Merge branch 'next'

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-14 18:52:15 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-14 18:52:15 +0100
commit: d00821e77f72d4af4ea30158c1c6e18ffff0875b (patch)
tree: b28b6cb077ae6b2457e30d49028fc978d8e2b59b
parent: 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 (diff)
parent: 6a339b4f9ec107438bb71a6f9ca72fd42fbfd436 (diff)
4890 files changed, 34882 insertions, 50679 deletions
diff --git a/Manifest b/Manifest
index 77fd460e7820..339e90949116 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29631 BLAKE2B 66c924136e3873ae4fa5b1b3230abe2c666b8d8c71c0c59a8380be9ba81b7e632c23653a65ebd0d4b21de92c23be269548f653a610eac3ac6ef30057fefbe79d SHA512 e3cf9a24218240763ee97a5928f84ef0a07dd5a78b8745075785617694a43dcfd5b88f281b619f1b3c5346dc2213612282ea86c6d67001ae3e6977c16533ed90
-TIMESTAMP 2019-09-07T23:09:09Z
+MANIFEST Manifest.files.gz 29604 BLAKE2B 6254168fd9e337c96be4f01fefea0829f05437859ac53f9016367b7cd087d7683ace7be43fb0a7f3569bfcecb8fa7bb31f7d9d70c0bcc5802d9fc831bc841d9f SHA512 f72ba794850f4f32ed00a13dbeba195a149893340f2b9cf38663cfc8dfd26216b2795c021006ed7c83302291733a960df25cd66729473ff83c42ff9d6306121f
+TIMESTAMP 2019-09-13T16:08:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl10OJVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl17vxhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDkRRAAstAtwFXHLsWio+eu+byxX291nsYZx0gy+i6gJnEhSCFengIRyATziuxW
-0dW7V9c4HfQ6NeCJ6i4+HZ/ckNT2WowFpS822HPuI3s2Z8Tdsj4Se1kw858imX1I
-EOQgMIlwcoyZ5nqmliwNmDB/k8zHrzmtvxp1QeeVuh9FC7jPCZLI5nGqLsSrAt52
-g88VVgdLqlIiAMnJw2ChRgyyzcPoS9ORzhJWqQXjUq1OZorT/NThGXdxCXE+96Xb
-j29kg9iZ9HUg4UzS1T+gyqYqSyzSOMEgJSvsroL5G74L7n1VuylcP40a2Ph/KtRl
-IHqZjrqbD/0xz7dWPpbsrR01FZyyjGN28/CHGKBivD6XPtO7S8qfsHdDEbIII3B9
-B48JzWWl27XIajHS8bX9UtVVsdqLRNox/SrJE6BNtco0BGeZCh/oohRJdxi/eoyU
-7GISadsO66ZAXvgFfzKY31+jwJfC1og3G/NnPEFLzGzyOP/tla/2Ql84hWOXkY5W
-GlRulBt+0uVZhs5RYdLMQEdO+94jlL/MErgLyYFsNwYFzmsta/XloTJ4T9aakWYy
-i9jivkWewSUH/8BWzQ+dIDa52MSBRcbLNvtotqNlCmHyeVasDwxrKAFgYVZFqGNE
-/couL4LKF+RGXC7IjoRyTfpBHsbSI3r16oElLSbbsY6zKbiw0Vk=
-=MU1A
+klBfBQ//cdvDQ0J2AhTpdy5Y7HTTkiQEazFmXKPr632Agh7fDsbvl9UB1iLZbBE9
+2VduMtcKD1JvGrmVpsieTnnLdSOjAojfwj7GDvkhpkqovclUxOxWUmPVIBMyH/z4
+I4toJ/iWTr4WXz3u7z0O7NsyPb2jkGRe+Qt1ag+HDbA0kpfR4nqXPC1UeS+ApoUx
+uknawq2QmIbSGoBvX2cdEPxmknY9t/yBHEUP7QjlWWSv4QJ3IWx4BWrDdUIZxKoJ
+0FaN5M4dDAOIbBZ65Oux0Dk+OZgXk/FU7cIz9jnTdlSSHeBCLo4N+byiuaa0kNsS
+39YJDY3JI30LbJ1bC/OHLfRZBZMsbzFbmU618BElJ8hkCI95FWCw9fXtkXXB1yzv
+tNAbnfi7Eda3OXEHY4gyuzwmMyQpOZdVYi2SQUHBJ+w2ZtXISDSVTeNDlHFJY2+o
+jakO2xb96qXb2NjOm4gkJlwJEp7LgF5zog288mgnMD7+daZfMrSdCSXahV1rZViq
+g8eRV36dsZh0j54oLghQHrDG67oPHl5ILZNSQ4s0Kd/FCru6otzKLfFLxsj+UIkP
+AmnmX+/ruIiLFVsh0rKUARF2iSAMLmJttg2mhSQ9O5Juloestv3zBNZdm5EoGtx0
+DQbpDNeyZ1937wyzZ9ULI8UV/RV2ngo5xCc2FwbbvZZAbUkjKIk=
+=4VPe
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index bfbac5ec16cf..312ec667626e 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 070173535e95..4aa081a13ad6 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/git/Manifest b/acct-group/git/Manifest
new file mode 100644
index 000000000000..c8d575acc275
--- /dev/null
+++ b/acct-group/git/Manifest
@@ -0,0 +1,2 @@
+EBUILD git-0.ebuild 146 BLAKE2B 86561ae154fba60375b1a65b05a06a7a398728872b02f013ab563053b6e5953a21706b4699ebacc25bf3c0920dc8fb67d3c812d8280a80754cbcb313bb370853 SHA512 f2287f7aa1c43f11d130963dd7e3bd7626abf6e0ac6acac5784ae5c766f9994d59efad8b75a58b2573e7be4e70d07480f08d4bbb51cb2fbcf8f35b3674471111
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/acct-group/git/git-0.ebuild b/acct-group/git/git-0.ebuild
new file mode 100644
index 000000000000..15d83cb050a0
--- /dev/null
+++ b/acct-group/git/git-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=196
diff --git a/acct-group/git/metadata.xml b/acct-group/git/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/acct-group/git/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/plugdev/Manifest b/acct-group/plugdev/Manifest
new file mode 100644
index 000000000000..1ab555b6d961
--- /dev/null
+++ b/acct-group/plugdev/Manifest
@@ -0,0 +1,2 @@
+EBUILD plugdev-0.ebuild 204 BLAKE2B 7b636e4ae06a7e0dab96f0039f5ee4efb6b76623f6b9915181f70022e59052e9773d8b46263fc804e477f2e56554b184f06b01f717652f435704f35806f696a6 SHA512 f5bfd1a8c80e694761e2318f5affe4e30582ef88fa856aabdae4fcd5d7cc8daaec0ffdd922e94f8d214eca96815746279085a1ea32edf51b375db7ce4972eb62
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/acct-group/plugdev/metadata.xml b/acct-group/plugdev/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/acct-group/plugdev/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/plugdev/plugdev-0.ebuild b/acct-group/plugdev/plugdev-0.ebuild
new file mode 100644
index 000000000000..14c2c876eedf
--- /dev/null
+++ b/acct-group/plugdev/plugdev-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group controlling access to removable media"
+ACCT_GROUP_ID=272
diff --git a/acct-group/postdrop/Manifest b/acct-group/postdrop/Manifest
new file mode 100644
index 000000000000..1127b2b1e473
--- /dev/null
+++ b/acct-group/postdrop/Manifest
@@ -0,0 +1,2 @@
+EBUILD postdrop-0.ebuild 146 BLAKE2B 6142ad63a6df4803d8e6a60ae48080b0ae54c74933971fa2c54b6e43670a7757fdc2dfb60f7e8a077c8e567866e5d75c104874709b7163c79dd09ac38e0eaa44 SHA512 eb2cfecd3b46c82e0580348b38d1a46c8ddcde8a6e62c897273ad0c29ac999ad307b49e26bae96c2fcd5a811caa7b07fb0fb6a05f8ca88c5fb9fa88d23131cf1
+MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/acct-group/postdrop/metadata.xml b/acct-group/postdrop/metadata.xml
new file mode 100644
index 000000000000..e6f3bf582ab7
--- /dev/null
+++ b/acct-group/postdrop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>eras@gentoo.org</email>
+    <name>Eray Aslan</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/acct-group/postdrop/postdrop-0.ebuild b/acct-group/postdrop/postdrop-0.ebuild
new file mode 100644
index 000000000000..eea0d6b07562
--- /dev/null
+++ b/acct-group/postdrop/postdrop-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=208
diff --git a/acct-group/postfix/Manifest b/acct-group/postfix/Manifest
new file mode 100644
index 000000000000..6535c513fc94
--- /dev/null
+++ b/acct-group/postfix/Manifest
@@ -0,0 +1,2 @@
+EBUILD postfix-0.ebuild 146 BLAKE2B 83f6102794bef9dd7aada2c551b769907083475343c9584207532c4efc397651345c248b11cf5fdba75b4ff0304d18aae73d3e2a9a81aa8551f94d885c3f267d SHA512 074124d29fa637888c7231f173e33246003e2f47a0ce65cc7ca6c93f225f1a6732b7ea5f1f3f21977bb2471aa7e16d498feba55112dba2cda1b2ea10d7dd07e0
+MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/acct-group/postfix/metadata.xml b/acct-group/postfix/metadata.xml
new file mode 100644
index 000000000000..e6f3bf582ab7
--- /dev/null
+++ b/acct-group/postfix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>eras@gentoo.org</email>
+    <name>Eray Aslan</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/acct-group/postfix/postfix-0.ebuild b/acct-group/postfix/postfix-0.ebuild
new file mode 100644
index 000000000000..e7dbea9784c0
--- /dev/null
+++ b/acct-group/postfix/postfix-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=207
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 30202e78a05a..9ac6e328119d 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/git/Manifest b/acct-user/git/Manifest
new file mode 100644
index 000000000000..96c13a7471a4
--- /dev/null
+++ b/acct-user/git/Manifest
@@ -0,0 +1,2 @@
+EBUILD git-0.ebuild 548 BLAKE2B d2dcc4b9f6a725301a53a8990c39b0108381dc599afc8154824ab8b266fe10822f0b418dc1ba5d4bd2f30c1da62bc4fde5d809785350fef9d86ca7e79d755de1 SHA512 977de3f8513fc82e29124e02f8ad68a480920649a00fdbefbec5444aa9e2d1fd73736fe68aa788712380cb1e2752128d83914ddcc874bb4532abf60edc784030
+MISC metadata.xml 502 BLAKE2B 9a5b2a85c54c283bed9e5ec27e03465639dfd2d8ef4daebdbfed9cf52eb90dc21764a35a910a4ac5aa7538b14cb8f733ce9758026ed1b2c6d9e92dd8a70e3117 SHA512 c9d052a560e89eeca6cd15d8d90824138897098277431a04cbab9074a670e037ee58afeb6466f057194cfb4dc8869c1af68e6bef4ba6d2416067d134c337a7c8
diff --git a/acct-user/git/git-0.ebuild b/acct-user/git/git-0.ebuild
new file mode 100644
index 000000000000..384b3bd703e6
--- /dev/null
+++ b/acct-user/git/git-0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="Git repository hosting user"
+
+IUSE="gitea gitolite"
+REQUIRED_USE="^^ ( gitea gitolite )"
+
+ACCT_USER_ID=196
+ACCT_USER_HOME_OWNER=git:git
+ACCT_USER_HOME_PERMS=750
+ACCT_USER_SHELL=/bin/sh
+ACCT_USER_GROUPS=( git )
+
+acct-user_add_deps
+
+pkg_setup() {
+	if use gitea; then
+		ACCT_USER_HOME=/var/lib/gitea
+	elif use gitolite; then
+		ACCT_USER_HOME=/var/lib/gitolite
+	else
+		die "Incorrect USE flag combination"
+	fi
+}
diff --git a/acct-user/git/metadata.xml b/acct-user/git/metadata.xml
new file mode 100644
index 000000000000..159d766b8251
--- /dev/null
+++ b/acct-user/git/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name="gitea">Set home directory for git hosting
+			via <pkg>www-apps/gitea</pkg>.</flag>
+		<flag name="gitolite">Set home directory for git hosting
+			via <pkg>dev-vcs/gitolite</pkg>
+			or <pkg>dev-vcs/gitolite-gentoo</pkg>.</flag>
+	</use>
+</pkgmetadata>
diff --git a/acct-user/postfix/Manifest b/acct-user/postfix/Manifest
new file mode 100644
index 000000000000..f4a282fc170d
--- /dev/null
+++ b/acct-user/postfix/Manifest
@@ -0,0 +1,2 @@
+EBUILD postfix-0.ebuild 236 BLAKE2B 6204cdaf4f74829cb02bf90751997d76c9f1253e589c1c280d7481b225fa7e9186c4eb6334c37edc4cf80230ca0671999371e51cb7573c509c3b3604497766d4 SHA512 8a438cef4650aee34ad9ce0c81af92449ffb7b708bcc5ee33f30194398bea342f55f9af2619a7f1691feda09257b15a05a60c42e623439375d578699db82898a
+MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/acct-user/postfix/metadata.xml b/acct-user/postfix/metadata.xml
new file mode 100644
index 000000000000..e6f3bf582ab7
--- /dev/null
+++ b/acct-user/postfix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>eras@gentoo.org</email>
+    <name>Eray Aslan</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/acct-user/postfix/postfix-0.ebuild b/acct-user/postfix/postfix-0.ebuild
new file mode 100644
index 000000000000..81f26ddfcd1a
--- /dev/null
+++ b/acct-user/postfix/postfix-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for postfix daemon"
+ACCT_USER_ID=207
+ACCT_USER_GROUPS=( postfix mail )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index acdc46bd91cb..7a127324e365 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index e9b22e747194..0de862b31451 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -9,4 +9,4 @@ DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493
 DIST brltty-6.0.tar.xz 2879976 BLAKE2B 31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265 SHA512 07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06
 EBUILD brltty-5.2-r1.ebuild 5232 BLAKE2B 1fd106413332e87b227a4cae664ef0325e07f66980ab7c94a8c5fded37623f40f87708b95bb7debcf1ecbdd8fd2a105a5f39bf0cdf6d1920844331d959432ff0 SHA512 86b1094f8e7fc411722155c78d822b640c954a4319ceb4b9462281da5e6ba430f45d390eb7cbe6062924115bb7a8ba4216efb72563786eb90d312213e7d80edd
 EBUILD brltty-6.0-r1.ebuild 5576 BLAKE2B 6e832c42e3b45a7cf51145edeac1ca7701843ea09e8273f70507df13a557794cc792e5df174383a45bdc6067685df82a4010f53fabcea23a306dee84805d98b9 SHA512 39bd8b2bd8899f030f3683f526cb61e3bd7d4fff569934714bb6e427252e9194fd6b436dfbcb41f403999b9a1a272563029bb29ef6fddb23e86deeefb2d10bfd
-MISC metadata.xml 1581 BLAKE2B dad24f7b2a02b83a33a5cff8513d22bb9977d2293d1c549347c5ea9c19166f771523c8d442f4c10e30f17827e2b501802ef545b528c16841faa50962644e5c30 SHA512 bd04635109012b7b2e1a605e6538dba54781cfa033b9fac49b1be1364eac02e9bb2ec55b4025a9a74477d7183cea89e4261db4ee3b9cc29eefc335b7b2939ccc
+MISC metadata.xml 1661 BLAKE2B a4687ddd715019cf8273353b4a70a4981e4925f5e931859280b2f836b8f56f82708b82a1cc184a3e056febb15649987650e1312a00ac8a35efa833ae2e4d1f7d SHA512 c7904bf90031faaa478456e3f3e6c59f969e9abba2cee33ac7ad7041edaaab8ea89ca3301f4bd7a7f385507623f316fa4908ac2c6e66a94ac108bce2aad87936
diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
index b05083dfd091..8f4dd156f0cf 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/metadata.xml
@@ -15,6 +15,9 @@
   <flag name="pcm">support for sound card digital audio</flag>
   <flag name="speech">speech support</flag>
 </use>
+<upstream>
+  <remote-id type="cpe">cpe:/a:mielke:brltty</remote-id>
+</upstream>
 <longdescription lang="en">
 BRLTTY is a background process (daemon) which provides access to the Linux/Unix
 console (when in text mode) for a blind person using a refreshable braille
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f7ec8fe368b4..cf65bb84ae2d 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index b3e01cb33398..9261f9f69746 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,6 +1,10 @@
 DIST ansible-2.7.13.tar.gz 11861862 BLAKE2B 3123d84b9f45bb5e50a0d5db5d0b2ae10163e2818d30f29ad5a80c23979a347eb5e17806bd295df547b88a09191918443162cb25d7f339ae76df52e3960954b0 SHA512 8dc19e5c93a90d43ced6628699d2da42d522a020bb2cdd35ba73f6286998c605852c89250af8696e94aba0080b2fab12761a39c3e2eb86d39c212a198f970652
 DIST ansible-2.8.4.tar.gz 14348300 BLAKE2B 8a9b5587411d2366a91643682c0ef82b0aa5b5cd5e6b882f3ffdfa100c4f3995472913bc12e1c2f7077efb69ec8ac3ad168a79fc3d8c127b34ce03c69588a4c7 SHA512 9efacbaf053acb8cf92ebe5bda982794ecbdbf55e33a4a292a68874b637eebe82406bfba129adf839354ee18aa809d45d77502f68b8e8d07358a48c9b5687b7e
+DIST ansible-2.8.5.tar.gz 14352036 BLAKE2B a2d60132e3aeafd7dbdcca13daac1c657e19fc1b7822b33dde35e0fff67fa7093b54330652ba6c02bad710fd2d05fba3081cd0b609f16bccf7e2eba52f9fa45b SHA512 6555b9a3d3d8298410e54f7116d92fc1978bef185a5136cfb809c1942b08b96c562af9e0d6d1a25eee5a4024d309b6713ce27836857b428a7c362e26efb53777
+EBUILD ansible-2.7.13-r1.ebuild 1675 BLAKE2B 9b2c3275f960f0c36be0db1fa01e09c8acb93ae8ff4e606c8fa874d00e20512f57c528ad210a8c375f9173d7484284dce1cd2d0ac3b0590551a487e329752838 SHA512 9ea7ede55cf58584f191ada7f48465af05007d3c8a26ac18b5b06a41794b8f46f9ca46ecd900bef1c61bd433177b516c8b16b01d0eb8a13be511b341c9552798
 EBUILD ansible-2.7.13.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
+EBUILD ansible-2.8.4-r1.ebuild 1756 BLAKE2B 30327a58804ddf1ee56c9ce618270afa554462123140e2ef6376b1655620289677b69ec6a49da1096cadc09924147f75fadbb7738cb68eb7cdc34ccb0b2f290b SHA512 386092c824fb03e07b89589281e64b4adcd817f1f977b8c9004497fa5b115a053c2789994d1385cf56afe134cad1b67d40ec3d36845989acbbc8cc11ba2b677d
 EBUILD ansible-2.8.4.ebuild 1716 BLAKE2B 8ddd4c96e597576d970964d5e9daf4d5f965230f3c42fffedddbd6d20a56b22d98151c0f0f3637304385e02e97af466e18c5cacee258fd93ea7006db5ea14046 SHA512 f70424d820a489d02936f625822ddecab576241d59ab65f8552fa254e4376d2cc0d746af29f3331c6814a45c60cf32f8ac46537a9ae668ebb1dea2d7354a73b2
-EBUILD ansible-9999.ebuild 1757 BLAKE2B 647e72bcd7497648dbc96e5bab87e2a8fd5a2e2f47d407536c9a7785e534adef457a24106769dbe8a4cb121a95a63c2b5dc62ed5315ffca3c7f9b72594890611 SHA512 bc9414c6235bc3706ad95ec016b2632e4a3f46649fd066d981711b3a969d7fdcab303bd3bfbd33ac30e60889304ce032743ec0cad37897812f0e055a990d2c53
+EBUILD ansible-2.8.5.ebuild 1756 BLAKE2B 30327a58804ddf1ee56c9ce618270afa554462123140e2ef6376b1655620289677b69ec6a49da1096cadc09924147f75fadbb7738cb68eb7cdc34ccb0b2f290b SHA512 386092c824fb03e07b89589281e64b4adcd817f1f977b8c9004497fa5b115a053c2789994d1385cf56afe134cad1b67d40ec3d36845989acbbc8cc11ba2b677d
+EBUILD ansible-9999.ebuild 1795 BLAKE2B 0f7288af3da8d075bed73dc9141c64cbecf4ec420bc79e64601d0af162cdfce7545dcb76939bc5b6d425d36b6c8f547082fd3c34b30bbe3ea155d56c00bc97e6 SHA512 3040bba45955f3e58d630222aaa0314506d12580d115fb00162ec2fb37eaaf12e48264164a75ddd5eaf62d61f47eb0ccc0402a05e4b61a47508394912f623a77
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.7.13-r1.ebuild b/app-admin/ansible/ansible-2.7.13-r1.ebuild
new file mode 100644
index 000000000000..401feb026c7e
--- /dev/null
+++ b/app-admin/ansible/ansible-2.7.13-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.8.4-r1.ebuild b/app-admin/ansible/ansible-2.8.4-r1.ebuild
new file mode 100644
index 000000000000..b078e69e7bf9
--- /dev/null
+++ b/app-admin/ansible/ansible-2.8.4-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_prepare_all() {
+	rm -fv MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.8.5.ebuild b/app-admin/ansible/ansible-2.8.5.ebuild
new file mode 100644
index 000000000000..b078e69e7bf9
--- /dev/null
+++ b/app-admin/ansible/ansible-2.8.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_prepare_all() {
+	rm -fv MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index c35e90491f7c..64bfd8037602 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -27,6 +27,7 @@ RDEPEND="
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
 "
diff --git a/app-admin/certmgr/Manifest b/app-admin/certmgr/Manifest
index 6130ee8f0975..53e833b5e6da 100644
--- a/app-admin/certmgr/Manifest
+++ b/app-admin/certmgr/Manifest
@@ -1,5 +1,3 @@
-DIST certmgr-1.6.0.tar.gz 31187831 BLAKE2B a1269aac2817f077fa2aae3d14f692aa5c83b0f53ffe041b9436754a93c7970dcc24bed94259e05b99105de5400b3b8c5e22bde087fe365a1c21b8eaf4b3e4a3 SHA512 65b0cb8d5b7a3b76698b3b3aa8c2b9db88d08fed209044668cb19f13eca69714a7a4bc8a20bbf60af05f5c9e39b221801a36e90c8b1c647dbf07952ac385e6ea
 DIST certmgr-2.0.1.tar.gz 2696154 BLAKE2B 0267c82dcf89297495bd46930bb53a176b0329aa933dd8a8b8a96b377133741f45e1a16e0beccb36540ef3c25d28f2af324a976ccac7c769c0cad06d2fb4d20c SHA512 b0de0fff3af435631b26ad4f3b0c1178b3f2e784545939b8dd4a90ee29918c879aea1afc774a23655e7e10526d7a8d13f95cb0740e407eb60110dabc56fdeeb5
-EBUILD certmgr-1.6.0.ebuild 636 BLAKE2B 04c13ebf4349cb36bd4df1b5f97775d6614e7666168f29b0ece03cb020d0dccb6759c4d0c77c433a789a93eb92891f720d2a06e90370cb3e09210037d7ef96d3 SHA512 6268aae4ca61265579e263ca766a6fdac438e5ef79730e10dbf467384c6040113fa31600bc149794151f7fff45c63587faeee17a33480e6761ae012c4688b5ca
 EBUILD certmgr-2.0.1.ebuild 633 BLAKE2B 33de20ac15a1868da1fb3ba6b40a63280f3d1dee05ccf86e3a9799dd55fb4336beaf42910cc032dbfaeb033c1a2dc11fe27d803d0b8519b03bb49b1b50a495fb SHA512 0b1604bc0bfc31410f8e3d33ecbb970e8b774ccdb6cdd39369ac8cef5ea807037fa4e00f2cb2f62127c5d6444e7ad341b4f524ec465082f2690f99994255a042
 MISC metadata.xml 250 BLAKE2B 267d35ba6d759d93dba62b94026d1f4219bef12cdd930e75b1bbc88e4603fe53602b0de8fb1dee62d4bf2ce778cf7ac2e241c5dc117900bb8086902a4a404df5 SHA512 35c362c6a4c181cf124fd1e86b9a06430beae594982b15bd53f6fce2c958189ff5c9cd778bb9fd9a2e9c9675af9e8efb1d5d037059b72f16ad6e6db502f886d1
diff --git a/app-admin/certmgr/certmgr-1.6.0.ebuild b/app-admin/certmgr/certmgr-1.6.0.ebuild
deleted file mode 100644
index 6951be522070..000000000000
--- a/app-admin/certmgr/certmgr-1.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/cloudflare/${PN}"
-inherit golang-build golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Automated certificate management using a CFSSL CA"
-HOMEPAGE="https://github.com/cloudflare/certmgr"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${S}" go install -v ${EGO_PN}/cmd/... || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	pushd src/${EGO_PN} || die
-	dodoc README.md
-	popd || die
-}
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index bacc9e05ca24..73fe2769ad9b 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,7 +1,3 @@
-DIST dxf-7.4.1.tar.gz 300216 BLAKE2B 53452e73a10912a09e912fc0710fcdd1b0a6be4f78e95c704526852deacf5a7bfd2d3b73bc165f178f732249a64547e13bf9f58f77159c31908e954d6d3a4161 SHA512 a7a2ba4da675f1dea73f2e3d7db63804eb2b68cbb859e43235997b3bc5b8e7ef209705935182ae33d4b28cec5857d2ede738375e19df72134a5695190fd609a1
-DIST dxf-7.5.0.tar.gz 301822 BLAKE2B 33f2356cc6e3567b11d48b63ae9951bdbf5e77726e7f6081b3d299b0560646fd775060b3fe2766d3de69b33cedf4c3f21810bbb4429402a1d9c616da2f7c0ba6 SHA512 82a4a4d2b8baaba242f82b2c01ae47adc4856250bf558d28e0582e6a92b081ff9512e33d3b02d022232880003df40dbd62b7a6401aa5bac83cb673ebb9c85435
 DIST dxf-7.5.1.tar.gz 308004 BLAKE2B 6f8aaf39fbf3a9ef813d5af502361fac3827db17fa5279c3a53e8b87826cac15ef59cb41b2682c9eea065e0a30d98c2b22f72b4922869a012eab76274b1ff325 SHA512 f1a5082d70c115da9f01385e40ed7d2c1ce82af6fb9e55c8f3173e544a9ff3e98c8c565c9e6a2ca1e9a688665944ec0d9dd873f621914d5b746ef4a145f308a0
-EBUILD dxf-7.4.1.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
-EBUILD dxf-7.5.0.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
 EBUILD dxf-7.5.1.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
 MISC metadata.xml 295 BLAKE2B b3270ada06f2998a84e5484b6b063cb5e1c397be2bb266ba10352e811f35e25576469488cb42eb49ac718c6e788861b706aba3e1cb673cbbf176c576fc5745a5 SHA512 99b0deb01ac0e00d6f958c41a9ad8a68bf606a178924c0f052a656d0bdc2638b711e4fe10ab49e1a943ce7a8c29fc77b94abd4a91f6f65a3debd892d8a099339
diff --git a/app-admin/dxf/dxf-7.4.1.ebuild b/app-admin/dxf/dxf-7.4.1.ebuild
deleted file mode 100644
index 2b55ca80585a..000000000000
--- a/app-admin/dxf/dxf-7.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Docker registry v2 client in Python"
-HOMEPAGE="https://github.com/davedoesdev/dxf"
-SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
-	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
-
-RESTRICT="test"
-# Require dockerd running
-
-python_test() {
-	emake test
-}
diff --git a/app-admin/dxf/dxf-7.5.0.ebuild b/app-admin/dxf/dxf-7.5.0.ebuild
deleted file mode 100644
index 2b55ca80585a..000000000000
--- a/app-admin/dxf/dxf-7.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Docker registry v2 client in Python"
-HOMEPAGE="https://github.com/davedoesdev/dxf"
-SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
-	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
-
-RESTRICT="test"
-# Require dockerd running
-
-python_test() {
-	emake test
-}
diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest
index 0d2528923da4..ec3522184179 100644
--- a/app-admin/gixy/Manifest
+++ b/app-admin/gixy/Manifest
@@ -1,7 +1,3 @@
 DIST gixy-0.1.20.tar.gz 710691 BLAKE2B 09043925d950a9a35de4df91ef3c2f9e5ca4458227320555a109e50d0838fb10ae22d086cdfc39c0d76bcd051c1a7e1d5e291354cc457cff398be8d164cbfde6 SHA512 d666e758c2746c201a11b67b4b99cee1bd3406085eb1c0aa9ae520b72d3a1273e09e3475226a6e54fbfbcefe65b3be0fc877e66cbaa81f384f757767852bc08e
-DIST gixy-0.1.5.tar.gz 32594 BLAKE2B c92b95e4c17e07b2367337ab8dfa742d0eb995b6c979c4ba25e9f83e446d95dc8c89013b6f45e467c0dcad275b8f0ca4a163a7eb6ae0c2867e4102fe4765a8be SHA512 63c41a16f1a1d16664c660150bf1603b87d2a2b474db58bb13af79e123b372a666b94aa96ef081af89fb5608c7f9a43e03750afb80d52c212c06d3407c413e38
-DIST gixy-0.1.8.tar.gz 35176 BLAKE2B 3e875f63044244b19a7b881c0082c6ce91a2cdc9d0245c741e1b3f4cbcff70e0787d212c09ce2ef157c5a37942a87f9868975c43102df54f79f0b29721cd4acd SHA512 fe45522dbee238282f05f11fc22bdff6f04df117d9b909aa3a9c7ff0aef3c376e65119e91e8e562a2ea5d9c2e85a1e43462eb3ce14f30c171235bd44097c7a94
 EBUILD gixy-0.1.20.ebuild 967 BLAKE2B 158d4ee112fd46ee9abb7ba5d5d29a596193b898373a2bf2b49277079ffefa8df733d92f48af904db1fb5a478478c91614110395dfff631b4ef662da9f421f69 SHA512 0cd185ae489e58958935c04e19228f1de330e9ddedd1af862db5a1a8c62a100d0a6662695ee63eb748b9cd82468d5d559fccdc49f0b7b2f92e68d9d3bf30ef6d
-EBUILD gixy-0.1.5.ebuild 788 BLAKE2B 40f8bca747a06fbbca06aeeeff196a0d0674e6fe7060b2bc1410ce8fab59821c9e331b0c2fcc9ff721dd13467b18f4ce0b1396a50584112d88fa3f5c3b54c29a SHA512 558ba5a26aeaaaa75717ca22d133fa2fc63d7dad47335105982d8e193bab49b3b7dd0b30a3a135a53417c7ba86da0eeffeb25982f06419fdb062233e3f9890fd
-EBUILD gixy-0.1.8.ebuild 788 BLAKE2B 40f8bca747a06fbbca06aeeeff196a0d0674e6fe7060b2bc1410ce8fab59821c9e331b0c2fcc9ff721dd13467b18f4ce0b1396a50584112d88fa3f5c3b54c29a SHA512 558ba5a26aeaaaa75717ca22d133fa2fc63d7dad47335105982d8e193bab49b3b7dd0b30a3a135a53417c7ba86da0eeffeb25982f06419fdb062233e3f9890fd
 MISC metadata.xml 248 BLAKE2B f2e59d4d05a017ebeeed31b36a72a279974f8fa64886873d23671f1fa91bcf3152acf9652624f2b1a2f5d9524bb24ec7dab734ce43e8cb6475ccfef67af40697 SHA512 c0d402a47544d8f31d1fc9f23fef5d84bf000f2a9a8a07c8b23899306818152aa71844f1d9310e0c32a354189be1f53ae8c89cde90464176ab9b861e62084822
diff --git a/app-admin/gixy/gixy-0.1.5.ebuild b/app-admin/gixy/gixy-0.1.5.ebuild
deleted file mode 100644
index 4ade6ac258d8..000000000000
--- a/app-admin/gixy/gixy-0.1.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx configuration static analyzer"
-HOMEPAGE="https://github.com/yandex/gixy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-python_prepare() {
-	sed -i -e "/argparse/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/app-admin/gixy/gixy-0.1.8.ebuild b/app-admin/gixy/gixy-0.1.8.ebuild
deleted file mode 100644
index 4ade6ac258d8..000000000000
--- a/app-admin/gixy/gixy-0.1.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx configuration static analyzer"
-HOMEPAGE="https://github.com/yandex/gixy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-python_prepare() {
-	sed -i -e "/argparse/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index f89bc9a52a71..f0889aca081a 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -7,8 +7,8 @@ AUX gkrellmd.initd 345 BLAKE2B 922967be33dcc733c55cfffa59addc01bbe2ba0298be14541
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
 DIST gkrellm-2.3.10.tar.bz2 782794 BLAKE2B c0aac7df866d40c79667551ca4b25346da4267a0aad8853776425a08097dcfe3a24082e7e5d17db6d3936b59d10c29afa11e8a425319c19696141c02f7d95f25 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.10-r2.ebuild 3276 BLAKE2B 621c5b2210a1dae150216d1e2f75ba537ac9dea5e22db9fb2722e642f6f8c05b8611b4a572567b88d5e75e3446d270a367ba1b61d2c04d50624c109186c96e6f SHA512 2391488443ac81a5024e3bddb7097b5819c703545f3146519fd572be76f3bd161c5a83f7879cedc6ef3cdbc971db94d8ad2f693d4c69f5486321254973cf34d9
-EBUILD gkrellm-2.3.11-r1.ebuild 3350 BLAKE2B b74f6c06cc63015c7a0d13dae0b884fe863fad7643f08ec629696ef484c73a509cde929374b6c84c77d9733a80addc33191efda805ec8d72daf580e75b91a60c SHA512 ab55d3b94fa2a95911a43dd6d6bd66e148dd0e0e02f515b28e16f7f1dfedaa3c63d856d337993d4a5b7c1fa4b0300bf98f66b66f88f1bd75329f49a4e3dc5fa2
-EBUILD gkrellm-2.3.11.ebuild 3390 BLAKE2B bc12fdade844680c79dd3212081ee9bff5b6a8f270f6320dd1f96c939b97e9daeb4f955f66aa1f48f5f00d13ceef9a06c61685f64baca9bcee99dbf8a50ad0fa SHA512 65b89fadf2bc0ccc50f27fd70040096d14c460f90c8461198653ac37509977ed68155c48f19adc56249a47fd14ba27610b9b92b6d925ba5e9d18275a2a1699e3
-EBUILD gkrellm-9999.ebuild 3350 BLAKE2B b74f6c06cc63015c7a0d13dae0b884fe863fad7643f08ec629696ef484c73a509cde929374b6c84c77d9733a80addc33191efda805ec8d72daf580e75b91a60c SHA512 ab55d3b94fa2a95911a43dd6d6bd66e148dd0e0e02f515b28e16f7f1dfedaa3c63d856d337993d4a5b7c1fa4b0300bf98f66b66f88f1bd75329f49a4e3dc5fa2
-MISC metadata.xml 917 BLAKE2B 34cca38c9abfdd920abe9bf75e8569d652f3575e3c9f81e40f90255464021cb9f1768f742f30a8e6469a9e74342231380b9bc465a95ee1963e03d87238725e86 SHA512 8896a7f487c9089202c78589eb62c47f1705d41000a562b40a08eea660d0fe4fec422026329dedb4a33bd0dd63da5249e8dfd03590cadcf7088c0b31d55a34af
+EBUILD gkrellm-2.3.10-r2.ebuild 3276 BLAKE2B fcb5c7222e306fec7d2a3936617ee19606f0cdf95d6cbfb17291669c77b1dd5942401b72355aadf5a2a1267aca4a1e78c8256d80ed8d78f93135e061d30acbda SHA512 30b6a8c19d6f848276372a4c63d4cdfc91b27cdb276bbaea41773af4461da7c39e18a00684c6d6fc24e25d6df9b8d9e2d071fe6ebb407b143460e2188079a77d
+EBUILD gkrellm-2.3.11-r1.ebuild 3350 BLAKE2B 9ea403477a4987e1fdaf3c3325a5d8ac59ab9e6d66c275e30d1015368bf160ed2d288d5b855dcc31a766d65dc5c52423d16bc3fa0694c771016fcfb2df727b01 SHA512 eb4402414885b31ef605a91cd79a3d5cc82cb7fb75bd01531d8023481cb6bdb2735116e30a55fc6fc453ea6afefc73cdecb5410681944cc5c12418d5de41c9ff
+EBUILD gkrellm-2.3.11.ebuild 3390 BLAKE2B ebf9593c76124df73379b39d679711ecb537fd7d7a70168a3d8312ba162a8d027ec617be46ff6aed8c76b6c5aa19c957336678d67bc4d94ce17f4eee2c5afb1e SHA512 65cdfae09c0f1fbe39c45fb08985397387ed815c706f7c548d777f4d15b55f937ccfbe5a917f458b322a42d966cedfde5a0718d26b272fe0efe82ddc18cb2692
+EBUILD gkrellm-9999.ebuild 3350 BLAKE2B 9ea403477a4987e1fdaf3c3325a5d8ac59ab9e6d66c275e30d1015368bf160ed2d288d5b855dcc31a766d65dc5c52423d16bc3fa0694c771016fcfb2df727b01 SHA512 eb4402414885b31ef605a91cd79a3d5cc82cb7fb75bd01531d8023481cb6bdb2735116e30a55fc6fc453ea6afefc73cdecb5410681944cc5c12418d5de41c9ff
+MISC metadata.xml 917 BLAKE2B 88567611e5ddaed8c1f81e639c7e82a120f9201f56b9e512bca08d948c78a967e57490e754f7e3b2c9a4a9a2c216b1288c8059593589378b5404b51db50a9644 SHA512 8b880d60459e4cba922f2fe586f0dfdcc4b0f8054e5f5cf8650ab10bacb30380b67f81795c671e28bf0c51bd6f3379c3b653bc78c0ec954bc7456dccdad274f0
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
index 2a8dc60efddd..6deb89dbedcc 100644
--- a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="2"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -26,7 +26,7 @@ RDEPEND="
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 	nls? ( virtual/libintl )
 	ntlm? ( net-libs/libntlm )
 	X? (
@@ -89,7 +89,7 @@ src_compile() {
 			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
 			LOCALEDIR="${EPREFIX}/usr/share/locale" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex lm-sensors "" "without-libsensors=yes") \
 			$(usex ntlm "" "without-ntlm=yes") \
 			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
 	else
@@ -100,7 +100,7 @@ src_compile() {
 			LINK_FLAGS="$LDFLAGS -Wl,-E" \
 			STRIP="" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes")
+			$(usex lm-sensors "" "without-libsensors=yes")
 	fi
 }
 
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
index c54518d26368..42065f550af0 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
@@ -18,7 +18,7 @@ else
 fi
 LICENSE="GPL-3"
 SLOT="2"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
 	acct-group/gkrellmd
@@ -32,7 +32,7 @@ RDEPEND="
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 	nls? ( virtual/libintl )
 	ntlm? ( net-libs/libntlm )
 	X? (
@@ -95,7 +95,7 @@ src_compile() {
 			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
 			LOCALEDIR="${EPREFIX}/usr/share/locale" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex lm-sensors "" "without-libsensors=yes") \
 			$(usex ntlm "" "without-ntlm=yes") \
 			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
 	else
@@ -106,7 +106,7 @@ src_compile() {
 			LINK_FLAGS="$LDFLAGS -Wl,-E" \
 			STRIP="" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes")
+			$(usex lm-sensors "" "without-libsensors=yes")
 	fi
 }
 
diff --git a/app-admin/gkrellm/gkrellm-2.3.11.ebuild b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
index d205ffcda8a5..c129a3783e30 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
@@ -18,7 +18,7 @@ else
 fi
 LICENSE="GPL-3"
 SLOT="2"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -30,7 +30,7 @@ RDEPEND="
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 	nls? ( virtual/libintl )
 	ntlm? ( net-libs/libntlm )
 	X? (
@@ -93,7 +93,7 @@ src_compile() {
 			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
 			LOCALEDIR="${EPREFIX}/usr/share/locale" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex lm-sensors "" "without-libsensors=yes") \
 			$(usex ntlm "" "without-ntlm=yes") \
 			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
 	else
@@ -104,7 +104,7 @@ src_compile() {
 			LINK_FLAGS="$LDFLAGS -Wl,-E" \
 			STRIP="" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes")
+			$(usex lm-sensors "" "without-libsensors=yes")
 	fi
 }
 
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index c54518d26368..42065f550af0 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -18,7 +18,7 @@ else
 fi
 LICENSE="GPL-3"
 SLOT="2"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
 	acct-group/gkrellmd
@@ -32,7 +32,7 @@ RDEPEND="
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 	nls? ( virtual/libintl )
 	ntlm? ( net-libs/libntlm )
 	X? (
@@ -95,7 +95,7 @@ src_compile() {
 			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
 			LOCALEDIR="${EPREFIX}/usr/share/locale" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex lm-sensors "" "without-libsensors=yes") \
 			$(usex ntlm "" "without-ntlm=yes") \
 			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
 	else
@@ -106,7 +106,7 @@ src_compile() {
 			LINK_FLAGS="$LDFLAGS -Wl,-E" \
 			STRIP="" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes")
+			$(usex lm-sensors "" "without-libsensors=yes")
 	fi
 }
 
diff --git a/app-admin/gkrellm/metadata.xml b/app-admin/gkrellm/metadata.xml
index 5e32bfdba9d3..1e171c786064 100644
--- a/app-admin/gkrellm/metadata.xml
+++ b/app-admin/gkrellm/metadata.xml
@@ -9,7 +9,7 @@
 		<flag name="hddtemp">Enable monitoring harddrive temperatures via <pkg>app-admin/hddtemp</pkg></flag>
 		<flag name="gnutls">Enable SSL support for mail checking with <pkg>net-libs/gnutls</pkg> (overrides 'ssl' USE flag)</flag>
 		<flag name="ssl">Enable SSL support for mail checking with <pkg>dev-libs/openssl</pkg></flag>
-		<flag name="lm_sensors">Enable monitoring sensors via <pkg>sys-apps/lm_sensors</pkg></flag>
+		<flag name="lm-sensors">Enable monitoring sensors via <pkg>sys-apps/lm-sensors</pkg></flag>
 		<flag name="X">Build both the X11 gui (gkrellm) and the server (gkrellmd). Disabling this flag builds the server only</flag>
 		<flag name="ntlm">Enable NTLM authentication for mail checking with <pkg>net-libs/libntlm</pkg></flag>
 	</use>
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index ea877c540c63..a70afd15e96a 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,8 +1,4 @@
-AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9
-AUX keepassxc-dont_call_mandb.patch 792 BLAKE2B 3154b6624a2e5923a3b3ad9edfbaedd5c0bba77f47108913d8eece63cbc4df571f516a41d72db0287a7a4d8741ab309cc7e09c8fcddaec0bf39ed09479607329 SHA512 21bd27e713357f5aa522a2263a1d03b8a595fb0d51ea10c034358169cb2f72c70585b04dde8f0d8e9af30c9ecf055b528b975a9701372d4f726a8f50b347d8f4
-DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8
 DIST keepassxc-2.4.3-src.tar.xz 3301944 BLAKE2B ba95d5d48049367e7d3c39b5fdc9fc9816dfe2b257530068f229d1b5bd4eb9c137607f63bcce0aac4bc67ed41ee00c0385be800720acfdc3920c44444cade180 SHA512 893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d
-EBUILD keepassxc-2.3.4-r1.ebuild 1847 BLAKE2B 4de124b498c9d101b56a9c966170d6bfef024ac8853b166c82e42244a209956f062ebe3f1cfa99d6b62fc2ce3569b884ede3cda338bfd6d92ca5575f18a30f33 SHA512 bbcaea1ebd466a585375cb29688761202bdff37fa4ec18f40134e933d8fa7036d8be422b822b3dbc307ca16fbc8a509f04d6f29c2e7b442143fcedd7b662eb6f
-EBUILD keepassxc-2.4.3-r1.ebuild 2137 BLAKE2B 58f0826e47b23ce6c2d142c315f7c86ffef47d7752627363b4218d58b5ac414cb2f75cb36c8aeef4ad829223ec054e7fa08e4151bc1bb6c0e1d867a420d77da5 SHA512 2b27245a7d84f720b3dd28eecf75a2d5b36ecfb41c67138bca189ded563e03ddee03ab87d7229fce937f22696bf1f4a792f3924854c75b7f8a9406e57559dc09
+EBUILD keepassxc-2.4.3-r1.ebuild 2135 BLAKE2B 499b397116dcde99805b4afa4b38b4c25a8b3121e4cd8fe473cb584e295a77ad6ab36a47cfaf447cf09bfb0d12f45bd649e7cb4e90c031ab4dd68b9b04565787 SHA512 9f2651697c320325e7dc9aba2cbb9cc6c01173a2c82072b9df13b9a8292e841bbcd059ef95c21b52ffec1c0155b3c9787cd303512139a9db38b00274edaa9c36
 EBUILD keepassxc-9999.ebuild 2137 BLAKE2B 58f0826e47b23ce6c2d142c315f7c86ffef47d7752627363b4218d58b5ac414cb2f75cb36c8aeef4ad829223ec054e7fa08e4151bc1bb6c0e1d867a420d77da5 SHA512 2b27245a7d84f720b3dd28eecf75a2d5b36ecfb41c67138bca189ded563e03ddee03ab87d7229fce937f22696bf1f4a792f3924854c75b7f8a9406e57559dc09
 MISC metadata.xml 960 BLAKE2B 63a61f81e372efa1d1a4118f8353818eb28f4d9b0e7c87c5cb6e7a4ee8c9856ae3c7ee981e2777d3263725338581834f294022d052397dffbe98db2b5ba36895 SHA512 85ad2302913936ce51a455ae15e2d9ca7a68d26fc16819f46ab494b6aaafecdf32f74596b47c1b5a3cea56bfc49bf7021dbb4b770efb8f362386a67c88ea2404
diff --git a/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch b/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
deleted file mode 100644
index c382db5873fc..000000000000
--- a/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/gui/entry/EditEntryWidget.cpp
-+++ b/src/gui/entry/EditEntryWidget.cpp
-@@ -32,6 +32,7 @@
- #include <QMimeData>
- #include <QEvent>
- #include <QColorDialog>
-+#include <QButtonGroup>
- 
- #include "autotype/AutoType.h"
- #include "core/Config.h"
diff --git a/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch b/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch
deleted file mode 100644
index a3ff5f7244d8..000000000000
--- a/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7789bed0f29e0067eca7a40f604262d18611cdb0 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 8 Mar 2019 14:48:13 +0100
-Subject: [PATCH] Don't call mandb
-
-There are other man implementations beside man-db so it is not even sure
-that the "mandb" binary even exists on all unices. Other than that, usually
-there's a cron job running "mandb" on a daily basis.
----
- src/cli/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
-index e59a911a..c3f97a2c 100644
---- a/src/cli/CMakeLists.txt
-+++ b/src/cli/CMakeLists.txt
-@@ -94,5 +94,4 @@ endif()
- 
- if(APPLE OR UNIX)
-     install(FILES keepassxc-cli.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
--    execute_process(COMMAND mandb -q)
- endif()
--- 
-2.21.0
-
diff --git a/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild b/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild
deleted file mode 100644
index 742ca5d1e1b0..000000000000
--- a/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
-	#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-	KEYWORDS="amd64 x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser debug network test yubikey"
-
-RDEPEND="
-	app-crypt/argon2:=
-	dev-libs/libgcrypt:=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	autotype? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXtst
-	)
-	browser? ( >=dev-libs/libsodium-1.0.12 )
-	yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-	dev-qt/qtconcurrent:5
-"
-
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
-	x11-misc/xsel
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.3-qt-5.11-edit-entry-widget-includes.patch" #655844
-	"${FILESDIR}/${PN}-dont_call_mandb.patch"
-)
-
-src_prepare() {
-	 use test || \
-		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
-	 cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_GUI_TESTS=OFF
-		-DWITH_TESTS="$(usex test)"
-		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_HTTP=OFF
-		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_SSHAGENT=ON
-		-DWITH_XC_YUBIKEY="$(usex yubikey)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild b/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
index 20cd5799cdeb..b6dd4fd2a017 100644
--- a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~x86"
+		KEYWORDS="amd64 x86"
 	fi
 else
 	inherit git-r3
diff --git a/app-admin/ksonnet/Manifest b/app-admin/ksonnet/Manifest
index 777b0d078b55..6b3f39d27615 100644
--- a/app-admin/ksonnet/Manifest
+++ b/app-admin/ksonnet/Manifest
@@ -1,11 +1,3 @@
-DIST ksonnet-0.10.2.tar.gz 9312418 BLAKE2B 5e097250a8f1c7887d1949a84d6b768619508b0557ae15220cb31b933a40fcf025200a1d5a60e3fed8e37226faf9b5fdfaa18c87ac56ff4187968efb73b8cef7 SHA512 d4ea1b9b5feb90b345997d8546df276c3e9b171cbe6b648133615ae89fd0fadedb6f98128f4c8b5a40005de3f08ccd0a4de46c7d9c7d0f20e62baa5727c11065
-DIST ksonnet-0.11.0.tar.gz 11228264 BLAKE2B 2c5be1124f2976b6f38b23c9f871bc67a1b88fdf851339893525a4f42a8b3a8ac37b18454e2d281ae3ff71008744a60683910d4864b158fd428b76d28cd73e9b SHA512 4b80b16e4b2cbf79f043e38c6668fad51ec958264a85262f16b1f44c66af80f93d51809c713360758392d4689f350748b5ec55bc2bd3bee01bd42ce4030ffeeb
 DIST ksonnet-0.13.1.tar.gz 12336756 BLAKE2B 1952c02a0dbefc0efdcde1728348e62b23e9ef92fedb8444f98dcc0e670090be56aa001ee50f5e6885752e565863b3813556b091dc614a766677ea4d6e0722c4 SHA512 be16e986c27da358df27d632d1191837d3c16a92e702f3bc29d504de80128870dd4d97752db07c06bd5a11b517e69d6690b9608125d702f809c181d4109622f4
-DIST ksonnet-0.8.0.tar.gz 5260937 BLAKE2B 3b14618d9e40e0f71f966a0acd1ac121040ddfbd378b363236f98c4ecc6d2a2b688988816cd56801bc127b41ac56f4a8446bf152b0ffbdc3f64bce879bfa7cc4 SHA512 c80bbb0d6959045c2de0bf3a21b8a869b53a397e2e31b4b273ccd4f16afceb4038c6263a34d8e0934234cea5997949202e58dd7603902b221a140be737924aec
-DIST ksonnet-0.9.2.tar.gz 6552479 BLAKE2B 46aa62fe5c647d87f11b0c35db1e494d7c045d65bd98a0cc81bcb9c5a1890739a6f782dd04735781cb11aff70e4ec6f04ab97ff51b567385fa1e72bd2d835f15 SHA512 fd9c3c966ed27799f5c7e29e031270406e901c16089f354984d5aed62ebc53f1fc3be0f7623c1dff4231e7a5676b3bed879448845e35d6c1db5104ec28669a48
-EBUILD ksonnet-0.10.2.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
-EBUILD ksonnet-0.11.0.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
 EBUILD ksonnet-0.13.1.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
-EBUILD ksonnet-0.8.0.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
-EBUILD ksonnet-0.9.2.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
 MISC metadata.xml 246 BLAKE2B b7d647c23d2215c6d61312a66a7d3521c8c16f69cf801328c67e9017be2809c2d16e29d61f190837c9fabce655dc69a506311a7781f7aa57c320524ed1bcd463 SHA512 bd98d2c774eb61947df8860a6948cda7148264a3bc86b52d317b3d805e2ab17fe81fe94ffc353ecdda86ad56bbfa17a044c9a789a878e15c5cec13c8e6eeeb70
diff --git a/app-admin/ksonnet/ksonnet-0.10.2.ebuild b/app-admin/ksonnet/ksonnet-0.10.2.ebuild
deleted file mode 100644
index 0c4bbcbd400e..000000000000
--- a/app-admin/ksonnet/ksonnet-0.10.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/ksonnet/ksonnet"
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
-		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" emake ks
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin ks
-	dodoc README.md
-	popd || die
-}
diff --git a/app-admin/ksonnet/ksonnet-0.11.0.ebuild b/app-admin/ksonnet/ksonnet-0.11.0.ebuild
deleted file mode 100644
index 0c4bbcbd400e..000000000000
--- a/app-admin/ksonnet/ksonnet-0.11.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/ksonnet/ksonnet"
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
-		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" emake ks
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin ks
-	dodoc README.md
-	popd || die
-}
diff --git a/app-admin/ksonnet/ksonnet-0.8.0.ebuild b/app-admin/ksonnet/ksonnet-0.8.0.ebuild
deleted file mode 100644
index 0c4bbcbd400e..000000000000
--- a/app-admin/ksonnet/ksonnet-0.8.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/ksonnet/ksonnet"
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
-		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" emake ks
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin ks
-	dodoc README.md
-	popd || die
-}
diff --git a/app-admin/ksonnet/ksonnet-0.9.2.ebuild b/app-admin/ksonnet/ksonnet-0.9.2.ebuild
deleted file mode 100644
index 0c4bbcbd400e..000000000000
--- a/app-admin/ksonnet/ksonnet-0.9.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/ksonnet/ksonnet"
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
-		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" emake ks
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin ks
-	dodoc README.md
-	popd || die
-}
diff --git a/app-admin/kubectx/Manifest b/app-admin/kubectx/Manifest
index 0bd058302d91..85e61f24105d 100644
--- a/app-admin/kubectx/Manifest
+++ b/app-admin/kubectx/Manifest
@@ -1,7 +1,3 @@
-DIST kubectx-0.5.0.tar.gz 398389 BLAKE2B 6eb5a91667e62e029bc9810e4e5833acdb99a73201713f9eb3fcee991001546fbcb7a381e3b1a568952b1a224975a238c41f65382cf384ea266f3dad55a79949 SHA512 0a587a0260960dfc69c3a30c3e73d2b2ac83937ef8a05df345445f1dc64adc725d42f7652ec2c65a02becdc40a7de3e49b402d7991f8dc970ee60b913b3ae5df
-DIST kubectx-0.6.1.tar.gz 481134 BLAKE2B 2e7476dfb4fe0296abfbfd939af53438692a4efb7f899b659aa8578f2b4610c0cc87ad0eaa142276b32b5441febde211232ed39f2306af5fd232fea8a5cc688d SHA512 cb4616777a090625cba892b8f73c06a8c5e182d1373c636576a8ae6937bb9817c2546ae1ee3f56a9473f0b04a93965a1a857fdd2ba10451ea0e0509c9f765a79
 DIST kubectx-0.6.3.tar.gz 483452 BLAKE2B 9f74a5df0c30e8414bfba0c2934ed0601dab249a78e8083179fc129dfe288b596f8f0932c3daf84b89ebb740a9c6694189f596c7a944bb6a584495a999d08192 SHA512 63054b51e3d2f52e895aa5b15162f67c81970c0d27e974f60f7f6641156d04cc4b590894e7eedcba3925f344009e65d04189c046f67d1edaf7f092ffe8d5dba1
-EBUILD kubectx-0.5.0.ebuild 695 BLAKE2B 7d577b4d94e9deb6ce514fc3997052526670ce9c4d9df60d90136388b04f80c360957ed46d3ca83093d73fe6ab696433d099ad853e3299ad897cd4d7460d2419 SHA512 ac6b600bbdb46ddb0bb2d4d4fffe25bd41217d231ccef053169bac0e5f5e8b0ff0ec85fa67bc73996c590845b6768dddea4cbc2b3afa53077a93a5f341597a40
-EBUILD kubectx-0.6.1.ebuild 695 BLAKE2B 7d577b4d94e9deb6ce514fc3997052526670ce9c4d9df60d90136388b04f80c360957ed46d3ca83093d73fe6ab696433d099ad853e3299ad897cd4d7460d2419 SHA512 ac6b600bbdb46ddb0bb2d4d4fffe25bd41217d231ccef053169bac0e5f5e8b0ff0ec85fa67bc73996c590845b6768dddea4cbc2b3afa53077a93a5f341597a40
 EBUILD kubectx-0.6.3.ebuild 692 BLAKE2B 12a53742c7e79321ea3a3e2f534ba525e65d8d3968494908eae813933aa4de9f07310f2c151301eed696e15da27d6c1f1b444a5dc191ec479c0aeac0c3870915 SHA512 d672947603b0f6c3d2783082b25a3c5ae595d471251df46e8b6ed533c371211c781bc0b6330f14b7659bf88f285207cf74131e879823a600af9708a2576a6a40
 MISC metadata.xml 247 BLAKE2B cc3ffec52f77e1ce57763359a7fc71a3225e3a2cda5cb797e98661c354fb9ee896033b1aa38c3a22c3587467da2833a801b710c8f43b3dffb2e9de327c48ab45 SHA512 a47289a415c6b8ee6759241cbaf42a851208f940432451a4b893f336d2c980aab922f8bb37de656465758532321dcbdfb372d1ee85739da46ec83ab89fa3f046
diff --git a/app-admin/kubectx/kubectx-0.5.0.ebuild b/app-admin/kubectx/kubectx-0.5.0.ebuild
deleted file mode 100644
index bcdb869a0ef6..000000000000
--- a/app-admin/kubectx/kubectx-0.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot bash-completion-r1
-
-DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
-HOMEPAGE="https://github.com/ahmetb/kubectx"
-SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-cluster/kubectl"
-
-src_install() {
-	dobin kubectx kubens
-
-	insinto /usr/share/zsh/site-functions
-	newins completion/kubectx.zsh _kubectx
-	newins completion/kubens.zsh _kubens
-
-	newbashcomp completion/kubectx.bash kubectx
-	newbashcomp completion/kubens.bash kubens
-}
diff --git a/app-admin/kubectx/kubectx-0.6.1.ebuild b/app-admin/kubectx/kubectx-0.6.1.ebuild
deleted file mode 100644
index bcdb869a0ef6..000000000000
--- a/app-admin/kubectx/kubectx-0.6.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot bash-completion-r1
-
-DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
-HOMEPAGE="https://github.com/ahmetb/kubectx"
-SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-cluster/kubectl"
-
-src_install() {
-	dobin kubectx kubens
-
-	insinto /usr/share/zsh/site-functions
-	newins completion/kubectx.zsh _kubectx
-	newins completion/kubens.zsh _kubens
-
-	newbashcomp completion/kubectx.bash kubectx
-	newbashcomp completion/kubens.bash kubens
-}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 654df8777c6a..05c03abf361a 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -38,6 +38,6 @@ EBUILD syslog-ng-3.17.2.ebuild 4920 BLAKE2B 2ee995d29e470961d08a0ed8dfeba52eb3a0
 EBUILD syslog-ng-3.18.1.ebuild 4897 BLAKE2B e6159007fb47bbe44110bfdda23250761901deb7a071430bd7a37df197375d5f079f8d038b064961eb07cfb6e6bbd044e5bc96c94809af2078652418b07f6da7 SHA512 c1b00c4cc864f145097533d0a6708e1daf3d840c1aea660c149e970fff099b0d3fc83eb5cc4b480c37e5a0325c97a3cca14d1a869f3a14a3eb2055f9127b9421
 EBUILD syslog-ng-3.19.1.ebuild 4920 BLAKE2B ad9cb81bc112bdbb4ae9cf36e53cd11eaa7380e180d2f44f025f46291a8c41c11071ad275d77a063e03ce0472c88c2341d3400a312988ebecbbfa173ad6b76bd SHA512 c937db23ab18b175b5f622a95701531ee43d42b9ca480778608e05fa57bf91635a8517b4f1b86a967d93815b7d77e7f45bb800a6cdb04db9e734a1cf3b0700c2
 EBUILD syslog-ng-3.20.1.ebuild 4951 BLAKE2B 45ad3ab6ebacbc0b0d2da1ce090d53e1ffc97d2c18648bf6763e6b7e4c0c9f8fa7bf6e746f85553aeeee144e3bf8997d6e0534357ee900fa26408b94ff815a7e SHA512 1164b8784d1061af518017698e71ce7ff48ecbc1a964eba9babe8436af141a2be119a9bd3553d1d3b90026df27f051c3a70dff23a1c7614752627f8583d1b028
-EBUILD syslog-ng-3.22.1.ebuild 4951 BLAKE2B 246f528243cadb3b07b48450df8b24f56edc73f481c0ed5fae0f2853c698f8e2690371e783d536a6279b7da2a5eecafd7332482493218c604622d892036b719c SHA512 fc497f0dd6e92f67d6d015e89ca6722dcb862ad40725abc3e1595e29af58432bf34ab606545219fb2eddb161acb0c649cc2de13f11d5c8f18dda159e3b094326
+EBUILD syslog-ng-3.22.1.ebuild 4950 BLAKE2B 8f357d97832fa2b34281ca0db58afbd648d33d9cb9de955edfe6f22fa442bd0a1a9661ea398ed2d7d964de416d73d338ca8237d881348f9e5a6438454a11c504 SHA512 8c91d2a427f451eb6fead571a9101615faf2f8aa29c0938fe491662ddda4e073efd2efb029fb1b56abb56985e2defb2e56b9ef16c46f77a38c06197668c90890
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
index 585f6092c7df..8be775f7d03c 100644
--- a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index a5c4e40e4459..a112d2a00cb1 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -5,9 +5,9 @@ DIST sysstat-12.0.5.tar.gz 711967 BLAKE2B 96aa49d82e71407dbd99d840ca5f71af83f54b
 DIST sysstat-12.0.6.tar.gz 712148 BLAKE2B 1118ce071e06c2853ffdec2be1b8b3bf060571caf988e17e04ff62cbf43e7111c5951a131d176b49ad35e1da75d2b8936e23f1a385e1c83a013b802a0fc36003 SHA512 e8f542b26c2b0b7b3aadbf34dce640879d27f8f1659447f15ffb5a210987c74840418046409403da85a9eb4c01484615d230ddc700611b7c0088d72165bffe86
 DIST sysstat-12.1.5.tar.gz 1032031 BLAKE2B 9fbc0c0d132983daa334345f1f83ac8a46092cf52f35bafd443febd8ce40e4ab11b5b9b05b92e4074ecf9feab682035b2e08094ce10f3287036821be57db0800 SHA512 9dbc44b0226efc2f219ff71d2f0b83c930263fe8d6d0b451ae8404b3056558de04c76c16f2e8ba62083cde3a37cabbcd466d9247bd61ba5921dbc2ab6a1f686b
 DIST sysstat-12.1.6.tar.gz 1089333 BLAKE2B 3a3c3867b6b78ca1da7d5ef5838f5aad490e6d454aff3e8db266136ce7666112bcd1ad05b727c2455c16e53f6c84e0e75e32e8f4cc9318300aa9076921f68c1c SHA512 9c03e911fd6843b1719e080fce429e0d33f73f01619251f425dd4bbcc9d2764cd9beb8f8ebb4406b9540634d36c83303c10abcf682b079d35045454b1541984d
-EBUILD sysstat-12.0.5.ebuild 1693 BLAKE2B 13fe90d234884fe0e164ac2e2e69643383b6e2dd6048d8886f2871d5fd5e77dd81bd4e9a2b83f0e2e2a604d71cbbf1cc44eb1f320ef7c4d7114da1b3359999f0 SHA512 b072840085d01d79dff0b65988f54425dc900f7c2d98c9e3ed20fc91ab3e886fc117ae6d0d3327d2fa3ec40c46ff1dd25bd6f9a9005e52c4b845dc1429d10d15
-EBUILD sysstat-12.0.6.ebuild 1694 BLAKE2B f17e881c4322bd2ac87ce15d19f3dab84dec949c7c5c6fb25d1760546a116ff7191dc6904f86fcb835fd92b08edac261ed8888eb37fb7519f6ba9f161dd6af44 SHA512 09e75c118e1557209e51191efa50af6269b50416d0f387d518a5a3916f3e0d1d522049dcd631ebcdc39a72861209b48e4715989d0b764bae9c9a630bcdc649ec
-EBUILD sysstat-12.1.5.ebuild 1708 BLAKE2B 3ba833b6ff81e4a5599367e15bac6370ef91069ee909a05c22b339faee931c8f6b84cef9795585b3b1f94f09bbf7f99624047fbcb814ba3581176d4db48ba0d0 SHA512 960934a753749b6a82368da345402c434810e1e8eb98575ef3363b95f9f99a918e70b1882fda51bb9bc349dbffcdf53e55553318c85eec97484a62bc03dcbf93
-EBUILD sysstat-12.1.6.ebuild 1701 BLAKE2B 8158defd39b0bee0414fbf72509c687cac2138f06d5db309b0d4b52d729a66bff4f9f59048150eb69dd93377aaef9deb78d263a87e0d7a9eeea1c882d8ca98c5 SHA512 8b63f4400cbfd2ff99a9e73aa377a5fe01a5fd9e730839e4b1b2bc469d5400e772bc27e89dbb3387c25e23c665f6a8f7441e87df27433b6764b490646fdce7be
-EBUILD sysstat-999999.ebuild 1597 BLAKE2B f7f0260cfa097d792c587b41148bc300c1ee20e0b2b91f3307e0bbae32f8eed00d2a3e925967b754d3e7f5492d56b604a7fe417d633252a573acd4c8244b720d SHA512 be8c3366fcb833b47dc82076616b6ea95e87592bb62377d0c07268ca0fe8651130eb843374c965f519bc1eddf3fe2a97c119c2a29c2de9e9e6384d3fc5765ba7
+EBUILD sysstat-12.0.5.ebuild 1693 BLAKE2B a70bf736b6ab9884abcea8a31b01494b4880fa6c3cbf2911f00660e704ad6ede2059debe19c858f58106543651bae91ad6c9d339a45f109cb126e371b848d2ed SHA512 7b94c3b44265af2e49d79b2738343f60dec9b31f315be518507e0245995840b3a84d5ca5ee3cfbe286c4c22815adbb6b1a8ece9f3452ef8e3f201e8f3a28e330
+EBUILD sysstat-12.0.6.ebuild 1694 BLAKE2B 0a56fa763a3ad76df9b73f857da77153b6ee3af3d0b92a02c79bddae3c462b9d66a7a41a5fc6a7e32f32d949e06fd83878663dc7de7d2157d7ecb30d0ca99bea SHA512 8a3e2accfbcc3fd818d0ffd77d8a0ca53d302aa96d1320504244730a5b2c95628551c7cbfa08e291ada1071ed6b029c16f657e3a2a0505636f032f6f2b1f5478
+EBUILD sysstat-12.1.5.ebuild 1708 BLAKE2B 19bba927cc5d2f9227eefe2e647eba6fc47617b80b5c8e1967d05c6c181af69a80dfd33d4d47f6f54e55a671a53723d3c4ccde21780546dc14147c978dd94f3e SHA512 c2ec3fc831b52727d7c46e8675f266dd7309756748765a0cf1bb8a2e4cb5397fd008a98f2e016c1aae430c34bcf810dd70bc24f5ad59f1a5b320ca3af715eb5f
+EBUILD sysstat-12.1.6.ebuild 1701 BLAKE2B 195658f4a166da3df50865bc7a4f4883a1ba8ffeebad23f9e0c1d76503948d66bf95857590d5296072a34876920ad8c57d34f1ede20f6bac287881eca46d4954 SHA512 71c2a6d7269c1e7a472689f9f09e0def12b167b06f1c1ea3fb1ef79aa51e6ce0af05c3a97ab5365ae16f6cb81c4ee43f388f593d53e0c97fb8d0cddc3078b06e
+EBUILD sysstat-999999.ebuild 1597 BLAKE2B 3b18ae2364877c157a2a3c26bd36a270ad27c2a886ab9f0ecbf63ebc6ca1bd4b874606657d27f65f592a12c22fefab192ec691fa1d9a7b7354fa940f6e538226 SHA512 3d7bc304bf0d618e56a7552b4e88207c6e884be5464ad239e171a268d6fe5aa79c2f7929db0835c57e95f829b8eb9eae500e5187aad85316220a996c6be583dc
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/app-admin/sysstat/sysstat-12.0.5.ebuild b/app-admin/sysstat/sysstat-12.0.5.ebuild
index d28c04c0297c..bad60fba75ea 100644
--- a/app-admin/sysstat/sysstat-12.0.5.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.5.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 "
 DEPEND="
 	${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
 		conf_dir=/etc \
 		econf \
 			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
+			$(use_enable lm-sensors sensors) \
 			$(use_enable nls) \
 			--enable-copy-only \
 			--enable-documentation \
diff --git a/app-admin/sysstat/sysstat-12.0.6.ebuild b/app-admin/sysstat/sysstat-12.0.6.ebuild
index db640d7d5f9e..a0e5561580a3 100644
--- a/app-admin/sysstat/sysstat-12.0.6.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.6.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 "
 DEPEND="
 	${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
 		conf_dir=/etc \
 		econf \
 			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
+			$(use_enable lm-sensors sensors) \
 			$(use_enable nls) \
 			--enable-copy-only \
 			--enable-documentation \
diff --git a/app-admin/sysstat/sysstat-12.1.5.ebuild b/app-admin/sysstat/sysstat-12.1.5.ebuild
index 88dd13ade1dd..2938a1a2fe44 100644
--- a/app-admin/sysstat/sysstat-12.1.5.ebuild
+++ b/app-admin/sysstat/sysstat-12.1.5.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 "
 DEPEND="
 	${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
 		conf_dir=/etc \
 		econf \
 			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
+			$(use_enable lm-sensors sensors) \
 			$(use_enable nls) \
 			--enable-copy-only \
 			--enable-documentation \
diff --git a/app-admin/sysstat/sysstat-12.1.6.ebuild b/app-admin/sysstat/sysstat-12.1.6.ebuild
index fd3a1dd527e7..79183431381f 100644
--- a/app-admin/sysstat/sysstat-12.1.6.ebuild
+++ b/app-admin/sysstat/sysstat-12.1.6.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 "
 DEPEND="
 	${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
 		conf_dir=/etc \
 		econf \
 			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
+			$(use_enable lm-sensors sensors) \
 			$(use_enable nls) \
 			--enable-copy-only \
 			--enable-documentation \
diff --git a/app-admin/sysstat/sysstat-999999.ebuild b/app-admin/sysstat/sysstat-999999.ebuild
index 62f6cc193b2b..fcefb54fdf3c 100644
--- a/app-admin/sysstat/sysstat-999999.ebuild
+++ b/app-admin/sysstat/sysstat-999999.ebuild
@@ -11,11 +11,11 @@ EGIT_REPO_URI="https://github.com/sysstat/sysstat"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 "
 DEPEND="
 	${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
 		conf_dir=/etc \
 		econf \
 			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
+			$(use_enable lm-sensors sensors) \
 			$(use_enable nls) \
 			--enable-copy-only \
 			--enable-documentation \
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 0e01fb776768..a73b94397e0f 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,5 +1,5 @@
 DIST testdisk-6837474129968d7de13d91e5454bd824c9136e73.tar.gz 637265 BLAKE2B 7d7a2c875db9d34ad5be687ef0ccc8122759c645b30faf6eed7967747e69ac988078ab6c1909007c32c6bf5a879a5bfd00dff3d2d268e5b50e3b60a8b660c636 SHA512 b494e23ccd8f913a9b22f4b803b02af66e94f6971f45e6aea8a0e1dd8549996e7bdd3fafcf70078ebc242f262d064cdc5674d99cb7a367b810c45c0b1c40336d
 DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5
-EBUILD testdisk-7.1.ebuild 2333 BLAKE2B fbfe0ee753b893c872f3a04b8557b0e7a648bcbb769d3d2a5963fe760101b2a6ebafecc618fdfdcb0be13f8441d969d4439025c102306c3179372b4185053442 SHA512 aa0210fcc2150c2d7d096b1b78d7152bc245f9c6af0b7f97f6935469b9f39daf74fd3093654fe346a4cdcfb6b46ec5363cf61e56b3f92be8fd7184258dffaa44
+EBUILD testdisk-7.1.ebuild 2331 BLAKE2B ef6479f36a829488f5238199d556517e3c667323d64753752fb55e2b4906d770ca564ebe9c1a8fb4d4174c6e3dfa7fa9a2172200f5d0317b0f7c59edc3771979 SHA512 b8d75536122cfd62ec5ad82ecc2bba9fc84fd665ee16d4869cb8fc37411d73e19b6cac5f3311dc403885ad9b7651ceb30e1a1c70415822d0ecf1541a3dc24ed3
 EBUILD testdisk-7.1_pre20180922.ebuild 2517 BLAKE2B 2335b1e92f1b9d90e0d3e0f4e0a4088fbd4e60b1a39c6eea0cb248a8f2c51e4b083a36404904ef24357002d2dafff914ee3014e1388db0154492f7be7ed9df85 SHA512 9b9f99e977056372bb89d49e35b44f06edbc6f18edff5e555b99cbc91183422ec965e8e0f396d4e03387c15c719a74c1774b8ef3a8ff2543664ed02349b92601
 MISC metadata.xml 555 BLAKE2B 4b56bad0ebd1af77d90c4fa650adba5ae59d06940dff5aa346cb0e9dc9ebfad5324f774cb1afa646e15731b41cb09d7020ee3b6a5a0d941452099b6b7884da75 SHA512 3c47ad35d151d92e4be40cd91c7f0ced271f7b61a00280f536cc70a700d25ae36426593fcb8aec76e9cf1c24ae76dc8290b00bbcb73fa4d95182210fa680562e
diff --git a/app-admin/testdisk/testdisk-7.1.ebuild b/app-admin/testdisk/testdisk-7.1.ebuild
index cbd57b54dca9..c76b3239eb3f 100644
--- a/app-admin/testdisk/testdisk-7.1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
 
 REQUIRED_USE="static? ( !qt5 )"
diff --git a/app-admin/yadm/Manifest b/app-admin/yadm/Manifest
index 13d27bfcde22..e6ce0c2b1eb8 100644
--- a/app-admin/yadm/Manifest
+++ b/app-admin/yadm/Manifest
@@ -1,5 +1,3 @@
-DIST yadm-1.07.tar.gz 34240 BLAKE2B 11952a693c38aac2f2e7fa3efd469dc640941ef9c75a8a1e70974b4eea37c506df7480b2fce84ca8482c932295923ece4ff52cfc13bf9b52030dab0500f07c86 SHA512 9bbe33c82a137375cb27916ae5b5a06f06c25a75ae05688be473103c29154309d3472accc0aa0670a80a4714bc6523ab85c41fd6aa8d1909586437c5778b9144
 DIST yadm-1.12.0.tar.gz 47340 BLAKE2B ef710f56c96244c082bfcc887cae4aee00aaaadec5e7466500dde263c5e4f43df046e11742fd275e989bd9704b39a123f17248cd70d64f6ca552b28db6c44814 SHA512 402a67770154ce3ae7ab947ff4d4e26ca5040d343110fb749195ca5c3f4ee435aba1d8cdf02d4ecf4a81d3f331c1b891bed4fb3fcfcc893867e0fce45b9c8cd8
-EBUILD yadm-1.07.ebuild 895 BLAKE2B 30f232a9b56113aeb38d9b500fc4964e21d705095a3e74214159854a4b2613635a29cbc0ffed322a627805de7b6d25b41b4749e4a5fb38a652a919b9410a5b56 SHA512 7313f9adeb78b32db14351ddead4d8c13cc81c49ec3cc7ea9d78ed4318bee9704d99890a9fc403679069e830583acbe8e37d32bcf91cf4fc25839f9715a239fa
 EBUILD yadm-1.12.0.ebuild 1234 BLAKE2B 73b60da066947ed5ff45950e5809695be1b234e01005103eee4076efcab65fc3acb193716590974caca0a5c209dc13fff77ef85f778c5aa2f8c65d1c67e9ffbe SHA512 9321ffa59728389909b187a1da4cf230467ab180f9ecc24e3137dfc1909329ab68e40066c622ad1c411ff5ed3dfdce9c6b2c1f69ec77f248d7e2361e38f99218
 MISC metadata.xml 825 BLAKE2B 6fbf4554179cf6141396b8e21be3dada54c0eec7c5c5bd1e18860b73f1d170044006b92010f7dd5d3c2238f8545024ee43dc2c86305e8bc91871acdd497c8749 SHA512 0c8facf902245118eab0d6c4b48eb5a2fb63aa6cb7fe4581cc0353bd164912b7620eb2f42984b45410065d3a6e1af1cffa5028f5c26a4ecd38a9983da6b34feb
diff --git a/app-admin/yadm/yadm-1.07.ebuild b/app-admin/yadm/yadm-1.07.ebuild
deleted file mode 100644
index 7c5907088202..000000000000
--- a/app-admin/yadm/yadm-1.07.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A dotfile manager for the config files in your home folder"
-HOMEPAGE="https://github.com/TheLocehiliosan/yadm/"
-SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DOCS=( CHANGES CONTRIBUTORS README.md )
-
-DEPEND="
-	test? (
-		dev-tcltk/expect
-		dev-util/bats
-		dev-vcs/git
-	)"
-RDEPEND="
-	app-crypt/gnupg
-	dev-vcs/git"
-
-src_compile() {
-	emake yadm.md
-}
-
-src_test() {
-	# 109_accept_encryption tests are interactive, thus fail. Skip them
-	while IFS="" read -d $'\0' -r f ; do
-		bats "${f}" || die "Test ${f} failed"
-	done < <(find test -name '*.bats' -and -not -name '109_accept_encryption.bats' -print0)
-}
-
-src_install() {
-	einstalldocs
-
-	dobin "${PN}"
-	doman "${PN}.1"
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 978ff28ba4fc..099c63bc9054 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/atool/Manifest b/app-arch/atool/Manifest
index 44b7157e16a9..8c7f7a55e4c9 100644
--- a/app-arch/atool/Manifest
+++ b/app-arch/atool/Manifest
@@ -1,4 +1,4 @@
 DIST atool-0.39.0.tar.gz 119307 BLAKE2B 770da3764a75d29472ce052c568ff534b88a394ef022c91678693e2eeaad1613343dcbda907346e2ac83eb4e6c164bc8e7a07b3edbad919e7cacb3846221eb90 SHA512 2011c13f510a140e71d26f9eac60d07f2cb9004dc278303fd37c5c7f78a6a2366ad9193e7b4e015d9fba8218c59205a6339189ae4775b0afc42328f9607524d3
-EBUILD atool-0.39.0-r1.ebuild 399 BLAKE2B 0d2ea8448a5661b5efe0b232c353c3d85af4ef5a8f86fedfcd31db67a0cb33cea561f169110b908e09822c300c7124af4635dcac60a0f491286862d8466595f1 SHA512 40732c25ceab10f627bb549f06fc8f88a402004c29b385a61b4790a22f4a94c018ea4f9197cbd6f4370f66c6874fe093ef3cc864498bc48ecfba23df33c8d24c
+EBUILD atool-0.39.0-r1.ebuild 397 BLAKE2B 2f135263b9377ca21f8405695607667edcc7973155bf7417a1a389590b6e0259d40b3e664ece0fb3329cd83b06183bef09e0e0a6cc4eb4cfb99aa037b09865ff SHA512 4fedacf094bd90bb79cc0731eac449867fa6c59a8fdf6e7f42d15937a508136b1d1411f9a2508087fb9955f586616d4cb79a4c4ecd7c146639c55e07e294bf91
 EBUILD atool-0.39.0.ebuild 409 BLAKE2B e6d40c0322d1e7819fcbf9a4f0873306a97d07edbd6f00bbfb3b0fd107ffdda62d5fcf23069e73b93da7508dbd9db9ffa416aa40060bf13749fba7de79fa022c SHA512 ecf7cc68e9c5f3946b7e456c3223827f50a65c4ce4782e06bab6e0a8f28c9ad3bb88aeca4d1c2aecb8cf1fd2afe749f1991a45605172f501e71b24fea59917e3
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/app-arch/atool/atool-0.39.0-r1.ebuild b/app-arch/atool/atool-0.39.0-r1.ebuild
index 729fa245614b..4ab3fb6b4aec 100644
--- a/app-arch/atool/atool-0.39.0-r1.ebuild
+++ b/app-arch/atool/atool-0.39.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index d0138629e40d..d78870ebeadb 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -2,4 +2,4 @@ AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa897
 AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03
 DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
 EBUILD cpio-2.12-r1.ebuild 859 BLAKE2B 837ebfa3106778479403b8e5786a09405d2c680ac3b6d54c54f6f509246bcd037772088b0b8ac664697381044a7bb295812ee0af26a585ae843969918ac1c9b4 SHA512 47f6af66d7ca6a35e00783cf2ec80adbee6084e23faf7934ffee9ce2d2c9cd37541c6b76bdb88493c2c09759730d5553ffc80ed52cfbeedf9e9f4477cdebe886
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+MISC metadata.xml 327 BLAKE2B 5f895635aeb7efdcc8e9999d6892fb8dd6668d204fbedf5492cf086a3ada6d9b1c71ffb2344de642b279de34d7ef459371d0eff173ed70cc404f6ef50d81987e SHA512 9aed569e7f3412d9891326d8d0bdbd48fd46dcbcb3d045ddbe7971e2d9e315e2d71ee9c5adebaa12425cfadf03de00ba5c70a16a4227634b9cf40e534d96fb05
diff --git a/app-arch/cpio/metadata.xml b/app-arch/cpio/metadata.xml
index 56c124413057..867891812d33 100644
--- a/app-arch/cpio/metadata.xml
+++ b/app-arch/cpio/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:cpio</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-arch/deb2targz/Manifest b/app-arch/deb2targz/Manifest
index b337bb4b55f2..ec8a04124ba5 100644
--- a/app-arch/deb2targz/Manifest
+++ b/app-arch/deb2targz/Manifest
@@ -1,5 +1,5 @@
 AUX deb2targz-any-data.patch 602 BLAKE2B ee85b284a594cc937e73ea66c24960fdbecf547742c1db010d90e10af72aa667c267fb13f858ca221d80c16af26c09fcaa9812567f0f5b7e9b015d5a44d3cb66 SHA512 0dfc301d17b171e52867e0837701596b60c697cc7a0520f0c003be8146d1d1470305186d443c1f7a4757938b06b2261cfb66f84f5a5776998681b9300bc20903
 DIST deb2targz 1947 BLAKE2B bfbe08a5671bda8da3a5d897f58aca863988a9ec7b7cf23ee81fb45e2bf85bd8b0909457bdc2cb545d42ccb5f56fda5559bd40547231c1c52441bf0b3560173b SHA512 9b6a533fbe232721304f3bc1d9ea952f78fb108ace3bd0a0eab206be8462bc547ff49ab9310f209079b9ed6f86413c8f0819a117b95c67b6082e37d416716b1c
 EBUILD deb2targz-1-r2.ebuild 646 BLAKE2B 4bbad5f015e86c02b923ae39fbbe51eb6c04c95b5977dae1de48faffcb698c611401cfebad4d06b13aec7ea8acb365254fa26267be0c60e6a103634d17797d0b SHA512 496a8acfabeff21f0f0e14dba5242d23f1cd1820c7b0bc2ebb2cce8ac5ab12582a9d1dfd75966f2ca915303064ff06962e4b48da89bc2b7ff4101fca0e2dee2b
-EBUILD deb2targz-1-r3.ebuild 627 BLAKE2B 30959fe781b1fc840e9da72668b9008d9dd3a550a6b4384dba7dbb995a55f905d099eb4da05011e54d52dd162b1dbd9b892b7f484dafda783affbc83d74abc47 SHA512 1fa3de53fa5c09d09b80b20ace9859489f2880b8e714a643bafa4718fce217fcb2d631c95fc38a561d65ed32b56f16f26f4e7cdef279034e84b3f2155402b616
+EBUILD deb2targz-1-r3.ebuild 622 BLAKE2B b8895a8f8be466158c1ed6a020683450aa3d63ce5a2911ff7374628aafe296b2a1ab478d866c80aa48e34465d729fa91dd2ae4e2e94cdcae60cfe8aae5c85b46 SHA512 69033d90ebb736dde8b5ad992c79107c1b5c72a40904a32aa82d6ef3a194b9a1c8c96a12efa7bbac22ac46568a01266f0811ee4737cb2536109b5456ca0e2bb4
 MISC metadata.xml 213 BLAKE2B a6b42a8b7c6f0c5a0b853af172e748301d2f4b9f2aa0424e217029affb54c88b1061dd970241a942e59a2a5ec66521ab9b67818181c03bd1dd019965e39eab3d SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380
diff --git a/app-arch/deb2targz/deb2targz-1-r3.ebuild b/app-arch/deb2targz/deb2targz-1-r3.ebuild
index 3a448ce52469..1896a9892dff 100644
--- a/app-arch/deb2targz/deb2targz-1-r3.ebuild
+++ b/app-arch/deb2targz/deb2targz-1-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="dev-lang/perl"
 
diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
index e3d26baa1f8e..cfcc903e6f90 100644
--- a/app-arch/dump/Manifest
+++ b/app-arch/dump/Manifest
@@ -1,5 +1,5 @@
 AUX dump-0.4.46-openssl11.patch 3324 BLAKE2B 5cc60ef04e7f53e96e900bc78e41f4c4bcf46f3000663ac7bb1995856b5cf067c69d84331b5dfd52da4ef2649e61f6e410e59f9a99bff3be44f9e46df1b75b4f SHA512 ae7c2549683a4cf33760685fe5b07ca88b158e81f5e3b866e58f618dced4c5909dec231d07a1df590a5ebbbc9f0eee575e63f4ffae719afe01315d53d63a76b0
 DIST dump-0.4b46.tar.gz 578200 BLAKE2B 91102bdba06f3affdf4ebd9de525145c0a4cc1b9fb4c6ff222c411c118b3b7835f3aad666d530019d8b9ee46590e4a283a143d188d6800218100cecf67877274 SHA512 a30e72ab6c4d18497dffe3d25634c2e55ca90861d1cd8a6c0fd44709e735a217dbf4cdabb8c80e02053def94d9a22cf1d685ee0d0f24f5b748ee5f0de19cf17d
-EBUILD dump-0.4.46-r1.ebuild 2135 BLAKE2B 1505e8f281290cc526c57c1e6f804c29686da9b3ff5e4a663766c65b6934333672c780aff266e92df1dc6b4d9c381fc91ccd4ede4d0dc7fc93106e6443dd81d1 SHA512 445ab2cecffb3c53b4d4294e602160bcaf0d8d61cd782282d6b2a64d7c8cbf8011b5bbf25d974e66eae145a29d054b5865f3a4b2bf1f50a08db0ce6f12ab0d49
+EBUILD dump-0.4.46-r1.ebuild 2130 BLAKE2B 4b14a0e748b2a85ebcb7a0d02b4f191a624b9691e5dc6c3494f44d064388819447b37aeb18ccfd82a0e7a77bbc2a8e2217a9d38aecab574b875d92412ae61e08 SHA512 05feb7fa8948abde6f4c0d5f2df5e08a4b01b57b502f4cab0dc82f34a4f2fd3c82f21f8fa29cd13b6d24d374bd7d37bc11ce59551203173bdca73aa885d68a0b
 EBUILD dump-0.4.46.ebuild 2113 BLAKE2B 431fd8ae0fa1c3b28015f27687c28f43a8d6fcb205c97a99f3d4ee1e96d3da7683456f02e4683b85c202848ddcc9efdaac85b63f31e0a4ad5fbf2d430465a8b5 SHA512 b99325a0d0cee4599e2e00ed40ea4a49050321c7b11d6fc2416dafa7b2dff56896d7861940ed009393e73dd514beb9f2b9c7e4c494664ed9c517987844ffba90
 MISC metadata.xml 542 BLAKE2B beff8763f8b3848f9592dbf200cb547e9c416e7d675b4e9015f20b417861523949916da4a6a38553abf7fdf5fc839841870f74258becb4e8dbbcbca9c564e328 SHA512 670b1e0032f69e22337cbd18c25ecda11a239d63345c32526e111ad2eb23199892aa7e1f39a79168bb4b81b6ebde4c7796f8ccf78233f3244bfbaf62c7e0345d
diff --git a/app-arch/dump/dump-0.4.46-r1.ebuild b/app-arch/dump/dump-0.4.46-r1.ebuild
index 1734d2b375d0..7040189b5061 100644
--- a/app-arch/dump/dump-0.4.46-r1.ebuild
+++ b/app-arch/dump/dump-0.4.46-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 # We keep uuid USE flag default dsiabled for this version. Don't forget
 # to default enable it for later versions as this is the upstream default.
 IUSE="bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib"
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index cb8f4b22d37c..d99b9088f714 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -4,4 +4,4 @@ DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd
 DIST libarchive-3.4.0.tar.gz 6908093 BLAKE2B 6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462 SHA512 2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852
 EBUILD libarchive-3.3.3.ebuild 3625 BLAKE2B 572ade5c05fa4a9951c6ffca4ccf5dfecbaa1a13538ec8f7589823b7dd90f3476722f92afa79d615236811f8838f852c2a68803ac74756022eb9167607de32df SHA512 e87384a803a6a4148517ce235f2be295f6b59c7e8e0bba6a9c0c2b1bc3be90d5eb41d1763efe70a30fce202c77bd3e56b71213135dec26aaf8a5540cc46f1c60
 EBUILD libarchive-3.4.0.ebuild 3691 BLAKE2B f45351446ccf244340cfbce44cc0eacefee6f906b3c35aa6f0c2ded9d7215e70eec6ca1b81f88731ee47da444d8d4683c9b2a55d51438430ca230e89e07683aa SHA512 ef81ab5a6a773e6061729f726a6af5d752693e98b97c07c573d8e4c32fae1c22165d866f46500c2994cbe151f9c828c411b1277d18e5e57eedcd8d4ec06f9602
-MISC metadata.xml 1447 BLAKE2B 342ab0c5aeb3fdae86b39228d4df3c98163b55c1fa23318b2b7a22f714303f1f0615d60d9c057b0a91f90e61e6a7357043096463ca3efe1e8d5cbcd2a5897ce9 SHA512 85b5c67f258ab07b14f15967024bd5d1f11a81bd203e67d40398b42b3728735e28cf2645a0db865c6b6ed81a64da6de470ce62c882d0f72dbceb5361f791b81d
+MISC metadata.xml 1512 BLAKE2B e658ac7af58e3e66dd905eced32a378de6fc82af4f8cad2464b486b9ec307da60caeef4df7d7e8783b00c55c1e9cddb04cd0193973e98c2dbb70eec0c70bae32 SHA512 53f74595b98f09eb31e30a4236cb6b155d013d55286a19f480cbdb006864fbd380d4fe35b48a53a25315ecd835bcb301af3959a66b45b995b0f98fe01d7e78de
diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index 8451f55586c8..69042b3e7224 100644
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@@ -33,6 +33,7 @@
 		</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:libarchive:libarchive</remote-id>
 		<remote-id type="github">libarchive/libarchive</remote-id>
 		<bugs-to>https://github.com/libarchive/libarchive/issues</bugs-to>
 	</upstream>
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 26dc26e93bb0..b4472dd2b397 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -3,6 +3,6 @@ DIST lz4-1.9.1.tar.gz 285336 BLAKE2B 50dfad2e92028a1ccfe186efb5dbe24e4641e104da6
 DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
 EBUILD lz4-1.8.3.ebuild 911 BLAKE2B 674ce798fb551fd4bdc4a0e5b2913f238532439e98c8887a5d3cb64e7bf5a7349e225dc290da191c97f01a2b03a8770409b915513c65d710bbc072de6b4aa8f6 SHA512 982493e85bf02014b490a10e4dc57e25e193e493ef6fcb65f77af84dab9501fef5087bd8d80f3e16f4cffa4cec025e7ecc1829ff163f5a043fd35fa4a55a3487
 EBUILD lz4-1.9.1.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
-EBUILD lz4-1.9.2.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
+EBUILD lz4-1.9.2.ebuild 916 BLAKE2B f1b3ff6bd834a2380bc8a21b01fe8ca9a171a49492c8dde04d53504d34e284b507de057d0e8c358c822441d002e991fc8e7bca84c759a8ec86dfa47a31fdd1d8 SHA512 2d90ac62435dac894de0f36e4f2c130e8cac94e0ce50a9892ae61222742de473ccc6a6d75bfca64245aae3e04c454552f99ef74512890fb23e3ac5fcac0dab3a
 EBUILD lz4-9999.ebuild 924 BLAKE2B 07b61eb5aed95e530b0ee84711a503f57b448c5b0699bee2b8986c8f25162aca1726a8dc0eb6b0d4f8213d5303e44294991d49fc6eaeb3904f1a960426fcd9a4 SHA512 d633e839c63dda8779606f9ccced3a27239562a0e32eef99b69fa93115be6e7e1041d2bd2cf3a7e1b853923b32c5fea0476c842ee39ad752c0285eacf92936d8
 MISC metadata.xml 537 BLAKE2B fe6b4b4291dd1358a873cf34cd4f62fc6b08ac0db2449c7bb2840a715f13c68521140b244f66f00e8881ed53b4d66e988d71baf75bc6b5c79dbbabc2d12f6615 SHA512 4fc89afbcd032d88e43f346105f02da50e946c706f60aa7991c64e768941409e335005c6a4f283c0dd4d2ddc8faba53e4968334763e9c8c46538bc5810fe9699
diff --git a/app-arch/lz4/lz4-1.9.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild
index f68caa90b673..1e087c8c3508 100644
--- a/app-arch/lz4/lz4-1.9.2.ebuild
+++ b/app-arch/lz4/lz4-1.9.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH=dev
 else
 	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-arch/pigz/Manifest b/app-arch/pigz/Manifest
index 1b48b278e9c0..addd1acdfa73 100644
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@@ -1,3 +1,3 @@
 DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
 EBUILD pigz-2.4.ebuild 959 BLAKE2B 0920a8eb84c9b2e51da97df8f4f5bcdbce4a6e4ffe7ed097586a2af9585e32690528e4b41c0bb275457cd07b4cac45495126081c2f82812f006c11b4f16ec3bb SHA512 a92e6ad4ae204480b6fc9bdcab8fae4912557108fc830f0aff9715d46986444dd7644357f39eba5bf9ec58083ce9b567d83e5c81b84179986040e250c76e9e75
-MISC metadata.xml 499 BLAKE2B a3f4937154e9907d34d3779407b1bfc07e8de329cb34b0efe4b62f20b4c9f5b9eb09d22023496e4f5228f1cb64bb4829c30730fe6035128b14e759073ec83a82 SHA512 7c954984f01ee2bf1bb9b8f0840445fed7f47899188a884462c59a862bef568845c2cb81a966aa6d46222d45ab7a9fabfc24b1bb4d178f9f8fb1789554ca87fe
+MISC metadata.xml 577 BLAKE2B 00e7995f3a4724227abc66b81ff56b83dd41b3ed173e80267b6d739f7db140f19b31c81420177e430ded0f9f38cf8c7cc527bf092d438ce5cb3ab867da1b6695 SHA512 5f825b9a9b0570d7687f2296e36f8dae325755e2d5895701cf621f2c01ec8db892932811f4b151231dab547380d96d234f715537a911887ce9bf144b7cf54532
diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml
index 478203e0a5c1..09caf7efa571 100644
--- a/app-arch/pigz/metadata.xml
+++ b/app-arch/pigz/metadata.xml
@@ -12,4 +12,7 @@
 	<use>
 		<flag name="symlink">Install symlinks which override <pkg>app-arch/gzip</pkg> implementation</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:zlib:pigz</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index ea59933ad627..cc9cc146fcbb 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -6,4 +6,4 @@ DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359d
 DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
 EBUILD unzip-6.0_p21-r2.ebuild 2593 BLAKE2B f626ff277131a9d5cc952bdfcbef19677acf487435835c0f50a438e74db7c3f8e795d0f95a51f51c14e7517ee90cd5906cf7e3c94206d46796c010d6ffd074ab SHA512 934edfb2983a9e423bd6c48d9bd7d71531c50a3578c8311b2310a126b21012986fe0a2726e40890c841fff13f5d75c56f6bfc48823f495cd227377d0b3bc4268
 EBUILD unzip-6.0_p25.ebuild 2606 BLAKE2B 19fc6e70ec6ea38deff1c0433b7d7367535967919d6b5e9efa15ba1d291d3e4a1203efc41afedac544187193aa2eb4058fd0f46a80106b78d1b38361b1036a6f SHA512 1497ff9cad0d17caaca2045e1adf075ad3bda34985cb73da9bae84f2941b746eeeee9195c26591dccbbbfc67463b09adc0a0998c8105b5a9acae46cded5c8729
-MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
+MISC metadata.xml 534 BLAKE2B a6baad9ace7880a38dea2a34ea8cebb730e8a0742bd4447ebc9147a713eff82aed50e97dfeaed5589a7025c2ba7d9a244d101508f21f69a3dfd79c0ed61c214e SHA512 b4735d77d58b041bb5259d362f493247cdd9217423d79eab06567a5d7f1ebdfae0f80085ab3c3a842e68c6f5a6122913cb13c210d6e7fbfe398ff5ade29b97d5
diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml
index 564fd76677c8..ed43f8ee64f6 100644
--- a/app-arch/unzip/metadata.xml
+++ b/app-arch/unzip/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:info-zip:unzip</remote-id>
 		<remote-id type="sourceforge">infozip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index f579a98f51d7..b866b09d1c65 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -4,5 +4,5 @@ AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2
 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 EBUILD xar-1.8-r1.ebuild 1205 BLAKE2B 296674ef4169aa92ff3eb40203ddce1463fa495196e9ddd1048fa2f5859acbb8ee724a50ebcc398668a723b15dfe1af8aa27199019502d4023d17205c9c3c78b SHA512 68c48ec7b162b4cbd3ac1147e500ccf84b54b80cfc27e50063fc0d0030c8f05fb02868ee8d71a463fc23c2c71eca306ce88ea44eb0bbcd923cd66b7c08aa3b64
-EBUILD xar-1.8-r2.ebuild 1465 BLAKE2B 1aeeda746b6c7a3830fac3f2df548dd034a894442167301eea2b77513685c58373d68a01e0e5e669e6657007c545686ecee8d9f24485c69b2ff584b90e1095bd SHA512 682c965cb54d9e5f6b09580be8648340db3eec37f8a11e612d2d99532ce495e6c9047b748d24d593745e54cdc8ef8f0d78f1a838183b82b26659acfd10120d50
+EBUILD xar-1.8-r2.ebuild 1458 BLAKE2B 70c060e409083dbca4ed273a9af38f2af72b0caac62bef5379a4fbc306eabb604259d2a4adae865d4e033e634d3a2ce6064e24610db001f12915d990b99fe773 SHA512 4f1bb61b3b3df0008985674a229119e17d564b5f9b1b29dd8598bfe72e9f138b694783a58881536012a945e67e217ac69b30c3017319c4c3858f2491e2a83ad9
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild
index b8acc75f2315..06d11666a580 100644
--- a/app-arch/xar/xar-1.8-r2.ebuild
+++ b/app-arch/xar/xar-1.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl kernel_Darwin"
 
 DEPEND="
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 3ff2040da0b6..6d4f3ea7c3e6 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -2,4 +2,4 @@ DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb08920
 EBUILD xz-utils-5.2.4-r2.ebuild 2706 BLAKE2B d7aafa86f26a9fd8b148cc4d9183365f323852b9dde311b2d91e394119e966379a99e242ec54b312fea89bd453b454035b0d8de0a802bfb4513fb2c675eaf68e SHA512 0aaa33811944233e533d4f90a9682658680371eb47e4e8adffcaec54763f3dad4b0b724e6f3e8e1f3c7b7358468d6f616b07db84c7ab6d6bf1543316c9b6f12b
 EBUILD xz-utils-5.2.4-r3.ebuild 2644 BLAKE2B e1a2bf99fc07ba1d7a7e690fab57f0d1ea0fb8d0fe3827c1cb624bbc9bbf67fc944a0ec1306fbde55ad6c0f1ea37d2a0d9d864653f97cc00e3459198a3b345b3 SHA512 9717a7c77306a020bd547a95bbb4b9ea1b08205800fc7e048ab99ef8027f404c0489224b9cb0d97e255d271c023de0fbb54ddf1126a3dd566bb20c95ddb246e2
 EBUILD xz-utils-9999.ebuild 2644 BLAKE2B e1a2bf99fc07ba1d7a7e690fab57f0d1ea0fb8d0fe3827c1cb624bbc9bbf67fc944a0ec1306fbde55ad6c0f1ea37d2a0d9d864653f97cc00e3459198a3b345b3 SHA512 9717a7c77306a020bd547a95bbb4b9ea1b08205800fc7e048ab99ef8027f404c0489224b9cb0d97e255d271c023de0fbb54ddf1126a3dd566bb20c95ddb246e2
-MISC metadata.xml 462 BLAKE2B 66d5625b239d042389ce8fef820efdc3ce3b5cbf21f6d0aedc4874d450ea1897dc8438575f3efc5a491ea857a8b990e6a51b16d0ff0b4982b41307bb52535cf1 SHA512 8f4ca7b987587a240f932ff1719f096de148db6e11c4e0af5f2f55552cab5d0af1256be337dbe8493b584d2c25a70a308dc28b90712078fb58f40cae37cfe5b1
+MISC metadata.xml 538 BLAKE2B 1ce32a16125c6af46b02bf0ebdef56c685d1d4903b74c2331b446e764096503b06fecf6d467ffb1c1627b8dabfa58092a1db21e5eda53d66f4e9ede4714d7978 SHA512 97dffaeaa9db4117a7e7770ac1ebfe16c0c32fc3de30f7cf099dea7a6565c3971146178140e0676e1946fcef609131124cc3d0bd971eb6fde1d45086da122310
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index fac09b73379a..74270db09ca6 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -10,4 +10,7 @@
 		used in any of the default xz presets. This includes delta
 		and BCJ coders, additional match finders and SHA256 checks.</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:tukaani:xz</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 8e309978b13d..06f3191eccd5 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 72445f3bea3a..a8604942295d 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -3,9 +3,11 @@ DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a1
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
 DIST Geekbench-4.3.3-Linux.tar.gz 71101735 BLAKE2B f7e784a624f558711e7ebc5fc502de0cae5be489154f3d7d20bfccb624269644ff90867c96ce9f8136609f4911b6764bcfb7ecfb037ebddac56e450b3baa2415 SHA512 8c4bdc51f215f6c84ef955d012d3ba81fab542716cb7dd9e2b05d15c68e678955817fd25032ec659028a769312b5bc04d2d3b9832c9f2fa46d55784446e31b49
 DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
+DIST Geekbench-5.0.0-Linux.tar.gz 92109155 BLAKE2B 5789ae929fbf47960939c3da79ea7cfe4efc9c5bfb9e158f0842d73e1a667a5e76d2c82952e0173aa4418d45a8d3314689e449e453ebe406a86da839229397e8 SHA512 dfec23335ffeef9b7cb089b164a5348fa4bb603169ba289d9995520b355c02815ce5b6619bb5d2ed090c21f21605d78238c1a285db41d75ce2afcc79835b57a5
 EBUILD geekbench-2.4.2.ebuild 1060 BLAKE2B 4700a2c4c82d5e829bf7b254c1a94a5bf47e1c534e1fad2b37458ddca39ef1f1372ec8d3727c69ecc0c462ec2514abea33a48aedf35c7eee5444dbea8e9ddf96 SHA512 663d11705c70d7a082678b7ee74802651734fe367458a7e10974f33b7c22930d78eddee7a1c56993e11a856da0efeef0412e02696485d7def3e4a6e0464b39f5
 EBUILD geekbench-2.4.3.ebuild 1122 BLAKE2B 70fba3ad954717c01cefd5b2df1ce40294001ad82f25dc82a3b5ba05650fc98bddc5e2c060f6cddd44a9e1028cf2fa8b908a3343491d6fe3b966ddfcad4d6f2f SHA512 3c6b303ea5459f9777bec75ea555a2794d7bbdc4d0da8a5881181e3dc5c8b6796191fb86c9536576c3ad43a7d4613ba22792e9a333cdde4de862a786f53b5e21
 EBUILD geekbench-3.4.2.ebuild 1122 BLAKE2B 8f4d72914a7333869104cac7f97a61c759699405c6f9bde61c95ca38a3804c4538ed8c679665537a380ed2892c685a9e365faa7ef54f1e8e0cae13a659d0cf0e SHA512 caf0856adbd7a3420f89ef5dcbc66629241c891f1129dce540832da224c34ac1d66a9b594503650566ff802683bd6c5f170ae31d95c2ecc147bf8dc64ae79c6e
 EBUILD geekbench-4.3.3.ebuild 1113 BLAKE2B fd8422df54e2b7d46308f565a49986a4fb828b27ce9716d0e7b8e57b4dd6d4288f55d596d325518d084d10f1af02d1097bf4e387b8d268ce48d5425d46e8f4d5 SHA512 dc86f331e2ce84e80b80abcf8928a863fbc3723cb8e7fff8238a1f6bec61aa99796d16f6c1eb0278aa8185399a0f09be9b1971b2df73df9e6638c2b9a93a1798
-EBUILD geekbench-4.4.1.ebuild 1097 BLAKE2B fce35a2964e0ff2db31a8d98025a9b0df8781d4357447848eb179eb8fccad6c087ad7220aa41a762bf9ab521a248f2a4f6224e56105c3e5b6b6ada7fa140b5b8 SHA512 493d70d3aa940437c03a307fc384bbc0e589c7fb5d906bee3e115f6326a2ba9a9f4c1ee22e1ee6a403b34564a701c36db04ba6b6f45d3563abea9dd33a7c187a
+EBUILD geekbench-4.4.1.ebuild 1096 BLAKE2B d6981883b2eb295d032b1672105833852a629aa073c63b685667f84f1ab0af8b92f1405831e1243b2fd4ebca06ba376a72e0608f54d7d6f6bf53373557d468be SHA512 8007ed61895716934085cc267fa6409975cbc4a5aff6f462844c9f88ef8a094decc594b034e9a25c53b8c34250a872a43f9fba761b2da8430aee69f51d5702d3
+EBUILD geekbench-5.0.0.ebuild 1042 BLAKE2B 30557738c7e8672de210600fb1e22154a9e9ce1d58482a75d30c1bb110faf94aeb6c708eb3b43c25fd287b52ffeedf6cbcd83fab58b13e13cb40c18ff0b47743 SHA512 5e2c92ae7ebb3d7c6aa0eb5e22524be41b2de1f655559522755e6754176b48b02e6ccc9df962ec412d02daa48b5bcd60f5cd04a8fde7956b326b8879c504a05d
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/app-benchmarks/geekbench/geekbench-4.4.1.ebuild b/app-benchmarks/geekbench/geekbench-4.4.1.ebuild
index 5754046d5dcc..0a63a4d5eff2 100644
--- a/app-benchmarks/geekbench/geekbench-4.4.1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.4.1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windo
 HOMEPAGE="https://www.geekbench.com"
 SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 LICENSE="geekbench"
 SLOT="4"
 
diff --git a/app-benchmarks/geekbench/geekbench-5.0.0.ebuild b/app-benchmarks/geekbench/geekbench-5.0.0.ebuild
new file mode 100644
index 000000000000..fd51c02afa39
--- /dev/null
+++ b/app-benchmarks/geekbench/geekbench-5.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
+HOMEPAGE="https://www.geekbench.com"
+SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
+
+KEYWORDS="-* ~amd64"
+LICENSE="geekbench"
+SLOT="5"
+
+RESTRICT="bindist fetch mirror strip"
+
+S="${WORKDIR}/Geekbench-${PV}-Linux"
+
+QA_PREBUILT="
+	opt/geekbench5/geekbench5
+	opt/geekbench5/geekbench_x86_64
+"
+
+pkg_nofetch() {
+	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	exeinto /opt/geekbench5
+	doexe geekbench5 geekbench_x86_64
+
+	insinto /opt/geekbench5
+	doins geekbench.plar
+
+	dodir /opt/bin
+	dosym ../geekbench5/geekbench5 /opt/bin/geekbench5
+}
+
+pkg_postinst() {
+	elog "If you have purchased a commercial license, you can enter"
+	elog "your email address and your license key with the following command:"
+	elog "geekbench5 -r <email address> <license key>"
+}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 5f86404aa282..dcadcf143a12 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/bchunk/Manifest b/app-cdr/bchunk/Manifest
index 341587a01351..8d7038b11b67 100644
--- a/app-cdr/bchunk/Manifest
+++ b/app-cdr/bchunk/Manifest
@@ -1,5 +1,5 @@
 AUX CVE-2017-15953.patch 738 BLAKE2B a7d35373ff5fc7f105430c6480285fe567a2ecd4cf6979b0e950a0945e9cdbe78aeab9815b628af6e398d1a57ae94ebbd8ec829b01a43bc33baa434ef4863b41 SHA512 266dc695cbc53a58f99cef7bff8e399a018275dce05d50edb4465096c418fa4d77850c671b56a3656f942f0affd83110f341c91bb325d48b9d264b5370b99a51
 AUX CVE-2017-15955.patch 773 BLAKE2B ed4a57da8a73cdde213a5b6e7b454d067ac7b178d1919490657ca0a2ba095ca0b2ae05dfe929d4ee92fa6a2fc7861215cddb9f5d6727d460f6a44b18b9f38581 SHA512 060d6d637f5af2507d63edea4bdda30ae4d6fa5b8e96aaac6d9e41fe328d474bf6854fea101fd6de878ea3b5f2f3e2ccdd1b8e1182a55fe423f293b2024dc7f1
 DIST bchunk-1.2.0.tar.gz 15078 BLAKE2B 60d443380ffaa8dd1d025777c91c1374a931f16c8de2219a4ff453ee4d7c6eb235b2380ce1021911636d247a12640214dc40b29f9c9cf917ff4bc4594f189fc4 SHA512 0e1f9daa2dfeff58e2c65ac2767bff804811fa22f70a220747aa873cb01b77b4c6a809736483aa22fb3f2d2a88885469d10fb45af4626069e992a0763a5fcc2d
-EBUILD bchunk-1.2.0-r4.ebuild 597 BLAKE2B 4030bf798180d7e46e8d0c96c9134d5675909db32db887032c43eac136569980449b361d0114597cbc40cdd94cef407707c3d23d5dcdd9c48fd73b4f93c634f0 SHA512 3cbbe4d50013895b72fb9eb223a2f110d77c8d5f83ff7d85ce9746dce1b8505268ae26bd8f888e27f610d96c4cac439c8e65f4361f90086ecacb9387d1e1b5eb
+EBUILD bchunk-1.2.0-r4.ebuild 596 BLAKE2B 7c72f8097ff9244cff812e71c4d8a8558e0c8a8afd115c6e60f306865cffb3850c18fbb4a5cba836eb96fbcdc2c12de7b161c114e0d038b9f866d5b7061f055c SHA512 203d8f394679a24037ed6daccc1232a461249484549657025495df6d16c218b7c8f8b0d790d41ab9883d909561f027295b47a19af910a0e04c11f4d0345c1b02
 MISC metadata.xml 316 BLAKE2B f234f603d9fcf3c50f48602826b361707317ec2dd0ca1438224e6ec753e92bd0c024d773343c6b6413a920698f4673b85cf6b6411a0c53dc02253b5e341da236 SHA512 1a2c6992e5957694c18634dd12d5a567d1bd74b063f91e7c524984722955a0a72ff22ff2ef17932eb2eafd84d4493dbe6a103df3fad70e4134fa33ddcc3463e9
diff --git a/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild b/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
index c9df21b4a075..9bde5ee469a2 100644
--- a/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
+++ b/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://he.fi/bchunk/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 DOCS=( "${P}.lsm" "${PN}.spec" README ChangeLog )
 PATCHES=( "${FILESDIR}/CVE-2017-15953.patch" "${FILESDIR}/CVE-2017-15955.patch" )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 85a8acd66252..c0806d665baf 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 5d9bcc9974cb..23706c339074 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,4 +2,4 @@ AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048
 AUX gnupg-2.2.14-quiet-sending.patch 1225 BLAKE2B 3165d5b8242a0bad7913881dfac66433bcea9f5d97a58f43999166ce682671060a934ea1618fd90c7b892b4f3565ae0c3e57ad2f8f7b200a52145452d56ad8bc SHA512 f61f029ac72626e0c7d3bf29d483fd313ba723ae47bd7659b4fa72252ec9b5f329510d37ae92c41dd7dd45a3b99e846ae3d83a7bb37825e95e6d10f29b131853
 DIST gnupg-2.2.17.tar.bz2 6717554 BLAKE2B ad052a0d1e970fe7748563a0ffa105d427e3d9299237f15ce93aa47b676cc1fbf0691cf2112dd5b55ba5fc9d2a6988f999415dd5026d44c5cb4bfef9f99189cd SHA512 a3cd094addac62b4b4ec1683005a2bec761ea2aacf6daf904316b1819f4f6a41f256a8d9452cf28cad71b3e68228465baa27ae0eb1fa734fa91542ef0f159c5d
 EBUILD gnupg-2.2.17.ebuild 4548 BLAKE2B 143d02639279e1d16c544e660aa17f1b28ae157d0ea8224e55002c89c1c7b607f4eb3dba2a81f479f985e2a4672436ae7dff77903474d2fb62c9232879ae277e SHA512 67352dd85c666ee2256ec9a324a9d385fdb4afa7d746e93002445c9cc199e2670077ca4244529bf97d70fa14d8b133f81cea3e569af07beb97fe6d1b97434e43
-MISC metadata.xml 1233 BLAKE2B 2b48171b444fefb4a7754f7d46495320a22c67e6a7d647522a9b1750950a105a490b5bba4cbec8f37ecad5f11595fcde78a84dfc72464440f8a6d49e91298298 SHA512 687efa743fc072665d521213e5d27f953dda450b5acdbcf194c00c3aa793c1f2610f5f75f0cae7f50292bb379f3cdd9da0e8480ee5fc8b8ad8bbffa6b90087e9
+MISC metadata.xml 1313 BLAKE2B 3e9b3fbc3decac1676bda2b09c822ddd723d4e08fd9d63196a7f0c46fe4275a06cd8b87815e1781fc999747ff0da9eb1823db81a0b5dada5482519e2f4c925fb SHA512 d03cfc1b7b44948a594bc2df9c5f79d250dd7601f4579f832f0ac3814b640e399b3f428737a16e7098772b4ae2dee157b6958b612aae2b59c21397e99a5d9aaa
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index 8f54fc7a736d..6abd36d9b6a3 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -35,4 +35,7 @@
 		Install the wks-server
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnupg:gnupg</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
index a315db2f15e9..cd9f218658b8 100644
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@@ -1,3 +1,3 @@
 DIST libu2f-host-1.1.10.tar.xz 471676 BLAKE2B 5066eaaaeda3b8c015afa8946f0af3b1b90a34488d4c71811c0d8f57a3ed2e4c8cb3d82d2df147dcf13ac3c384522d22f25894ac3a2d994a75b288891a67640a SHA512 91c5bf3994f1d3c9bd144f54b14b0404d839c15bef3c318619decdf1bd37214bcff33927af78a9826ff7d0bc9907c912a0e31104ae68d3a727a8436f2a1dbf7a
-EBUILD libu2f-host-1.1.10.ebuild 996 BLAKE2B 76297c68d6b7c036d0f5c713465d9dad6f9c0a127825492469773c8e6a913accf9777830b18888ef61f525a55dc3aecfd2efcfa9d331147e3e3ada4f7d082eb4 SHA512 84a87b5ab3ade57f37b02ad8248ab4d5afb0dd3687b001be3892b6322e75ffc985b0f38d7ff046a1c19f6858afb8d8aa8ddd206a6c20db1e0f720d5563a85b4c
+EBUILD libu2f-host-1.1.10.ebuild 958 BLAKE2B fa5cbb0284764754ad1190da8e07b43f37a632a895188966b394e51ebfb1aa3197e1c60ff3584896beefb6068dadd1d5524d90ce6b56cecf9d59f6a0c5ce9f60 SHA512 0aade0f668c76a89d2bfae261dee437e849ec1c22cca333251da545d33b9908cecb11a9b9a9b9b6c5865edc88bbfb1105e047c8be361e2203afeb3bae24f3c7f
 MISC metadata.xml 668 BLAKE2B 7720f7dae3f50bb3c6061bb2fdfa973fc5cea8ee314c4d7b95934037430d8083ff8629b3fb4d6233e6617596810112e3a4fec93eb702058ec09cd86d0931183b SHA512 017018b2122b3adf87c7d3a8d70211f337de3b6ac9e8e446f3f2f70db29d33af201c9b2dbe4404e5ac7f36360f96abae24e6501ec60eb256e6ba974c37fc6932
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
index 104c7ec0ef0d..6797a6c93d08 100644
--- a/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info udev user
+inherit linux-info udev
 
 DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
 HOMEPAGE="https://developers.yubico.com/libu2f-host/"
@@ -16,20 +16,15 @@ IUSE="kernel_linux static-libs systemd"
 
 DEPEND="dev-libs/hidapi
 	dev-libs/json-c:="
+# The U2F device node will be owned by group 'plugdev'
+# in non-systemd configurations
 RDEPEND="${DEPEND}
+	!systemd? ( acct-group/plugdev )
 	systemd? ( sys-apps/systemd[acl] )"
 BDEPEND="virtual/pkgconfig"
 
 CONFIG_CHECK="~HIDRAW"
 
-pkg_setup() {
-	# The U2F device node will be owned by group 'plugdev'
-	# in non-systemd configurations
-	if ! use systemd; then
-		enewgroup plugdev
-	fi
-}
-
 src_install() {
 	default
 	if use kernel_linux; then
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index fa93620c6817..2ed81ed08bbb 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -26,5 +26,5 @@ EBUILD mit-krb5-1.16-r2.ebuild 4212 BLAKE2B eac567c47b44a75e06ea412da95ecfb5e652
 EBUILD mit-krb5-1.16.1.ebuild 4172 BLAKE2B 4b120ec5bb2d750c6d76c1f6fda2cd21aedbfe771eb234e4d7b392868b6e9d9bcef4b6897df456d8ae30b9cc96a8b83636028d854cb2646172c4f0c27ecc0087 SHA512 af0736e57376a42e44e4a2d97587386590c5a3c5de56485b6db2016494b2bc392ba4bf573462576de5a909fd963da8095d349eaa5866f3ec3ffd427224650eb3
 EBUILD mit-krb5-1.16.2.ebuild 4294 BLAKE2B 4e36bfd702bf28bf73d81265a4d410ce53631c012b9090b6296f1ccb0b923b598ba7bf378451a3490d7018b0681fc9a882805707feb165975ef9ee072536cc89 SHA512 f026e3e3f59e6d4747a3bc3e71292092668f388b61a6d53db437b6fc79311f11c95f6d70e21c36911733900556015a4ebbfa01fc7bcca073561359ce72e9659f
 EBUILD mit-krb5-1.16.3.ebuild 4287 BLAKE2B adfa76bf62c6c9ebd4d854307e77ded4dc6a061e54249332f3ea0ea16863063a18bb142ee02a4fc253ad6a0dc199242796b8b085b324800a12712a98753fc6c4 SHA512 0858f94f587c452c23952f533418ff134723c76061dd244e7ed800ca5d7d16bda1ab3c24494e989c1c6c2f11176c4dda3715d48b54862b643080d05d8d4481cb
-EBUILD mit-krb5-1.17-r1.ebuild 4326 BLAKE2B 3747f9c59f16c325290d46ba5fd504a27f51db33d846d8d303ec55730725e2d4fdff3af29764a63bd0e5f11b0d765b338701344ca802828ab44a9070915e14cc SHA512 5cd046fc19fdefad75b9fdef9c79f54f39d12c6b35894571f67bc13c5a4dad4cdc05df3d312a304ab015ff3f253f205abb18b16159826972ef9e8da735a3d3aa
+EBUILD mit-krb5-1.17-r1.ebuild 4321 BLAKE2B ffb4f2af3f15567341b3178db80e8800c30bf349e37380cb43b49ddd39c9dddf778c81132ba3c0e979d17a3b78c89439b298e4468f08954d2a9e8944fbcb4c8d SHA512 c50dd222d1d98d5ca63abe08f7dbe854eae5555be4f10174f48a45807a6a6c5f3b4d55cd8bd2fd6e29675f8b9c37353361351177af8bdbc10fadc365825dbf60
 MISC metadata.xml 903 BLAKE2B 57a48ed1fb3f046b8a4a6a80ae6223bc923f30ddf350b8ee0f5769c78b28c0bd14c35539d9552bfca02901e054332a4dc22f88c48d4eb4db4d143a7f0b938d74 SHA512 44909c99698b78ad01f72cd1d74ad6807f12154c8675b7fe31f4bd95744d8e7dca53446875c57408a294e5f87fc5aa038e6f869d3ff957cab870cd75f8e45464
diff --git a/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
index f18acd2b3c7b..b81d24e81cb1 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
 
 # Test suite requires network access
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index 98720a94fe55..48106f8b6d17 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,5 +1,3 @@
-DIST osslsigncode-1.7.1.tar.gz 127631 BLAKE2B f0ced06a33968f03558e189fc9ed2340dba2cdfe823422c760d62476446646f198aed1a95f99734f80e7ec71d23cd286a23e68953f7e432a9a6ff048c76cae63 SHA512 cc5a7e0c5baa2a98db93f1d2cc9d86e732e2a8a55fc20bf8e6aa67e2120af37c6be857dfe4b8eb8c82fd40604dbb3c845190b59c7e6b4147f06b710a256b877f
 DIST osslsigncode-2.0.tar.gz 57951 BLAKE2B 67057c07bb667a546e3a8abc49e8a20a0ef42ae77edacd2e88486a4357e8e8e789307e1c2abd2e13d18401621ba5607bb42af46ed8451546a26bb6855a07e652 SHA512 aec7b101afd96925fbd70ac67a6752997f0dab3987151c0658e5f011d8a6be6f53518d7a4aba6dff696c722a1e669100143a87d07c3f59364cd62693e9f3e4e5
-EBUILD osslsigncode-1.7.1.ebuild 582 BLAKE2B d95a1ad0de96294087a2ab81446ae718438661257a864b4525232c2b91029f68313932186f2a854e4ed2498c0fed9be49054b30c95a46938149918fd5e689779 SHA512 29cbf1ff27b7f04a7a00e02697a39a02b2222e9b23a7d507708db3b322c3ed7443fba4781cd900d3abd8c5a325020f97df1edf0aff5a152b68d594ebe0c40f53
 EBUILD osslsigncode-2.0.ebuild 661 BLAKE2B 6f1a7d79ad04c62a74675e0f0d8d96a7cc315d00d39c6bbc431433b51066016e2830794184a1e9ff6b5862024f382edab3233f2e7ce16158559c077d5410a6d6 SHA512 dc9e8de629017762d7599223597b583200a521a16739edff3d0137e237fa96c829eebc84e129656844ed74169d0c1dbf7e30b0fed828cb864585c24fe3d76a15
 MISC metadata.xml 249 BLAKE2B e2269cf35520934d37b0cace5aaa64dc71ba9917bb90ef01e3ddb5e0208ffd0e2c650008fe88df51ebf6c5c304dbf7670608712f4229cacf62f9c7a747fb8f00 SHA512 9d2ea5145e05b199a7c1cff11164a7eaa9179fec4149b5a0c6f17c5c689d041d68243f4e1cc550617f9649f72ca77d7cadf3d488d1c6cab31bdbdb3fdc26aa9a
diff --git a/app-crypt/osslsigncode/osslsigncode-1.7.1.ebuild b/app-crypt/osslsigncode/osslsigncode-1.7.1.ebuild
deleted file mode 100644
index 6962aa2c45f2..000000000000
--- a/app-crypt/osslsigncode/osslsigncode-1.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files"
-HOMEPAGE="https://sourceforge.net/projects/osslsigncode"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl libressl"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	curl? ( net-misc/curl )
-	!libressl? ( =dev-libs/openssl-1.0*:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf $(use_with curl)
-}
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index bb28254bf8d3..a87e3928df69 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1,8 +1,4 @@
-AUX pesign-0.112-fix-cli-opts.patch 2228 BLAKE2B 6037340b1bc0c659ec2be5358d781b29f0fe755a17e7c17f612ef7c8dc514dc5d5ed2c49121463caa269e01a206a160ec725f7545a004fe10ffc35841f23625a SHA512 62d2ec0059ff518b576b6399a217f47b1f361c41292055b8a7326e81cda30190b4a62dad7dd8150855b2025af1ad25458a2cbbfd3ae89ca6c870067224662695
-AUX pesign-0.112-fix-initializer.patch 388 BLAKE2B e5beacd2503dbde5c6e4ba748c4dc5151747028b3448e91fcb2e52f6e2622ba5f84cb29a816c67979dcf7ab40b9f3d2ea10ff31033027c18b68c863ab2eed86e SHA512 1b76c6dfe7ddc76a2051038894b7e2da72c01ebc05a46d4b6ebc05a092a55d699161e04c4df73d1afb7752e6a138ed8c9c28eda55897c82934ca852be42dae84
 AUX pesign-113-nss.patch 2092 BLAKE2B f75730c2ab48f0ff6af4237fc46c535b3ceead357e31a548c28b78648fec7d52a5cc1bc9dfdb9db4e6cf22b7312cc452afb04a3088810140055ae88b55fb2f1d SHA512 7a4ebd4c875cf6678a6d2ca4083eafea552259e2c1692d167d0b948ac73d50244db3feea1c6d7c403e152236421609da5d92cd6405fb3107e1c3933c2f94fece
-DIST pesign-0.112.tar.gz 107632 BLAKE2B 737b75aec7efa9f41dbdb509405dede914cd5aa563572f0d2ede96a321f4a669170c696c7bd93bad1a5c1a6f2c65715b66317544fa6fc55d6b7f85436d778e8a SHA512 9a0cd266f973fbd7bbbd23939d0be3c34dbccd9ab20941bf967ca1b18aa5bf5d2c41cdef0799399e09e7b0fc59a0b34bc660afb6da292eb1c127db2893362018
 DIST pesign-113.tar.gz 124618 BLAKE2B 36cdface6ecdf9003251da3058b21b2ee8e94eb655e47a8668b38c4ea576d990a71860952eea277d5e029bb007039c8e3ded9918e89d47f6db404423acbd1cc7 SHA512 e71dc90c2ab8085d1b000c0d2cf9cb00ddaed1ea1393db75c2d19a96f1b1c188a26b76850533ba97ec254a3b48db6b07a69b597c329ac891e64422780a358c24
-EBUILD pesign-0.112.ebuild 1222 BLAKE2B c72e2506d5a391db63c12f2f299772d3531aa029eb4116ce731e6608f9f10496c64489475d56473e5896b2649c0312359c3f6ea009cb3a1c9357a9d34c53b60c SHA512 17314da5a476af1543bb5ce71e764e0a93bd4ddd7ea61f0ced626aebf5abb9683f204af08845d13b7e84f591c580cb8fb4ef205134cb38c1087d717585a6f00a
 EBUILD pesign-113.ebuild 1177 BLAKE2B 2ac7fc3a2197194d5e1518ea110789054947eb94b2001190c34dcc6883559052681517361152ffdf39b807572d338f7764511a3dc109b27daf11c47ea557c8f7 SHA512 42308998cf9546dc4e844c96688c3c9990e51ee001925783e2e985cec4ec5470e63d62302cd8d81a5ae55492fc64e15eec8ff07a03da56c0bc53d1239a2ffdb1
 MISC metadata.xml 248 BLAKE2B 53654091f15005bbc49262b840fd687c88b36450646c7639f9767a891a973f393dbbdc093143b3b120e50b1263e383d674e227c44de4c204b34a3a7892ed59e7 SHA512 c77276afdf688db707b87d976aa741c359c9152d0de1ffbdb9d3202a3b62aa2797cd8beb86354dad9fa2158be17948f53995ab9b92ea04ef79e6dd8ac3ede1fa
diff --git a/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch b/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch
deleted file mode 100644
index 6271a999859a..000000000000
--- a/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 5be0515dee24308fd7e270bf2e0fb5e5a7a78f32 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Thu, 9 Jun 2016 14:30:37 +0200
-Subject: [PATCH 2/2] Fix command line parsing
-
-The gettext translation domain should be passed as .arg, not .descrip,
-otherwise popt won't process any of the command line options (it stops
-looping over the struct poptOption array when an entry has unset
-longName, shortName and arg).
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
- src/client.c     | 2 +-
- src/efikeygen.c  | 2 +-
- src/efisiglist.c | 2 +-
- src/pesigcheck.c | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/client.c b/src/client.c
-index 028419f..575c873 100644
---- a/src/client.c
-+++ b/src/client.c
-@@ -555,7 +555,7 @@ main(int argc, char *argv[])
- 
- 	struct poptOption options[] = {
- 		{.argInfo = POPT_ARG_INTL_DOMAIN,
--		 .descrip = "pesign" },
-+		 .arg = "pesign" },
- 		{.longName = "token",
- 		 .shortName = 't',
- 		 .argInfo = POPT_ARG_STRING|POPT_ARGFLAG_SHOW_DEFAULT,
-diff --git a/src/efikeygen.c b/src/efikeygen.c
-index 6278849..8a515a5 100644
---- a/src/efikeygen.c
-+++ b/src/efikeygen.c
-@@ -486,7 +486,7 @@ int main(int argc, char *argv[])
- 	poptContext optCon;
- 	struct poptOption options[] = {
- 		{.argInfo = POPT_ARG_INTL_DOMAIN,
--		 .descrip = "pesign" },
-+		 .arg = "pesign" },
- 		/* global nss-ish things */
- 		{.longName = "dbdir",
- 		 .shortName = 'd',
-diff --git a/src/efisiglist.c b/src/efisiglist.c
-index cd3f1ae..40d6a93 100644
---- a/src/efisiglist.c
-+++ b/src/efisiglist.c
-@@ -126,7 +126,7 @@ main(int argc, char *argv[])
- 
- 	struct poptOption options[] = {
- 		{.argInfo = POPT_ARG_INTL_DOMAIN,
--		 .descrip = "pesign" },
-+		 .arg = "pesign" },
- 		{.longName = "infile",
- 		 .shortName = 'i',
- 		 .argInfo = POPT_ARG_STRING,
-diff --git a/src/pesigcheck.c b/src/pesigcheck.c
-index 1328fe9..0d49c1a 100644
---- a/src/pesigcheck.c
-+++ b/src/pesigcheck.c
-@@ -214,7 +214,7 @@ main(int argc, char *argv[])
- 	poptContext optCon;
- 	struct poptOption options[] = {
- 		{.argInfo = POPT_ARG_INTL_DOMAIN,
--		 .descrip = "pesign" },
-+		 .arg = "pesign" },
- 		{.longName = "dbfile",
- 		 .shortName = 'D',
- 		 .argInfo = POPT_ARG_CALLBACK|POPT_CBFLAG_POST,
--- 
-2.9.2
-
diff --git a/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch b/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch
deleted file mode 100644
index b6147fe68e6d..000000000000
--- a/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This addresses a -Werror=missing-braces build failure from GCC bug #53119.
-
---- a/libdpe/pe_allocspace.c
-+++ b/libdpe/pe_allocspace.c
-@@ -61,7 +61,7 @@
- 	struct pe32plus_opt_hdr *opthdr = pe->state.pe32plus_exe.opthdr;
- 
- 	Pe_Scn *scn = NULL;
--	struct section_header shdr = { 0, }, tmp_shdr;
-+	struct section_header shdr = { { 0, } }, tmp_shdr;
- 	if (pehdr->sections < 1)
- 		return -1;
- 
diff --git a/app-crypt/pesign/pesign-0.112.ebuild b/app-crypt/pesign/pesign-0.112.ebuild
deleted file mode 100644
index 3937fb8fdcd6..000000000000
--- a/app-crypt/pesign/pesign-0.112.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
-HOMEPAGE="https://github.com/vathpela/pesign"
-SRC_URI="https://github.com/vathpela/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
-
-RDEPEND="
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/popt
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-apps/util-linux
-	sys-libs/efivar
-"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	sys-boot/gnu-efi
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.112-fix-cli-opts.patch
-	"${FILESDIR}"/${PN}-0.112-fix-initializer.patch
-)
-
-src_compile() {
-	emake AR="$(tc-is-gcc && echo "$(tc-getCC)-ar" || tc-getAR)" \
-		AS="$(tc-getAS)" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" VERSION="${PVR}" install
-	einstalldocs
-
-	# remove some files that don't make sense for Gentoo installs
-	rm -rf "${ED%/}/etc/" "${ED%/}/var/" \
-		"${ED%/}/usr/share/doc/${PF}/COPYING" || die
-}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 1f4fa1607e9e..38c51598e959 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/myspell-nl/Manifest b/app-dicts/myspell-nl/Manifest
index 667083f52d7a..b59525179957 100644
--- a/app-dicts/myspell-nl/Manifest
+++ b/app-dicts/myspell-nl/Manifest
@@ -1,5 +1,4 @@
 DIST myspell-nl-2.10g.oxt 868845 BLAKE2B cace4a9750e9e7680c48a414065be3897afd29c3f6908c95021e92ebe050784bc7c7379f0a3ff74fc34c6ee6bb1b3499636c77dc60c757520c6d725735a2547a SHA512 070ef6a5d63a2fb9806f7bbbb1459e40097bbcb5c8ab9babb9195844e387847e2295890b149c0a90aba19e4fced7f3d90d338ba976614fc73c5c367bbc9cf4d4
 DIST myspell-nl-2.10g_thes.oxt 1956026 BLAKE2B cc8a79e746def1f6f1026a77890472005f6ad81a1addf1e86936848b07aa1aa31692151e1f7427f792d0c04d1854ff9a6b56abb755cbbc78e0c4dd1e03e378df SHA512 2a13b97ffee1fb98ba29f74595ff9e29a89f294d82efd2da2e89983ff5a21852a1222bee9a4684dd5df621e1dc5621853e1d87cbf0fca311c8eb9e267598eee0
 EBUILD myspell-nl-2.10g-r1.ebuild 1090 BLAKE2B c9b94b4050ad5061785a5cbae39cf19a051de2e4daa05026da141a777e1ee840fbad04e1014c79b0d67e9c3e56134f3ce011999f4493cecec6daca0ee4d50400 SHA512 1f7a2219d45a5c215d7947dcfc0f320c0289b6ee2ebc2c9da905b280d6bd3d1400cbda7d1fea18b9013e9bb5b4c1ac11a4707460041569a8bca14de072b67447
-EBUILD myspell-nl-2.10g.ebuild 1093 BLAKE2B d37ef2480a0b9ca3ce3d64132f5ff46b43f13a216449093ab1fe793e3f79b44723e3342be7a9ce49e9e06a125569a9c83021fed395e0532f73750ba49cf175b3 SHA512 5de3e7c0283484b48cee4f775d1ed19774eb0177c32096c42a98e4b55618316c556a9154eaf66806a5a8a3a12a94ce9a62ea312e1417a8c6ad88c3f23bfdeaec
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-nl/myspell-nl-2.10g.ebuild b/app-dicts/myspell-nl/myspell-nl-2.10g.ebuild
deleted file mode 100644
index 56b4625bc85c..000000000000
--- a/app-dicts/myspell-nl/myspell-nl-2.10g.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
-	"nl_NL.aff"
-	"nl_NL.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_nl_NL.dic"
-)
-
-MYSPELL_THES=(
-	"th_nl_NL_v2.dat"
-	"th_nl_NL_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Dutch dictionaries for myspell/hunspell"
-HOMEPAGE="https://www.opentaal.org"
-# Thesarus is not versioned at all, I suppose we could bump it with each dict
-# release, or when people say that the download uri checksum changed.
-SRC_URI="
-	https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-${PV//./}-voor-openofficeorg-3?bid=20&agree=1 -> ${P}.oxt
-	https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> ${P}_thes.oxt
-"
-
-LICENSE="BSD-2 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-	default
-	# thesarus has ugly name
-	mv th_nl_v2.dat th_nl_NL_v2.dat || die
-	mv th_nl_v2.idx th_nl_NL_v2.idx || die
-
-	# remove dutch translated license so it aint installed
-	rm -rf licentie* || die
-}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index f7ef53fb0ea8..4113bc397bc5 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index b51250512ffc..b7529d3d5a46 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -8,6 +8,6 @@ DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615
 DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079
 EBUILD doxygen-1.8.14-r1.ebuild 3187 BLAKE2B 463f9282257c8f4a31b46637c9accfb2a2d4839588ac0903d4665996ac462ab3dde9ae96a3d25b3269cd7492f9eaca3d97dd9fbe6719fc9660429d31264ab71b SHA512 c47808d2d8739a4e9773b5524a256f2d357716a57d11f0db22d552a6d3edbd23848cb0187c209b3febf0e59e62476c1dd2ee3286d2083a15be74d8af798512fc
 EBUILD doxygen-1.8.14-r2.ebuild 3262 BLAKE2B acdff6cc5535499fa674027aaaae039a525afb4933202fb79b99b0d010cd39613aa8a58ddb18c07bf3dcaa82e082a596c85b568240e78745d986c0badd53b005 SHA512 cf6b58eb9d56e672c8c54ae0290a78170feaa2121958ce34828e19c816ce9c3ca7863f001cbd8e0634c602b23fdd2c62640609c32734ed13e965e3ffcc109f07
-EBUILD doxygen-1.8.15.ebuild 3238 BLAKE2B 126d7c6534dd5904f7500a978e89c25ce25be8b3c4d10121709a6fffae21c618d8c3388834d97fa30ccd6fd1f2958361e9105839b8d64238bd7c3c59fe67506d SHA512 2474e09c3b46ee6a5458d21df24c9262551db1d97e7202a2864a63373588fcb9d007ad8a828e6144600ac959361b3a6f7550352b57e4c5d4605b415057e6e8f0
+EBUILD doxygen-1.8.15.ebuild 3236 BLAKE2B 0e6f62dfb2b5c85b97348496c690ca2e30e69f0c54e0f9444919635f340d3cce2903dd1c65d33bb0d6b05772edd8e77731e103714cdb52be8488052c32eebabb SHA512 535dd4c7077e40afb1cb73500221523ebda63358f2a44aae4fda7c86172a776a50dd6e5dbf5a3a27351fdf18160c4997459ded9beb4c1d44895dce3dfb3b3aee
 EBUILD doxygen-9999.ebuild 3124 BLAKE2B be423d31a057dc9129d85e9159070d609b913ecb11c30ac517b80ccf054783be1cc07bbebedc79dad2c5c57b1e01ba69be9c27550eeae7bb70072f594937cc06 SHA512 167218874b4cf2006fad2de68a7caea6b6267b299faaadfa609fd51b6478857508f7410cc5e00b195668cbed7ed52f7bc68f8ef1fe6259b461525d69cf994d11
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild
index 7564d101776e..d48cdc02fa1a 100644
--- a/app-doc/doxygen/doxygen-1.8.15.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.15.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Documentation system for most programming languages"
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index ea6e18bacdd5..05fc02811ffb 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1,6 +1,6 @@
-DIST eclass-manpages-20190714.tar.xz 416068 BLAKE2B cfab717198e947238b17b606afcb5f39efa377e5110c0d797397f38a4588a176f75a2ffc4276e92628739c3e7a7e39e54baa092306dd05e9ffbc6a24c6ca0db0 SHA512 65cb3507ee3338a1a7bd1274a68ba2dde79914747564cb2ed35c9307ed15826a0998fe141fa4d4e1c6e358b0c428bde256ced46888d192349a72f0313c33250c
 DIST eclass-manpages-20190728.tar.xz 415612 BLAKE2B b3225bf2ea8036f4714f6cd07ebd00092095f39970855d1847c3bd5e0cfc23baa6328d21788972ae430026b32172d43ef44fd9a9d243711885061cc2c209b475 SHA512 9d7c493808477bab22ecff8d832bdc082f55c39e886c3551c9e75c612de2f94d54d686f4c81ee77e06465eeb0d8004aac6c9fdc530f2c6c325832452242676df
-EBUILD eclass-manpages-20190714.ebuild 605 BLAKE2B ceef27f3e43fa279fa6e380ecc4254257f2a64cd643eb3f0da5f0985bc9aa98caa2939e8bd37247c65a01d959439667f9b931f6e1c845bcd9173df1980c06949 SHA512 95e1e5b5c09bc281dc0bdc09bdbd1facc548e4a7c5062ce9ff18725ecc489946e486c883235d570011bf69d792a33a3a45175e15f94a56317f167d2817c69236
+DIST eclass-manpages-20190908.tar.xz 416412 BLAKE2B 12d2b8c90349993510b3b0b462c3158090751e31abba013557595688136519a83bacc58ab4a26e3ed398aa0cb1647e4fa4fec412cce02f48007c4cf2a7c91121 SHA512 6d99114fd754bc9f84c90fcd485cde38772b506e960c2db61025ce3ceb3258c37f6d0e1be13bcc198b875969551c98e19da3f2c09b04efda0be5f4509b006089
 EBUILD eclass-manpages-20190728.ebuild 621 BLAKE2B e661db0903a9a4e565d97a6e86ba4f1458ae30d12e0374f49f61d6b2b4aa839357f60efdb80b9dd7f03c97323d2800370a21d2cb55c5e9705b7596cd15cca45c SHA512 e13f9e45b4a9a3c0edb1b58cdd85fba89f9089a508bbdb7d5f40570e9c23d104accb33a5534f216439437a320b184aad9a861c012996145d42480587b2aa9d45
+EBUILD eclass-manpages-20190908.ebuild 621 BLAKE2B e661db0903a9a4e565d97a6e86ba4f1458ae30d12e0374f49f61d6b2b4aa839357f60efdb80b9dd7f03c97323d2800370a21d2cb55c5e9705b7596cd15cca45c SHA512 e13f9e45b4a9a3c0edb1b58cdd85fba89f9089a508bbdb7d5f40570e9c23d104accb33a5534f216439437a320b184aad9a861c012996145d42480587b2aa9d45
 EBUILD eclass-manpages-99999999.ebuild 729 BLAKE2B 79cbaab27b22289c66c053232bf900a7ce8afacf48f0d5e750d324732e5c74918403cc271286da0eb005d15deb6f5579e04f6ff2eb5e9dd7372ef842d6ec31ce SHA512 64d4c7078873ac0814c68a02596ef6890949dbca960a452c867d2c7cc16b098b8922e5a915360fec4fee47c922e9bab81f84a04b3a71c92a96e47b6b02cc25e7
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-doc/eclass-manpages/eclass-manpages-20190714.ebuild b/app-doc/eclass-manpages/eclass-manpages-20190714.ebuild
deleted file mode 100644
index c567d7c5fc37..000000000000
--- a/app-doc/eclass-manpages/eclass-manpages-20190714.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Collection of Gentoo eclass manpages"
-HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# Keep the keywords stable. No need to change to ~arch.
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-
-DEPEND="app-arch/xz-utils
-	sys-apps/gawk"
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX=/usr
-}
diff --git a/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild b/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild
new file mode 100644
index 000000000000..3e6b3491f481
--- /dev/null
+++ b/app-doc/eclass-manpages/eclass-manpages-20190908.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Collection of Gentoo eclass manpages"
+HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/eclass-manpages/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stable. No need to change to ~arch.
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+
+DEPEND="app-arch/xz-utils
+	sys-apps/gawk"
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr
+}
diff --git a/app-doc/linkers-and-loaders/Manifest b/app-doc/linkers-and-loaders/Manifest
index b89c680fb2b7..ee835b60d223 100644
--- a/app-doc/linkers-and-loaders/Manifest
+++ b/app-doc/linkers-and-loaders/Manifest
@@ -1,4 +1,4 @@
 DIST linkers-and-loaders-1.tar.lzma 7346038 BLAKE2B 6d3f1ad4e3872d80b4740ec12586335ef3dbf3a3b9e0642d3cef6dbaf638ac91b2d834c7cd01c91fde517f381212edf68320a55d8b060b533e5e787b88a3e4b5 SHA512 65aa03a4edc9da009f49f3dd5540cc84a64d001d04f12f5f4ea152be5cb246a2b54d0db16bed6d8b764b64fad564227e566504adb5fb9172808b124e0aa79f22
-EBUILD linkers-and-loaders-1-r1.ebuild 572 BLAKE2B 1c17e107f29b6a5c8d8b57daa0e330a6548a7ae12548a30992408e0d27c0bd394e642cbbf1337d16bd0fb6bd9d294e5e1ee2391fe52ca2ce0f1468505ead0a6c SHA512 8efd2a9ba043869f2fa9917dd79184c613b7f9ce6b8beff583428fa92412df76147d13d41093271b399241d748814abbdbeba2f5d0403865756204ed76413500
+EBUILD linkers-and-loaders-1-r1.ebuild 566 BLAKE2B 4d1222bb065266de15fb00b00c6c242c352ee53b51f6f1ac282fec6028f8c36f4a2d8df96464276d79b5df8a836596c858c36c35f12f3f3771070dfb44ec6544 SHA512 800bc771ba32dc56ed4b3dea0a3ec9b208ac1ea1e483f904f28110eba088cf66382eff1099826181b71ba05d6cb229c75e07857a02618aa78783fd5a311e9807
 EBUILD linkers-and-loaders-1.ebuild 561 BLAKE2B 53638932b42644566bc46182276659799dedee4e2e123521553387ccd110920a99bdcd71481f76c73f79d9e3613ac98e6388f10dcbdadd6d36b260b40535a213 SHA512 1af07042ad0b2002ae1254d4ddc824083a5003f85a312595684e15d95c293ca57ee98e0aef2f382376550743a32104a9eee7080d0ea00f2c30ba32bab34f9c1f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild b/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
index 4ed9b9c15398..0c05fc4da997 100644
--- a/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
+++ b/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://wh0rd.org/books/${P}.tar.lzma"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 RESTRICT="mirror bindist"
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 52e1b6599287..f8d02b3d2949 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index b98249913ead..da26e7005ecd 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1,5 +1,3 @@
-DIST ghex-3.18.3.tar.xz 1630720 BLAKE2B dacca0b015dd73dca9ea7a5303de8b6ef981c7e4fd93dfdbb0782ac61f073381fef7d5a1dcb8a88f2d31319fd9583ac6f556ed6856b5ba7d3449bbf2af2c991f SHA512 e03b154a22db000a5994c68bb72280113e69e7ef210f86ab2c6578e77daabf50bac8eb620ffaad5a7eb776d23383478cbdc7fb317fa336cef55173f858519023
 DIST ghex-3.18.4.tar.xz 1420268 BLAKE2B 70a3027a2c228481ecbc6ae44c0a707c9858453e3af7bfc268b6e32a8496722cf117c1b2ce4dd798795a429dccd24e1fa9cb9d1a8c9c8fb5998243369f76ccc4 SHA512 6121a5986ee7d7f96bf7f401e155f8aa37f076af455bc68e43d1b5b02b63bc9aed3eba5209511d1b659eb4c9093ab5d9601c14a5e868d979e92a6d0ca0cf9ce2
-EBUILD ghex-3.18.3.ebuild 515 BLAKE2B 6aa5555afa45caf838b4ac12c51eac0bc649a93b04670ff869e446a0f73031829809c10bdee66ed63262266fcb92d0bb9dbf7a5c7aabaaaa3d359ef11f878c78 SHA512 e2726043a37cd14228c21c47c8cba5cf2add49fc669db221c3635940f8c688250823c4933d5e4d28377d0aef09713345dd579ae3c4f045d78e021b447a3984bf
-EBUILD ghex-3.18.4-r1.ebuild 819 BLAKE2B a667fc8bf80f75d4844ee40cd57d14ba1a97a8e9ede6eb9f6c986e672c80f78f235f7ae56021605d101c12264fdfa76dd6f29f50472d02d42021e35659b9d83c SHA512 7e2a28c48b39cd083e48535baeba534d20ee2447f5dea63c0006709f694a5e939f9e9d9f7f41e3cf349ccf2911d5f15c7f1776bfaefc376291b9d6a0bd52762f
+EBUILD ghex-3.18.4-r1.ebuild 818 BLAKE2B cbae7743d2d8c3734c183d05417cfb5f3168c790fdeb4c2d35cf909465713dec09888813d01e94e3c5f5276d4441d6240905a0a3da9a8b1de81f83a7eee61717 SHA512 2cb6feac4497e9b1793e693bd9a054ecd890a7588dd0c282a41f1ff57f569bb80e1f666052ee1b8e771eed4834430f17a6d771c652f4756174a1a2d313af37bc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/ghex/ghex-3.18.3.ebuild b/app-editors/ghex/ghex-3.18.3.ebuild
deleted file mode 100644
index dbf011b8d722..000000000000
--- a/app-editors/ghex/ghex-3.18.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME hexadecimal editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/atk-1
-	>=dev-libs/glib-2.31.10:2
-	>=x11-libs/gtk+-3.3.8:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.41.1
-	>=sys-devel/gettext-0.17
-	app-text/yelp-tools
-	virtual/pkgconfig
-"
diff --git a/app-editors/ghex/ghex-3.18.4-r1.ebuild b/app-editors/ghex/ghex-3.18.4-r1.ebuild
index 8e81590e73be..3cd47749cca0 100644
--- a/app-editors/ghex/ghex-3.18.4-r1.ebuild
+++ b/app-editors/ghex/ghex-3.18.4-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index ecaa4ffa09d4..58e3e8f97706 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/circe/Manifest b/app-emacs/circe/Manifest
index 1d8d4123ff34..97eebeba76f5 100644
--- a/app-emacs/circe/Manifest
+++ b/app-emacs/circe/Manifest
@@ -1,6 +1,8 @@
 AUX 50circe-gentoo.el 84 BLAKE2B 256e2b96a42e5662222eeadfb0fe7277a09eec8119903ea6e3e9a1dfac3157e238d383051b0738b1a8d555250181db67546da50743221314a0ba1353474ad81a SHA512 3f3c92f02e0a6ee760e83b83c4685a6b7f3268d0cb99abc9be56bdee8dd794d177f865582e45e90f895d1a2d9bbdc2ce39a3a60c7fc4eb973021eab66d8dbe47
 DIST circe-1.3.tar.gz 118776 BLAKE2B 61ffc7df022be50beaba29a4025fde6d7cbde5cab28d0661e2e3388f712281f8d9370b92e8c56b4eb49984573d5a2f7edff308a7d1fe74ff630620f0867b1441 SHA512 60bbd752c73e875f2306877591ad8de324db0a7446bbfebf460e44ef19c0c28d40d08c8ed9e0caa4062859b07545d310d86380377a479eb6bc38c72decfaa213
+DIST circe-2.11.tar.gz 237797 BLAKE2B f5a6e72ac51a8e8638d1e05e4781688d83e7cd4fcf3e3e21e517793588c3a32b1686d390ab286d26fce3cbb7dd3ba7a30bb09ec677deacead16057ae8037e1c8 SHA512 aee0b5c7dfa03a190ba697941664e4afc76ec30b8602b2e95ad771fb6172ef2b76f4d05ad8af68f6b274f7f89373e05308b63e9c9cc494b7df0bf2c58fdca4e3
 DIST circe-2.7.tar.gz 237375 BLAKE2B d9978cc3e0c6431dace919efbd323f90e36ce40debb6e03c955b8cdfbed60ac0bbe27c68dcebfe2df9aabd2e7198d2d6da993c2ad41b5ede0b5d1b142217ec8f SHA512 6f4e0925381ad051e4680b5413eed000a6796d2e9bef35a052464a07968f67edb19d99f74be93620359e061c044a910e35afd1f88608453d264bf37826e10af3
 EBUILD circe-1.3.ebuild 474 BLAKE2B 466b3f47e0e6124ee5d2484dbfdfa189b895cab597253066521075278fc93f29738fda684b2b2ae7dc801598845e80a731f7abff3a0bf16ab7e9d64c293cd70e SHA512 5310ba832a4652166b39247d3f7f581fb2deb99832d55e52c746dc7ff2ea183ada09b03ccfa6c0c55c81d816a412dc5681efc70e3601b975c14ebdfe6c322e07
+EBUILD circe-2.11.ebuild 534 BLAKE2B 330b71e9e9393400b460e668df6bf7c6b320becf5ca2e665452e4a923cf7f183f5d77e20ab7dc06b750ff2a6435c786f0eccd7bb2fd86670c8b1a5100aa185c9 SHA512 c9a782a7f40cc817949504795cd3be5bb1a84f268ee3ff2972e3428ef417c9e9f55ec75a553390dbf2394132d11fd0bea29612655dc7dcd3aafb763fa439a8f2
 EBUILD circe-2.7.ebuild 537 BLAKE2B 9ea555c3500da4eda553396eed1a2b019f7e345214573c343bdb725a6427809aa2460a3fa3de3360274cf7d6ea3cec89f136a6226ae6b0285e412f87cb8193fe SHA512 3f8f4ff558f50958c3dc475fed1aa621e4d24912d325c07fde80562a332f928af64e3c9d2119c1297010b9162c2a25e6f92ee229982d71555162599e9c6db973
 MISC metadata.xml 365 BLAKE2B b725f9635d4c4b98167ccb4145c0e7c9fa32b39cf18e79e7f86e583897bb2a79bdb0aa6fc070c53ee0fd03b41685ffdb9f7636c10ff6bfc1c7244f81e4b417a1 SHA512 9e3191129263a25e6ecbf4f7252b326a1addcb110a324d9a4c277ce7a152c086f361796454174e01696be6ad3f9404628b4c9264e3bb7ac2644eb2f72c8e3657
diff --git a/app-emacs/circe/circe-2.11.ebuild b/app-emacs/circe/circe-2.11.ebuild
new file mode 100644
index 000000000000..eecc09dc8adf
--- /dev/null
+++ b/app-emacs/circe/circe-2.11.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A great IRC client for Emacs"
+HOMEPAGE="https://github.com/jorgenschaefer/circe
+	https://www.emacswiki.org/emacs/Circe"
+SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+ELISP_REMOVE="circe-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="AUTHORS.md CONTRIBUTING.md NEWS.md README.md"
diff --git a/app-emacs/multiple-cursors/Manifest b/app-emacs/multiple-cursors/Manifest
index 23c8fdbd9776..9ab775103cc7 100644
--- a/app-emacs/multiple-cursors/Manifest
+++ b/app-emacs/multiple-cursors/Manifest
@@ -1,4 +1,6 @@
 AUX 50multiple-cursors-gentoo.el 80 BLAKE2B 90614e49e4e09b48bc2e34a9f7f2a33fdf3090ede9af2f48d297a88c9531031b4aa73213659780f3b1de49d18da7c35f5c78a9ec4393d85cd92c607f781d89ac SHA512 3c5a03d2cd864fdaa43bdbce47884b189abac77ba99cf57cfe2a6bc2c65cf3f32d45739832ec30613d884a01a08547cb80a028eb6b9a93329ea690ef57230fa7
 DIST multiple-cursors-1.3.0.tar.gz 25880 BLAKE2B b0578299fc1e700ec627f1cdcf153e47d0c32df3374db2bad0d88a76933b0253de61f4670ff155fe6cb7d92d43204d47ffd44d8b90f093fee64a18ee3085049b SHA512 2d321f9016b78aeb37507071756781c84b576a0fbefa385474c8c6287c989412b72b83dfdbe79bc0da1485893ea01952b6e0d392573386338db9e8728f722259
+DIST multiple-cursors-1.4.0.tar.gz 30152 BLAKE2B a63c09afb464cd208296e359f59babbc9c9fdace1d5261386bac4ab44f7896bfe2eae869e49c2c094b80af453bd50936c7feeb42e530536d148154c879ece90c SHA512 070121365380db3dc77749ab6f0da2f034a979cacc07a11e805f1da81ae70fccff1abb4a0353fa30670b3a8d686ebd25e501d13fcc42d765f5c015a83c62146f
 EBUILD multiple-cursors-1.3.0.ebuild 504 BLAKE2B 1f1f6ac2d7cce30dca0e271a0d757e4b81a88348dc7cd6e78d7fa7bf6c74645a6c9b43ec22f574aa625dec56032561b28784ed2faac7300b35bdcac1e303271b SHA512 251e358812df5ae3a05d9a3081ebad1d02ae7386693b39ed37e417268cb7181d067b767c763b6cf8ec9ed8e4702171bd42260b03fa96147550d5afc26bc1da77
+EBUILD multiple-cursors-1.4.0.ebuild 501 BLAKE2B 40a320a6a07121c5c066217ea8df04ba25a09ad82b0aee14d4011401395f3c2fd64d57479d28ed9d57851f1bdab0e2883ec5a872aeb478103e828a83e512d717 SHA512 f81a1935720abe40297b0c5513139eff830e4c4b5fc4763b23aafe7c2289444f8c319737678eaa2d97b4b1c6f45cd7158588d7ce9486e87121de933456e80fdb
 MISC metadata.xml 372 BLAKE2B 9e5668003abdd4f8688521568299c96a139226432f1d35248056ca624bc558feb833c20a2ade9a946eb7436eabafc1b4c289995c192d543d3f48e4066c6245c0 SHA512 392d223ae60d3b40f0bd46ec369e53753f72872352885201b2b7a83262d0ec73c584746dd110f69b86c72e81415d47af9e72fd277157135565c953b11915fb27
diff --git a/app-emacs/multiple-cursors/multiple-cursors-1.4.0.ebuild b/app-emacs/multiple-cursors/multiple-cursors-1.4.0.ebuild
new file mode 100644
index 000000000000..97a40f1ad198
--- /dev/null
+++ b/app-emacs/multiple-cursors/multiple-cursors-1.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Multiple cursors for Emacs"
+HOMEPAGE="https://github.com/magnars/multiple-cursors.el"
+SRC_URI="https://github.com/magnars/${PN}.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+src_compile() {
+	elisp-compile *.el
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/vhdl-mode/Manifest b/app-emacs/vhdl-mode/Manifest
index 8dff75ee68dd..b913b5c68931 100644
--- a/app-emacs/vhdl-mode/Manifest
+++ b/app-emacs/vhdl-mode/Manifest
@@ -1,7 +1,5 @@
 AUX 50vhdl-mode-gentoo.el 146 BLAKE2B 4a747d323606390205a52c3cebfd1e54b153e9e18ec3fa5ed557493df1579b783cd29fdef2a031f6b8f8c573fa3eb82e312c8e7449a5e91ffd00ebe9b4c874c1 SHA512 22f1d437f487fc2c0e739000687424271027c2defa87eec696c79ff5df958c6087475c7ff84c2af39e2eb756401ec1d4b1f013a27af1639c416843899333ee21
 AUX vhdl-mode-info-dir-gentoo.patch 522 BLAKE2B 35204f9ec727ec5ec44ecc03a99cedd5a5a3bc62e59dac577ed40dd0099cf08788b149e16d4fc0c2953dbe70bad8810eaed8496165e3b65ae1d8c23298a2aa5d SHA512 7ca2b0ea5c07255bf99e6a9105c120df924178a596e97d6a1bfcedfda4bcdf4f093f1383d1ea2a1383207c19971a110696ef9b49b17542e79d92c4501316039d
-DIST vhdl-mode-3.35.1.tar.gz 316090 BLAKE2B 5517c7881fc52df631d3efeb82e88d0b5db7038575eb378e241d062c4746d810ab308005b24570725ab244d1d3229b69896f8821944b15664561a38d828f4ae3 SHA512 963d4c8c938c9c9279a7ab862da6fc91257ab270e8eefb185d73b9c9217c4cc7b7330f2b33300bb7b604ed348543621d8371685e7e4a8f29d596e76ce8795f1c
 DIST vhdl-mode-3.38.1.tar.gz 318400 BLAKE2B 2ddad9f4e8fdb0fafd2e27075f5722fcf7959a2b50ad61c5860af52706d9579065e0880d7b9bd1b884c21cfc902760dff006404490c8cbb1474831aa4c6d841d SHA512 2cc12994e17658d65cffa348c59ac3208cc0f498731941b8f64da68e258ca57d6aa500d72103b005996cf3496e119cf59b52bbc1c4b740401685030b42f272a8
-EBUILD vhdl-mode-3.35.1.ebuild 530 BLAKE2B 2301997d33cf7a51789b8c66a15439cdb7a63c102cffb8cd48dc381d8f920863fed59a0b50e603516a8e9476d402e8ae09cc172779fe36d6f26e9462b1d47648 SHA512 1c1c7584288f7a3e9a666d4563347441da782deeddb49eed51a305beb21cb1aa6c062a0355ae8454130006532134b8bd0379928ec17fe2d7e035fb0f4da0f515
-EBUILD vhdl-mode-3.38.1.ebuild 533 BLAKE2B 88d38d63abb7ae205d808b248b5fa9656f41f1edf147f0fd797928616aa9901acf44e0365351e941689b11de76dc4d391a0490d738f5d108e877e0ee9239060d SHA512 47b31b47cd00c415f8ddc14814f1339a826e234999b0f36ea6ce170b9a8822c210320e07fa0e03acdbb69a3a0506b5089ad38e7bc40b96af2124edf93c836b6c
+EBUILD vhdl-mode-3.38.1.ebuild 521 BLAKE2B 6daf2a4dde624f116e6d1aebc272c7cc4e4ed2e35ac7e74892a146ab728becf5bfbf591c1355f789bcfd52472d1a84eeabea247eae72c97d4e0797357b35d9ec SHA512 10a2e5ffa339d897d17eb6618429fbcc4b1e539c03e4d543b39c186d7abc88b83cd8d813b771f67637ec7686e5eb785d031ac84c291708d3b054359e23524776
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild
deleted file mode 100644
index 60a209731182..000000000000
--- a/app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="VHDL-mode for Emacs"
-HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
-SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-ELISP_PATCHES="${PN}-info-dir-gentoo.patch"
-ELISP_REMOVE="site-start.*"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="ChangeLog README"
-
-src_install() {
-	elisp_src_install
-	doinfo vhdl-mode.info
-}
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.38.1.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.38.1.ebuild
index b998478a45d4..f6225cb586c5 100644
--- a/app-emacs/vhdl-mode/vhdl-mode-3.38.1.ebuild
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.38.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,12 +6,12 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="VHDL-mode for Emacs"
-HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
-SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
+HOMEPAGE="https://iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
+SRC_URI="https://iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 ELISP_PATCHES="${PN}-info-dir-gentoo.patch"
 ELISP_REMOVE="site-start.*"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index fbb3bc1c485a..95ae9100d2dd 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 03937ba7342a..661271fd6d17 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,11 +1,13 @@
 DIST buildah-1.10.0.tar.gz 9362108 BLAKE2B 691b5273056f9eb3e1f1dabf22c299ae281af8db13e680351bc0f4e0b6560b0ac20def5a1b3a039d14b97bb35a935a34ae83eeadc6272ad4d68a494439cc5f57 SHA512 33d33bb622e69512a2e11592455d654f6478994e78894bd0f73e03cc01e12c7e30b1fc25bbd6b44a3ce83b9e261ffb47c3d08a99bf523f4fe0e3ff00d93861a8
 DIST buildah-1.10.1.tar.gz 9378648 BLAKE2B ea563d1a52634aa4e0172f05caf04b511bd9962cec012ed35830ceb5848dae1c14020167d61d44e11d0dcdcd6d5440c216505a11987f6806bac1336dd12152c9 SHA512 0651ed1ec6015b437ed0a786bef20c6a88fedfa4d318edc081d257720b1cc2c8d380a8cde5125ab5894bf0b4a6df90034b689097f7cc05630401e8e7700fca6a
 DIST buildah-1.11.0.tar.gz 10065996 BLAKE2B fcf709f7474bcb45f2da6f90b614b4c95036d19c05fad715f80720efbb9ad6c4be6725001de4b5198c7d81e365ff12a742b73bc5d7268819de56c4b2fbe0b8e4 SHA512 a5e852a427de4e3f3ce8d78fb8ea82e8b6e0a1bcc6a0bc786c2bcb0d4689fec5f5a6413f77898bd953dc7eeea31d1d58fe22fac40cd5209fa5016a376a9958b7
+DIST buildah-1.11.1.tar.gz 10126770 BLAKE2B 88ee8aa43490b12e0e63cbdae24d62d8fd10f8a502689dc30b748213aaf32851bc83c4fce38316f79523e3fb3a7110fc763d8bcbd24181ae45abeb5b3eecdda5 SHA512 322fe1b249ff6db160bc1dc111d19ddde8f36ae931f222aeab21e0b39f60bcbe9ad8b11cb6ee088b028478d6774a2fb231b6d457ed4c30cd5477b4a67ebcf06a
 DIST buildah-1.8.4.tar.gz 5122400 BLAKE2B b02a1cac77f5f16ab6cec3a74f11ee94675c717ead21fd791feb4cfbd08dcfb4313a1ee3134d3b9f9d20218935db35e28dab406a9f706ff2f46a2beb1abaa56b SHA512 a316e5e2bea7cded1db089bbc7831c9af69242caa6108c78d63864c012053bda3dc3da5bf70248b2742b2be1ad66aeb59c844558022c20f79236f5b1292d6366
 DIST buildah-1.9.2.tar.gz 9505091 BLAKE2B 886e1ae5804f005f5782d011ed8440a8ac5eb09b2cf7917ac04ed1ab3e08f8cce6ef9b8efaf3392d60ed46b5bdb2efcec8b44c0448f970210cd613837a5d8f1f SHA512 1add432491fcae3b22dac2768ba71be2a47f42f3d9fae14cc5ff54220b3b7b96a48a95cb10b249de98f9c3067d463bbeca75c7c52783c111a9b5ed0ba03eb30f
 EBUILD buildah-1.10.0.ebuild 1446 BLAKE2B 6fd24b1e8f98f2db900fdc3840e7448cb61fa1023783e22d384a0ecff4da5d8398c9c8cd1c096c6bb6cbef297517e009fbc818aed03716b05c9f4716b237ce71 SHA512 a743db9feccc105c90b0180e4151d62d4e8bb400b8f3324702896821560bdc8d08e9545c738863e4985d7fd9a264fd7cb7166446167dbeb51348d499cf47017b
 EBUILD buildah-1.10.1.ebuild 1446 BLAKE2B 0d5351236e5fce90665bc9b30e134d9a33ad4ed0cc9d6fb4f4977243946fa3dcaa94e7c156b7db58aabdbdb12c2bbe4f10b54d7eae644734b68584b30970ab85 SHA512 956d1447f322af82f0f8f88c483d980b4409e5cecb6d01980ad31b16844f46722497cd39a760c169461cf2a493fb31bc191df8dee682b02edd038054aae52487
 EBUILD buildah-1.11.0.ebuild 1446 BLAKE2B 8dc0564305db4174600aa2181a0ca5c67c4ba8c2526e148a58eff60c0078057f0a1d1c139a25167a7ba2919a1c069f2026b5f357f88217a65234b647059eedec SHA512 42b645d49dde0685aaf444166c2809d424f7fcfcaa1ebf07c919c5156988ce0b320397770ae7d4108bdb1ff40cf733806d0b1296330949c96d83d4e59df8d198
+EBUILD buildah-1.11.1.ebuild 1446 BLAKE2B 86efb60a185258e544e9ead22fe4f623bb6e3cf23be41c8db6d2e45293706fac719db412596c9168b9e9926d62334f35a45022594ad1f0ca21e95afd42402ebe SHA512 c2ecf53db18fc1db4f698284f1cefa037f41d5c0e48471377a2bbefd5f250221da813264c4754d2fb5b179ac1fe302250f2cc744cfb2d50bf51c2561d45a8dc0
 EBUILD buildah-1.8.4.ebuild 1446 BLAKE2B 12ce28dbbc9cdd9b3dcc9ffb32d31e343645db77c83349b02d114d1fe26d9f3a54208df5fde51760e913ffaaa2ea3b1f8ba5ef7e2bc925767ca41899d38d5688 SHA512 7fe65e02c631a6688d402fd6922b8bfb8cb8ffe9f496ccba5ccf2356fbdc066cb827a759f57f59ad53ab85c6544244fc48f0d5e048010ce7ea23b54512fc16ec
 EBUILD buildah-1.9.2.ebuild 1446 BLAKE2B 5f89e5874d84b1813c39485970832ca13a7ba70add473867d14d36d1252139bc0059ee3a365b0a530297c58dffd046ba55cb88771bdc8faf8313c70ee3adcf40 SHA512 502b062366388451ea0c120b6d05a6d6cc2db7a8b1f986f3b6e72b104b0651dd313032f16f56c5bbb7c519102598d1c94c73ae9f25c2ce6080fbab6cf1948c42
 MISC metadata.xml 430 BLAKE2B 7486f6f62edf735da40a63ee17411e421101908e3e2652584800a3bfe315afbd46b9b6fe6338f8bb6cc7d09eb1bab34c1600e9aa6ae08b8d0326ee896270f2ea SHA512 8f25eca02d11272cc5a479adf3e361fe7f7cd595b0d54d26668b68940e012499d6c447ba93f44773a72f5431dffc346f1286be1f1a984eaa94e9dfc9501eb7b0
diff --git a/app-emulation/buildah/buildah-1.11.1.ebuild b/app-emulation/buildah/buildah-1.11.1.ebuild
new file mode 100644
index 000000000000..81faedfb0507
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.11.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ostree selinux"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="413bd1f"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="app-crypt/gpgme:=
+	app-emulation/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+REQUIRED_USE="!selinux? ( !ostree )"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+
+	[[ -f ostree_tag.sh ]] || die
+	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
+		ostree_tag.sh || die; }
+
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	GOPATH="${WORKDIR}/${P}" emake all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin ${PN} imgtype
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	GOPATH="${WORKDIR}/${P}" emake test-unit
+}
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 16859a65b6c4..6759b538f174 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,6 +1,6 @@
-DIST diskimage-builder-2.25.0.tar.gz 419297 BLAKE2B 78ac5b1119233080dddef917b05ca4f51f73382bb325cbf228f63837ab79be9ce524351404f2a26cf735440c66a3dc246a1642258b77f217406998650860eb39 SHA512 4afd257b01924a526ef335bf6699f5fbf49ca0c08bb3d288a6823783b842827e3afb51794771994f068332c6ee2ecf6f105fc03112d6a7807932fb5ab1fa4c24
 DIST diskimage-builder-2.26.1.tar.gz 421821 BLAKE2B 11c0ba668494285f33f3461e1a2c091ce6d622e4be164c4ab56a93cd000c82cec6702a6ed2ae37007120320f053760473f45f58ad8b45ee14b7b3eb47ac82d9a SHA512 e8bb68d15fc0bdd4881e76a7277f3e5e481b77decb4591546a576eda015bf624da3746326735add299551e168b82ab8bb165a18a64e96532c5b846e49815528f
-EBUILD diskimage-builder-2.25.0.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
-EBUILD diskimage-builder-2.26.1.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
+DIST diskimage-builder-2.27.0.tar.gz 421632 BLAKE2B 3899f65c3fe29a9a39410393585c12c977687c6cf2865fcb4a923780600f92f09211a65f7e69e9e0c00501bf6db21341c1a2f55fc066e53574f4ad1808464dba SHA512 90a84489e4a753d6aa2a445abf3eb1402c387036959055bcdb607b7daabaa43502bd0689d450a5e785271aa3a3f696cf20fced2dfda7b9c872d59a9e2f87cf30
+EBUILD diskimage-builder-2.26.1.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
+EBUILD diskimage-builder-2.27.0.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 EBUILD diskimage-builder-9999.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.25.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.25.0.ebuild
deleted file mode 100644
index 20cf3dfed3ae..000000000000
--- a/app-emulation/diskimage-builder/diskimage-builder-2.25.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
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Golden Disk Image builder."
-HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
-	<dev-python/networkx-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
-	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	app-emulation/qemu
-	sys-block/parted
-	sys-fs/multipath-tools
-	sys-fs/dosfstools
-	sys-apps/gptfdisk
-	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild
index 86d3bb124b34..20cf3dfed3ae 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.26.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.27.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.27.0.ebuild
new file mode 100644
index 000000000000..86d3bb124b34
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.27.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	<dev-python/networkx-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/ganeti-instance-image/Manifest b/app-emulation/ganeti-instance-image/Manifest
index cc62dccdcd68..b93d05873ff5 100644
--- a/app-emulation/ganeti-instance-image/Manifest
+++ b/app-emulation/ganeti-instance-image/Manifest
@@ -1,6 +1,4 @@
-AUX ganeti-2.15.2-os-image-common_sh.patch 1869 BLAKE2B 61c3ee20a7774874a85b773b221dfbfe6151d5849e677198a8657ef8a5244be5546caf8fdd1d1c771dfb195c7748c430689ab854a0d7998f7636d60456f81846 SHA512 5ed87c15884aae8ce23dae6e40ddf48e91c417bafd9e20b97acd5e20583bacfa9d37433466c2f91e27770f86f3b462c056e35f5ac4235e955348c52ba67b8e6b
 DIST ganeti-instance-image-0.6.tar.gz 82534 BLAKE2B 8a16f1ead6307400031425c60dae2585ea9ad53e55276a73177b46652c9054c6c24ea7068347ecaeafa77cea27b1b97350420bd6cf0e69e5ac18692cede47bbc SHA512 92b5048fe8c40692e8e7c4cb73b21e764660d7cb5f585a8489fc4338eef7df8aae1147d38a849103585a884a0216a0bfb42473d5c1922130e5aada31f5d580c3
-EBUILD ganeti-instance-image-0.6-r1.ebuild 1057 BLAKE2B 232dcf827777247b952f2401d0adfac3c20df4b10ff521c29319167d08e13a6a899ae4d803512d2ec74118153ab51e7d83b75e1c655fe4323efa9f26bccd8ccb SHA512 1457c2beb8fd4eb5176285bb2ac67315675d810008842150fcef168b76a068d520067c376a0752fbbebf52dc1cd047532f112e7585ca8354d3cb46a86dbad946
 EBUILD ganeti-instance-image-0.6-r2.ebuild 987 BLAKE2B 2394defd8cf8b9b6ab8b06614ee0cbd7c0b582af81ad57859bd64ce5613d404feb8be33ce570aaae1108f6165960d25bd63fe29006c3041c282eaf029dfd50a7 SHA512 3cba2e12ae9f97b60e57ed44e829cd7b4eb9d3594c0779616b9b7d0e9a336e1b7e3d1d89d750ec161f7bf7e9dc2195d10369e13b90701c87cd2dc4868c05ebd5
 EBUILD ganeti-instance-image-0.6.ebuild 990 BLAKE2B 79251b99b7a51045025577f5481c08cecbff9b8bfc860c243e83c6ab08f4f0d9b3d31f08fc78899bef632aa6bd7b362b139d75d9e421f263ca76a3105dd8c870 SHA512 98764555f1dfd871a16cc8cc65ce5e6682b01575b6746a6560c65434f2e95a1ddcade4ada125c75aa79f3bcdcf65c51d6c3eca40c1acedf1c7e682c38418b340
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch b/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch
deleted file mode 100644
index 73e7ab8a923d..000000000000
--- a/app-emulation/ganeti-instance-image/files/ganeti-2.15.2-os-image-common_sh.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/common.sh.in        2018-09-05 23:23:07.811528673 +0000
-+++ b/common.sh.in        2018-09-06 00:10:36.993693654 +0000
-@@ -284,13 +284,13 @@
-     blockdev="$1"
-     filesystem_dev_base=`$KPARTX -l -p- $blockdev | \
-                             grep -m 1 -- "-1.*$blockdev" | \
--                            $AWK '{print $1}'`
-+                            $AWK '{print $1}' | sed -r -e 's/-([0-9]{1,2})$/p\1/g'`
-     if [ -z "$filesystem_dev_base" ]; then
-         log_error "Cannot interpret kpartx output and get partition mapping"
-         exit 1
-     fi
-     $KPARTX -a -p- $blockdev > /dev/null
--    filesystem_dev="/dev/mapper/${filesystem_dev_base/%-1/}"
-+    filesystem_dev="/dev/mapper/${filesystem_dev_base/%p1/}"
-     if [ ! -b "/dev/mapper/$filesystem_dev_base" ]; then
-         log_error "Can't find kpartx mapped partition: /dev/mapper/$filesystem_dev_base"
-         exit 1
-@@ -302,17 +302,17 @@
-     filesystem_dev="$1"
-     partition="$2"
-     if [ "${SWAP}" = "yes" -a -z "${KERNEL_PATH}" ] ; then
--        boot_dev="${filesystem_dev}-1"
--        swap_dev="${filesystem_dev}-2"
--        root_dev="${filesystem_dev}-3"
-+        boot_dev="${filesystem_dev}p1"
-+        swap_dev="${filesystem_dev}p2"
-+        root_dev="${filesystem_dev}p3"
-     elif [ "${SWAP}" = "no" -a -z "${KERNEL_PATH}" ] ; then
--        boot_dev="${filesystem_dev}-1"
--        root_dev="${filesystem_dev}-2"
-+        boot_dev="${filesystem_dev}p1"
-+        root_dev="${filesystem_dev}p2"
-     elif [ "${SWAP}" = "yes" -a -n "${KERNEL_PATH}" ] ; then
--        swap_dev="${filesystem_dev}-1"
-+        swap_dev="${filesystem_dev}p1"
-         root_dev="${filesystem_dev}-2"
-     elif [ "${SWAP}" = "no" -a -n "${KERNEL_PATH}" ] ; then
--        root_dev="${filesystem_dev}-1"
-+        root_dev="${filesystem_dev}p1"
-     fi
-     echo "$(eval "echo \${$(echo ${partition}_dev)"})"
- }
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r1.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r1.ebuild
deleted file mode 100644
index 6d10cc0ad0dd..000000000000
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://git.osuosl.org/${PN}.git"
-	EGIT_BRANCH="master"
-	inherit git-r3 autotools
-else
-	SRC_URI="http://ftp.osuosl.org/pub/osl/ganeti-instance-image/${P}.tar.gz"
-fi
-
-DESCRIPTION="Scripts to build out CD or image based VMs using Ganeti"
-HOMEPAGE="http://code.osuosl.org/projects/ganeti-image"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-arch/dump
-	>=app-emulation/ganeti-2.15.2-r7
-	app-emulation/qemu
-	sys-apps/util-linux
-	sys-fs/multipath-tools
-	sys-fs/e2fsprogs"
-
-PATCHES=(
-	"${FILESDIR}/ganeti-2.15.2-os-image-common_sh.patch"
-)
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf --with-default-dir=/etc/ganeti
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	rm -rf "${D}"/usr/share/doc/${PN}
-	dodoc README.markdown NEWS ChangeLog
-	insinto /etc/ganeti
-	newins defaults ${PN}
-}
diff --git a/app-emulation/grub-xen-host/Manifest b/app-emulation/grub-xen-host/Manifest
index 58d32507e5a5..b299862a0fe5 100644
--- a/app-emulation/grub-xen-host/Manifest
+++ b/app-emulation/grub-xen-host/Manifest
@@ -1,2 +1,2 @@
 EBUILD grub-xen-host-1.0.ebuild 1682 BLAKE2B 3d718f06ccef3a0fc4d3d39d64e8fb39af24f558793e4f7c96ec616585cf95371091737287bbc282476c1a649bd390e0a4eda0da168c8c40b5c9294e24eded8f SHA512 08e24d2b9b0c45af8cc757fe8c7dd29d5e69803b953897c2e552053f09358a8ae1a328402f148337ba738476c14e1c6db4fa4f37d68d04a4c65b7cdc208bb83c
-MISC metadata.xml 514 BLAKE2B 851dced55bcc8b7188be4b3b0758af207a0cbac7c5bd59138592fcd0ea185e701abbf08e36faae46dc41cce794c8fe95143c7393f0ce428f9aca9c7b27fee380 SHA512 356a5343e7133e6778d3b1e3715c76c2c873bd74049c13b4b9689ea0a69bedae6ef5fd9529b944540f6c22d4f66d02aa098f0c15dfada9cbe16ea74337b6f3aa
+MISC metadata.xml 436 BLAKE2B 03924f7f085a065b132b43ed495da190beeba74930b19492331cdab438aecf1af8d1677682500db01868bc01615114a48824832f1c032dcc2abd9f5d6c2ee4f6 SHA512 0abf2f429df9f3bf35b4314842b9cd8b3469655b061d1daf988f432f657575196c9762ec4b2c5003b7b6cf22534292a711738ecb26491a42b32245bd9d2a557a
diff --git a/app-emulation/grub-xen-host/metadata.xml b/app-emulation/grub-xen-host/metadata.xml
index bddad784d7fd..84e79366a42d 100644
--- a/app-emulation/grub-xen-host/metadata.xml
+++ b/app-emulation/grub-xen-host/metadata.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type='project'>
+	<maintainer type="project">
 		<email>xen@gentoo.org</email>
 	</maintainer>
-	<maintainer type='person'>
-		<email>cardoe@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		A grub 2 built to run in dom0 which is a PV grub that can chain load
 		a guest installed PV grub (grub legacy or grub 2) or handle a guest
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index 87a52c545c65..2867f64c9358 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -1,5 +1,3 @@
-DIST img-0.5.6.tar.gz 3429213 BLAKE2B a1525d4aa09e11d122b41b54da8b90557dac3d0bfed5ea93dd6dad31269b7095d58d6d44dcd92dad9d56436132493d7ec8f1517b32eaa2bfb608bfb1fef639ec SHA512 e1a4469717df66f167f859cbf82ce54dd877e3e9c2f2d723f4424480c0429ac6ad99a13718c103bed3a823a91bef2f3ee3ac6c17e6f951f74f2f1b3ed0021785
 DIST img-0.5.7.tar.gz 3875988 BLAKE2B dd8f13f6861eadc3a4c3d2d07ac826e53a8f3b83d66974717e9312c579967e0c9b57657c8fe6e86f03bb91fd7a82bc6d8d7d87a70be4dd85da10800d8909a51d SHA512 a42247c2ceac0ccfcc2cfd6a561a058855869f0219994cd8fa2bdd5092be17803057e4cb48a2d5277fdfded74dd06eb7c3c3db590fbde91502aebcaf593ddef7
-EBUILD img-0.5.6.ebuild 918 BLAKE2B 4585d6c42446ba7c649791d5d4fdfd3c916457b26e40827d785900384f74ec5d888422e752538a195070858692405173f5f7cbe932cacd30087c8c7939fabf70 SHA512 fbd4cfd7778ea358f7ce43305bb52a9213269b7307e005cc0cbd053ce081087e1924069f001b105c163f87ed3caa1ecfe442980c965f4fd0a4895a51687796d4
 EBUILD img-0.5.7.ebuild 889 BLAKE2B 50e79b991e0398aa79085dee21ab1d37e7c4e46d7a77794d88080de7d67e1101e1e8f0a1a5f0ea88492afc4f91416077e382345bbbabde8f16bfc00480f08d29 SHA512 d1ca0e8d9a670a16389d3e06683a6ca3873a8761ef29b317496e45d1461ec6bf624a79561caca39e79b4d9c325f2ef5164f7b9cc576a6bfe89bd6613bc2bf96b
 MISC metadata.xml 248 BLAKE2B 65f712fa82650530a08edb7671e6c6104649422106cd65d55253bdf920e84cc64ed47038feca9da18e770997c52cc6fdec416a6d82eb4146677b78d8509048ca SHA512 0de2cc5b3231aa87bc19df0801003e020b1599bf4a006a991a2d46d84495569245bb04756c1537376293765593167f2c083c46470389a5438ca7b44abafb0a2c
diff --git a/app-emulation/img/img-0.5.6.ebuild b/app-emulation/img/img-0.5.6.ebuild
deleted file mode 100644
index acb7de2fa244..000000000000
--- a/app-emulation/img/img-0.5.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/genuinetools/img"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="d08b52517b4f2ec47e621541b8799de82c1a31f6"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
-HOMEPAGE="https://github.com/genuinetools/img"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE="seccomp"
-
-RESTRICT="test"
-
-src_compile() {
-	local TAGS=$(usex seccomp 'seccomp' '')
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/README.md
-}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 22dfd3172d8a..4fd252de5b35 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -2,9 +2,8 @@ AUX de-translation-newline-1.patch 432 BLAKE2B 2b546cd7200f0d736bffd255bbb79d4e9
 AUX lxd.confd 538 BLAKE2B f020d83375bddc3e88f752d4be49c65893901893eaa572f212c655f4d3c5631b41238ed917c70f16b4c092d82ced13011edd6e91140cda251ebf8745591cd886 SHA512 9ea61647a8da82bc595f78882adf5a6c71483c7adf8965d7d32016a67a0da6510f8dc3d09fd29f77d5f6d5f18282bca3b3b5c2abffaa67265a4fd4ddb07f31a8
 AUX lxd.initd 853 BLAKE2B 0b48de1a596767db356850adcb5682c5c351e7477b0d49d81aebf857a01e4eb75067087d323ba4b5d6fbf8765a76cf161ad2cfaa0eba480fb86e91fdb95b0e79 SHA512 960aceb2845cc3b454b2f916c73273f4b1ec6f87e5d569c27c8c58e0db153c084e03addbdcc91dc8761fc6f0e306261d87db73f8610fda197e55f9ec6756fd56
 AUX lxd.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140
-AUX ptbr-translation-newline.patch 599 BLAKE2B a60e323bfcbdde55bb82f930165a56f0806975370ea090d30a2f40057445b7552b1ff368aac4518e3539f2a4f9b66bd474498f7797002c9bf92d0d837cb72246 SHA512 07c7682ac24b138da10e1a24da02b0cf6144d911200d89ae74d4a03c16fd2a75a22f5956902d071fb93ae1b9b74aacd4ad98e98764678881e19773ab64561581
-DIST lxd-3.12.tar.gz 27365315 BLAKE2B 2b371ef4e9703a7a0494ca009b3c04a3051d76ba0bc87566b90871059cce04f80c5d941d639a53762b219f658379bbffb8ed844cee4271bb756aecb2742ce1d0 SHA512 fd56ee2a2114b338cfb8b575775530b34c7dcc978c95f9bc3b0dced91cf7f01558012c357eb3f8220bc6fa6aa5ecaca67d47b300b67c0d193f11c5088ce6330e
 DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
-EBUILD lxd-3.12.ebuild 6891 BLAKE2B 91296155f7a1d53ae46e594a9171945fc371c5d03276b28734d180d3eeb4a6b1ef973cdf47abadfdc2d580b5879c1aab77d517c1a9034070b64f6c43aec1c55c SHA512 a3f8525e2da1cba2c1ce2ed4f05ec13f78faa7c76a90e08d11eea5d7d3840b34c2bd0f6e3edff6759cb037974ea7c9f9b9f527fef8bafad314995c42d64fbcd1
-EBUILD lxd-3.14.ebuild 6839 BLAKE2B 939781e111424f59cee080925c822bd8574953c311a7a15906482eb69613e03ff161e85149890724191fe3b01eb4ef877ebb7440826155a9438bccbefd89cdf8 SHA512 13d4537a75ef22eb92a8da9053b46ec48ff033bec6a01bf7ee6b63b5c7dc611bd729b718b646b406c7c5de54dad06236ea9ae63afd304bb8baf6034627eebb03
+DIST lxd-3.16.tar.gz 24863601 BLAKE2B 0087c00d86ea3f623ea31bc008176e4232bb432f5c431c288f5c5ff3e1658abe4e310509088ddc6b23d8db68f8e93997522b8a5c0b19fd243abee13e11d3deb9 SHA512 11c6c5c49ceb23c31979829937e1baad340b8920481ef5b89b2b6d0b6b05967ec1f446f8b0330c11008f6fecea077eed0858af7fe802c50b52148757584fdfb9
+EBUILD lxd-3.14.ebuild 6838 BLAKE2B 19767cc66314b0faa5270a51fb0f5db7264c6f55bec02ddbed3673b3c051d16f9556d59da592b55b638b0e93d76fe549ac1ab24a5fe997d0af19c71f0ae4cb47 SHA512 8f7309e0eb05b64e6dbaf2c048511737d7df96d35bb1d0a340c9e80b2a025b3d49a37795303b02b4c0429fdfb43e881be22d1f4b555949a25c4e51b9607f3dbd
+EBUILD lxd-3.16.ebuild 8078 BLAKE2B 48585fc59909c1d404fbc1cb44e4c7ed4c49b78e2685dac1a542c9be44efffdd679c6bea7997cc0e52f0e434a4d96d1cedaf3ff53fc9e2bf96018da770484780 SHA512 03cd8e9a1e2da16f6f1b6720556fe781c96bd9376135cfdfca17bbd4028d31a71ff490bae8a6317e8bfea89394a87fd5b9505a8803fd80cdecd60f03764f96a4
 MISC metadata.xml 925 BLAKE2B 74a89f515bf441f62686a9a2fc2576ec8986705b681e52c9e8267acd6839b06fdafe82dd27df43c39b5e09bba87e63bbb27cc4da18ed31931393946b90add05b SHA512 e4fc6d70a790e164366349e4980f5161db0ca1b4d1996c1ce32223a75926a38ea46f8e08e6c708c6f41c2c81aebde3dbe0d0ce5c63f9340f7ae6f895b5fde144
diff --git a/app-emulation/lxd/files/ptbr-translation-newline.patch b/app-emulation/lxd/files/ptbr-translation-newline.patch
deleted file mode 100644
index 92d78ca14270..000000000000
--- a/app-emulation/lxd/files/ptbr-translation-newline.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- /po/pt_BR.po.orig	2018-10-13 23:27:01.523645894 -0500
-+++ /po/pt_BR.po	2018-10-13 23:28:04.730644762 -0500
-@@ -95,7 +95,6 @@
- "###\n"
- "### Note that the name is shown but cannot be changed"
- msgstr ""
--"\n"
- "### Esta é uma representação em yaml da configuração.\n"
- "### Qualquer linha começando com '#' será ignorada.\n"
- "###\n"
-@@ -112,7 +111,7 @@
- "###     type: disk\n"
- "### ephemeral: false\n"
- "###\n"
--"### Observe que o nome é exibido mas não pode ser modificado\n"
-+"### Observe que o nome é exibido mas não pode ser modificado"
- 
- #: lxc/config_metadata.go:63
- msgid ""
diff --git a/app-emulation/lxd/lxd-3.12.ebuild b/app-emulation/lxd/lxd-3.12.ebuild
deleted file mode 100644
index a330cfbac4e1..000000000000
--- a/app-emulation/lxd/lxd-3.12.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
-
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE="+daemon +ipv6 +dnsmasq nls test tools"
-
-inherit autotools bash-completion-r1 linux-info systemd user
-
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-DEPEND="
-	dev-lang/tcl
-	>=dev-lang/go-1.9.4
-	dev-libs/libuv
-	dev-libs/protobuf
-	nls? ( sys-devel/gettext )
-	test? (
-		app-misc/jq
-		net-misc/curl
-		sys-devel/gettext
-	)
-"
-
-RDEPEND="
-	daemon? (
-		app-arch/xz-utils
-		>=app-emulation/lxc-2.0.7[seccomp]
-		dev-libs/libuv
-		dev-libs/lzo
-		dev-util/xdelta:3
-		dnsmasq? (
-			net-dns/dnsmasq[dhcp,ipv6?]
-		)
-		net-firewall/ebtables
-		net-firewall/iptables[ipv6?]
-		net-libs/libnfnetlink
-		net-libs/libnsl:0=
-		net-misc/rsync[xattr]
-		sys-apps/iproute2[ipv6?]
-		sys-fs/fuse
-		sys-fs/lxcfs
-		sys-fs/squashfs-tools
-		virtual/acl
-	)
-"
-
-CONFIG_CHECK="
-	~BRIDGE
-	~DUMMY
-	~IP6_NF_NAT
-	~IP6_NF_TARGET_MASQUERADE
-	~IPV6
-	~IP_NF_NAT
-	~IP_NF_TARGET_MASQUERADE
-	~MACVLAN
-	~NETFILTER_XT_MATCH_COMMENT
-	~NET_IPGRE
-	~NET_IPGRE_DEMUX
-	~NET_IPIP
-	~NF_NAT_MASQUERADE_IPV4
-	~NF_NAT_MASQUERADE_IPV6
-	~VXLAN
-"
-
-ERROR_BRIDGE="BRIDGE: needed for network commands"
-ERROR_DUMMY="DUMMY: needed for network commands"
-ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
-ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_IPV6="IPV6: needed for network commands"
-ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
-ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
-ERROR_MACVLAN="MACVLAN: needed for network commands"
-ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
-ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
-ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
-ERROR_NET_IPIP="NET_IPIP: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
-ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
-ERROR_VXLAN="VXLAN: needed for network commands"
-
-EGO_PN="github.com/lxc/lxd"
-
-src_prepare() {
-	eapply_user
-	eapply "${FILESDIR}/de-translation-newline-1.patch"
-	eapply "${FILESDIR}/ptbr-translation-newline.patch"
-
-	cd "${S}/dist/dqlite" || die "Can't cd to dqlite dir"
-	eautoreconf
-}
-
-src_configure() {
-	export GOPATH="${S}/dist"
-	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
-
-	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-	PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd
-}
-
-src_compile() {
-	export GOPATH="${S}/dist"
-
-	cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-	emake
-
-	cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-	emake CFLAGS="-I${GOPATH}/sqlite" LDFLAGS="-L${GOPATH}/sqlite"
-
-	# We don't use the Makefile here because it builds targets with the
-	# assumption that `pwd` is in a deep gopath namespace, which we're not.
-	# It's simpler to manually call "go install" than patching the Makefile.
-	cd "${S}"
-	go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
-
-	if use daemon; then
-
-		# LXD depends on a patched, bundled sqlite with replication
-		# capabilities.
-		export CGO_CFLAGS="-I${GOPATH}/sqlite/ -I${GOPATH}/dqlite/include/"
-		export CGO_LDFLAGS="-L${GOPATH}/sqlite/.libs/ -L${GOPATH}/dqlite/.libs/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
-		export LD_LIBRARY_PATH="${GOPATH}/sqlite/.libs/:${GOPATH}/dqlite/.libs/"
-
-		go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-	fi
-
-	if use tools; then
-		go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
-		go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd"
-		go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark"
-		go install -v -x ${EGO_PN}/lxd-p2c || die "Failed to build lxd-p2c"
-	fi
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	if use daemon; then
-		export GOPATH="${S}/dist"
-		# This is mostly a copy/paste from the Makefile's "check" rule, but
-		# patching the Makefile to work in a non "fully-qualified" go namespace
-		# was more complicated than this modest copy/paste.
-		# Also: sorry, for now a network connection is needed to run tests.
-		# Will properly bundle test dependencies later.
-		go get -v -x github.com/rogpeppe/godeps
-		go get -v -x github.com/remyoudompheng/go-misc/deadcode
-		go get -v -x github.com/golang/lint/golint
-		go test -v ${EGO_PN}/lxd
-	else
-		einfo "No tests to run for client-only builds"
-	fi
-}
-
-src_install() {
-	local bindir="dist/bin"
-	dobin ${bindir}/lxc
-	if use daemon; then
-
-		export GOPATH="${S}/dist"
-		cd "${GOPATH}/sqlite" || die "Can't cd to sqlite dir"
-		emake DESTDIR="${D}" install
-
-		cd "${GOPATH}/dqlite" || die "Can't cd to dqlite dir"
-		emake DESTDIR="${D}" install
-
-		# Must only install libs
-		rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary"
-		rm -r "${D}/usr/include" || die "Can't remove include directory"
-
-		cd "${S}" || die "Can't cd to \${S}"
-		dosbin ${bindir}/lxd
-	fi
-
-	if use tools; then
-		dobin ${bindir}/fuidshift
-		dobin ${bindir}/lxc-to-lxd
-		dobin ${bindir}/lxd-benchmark
-		dobin ${bindir}/lxd-p2c
-	fi
-
-	if use nls; then
-		domo po/*.mo
-	fi
-
-	if use daemon; then
-		newinitd "${FILESDIR}"/${PN}.initd lxd
-		newconfd "${FILESDIR}"/${PN}.confd lxd
-
-		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-	fi
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	dodoc AUTHORS doc/*
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-
-	# The messaging below only applies to daemon installs
-	use daemon || return 0
-
-	# The control socket will be owned by (and writeable by) this group.
-	enewgroup lxd
-
-	# Ubuntu also defines an lxd user but it appears unused (the daemon
-	# must run as root)
-
-	elog
-	elog "Though not strictly required, some features are enabled at run-time"
-	elog "when the relevant helper programs are detected:"
-	elog "- sys-apps/apparmor"
-	elog "- sys-fs/btrfs-progs"
-	elog "- sys-fs/lvm2"
-	elog "- sys-fs/zfs"
-	elog "- sys-process/criu"
-	elog
-	elog "Since these features can't be disabled at build-time they are"
-	elog "not USE-conditional."
-	elog
-	elog "Be sure to add your local user to the lxd group."
-	elog
-	elog "Networks with bridge.mode=fan are unsupported due to requiring"
-	elog "a patched kernel and iproute2."
-}
-
-# TODO:
-# - man page, I don't see cobra generating it
-# - maybe implement LXD_CLUSTER_UPDATE per
-#     https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656
-#     EM I'm not convinced it's a good design.
diff --git a/app-emulation/lxd/lxd-3.14.ebuild b/app-emulation/lxd/lxd-3.14.ebuild
index 80bccb3ac766..4d7ff49b9d13 100644
--- a/app-emulation/lxd/lxd-3.14.ebuild
+++ b/app-emulation/lxd/lxd-3.14.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
 
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="+daemon +ipv6 +dnsmasq nls test tools"
 
diff --git a/app-emulation/lxd/lxd-3.16.ebuild b/app-emulation/lxd/lxd-3.16.ebuild
new file mode 100644
index 000000000000..8c7e5f94a4d8
--- /dev/null
+++ b/app-emulation/lxd/lxd-3.16.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+
+LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+
+inherit autotools bash-completion-r1 linux-info systemd user
+
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
+
+DEPEND="
+	dev-lang/tcl
+	>=dev-lang/go-1.9.4
+	dev-libs/libuv
+	dev-libs/protobuf
+	nls? ( sys-devel/gettext )
+	test? (
+		app-misc/jq
+		net-misc/curl
+		sys-devel/gettext
+	)
+"
+
+RDEPEND="
+	daemon? (
+		app-arch/xz-utils
+		>=app-emulation/lxc-2.0.7[seccomp]
+		dev-libs/libuv
+		dev-libs/lzo
+		dev-util/xdelta:3
+		dnsmasq? (
+			net-dns/dnsmasq[dhcp,ipv6?]
+		)
+		net-firewall/ebtables
+		net-firewall/iptables[ipv6?]
+		net-libs/libnfnetlink
+		net-libs/libnsl:0=
+		net-misc/rsync[xattr]
+		sys-apps/iproute2[ipv6?]
+		sys-fs/fuse
+		sys-fs/lxcfs
+		sys-fs/squashfs-tools
+		virtual/acl
+	)
+"
+
+CONFIG_CHECK="
+	~BRIDGE
+	~DUMMY
+	~IP6_NF_NAT
+	~IP6_NF_TARGET_MASQUERADE
+	~IPV6
+	~IP_NF_NAT
+	~IP_NF_TARGET_MASQUERADE
+	~MACVLAN
+	~NETFILTER_XT_MATCH_COMMENT
+	~NET_IPGRE
+	~NET_IPGRE_DEMUX
+	~NET_IPIP
+	~NF_NAT_MASQUERADE_IPV4
+	~NF_NAT_MASQUERADE_IPV6
+	~VXLAN
+"
+
+ERROR_BRIDGE="BRIDGE: needed for network commands"
+ERROR_DUMMY="DUMMY: needed for network commands"
+ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
+ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
+ERROR_IPV6="IPV6: needed for network commands"
+ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
+ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
+ERROR_MACVLAN="MACVLAN: needed for network commands"
+ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
+ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
+ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
+ERROR_NET_IPIP="NET_IPIP: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
+ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
+ERROR_VXLAN="VXLAN: needed for network commands"
+
+EGO_PN="github.com/lxc/lxd"
+
+src_prepare() {
+	eapply_user
+	eapply "${FILESDIR}/de-translation-newline-1.patch"
+
+	cd "${S}/_dist/deps/raft" || die "Can't cd to raft dir"
+	# Workaround for " * ACCESS DENIED:  open_wr:      /dev/zfs"
+	sed -i 's#zfs version | cut -f 2#< /sys/module/zfs/version cut -f 1#' configure.ac || die "Can't sed configure.ac for raft"
+	eautoreconf
+
+	cd "${S}/_dist/deps/dqlite" || die "Can't cd to dqlite dir"
+	eautoreconf
+
+}
+
+src_configure() {
+	export GOPATH="${S}/_dist"
+	cd "${GOPATH}/deps/sqlite" || die "Can't cd to sqlite dir"
+	econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
+
+	cd "${GOPATH}/deps/raft" || die "Can't cd to raft dir"
+	PKG_CONFIG_PATH="${GOPATH}/raft/" econf --libdir=${EPREFIX}/usr/lib/lxd
+
+	cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir"
+	export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
+	export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
+	export CO_CFLAGS="-I${GOPATH}/deps/libco/"
+	export CO_LIBS="${GOPATH}/deps/libco/"
+	PKG_CONFIG_PATH="${GOPATH}/sqlite/" econf --libdir=${EPREFIX}/usr/lib/lxd
+}
+
+src_compile() {
+	export GOPATH="${S}/_dist"
+
+	cd "${GOPATH}/deps/sqlite" || die "Can't cd to sqlite dir"
+	emake
+
+	cd "${GOPATH}/deps/raft" || die "Can't cd to raft dir"
+	emake
+
+	cd "${GOPATH}/deps/libco" || die "Can't cd to libco dir"
+	emake
+
+	cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir"
+	emake CFLAGS="-I${GOPATH}/deps/sqlite -I${GOPATH}/deps/raft/include" LDFLAGS="-L${GOPATH}/deps/sqlite -L${GOPATH}/deps/raft"
+
+	# We don't use the Makefile here because it builds targets with the
+	# assumption that `pwd` is in a deep gopath namespace, which we're not.
+	# It's simpler to manually call "go install" than patching the Makefile.
+	cd "${S}"
+	go install -v -x ${EGO_PN}/lxc || die "Failed to build the client"
+
+	if use daemon; then
+
+		# LXD depends on a patched, bundled sqlite with replication
+		# capabilities.
+		export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/libco/"
+		export CGO_LDFLAGS="${CGO_LDFLAGS} -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/libco/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
+		export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/:${GOPATH}/deps/raft/.libs:${GOPATH}/deps/libco/:${LD_LIBRARY_PATH}"
+
+		go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
+	fi
+
+	if use tools; then
+		go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift"
+		go install -v -x ${EGO_PN}/lxc-to-lxd || die "Failed to build lxc-to-lxd"
+		go install -v -x ${EGO_PN}/lxd-benchmark || die "Failed to build lxd-benchmark"
+		go install -v -x ${EGO_PN}/lxd-p2c || die "Failed to build lxd-p2c"
+	fi
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	if use daemon; then
+		export GOPATH="${S}/_dist"
+		# This is mostly a copy/paste from the Makefile's "check" rule, but
+		# patching the Makefile to work in a non "fully-qualified" go namespace
+		# was more complicated than this modest copy/paste.
+		# Also: sorry, for now a network connection is needed to run tests.
+		# Will properly bundle test dependencies later.
+		go get -v -x github.com/rogpeppe/godeps
+		go get -v -x github.com/remyoudompheng/go-misc/deadcode
+		go get -v -x github.com/golang/lint/golint
+		go test -v ${EGO_PN}/lxd
+	else
+		einfo "No tests to run for client-only builds"
+	fi
+}
+
+src_install() {
+	local bindir="_dist/bin"
+	dobin ${bindir}/lxc
+	if use daemon; then
+
+		export GOPATH="${S}/_dist"
+		cd "${GOPATH}/deps/sqlite" || die "Can't cd to sqlite dir"
+		emake DESTDIR="${D}" install
+
+		cd "${GOPATH}/deps/raft" || die "Can't cd to raft dir"
+		emake DESTDIR="${D}" install
+
+		cd "${GOPATH}/deps/libco" || die "Can't cd to libco dir"
+		dolib.so libco.so || die "Can't install libco.so"
+
+		cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir"
+		emake DESTDIR="${D}" install
+
+		# Must only install libs
+		rm "${D}/usr/bin/sqlite3" || die "Can't remove custom sqlite3 binary"
+		rm -r "${D}/usr/include" || die "Can't remove include directory"
+
+		cd "${S}" || die "Can't cd to \${S}"
+		dosbin ${bindir}/lxd
+	fi
+
+	if use tools; then
+		dobin ${bindir}/fuidshift
+		dobin ${bindir}/lxc-to-lxd
+		dobin ${bindir}/lxd-benchmark
+		dobin ${bindir}/lxd-p2c
+	fi
+
+	if use nls; then
+		domo po/*.mo
+	fi
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/${PN}.initd lxd
+		newconfd "${FILESDIR}"/${PN}.confd lxd
+
+		systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+	fi
+
+	newbashcomp scripts/bash/lxd-client lxc
+
+	dodoc AUTHORS doc/*
+}
+
+pkg_postinst() {
+	elog
+	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	elog "including a Quick Start."
+
+	# The messaging below only applies to daemon installs
+	use daemon || return 0
+
+	# The control socket will be owned by (and writeable by) this group.
+	enewgroup lxd
+
+	# Ubuntu also defines an lxd user but it appears unused (the daemon
+	# must run as root)
+
+	elog
+	elog "Though not strictly required, some features are enabled at run-time"
+	elog "when the relevant helper programs are detected:"
+	elog "- sys-apps/apparmor"
+	elog "- sys-fs/btrfs-progs"
+	elog "- sys-fs/lvm2"
+	elog "- sys-fs/zfs"
+	elog "- sys-process/criu"
+	elog
+	elog "Since these features can't be disabled at build-time they are"
+	elog "not USE-conditional."
+	elog
+	elog "Be sure to add your local user to the lxd group."
+	elog
+	elog "Networks with bridge.mode=fan are unsupported due to requiring"
+	elog "a patched kernel and iproute2."
+}
+
+# TODO:
+# - man page, I don't see cobra generating it
+# - maybe implement LXD_CLUSTER_UPDATE per
+#     https://discuss.linuxcontainers.org/t/lxd-3-5-has-been-released/2656
+#     EM I'm not convinced it's a good design.
diff --git a/app-emulation/qemu-init-scripts/Manifest b/app-emulation/qemu-init-scripts/Manifest
index e47d0a0a549c..a2e09f36f0a4 100644
--- a/app-emulation/qemu-init-scripts/Manifest
+++ b/app-emulation/qemu-init-scripts/Manifest
@@ -1,3 +1,3 @@
 DIST qemu-init-scripts-0.3.0.tar.xz 4584 BLAKE2B 836cdf49b5c85333a18fb9c18efb012598474617ffa35d2ff2eea717546da0f1f0374b98b315ad67a1fedc32bd65f3879f6553915aec2f3e230644a93862909b SHA512 49427572ce0636400ad3e389ed143fa9b1d637a7a89649cd5e265e409d3d745babe28f6af8cac3d9a249a8d5cc6554b321c0613f35824d604dcd814a44033c51
 EBUILD qemu-init-scripts-0.3.0.ebuild 899 BLAKE2B 87d9829842fd19720de1039a1bd02a6c0102197a16ed788f856c768e38ed50db6e72ebac194c36bdfec266dafecc79b3b4b9c98bca5eaff7e26aa2d3170300a4 SHA512 8b525350d3725cf6806c5ab45db1093a0a87c1e44cde78cb5177a9658ada754b2c13a020c84aa32342c4d0bbb00d1a6f1c9fac4270f0c6e07492b754a11b43ca
-MISC metadata.xml 360 BLAKE2B 847b11592ee02f8894809907bf04f974798e2d280a73fe578eeed7427e7af3d9386c3d7633f337c74a89e0a35da00b12c54ae2be17b1c1c72775fd74b1e93d95 SHA512 54b1475832c925059926edac8b587049c2e940969623a5626e080cf2d3cbea749ca7b33c2907f6624c036a157fca3f626ff3749eb0c32f4d10f510ebb50d0b55
+MISC metadata.xml 254 BLAKE2B 05e90c5eb1f2a48da63b95e38ffa2e2fffd9fc2d51ce6b4abfdc3538b1efa1955b9c1fe72e0be076a4ee74d18408dae7a23f143ac252bce6b123da7fa0ecf37c SHA512 3ffe6103a749aa1ae8495f7f837181c59440b62e2d8df3248939d68be029a513be65ffd60b23d7b9680d162765f26054f60ee0f9136332ddddb05ba8276b8016
diff --git a/app-emulation/qemu-init-scripts/metadata.xml b/app-emulation/qemu-init-scripts/metadata.xml
index e5001f234976..00bc0c58b6a6 100644
--- a/app-emulation/qemu-init-scripts/metadata.xml
+++ b/app-emulation/qemu-init-scripts/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>rafaelmartins@gentoo.org</email>
 		<name>Rafael Martins</name>
 	</maintainer>
diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest
index 5eda57ec9ca8..87272c778682 100644
--- a/app-emulation/virt-what/Manifest
+++ b/app-emulation/virt-what/Manifest
@@ -2,4 +2,4 @@ DIST virt-what-1.18.tar.gz 173703 BLAKE2B c1ab6f331ca370572cedef06fd3eb9177ca8ef
 DIST virt-what-1.19.tar.gz 183594 BLAKE2B 36b58cbe41f195cf81e0b0cf35ab881c3746ac352c57f470e1fe0005d65534f38886d7688ee9393837e667fd1c8bf41af013f3a12748db5f8615b9b5c944f7a9 SHA512 7b6e6c00e3f35cea236cc5f5fdf28d13e9e38143f280dfcbf083ebf0dca2cb677752b8daec5b2956a08405d1fe5368f9f633ce11a854928c31121a35ee4c6820
 EBUILD virt-what-1.18.ebuild 609 BLAKE2B c2e183482354a5623ee7ac84a0f50d36d80065f1f803a9086e687f16416be6f1b62482d67d99890f2f1f61c371f6053b03eb2eb71c099c309a049474494aa57b SHA512 56ee0708fa083bee61d82106227238cbce18027557b75ffed68fdaecf47f6cafe84766a03f0c55d0ed7060af90b929cd6fa80453ff355adb2f5f00e70dffa7ed
 EBUILD virt-what-1.19.ebuild 613 BLAKE2B 7ca204c642e7d587100829db36311d0c1711dcfcca0304c889eb21c2b6ff5049e6865cea646903659240c8689a23ae734d1e0021f817db4505502aa867b05905 SHA512 81f456788def5e4b3b5792b22f2e217aeb2c1cdf43bb3613d38e7df7a96e53e90fa3005e948a8023d90bf8a7a036cdfb1f00afb34d5c06e8e4b16b2a709ad3a9
-MISC metadata.xml 456 BLAKE2B 7f4f5daff8e3d30e59981cb50fcc8da98ee032dc33c16cb441f9aec580c101eab57fb25257a7298e32d6093a7ddb25c292f35858b0392bde2a2ec5e528b49079 SHA512 9b3ce56970ef01166980d6e5275bf4d740c47c044ab531cedeaac4e606d369f2c65b22fd8d8387332f0428ed7d9970d8b7e6363b48cb73c5b3326c7b463906bd
+MISC metadata.xml 348 BLAKE2B 6f0d91006e793eb3ed8da45a845d5fb6ae09874c5a0c3fb1731b0b6c002c3188b4496a201af07b6c68004f33327b65374e23446c6ca28d93d7736f3388c0a773 SHA512 49f92316c1ac28eebeb160fa9cfc6c1956c25ffcb69b202eb3e9492ab023be6debd780f6aa6a7e6e6dd5f116308f34e2c1c16f131438c48d2634d13702ade0f6
diff --git a/app-emulation/virt-what/metadata.xml b/app-emulation/virt-what/metadata.xml
index 7e3c0f29d1a5..be34d3dcfa08 100644
--- a/app-emulation/virt-what/metadata.xml
+++ b/app-emulation/virt-what/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>eva@gentoo.org</email>
 		<name>Gilles Dartiguelongue</name>
 	</maintainer>
diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest
index be3c83e1bbfb..bf1532465e8a 100644
--- a/app-emulation/virtio-win/Manifest
+++ b/app-emulation/virtio-win/Manifest
@@ -1,13 +1,3 @@
-DIST virtio-win-0.1.117.iso 56999936 BLAKE2B 7880ab46d194ed265a2e0b88ea98752be9297af13f8b74b6c5b4f5249505ec3d84ffc70cc927816f0d45b7560df82c6ed1a27632db8bf4d78372af3ea96373fe SHA512 695d4bf0bbe469269ef46735997c33d3bec83bec30b86ffefe6ee3a7142e4c70a5cdb6aeca1bef6b538792faee752296452535c0276a3f7686d8a96bdf9eb6d4
-DIST virtio-win-0.1.118.iso 56967168 BLAKE2B 6bcabe5384ae297838d289ad6e2a18c08089463f6c5d58de8ace4d0d47396dcab60e0f021ca009d7faa7a81ef3fc855ac1aabefda4a540f9f07b25e12fa46048 SHA512 1a1da7bfbecb1cd02eca780583c486caadd5b76b225a469af0e693f08506bf9b582f57df52b670409a1cf0d887c0ab715ecca0f08802c242a93535d2d58134d9
-DIST virtio-win-0.1.126.iso 155856896 BLAKE2B 88ccc79e43f2c9cf8d985b0d0677c76ec7eebc960eb8c6c2906cacb05e05f945a90d549bcab50754930bf43a84cd722034c3a06828622b47dc99d87fc5634528 SHA512 b57810f33746ed90420f12f6267903f595ddd02aecb8d3de58cd2d5c0b39ec2f31e0352c2548344e629827616bf2d3c284e1ff60d2132fdde39f2086b36af2e6
-DIST virtio-win-0.1.141.iso 316628992 BLAKE2B 41663ebfd084e9e386eddc3db9ba2c9fe3313260fe3158bbb67c03270c0de37d4ce33e7b6f39ec1b8b5190a9fc8918364d0e9a4ac2a03cdc988e0f26d2062389 SHA512 909f4437b69cba1edfa857326986eb8c4b58835169d70117a5ff57bfa4ebc48f74d6ffa05de50732fb60551166544160fa3b4ec5c59cfb98daeb789902a9b119
 DIST virtio-win-0.1.160.iso 322842624 BLAKE2B baa1475055c2df609931e48cc4a18a2e24fcbf07ec9df80a94b1bdb77ca76c1278c5269a95422ea5c2363df424a30b8395b539689982d609096823ebc880afaf SHA512 71c9de9086fa5b5d764d210b5f7d0238c8b294aaf17704eabe16fe65c5649944126924870f0e2eb05d030c2f521770cb5760f4016d29319f5f1bd5deb7955e50
-DIST virtio-win-0.1.96.iso 160659456 BLAKE2B 7e7784c7585af899881d44a60167e2cc08d40d5a575fd5b0815e218ddbc5e8ea3b37deda7352688364bc1c6d72186c2e1eecb5a616102576c13d61b890a330bf SHA512 a00311f29937383d0dd538b5156a078fdb0c93d39a91d66376a9567f3d4841eeb0ec2a8bf8b018d089040895c9f720e1b253a5aed8bd337dd8713a47544b2a61
-EBUILD virtio-win-0.1.117.ebuild 517 BLAKE2B 5d24b3f790cab2ac291a69cca6c26f5fb4c830667b15beffb8c674263af772d30862b6e70781552ac0710f0ca7848a294b5eacad4818b4917509e2289515fbd2 SHA512 3135bd99dc84c56f716f4ee26769b2e03abfa91d6f0b69b3e81906ce65b7df4149101651796b9d4d7fdf8927ccd45709f76fcea9d4c1d73faca1a9560e4fe25e
-EBUILD virtio-win-0.1.118.ebuild 517 BLAKE2B 8c84fc7d82eb375e68f398b2024d0232b6c9837be3ca0fb29c7f7f2d8745fd0c9aa9ce2dcc369b18b76ac7db1ded95b0fa439328ad33098477e104ad06569a17 SHA512 ee718239916dbd79534d9381e1fe353521b4c721e0d2e0da3aa35e426ad7c910e55d7650f6c13a25184b486d13e64ef5d74b6f871dd4297211461df02c169947
-EBUILD virtio-win-0.1.126.ebuild 517 BLAKE2B 8c84fc7d82eb375e68f398b2024d0232b6c9837be3ca0fb29c7f7f2d8745fd0c9aa9ce2dcc369b18b76ac7db1ded95b0fa439328ad33098477e104ad06569a17 SHA512 ee718239916dbd79534d9381e1fe353521b4c721e0d2e0da3aa35e426ad7c910e55d7650f6c13a25184b486d13e64ef5d74b6f871dd4297211461df02c169947
-EBUILD virtio-win-0.1.141.ebuild 517 BLAKE2B f07c46f623d9172ab25eb0168348459927b889bd5a1ee246eee6967675eb9fec5db83919d053aa540d865793562e90a2d5c30e00a64b1f64b111f239a9f685da SHA512 56f5ec94803b325aa499404b8300b8b5b266cdd2ae73a8ab21181c76830536e593ce0cdf422468ff1f761f17d9b86fc52661cbd2b2654a8154a9ceba7ef810e2
 EBUILD virtio-win-0.1.160.ebuild 514 BLAKE2B 92be643978614da46a322ec5a9c4e772160bb1fded2996ad8ca17ccf1478ee6c18c657c02d5126963ec4afb3a9a2391ca7d4f7f3dc82869550e92b5a92173e57 SHA512 45926753c1b078acb955c2713b6b835310ee01a041d5338357bc696198ee975fc8dd64235a0e7a92fdfcda974e1f9e54db29f6ebdb4244fb757277f3723d369c
-EBUILD virtio-win-0.1.96.ebuild 515 BLAKE2B cc2ddba339b8a881b7e6881cb538f7e5dcd6cb09c6c9ac9dba351917754f4ac1789cfa7118f94c3dc930670675e4d2ab60bee9cfbe3a31af5c0c2759d9b61e09 SHA512 f231a9cf9873fb38bfb7762f87b9d4e114a9aa58401bc078511a2a8f55867ddbf545ba0d68ba80817e57e397a9f7d23e7ccded9a2bfaa30ec2767ecf88e77641
 MISC metadata.xml 268 BLAKE2B fc720112c357f73a31bc48f4c85526021faa1023465e8ab5c2c990fb66aabe737fa03ac9413ee5dacb2a2e169865280149c58d4b96c68ba82520b658e43131de SHA512 5ec3669490d9310461ab6cfaa58eed747c762753578026827818ded5bd9a5221f0860fa2c9308adee2b11ee7d328a8c3b4908fd2ba76c5c4949524c8fd48ca64
diff --git a/app-emulation/virtio-win/virtio-win-0.1.117.ebuild b/app-emulation/virtio-win/virtio-win-0.1.117.ebuild
deleted file mode 100644
index 240e35c8dfda..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.117.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
-SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}-1/${PN}-${PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${PV}.iso"
-}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.118.ebuild b/app-emulation/virtio-win/virtio-win-0.1.118.ebuild
deleted file mode 100644
index a2efd51ccb8a..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.118.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
-SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}-2/${PN}-${PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${PV}.iso"
-}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.126.ebuild b/app-emulation/virtio-win/virtio-win-0.1.126.ebuild
deleted file mode 100644
index a2efd51ccb8a..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.126.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
-SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}-2/${PN}-${PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${PV}.iso"
-}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.141.ebuild b/app-emulation/virtio-win/virtio-win-0.1.141.ebuild
deleted file mode 100644
index 7a1b03cb92e8..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.141.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
-SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}-1/${PN}-${PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${PV}.iso"
-}
diff --git a/app-emulation/virtio-win/virtio-win-0.1.96.ebuild b/app-emulation/virtio-win/virtio-win-0.1.96.ebuild
deleted file mode 100644
index 5744f3efd289..000000000000
--- a/app-emulation/virtio-win/virtio-win-0.1.96.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
-HOMEPAGE="https://fedoraproject.org/wiki/Windows_Virtio_Drivers"
-SRC_URI="https://fedorapeople.org/groups/virt/${PN}/direct-downloads/archive-virtio/${PN}-${PV}/${PN}-${PV}.iso"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/drivers/windows
-	doins "${DISTDIR}/${PN}-${PV}.iso"
-}
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 722279b33ae1..f5ab56d6ae9e 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -6,20 +6,16 @@ AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a2
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz 19684009 BLAKE2B 81787dcf3b70211fa9c84a40c668100eda0dfd2ce3e1d35c226cb6913ef74027f3444be93069a5e881d8e60905477460a180cb98919050286978edf9c1edcdf3 SHA512 deb4c62d58e2071f4413f0ff769e9ecd756362920b29482a6a3d77566c327b075cb5ecafdc65985305b8b798dc56ca2104a0f8244651fca89c4e15ef879c121e
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e52c746299d32ae908892791d8fb9b4dda264875e66bf0459adfbc64381001e9be1800a8ac93bbea14dceb47a0e81cf79c29a4c0796f7c4a30021e4beb036cfa SHA512 382ed45a90981397da7d46925a73c5aa0cc870fe41992c87ccd3d3a33420b199e4a0a19761a6c6ebeacf93450e2937d81befb6fdaf7fb7961827e23f0f24c645
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.10-132072.tar.gz 23160596 BLAKE2B 5cd7d1490305236f99b759520b4c63afd207cab53e861aaca0b0c318fe96f991756db60652bf65b26b5b9690366b6a5df13c225b44df75a30c1cc04badc7dbb2 SHA512 2c99b9917c65b4287bd1b78e9b9312630850307becea526188f97de569f541fab6bfbc4d5cff2ea9aab784dc4bbb23ada3679f76116ba94169f9c73566cc6c09
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.tar.gz 23160551 BLAKE2B 6174296d97f9e32a79f29e119804b15d288100017ea9da20235325f095e1d10a7ea5acf478d914b4a2e874da7640520691ad9a881228855b047f5c0c529ad120 SHA512 f7d4785ce8e53836cb4b87920765967cb3148ba09ee5921ab67fc4547d8a90923bfbb8a432d67ec6b878775fd67f1dbd826dcf993b57481f71d2f8a71ce13bfd
 DIST VirtualBox-5.2.26-128414-Linux_amd64.run 89220562 BLAKE2B d937e3a8f622ed1afc8ab7d2479401c6b41f6b1404197b2d86933d741a209071b1bc98de14ea4f25b2b0f2a22a328393908f85955f8879dbf8b28e2b981e4d04 SHA512 c8d7741408d234e7c05709dd0ed66d30b427b0f39976f232b1fe8a17160d36c4dda7d3adda46a38cbdd6626d34570805f582ac0aae2a975385a1f1d06e97f354
 DIST VirtualBox-5.2.26-128414-Linux_x86.run 88339918 BLAKE2B 0fe177a8d9ab4c4cb894151a00f9554713dee27af1fe3036591a0e7865c8869eef17368ab42270d5a9081c849e6550ebef809c3f8f09a9238e2f5a5f0c9e76e5 SHA512 6a809cf29a2cd70bddeca0443955ea10044553ef85744949b604f92a8bca96b9deb1c37f723388d1f27f903c9469e7cb853a0bf7d6928bb18ba61cb19b216fba
 DIST VirtualBox-5.2.32-132073-Linux_amd64.run 83854803 BLAKE2B 3522df31f4f98efcd40adcaaf8ac458078adf0bbfed96c7d309d4726ddb8b8dd78eef830b3cfcb2f1fa6329bcc30ea2449f5c88cab66fa0c7d20818d7b5aa07a SHA512 aea9b27793f3363eba2ed627cc3b35ca51445946e6e9f20382fb3034afbb7470d27fdc476066c04acc595690a9e34109e8b8ce6dcab10fdc990b241b24ec47fb
 DIST VirtualBox-5.2.32-132073-Linux_x86.run 82943439 BLAKE2B 31a22e8b52a53d6948a5af533b5c8f374d703c44736678c0bbe6fd9b5298bed4817996c32902a69c2c59dbf751cea04f22beb7203deaeadf79d2424e123e9d37 SHA512 05f99b673224c2b3d94b0d568067ae5ee74200c88a3b7f6665988a9d0c35f69f81c07292b838d07c07fd6d5484979615fd255650b138387501a593f3833b9071
-DIST VirtualBox-6.0.10-132072-Linux_amd64.run 127108569 BLAKE2B f2313b8e797f1292975d6d0f214985b16541b4b05cd0efa3f9b417a02b85ad7affa8c1d4929f161f90548242541628000c3ef39acece29a376f11aaf4d3536e9 SHA512 026c9b5d5f24714293cafb522840c2c84b86ebaa903f7e402472a916bd549cf3b279ef6de02ff0c9c7cb6df74ea402568df64ed224c0173d445d80f04a2d93d1
 DIST VirtualBox-6.0.12-133076-Linux_amd64.run 127118808 BLAKE2B b654fce2e9134390c7cf27e30e2c2e15e5d3bfd40df85627b266f250c112b0f4f60062d3f50dbb0e5bc0ac7f4b819694cdb65d2148b4b015b8e0c5c71c13e4ec SHA512 cce0e95de6e7ecb879807ec47cff0f4423c471132fc157e4c1656824ab5c914684db53bf73c77f9a98e72f654a7af13b21ad2954ef8f5a961b39ab9bb7c04990
 DIST VirtualBoxSDK-5.2.26-128414.zip 10159276 BLAKE2B 32a9e0a70cc63c8e0daa7080f8e10ac8a514837be98a66b00161cd0c9bf2cc42ef0a11f3a69a742a2f6745b4c8b8fe9e946e18f81cd5ef3ab2f68d5e3c95c568 SHA512 f3d1cc622734ecb0f56fcdf5728fcc747e3b084cb2358d420c55c1acd98d2f24870f0fd18cea430f118f34bca10199526ba195a314d6ce7fb6c4bc8281d89f09
 DIST VirtualBoxSDK-5.2.32-132073.zip 10200195 BLAKE2B 0de34e166b94889c605014233142887e7a8857d1915866156a0cc63850937730ec063e63b550f0d39ad241259158f033b028dbab7eec3f6f38c3715139413b3a SHA512 ccbe2af819bff46055bd6f079a03d69e721a09286e83d4f650583bc7692f5d19ae1a725cf3a6eb1b75167a2c73ff2e020d1f932bf9cfeee9ee709d1174c4cabf
-DIST VirtualBoxSDK-6.0.10-132072.zip 10801181 BLAKE2B 9ad30a0db9e0e87594277c10d869f915a1981c8a7fef294c34bbc904714141bc69e9ad80b79fa61b418ab537f65ccb574f72b6a2985110b51c54d8bfeac9f42a SHA512 b1cf9d3d289a3ba765e3ef9af2491b9f785e241c2c1ff9606009d3983c8fa8660a80dbd37404c773aa57b76a06fd2d1136644565643a58d1d4e1700a7cc329fd
 DIST VirtualBoxSDK-6.0.12-133076.zip 10799655 BLAKE2B 93fc5093454a21bf5da26d00f35ab107410cddfed63c9af8494cd194cdc080a70ec8cc8af57233be0472b84a25709a3719f51d399585c1b474ddb4d40e6488ab SHA512 f270a6c404f1bf49ca6bbbc8c4fdba70e6c65001e9731a689f391e6d4c18866ceb14c94a241c15a4e5dd01e08f2c5c61f0fe7feb43ffe36acc9868a72a75603c
 EBUILD virtualbox-bin-5.2.26.128414.ebuild 8327 BLAKE2B dbc945c46ee55ef5c11ea3a7c169632ecae5d039fd7e5961255c2006c6f827860e59bf877fd4845e0543006e57c7fee12c28848dbeddc98741d0ce6fa57a5974 SHA512 248b591075c526b2c246dfb32cb9a00166a9243391cd6caf9d9b776835e1d201e1227c2d435f403ec2f357c54fe1246b68282ec1abe7796e428c1e505e75d5d6
 EBUILD virtualbox-bin-5.2.32.132073.ebuild 8328 BLAKE2B afb27eef7f7daa384d5acce90205fb8577c65c56ea276201372784a0a03c98182857f7e5c3183eab2620fe88062f3238008b07b46f8831e3227c4a2f381f3449 SHA512 bd59bd894f84357702e9d5ba4373e68b11ee0c8befed8188db3d38deaa75b560f94e8d5a4a8285b408c1d5022638775722b463950421fe7d9ed3538f40cdcd1e
-EBUILD virtualbox-bin-6.0.10.132072.ebuild 8490 BLAKE2B 0acedaa47d39ac39c6739053a20343d18f6d53294177039cb54de95f0eb5d2d58a8557b852713a3e3e9c6e3b8549cd70f6c307684e569716c8e3a68b7f5f021b SHA512 a8cd2174ae64b1dc0977dbcd388c26989779546fde33d1c5e89e4d22d026154a4f5cdeeb134c67c81c161b0114a9f4648d78be1862ff5dd44d6fda205db3f822
 EBUILD virtualbox-bin-6.0.12.133076.ebuild 8490 BLAKE2B 0acedaa47d39ac39c6739053a20343d18f6d53294177039cb54de95f0eb5d2d58a8557b852713a3e3e9c6e3b8549cd70f6c307684e569716c8e3a68b7f5f021b SHA512 a8cd2174ae64b1dc0977dbcd388c26989779546fde33d1c5e89e4d22d026154a4f5cdeeb134c67c81c161b0114a9f4648d78be1862ff5dd44d6fda205db3f822
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.10.132072.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.10.132072.ebuild
deleted file mode 100644
index 0d68ba80c9dc..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.10.132072.ebuild
+++ /dev/null
@@ -1,291 +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 xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	KEYWORDS="~amd64" #~x86
-fi
-VBOX_BUILD_ID="$(ver_cut 4)"
-VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
-MY_P="VirtualBox-${VBOX_PV}-Linux"
-# needed as sometimes the extpack gets another build ID
-EXTP_PV="${VBOX_PV}"
-EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
-EXTP_P="${EXTP_PN}-${EXTP_PV}"
-# needed as sometimes the SDK gets another build ID
-SDK_PV="${VBOX_PV}"
-SDK_P="VirtualBoxSDK-${SDK_PV}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
-	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
-	#x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
-
-LICENSE="GPL-2 PUEL"
-SLOT="0"
-IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
-RESTRICT="mirror"
-
-if [[ "${PV}" != *beta* ]] ; then
-	SRC_URI+="
-		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
-	IUSE+=" sdk"
-fi
-
-DEPEND="app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="!!app-emulation/virtualbox
-	!app-emulation/virtualbox-additions
-	~app-emulation/virtualbox-modules-${MAIN_PV}
-	!headless? (
-		dev-libs/glib
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/libpng
-		media-libs/libsdl[X]
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		chm? ( dev-libs/expat )
-	)
-	dev-libs/libxml2
-	sys-fs/lvm2
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXdmcp
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/VirtualBox/*"
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_unpack() {
-	unpack_makeself ${MY_P}_${ARCH}.run
-	unpack ./VirtualBox.tar.bz2
-
-	mkdir "${S}"/${EXTP_PN} || die
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	unpack ${EXTP_P}.tar.gz
-	popd &>/dev/null || die
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		unpack VirtualBoxSDK-${SDK_PV}.zip
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# create virtualbox configurations files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-	if ! use headless ; then
-		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
-
-		# set up symlinks (bug #572012)
-		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
-
-		local size ico icofile
-		for size in 16 24 32 48 64 72 96 128 256 ; do
-			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
-			if [[ -f "virtualbox.png" ]] ; then
-				doicon -s ${size} virtualbox.png
-			fi
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="virtualbox-${ico}.png"
-				if [[ -f "${icofile}" ]] ; then
-					doicon -s ${size} ${icofile}
-				fi
-			done
-			popd &>/dev/null || die
-		done
-		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
-		insinto /usr/share/pixmaps
-		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
-	fi
-
-	pushd "${S}"/${EXTP_PN} &>/dev/null || die
-	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-	popd &>/dev/null || die
-	rm -rf "${S}"/${EXTP_PN}
-
-	insinto /opt/VirtualBox
-	dodir /opt/bin
-
-	doins UserManual.pdf
-
-	if [[ "${PV}" != *beta* ]] && use sdk ; then
-		doins -r sdk
-	fi
-
-	if use additions; then
-		doins -r additions
-	fi
-
-	if use vboxwebsrv; then
-		doins vboxwebsrv
-		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-		fperms 0750 /opt/VirtualBox/vboxwebsrv
-		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	if use rdesktop-vrdp; then
-		doins rdesktop-vrdp
-		doins -r rdesktop-vrdp-keymaps
-		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
-	fi
-
-	if ! use headless && use chm; then
-		doins kchmviewer VirtualBox.chm
-		fowners root:vboxusers /opt/VirtualBox/kchmviewer
-		fperms 0750 /opt/VirtualBox/kchmviewer
-	fi
-
-	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
-	# The compile phase makes VBoxPython2_7.so.
-	# py3 support would presumably require a binary pre-compiled by py3.
-	use python && doins VBoxPython.so
-
-	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-		VBoxPython?_*.so
-
-	if use headless ; then
-		rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so
-	fi
-
-	doins -r * || die
-
-	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-	local each
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,TestOGL,ExtPackHelperApp} $(usex headless '' VirtualBox) ; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /opt/VirtualBox/${each}
-		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
-	done
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	for each in VBoxNet{AdpCtl,DHCP,NAT} $(usex headless '' VirtualBoxVM) ; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 4750 /opt/VirtualBox/${each}
-		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
-	done
-
-	if ! use headless ; then
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		for each in VBox{SDL,Headless} ; do
-			fowners root:vboxusers /opt/VirtualBox/${each}
-			fperms 4510 /opt/VirtualBox/${each}
-			pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
-		done
-
-		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
-		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
-	else
-		# Hardened build: Mark selected binaries set-user-ID-on-execution
-		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-		fperms 4510 /opt/VirtualBox/VBoxHeadless
-		pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless
-	fi
-
-	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
-	fowners root:vboxusers /opt/VirtualBox/VBox.sh
-	fperms 0750 /opt/VirtualBox/VBox.sh
-
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	local udevdir="$(get_udevdir)"
-	insinto ${udevdir}/rules.d
-	doins "${FILESDIR}"/10-virtualbox.rules
-	sed "s@%UDEVDIR%@${udevdir}@" \
-		-i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die
-	# move udev scripts into ${udevdir} (bug #372491)
-	mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die
-	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
-
-	elog ""
-	if ! use headless ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\""
-		elog ""
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
-	elog "an overview about the different features of ${PN}"
-	elog "and virtualbox-ose"
-	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 50bf2dcbd5d3..6ec7e9d4e0d5 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
index 5af2fd32264e..4a242cc80468 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,6 +1,4 @@
-DIST eselect-repository-6.tar.gz 5605 BLAKE2B 4a6dbb3f573cb1c4e212d02d011e79d8522828b8928bf28016b616c8eefd3beb08db8b555728d4e7f83473f2d36395eb1e2f1d8d21ccd5817e38a5d555cf6f09 SHA512 02ca2d66a6cfe4c68dea780440bf7fd431c575e535139a43c2b6201e833e43d174772486c97dc4154fc2d813935079d36c116ee907db115f7cb281db3d72add7
 DIST eselect-repository-7.tar.gz 6768 BLAKE2B f648b880ab188b5beb21161dd011d8cea0bc9dd124d524d747a1867a37f334667363be9c0ad9f04275aa1534b904a519d7551c25ea547ae2acff625382c35dbd SHA512 87569158dce3acfdd81a469387fe1a7a7c268cae2e15cfdb12d8377984be5feb674c9b385f0171d27dbe8c2066ae98b2c9a74214340e85380cba173ba26d6f0f
-EBUILD eselect-repository-6.ebuild 964 BLAKE2B ad1bf7e3e8769b22d9ad1ce832aab7568783ad578650b78ee7ad02585f2677b9f84c80efa0ce5c92632f2cce23efa8557beb81e591fb9d9c7b75da162943e955 SHA512 f11435a8f33020d4a2dd01498ca0b5594b0e0159c2e83c4a5e2015ea90383bf2f1571b774c70a2937358559e49cf37e3b0c0c88d3d76e8c09821a65f9487afe3
 EBUILD eselect-repository-7.ebuild 964 BLAKE2B ad1bf7e3e8769b22d9ad1ce832aab7568783ad578650b78ee7ad02585f2677b9f84c80efa0ce5c92632f2cce23efa8557beb81e591fb9d9c7b75da162943e955 SHA512 f11435a8f33020d4a2dd01498ca0b5594b0e0159c2e83c4a5e2015ea90383bf2f1571b774c70a2937358559e49cf37e3b0c0c88d3d76e8c09821a65f9487afe3
 EBUILD eselect-repository-9999.ebuild 881 BLAKE2B 2373feef6139c44fd898b66a1b8a182c5901f1f413cbe7bf6fdc2e172acced7e82468bb33f96fd0344c6377582d2ce66d26d5140dc25944c4f2546e4a5112260 SHA512 3bb7f50b44ca2231d25844799e9d5c1cf46cc8f6a9c335e4f631c6149aaf18267fff824c1d77dda12ece95e0198a7fbe6607d44c0dcf1945cc72ff108b6d01c8
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-6.ebuild b/app-eselect/eselect-repository/eselect-repository-6.ebuild
deleted file mode 100644
index f5e003885de3..000000000000
--- a/app-eselect/eselect-repository/eselect-repository-6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-inherit python-single-r1
-
-DESCRIPTION="Manage repos.conf via eselect"
-HOMEPAGE="https://github.com/mgorny/eselect-repository"
-SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	app-admin/eselect
-	dev-python/lxml[${PYTHON_USEDEP}]
-	net-misc/wget"
-
-src_compile() {
-	MAKEARGS=(
-		PREFIX="${EPREFIX}/usr"
-		SYSCONFDIR="${EPREFIX}/etc"
-		SHAREDSTATEDIR="${EPREFIX}/var"
-		ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
-	)
-
-	emake "${MAKEARGS[@]}"
-	python_fix_shebang eselect-repo-helper
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	keepdir /var/db/repos
-	einstalldocs
-}
diff --git a/app-eselect/eselect-xvmc/Manifest b/app-eselect/eselect-xvmc/Manifest
index eb3f2db1686d..46c9ac22e7d6 100644
--- a/app-eselect/eselect-xvmc/Manifest
+++ b/app-eselect/eselect-xvmc/Manifest
@@ -1,3 +1,3 @@
 AUX eselect-xvmc-0.4.eselect 4169 BLAKE2B 88d4d93097e51c5e2f6b98adbf2e09a643a3ef37176010907035486b4d98eb38c02e0243a8ec617c89bc0204948db83431174d1bb217f6e9fc6f3fcb649338dd SHA512 d86d80b931d2aa6c085accf9a647745cffd56b496728162b1084eba2fbde981ac17d3d3758cef993427b4236330fcc21bf2fc52d2b50249764a65fc508121135
 EBUILD eselect-xvmc-0.4.ebuild 551 BLAKE2B 1b389fba3f0dc4c52b77273409d306a6a32e6656b1fccea7a87158d29b230adb2ed88e5ac2ae2a383209fe5cff352575990213c282976142ed6b451db05e2ed2 SHA512 cbad3bc700aadabfd33e54ef7e5755c5deabfebb71a41a4703951c940ee3633ea55416ce78cf3cb02a36c8497ff974492a211d65015f5ed0fa93cef241b63149
-MISC metadata.xml 331 BLAKE2B 94766ef6054386b5218ddab7910b2b9f4fa8904ba9d6738871a4c4fafec2433b42d489c8e156447ad473831fe55af2e75cd6e385305af8c40459ffa8ca1faa9f SHA512 f4c7dc245325bf6b4b37c893183e3dd9c43c9f05046e231f31f7fcfce8ee9e4108c0f4aa231b7d8f0fb4206fdb80186cd54dfe03ea7a037f6a5d4a61cf3b0d0b
+MISC metadata.xml 254 BLAKE2B ee88ffa1e088e8468e68ced9c2f45c893ba1a63b35efb4bd4093dd6b65f976a30ca90d8fb6a23dd8153d800f08ae5253aba6590ce59a79e4db1562676a39f79c SHA512 835fb05d568b08bf648a64dc26c52cd2166f5197b82615d3218e8a69049c449cad544da478cb09c68c5578f75628a86fc4c361b54ff09d8f778839c186466a47
diff --git a/app-eselect/eselect-xvmc/metadata.xml b/app-eselect/eselect-xvmc/metadata.xml
index 10bc494a7e79..088f66338181 100644
--- a/app-eselect/eselect-xvmc/metadata.xml
+++ b/app-eselect/eselect-xvmc/metadata.xml
@@ -5,7 +5,4 @@
 		<email>junghans@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
+	</pkgmetadata>
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index de8f21cd4ec8..8a8a25ddfc79 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 38bbdae987a4..e1f9e0456c44 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-hangul-1.5.0.tar.gz 505707 BLAKE2B 4dd630d7ed83ff4913e87c4d77f951845714697500a87ae337d898fe674d29e9421d5d506c2beb3acef859864d655f20d92f6a0cc5620f293a8a7623c4bd3158 SHA512 a9bef9ad887d1b41555af12e7589a9c4c69ddf4f61890907d90cbab6b9bf4cb6df4739c54d34ee1b2507486a1cb568f826bb4641e9ccee8ccfa11ff2d7e962bb
 DIST ibus-hangul-1.5.1.tar.gz 460517 BLAKE2B 913d0d8b8995fac3cd73ca40280761d5bf44f35134cb7e73075c233f9c1ef5aa00bb7d7b8da20a69273cd0eb8202b9deb409e1b8d1b6ebbeccccb5f0ef98d341 SHA512 1254398cc4daef2bcbb4cf5be5cfe4c3478097cc5be1f2b39861efe55529ba36602798a84c2540298c2c3b6405c1bd38c97543827c74a473dca5a2d23e3ac4ec
 EBUILD ibus-hangul-1.5.0-r1.ebuild 942 BLAKE2B 1dfb15cf5f049c350e4cb0eaf1e840249536d51f31db55ed258389a2b6ecb7ccb1dbfbc7c58d03a78b4c4d4b620b95409f8bf29e45f517032b66025e2650cbe0 SHA512 70d277553322d1da4ce2acbb4087b5d5d86fd4e632fc3f70d357fa955f793c25b1b02e384df6c788a68f787cb2f552b6562e23a1a21e08b60f521537afca97e2
-EBUILD ibus-hangul-1.5.1.ebuild 889 BLAKE2B 7679f7c1bd39a32e7ef3871b3941874ea0784ab4b8b4393143b6c7f5bea4bd076c6095e28a636d22d00c9ddb4cf9977ccf9c9c26a54c68a21b3915564f36c4d9 SHA512 fde77141af3998b53b493d66a5b07a60e9fc96a6af21ae51a2db24f370a8c27143c5b626f264e2c5031af36bfa6002e36b2fabd655eae84a8056581e00f71ce2
+EBUILD ibus-hangul-1.5.1.ebuild 888 BLAKE2B 305410e7da6777cbfec80e1ae38b87c8dab2f62e2bdc7c9c3347e0a96a4a2d48664ceffecf6e09ee289e10f293e5346789bc30b947948b93bd41f8ece7b74074 SHA512 75301abd0f15d1201958eb8fff122d73d7a739251198872d702787a505b266c5aa1f3748903c37dca28993d414bc303a685d1ea17a37098968f2a22bbc013f6b
 MISC metadata.xml 469 BLAKE2B fc2c441dc9e4074913f97fd699f765f5cf658cf2faf60bd2e5794349cf58ae83d875bee8303f4836625111b1af89bfad5379c53424910725fc344bc89eef7eb7 SHA512 e22052e96605c02b108b6ec009c81f92ec83fe39978645ec5fccce5cbe4b17f1e205bd5e2173b3f082ff3a0ca404a6576b7f4bc2afa3915482d7afbb154b0172
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
index b427dafeb869..ec232f0cb01f 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 82aff2e0c57e..6cdf41933922 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -6,5 +6,5 @@ DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060
 DIST ibus-1.5.20.tar.gz 3393487 BLAKE2B 0ed930cbadf7ecf9fa82ee2c0e2a8aa8cfb25a8dc1a2e2ffef0d4f894df31f879f08d7ed14508736836545cbc25b929707939c3b0ea53f2b44ba7489d6dc80ed SHA512 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
 EBUILD ibus-1.5.18.ebuild 4303 BLAKE2B 8ee9740732ddce17e04235a81334ef3547825a3f5d23029df92e172c6a0fccfc180e46961d025c232acbc89a37fed4a50daed7eed94fa14917b9a7523e4a677c SHA512 22280af357ddc970b4408b8a689c497fa5a13265e5dd0fe48d5182409cdcf42ecf818012ba7177ebdd4485b6ee2878ed0055c377528ebb0fd42e9f6195366c6e
 EBUILD ibus-1.5.19.ebuild 4416 BLAKE2B a32df75cb888844a8ca78753ccb9e8245c288882a38be41dbe8ea503d07e6d2e4c4820a5ecf48eae1e5e987592872cf8aaaad04e6545c2258c63f0eb52bf1b04 SHA512 fe00a1e0e7d336a2d3a9d066334c8a5dd667c9eef7fc8ba516028a5feede945f5b0af59717874a9ac3ce9acd57b189a51182c77bf7eb73d83bd0bcb96ec070b3
-EBUILD ibus-1.5.20.ebuild 4135 BLAKE2B 1a11d74b23996b0b28da931f6fdafd23629f17a0829c72fc1b95310689747f3030c04b0c7d0f62155ceedb9435c71ce61f2413d6721a3d9796d1669edca82097 SHA512 b0c15279c13b4010a6def76a2f44638b7f906de2f208768717991b2aae1a10212ab31ce694376b24a901dd17940aea002a146c1848f4c2d306d79dd782e78cd2
+EBUILD ibus-1.5.20.ebuild 4130 BLAKE2B 19d14745ed2be706daebf0625f93619b8210198870a722ec6f4e86afef5203cdf0d5ec45a28f7e942213b5b94d9d58433ecb837d4f7647a2e89d4c5d1f852e02 SHA512 8078a4355be3495e1924e0ab41751c1d695bf085840435fc168327905a3aaa51f783e83fc155d45e16ba0ed065d094d36e768d3f3b9730634ec174fcfb6da52a
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index 8009d581ee15..1f0bb3865191 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
diff --git a/app-i18n/man-pages-fr/Manifest b/app-i18n/man-pages-fr/Manifest
index 5252956e37e2..e1f8c7f4bea7 100644
--- a/app-i18n/man-pages-fr/Manifest
+++ b/app-i18n/man-pages-fr/Manifest
@@ -3,6 +3,6 @@ DIST man-pages-3.70.tar.xz 1266044 BLAKE2B 00aa14ac7c9aafb9883713c4d13fe9318cf10
 DIST man-pages-fr-3.70-1-r1.tar.gz 4669973 BLAKE2B 2fd32c5e922f8d74dbec74724c9acb8f5fdc0fd7a88f4687465713b22ddee5589b4a54383bdf14eb76076538e9d28a20ffdac2415c521b21e21f5186606121d6 SHA512 002ca3b7066437ce3a42f9c0396940ffc8593d2acdd05a3150c54b8d1f272ef6a448a18e6f3de0f90ac6eb4e616c132eb4e11e3e052b2e6f83a820a7d56f32d1
 DIST man-pages-fr-3.70-1.tar.xz 1143156 BLAKE2B 09a86733caf03246e530e898688d0f93ef401a74cc66eb1f5ee05ded5dee0be45fc27fcbcf458f2c5a3286a6655c7b7302eb1b2759be6e0205e69db95ce989dc SHA512 7bb6991b2278c898d67d465ebe434dc3a969e9ec5c962ed6b6fdb41e66121a1924573f529d310adf30cd8494515888627b3226f26b906452a8882c4851c290d8
 DIST perkamon-man-pages-3.70.tar.gz 24292 BLAKE2B 60848a93d95c1eedc50b10a4b8cfd68c3847ae5e6d13de06058f1c89218d953f68f5428fe3d422c11078f80a5bcb678abd51388b6ee4ea20c2db2e9a87fc51e6 SHA512 648f16c958d1ed5933da1e971f94391761cad94414eb4d0d3eee612f9cabef3a56f07c5f83b72be3f98d49a9956d3ccceb1568ea76572f6d4a6fb8b50a8225a5
-EBUILD man-pages-fr-3.70-r1.ebuild 1218 BLAKE2B bb20fa190d5cebea67a8722c939e1498aada77a652f7be6c10a61d09f57341a2bce17829b17a2f48455112fe01dab38719303f8a7b0a8b08aa8ee863b518ca87 SHA512 3da38fd84d4fb8905922febd054f0439e1aeaeb0198cdcdd0813fb479f00824fd7f65fd007d2deeddcc865a854ad961045a0110570be64cb8634b8795cc173fb
+EBUILD man-pages-fr-3.70-r1.ebuild 1212 BLAKE2B 7b49de502f38eaf4c693d76945f45fad7ae165c772af2a2f9ce310b69ab318095d272b02c96ec0d78305a5ba8c5ae83c2e9080b495702bd4fe7059934e7dc81a SHA512 481d0e0a9906e24ecd7f671306aa7c11728e7ae2993392809e20b352670257a6397777986b7597f23b181ec9f3b3e69d4dc3e8c661f7af0f6e808b8bf25b8453
 EBUILD man-pages-fr-3.70.ebuild 593 BLAKE2B e0169886c506e7412fbd395c42d7320b841aee6b22acc26c3244f8b695fc7a23621e9a744912417fba2d423a218fa98a64eeeca118e6b5f537ac0b56f37fc724 SHA512 22aa7346bed0fadae049e5d461d5694fb71e13e0fbad028d4e68ab3663b7dd434e8138ab5199d627bb2e26ae056c61776ddd16aadc882b53c494368a8e72b57f
 MISC metadata.xml 546 BLAKE2B a22dfeb81d1ca03f415767c7666bf5575e9c6bffb6a12b7f75b3c1921c05f21d7cd2eac020facc5b161ca89204d6d1d64b47e7436b577dbf2939b0799820cca6 SHA512 dcda3faede9782291b4ee3a1022434bea5c1807fe1099f84f3869f6d4276a918fb0eefef6879db96497d1106deb490d0a993dd5636d36b4e7455f71b6b809c17
diff --git a/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild b/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
index 5d86ea304428..2a7a148e2f75 100644
--- a/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
+++ b/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2+ man-pages"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="app-text/po4a"
 
diff --git a/app-i18n/man-pages-it/Manifest b/app-i18n/man-pages-it/Manifest
index 80cb2a528655..dac1d394fb34 100644
--- a/app-i18n/man-pages-it/Manifest
+++ b/app-i18n/man-pages-it/Manifest
@@ -1,5 +1,3 @@
-DIST man-pages-it-2.80.tar.gz 1789480 BLAKE2B 664121e6a6d8e73200546431ea97d0b8c751eaeed87e958ff0b0a822c651c7e489b05a7e26de23a889a4f1ab6fc21524bb81fab21f0331eedb4102d40cecfeb1 SHA512 81cee1b4d0c818b83830355ba1347df7a309b87ebfe3169db7763b22de8638273eacf377d0b9127aa1e748c8fd427eb268dda6d6c4b543c6d3788edda86980ef
 DIST man-pages-it-4.00.tar.xz 349192 BLAKE2B 90f25e7abfd64d0f175c2596bc9203626d9e7e53218d579081d17aa01665be20ffa721e33379107814a57715a35f480bb1833a2d3965f4b86b3247bf70e9162c SHA512 6392b42254eba42bd76f3aef3b6206396a817019df61462e44bd0f7dc519768cb1b1107726c45e402a0cf27e6f2ca8c8912363bd9bec7562b10e8fd5dcc60ffe
-EBUILD man-pages-it-2.80-r1.ebuild 719 BLAKE2B 731599ffa82862ffb559abb582c806a656f6b944b35ea68ea384e6e6bdcd89cd1ada2aa981e572354065de74b928177676a8e8d5bba0f8e360feb399215518e3 SHA512 63361bfbe5770c970332fcb43df2ee706a6ea06a098562eda2b55de9d6eef893e6dec1ee17c25678060599e1440b0f9032a5ba910364cf6ec8f46a29434f7cc1
 EBUILD man-pages-it-4.00.ebuild 716 BLAKE2B 1ec27a0e6e759a06dec2b7c549d0fab909ce1769dab6bc86324061b3b077d0682f4cdecd2828715a8d1ef0f0269392aef5f1b5b6529c2b628483ccd49029c6d7 SHA512 bd40cafe418acc2be38053ca59de0f4fd29b2f7f874420542a5f4c1added8756b85e5fb4a8fc91d18c1b48e4472469cebb63405347cfa5f94ba4848cfb2a36da
 MISC metadata.xml 421 BLAKE2B a703dcd3047685aa6aa2a276d88a4a2f7a804bfcdf9d2980af1cf243b5f002361e8ed0b78961baab773fc20d46a6f860c8c912b39dc8a821d7ff4dcc7b317de5 SHA512 0c58ae5b97148e94d374bba03e0a65a2462b5f0d750c4df4e52ebd0cfac649fe4f35011429423ef20a20391cf4d69c206eb8bfa3d4ddd060265427b6d96aa095
diff --git a/app-i18n/man-pages-it/man-pages-it-2.80-r1.ebuild b/app-i18n/man-pages-it/man-pages-it-2.80-r1.ebuild
deleted file mode 100644
index 2a3c4dbf7b29..000000000000
--- a/app-i18n/man-pages-it/man-pages-it-2.80-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A somewhat comprehensive collection of Italian Linux man pages"
-HOMEPAGE="http://it.tldp.org/man/"
-SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.gz"
-
-LICENSE="man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_prepare() {
-	# bug 480970
-	rm man5/{dpkg.cfg,deb,deb-control}.5 || die
-}
-
-src_compile() { :; } # emake does bad things here
-
-src_install() {
-	doman -i18n=it man*/*
-
-	dodoc description readme CHANGELOG HOWTOHELP POSIX-COPYRIGHT
-}
diff --git a/app-i18n/man-pages-zh_CN/Manifest b/app-i18n/man-pages-zh_CN/Manifest
index 5f8bbc8c81ca..7198ac6c22e3 100644
--- a/app-i18n/man-pages-zh_CN/Manifest
+++ b/app-i18n/man-pages-zh_CN/Manifest
@@ -1,5 +1,3 @@
-DIST man-pages-zh_CN-1.5.tar.gz 3762338 BLAKE2B c2c740e6ae6f6e0cb26af7bca4e9d5ce75b20eb535362030565c8ed794c984ac8d1c7fe0ee354f58cbb37bc2dba1067afc33dbe4af07257938b0137156b43790 SHA512 799eac7e6c64dd9bb647bf490457bc6ece76870d261606e33f48df977762b66f778fb5afe3608443be100e516988c700ddb53de2a226e7b29d32348fa240ce91
 DIST man-pages-zh_CN-1.6.3.2.tar.gz 1845997 BLAKE2B 3af6859593e4b2a52ef3ce93f2d18fe0f102e63cee3c7035de04ab4d8b8ac491ceff284b1a2f01a5e4dcdc4869c2a9768ff7dfde48b9e89813a2e558bf7b259e SHA512 61171406482a24c3dfd1b6303af3d7fb086466d5f05d5799f50488beb78c91c5d1bcf574aab669b71fa0f027691a0be1a1d254d08f823ff4bd8bf976e0c83dff
-EBUILD man-pages-zh_CN-1.5.ebuild 643 BLAKE2B ec1026616838e311022ba6f1792b29e7e2529d869aade168aa7384995ba4ade5d7d97d4f2d7b18fc6e825289f999575ee618733ab0c0d7a7ca6a9b31ef36c7b7 SHA512 2311e3c84969eb1a5654b5e5f1eabf6c6331ffec4d566e3035f36946c830104171f65da7c5b2564e37f0dff3c72581cf94d44a979370cb2f223a06696fcea12b
 EBUILD man-pages-zh_CN-1.6.3.2.ebuild 831 BLAKE2B da42fb8b84237f3383b9062a5eac54799dc5b205ac6d0c9b148267c369278157834182993886ce6f122d4450f68995c290cafaeabf3669ed38948819f0ec1911 SHA512 39ff67c68cfedf51d4f8c24c1d4c4c96682a14073e20ae7a457f7f1697c2bf22596085e04405fcedcd00f565ddcf497768d2dd02289789c160d8fbfc39d0e895
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.5.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.5.ebuild
deleted file mode 100644
index c1d639ba7f7f..000000000000
--- a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A somewhat comprehensive collection of Chinese Linux man pages"
-HOMEPAGE="http://cmpp.linuxforum.net/"
-SRC_URI="http://download.sf.linuxforum.net/cmpp/${P}.tar.gz"
-
-LICENSE="FDL-1.2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_prepare() {
-	ecvs_clean
-}
-
-src_configure() { :; }
-
-src_compile() {
-	emake u8
-}
-
-src_install() {
-	emake install-u8 DESTDIR="${ED}"/usr/share
-	dodoc README* DOCS/*
-}
diff --git a/app-leechcraft/Manifest.gz b/app-leechcraft/Manifest.gz
index ba48c3b9adaf..7781081d6891 100644
--- a/app-leechcraft/Manifest.gz
+++ b/app-leechcraft/Manifest.gz
diff --git a/app-leechcraft/lc-hotsensors/Manifest b/app-leechcraft/lc-hotsensors/Manifest
index e479bc0dd872..67db956c42f8 100644
--- a/app-leechcraft/lc-hotsensors/Manifest
+++ b/app-leechcraft/lc-hotsensors/Manifest
@@ -1,2 +1,2 @@
-EBUILD lc-hotsensors-9999.ebuild 511 BLAKE2B 1f505126d2cda5d2dc87b5f5de23f27c734bca33cc96ebe20eff72d867ec474ffd3bb707d74bc8d883bf575dcf2ab5e1fc0917ee3a568d71f1a961131582a22f SHA512 d54e5fe3f1242b3d463e9ca4ccd71429095e36f952ec94fb14b3becd70151dce6c0c6c41027e67eec6ffa5eb7b1cb5e1a2a993b13a5e53f8ed9c26aee9b8e48a
+EBUILD lc-hotsensors-9999.ebuild 511 BLAKE2B 5a771c8968f502541258a1420f3bd56c6cb64196ef3c98e7b4867598980a2d120d7009e336fe37288472e07d31e6b7d00e1751705948acbde49d35de83422afe SHA512 b86e5fab95e1b73748869a2200d4dcd78db147bb919e57f0de67ce5134eda53d534aad1fa8defce3c37d71774e48cbc7c85b11b251eed65299b633d7f9df4100
 MISC metadata.xml 364 BLAKE2B 39462072f9e35ecb19d9426fe032a499aefa12b7327ed4b97692f4a0778c9828f4b7cbef3bb5bb0bce597d51a99b11db8dabcaa9fda8a326c9916690e6ff4af4 SHA512 697d6e58b4620f4b3c1b7a147955d97f29815facb843de2b6cf67b0c44ccdcb6a0e47ae9a32947f0fccf6a3aea9d204bd30a334e642ff77acca43b03ff56f3bc
diff --git a/app-leechcraft/lc-hotsensors/lc-hotsensors-9999.ebuild b/app-leechcraft/lc-hotsensors/lc-hotsensors-9999.ebuild
index 4e5347d717f2..d693a30b7e1b 100644
--- a/app-leechcraft/lc-hotsensors/lc-hotsensors-9999.ebuild
+++ b/app-leechcraft/lc-hotsensors/lc-hotsensors-9999.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}[qwt]
-	sys-apps/lm_sensors
+	sys-apps/lm-sensors
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtdeclarative:5[widgets]
diff --git a/app-leechcraft/liblaretz/Manifest b/app-leechcraft/liblaretz/Manifest
index e9e445d251fe..9f09b6e3804e 100644
--- a/app-leechcraft/liblaretz/Manifest
+++ b/app-leechcraft/liblaretz/Manifest
@@ -1,6 +1,4 @@
-DIST liblaretz-0.1.0.tar.gz 11783 BLAKE2B 5ab0aa23fbf7d6840e53663df7963258399388f414faa3a380ff1822173f6b0f130a5f0d9b07aead08a85f2b1688138abd5a2d2bc3f224a60ed942b91b797d49 SHA512 869361667c4872e694a875655dd33744925b6dab13977b9b93b87de52c8290f59206afc1ee711941dc698a12fd4ea38fae4f1bda6aaa750dd275dd2b1c8a0a53
 DIST liblaretz-0.1.2.tar.gz 11951 BLAKE2B 87d5e9297b6fa73185a9c3555d408eafb9383d0b8361bb229848ef168a2af54dedafcd27cbfbd826d3ee432b701ed0150aa4b186eb86f02c8a145e1b9111b0c0 SHA512 d0966b5c503ed4741da6bcf57a28cd36bb6466d16f83d4276e4055b0fcf66fac58627309cbe2218ee0b8aeb7f30bfb018d58d81a87ff3dbb3c158cc7589ee484
-EBUILD liblaretz-0.1.0.ebuild 504 BLAKE2B 618bbb00c345a1a4273e4e5465a9dd23436ec8932f5f3a15acfb70b08f75dd09dd5e232a4a6d3797b2cb30eb6c02da7b7c7d9df0bfde5f09086fc2df1f3c0b24 SHA512 2d9e11b98358356179993f009737d361efec644664875018583be6587703946bb201f85ea7c4a52315ecb96d6f2571fd4856755aced197c8bb44f65487dc4b66
 EBUILD liblaretz-0.1.2.ebuild 505 BLAKE2B 95138dc1fd7bd898ef721def6b72652da5c5ea739744e048ba3c8bf17fa0b8518b9c408e7eb7cb6f743d49ea79e720d8860f717d97c7859d612e970f6fc7e16e SHA512 b8f0e8ea83f9f461d8423b10f598cb10f842d0fce377717fe238c0a1983ccbecc7333fc761c5b5883d288fc792b5fdca95b5eaaba973753c16c68ddf8b3caf55
 EBUILD liblaretz-9999.ebuild 465 BLAKE2B 2561d5bd7966e72bdcdb0348d1a55736d7d06bd5ff7ba84d925c6f86431588015f9bcba87f76aeffc6d25b0261260075441e8df96afabfed99b0119c93dfab61 SHA512 4f09faf7df589ab7c8a338e87e29645c5d65af565e27aa7c66bf61abd99f15a6a709752f57a64cb8b97df6eb093352a31c73c1029147883b8953f1c4f052e8f4
 MISC metadata.xml 446 BLAKE2B 2a7957b76ffd001b00578f63311e7bf47e578988e93e155672b147a5da93a68abec776c21a9a2889d80aab8c5255acc0cf9371d1a6bb3bb617b669173a179fa7 SHA512 2f9e6253191bd50ed94c981934f3a736c7397be9ddff0120ba8c140c0683c8f22af72fc6229b7e62a34730cfaa3e4970fe80b3459ebb5f46e78e839815d46e00
diff --git a/app-leechcraft/liblaretz/liblaretz-0.1.0.ebuild b/app-leechcraft/liblaretz/liblaretz-0.1.0.ebuild
deleted file mode 100644
index f36a501479ec..000000000000
--- a/app-leechcraft/liblaretz/liblaretz-0.1.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=6
-
-DESCRIPTION="Shared library to be used by the Laretz sync server and its clients"
-HOMEPAGE="https://leechcraft.org"
-SRC_URI="https://github.com/0xd34df00d/${PN#lib}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-inherit cmake-utils
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/boost"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN#lib}-${PV}"
-CMAKE_USE_DIR="${S}"/src/lib
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index d41ad6484046..b02ca0409361 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/bind_exporter/Manifest b/app-metrics/bind_exporter/Manifest
index f724406f3739..de7c35f627cb 100644
--- a/app-metrics/bind_exporter/Manifest
+++ b/app-metrics/bind_exporter/Manifest
@@ -1,7 +1,5 @@
 AUX bind_exporter.confd 57 BLAKE2B dfffea2f2859b377d5132a2c56ace0260f2d272463c104144acea0a2489141d01e35f4899d53af1526fe0ca1ae760fef62c96a0b6849c8b8678b7693a53ac20f SHA512 54c5162993d488eecec2453b06b2cbedd5eb4599074cf43fda644e2faba4c35ad481840dbb8b05979bf1a0dcdff32edd9efa56bc779f264d81056793d1d00be0
 AUX bind_exporter.initd 550 BLAKE2B fcb4eb3066023024b8605a2c9787ba7c8871d05d1b11a1ea97ebab91e403e21876c8b29136b114c6ceef29e9be79056accdde7061e13f615b1f55c25998b938e SHA512 1471a0644c1c2d5a242987638b6fa0576913b9dfbcf886ade42951b3cc71f632c210060a619637988c5239a3ff934c2073e2bd34b913abd9871eb028fd71e2e1
-DIST bind_exporter-0.2.0_p20180307.tar.gz 873965 BLAKE2B e59cbd2ccbd13dd60b673c6816e2d4c151e85ed159daa272996081814f7f276bc686b5d6a94db59e41085d57a12974bd2dcb8ef7696dba3940de705dfc800f25 SHA512 63331f877d988a41b86c0204569a1cd19cbfa176be9e811ef8fa5509d0af4a2f7dda0b27f9ba3b0f3df985f7c075f4535225298ce8808f97497d8bfa3b41256d
 DIST bind_exporter-0.2.0_p20190226.tar.gz 874497 BLAKE2B ce04a168be6844d43ed2c358aa6469d5dbae1730825e4c3c038805f4bbf071bfae2936a6a5341832939e3ed249e5d484f2ca0908ac0e717cd2b5ced496c44a49 SHA512 95a8ae6f7c6470345d5a5f7e4e36eae282e5ca74393dd4372342f44732b54a6cc977ae037d6d16ae4ce6a9ac526b2e01721f5468a6469c30ae60ca59dfec8d5a
-EBUILD bind_exporter-0.2.0_p20180307.ebuild 1550 BLAKE2B 5448c9f30f97c14a72f8063af4b335d5ea34f092d6c07adc5f27e72a366acccaf437b5c83a74117f9ce2f55fc6823762d587e823615745a004d38d85d201d09d SHA512 f94d6e633a3fff0c9b1b84e4ce3bc4034abce0519dbba1d332f54dc188278821e874d4e32323aca926d01e2b06c7506378e0318d1acba22f1a66da248cc5d6c9
 EBUILD bind_exporter-0.2.0_p20190226.ebuild 1547 BLAKE2B 3055fa2ee9dc825d9205e90c469f6c297b3f3b28b3c579daaa99caf9ca12fb0c6f26f08f4f5b3fab01b6290090f6f760ba795b41a42d975a8ce3bfb1cf92afef SHA512 c51f97306474af0d12d8c45ee1af601b1e440b8462f26a57e7293fe498900c466e87c78a4fb3fcd52cdc5e42121e8c12eaceb6fa01c526972abaf9c51b7fab12
 MISC metadata.xml 258 BLAKE2B 3e1e1a99e20e0e84744b82650f72b24662b588dc603d95d1b45258f4f0a3bfba11aa1322672adaafa0a4f505f63d6a7c2a7460612c055377ad2bd8b7a0b9fca2 SHA512 6848088d8b0b0dbb9a54a50370ca7318bf8e127e1f59712a48bdf080e623dd0bc67e42c5f98356918c34d2e1caa2daab6f24bd3e74e76d09d8449bb5895cfedb
diff --git a/app-metrics/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild b/app-metrics/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild
deleted file mode 100644
index 2a1f34a01290..000000000000
--- a/app-metrics/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/digitalocean/bind_exporter"
-EXPORTER_COMMIT="38ef3a6caa68e8c42a08e72d51e90b00333e6894"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EXPORTER_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for BIND"
-HOMEPAGE="https://github.com/digitalocean/bind_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/${PN}
-	dodoc {README,CHANGELOG}.md
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
-	elog "Make sure BIND was built with libxml2 support. You can check with the"
-	elog "following command: named -V | grep libxml2."
-	elog "Configure BIND to open a statistics channel. It's recommended to run"
-	elog "the bind_exporter next to BIND, so it's only necessary to open a port"
-	elog "locally."
-	elog ""
-	elog "statistics-channels {"
-	elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };"
-	elog "};"
-}
diff --git a/app-metrics/buildbot-prometheus/Manifest b/app-metrics/buildbot-prometheus/Manifest
index 9301427f16b4..f33a0fee78b0 100644
--- a/app-metrics/buildbot-prometheus/Manifest
+++ b/app-metrics/buildbot-prometheus/Manifest
@@ -1,4 +1,4 @@
 AUX buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch 2430 BLAKE2B 1c7cc11d95301cf119b3cf0a1d9b1c0af9e48fd486a03350138d97c625abcb72e0f13b0eb4c826341f4e9a6938a708f0afee4c1cd36750a99580a34b23aa290b SHA512 ef63fbfabe5bef28eae222dca2509e24f5f1ec3aa71aa3af3c0092cf78cb9efe58296d54e46760c43ecd38c3d9ab741d1c83c79f2eee7f96572a82f125a389b6
 DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db SHA512 8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b
 EBUILD buildbot-prometheus-17.7.2-r2.ebuild 1122 BLAKE2B 4ed47d8f6f252be8866c997639f7380d0ecf33f7813c1c08b7f6fd83837b216dac116cc78bdd3e5d892ba8a8952f65564919b59286d1375b2b09f42b36065f51 SHA512 b72291f2d007542bd510e3f2f2b0bd42439d3c70583909a742a02a209e9f8507850597512222acfb99f355b4dcedb51777b7f1c67177fccd5bd2a1373b9e3d2e
-MISC metadata.xml 392 BLAKE2B e9618f93a6f7cc7fe7b3b42db9a1899e24638dcff9d4f5d13ba6e1be93f738421859ee09214a26652516088ff333bd039cb57f25bfef6a911c2ecacdc2a90979 SHA512 9fa3b273c27a7dba7ea6e75ffe7062667816bf145e06b735a66e23f1ffafd768954fbe729e400fecd82983b883529905b08b252a60601178dc68b9cba94179bd
+MISC metadata.xml 314 BLAKE2B 7ea3af51048358bd6291056e64324eee54fdd041b5a6199c14058e54ccafdffcbfddad12490cc6a6a5baf0aff47648c23ee8e7df6234e5aac10d15740b93d47e SHA512 73b0984af8b92c14a21617b3977d2f7b84f5ac33b9cb3ec26dbb12d59789f8c50c839c3de6044667e9d2ab12c420a28511ab4fa445f043c98e22bdf0b16fb68e
diff --git a/app-metrics/buildbot-prometheus/metadata.xml b/app-metrics/buildbot-prometheus/metadata.xml
index 94c578720712..7499dcce7171 100644
--- a/app-metrics/buildbot-prometheus/metadata.xml
+++ b/app-metrics/buildbot-prometheus/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">buildbot-prometheus</remote-id>
 		<remote-id type="github">claws/buildbot-prometheus</remote-id>
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index d3b85962f990..8bb37058deac 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -6,6 +6,6 @@ AUX collectd.logrotate 115 BLAKE2B ce2a79787096b04af6ecd128633dde68fb868a02cc1d2
 AUX collectd.tmpfile 39 BLAKE2B 0d1ee2f02e539e854b62b47032308d08505fa31d8428e98f8d150c924201074c5edae22eea3990edf3a7837f1473193fe009a501645bf064638c532ec53a36cc SHA512 55fb70da9ece74b143c3e971b890954842230691039f8ad2240cc4c8d699e4e7a21efcbfd0b3cb2503e90af0bbdd0c7d886e09baf9fc86ec26c115a0bce6a668
 DIST collectd-5.8.1.tar.bz2 1789228 BLAKE2B 739f961172978db33bdf95c8f93bde0036a26b2ed2abd3396a734d4b97c4ae117bb26a62fcdbb3d77bd63d9f64a38f83d0c8a0665e8fa7bf5ed2efc6838b0e8e SHA512 8c75448c6e59ee1ea5c1cf486c07040d20fb36d5b7a1be2ab45facea330166e8c1d1fa38e3fa82ec905428d7b2c92c66aae35ee8e3546f67ce76f7f410739901
 DIST collectd-5.9.1.tar.gz 1501178 BLAKE2B ed0984637161427f3b354002850b7ea8c49a4aca64b637b864e5513c8057f52a4a479477b21e2a4cff436728c16d66c6d561df14308adcaeb7d597c290f543ce SHA512 424ef12a3ba6997a71e6eda1a62d73fec588c9c4d90542c2381c1f9f4e118b2c02e18c71507e8984e20fb255b69b7f42afe83085b3df5e225c576d1eee1655fb
-EBUILD collectd-5.8.1-r1.ebuild 19431 BLAKE2B 7bc4b09438a006dea269c954133c7b8ca0f051451d7408fe53d672caec76cff0c462050719c069a8f3b4fd7106db7e6551b240b5cf3a3cd6644543a09b53fd76 SHA512 a3dedffad32926cb884678790a3243db5560600e9a7a6a1ae518a9c332db441b5e9ffd41b10191180464e3366712b90606c7e5b7c98d550b3c4bb7a4fcfcc003
-EBUILD collectd-5.9.1-r2.ebuild 19597 BLAKE2B b592caeb54af1575e62b23026ca726eb50c28206f162728f0e945c797c904a94470f7d4f5b3e4b7c51a9df7c131412e6c620c4801585b531d3164599a54f51af SHA512 c89e6971009200fefe9b8d3ba15a1e9bb0c35405f459cd779b018be3630091a70bbcd4a3d001899f1e1364f5ba3969ac0db1242e8c73029cb1779f44f34648e1
+EBUILD collectd-5.8.1-r1.ebuild 19431 BLAKE2B 970be74630e220d80bb5ad2ad59d1f82356c41d8ec3a360427ea0c0ea6f792d3698551cb2980f6020a227b656f6cd4a8d20d750404db9e7fcbceafb3f4c71796 SHA512 4f1e16610288db0be07fa89a1d32792a11d69277a71367a201013fcc92f98659fb5c3b1220e0c4bdac935b14afddbf5e78a282445b83487e9e9a8fe5f4e83284
+EBUILD collectd-5.9.1-r2.ebuild 19597 BLAKE2B ae1badd06dbe8a0a756fa338440c06e9c814a45c59e657c68d56db1dc62e53e99354f6e452904e7351206b06813638f9bbd55bc646ba96789cf6be96a78c60da SHA512 ffdd05679e68dd265e1385c6ba11c2040fafa27841e8e5a0495c6a1c9d04078b829557a3c0e92194fb8136c6fb1208556152eb23d50bb714ee0922efeecc6266
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-metrics/collectd/collectd-5.8.1-r1.ebuild b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
index ce224b6f9195..5ab2828b9777 100644
--- a/app-metrics/collectd/collectd-5.8.1-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
@@ -119,7 +119,7 @@ COMMON_DEPEND="
 	collectd_plugins_routeros?		( net-libs/librouteros )
 	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
 	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
-	collectd_plugins_sensors?		( sys-apps/lm_sensors:= )
+	collectd_plugins_sensors?		( sys-apps/lm-sensors:= )
 	collectd_plugins_sigrok?		( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
 	collectd_plugins_smart?			( dev-libs/libatasmart )
 	collectd_plugins_snmp?			( net-analyzer/net-snmp )
diff --git a/app-metrics/collectd/collectd-5.9.1-r2.ebuild b/app-metrics/collectd/collectd-5.9.1-r2.ebuild
index af1f3432adc8..6a6e866259d1 100644
--- a/app-metrics/collectd/collectd-5.9.1-r2.ebuild
+++ b/app-metrics/collectd/collectd-5.9.1-r2.ebuild
@@ -120,7 +120,7 @@ COMMON_DEPEND="
 	collectd_plugins_routeros?		( net-libs/librouteros )
 	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
 	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
-	collectd_plugins_sensors?		( sys-apps/lm_sensors:= )
+	collectd_plugins_sensors?		( sys-apps/lm-sensors:= )
 	collectd_plugins_sigrok?		( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 )
 	collectd_plugins_smart?			( dev-libs/libatasmart )
 	collectd_plugins_snmp?			( net-analyzer/net-snmp )
diff --git a/app-metrics/mongodb_exporter/Manifest b/app-metrics/mongodb_exporter/Manifest
index 89b32d7b4520..c956182674b0 100644
--- a/app-metrics/mongodb_exporter/Manifest
+++ b/app-metrics/mongodb_exporter/Manifest
@@ -1,9 +1,5 @@
 AUX mongodb_exporter.confd 94 BLAKE2B 25c98466e22b137a33f347d2c8c53fb15e0727423b6e0d8d804547a9b4220ca1c742cfdea6f6afbbb1fc6a38adafda56d1d372b5175bf3293ee5094ba2c835d5 SHA512 3ead6c80528042a436d8b0d013998e410c9a4216f532876766b7631187051b29b37bc4d834dcdc1483b1575dfa3b975baaef03e0637e63e279a5fbd9b3b75073
 AUX mongodb_exporter.initd 591 BLAKE2B bc176954356a3633fc9a3ca314803e1149c14767f11da5d3d6c29cef0e0455b6e61571ca85b19628a5d6e61c653c2de37b16bed34d0d36e51aee1c3fc2ff1c7e SHA512 d81430cce189c5655c2432e5133826e73a92f04f33b3a4d632d0bcf27dc31d9fc2fcaf7a3322e9c6905606770be032647b5beaa1561c967522a4f331f43fe939
-DIST mongodb_exporter-0.4.0.tar.gz 3386266 BLAKE2B a6bebada2792e620b2107b72b3ab8b2a4e7a08fc53747f266b30a3cf2fe42ed7e09e3be9aa36332cba2df124947064f545821f355726e09649509c671a56c30b SHA512 0db1abd8c7439239cf59b24968ef33f83c6609a9deaed250315dd7fcb6844ef3d0d0c1f50b979f931beb539038a13eb7b88c03c899333d981112695be2e031b3
-DIST mongodb_exporter-0.6.0.tar.gz 1274979 BLAKE2B 9e039d33048a7cc8552d39e9dbc6b04d26f062ac7c232088806318a69b2601b9ae98f09a41d255e9b6ac6883acfcda9511219513382837a0d88903cf31578bde SHA512 c9d7f46a6d7222e4dca105be9c306a6d558dacf185a726345988e262386c27ed63ef7022e524086f522aa0b5c7ff0ad6207863e83670c6116bb2b1e681abfc9d
 DIST mongodb_exporter-0.6.2.tar.gz 1296198 BLAKE2B 4cd04b5e69788f2bbe3e87eafe6a7cf4f0a2e72abff4784176299e46943eac2219141beed2f8d11cc8a2458737456d8edaed42a5392bedd017e85315dc75ba1d SHA512 52c1464af82c09fc79338e805e62936d4da8131cea1bb6608500fa36a2d4069676eace5da0ed1b14d82de9d626be301b42c7bc1d5c620bbecb47ae9a350ecd65
-EBUILD mongodb_exporter-0.4.0.ebuild 1110 BLAKE2B 5ad73d6b2c0cea692de28c2bac400beca74be721fe4c0766d8f12fede1f598e45f91f29ef001ec21a72a25884a2bc789ed51771ebeac751d63d22de4316e0b92 SHA512 75956d5f16c5723cfc2e2f7758f4645d87d6539bd8a3f5dbd0244d1985ece9372df28d9747ffec068c7bb352fc236abc25f0f0edea66e41c5d9477ac6ac7d581
-EBUILD mongodb_exporter-0.6.0.ebuild 1068 BLAKE2B 28d809b53a9501ca8b67d939351ac84a6b264fead83dfb5f985470a69ae9d8337521e03a83f1d633612f5813ba59f11e28b76623db9929bad55b881a86d6276e SHA512 f1c4119c210821f893df8f4bc4458c73f51031a513718d21dcf0bed85e72b818d34c40323068ade2d91020ecd72337aac0ae0fdf44c3a73b6e6dcb65fba2a8f5
 EBUILD mongodb_exporter-0.6.2.ebuild 1068 BLAKE2B 28d809b53a9501ca8b67d939351ac84a6b264fead83dfb5f985470a69ae9d8337521e03a83f1d633612f5813ba59f11e28b76623db9929bad55b881a86d6276e SHA512 f1c4119c210821f893df8f4bc4458c73f51031a513718d21dcf0bed85e72b818d34c40323068ade2d91020ecd72337aac0ae0fdf44c3a73b6e6dcb65fba2a8f5
 MISC metadata.xml 256 BLAKE2B 61aa17e78f6de159d61992fd9bd136f0ae751cb85cd8728031408dc8fe1872c746620fcd34604770332391bbff81f34aca135b30d8bc5b558242a71d4f3bcd25 SHA512 8f0c6a1845a873568e14f9032658de049b0c255c91b5fe31c8ad6e9d53bb1c009083d7bb75ffbd86d7b69fc09d8a8775fd65cda98c47698f970dad85e346a848
diff --git a/app-metrics/mongodb_exporter/mongodb_exporter-0.4.0.ebuild b/app-metrics/mongodb_exporter/mongodb_exporter-0.4.0.ebuild
deleted file mode 100644
index 5ea07ecd61c8..000000000000
--- a/app-metrics/mongodb_exporter/mongodb_exporter-0.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/percona/mongodb_exporter"
-EXPORTER_COMMIT="01f0ef9"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for MongoDB"
-HOMEPAGE="https://github.com/percona/mongodb_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/mongodb_exporter
-	dodoc {README,CHANGELOG}.md
-	popd || die
-	keepdir /var/log/mongodb_exporter
-	fowners ${PN}:${PN} /var/log/mongodb_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/mongodb_exporter/mongodb_exporter-0.6.0.ebuild b/app-metrics/mongodb_exporter/mongodb_exporter-0.6.0.ebuild
deleted file mode 100644
index 4f780222d44f..000000000000
--- a/app-metrics/mongodb_exporter/mongodb_exporter-0.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN=github.com/percona/mongodb_exporter
-EXPORTER_COMMIT=a642618
-
-DESCRIPTION="Prometheus exporter for MongoDB"
-HOMEPAGE="https://github.com/percona/mongodb_exporter"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/mongodb_exporter
-	dodoc {README,CHANGELOG}.md
-	popd || die
-	keepdir /var/log/mongodb_exporter
-	fowners ${PN}:${PN} /var/log/mongodb_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/nginx-vts-exporter/Manifest b/app-metrics/nginx-vts-exporter/Manifest
index fccfab62eecd..4597c71be908 100644
--- a/app-metrics/nginx-vts-exporter/Manifest
+++ b/app-metrics/nginx-vts-exporter/Manifest
@@ -1,7 +1,5 @@
 AUX nginx-vts-exporter.confd 138 BLAKE2B 5276947629899f4e338324d7bbfcd7afadac604fbe9d0b9bc101fbbfc5af2bccc2d9968315abcf060932defb3a054885527dd058e6ff20594ddfb77fafc8d138 SHA512 2b41b8efdef35f4beaf8b991e77a7ccf76be55290f9ddfa1262f860dc3b57411bcd1a3332f23119d87e3f72640d23da28d9080df43902f711cb1d1bff838532f
 AUX nginx-vts-exporter.initd 637 BLAKE2B 9fb8c9e1908846391ef0afc4b586f40a0ae13410c9f04e0ee594874b0434fe6fc0bab029f9d5021e5ce41a67df622bd2d7dff1f014baf25deee07d3e65a22eed SHA512 75ed5cfb084022e86058e20a7daee0c9c0fed3ee68090818e6f9d9b92dd8aee86145267c6b5309ede12f0a5103f80b74c43fd2522015ec866217e927c16a3803
-DIST nginx-vts-exporter-0.10.0.tar.gz 149620 BLAKE2B 6856240886d1a7082c901535954193798e8636ef744a5960441726cb12a5510706f7b8c1757e9f719c756d0beabc355cde8ec626c9bd4f14f7ff84894d0cc6da SHA512 bdd3993b3fee24d3332db720df2880493eeb0724cd5b099ccdd5fe6456df1b344132e4e585271999df355fb2042954cb3d452e6dc0b92dead288e94dd71f627c
 DIST nginx-vts-exporter-0.10.3.tar.gz 149578 BLAKE2B c73a8cfdb875fcc02d3b7d66f5b436b9e3e8d516c8a241062721e3124452722e9e30abefd5c79e89772a480fad005d0cf25d0359dd253a39d7ae5a20495f074a SHA512 0ee97be313dc829ae9e23bc836d7e11106c4843306583ff8baa38fa10bd9d56396ae3f6ce12cad4e08a383047c3179013962284aef6e627b23b89c72c564789e
-EBUILD nginx-vts-exporter-0.10.0.ebuild 1120 BLAKE2B d1200212f0ae09284a27b18826a49d3a30e55334d7f55e48134d4d6cfb704fa27ec95f99c5e8d5ee8a5c40c5f92bada71092d6b2c1e5bccdd58ac5fc1452e274 SHA512 871899a662d4d6b4c3b36fcce440cdc5ef57abf36016b8d0f535b0fb3a3e78adc71aff16ffc314cc1ef99167324aa1230dfe423bab0ffab7def00650f28842c3
 EBUILD nginx-vts-exporter-0.10.3.ebuild 1120 BLAKE2B 34e05f1a24e62e1c036ef50f0b0b8ce2256bc84f27cc5961b5b035d3d41d7194a503337b96bc90b4a7f92489536e8e48aefa97212e78883894fcf05882082114 SHA512 f02831085bc7462d9953da0135b632dfa86e2e4900a6e6c186d60c54facfc0b5baeb66a97a4720cf94cd6a61349630d4d5d8c686d6ad1578f552c1de0ef4a807
 MISC metadata.xml 258 BLAKE2B bd20ec1460d7fb49c9a758a9078a7780174ac04050f32eec89ddba7fe5d41c7fce50cd05cc2e1eb1ea1fb2b0eb33ea567de59b01d0711781f4c297098fef93e5 SHA512 ca87b9d1e5ff8a727d456d982206d9fbd0c7a6d8e6b3675e6aa5f906e1cd0b67fef1fab7c21cf0316850850e221039e929ce4060e3a4748d349522178aa3d1a4
diff --git a/app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild b/app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild
deleted file mode 100644
index 761f9630f63c..000000000000
--- a/app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/hnlq715/nginx-vts-exporter"
-EXPORTER_COMMIT="f5b3491cd0a8cc2df7088470f2727b0ae39a2700"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Nginx virtual host traffic stats exporter for Prometheus"
-HOMEPAGE="https://github.com/hnlq715/nginx-vts-exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix bin || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin bin/${PN}
-	dodoc README.md
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-metrics/postgres_exporter/Manifest b/app-metrics/postgres_exporter/Manifest
index a461507c4e2a..fb8cbb5f4817 100644
--- a/app-metrics/postgres_exporter/Manifest
+++ b/app-metrics/postgres_exporter/Manifest
@@ -1,7 +1,5 @@
 AUX postgres_exporter.confd 61 BLAKE2B ce1fac504bd44cd87bec492b2fc5ccc8fc7c1f1bc19b44d7c9572025f82c365655f4269679acf2b40adfbe30c624d59b1a72a2a802c50310ef3259d0c46264b4 SHA512 8792b42a98f807aab7f33ef2dd679f79b14afa3f61a41ac86e9d829199a14b1a21d116c1f921a646c460ebb568591605272fa028ef99c66d16b529ce9da66c54
 AUX postgres_exporter.initd 560 BLAKE2B 2a813208d623460930d0e2288fb4102dde6add57bd9e83caa60a46cfb4770734bfcfd88a29713c881a36f2d1e20ff0c8e3ed47a23e024d865cbcc7d6cddf99ed SHA512 7ab3c8ea837e48ee776e12254a6c968ffceb6fa3f9f994aa44897f3a8fe6bea3d5ce29e8b4f85b626b690b50171feff5901952cbbad28ccc0e49333496ca7c87
-DIST postgres_exporter-0.4.6.tar.gz 3698795 BLAKE2B 5d8a370d6f5ddbe0c8570ad14d8547a5d56dbbd9d4f2d5ef604550cd0e1e97baa5c7bbd0940704f3d8f7f25da0f26d54318b4e4732a82f68e9394c5c9b044a20 SHA512 16062a372ad8048ca0bdb41e302bde9d18dfcdc519fbf387cc7ea414667d4a8ad2984b524e7a2c86132f4b37a175c6dd9d4ce67be5cc3c9d91aa9e73cb8c4e3b
 DIST postgres_exporter-0.4.7.tar.gz 3699251 BLAKE2B b4232858464ae30f714dda58a414ec343aedc5972b44066aa45a85cf64d98ef40925ca77956c218a3962e22a35f3229795cc730fec9fc10565a43fc9e827200c SHA512 81afce765830a5c16597f0ac9a95d21466edb20e40cff8e26079663db75f0051a6e0eb4ff828eb825b51a6fc52b3b534e0f6ffbb2ecf2c94e2ec8656de4a2ff6
-EBUILD postgres_exporter-0.4.6.ebuild 945 BLAKE2B 0f8ea22ff54917e578d0713ca8f40fa0f53796fa42432c22615a06057526770c03c45516f7126b491e45150ed747d99c7e8c0e04fca18c6ee17c409282d8d6a9 SHA512 52d4ec2a3f8666509ef1dfa2277085905da5fed3fda393492fc3b2960045c573dac2365404887c6a71fea9530135ae801e2a0ea3d7aa7306d2faad1acece4e93
 EBUILD postgres_exporter-0.4.7.ebuild 942 BLAKE2B a97fe2eaa63d04df76749b64a38f83cd65efa84eb9868ccfabdfde601f58509384f90df305aa9e30c5748d3e34911a5881a91c7dda5c48e4b3fb0404eb1b92ea SHA512 17b42694342236fcdae3c042df8c029877bba1ce2759e6e574217e90383160d649251c60b9f73b6dace9a1e1766d44ae45a34bbb24a0010d6d8969eff56f9dea
 MISC metadata.xml 259 BLAKE2B 1da22e4138484c1f7bfee8247821b2713ae5b85e6e5a49eb5c9792eb0147e7bbb5939a6f9ebf3eae066ceb74f8c8dd91f8245e1f9e258b7a4aa56dda51d64df7 SHA512 d09f331ce43bb316cbc5a5a2c5458cea004a82e0ee214678146706a19b2eea64a30f8a2f08c6d7062189c0eb3287b2615b750fdcfd840bed935d78aaa1ae5622
diff --git a/app-metrics/postgres_exporter/postgres_exporter-0.4.6.ebuild b/app-metrics/postgres_exporter/postgres_exporter-0.4.6.ebuild
deleted file mode 100644
index 8aa5a0f5e8dd..000000000000
--- a/app-metrics/postgres_exporter/postgres_exporter-0.4.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/wrouesnel/postgres_exporter"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="PostgreSQL stats exporter for Prometheus"
-HOMEPAGE="https://github.com/wrouesnel/postgres_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	VERSION_SHORT="${PV}" VERSION="${PV}" GOPATH="${S}" go run mage.go binary || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin ${PN}
-	dodoc README.md queries.yaml
-	popd || die
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 202b55d2be98..c8d3d4b86571 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index 8ec04ff8bf1b..7ec2c6164693 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -2,4 +2,4 @@ DIST ddcutil-0.9.1.tar.gz 656853 BLAKE2B e4f11253176587cb5ee3c9647a01ab04d5a92ce
 DIST ddcutil-0.9.5.tar.gz 681534 BLAKE2B 6746c239738d4f8eb7fe56323816fadee9b8fa9ad2b66a8242782e0b2688182c0140b40b9eddb3b54ad32c7ff7d1f0cf9a28c5477a48d90cc39431ed82f5d443 SHA512 6249ebdbb398ad5a6c32f3891be8bf5328114b1ed08afd75adf4b67f10a40f19451e188ce5cd88b3153a18f317e394146a34258a7d2298f126be227d7e1c25e8
 EBUILD ddcutil-0.9.1.ebuild 2680 BLAKE2B 1d5a6ec7d867528aa82ea1c401a7b9f5e4e70da6f2f616ae9781851e0a1f320b266ca3b436631103c0e0f104dce55f55cafe131f910cb921e25522484b0946c0 SHA512 6da340c08a14dee704b9a6af2d889f55155414f16afaf3ba63669beaa090865f4049d2a938fcd6d76c45f947fe5a72cc01e1ff7df8aac70b6bd62dc52b3a4b5b
 EBUILD ddcutil-0.9.5.ebuild 2768 BLAKE2B a76c3a6fb9a40dc46b1be36447683ef7bbc8819274d416e089bab8c525dd37bf4c5f27f58ea6290e7828b9a8388e6221a297c05308aa240776f1bb92747fa692 SHA512 f76301be0f85eb21c1c26cb09cc066b000c9ea0ac10d21a031f10f864f9e06fb042550140fc609c2058fdb5f85f46119204db56412ce8a39d20f4490a1287af4
-MISC metadata.xml 1293 BLAKE2B 185066701c363efd3520b07a9ea0cd70f94f0adfc10ea4d3cc624904c6bd66ea925bac4ccb53afa22bb7bb24b843e019fcf62e11a26c934ef16729a50f2a7117 SHA512 cb5e342c412ab146f28e75944a47d91b73b7148234c2f25966fe24993c595bff47c5e5b87bec82e07401b41338837d5425ca32f02cfee4df20d176954abb66d3
+MISC metadata.xml 1209 BLAKE2B e41b796aa6d3de7f54292a07c2aff7b116033953db912e0eeb513e946e5d6f2dea5c7a02e20185217e4aa04b29f40c4d4b6f8fe2681ee0cd51e1e56847c36b59 SHA512 0cc976d55a11f0dc4fcf5711dbb1d8069551103ec2ba7faa4ceb8458529a6adb80098bbbb90f43c9e772487f43e9035346fd2736e8203ad307570b21879b19d2
diff --git a/app-misc/ddcutil/metadata.xml b/app-misc/ddcutil/metadata.xml
index 7a944d0907c0..4ed719a346cf 100644
--- a/app-misc/ddcutil/metadata.xml
+++ b/app-misc/ddcutil/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dracwyrm@gentoo.org</email>
-		<name>Jonathan Scruggs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		ddcutil primarily uses DDC/CI (Display Data Channel Command Interface)
 		to communicate with monitors implementing MCCS (Monitor Control Command
diff --git a/app-misc/dfshow/Manifest b/app-misc/dfshow/Manifest
new file mode 100644
index 000000000000..26a9589b6270
--- /dev/null
+++ b/app-misc/dfshow/Manifest
@@ -0,0 +1,3 @@
+DIST dfshow-0.8.0_beta.tar.gz 97301 BLAKE2B fa98ef37d23ef39e8512eed410d4a3a9e45aee87d9ee1c35230a9bea47af61c936091117c7232c195cd661ba61b09376ba1db4167bf8388323311f2a2fa7b6a6 SHA512 79cd82916521500d5f6f7ab00770af084f1a52069fe5625b7336f3081084ece6d2773be7f5480c444455ad3151e603d937b3feb279a18502c435c1a05d6d1446
+EBUILD dfshow-0.8.0_beta.ebuild 734 BLAKE2B 94dba6b5ffbef8e703a05a16f6f61ae7e64f64771e5dc5cbe62c4d61eab9af8e2123c94c6184c5e9d88a8b18cee4a836ac3c52168a9a262077b8702f0353f32d SHA512 10bb9a6127c6727e79cca0abc5c1d15da27a7f9dcc568091ef5c06f224864b4c7b6e6a8fece758a4fc6a7d4aeab6e6961bdb795fbbb19674934d3ff61a26e72c
+MISC metadata.xml 637 BLAKE2B 30ff2ed55699e7482978875ab5af6058eb9ba91ff46756df7a2b6fcdf93f01026c87c61ed3ab1cbf2ceea9fbcb9e85730457bdcb93bd8f6461e869fc55398a82 SHA512 ca6da84af5bdf429ca98077e5656a4704771d11b9e0b13aeade9d0fc375634f4c50a94c57bf8866ded03c19cd99b7866f48b26fb1c271847816812b758fc6eea
diff --git a/app-misc/dfshow/dfshow-0.8.0_beta.ebuild b/app-misc/dfshow/dfshow-0.8.0_beta.ebuild
new file mode 100644
index 000000000000..c452101f7fc3
--- /dev/null
+++ b/app-misc/dfshow/dfshow-0.8.0_beta.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PV="${PV//_beta/-beta}"
+
+DESCRIPTION="DF-SHOW is a Unix-like rewrite of some of the applications from DF-EDIT"
+HOMEPAGE="https://github.com/roberthawdon/dfshow"
+SRC_URI="https://github.com/roberthawdon/dfshow/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libconfig
+sys-libs/ncurses:0=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i 's/LDADD = -lncursesw -lm -lconfig/LDADD = -lncursesw -lm -lconfig -ltinfow/' Makefile.am || die "sed in Makefile.am failed"
+	eautoreconf
+	eautomake --add-missing
+}
diff --git a/app-misc/dfshow/metadata.xml b/app-misc/dfshow/metadata.xml
new file mode 100644
index 000000000000..6ba2366d6cce
--- /dev/null
+++ b/app-misc/dfshow/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pepitsizous@zoho.com</email>
+		<name>Angelos Kouratzinos</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		DF-SHOW (Directory File Show) is a Unix-like rewrite of some of
+		the applications from Larry Kroeker's DF-EDIT (Directory File Editor)
+		for MS-DOS and PC-DOS systems, based on the Version 2.3d release from 1986.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-misc/faq/Manifest b/app-misc/faq/Manifest
index acc8883a3cec..bfc6cd71c224 100644
--- a/app-misc/faq/Manifest
+++ b/app-misc/faq/Manifest
@@ -1,32 +1,21 @@
-DIST faq-0.0.1.tar.gz 9916 BLAKE2B 1a585f56e72818978f5a79e0df3d59533a422127e8eacc79a05bb8704c0321b85c85e8cc9fd6eb633a1d5c39ea0b03d546d8da39462a94f369495ca0279a516d SHA512 38d5789dcf83042cc909424864e37d7adaf49bd3f2ab3da851005d528d3deb1e13ea37f68ba9245cf05e1fd1e45d1ab80c5d6d027ed785983d279cb8de05f718
 DIST faq-0.0.2.tar.gz 47842 BLAKE2B 7568da2ea59d6d2888116fa7cfb920d2c07fff56fcf8c0b7f568b6ed3545da8497ad72854d62041db8160b50004034524e928fe89bb4c9e02c426c722fcb887c SHA512 d9f33f1dfd2210a77ff9bfc4b08095a9d4689c81d1effda573a794272d5dc3461beca7294e3fe3652adb322e4b15ec11bd532f0a013a420ec82f7c6d782391c5
-DIST github.com-Azure-draft-53924464463d2474f410415f1310d2b95fb8965f.tar.gz 1417651 BLAKE2B 3d8743ac35e813116ca7c093878669b721a1af052e2a8e48daa48736132bbf85326a363638dc4f253f825a730e4325c6bd6f83fccb319c507cdfc82c2ba978a4 SHA512 464b6cb5250bf35b505c6c40c509c357a46b32b96cee4c06917b35fb66cb5f21841fd5c812079356565d5ca2045c5e51eec74106f0d4731e9096e8224286f68e
 DIST github.com-Azure-draft-fdc29c553a45600ac4f795f3485d4bb9a80c7862.tar.gz 1461279 BLAKE2B f15dd35c476dab9e8c8c8699a14ef1d26f208c29512917b3c16a75e36b9435f158f66505ba88d8820ad1c3b37cff06edf1b90f71b178b17f67705033f0f270d4 SHA512 5e4a526ff4f3a22d6e8e5a84592ba8b3c075ffb3867f9781a106f07f26b6ad7176e4bec2bb9829eb2dfbb45bf76569dc03ecb3eba1e71b119d3e70748eb1a4c5
 DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
 DIST github.com-alecthomas-chroma-d7b2ed20a4989ab604703f61f86523560f8a6a87.tar.gz 307488 BLAKE2B 1b4e373e2896fdf9126eb8f8f9b4c9137921d2067b13d14d91582fd83d44976f894f32fa1bd89750a04914fb6e14b37bea01ce7c893fc7b8b94093457855d809 SHA512 ba1e4eacd22006ee32bfd4ab4f56579d332d1fa8e3206e3670edf9270743cc87a8743f00deac30c2ac449b4eea0ab99dc14e829acde039d9cdb4593fd0dfc2c5
-DIST github.com-ashb-jqrepl-70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz 14761 BLAKE2B fe636cf5425d2b717647404a012ff297d3c792e6ac11998004c3813e30768ba9dbee7b12aefbfd8793db398c7e24dad805e54207f689399bf9ce7f5632cfa7bc SHA512 f0f6529ad9561919fe5ffecb2acb2a432560a01b24292eb3b2746ba45491455f5e7bb023ceee0de1fdc147471e9733f3946a3bde599d2bf8122177626ea54424
 DIST github.com-cheekybits-is-68e9c0620927fb5427fda3708222d0edee89eae9.tar.gz 5848 BLAKE2B f3afe8bc17c2edf7cd334e8a54c34073772b26dd05268536eeccbcac2e210aac0159c6257aa02bb19b2cc76ddcec9b2b2b99db975535a900b44c8e42caee8227 SHA512 bbbfadfce1cdb7f8ea0fa7b319ed56df64630031aa85ca04e74b9da0d2eb8c6b5e02b5446ff4bbca11650592992cb4b2f63061686130e37089d2fa37a547de07
 DIST github.com-clbanning-mxj-32282164326064599d3a83e53adcb9b318d78d90.tar.gz 1089017 BLAKE2B 036c33acd4919dd228c90a5a7fc408244290ab38f66fa9875f60e4d8bfa8e5369ef9350b199b84b95ee74ea2803358313c3f8ac07110561f2892dd56435a7b65 SHA512 cc10b7f2eb440f7e553efd55adbfe024273ec85ed5447739919472123dba00638e1ce1683fe91927c2eabd53cfae9ead26e78a047002ffc56b638ab3f98c3e7f
-DIST github.com-clbanning-mxj-eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz 1071238 BLAKE2B 34a7cfe6e46fd80ee49c05c4efa6ba615ca516af34828dc291029d3f8efc83548204930a2487ed0fc86590f1443c8ca2b5574071189872ac9578739c1ecb6445 SHA512 742f9ff55eda7785cc733189018f487c2a7debcbc2d4446f8631b1e66457aa433319d9b5e81ed405ca54581a300d6e979367422eb7729d2cd9edde36717414b9
 DIST github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz 4952 BLAKE2B 92a7cfe2f3c07bdf2c61b445e35531150869dc181138d3438d7173ee38130d411a0de770ba40958471ea61d9aebe8881b51eb0ca9340deced89fd94df267e299 SHA512 5904008003ac80d34581dd1d33130fef27c6a523196aafef1231a2e63c5296cd30f8c3c517090b6b4c7ebb6a57d24bb0bff10cc40876e3fa1c9e74b65bc13154
 DIST github.com-dlclark-regexp2-7632a260cbaf5e7594fc1544a503456ecd0827f1.tar.gz 200360 BLAKE2B bbefca0280c0858669c45c8d63e66e77e07871507185ed777e96334eac22fc52ddd89a5dd0216ca12328d7a1b0b71dfca4e5ac75e75aebebdbda649818668e1d SHA512 b43d08612524b52a61179356ce3e67f170a7718349c89aaaf70ddc8e3e6de1bccd5df03f9caf596a48866b31fd8a9680400bbaf73408660e595e112de2b93736
 DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e
-DIST github.com-globalsign-mgo-baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz 409146 BLAKE2B 4fe1d3812f0f695febbb42809cfffbce50a8602ed89b58d1dca53255520b4945f30aee0a97141e28ce554f97edbaea3121020aee66db1a29cecd59c463755bc2 SHA512 7caac9d229c9cdd9a32a2f3f3117790bf67391c2b25c1ff88cd4ad6f5b0157f68affc90f86733919f961b5551e6732eab307309ddcf25f517dc8023ce6c96e0f
 DIST github.com-globalsign-mgo-efe0945164a7e582241f37ae8983c075f8f2e870.tar.gz 416824 BLAKE2B 4b0f151d5ac226c31de9126ff911aab762df0e4915d12deaf243698dc13db45466f7071998921c275e66485ee69ac8b5db86ccfc3c471682e0de73ae6dfd9b13 SHA512 cc38bcbf6944176caadf886d2c4882f727fa9732972ccbc040355cf95ed0f452e047727a0690a57eb98cf10e290bb028218ee1af03ac13ceaea54ee58bbdee62
 DIST github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz 70322 BLAKE2B e4284bbc1825c0e78cf2818091d2d25c581fd5da86d66eb8f91877b8a92f62400962391efb911ff33ffbe3db1de432a892dcc3670f96710fdb7c2cb191309697 SHA512 a5c4cbfc12e932f161c827537ad8366d8c003f40c3959c39bba9b6032e3d381516998a046429ef0980072b717dab0ab1df6b1ef24a43e66e1bf4bda176302b49
-DIST github.com-go-yaml-yaml-86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz 70230 BLAKE2B 0d6d56ae3ab1a46a2b8cb7cd89141825358d33b76d8bdf7a18bd42bea42321c2d294cabc1fcaee3b3761a56654da261f83cfd54db0f734b1471ab29df985197a SHA512 ab1f058e9702238b968e21d03c2d5effb606f6446e2f0a3f6fbd71dcfd90bf1a390bde6d3097f5e9b087e79645138e21a792862cc83d119ce4e0da2510be775c
 DIST github.com-golang-crypto-1a580b3eff7814fc9b40602fd35256c63b50f491.tar.gz 1606221 BLAKE2B ffdb4c6152715f0157c1c4bdea1ff0abf549daa39373cdb30e78c4a9b9e73b238d287964a9a2335c18349821bfb187bf608169c08190d37eb363c8701eaab63c SHA512 ff8fee4616ce22a304b829e2991299214953b5cfdcdfd18e75ba60bf873e54395fa2c255f11e51837b27c576ac959eee766127d2a299e05842881a4103a10617
-DIST github.com-golang-crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz 1455583 BLAKE2B ceb0dbb22869d4e5a43a8674138f725de7514af12131da26152bfc723d8981356f056547c63b81193da2b0b9d4587a2941b05dcd921d27ed9cb5d9db3abdd971 SHA512 2c81f213f5d934af9b449d0bcb4b6ee2078b4db842933aa84b6dcaf893029f2bba3657fd3cab14749cff8d4cca6ee64dc7478d4c790f314bb12ebb8fed88d179
-DIST github.com-golang-sys-13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz 802725 BLAKE2B f826bcb2230bbeba10b138d3fae0191ee0dda49ade37dc3462adcf16ea890dd87d86aa9793ada59b86ee427da4f2b336fee1a2cda7f079bf50a6f7b70360cc48 SHA512 d4f82bd401b6a805c7d369fac26edb5153f0f9654a6d9fc9809a545c8a3de546329a36f4fe8aa5506bd2d3b4da27dcd56cc2bd5ea18f2c5a033d7fa5f3820251
 DIST github.com-golang-sys-7c87d13f8e835d2fb3a70a2912c811ed0c1d241b.tar.gz 857002 BLAKE2B 53fe56ca4674f48f18f8de03a1eef1f5e57f71a2fe8d2ae2f6e67fa106cf57c4042aafa783b7d3aa8044012a2cd527eea30881beca6c49738758dd961f7f3a3e SHA512 95451c906c1b797de586f4c3a313378a45fba0557fdc54d2373db2234093f7e7966a06757fb35e4ccd466e93260f867ff832b85b6b632f3c2d600c1ff06d21a4
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-jbrukh-bayesian-bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz 9353 BLAKE2B df1e8457587b5d27f0cbfe5707da54a38c3ca4311586674d9e4bc85ad55dc222e570002a2388fbbbf239e559e4438aa063971665e436e234ffecb7888a7aff3a SHA512 e3ba5ce1e2a8e3b61e70b4c9f31c4215ec8ffb4a558e51f74efcace20b6bcf958f675ffc1125623e79da616aba2518a6e4623596e3a47abf3d841ca9d9833cf3
 DIST github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz 28758 BLAKE2B e34b383cbbddcadd99692609c9c20f94182735fc9879c0391947d0bc540df05cae7570230103a75a1e031fe8e30d1a4796eb17c80b4fba4a6d79bb999932205f SHA512 8f4f0bc4f4cd02f26f1ab39857e0e8120feab8ae3bb44b570e5d269b0c716d4028b824b04ad3923dc3e5a82b64c757e462ff74c71875677fd4fd276bd5b40926
-DIST github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz 100895 BLAKE2B a4534b0ce3689db04d2f1fc4bdd982576f62e1f4622b81f305b9651bb455b14d4b4b145cc4da49a52289b2b7f32cd9e1406e950020fc7b3f87bb0fdba98db12f SHA512 b33bc0c32d25d099f44b3c7cf653ebbcdbec00d45aade37d38e9c5e0f15bcff36ea736b13583d5ba88e7728815ffa986c4dc01b082df5ac2bfbd8db2c7f7d333
 DIST github.com-spf13-cobra-ef82de70bb3f60c65fb8eebacbb2d122ef517385.tar.gz 101660 BLAKE2B c55d90b35107df52b9a5e8376f096267a0d96253dcdf01cfad27fa3e67d58e352472dc871ed0cae411f09600d7c2a1f244e03d8d62a1db609368a95f836aa933 SHA512 2897e8e2e837606e42daf0d3319669ed1c3ea03d3c9c07b784bfca38fe0b5fca6ac07e074608036af33f5127bb3f0a2a6606df79437c90363c11fc32185a068d
 DIST github.com-spf13-pflag-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz 43327 BLAKE2B cc00d2852d895265eb0b60454877da841fe123535009025c761761c61b4d937d6293f3bef765d2a8919d63d8324dcb6addf774837df26fb864cb72d88add2d03 SHA512 061b9895e3936e356f707385ed7d7e5172f94167a1fabc84e9a0a69df4f03e0eaf435a4ac0cb00f5077855987ab1d2c3b051846c0466485a7bc329a547dc3d3a
-DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
 DIST github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz 13253 BLAKE2B 043d6824c2d0aeb69403610dc64b890d77a555483e92d54d0f70f630bc1b1326202118a8d2285335dea0605b582d640962a763eb4fe9cfee257a742a6da2141e SHA512 488aa86cbb20e0c1c0f22d053dd6e793f0d1e6faaa84c3e5da299e3714d493df2284ed74009002dfe8e33d06291d06791f74c257443ee6dc3ba84b871d59fec3
-EBUILD faq-0.0.1.ebuild 1768 BLAKE2B bf175e390eb6cf4d0a125b1623dac6c8513085a82c55559c56710eddec75a139a1d68cbaccb74469acf69bf0af038344dd30e53705b7bd6d32f5ff534de2ff74 SHA512 2bbc7f2b9752397c5861b16bc053d09a46a2bf7a0ebf23f367620eed404d0a19ada0711f50fbb71d742127f260779594a60d07a7aa675459b47f73a55562bba9
 EBUILD faq-0.0.2.ebuild 2038 BLAKE2B 4d66a88e6710a29bc2fa2c9609b09f59b7393d01cba61f1c776b5cc80957bf742b84df1f77d614942f111cb4e0f39b216588ca672a330de2b36768374355c656 SHA512 b28006be2f78ed512e23e7e2c606e6298ffc314ce2c4c456393d329d8fa5175f44e4483cf354edbe05de2a60e26fd37aff1cd32ff245bf0e8cdbcff488ca9134
 MISC metadata.xml 246 BLAKE2B d031b734e218edba4b23370a7939d2c35dd3373ab8d19f348ff8d2496df0b385aa5af4647bd9cd8c4f0294760c242e84d9e851a191a58cb879dabe6ac92e6a0d SHA512 692595d65c509eaa4ad7e3fd4f31b67e8499a0c4415b8c49fd511d63816f47047552d737d1f8c761b89a6c1050f0c133309790efccb8358886543e7b4359cad5
diff --git a/app-misc/faq/faq-0.0.1.ebuild b/app-misc/faq/faq-0.0.1.ebuild
deleted file mode 100644
index ddd31a08b0a2..000000000000
--- a/app-misc/faq/faq-0.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/jzelinskie/faq"
-
-EGO_VENDOR=(
-	"github.com/Azure/draft 53924464463d2474f410415f1310d2b95fb8965f"
-	"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
-	"github.com/ashb/jqrepl 70de3caa122cf7c7a737f28b666ab0d541560598"
-	"github.com/clbanning/mxj eb2e8a1ed220896d2b16890436447a0eae496fae"
-	"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
-	"github.com/globalsign/mgo baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2"
-	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-	"github.com/jbrukh/bayesian bf3f261f9a9c61145c60d47665b0518cc32c774f"
-	"github.com/sirupsen/logrus c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
-	"github.com/spf13/cobra a1f051bc3eba734da4772d60e2d677f47cf93ef4"
-	"github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
-	"github.com/zeebo/bencode d522839ac797fc43269dae6a04a1f8be475a915d"
-	"golang.org/x/crypto 88942b9c40a4c9d203b82b3731787b672d6e809b github.com/golang/crypto"
-	"golang.org/x/sys 13d03a9a82fba647c21a0ef8fba44a795d0f0835 github.com/golang/sys"
-	"gopkg.in/yaml.v2 86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb github.com/go-yaml/yaml"
-)
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Format agnostic jQ"
-HOMEPAGE="https://github.com/jzelinskie/faq"
-SRC_URI="https://github.com/jzelinskie/faq/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${S}" go install github.com/jzelinskie/faq
-	popd || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	pushd src/${EGO_PN} || die
-	dodoc README.md docs/examples.md
-	popd || die
-}
diff --git a/app-misc/irtrans-irclient/Manifest b/app-misc/irtrans-irclient/Manifest
index 8dc6492cf347..4b1c99ffc27b 100644
--- a/app-misc/irtrans-irclient/Manifest
+++ b/app-misc/irtrans-irclient/Manifest
@@ -1,4 +1,4 @@
 DIST irclient-src-6.01.05.tar.gz 69814 BLAKE2B fb8d854fa9c00e57ff5f4002047c1733fb42e95d4055efb2c23bdbe381f901705973f54c155a65ddab1ca134d0c31b5e36eb90784a9e9986bbd5c8a2f4d4775d SHA512 47d76f66ce6422252624dd805fbff042bcd9443f04b656cb2b20267dbf42a57345a0ac5cda0204a44535088a06c1232d2dea6305ad3561c78a7330774c1e998e
 DIST irtrans-irclient-5.11.04-ip_assign-1.patch.bz2 5051 BLAKE2B 79b8fb9249c69e8a868771a288e5f0e7c4d6658d36f97ce1ac0c577dae5c810207780406bb7a87df3392eb795463b9c62c6ce7d99ef349111db99637ee8d2432 SHA512 9be72f7f6fcc24c9bda73cf5dd8a2c112c6cb82e2ef50d40c17b43d7dcb8f11bcf8bc0ebb914046b5429bce1b4936278ade936db6c916384fbd637a300f528cf
 EBUILD irtrans-irclient-6.01.05-r1.ebuild 1328 BLAKE2B 3a56233f675d8515eb09675b1e0253a9403d99986699de28f60972052c88a1f28001b4c757499013a38c1d04fc5dd2ae965d01adf3f07fad6354496e39f6f58c SHA512 9a9c609ef2ea621bb1a1cd53ff5751228d3531ca44256d37df88eb5bdea489c576c1542c5ae79fc02d6ba44759548a1c412322fb65ca1d100ad69e53c7b737a9
-MISC metadata.xml 460 BLAKE2B 8911eaf34bbdd8c9978c5d89582d1f0765ade9101da2102b02ab55f2f2c93384198c2fe79fcddb3ae8319bb32d0c8c973e69297a7830d7afafc454a7600dc145 SHA512 6067b6d98528ce0e9b0811ae31d949362173c43471d935197d2da5eeee5b4391cbd43b1bfbed8468c187d71c341f1eee247df0bfd3faf963104a67223501f75c
+MISC metadata.xml 353 BLAKE2B 2dd10c875e6ad6330f05698e402ae3f702173425fb28552c0fb0be29be461719c04892b5405d4003e99f13d33bc4308ff60a399df5e30e1409893777008d1ad2 SHA512 0793beecc7f3ef50588aaf249a86e6c8b9740a2b9655507c337b823e400fb115d1b7c46360c200873622aedd496fe100e177d298c6e327800585b23660d6ed66
diff --git a/app-misc/irtrans-irclient/metadata.xml b/app-misc/irtrans-irclient/metadata.xml
index 8143f8cf4708..6ed3aa55bfab 100644
--- a/app-misc/irtrans-irclient/metadata.xml
+++ b/app-misc/irtrans-irclient/metadata.xml
@@ -5,10 +5,6 @@
 <email>mario.fetka@gmail.com</email>
 <name>Mario Fetka</name>
 </maintainer>
-<maintainer type="person">
-<email>hd_brummy@gentoo.org</email>
-<name>Joerg Bornkessel</name>
-</maintainer>
 <maintainer type="project">
 <email>proxy-maint@gentoo.org</email>
 <name>Proxy Maintainers</name>
diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
index 3dbef59f2d36..59343de98bb6 100644
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@@ -4,4 +4,4 @@ DIST irserver-6.09.04.tar.gz 665809 BLAKE2B 1f336e34a3a79490266a762520083c74f79d
 DIST irserver-src-6.09.04.tar.gz 200481 BLAKE2B 7eaffd5bb335dfcbe6f0716af57aa898d2cce1a984a2f050081bd71a9c63d5d1e5949fdebdcbbbee05c337141d0efe5c6ebcb937726ff9506a766f69ed8d2f58 SHA512 09c38066e64404808856a89a8451e41a6eb8a51b98635b1515fc07050f25b4552b9cc912bd9612c6746ba67cd9b1bb45f3d4871dfa820c9e9bd810ede20f28d6
 EBUILD irtrans-irserver-6.09.04-r1.ebuild 1879 BLAKE2B b7b2863ab4fe59391803a06836d1f18c3c7107128d0d30addfe98740f9378a7ecf810f2566e855bd9590100b2f091221c2e4c7e50e07876e294e9c3adaf97fe4 SHA512 b60b4f6ce52a8c40e6057fa9efe9704be3eb87b37d1398922c1db7773d9aa5e65aca6988f5a652cb330aebb7da8a3a98390b90f5b040b382d9b47b571d17ead9
 EBUILD irtrans-irserver-6.09.04.ebuild 2003 BLAKE2B 87a88bc13931589f4d09c88dc2670884278225562fa419f7552d5219a4bd8a1ad4ec4ad592dd094aaf143a9375b9bb562d85a48e4a7e4e1003a3eeecededeeb1 SHA512 e21da7b0e7bca442283282a7396a2c10ec61a20cb5f13083b1536be5c41cb6b0b1be3f0f42cbc6f44341055639576aab4004b406b56c47ee3b39e490019cbe11
-MISC metadata.xml 540 BLAKE2B 3355962a1d9d6d94c207254ee0f49639ac55cba6504a4ecae2470c0df4d09189c3d00f76c6dffc554d13ebaa6d154040152a3169da166232ef4f2308c968e160 SHA512 9c1297f57d16730eba72da496f870d67aae2cca6a4c49da99e2f6bd4721f13c9208599b2a1a50ed8409ebb26f772a9906c5f9969f6e2f1f262592b0af2fa4b58
+MISC metadata.xml 427 BLAKE2B c4da795721c8a36a5b9817e71589757731b6ae9c903192f6e0ad041b9f887cbd861d071b30f1337df6d6bb3fddac4a572010b731b0ceebec3a5e5c6db9387d3d SHA512 f2323a83f13bdb99de53f94a7052ed0b601dd21e600e78cd452d05965695053b4ed87b0d1e74ac44a5ae3413041165963e6217b1137793b2cb3de2af1f467b40
diff --git a/app-misc/irtrans-irserver/metadata.xml b/app-misc/irtrans-irserver/metadata.xml
index e8fda48bc222..a6f45b6038b3 100644
--- a/app-misc/irtrans-irserver/metadata.xml
+++ b/app-misc/irtrans-irserver/metadata.xml
@@ -5,10 +5,6 @@
 		<email>mario.fetka@gmail.com</email>
 		<name>Mario Fetka</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>hd_brummy@gentoo.org</email>
-		<name>Joerg Bornkessel</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest
index a5e0e6b89781..d76588deeefc 100644
--- a/app-misc/jq/Manifest
+++ b/app-misc/jq/Manifest
@@ -8,4 +8,4 @@ DIST jq-1.5.tar.gz 739309 BLAKE2B 9d36db80fa9365d9967c9e1691e723d5237e7db2ddef43
 DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
 EBUILD jq-1.5-r3.ebuild 1392 BLAKE2B 3bf5f4a5124ed0e44158969a38201e5c9a5311ce23af5bca431acb2b0e69f50d5c6be60561a29c067f813f7bb4bb1d57bd7659672258574e3e9cebaf9e8da1c7 SHA512 2d1a0ca492838b08b40232cc574d3cbd3319250a45f23a53f5b8688e12def7702cce59bb761d3d30e58fd50ba8cde1dc0e1d7790a0ce0411444dc39922a81426
 EBUILD jq-1.6-r3.ebuild 1825 BLAKE2B a344024a28fe7ad1a0e4958e39debd8a7ff3dbc07b0168aeb4e04059d35ed0337a2fb9da41fbb909e92329af435d4d799ef6190d8c35c40e3a7bbcbef60c8521 SHA512 c1237979fc40dc341c6df202fdc751660b71e787f7824ecd51fa5cf9635c5dd2c1cde8961e8f12001b59d81e5da07920281b2fa5ee0a02ed7ce852e729a85e9d
-MISC metadata.xml 423 BLAKE2B 1e5f03ac7d6b93814bdfe760d9b2d9b74447272b554f7e92c40918069c7787ee8c60dd68a86df38c67f27422f0f281c7ad7234305a45532b657be0397a5b81af SHA512 1787b1ce5d050aaa440996ceaf2367e39192af71e7d9a0d973e8dc8a87854f910aefd020c869867e3da5da33d27cc261047a1ded58b18052b21bf6737ef3081c
+MISC metadata.xml 480 BLAKE2B af40f3486b5b19c364f2e778a083a99297316f92edbed1ea442a8f49966465fdc9e831f3e6d6ffe78ed8debd9eb2ac8f7ab97522199dfad49afca7ab0b514890 SHA512 2b6bf8f32f6500ce0b3383dae1ac280613981571b83a26e482d793e93c67059cfb6eb9f1504c0c2a9a787a53ce1feb473f964fe2334553c2e9bd2b44b3da9609
diff --git a/app-misc/jq/metadata.xml b/app-misc/jq/metadata.xml
index d9b5cb1343c4..ce9b0102c59c 100644
--- a/app-misc/jq/metadata.xml
+++ b/app-misc/jq/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="oniguruma">Use dev-libs/oniguruma for regular expression support</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:jq_project:jq</remote-id>
 		<remote-id type="github">stedolan/jq</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 4b14e347144d..34b8cd3cae7d 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,9 +1,11 @@
 AUX mc-4.8.23-3933-iso9660-1.patch 2491 BLAKE2B 30e6db19f3251784dc99fc9fc8bc8961cc2dc2414942ad2fbd62ef7a2d9d6a58416787cd7811bcc33822c3a3407c65f86886117372a3f6828ad2eb83ca516c49 SHA512 3b5e6ee0422a860efd7ec3768746bf3b0a81b4f55d775ac165946ffa5f00507fb1a0d4344d213867088e7152c0f0c12b3bb583b1d247368300b7b9cf2d8f8dd6
 AUX mc-4.8.23-3933-iso9660-2.patch 825 BLAKE2B 6f10685889f42553d54d9473a26fd4644163012d8201fe9ac42e02e5d45ee6764ce7c75f7939bb676295c0ef5d9dd4b182bba3ad198ccb2f1b907f0808be0b97 SHA512 1c9c7c961d3a69081ce5835edd386c76c9b947c7b23467f9bfd8979942248ba4382c74dfe67f8615b92b0a18b3754405486bc9a27ac7014655a2ca2f733dce99
+AUX mc-4.8.23-gettext-test.patch 2061 BLAKE2B a4381f4919cc48750994037daad17a3772684a54744e290f379e86cae4e1669499ba56229359b987d8e59a5673033bb11496898377642a246fc380e83eae5ef9 SHA512 eab959879de062301c6ebd04fbd2addb655a369c5cfc5104226f6cdeac6e55439e5769caf62387898fc6a6971fb7261f1e3090c950db47bc6c74671e65898339
+AUX mc-4.8.23-gettext.patch 2017 BLAKE2B 9d67398051f77e94d1b9932a89801335efef851b58471354c48d9c8289a4e4b4f3feb275b6c40e46d66a51a374e4a0712cbbce0d3e4f010b256c59930525a96f SHA512 60db8df34ff93d0ed30604bba1969b4b9832417b0b09fb0d0e86b53669c8349e9ab992d6b84cbe7f0c2d8d8a5ffc6ab9cef0a88a86066f36c0c5e45da79c57e5
 DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
 DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
 EBUILD mc-4.8.22.ebuild 2854 BLAKE2B b62a578f351b1535f3b48ddf01c21aa5ab5bbf02cdabc9b967a108cbaf1304ad3130ea26211d06e45697d00cd65bb7842badbfecdf6f360ae8443afaf812777c SHA512 6534293609a40883ff86f9cbf1894b9898c7a8ea910b1a05f8057ce30e26e726b13f5bab7060e64196376fd244b90f41e48632860684c3c5bb1f85eab6bedf0c
-EBUILD mc-4.8.23-r1.ebuild 2959 BLAKE2B 5a2907a1bd7ba0f79cf2ee2b89d2ad2abcf2010c45e11c41841372284d68fc216cd1e8bfc802a78f125b138f096b95a0b6e212d1f39d5df371667b09950831d4 SHA512 4cf31cf14bdce25c2a14bc22a06c5390249a735d3ff15080c0be7880bac6c957013c9e65c09c64ad4905443817f66e152a0ee119a9eab85d6586fea50f7e8fe2
+EBUILD mc-4.8.23-r1.ebuild 3042 BLAKE2B f3a0108866ce9f7cd10d48f402b8c169eee19f5550f9312afefc98c2b8b2593eca1496d6a2f93a275c94860cdd061aa933656aa1a150bd1b70db1b83e06cc7a9 SHA512 1f8dccdab837a650c3b602975bbdadcbcc40be387dbe055daea8db1237dd69e89113158297e56dc9ff0dad752c37858dace0dcf359c1346f20d3092c09f612b1
 EBUILD mc-4.8.23.ebuild 2864 BLAKE2B 4d2fa3896976b9775a0077db49890995d8348caa003357c27cf429c4b372381cb21a66b8477fd28bcbd821b143f94c4753f91abdc96a1f60c1de2dc746412a0f SHA512 439957bfb9c4441a3e344ff8ea7361efec8a19f19a5277237b4ac98152fe59213451d3b04b430c0e558001c7f10119381aed7fa4e3e933a5b02529dc7f948bbf
 EBUILD mc-9999.ebuild 3111 BLAKE2B 31c178fdbef8bb48d7ca13c15f7e7e56bb3d3de730ee62bccd75a593d9ad313e5cc6fc6e5dbd60a116ab5770ddcb24d31bc67393b1868b2cb57ea99a8dfb174c SHA512 fc8bbce6e66c343e141fcd0ad6c3a6fd450db0ebc366450589bf24a27556a3e536653c7430b65f2e4766172f8aece01c0206fe8c00a0bfefe4f8676c269e7553
 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/files/mc-4.8.23-gettext-test.patch b/app-misc/mc/files/mc-4.8.23-gettext-test.patch
new file mode 100644
index 000000000000..7e19cd7fa119
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.23-gettext-test.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/693850
+https://midnight-commander.org/raw-attachment/ticket/3629/mc-3629-Linking-fix-for-gettext.patch
+
+Test change counterpart.
+
+--- a/tests/lib/Makefile.am
++++ b/tests/lib/Makefile.am
+@@ -9,3 +9,3 @@ AM_LDFLAGS = @TESTS_LDFLAGS@
+ LIBS = @CHECK_LIBS@ \
+-	$(top_builddir)/lib/libmc.la
++	$(top_builddir)/lib/libmc.la $(LIBINTL)
+ 
+--- a/tests/lib/mcconfig/Makefile.am
++++ b/tests/lib/mcconfig/Makefile.am
+@@ -11,3 +11,3 @@ AM_LDFLAGS = @TESTS_LDFLAGS@
+ LIBS = @CHECK_LIBS@ \
+-	$(top_builddir)/lib/libmc.la
++	$(top_builddir)/lib/libmc.la $(LIBINTL)
+ 
+--- a/tests/lib/search/Makefile.am
++++ b/tests/lib/search/Makefile.am
+@@ -10,3 +10,3 @@ AM_CPPFLAGS = \
+ LIBS = @CHECK_LIBS@ \
+-	$(top_builddir)/lib/libmc.la @PCRE_LIBS@
++	$(top_builddir)/lib/libmc.la @PCRE_LIBS@ $(LIBINTL)
+ 
+--- a/tests/lib/vfs/Makefile.am
++++ b/tests/lib/vfs/Makefile.am
+@@ -14,3 +14,3 @@ EXTRA_DIST = mc.charsets
+ LIBS = @CHECK_LIBS@ \
+-	$(top_builddir)/lib/libmc.la
++	$(top_builddir)/lib/libmc.la $(LIBINTL)
+ 
+--- a/tests/lib/Makefile.in
++++ b/tests/lib/Makefile.in
+@@ -636 +636 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
+-LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
++LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
+--- a/tests/lib/mcconfig/Makefile.in
++++ b/tests/lib/mcconfig/Makefile.in
+@@ -542 +542 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
+-LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
++LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
+--- a/tests/lib/search/Makefile.in
++++ b/tests/lib/search/Makefile.in
+@@ -584,2 +584 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
+-LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ \
+-	$(am__append_1)
++LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la @PCRE_LIBS@ $(LIBINTL) $(am__append_1)
+--- a/tests/lib/vfs/Makefile.in
++++ b/tests/lib/vfs/Makefile.in
+@@ -641 +641 @@ LIBPTH_PREFIX = @LIBPTH_PREFIX@
+-LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(am__append_1)
++LIBS = @CHECK_LIBS@ $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_1)
diff --git a/app-misc/mc/files/mc-4.8.23-gettext.patch b/app-misc/mc/files/mc-4.8.23-gettext.patch
new file mode 100644
index 000000000000..3ad67dbe5d40
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.23-gettext.patch
@@ -0,0 +1,56 @@
+https://bugs.gentoo.org/693850
+https://midnight-commander.org/raw-attachment/ticket/3629/mc-3629-Linking-fix-for-gettext.patch
+
+From 2a97524b42eeececd2ecd928a1154da1f5b7378a Mon Sep 17 00:00:00 2001
+From: Andreas Mohr <and@gmx.li>
+Date: Fri, 1 Apr 2016 06:44:22 +0000
+Subject: [PATCH] Linking fix for non-default gettext package
+
+mc lost the linking game if gettext package pulled from outside of system paths.
+(Pulling can be done by suitable C-/CPP/LDFLAGS settings)
+
+Furthermore gettext package depends on libintl (if system lib
+don't provide needed functions) then gettext prepare INITLIBS/LIBINTL variable
+for working libintl pull in from gettext libdir.
+
+https://www.gnu.org/software/gettext/FAQ.html#integrating_undefined
+
+Let respect LIBINTL variable at linking (it is empty if not needed).
+
+Failure example for Solaris 10 with non-system-default gettext package:
+
+Undefined                       first referenced
+ symbol                             in file
+ libintl_bind_textdomain_codeset     ./.libs/libinternal.a(args.o)
+ libintl_gettext                     main.o
+ libintl_textdomain                  main.o
+ libintl_bindtextdomain              main.o
+ libintl_ngettext                    ./.libs/libinternal.a(midnight.o)
+
+Signed-off-by: Andreas Mohr <and@gmx.li>
+---
+ src/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -53,7 +53,8 @@ libinternal_la_LIBADD = \
+ 
+ mc_LDADD = \
+ 	libinternal.la \
+-	$(top_builddir)/lib/libmc.la
++	$(top_builddir)/lib/libmc.la \
++	$(LIBINTL)
+ 
+ if ENABLE_VFS_SMB
+ # this is a hack for linking with own samba library in simple way
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -556,7 +557,7 @@ libinternal_la_LIBADD = \
+ 	viewer/libmcviewer.la \
+ 	$(DIFFLIB) $(EDITLIB) $(SUBSHELLLIB)
+ 
+-mc_LDADD = libinternal.la $(top_builddir)/lib/libmc.la $(am__append_6)
++mc_LDADD = libinternal.la $(top_builddir)/lib/libmc.la $(LIBINTL) $(am__append_6)
+ SRC_mc_conssaver = \
+ 	cons.handler.c consaver/cons.saver.h
diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild
index cfb708711999..9bbeef2c62c4 100644
--- a/app-misc/mc/mc-4.8.23-r1.ebuild
+++ b/app-misc/mc/mc-4.8.23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
@@ -43,6 +43,8 @@ S=${WORKDIR}/${MY_P}
 PATCHES=(
 	"${FILESDIR}"/${P}-3933-iso9660-1.patch
 	"${FILESDIR}"/${P}-3933-iso9660-2.patch
+	"${FILESDIR}"/${PN}-4.8.23-gettext.patch
+	"${FILESDIR}"/${PN}-4.8.23-gettext-test.patch
 )
 
 pkg_pretend() {
diff --git a/app-misc/mkcert/Manifest b/app-misc/mkcert/Manifest
index 6b29a3275fb9..d7e43c5cd2a0 100644
--- a/app-misc/mkcert/Manifest
+++ b/app-misc/mkcert/Manifest
@@ -1,5 +1,3 @@
-DIST mkcert-1.1.2.tar.gz 374244 BLAKE2B 3d9dd700e77ae6eae693bed51ae027fba409880f2c0f8fe1d5eb3c4af1e85f03784c0f6b55a384117c8ba8949ba0f061911998846f8c7ac3fddaa9e4dee567f5 SHA512 6015964915088914c0c208c47a41142b4b69e1e0c6e890422fe07c0dee2fb7c8a1ac04b9efba8a913de35ef3f46d3c8ee96941257eefbceb1c1885a67e1255da
 DIST mkcert-1.4.0.tar.gz 375857 BLAKE2B 40d8f7a421ca4dc5d6c9c3fd6ec2a2d5a742c1f0d3a7a336270b44847e9d0188cfb34b918332902213d71ef3251a65dcd1636d641609a2f898f449298d031dfc SHA512 4a31012262813ad6f34f129615e11580084e5da74ccecd043dc47b1ebb7b13fd2f6594bdb4e05a5d1a680d89ad62c2a4b0662c5fd029c154bf9e9e0981de7d33
-EBUILD mkcert-1.1.2.ebuild 638 BLAKE2B 63edba0e65ce29bcd23e26be4d4573208d1ed457966338d663587800c583b4f60daaf823fece40397781060e2c5fe6d08d0be907fe2eea5a7201b1af7364482f SHA512 ea148834a727dee96adf0c7b863ed220bd5b3559761c552b004e8db35ec5c72f3ae77ba9beee63b35e637e781cb1b8ac401ad8df6cec58e2f4b6b9879625844a
 EBUILD mkcert-1.4.0.ebuild 635 BLAKE2B 8f7443127996609fe967de423b144fdfe964fecb9ae0c4b07749fe1cc9e5dce94b3ae876cd13086ac06961ffd596f7af7c54b086d288ff84ddb41bcfbfafd7e4 SHA512 b66d28b3bff5f902a370b22dff4eaabf12d62013b6dc151b50333a1135e8e61984ea1cb42d2f54221ad2fe3829148d1f5f2fbab1bac449bda7f7e7d9bc4478f0
 MISC metadata.xml 250 BLAKE2B b66a738607cc4fc7299cb2075c67ac40558a890c57e9c28539c4eeeebf1edf12288414babb7340a5464fe87ba325d7665a37ec2aadb81934a41f16b467db96aa SHA512 c2fa249b463e4116ba228c35128bdb3d4b8490678cc9e240074bcf4d3569b54edbb67cdb27da45535f2e23bfe4d35607fbc16887e97af285cfd2b1f994fe95ac
diff --git a/app-misc/mkcert/mkcert-1.1.2.ebuild b/app-misc/mkcert/mkcert-1.1.2.ebuild
deleted file mode 100644
index 0176c20c9259..000000000000
--- a/app-misc/mkcert/mkcert-1.1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/FiloSottile/mkcert"
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="A zero-config tool to make locally trusted development certificates"
-HOMEPAGE="https://github.com/FiloSottile/mkcert"
-SRC_URI="https://github.com/FiloSottile/mkcert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go install -v ${EGO_PN} || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/mkcert
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-misc/regionset/Manifest b/app-misc/regionset/Manifest
index 2a2705efb7a9..efd16cb49059 100644
--- a/app-misc/regionset/Manifest
+++ b/app-misc/regionset/Manifest
@@ -1,5 +1,3 @@
-DIST regionset-0.1.tar.gz 17095 BLAKE2B a72d73b921a5f93515462ae287766c75d5019663244569504ab29220c53804919c08a6120e24f6e9c06a01f304f8a4188129d199c1f0f028443f39e074c6c9d3 SHA512 19e1a681f6acc9f7da064432f893cd6736e3b54e5f0187025b9702a7301a982bc2f3948604e3bc9f7f15b20feb0dbc0424ad9727790cddb448b89189c1ce18c3
 DIST regionset-0.2.tar.gz 19063 BLAKE2B e96c014effa78d7c5f636d80edb7d74741107dd11728ca7f52c2d41919960986d37fd4245bb7975928605c6a06e7e2c31d050b847771e60af837e3f2286edb27 SHA512 7d7fa92a2031a1d18032ba0979fe0ee27ff84c02977dc03df394383a2d562925b38eedfd478ee08d60e84de60914278f7880c10a43552345fe36af0c0fee6431
-EBUILD regionset-0.1-r1.ebuild 945 BLAKE2B 6f6d7a8e00d64a19950a4c28c02360a3c70bd68799821479b90019b993101d61785e857f3cd38e493b081f8054e7d59057c1eaf871a9c0c1d590a5a36d65a341 SHA512 b41176ef36842aaa5bbeec7569a0232513c463cbc943f0a14bad7cdc7b0b007e4fa32fe1d8814185013f751ffa7bf77f89390133f58950a7faee2b6e6a08f0dd
 EBUILD regionset-0.2.ebuild 1013 BLAKE2B 840e01afd9ab775c8265253c820ba522c904d97d2f1b1dedda86ee8076e648ae2a0bc2d45ef1b06ab4fddbf32a0efa7c555eafee8fc0970efc3d9efa09ffefd8 SHA512 18ea86944db5cc359b0ea8bcb27a47d4378f6b5d0e82473c7a639aec231527a826c7706f163e89ae5b06b696b927a3f6222cc2f9a577bec3c194ec9f3f982b4e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/regionset/regionset-0.1-r1.ebuild b/app-misc/regionset/regionset-0.1-r1.ebuild
deleted file mode 100644
index 5622745866fe..000000000000
--- a/app-misc/regionset/regionset-0.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Sets the region on DVD drives"
-HOMEPAGE="http://linvdr.org/projects/regionset/"
-SRC_URI="http://linvdr.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c dvd_udf.c || die
-}
-
-src_install() {
-	dosbin regionset || die
-	dodoc ChangeLog README || die
-}
-
-pkg_postinst() {
-	ewarn "By default regionset uses /dev/dvd, specify a different device"
-	ewarn "as a command line argument if you need to. You need write access"
-	ewarn "to do this, preferably as root."
-	ewarn
-	ewarn "Most drives can only have their region changed 4 or 5 times."
-	ewarn
-	ewarn "When you use regionset, you MUST have a cd or dvd in the drive"
-	ewarn "otherwise nasty things will happen to your drive's firmware."
-}
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index de2d12c81f75..6eec6c20ba93 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,3 +1,3 @@
 DIST solaar-0.9.2.tar.gz 864509 BLAKE2B 57c58d203d8d1ae390eaaa1cfc963cfcc9523de8d7edcb482f30c66bcaaceebc7c514cf0fcffb1b20ca5cc3bc869c94cb61bcddff44debba9307ec3b1c0e1def SHA512 13f469df753cc8fab55f5259ccc3e62b6e44471d277d240cd56ce0580144d2b1f95d731268176648663dd15e5607bfb512f477362f4f100aa0a653b001dfe04b
-EBUILD solaar-0.9.2-r3.ebuild 1340 BLAKE2B 81eb5e66a4a558ebf6538d87b6b0a9245d9724bdd5dfed6df80d2cc98dd27613a2afc06d356b38ecb3df2caf6ecb67a178100f7143983141ce07040fe22a5fc4 SHA512 36de617d819cc6021fefae82f1226c77668acf4964cffcb7134aa03256244435fa889f0c671485548a3bf4047491423c71a7cbbb80c124db25756de6e2792dd1
+EBUILD solaar-0.9.2-r3.ebuild 1337 BLAKE2B da7b2feebd9fb7558c3f793113c25a13788b36cbdaadd38c68cc86c972ab56cd8d19c151e1ed5df005d6c2f98c7d590471f1ee2485d7cc569ce645fba863a73a SHA512 0fd7b6581d925419aeaa8f0fe67c35d4a83b9ffc2a16a3bd81d61c8034f5a872e7288ce722df139e3fffebf7183eef28c5d877658b114e0009b8534c725d45ae
 MISC metadata.xml 247 BLAKE2B 28b1a6239555a2c8babc0c1ee34558209080f365bb6b8e2f29461758cce930f9ece751ebda2c364eccefb106aead7896b47c5bda1b8d275197c69d071edd2504 SHA512 5c9618d73d0e1e0b66294e959564df8703bc276f6e430d4692230429a377dbdaf38e7d569dd9b89b35f4acc4e2692ef6520e5cf118d0e76c8498d8ded0c98b14
diff --git a/app-misc/solaar/solaar-0.9.2-r3.ebuild b/app-misc/solaar/solaar-0.9.2-r3.ebuild
index bf8511866786..55fc4c787a27 100644
--- a/app-misc/solaar/solaar-0.9.2-r3.ebuild
+++ b/app-misc/solaar/solaar-0.9.2-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
-inherit distutils-r1 udev user linux-info gnome2-utils
+inherit distutils-r1 udev linux-info gnome2-utils
 
 DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
 HOMEPAGE="https://pwr.github.com/Solaar/"
@@ -15,7 +15,9 @@ SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="doc"
 
-RDEPEND=">=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+RDEPEND="
+	acct-group/plugdev
+	>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]"
 
@@ -45,8 +47,6 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	enewgroup plugdev
-
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		elog "Users must be in the plugdev group to use this application."
 	fi
diff --git a/app-misc/spire/Manifest b/app-misc/spire/Manifest
index d75538236ce9..3cee605156e9 100644
--- a/app-misc/spire/Manifest
+++ b/app-misc/spire/Manifest
@@ -4,5 +4,5 @@ AUX spire-server.confd 176 BLAKE2B 9a0158a8882be40483d6cf5b34b76337064847f86d0af
 AUX spire-server.initd 408 BLAKE2B d5e2c8c8af1d27332a6a0762f0795b5a9c9367a95a00ce1eb8e84be06f3bb3201cfed91033ca742ea5ba31477d2bddafb7ee0fdf8e1094d6bc93fe791992a5b4 SHA512 511e3a2bb0baace563504deaf465a64b6ed4b1368afd7b5398357c6a13b1472b29e3da7a9027318a5bc97e3b69561fa24b9d83c022648de24fe5fcc884f93525
 DIST spire-0.8.1-vendor.tar.gz 10550551 BLAKE2B 4ab04c0e4de231097620a015f523ed9d7e0d6872425826e4bc3572f920a4d3de5174cb78f4ed61340ffc1abe3e25d42e8735228b142b424c85ef24fac52740ca SHA512 879cba4eaa681814858fa7965b28d0217d4ae806c979d348cb6d5f413dca7f03f99c34b8dcdbc0dad8e5253990a473962b9c1438ba79bef5fe757df11c7f4ee7
 DIST spire-0.8.1.tar.gz 1070262 BLAKE2B 7e30ac233759f2fed7476a82d072c4ec7815346cb50419b10ac7c5ce566aae6e783a51284a39847d63c04b0e398aab7ad15d94ea4e05569b43e762abfadaf550 SHA512 aa864f3f1d0faa8b7bfa527effde244957f9b30c6f115e49819777b6f3a5ea751ed751ac19b94a45d02aa22e719e6bd6e33355f9b561bbc5458d5997d95a1437
-EBUILD spire-0.8.1.ebuild 1519 BLAKE2B 16c667d2a4ce8be6074b4693e15d62380d1833c9a300dac33aed007ffc77f587c7be4093130855cd3a2684f5043e9985abbe617375bd6abb3cc41a81cdbbf45e SHA512 e710d49d992165bf5400a87a5d0ba57e88bef970e06e2b41fff8ba6b450e4f3ea5332d5b47aba6e09d0df2089825e0d73741027eb4539b749abb9bb23c5591b1
+EBUILD spire-0.8.1.ebuild 1521 BLAKE2B 7775177fcf811810fd8682b482697e20f9f5dad8fdd18a44472606de6ed3084829d162963570d96d3a45a68156c17697d078b3549d7aee60f02d00b6ffa10d8d SHA512 a963544fbd3d0ad0a21c3c7c3c9e1781e7486baa406a5c9f828a79db7b7230cd16552dd8dfaef34728a77ac455184275b5f2180bf56865c5e59c9a4f8e39f179
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-misc/spire/spire-0.8.1.ebuild b/app-misc/spire/spire-0.8.1.ebuild
index 15aa92b309c2..552104b1bd85 100644
--- a/app-misc/spire/spire-0.8.1.ebuild
+++ b/app-misc/spire/spire-0.8.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-VENDOR_URI="https://dev.gentoo.org/~whubbs/dist/${P}-vendor.tar.gz"
+VENDOR_URI="https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz"
 
 DESCRIPTION="the spiffe runtime environment"
 HOMEPAGE="https://github.com/spiffe/spire"
diff --git a/app-misc/tails-installer/Manifest b/app-misc/tails-installer/Manifest
index c2c4b6b9aa78..814c1b2dc3e5 100644
--- a/app-misc/tails-installer/Manifest
+++ b/app-misc/tails-installer/Manifest
@@ -1,7 +1,5 @@
 AUX fix-desktop-file.patch 1046 BLAKE2B c27059fdd3baf37ecab603c1f96d70927c967909a360371c8da0cf0bc34c78c5425a9e64af4582ec0b3de5b2a5328cb3d4248f999ddc662ce8370bec6377c4bc SHA512 9c51d36b6b97e7fd52aaacc8bae9b6dc16785c249eddc01cfa1ba3bd76b5badfd1b60e53c8735d6d206753e19d7ac48e7405d2bf69300c08391b94a0ca173dc0
 AUX sgdisk.patch 1138 BLAKE2B 1dcbc23924f592a619336827fa5c4bd21fb37f52070bbd44b08ec41c3dae8c8d09a322f2aeae9e0e67a2dce435cb9ddee7729d9e83e31fe3f06513f35f1ba934 SHA512 971e9b89acd7d175e7b6e44d3c31f7541721936e5cb7c08ba196b257170e841fb95965bbdfaffb2a9cf49f43e3ab05cde29136376b497ff3ba9741735c1cbc35
 DIST tails-installer-4.4.11.tar.gz 346123 BLAKE2B c6e0888cce180d411ab60a8098581da0df64ea6b2201076e58d6ae4d489feb5e9967fd67a457e8d333fad9934350d5df13044e02e2d428980bee335fd5420dcd SHA512 06d7e21f01841250ada8eca3dcb14078331450b61be4a15923fd0543970b9fb4284aba6cf12729515b2adff9dfa3f8a011e48d97a114356fff1edfd1eb914684
-DIST tails-installer-4.4.8.tar.gz 332532 BLAKE2B 5c597f38e8cfd690b56e1a08d98567278bcb12eb72cb292c02b77d497c8fc4925f5829efdbb3351fc5a30296d9138a07f2dc8077ada2e32bf7b04dff2f31193e SHA512 3a15d31d54ae17c12c1ba8346782f26678fbabcdd99582a5b43c75f520001ec01e5cc09b1832d0f7d346852f9eb30114135c92caff8690281469f35f23806a12
 EBUILD tails-installer-4.4.11.ebuild 1158 BLAKE2B 50a17a692c89d7ef4281b4d5523143027265dc7691b751013ff64df045a5b73366dcc39fcc4f05f3fa50b2129afd3210637c21ba63a2e38629e72878a1c906d6 SHA512 bb52088ac9b0a26824b894e85f13258710b6e4643c8cf3e6945aaa26973a7a65b3684713e251c83bccd77dbd66f1f5a23c655ac7368e50e8a55229fc4991b262
-EBUILD tails-installer-4.4.8.ebuild 1160 BLAKE2B 3eb26826d2ac9201bec0e8137effa1e3eff9e8f2b2d79a32f7c928768bfe51125181fb224e5c5e684717dcc0852f2705289d248bfc59da318cb833abade1fb12 SHA512 a8a7bcea7e1ffad14b6f11eb11024a3cbc3204043689cf8928201dd011bbd9d38a956914c16619c87c6a7126e2792269ccd4b951a672f3b79eede598e0b1600a
 MISC metadata.xml 309 BLAKE2B af6f3c6aa04dd9f3f9b808ecc90fab80f06e47641fd56b78305edeb1feb5efc50c874007ddba4ba3d414cd9993719f844d22aac97f04c41020890d4b5e6b8e25 SHA512 6e72318e11edc847698cc3b37002b61b70b62e6f8aa644fa400c55801613ec30187b6073cc9b5218911ba4e6e08603dc77d9f3585d28acf683c732dbda2b816b
diff --git a/app-misc/tails-installer/tails-installer-4.4.8.ebuild b/app-misc/tails-installer/tails-installer-4.4.8.ebuild
deleted file mode 100644
index 95febfb28b2b..000000000000
--- a/app-misc/tails-installer/tails-installer-4.4.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A graphical tool to install or upgrade Tails on a USB stick from an ISO image"
-HOMEPAGE="https://tails.boum.org https://git.tails.boum.org/liveusb-creator"
-SRC_URI="https://deb.tails.boum.org/pool/main/t/${PN}/${PN}_${PV}+dfsg.orig.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=( ${FILESDIR}/fix-desktop-file.patch ${FILESDIR}/sgdisk.patch )
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
-RDEPEND="${PYTHON_DEPS}
-	app-arch/p7zip
-	dev-libs/glib:2
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	dev-python/urlgrabber[${PYTHON_USEDEP}]
-	sys-apps/gptfdisk
-	sys-auth/polkit
-	sys-boot/syslinux
-	sys-fs/dosfstools
-	sys-fs/mtools
-	sys-fs/udisks:2[introspection]
-	virtual/cdrtools
-	x11-libs/gtk+:3[introspection]"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
index b090fcd2215d..31ea51e517d2 100644
--- a/app-misc/tdfsb/Manifest
+++ b/app-misc/tdfsb/Manifest
@@ -3,5 +3,4 @@ AUX tdfsb-0.0.10-debugging.patch 2106 BLAKE2B 27d00c7a5bfee66126417c336d43890c30
 AUX tdfsb-0.0.10-format-security.patch 1398 BLAKE2B fc461e169ca717fa75b1220d606cf1bd6a2d8c7b15c928402ac1d9f1a37413beaec464b5da867d1ef9cfba35baf2b17f24a57c06b894c468b0e961481cb05e3b SHA512 17543c4edcc09adc21a1dd8787eef2c7e57803d2ea490e4d0f259275e40d8619009ca1f5bd22970d1461078f998d3334ce5af9667f00c31b40a7c41841b151ca
 DIST tdfsb-0.0.10.tar.gz 35630 BLAKE2B 6df88ac449c8c671921aabe0b429e9b5074328c6b5c47869e06001f2996583c483427f744ce64874c2f70705463d432e945e1946436ebee8300c33702a64dca1 SHA512 4bfde530761bbc8373f2a9cc8bc5a4ea721ac564e7440d67ebf0c8b019c553b2e1288db86e54aaf111253decdbd4df93ea812fd5a70fd95acf11ff702387a7eb
 EBUILD tdfsb-0.0.10-r1.ebuild 914 BLAKE2B 025a6278b386ccd288c72ea6a95c06958efd21fb01ae3076ef64319f9cd3f61c7337293944716d9f465b89f19192151c81147dc915a08e9f11bcef2e287c7723 SHA512 2307b4ea3739fdaad830787048da9f0d3eca7e5885486dfa18145038f42359fe4ef0bff574abadb9cb62a14991d2500181cf43401d8bfefc0811adbe6e0323a4
-EBUILD tdfsb-0.0.10.ebuild 869 BLAKE2B 82a15208cf84421bbdb2cf277a1bfd405bbe3a60525f781ab752e2fdc1268dc71963f93bcdfa4f093a1410b9cb1ab8505189b50f8424669451ab70f453600e26 SHA512 55c1b31d3fb421f2f5ddf6655a209eaa37bb5b201c3190bf4cbf7021d15891c8e3e32d14cf4e3d1c618092dcdce586c398abaa2a159cebb7a88ca1f5b9064da1
 MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
diff --git a/app-misc/tdfsb/tdfsb-0.0.10.ebuild b/app-misc/tdfsb/tdfsb-0.0.10.ebuild
deleted file mode 100644
index 235f23ad33de..000000000000
--- a/app-misc/tdfsb/tdfsb-0.0.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SDL based graphical file browser"
-HOMEPAGE="http://www.determinate.net/webdata/seg/tdfsb.html"
-SRC_URI="http://www.determinate.net/webdata/data/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc -sparc x86"
-IUSE=""
-
-DEPEND="media-libs/smpeg
-	media-libs/sdl-image
-	media-libs/freeglut
-	virtual/glu
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-debugging.patch
-
-	sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:" \
-		-e "s:gcc:$(tc-getCC):" "${S}"/compile.sh || die
-}
-
-src_compile() {
-	./compile.sh || die "compile failed"
-}
-
-src_install() {
-	dobin tdfsb
-	dodoc ChangeLog README
-}
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index 76b389ba15b8..1b5336ed5c2e 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,3 +1,3 @@
-DIST tmuxp-1.5.1.tar.gz 67536 BLAKE2B f96aa7c779b2c71f7467683acb1a218da3bbc2808040eb6030ee5b9873fc842c57f811ee4aee9796cab329aa46e9c639700b465c07b91be221780bb9c3a9e271 SHA512 f2b9a7429911083ff090ccd3bd4f0d56db7dc2dac9420a2e0db3eddc33df2f55e2d288a065c407b1d9dccf2a71f820075639efde7fd6109408587f661eef0941
-EBUILD tmuxp-1.5.1.ebuild 892 BLAKE2B 468cdcc2f3799bba0ace9c2c34685c1441dc680dcea0a84ba65fd15fb642ab4f00612851d0d57bea7fa8aeaa71bb65db74d4d542a265d84fb53b5b734c7f2d85 SHA512 b659ad7c362c5d4f0b77a5ea68e7a622de6eff6bff931709712fe79b1cd3df963ff1f904410ff72068655bf2a6b0fd60fc6b4fe5cb7a8b9337b43451a7bd6f0f
+DIST tmuxp-1.5.3.tar.gz 71095 BLAKE2B 37c62eb9d334e5cca47cb4687403ad73cfffa57919770d754fb595dc26f76d248001e62e82eb7246104b74e752701ce57fa56cc78e8eeec8dc49e1522fc6b72c SHA512 9d803e715b1b75aec8940996db579ef545f5d291e64c7d4551930ec5ad683d8a5f737cc22328f0d528e709da6f613c8b3451637ec3e93ac7e9d34aea64faa0e0
+EBUILD tmuxp-1.5.3.ebuild 892 BLAKE2B 468cdcc2f3799bba0ace9c2c34685c1441dc680dcea0a84ba65fd15fb642ab4f00612851d0d57bea7fa8aeaa71bb65db74d4d542a265d84fb53b5b734c7f2d85 SHA512 b659ad7c362c5d4f0b77a5ea68e7a622de6eff6bff931709712fe79b1cd3df963ff1f904410ff72068655bf2a6b0fd60fc6b4fe5cb7a8b9337b43451a7bd6f0f
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/app-misc/tmuxp/tmuxp-1.5.1.ebuild b/app-misc/tmuxp/tmuxp-1.5.3.ebuild
index c29c3a629500..c29c3a629500 100644
--- a/app-misc/tmuxp/tmuxp-1.5.1.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.5.3.ebuild
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index c598deee15cb..337b4e874a2b 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice-voikko/Manifest b/app-office/libreoffice-voikko/Manifest
new file mode 100644
index 000000000000..bd841d5a04a3
--- /dev/null
+++ b/app-office/libreoffice-voikko/Manifest
@@ -0,0 +1,3 @@
+DIST libreoffice-voikko-5.0.tar.gz 51882 BLAKE2B c4d33f469821b3d3ee15f71c21a2e3fd5474939dda204873e85d9e52aee0d1cd9c01f660d63fdbef87786dbb0b8a88ba4fd45b8aff07b0b35588c9933d4c9cef SHA512 58f139c190acf5c56a8506365c296d06efd95b4422bb66c50e8058231bd10410b202d2a01ad0a2bf82dc0f41565c1e3a07ed86a4ae070d32af8cfd0e56d7eec0
+EBUILD libreoffice-voikko-5.0.ebuild 1414 BLAKE2B 09aafaa560e94a1f8ab9e91829fb28307ab6ae4fa6d7a0026f5878e55ff37223fc93cffe63661c66db3ebcff27b67f7f74f8b08009a093236397c4b1735a64d9 SHA512 054ff39abf9507e70c645f32880a2741613795cfeaaaafed7c833ddccd871986099b28f19ea000e5c3f5d965427b9453bdf9c63a9a1d50ca5bef063a2200e0f1
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild b/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild
new file mode 100644
index 000000000000..407d34087ed9
--- /dev/null
+++ b/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Free Finnish spell checking and hyphenation for LibreOffice"
+HOMEPAGE="https://voikko.puimula.org/"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-office/libreoffice[odk]
+	dev-libs/voikko-fi"
+RDEPEND="${DEPEND}
+	dev-libs/libvoikko"
+
+src_compile() {
+	emake oxt
+}
+
+src_install() {
+	einstalldocs
+
+	emake DESTDIR="${D}/usr/$(get_libdir)/${P}" install-unpacked
+
+	insinto /usr/$(get_libdir)/libreoffice/share/extension/install/
+	doins build/voikko.oxt
+}
+
+pkg_postinst() {
+	# Register voikko with libreoffice
+	COMPONENT="${ROOT}/usr/$(get_libdir)/libreoffice/share/extension/install/voikko.oxt"
+
+	einfo "Trying to register ${COMPONENT} ..."
+	unopkg add --shared "${COMPONENT}"
+	if [[ $? == 0 ]] ; then
+		einfo "${PN} registered succesfully with LibreOffice."
+	else
+		eerror "Couldn’t register ${PN} with LibreOffice."
+	fi
+}
+
+pkg_prerm() {
+	# Remove voikko registration from libreoffice
+	unopkg remove --shared org.puimula.ooovoikko
+	if [[ $? == 0 ]] ; then
+		einfo "${PN} removed succesfully from LibreOffice."
+	else
+		eerror "Couldn't remove ${PN} from LibreOffice, "
+		eerror "manual removal might be needed with "
+		eerror "  unopkg list --shared"
+		eerror "  unopkg remove --shared VOIKKO-IDENTIFIER"
+	fi
+}
diff --git a/app-office/libreoffice-voikko/metadata.xml b/app-office/libreoffice-voikko/metadata.xml
new file mode 100644
index 000000000000..6b0a0fb3a729
--- /dev/null
+++ b/app-office/libreoffice-voikko/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 658f0bef960c..eed046971731 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index db0048ba8088..b04def20b62f 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,3 +1,3 @@
 DIST usbmuxd-1.0.8_p20140530.tar.xz 46988 BLAKE2B 8efedee3231b134995316fc295fffd975271aa9d630aa6e3d96ccda472634422299aadb92acda09b6802cdcf9e99af0c165dcbed153d0a5027ffcc8f26126cdc SHA512 200c9bd208ef9e8d5e0a9b2779ff260efe6319333ce27c93a0686ba924e6cfaa1a003072c3eabbe46d495a66bc47c3cd6e82482653fde5e1a7ae0edd9b838fac
-EBUILD usbmuxd-1.0.8_p20140530.ebuild 869 BLAKE2B 0e2e9847b97a06661acff0aa19d8518fa73361211d8e89758ab18c090f6917c412ecf8ad4e00b917dca5ecbce2a82293f52a38b38915fbbe863eb5596261ce83 SHA512 5ac79095dff7495464783e39ad99e15817e72f96c8bad9ee77fa904f21b3bddc5419f708f6639d7026889a282463347bf3ed80d8226b095e28e70a451acdbbf0
+EBUILD usbmuxd-1.0.8_p20140530.ebuild 869 BLAKE2B c4f285dfdb12994d9bcf488b91215b1e5f4245d9b269d3cb1164710fc8a344a2d66a24a3fdcdeb1842bbb8b64a9c47ef3f20e15548367d711fdbe9c4b0d16131 SHA512 fd1b326c16e0c74f4a2f6b3857606ffb6b7e14c40e5682c01fab1655c3df27dffd4b4ea6b15d5c3a5e5ae64f914b135ac562b6d792d6699dddbb183dae5b226e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild b/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild
index f4c8c46ae9c1..17dd00ce82b1 100644
--- a/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,9 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
 
-RDEPEND=">=app-pda/libimobiledevice-1.1.6
+RDEPEND="
+	acct-group/plugdev
+	>=app-pda/libimobiledevice-1.1.6
 	>=app-pda/libplist-1.11
 	virtual/libusb:1"
 DEPEND="${RDEPEND}
@@ -24,7 +26,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 pkg_setup() {
-	enewgroup plugdev
 	enewuser usbmux -1 -1 -1 "usb,plugdev"
 }
 
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index e53cf03dbd33..170378c2f677 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index 1440ffc976f3..2c33bc7e4bf8 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,8 +1,10 @@
 DIST cpuid2cpuflags-5.tar.bz2 72050 BLAKE2B e9b7022ae5b7d51c88b5e41d9d7af1175498cb5a1f32876bfb766f785060f501d07ba3a5c346961e742bbf7022121faf3d0d068ec711ee9ed4e67cbdcd72a58a SHA512 41dcd2b974f6bd96867dea15a3839a8d63a3ff600189107ab16a67b5bc77ef421acbedb83f3e3b16ec90ac900d187aa8c44baae6fbdb4988f3bf7caa2d0d19a2
 DIST cpuid2cpuflags-6.tar.bz2 79329 BLAKE2B 3fb1e104a065b020926602e3badcb96c8c3bbcf5ddc708eebdf7754e37bc302b88297471f51a07403eb49b0d688a1c2725b878bcb2a47edb0f491e3608d72b49 SHA512 b7c844667988663ad50430a506055c11263c33bd8821ae8025eea3f719c33101425dcaef3f89afed7f15952d678e4467afe99672eb3135bedc34fe5979f999e0
+DIST cpuid2cpuflags-7.tar.bz2 80582 BLAKE2B f78c94e2c3706a3bffe58631455c91d1742d8e551449b8ec0b3aa7cef4b542dbc7215f6cc6d5d8514aa7f8d90af56ea95ab6d1263f8d7442e0478581728d9511 SHA512 6ddfab6fc44910f8ad1c03ef1f6d6e2a9348a4ae419eeca6f97cf7bea76a88a2ff413421f6fc75df22b6b04d42346dc0f3c958dbd87d672abe007bfacf355d7f
 DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
 EBUILD cpuid2cpuflags-1.ebuild 1049 BLAKE2B 7d80e64bf6109c0554ecf37f3ddc4042bc8801cbab79235e94647dd1d46bef5de89261640957a3cb0715345855462b81bfcd2d2c3a9b6d2e21fd201c2cf916d4 SHA512 df3f8412a7992d034495dab33395ed892233976ab7ae70e3b8e698867e03cdf0231c2814968bca139c870107e3d96aa90b4473904a4c6aba02b7be098c9617ee
 EBUILD cpuid2cpuflags-5.ebuild 922 BLAKE2B 0c8097b9adda83aaece462f4efd3b0380c2ea743c51a3629a9bb5efc6c0a3ce549d21cae446e457357cc70bc723b859df86d095189f4606cc164e3a8cff65f7c SHA512 e13f6f2561fb4c511ba845c32256319512381657664e5eef38014e6f6e0f1e6a64f5224203022e276fe950f8900cc3933ddbba06a2099d7936689b93e514d4d6
-EBUILD cpuid2cpuflags-6.ebuild 925 BLAKE2B ac761bdb5b058833ac0448c29f36e5f9140ca95f846712f7e5644e8b4f2ba15c4c2a1aecba926e7afd48d829ee62c39b21b79a3240575c891eb15fb7998d9abd SHA512 ac2625e5f8ca8681d651fcdff392aa18b9098cc8933dcb1844248a6e5f9dbb31a959d42062ccf0f17870387a79372e3f5e51c40f72e5ccfa61640378e42866fd
+EBUILD cpuid2cpuflags-6.ebuild 923 BLAKE2B 66c37e8770b45f3a11112b2b975b5118bbc1599c282eb2f79a4d5f50e0ef593ec23f3095f85b5dfe35f0856bbe02e3e2a48fe23ef9b5d23c3348d61b72441f63 SHA512 6c1f9f3e3bc4572cca9fd55948e7975e055e115334d3620073cc452cc5df334c7aa6303edd860ccdf2d3d576f272ca40dcc44feb497028e709d07d9b0a37d019
+EBUILD cpuid2cpuflags-7.ebuild 937 BLAKE2B 6b20279269289630cde57817e81b759745e1d9401d8bb1e2d22924100ee66a883474523cf6de595b522503192e300e7629b05ff8c160fb6ce194d99ff4de8f0e SHA512 c4948c5897f5572483176ccf615842126a754a01b952d8e4520459b9a1c0f4c0e1886ff752ec570b053102fbddd060e529e6656fff6a23b32a3f10791872458e
 EBUILD cpuid2cpuflags-9999.ebuild 405 BLAKE2B fff9a10b348e61e1af045a39f10aaf81cb6d635d7c87056ab6665018c037b338a03890e0a1dee89f135b56b6805fdde0b2e547e0ab82832ae042c8c28d8bdd3c SHA512 36da5933134753af27f01b833ecf1e2d55c4c55eb58476c32e2de1c2ac6bb51de218e415c7168f97c574b0b2655825f0d981478ef8c17a147a3f38465eb0919e
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-6.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-6.ebuild
index b4d12bac27be..6b4ad44d0f24 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-6.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 pkg_postinst() {
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-7.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-7.ebuild
new file mode 100644
index 000000000000..f90b8b68888d
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
+HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
+SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v%-r*} -lt 2 ]]; then
+			elog 'Please note that the output has changed in v2. The new format is suitable'
+			elog 'both for Portage and Paludis. To use it, e.g.:'
+			elog
+			elog '  $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
+			elog
+			elog '(you may need to convert package.use into a directory if you want to use'
+			elog ' separate file as presented here)'
+		fi
+	done
+}
diff --git a/app-portage/elicense/Manifest b/app-portage/elicense/Manifest
index dfcc9903da7e..434b60ef316a 100644
--- a/app-portage/elicense/Manifest
+++ b/app-portage/elicense/Manifest
@@ -1,4 +1,6 @@
 DIST elicense-1.0.1.tar.gz 9260 BLAKE2B b5782412de613bce009ff1d685de6af9a129afadd131a91328cfd02d55c416e5c7549aacf676c4596a4512de4e3a42d2b89c24d2367404177e9675a7fdc35d94 SHA512 3b7b412742a9b67b5c4dda10838d6380c1f18199bcaa87458f30b06bff068228f64364d336d1daf4b95df6c1889ae9de7f277dea3defd18dbf74d50fc9381500
+DIST elicense-1.0.2.tar.gz 9262 BLAKE2B fd1e808f577269758ed46c8e8965dc1be7649c825a094ff5b2e09dba12af5249a5a73dc5489ed131c8221e88642f92ac8b859ad5185d3a0c095bd1485178cd27 SHA512 ac6788e7726d962e72855da053be0c44722a013dfa7f500dc137ae46d946c176a285455ddaa5eeee1f6e224d5960aa2a578caa7c3182a5f93d3bbfae8cfd4a93
 EBUILD elicense-1.0.1.ebuild 940 BLAKE2B b8caa99f39eb24d20ab49e5a73c1db2d334b98721ccc19a174ebb4982679381107c9c68f9acb663b7a26cc30c2f919c7fc511447d70dbed4ce9b4f7d6e1ac97e SHA512 1230df0f640f01e7c753a3bd956bf82652ae68e9452567aaf554a830335d105585c7a51b166fa7c78e172c2a2bcd20fc035be838ab733cd66ade8c876d978b56
+EBUILD elicense-1.0.2.ebuild 952 BLAKE2B 1f07bd06d78d0477ab50cbe4e58872acb853500bc41a5c1c79e06bbdbc7b847dbdcff98758782c2d0d051eb2d4acec375344b31d52a9b3559597abfee9d05f22 SHA512 ef169f0c15add750841267965de9b12c8a1e8845d107461b82952c94623b55ccde90c1b88b5108a8489e33466edca0fa87a39e91b8016c332e7ac9d07c07b94a
 EBUILD elicense-9999.ebuild 952 BLAKE2B 1f07bd06d78d0477ab50cbe4e58872acb853500bc41a5c1c79e06bbdbc7b847dbdcff98758782c2d0d051eb2d4acec375344b31d52a9b3559597abfee9d05f22 SHA512 ef169f0c15add750841267965de9b12c8a1e8845d107461b82952c94623b55ccde90c1b88b5108a8489e33466edca0fa87a39e91b8016c332e7ac9d07c07b94a
 MISC metadata.xml 355 BLAKE2B 3b6e208a86ad1c40713f9e441d5ec81de0040c146d4cdfd1e1026d550dda0177ae659120ee272d84035fe9fbfc0d2089a7f2726056247710530db9b59e4ae1d2 SHA512 2c5c3010075adc10002bbce3613c30228993c3a14acf9785ac452b39608fa8cb7e9f810490710b91be4558c9a30342e679a44e7ba88fe060eb563da7369e2bba
diff --git a/app-portage/elicense/elicense-1.0.2.ebuild b/app-portage/elicense/elicense-1.0.2.ebuild
new file mode 100644
index 000000000000..bbba9eea7ef6
--- /dev/null
+++ b/app-portage/elicense/elicense-1.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/Whissi/elicense.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
+HOMEPAGE="https://github.com/Whissi/elicense"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/portage-2.3.62[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	default
+
+	local MY_PV=${PV}
+	if [[ ${PV} == "9999" ]]; then
+		local last_commit=$(git rev-parse HEAD)
+		MY_PV="${last_commit:0:7}-git"
+	fi
+
+	sed -i -e "s/^MY_PV =.*$/MY_PV = \"${MY_PV}\"/" \
+		elicense || die "Failed to sed in version."
+}
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 468e8d83ca2b..ad76237fbb15 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -2,4 +2,4 @@ DIST elogviewer-2.7.tar.gz 19936 BLAKE2B 530c3324666089af93712a17f01cc9b6284b263
 DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
 EBUILD elogviewer-2.7-r2.ebuild 1700 BLAKE2B 173150bcbda74207e134e1498ee3bf6471b06fe9a9ac24989d97d376eadd3218223bb1aa71c15ba00a3780e38a37e3d65463d9a9d6c9f97e6c8b96d33aa7950d SHA512 f8e17dfc8ced29171d2d17d3a2c33e541643a5f539b518d72e9f648bf53d596437db5221255729fb1937dbf6addff17c2eca008f017264f1d851f94e8da1cacc
 EBUILD elogviewer-2.9.ebuild 1704 BLAKE2B 28ac76b5b516ba34b5d3ea8630d631645e88f23e6f6e33c4288efdefebaa1c6977cd07ce1b416e15c6a923d15a765579873a2e5d053c49da6b201d8f916c195b SHA512 e130531869b328510dbc7f6b2ff85dfe8219ed79cd842950788c08fe34ac6addcfcc346fa423b40253205fd1e702250731cb585cf1d687391e81707adbd86d21
-MISC metadata.xml 508 BLAKE2B 4414a5567ae33626032ceec6a059d7547bf8f2b69bc561b08e7ce60817194cd646813e0d3d0debc88ca10b85933ecbbdf954cbfe4d6b4194499e866ce54d7271 SHA512 bcea5d31473ddfb682d52f604f8eec6ec26938a30a62f7388e9b3be36d17a8f189ea97c418708b88949a6d48e10f6652feabbd247eeb9ef9132ce20916c41ec8
+MISC metadata.xml 402 BLAKE2B 4cc6503c5c74f4f0883d2c167bb06515878ad1324931d38d9402b463c774b009d14ad2ec5b8d2611ea361e0793ffa3b4d463e88173f2f08dd0b1c0a988bed44a SHA512 77f982c8b1070592bcea3b91ae6e4c2fd815c5be0a63b7160793f7e7fbd1b1e60c3e3a993da1e7d2933b22ca621d6320955f7ac360b7ed09dc04a149ee32d567
diff --git a/app-portage/elogviewer/metadata.xml b/app-portage/elogviewer/metadata.xml
index 7144a8404ae4..54f126394a36 100644
--- a/app-portage/elogviewer/metadata.xml
+++ b/app-portage/elogviewer/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
diff --git a/app-portage/etc-proposals/Manifest b/app-portage/etc-proposals/Manifest
index f34aa4096f56..9aae1da0057c 100644
--- a/app-portage/etc-proposals/Manifest
+++ b/app-portage/etc-proposals/Manifest
@@ -1,3 +1,3 @@
 DIST etc-proposals-1.4.3.tar.gz 53696 BLAKE2B aa86d4b55d53ea269bfeb58cb1db9877fab224c5387fd91ac377d757814580b8c4561c868d9c2d97c465b332041c67fdfe7a5e196fe329b92a768d542257a9ff SHA512 9de117b96908bbde87e8ee9c326525961547ba779ae571071c57571d039f3e01f9d0ec6be5eefc1ea40abdfe73631b4c750964dc94dbb6348119b83afbc556a1
 EBUILD etc-proposals-1.4.3-r3.ebuild 1272 BLAKE2B b99b4f39bc3c08f433fd93d90f24f3f8e953bd1d4c091d81fcf8fcbda045b670bbcf93bca0835164cf3c0307fa43f3a1b688653f913b9d45f51eb93e69f5eaa8 SHA512 1d85af758807a3d7eb94041528c29c48566809a4c5a975562b153f62fe40a91d61c912629c4f9792ce53cecfa72a0e241c7b395d173509420d37ef48146ade07
-MISC metadata.xml 463 BLAKE2B fc408f9701b4ffee390c6d5983b94e5913d28dca4c0ec97a7f0fe5758797b767d3fce8738208a869b5134907c066d5dfdd15fab70f0de821f69e587b7361453c SHA512 8e858c382a8880509a3f8964a2d94e64899a842d7c0368069eb8f58c041863a3a6d6a3d586cfd12d411de21bd990b685ebfa3d2d97ac460c0eb2a6dbf6aa91d1
+MISC metadata.xml 357 BLAKE2B 88bc360c88c0e4b9d32bd28923648fd27263bbdf753b3e6be5f3ec2bcf9cff590a9cff68a62bc1426fdd85e4f4aa8cfb8d818633304af9a13f5954da4b5f72a6 SHA512 a4c8e74227ed3eb52a28f7f44c5374368573f9ddb6760f673e6815aee796ee14d7ab011e0c4c8c7035bcfb7a2cce27f68e185e86100cc3868ed97d5763bdc10c
diff --git a/app-portage/etc-proposals/metadata.xml b/app-portage/etc-proposals/metadata.xml
index 8f4a4e4862f1..85162e1ca20c 100644
--- a/app-portage/etc-proposals/metadata.xml
+++ b/app-portage/etc-proposals/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
diff --git a/app-portage/g-sorcery/Manifest b/app-portage/g-sorcery/Manifest
index e9654c0716a7..fbe321e54e5c 100644
--- a/app-portage/g-sorcery/Manifest
+++ b/app-portage/g-sorcery/Manifest
@@ -6,4 +6,4 @@ EBUILD g-sorcery-0.2-r1.ebuild 831 BLAKE2B e46177245bffb59d0e7287d2b4aced99d9b34
 EBUILD g-sorcery-0.2.1-r1.ebuild 956 BLAKE2B fce2b8b0643b06cecc944a7fd3a2934b2a5b6c22fd3d6a087f9c6273eb7299cf851bbb0927a198a5ab32ec12431317eb28c13c180210c12667cee7273138a8ce SHA512 986f3e3a3aa17b63729fd684f07f26a4227ccbd56fee683e32983f242e596eb9886d387d4f27bf7f32e898cde3ed80f5c21d0a8bea352beb7f9c38490e419ce8
 EBUILD g-sorcery-0.2.1.ebuild 857 BLAKE2B 6c17b1a9605887a85576dd55e4f418c53acf86e2e09ffa7b030a4e7b6b2921db5f1aa4da6e0fc8610729b4371fecc9a50a319f0112d227067655548f8c78fcc7 SHA512 bf5a8e33dd3e59043788da60336e071364c8879f5d442f5d095290d059030899587e708c57af52e0323029a481466c4fb9d9eec6bcdfa54d8858324701217ba0
 EBUILD g-sorcery-9999.ebuild 873 BLAKE2B 548adb4347479ce35bd4f2751ab11c3cdaf60c80b2a478a8a88851292f8113e908120f4371b29f380479f03b91dc15f51ae0825592218b7661247135f4e43254 SHA512 2fde4d2e0b19a2bc999bcf2b6d4c497a5cba4da6f03b7511b311b7b7ce1e4e653e23502330339780399a0e081f5e3978f873cfdd043ac190416a3408e5ef41bf
-MISC metadata.xml 494 BLAKE2B 558f844e741fb22e9b08b8e926fdc0bb697a6d0697815efe74e925eca39f644223772a1ed3f98585383f58a5d2ed4b092b8868b595f453184762c62e1937f2da SHA512 dc99a22780958061da21e20aa74ea128b1397fe09092b8dc32268577315efdb6d8531b227e24863cab4eaf393ce94e783c763f0835a5358ea39c02bd628a74c1
+MISC metadata.xml 416 BLAKE2B d1009974d29bf69e2938899e03cc44942f86476c92ba3dde3f3a56e7253f77307bcb30771ba2a860e2c84e5daa1a16039a69aade1227c0739668ceb766ef9134 SHA512 63d03d46ad0f346591ea9208c55d186da8419fbd8cb1ba9ec68dcd8484cfd6dec0200e46004829cc8a1c411e13e4cdfeeef8e8c9ac05679f8d595cf306d49f54
diff --git a/app-portage/g-sorcery/metadata.xml b/app-portage/g-sorcery/metadata.xml
index a61b3d383283..a7455e94355b 100644
--- a/app-portage/g-sorcery/metadata.xml
+++ b/app-portage/g-sorcery/metadata.xml
@@ -4,9 +4,6 @@
 	<use>
 		<flag name="bson">Support BSON file format for package DB</flag>
 	</use>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>layman@gentoo.org</email>
 		<name>Gentoo Layman team</name>
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 631c2272a37f..496f5f500ccf 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,11 +1,7 @@
-DIST gemato-14.0-multiprocessing.tar.gz 71359 BLAKE2B b8c6fbcf8a83c8e85db4045ad23296944b94623d132a6c5f15b8388662fd092cb589600fda1d11c9645541106dc735dceaeed87d642b1fadf0f352f4a9b3f108 SHA512 2f1a1cbd837ab316bf544f713470f570286a313e002a4dcc075e464e77a3b10ba86410f805aad3d5702f3deedda48f8270f1274a67d76086b4ad5cd597426c5e
-DIST gemato-14.0.tar.gz 70754 BLAKE2B e66d63a20e144e809555b2eeff6a24f899e1f488c95a14b2250c6eb45c39a6e6b0e614afe30a64f5a353720ab38371ba3e4bf9948052dae3e06f9f82ac3d04a2 SHA512 0494b8fab720b4e5ad2b190fab128baf997073137b933bc113dddc8c5f2c54f53d09bc640b01565e9757b41197d039c8487cb2b78de77313722d19baf008b51f
 DIST gemato-14.1-multiprocessing.tar.gz 71707 BLAKE2B d7d22615a65bd598160b23e01a938c20ecadfb1a1332db3842b14bfac69006269efd0f1da6d6bf0f10f3aafb07ebe01af09e64f9612c50b8e98a0bd6aff27651 SHA512 fd4722dd2f632bda4abac59b7e62f531edbdc455be1f1ec94d8bf99194956de15b6cfa4d623713bf3c25e55a6cc6adcdf8039cb7d20a556924bed0ddefd95daf
 DIST gemato-14.1.tar.gz 71142 BLAKE2B a7c8f814f9c6875e977aa178d4a49e3454ea8d6e19750786452aa2f34f0904f0ccc0a9a58411a0214a68cecd571320769c6374b265e2aa7f52fbead53ba6b284 SHA512 de57f3b7aa17e650894876bc2423c4fa9809f2de25aa2fb8ef070e943faa182c80f7ea8a519ecdf6edec8098d11f786344ee872b9e98c69bd6739760652baa2e
-EBUILD gemato-14.0.ebuild 1352 BLAKE2B c2d1e7c84eb461f2b2f321f699958e480ec7d4459c001f542b36bd3219358ecdcf9f5211fa39ec320f32feb5fb07929f3631a3d243a5e7909f91a61fbfe4885b SHA512 caf7b72bf8cd730dcf8ac572223c1b2ec0ca4d7f6fa021cfed7d2d398e8c4bbb64211baac89dd7f317526a733a496dd3ef0559d81706d7fa7eb8c6af0260901a
-EBUILD gemato-14.0m.ebuild 1635 BLAKE2B ed2bb89c6b7f2fd7125fddb8429d1ea70d77fe3eacef38b65a3e5ef48a75f6fd9827d227668854090d565a4b3136c1888a901b6a3478175fff15418d3e0e9870 SHA512 763cfbbd2995d8a90e1b7278cc831ddafa7eb53dad2c4f461e1ca76db24e398ded702462bd22a65b0d389ca14952223c5c4c3601eb99c70ae33abde85db74591
-EBUILD gemato-14.1.ebuild 1376 BLAKE2B afbbeef63e526db7e95387b56bd138fe5f0a69c0709647c15a6549f67e4991a7478a952ff857943da77932982706b2caf91eb7dfef0e65e8de39e2cf856ba6cf SHA512 d634cc2e59c18a4669701db466a8cabaecd81253a3e98e7279fc8e5d6634c1da4a51c38fed1a383037a2034e98579f7df2857e3a1102c9d148664ab060b98aad
-EBUILD gemato-14.1m.ebuild 1659 BLAKE2B a097ef71bbe477eb7b3b9e389e10b42d63df3e56ff5f5773d7fda06fa771677a64538acdc9a4b86b956ab825d680fa8516cfcc5d8bd415548432fd8b4abdb4ef SHA512 20e969002fd5861edfad5d538b96d2f47c7881f9e59034ba28ce98b37d663221bd2870308cacc9685add8b12dc281792a9d06a65c7f143ca83aa4c8b1935ef04
-EBUILD gemato-9999.ebuild 1271 BLAKE2B 761c2087c144d5936aefcb45cf2be23641c2605f1f836e07ade31b577f8bc6f82c8ffe7313580b371b89bea6f036996d7a1925fffbb03553cf57d02800ca370a SHA512 a910a795abe974d3c389a77cfc827fa7393e6adc603ade32d782dc5838eda46f7c255abdbb89de263ac7c38d948bfb616d1c3cb72088d3fb5a7da6bab027cd28
-EBUILD gemato-9999m.ebuild 1466 BLAKE2B 53d42b54cc09dd377a60bac37fabc82ae5e272cbd336fd7f5047fbd7d940dc9005ac1006ffce31576ca146c5f65c56af83405c1f0a93831e4a24051c0f075a8a SHA512 4deb02e736943d5014d53a05602da09b1d7436ed28a4f528240b18b65741fad352cea686f9532f81d6f60a0c62735a3e5db3ace44c6dd7308f55928d844a2562
+EBUILD gemato-14.1.ebuild 1403 BLAKE2B 60db2d2efa3f87141ce6c6ab1eed3d1dbf9e71ca55f0a16f9475e1be610050c81bb03f132325c1419913fae90f9c82a42aead562ccc4cf9b6e98d671c667106b SHA512 250e6d10bac36eb6353971e3d40cd9841cb970f39f174ff84609650275d69d0ad064824bcf9c835bdf6bc11ae84a91202815ae31d0a1fce41a4196b508276b85
+EBUILD gemato-14.1m.ebuild 1686 BLAKE2B 8e9abc1542037d1522696b5a8d6346b02e9d7d6eecc6dfb6795cbd562ac23f5b27056bf91915b3699455eedafb9a4cfe58caed21fd23eba1a84407ae71591380 SHA512 e647e09445ef8ba5d4b37b5e1982d2469780e529b79c7fd36a069e372ee5abcf17e78e0d427dc5536c97c4bc56d15ec1b27ae19a07666c939a919ee67655ddad
+EBUILD gemato-9999.ebuild 1298 BLAKE2B cc2cdc3081a1662d04b4a991a4fec1a6cff50da2faa90536efc34b47b3cfa1831c9e6e69e5fb304c39fd807dbced6e0a67d16830733e5ec2061e88931d6d41cc SHA512 9cc1345c6e9df9112c43cacaf896d46917753873a23ab4282e0fea5aa20dd26d0190eebce0d67bc73fb66b1d4dad5fcb9cc5797236377c2ea4f4c01031ef5ad6
+EBUILD gemato-9999m.ebuild 1493 BLAKE2B 1826c7324f6b383dc4766de75731b93b46f2f13c6b9c4b7b928cda02e2ba9d6882fecbe828cd2e52b235ba0a4395663db13953e6d0d835614e66534fc0e0098d SHA512 b94f5e54cea9aa25dd90133fc127f8f14933d6b102ce5016346a3d73a78205aca21cee413e6de4f55c6c6df0ce2a65f86999e8cc8d0cfc1f85d8bb0a7813957e
 MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-14.0.ebuild b/app-portage/gemato/gemato-14.0.ebuild
deleted file mode 100644
index 9c8ca68bae1f..000000000000
--- a/app-portage/gemato/gemato-14.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
diff --git a/app-portage/gemato/gemato-14.0m.ebuild b/app-portage/gemato/gemato-14.0m.ebuild
deleted file mode 100644
index 318a72bafc86..000000000000
--- a/app-portage/gemato/gemato-14.0m.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
-PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1
-
-MY_PV=${PV%m}+multiprocessing
-MY_P=${PN}-${MY_PV/+/-}
-
-DESCRIPTION="Stand-alone Manifest generation & verification tool"
-HOMEPAGE="https://github.com/mgorny/gemato"
-SRC_URI="https://github.com/mgorny/gemato/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd"
-IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
-
-MODULE_RDEPEND="
-	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
-	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
-	gpg? ( app-crypt/gnupg )
-	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
-	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )"
-
-RDEPEND="${MODULE_RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/setuptools-34[${PYTHON_USEDEP}]
-	test? ( ${MODULE_RDEPEND} )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use tools; then
-		exeinto /usr/share/gemato
-		doexe utils/*.{bash,py}
-	fi
-}
-
-pkg_postinst() {
-	elog "The multiprocessing support in gemato may cause the process to hang."
-	elog "Please see https://bugs.gentoo.org/647964 for more details."
-}
diff --git a/app-portage/gemato/gemato-14.1.ebuild b/app-portage/gemato/gemato-14.1.ebuild
index 33abd8977510..8aca0bc182eb 100644
--- a/app-portage/gemato/gemato-14.1.ebuild
+++ b/app-portage/gemato/gemato-14.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+RESTRICT="!test? ( test )"
 
 MODULE_RDEPEND="
 	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
diff --git a/app-portage/gemato/gemato-14.1m.ebuild b/app-portage/gemato/gemato-14.1m.ebuild
index 851a29675cc4..18f0b42a31f4 100644
--- a/app-portage/gemato/gemato-14.1m.ebuild
+++ b/app-portage/gemato/gemato-14.1m.ebuild
@@ -19,6 +19,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+RESTRICT="!test? ( test )"
 
 MODULE_RDEPEND="
 	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index eadfa2181db3..f419059fa647 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+RESTRICT="!test? ( test )"
 
 MODULE_RDEPEND="
 	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
diff --git a/app-portage/gemato/gemato-9999m.ebuild b/app-portage/gemato/gemato-9999m.ebuild
index d07e16ce862d..fe7b3b5ba969 100644
--- a/app-portage/gemato/gemato-9999m.ebuild
+++ b/app-portage/gemato/gemato-9999m.ebuild
@@ -18,6 +18,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
+RESTRICT="!test? ( test )"
 
 MODULE_RDEPEND="
 	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_5} pypy{,3}) )
diff --git a/app-portage/gpytage/Manifest b/app-portage/gpytage/Manifest
index 92f34377b366..92813cd955c3 100644
--- a/app-portage/gpytage/Manifest
+++ b/app-portage/gpytage/Manifest
@@ -1,3 +1,3 @@
 DIST gpytage-0.3.0_rc1.tar.gz 45470 BLAKE2B 19198581088ee8e6051404e6ed412773bd6522ea19127e432286443aa6f939a11d7a2323907e6d5a5b141e53d8dd698b23a9f3bfd9a74893abf362a82478f5dc SHA512 82f6ecdf5a5710c5f11a22401f46dbb50410f78101086f4ae727b09e6a022065c83b1ceccc3cf6771b5b09c37fabedd9ba58a01121c941c55d0fe9185ae9d0b7
 EBUILD gpytage-0.3.0_rc1-r1.ebuild 430 BLAKE2B edd432ebf0351b8e4b8a3e8317cf93788245b2e8211fe2a033dc105613be509a8c532cf5abc60883635fa2818e203bbcc19c0afaba8635761ebc4ac6021be329 SHA512 15613ea9f3abdf7b9928845312e2f6bd0f3ffab857c9818a4016c3d5d08bfb20ba9c5a279f8cd52e30bebcf77138d213d5b32e8654bec8155c7476efca6b4000
-MISC metadata.xml 371 BLAKE2B 7013ca4d9ac135127633618d90016f96fc2422177f820d2a438189745ae7412f819ede35cc6a17c596965fbe21e69a9ca52144f62c7167b980ad8c6a0e160c42 SHA512 56a42cde34ea7c1d416374cc8f1bf10f65257f25affe9289f92c6fdfdbc59eb32d71c8c45618b410b5ef768318d9038da1de6787b6477449d01624f2f67e24ca
+MISC metadata.xml 266 BLAKE2B 75815a801df3e14d69c6810b6cf13de3679f3ca9a0c3a260b2d1bf6dc83e0384a1008cfeafd03bf6d360234597edc078b4604bc308b331e07fc8fdf0290fca70 SHA512 cd1fc3249f6de3f67db01b9aaf228ac3230f3748e884c85217239ed372091cc8c266c7e617be8f2cad290a5bebb1311f604bbe3e6ede91ab430d8d1dec770a42
diff --git a/app-portage/gpytage/metadata.xml b/app-portage/gpytage/metadata.xml
index 55c598a89486..210b750f9c7c 100644
--- a/app-portage/gpytage/metadata.xml
+++ b/app-portage/gpytage/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
 	</maintainer>
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index f4d4b64afe4c..3121ca5dbfaf 100644
--- a/app-portage/gs-elpa/Manifest
+++ b/app-portage/gs-elpa/Manifest
@@ -2,4 +2,4 @@ DIST gs-elpa-0.1.3.tar.gz 15486 BLAKE2B 6e34aa27aae9d7e27d41e122ed18890b5b63a18e
 EBUILD gs-elpa-0.1.3-r1.ebuild 611 BLAKE2B aaf209792b301352bdec3d8c59e44d4038f6698ef23a504e31870411cfadd1fa32e6ce1293d3c35cda723ac877e6eca35a8b58155aa101c4a90f46b63bd93e70 SHA512 9a973e77b992b4f24f42cfa42f10af241778a8043300c6878d73fe72a0ca8d75703af59cfce7bf5222128c75b2e3f4a8d235e0ff3cac1cd1bcc34541ce0b6f49
 EBUILD gs-elpa-0.1.3.ebuild 601 BLAKE2B dea8a0b01179e9b9eb6e0d872d397fd9c25621dcc2b80180fad9bfb8a625e3b10eaf52c19c57c5f3da394da098dd769fe8daaa3c8a851cb973a29edde6fed7fe SHA512 ab8fa141fe05ee4aabdd80684978bbc8b802e623b49c090a3e76dc20e1e908c157cd5af34ce0c4f4dc62a00073b508c0d563e3ade4f004549df229dcd7f76c23
 EBUILD gs-elpa-9999.ebuild 603 BLAKE2B 5a33f85b77047f3407754a72e71e6266de017aa4280f20c8ddb5eb4f4983c1bf2d612b872b306c3c12427a0ad276871995c7547a00cd3e3a01377a148bf53bd6 SHA512 32985794e555d5772f548b591e51852d814a12e4dcb0f5ec7f566ca41d8f3a26b5b661b9dbc2837f04c2ab3be49946cb4eb2a2a3fdda37a5b89fec35d73a41a1
-MISC metadata.xml 410 BLAKE2B 9f071e05c03a23b6d215d066cce446e3c1e810f0d83823f133f45cd90f31e70729e8358d524bba95050848d445fb31b80b6433854c4273a0e41b377e5bb5a135 SHA512 22269ab3fd95d8480b44f2327301ee4ccefa28e68bc58d31ecd4b64ed345eefdeda87b6341e708fd2c2f19066ae820f9a14cb375917b85bbca93d0496ad4c9bf
+MISC metadata.xml 332 BLAKE2B fba6bf848c564260ffecdccc4a972f929bc0bec8b8df1a5842da68943d1877a27eebe514d3b6d963d398050f3411b8c6626be4cf743382559646099cd681d570 SHA512 cd0d491e5d3362c673b23769d802067f467d48038f0590d94a3a93fdcd6ebd3edc2162829854d0123576dc92a7b1bf49dd3fbad2a0e2a85c311701027d8d4fb9
diff --git a/app-portage/gs-elpa/metadata.xml b/app-portage/gs-elpa/metadata.xml
index ce604de6854c..02eaa858168c 100644
--- a/app-portage/gs-elpa/metadata.xml
+++ b/app-portage/gs-elpa/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>layman@gentoo.org</email>
 		<name>Gentoo Layman team</name>
diff --git a/app-portage/porthole/Manifest b/app-portage/porthole/Manifest
index 1894157ed0de..efc8ba72362d 100644
--- a/app-portage/porthole/Manifest
+++ b/app-portage/porthole/Manifest
@@ -3,4 +3,4 @@ AUX porthole-0.6.1-missing-attribute.patch 665 BLAKE2B ac282d0f7ef0f94d125520d25
 AUX porthole-0.6.1-missing_import.patch 858 BLAKE2B 6b338ff4425d533e6f5a7033f2372032b7184ef3119a95cd5251ff92430223cbef3e95922850ee62416f9d7f2e0dde6df015a5cad1146e227c120c2e4a902630 SHA512 aa61359f9b0d53ffeb3a68bdcacf0010de2a789ea70b1bc0a1035d649ff3986e7fb44292fced65f5652475956d7a10d15907a4e6fa139854f7cdb4a7db1eaebd
 DIST porthole-0.6.1.tar.bz2 958696 BLAKE2B e4eb7493a66278cd7d16ac68304fe74ad8623054a95bb3dca84b0b8236f76cb9b0a92f446d1ffd95f907c29d703d93bdd48e8e5064485b69282e8680f5fcb658 SHA512 9bc1d79c587ad8228b9bb4eee6cb32559a5d7b6a9f4f6ece752fce9030f71fdbfd6158d7a2a055641b63df1f0a1c31995747e15b618de79cd8a7a56e4d8f634c
 EBUILD porthole-0.6.1-r5.ebuild 2005 BLAKE2B acdef353bee069cf2d20cab1f419956bdd9eacf2547f7e78ac5360d476ca0caa7050077d9f145ddc90eb4c961a787398c113f63c42adb64c01119d84d6a4bdb5 SHA512 39d636daf4d6d7e8f9748cabca235775412cb5374f0976aa49ffb8352a6398373854c3069d8c5b128a0cebcadcf45960de3ddadf0f9885085353832c0176c519
-MISC metadata.xml 519 BLAKE2B 2c5fd18fa8f91cecdebd9e89292c1862e11e126cbf710db17af3358e92bd2a7abd30e5a7ff925b33c446d9d7c6937f2e3d19c171e8c35c2bbee243e2f9339947 SHA512 d149c76b00d1a0c2b3593f90b45b944de122498606d86cb90f992beb2a727bb3b32f610e823c0d0ad0377538616447698acc110c6f152860844a53610d531220
+MISC metadata.xml 344 BLAKE2B 5a339a4ff73fed112ccb83ade8e56658473c29b3a0e168af830ad8e230f6703c2970da919196a42e438ab619c6a65432b1404b5657153fdb32a4215906aee00b SHA512 0d2dfde092b1691cdf45572b7257183625dd2fb11b0990840235b365483d87780caa3be5df6807b5b64e9502dde452bf589a3551967e97eec32cc0de77577811
diff --git a/app-portage/porthole/metadata.xml b/app-portage/porthole/metadata.xml
index 860c6eb9ffd5..c49c4019f904 100644
--- a/app-portage/porthole/metadata.xml
+++ b/app-portage/porthole/metadata.xml
@@ -5,11 +5,6 @@
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-		<description>Upstream Maintainer (please CC on bugs)</description>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">porthole</remote-id>
 	</upstream>
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index fabad1be422b..6c6e4ba25657 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -2,7 +2,7 @@ DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06
 DIST repoman-2.3.16.tar.bz2 86739 BLAKE2B dc3e3b5e72df751cfacc17e6f5c847160438a4d6f5d86b4dd17ab8a3a69cd0502f2965934c456ea7538f228c40364535e861c489ab2a09a0df14183b111e9a38 SHA512 d0e8bee1e3bd6dd8aecb1278fc7877768552612c4638488b61a9b8856ad9cd7333c7d52f0c334925d90170a1d8af20e9ead6533edbc10cae02baec629dece121
 DIST repoman-2.3.17.tar.bz2 86732 BLAKE2B 95324a3513513349f3127b5c758766d3a05f9aa47ed9cbf1808a49b402b90004c469c2d621e5402358c307f53bfa04ac2873d0b3c5d6bc8548a092f9cde408b2 SHA512 a3c798482d5f91b61c979636876e8f127c5c84627b433c20343f359bc89b65b48f17fbe0d34fb0a8b9cbd3aabbacef71302ad87abc88763f51829e74a9d9f8fd
 EBUILD repoman-2.3.11.ebuild 1943 BLAKE2B b241eb055f279b28a6629a58b90b9d8f16f2df9dbfce8a816e7640a328aa5e71dbc3dd867d3bda6292315d728e533e76ad5fbef4585ed1d8c161c5c8f171f6da SHA512 c83557586c069c566aeb68d995685cd28e72f15eb274f11ed9439e85aff514666f4d4cc3df59388eba97ccc0b0ab313ae089c4935a07cae03561ae6f4bc32f4a
-EBUILD repoman-2.3.16.ebuild 1953 BLAKE2B 1f3fd07870dcd8a8db95fec7e0e70ab7cafced3d3b6a557022c43097fd031b65d671dde404fa028c531fe29400eebd3f1d88e853b150283d5ef70c3c6e730a34 SHA512 2759956136bfe9275c2e62eda1f0ba1bce6fa4f8b6f4415de9e62d750cbec73e2a22585c1aab3f9e513d969f1a58aa6cb4b002c14a44a8da6bcc61767db51d96
+EBUILD repoman-2.3.16.ebuild 1950 BLAKE2B 13389c07fd49613296fdd5ce0d0223bf02a2044fb7a60ef37fc73afee0d5b2d39ba87fcdaf36d8cf6a38ad4f49dcadd9c6b8503c6e1aa381ca77863e8bc8f45d SHA512 e84c7582221cb20a3314bef5bbae3e8c2aaa934aa43260204af8e13a61656937def624ff983aa002970e11af6cb985371561dcd07875fe8ebff78becc9a365fd
 EBUILD repoman-2.3.17.ebuild 1963 BLAKE2B 4dc7b5a7e24ae8e9267d424271c4f8a185727ab7dab85667a4339082ce9314520544f096cd8f3c0f90b6d2d1b24bd3607be1191414b36df4184e97c58fb47d98 SHA512 926ca8fbf0a9ee482205c891b913ffae61e4a41455eee82aea0da10e93c9a6dbb9100cbacc0a2f3075e5819db78885b7df19edf95d7e208a092d021950ee670b
 EBUILD repoman-9999.ebuild 1984 BLAKE2B 731d6bd31c3f65e5402c3ca736afda5e7c566a25d59e869fde16a39cad2541a9261820d72c67150e8789464c8043f24d8329d40c3e8121ce61bc1bc6daa3795c SHA512 e411f9c7ba86104fb32f0013c12956362fe3de11fe5d3238999c4b5c3c625bdd6c7fe6fb136de24993e2525655b9c22c0a06d285323a8babccfb6fc0572a4924
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.16.ebuild b/app-portage/repoman/repoman-2.3.16.ebuild
index c3d858593bdb..0566684b73c0 100644
--- a/app-portage/repoman/repoman-2.3.16.ebuild
+++ b/app-portage/repoman/repoman-2.3.16.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	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"
+	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"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index f3d9df1c66d5..7a2ce162a0c7 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,6 +1,4 @@
-DIST unsymlink-lib-16.tar.gz 10139 BLAKE2B 8e43fe85747d97fa44ae30cf6f276e8e5557141004c0c6ec5f1b998c0f5c121e9fb6bb3f7d711d11ca962c703caa7dc6014ddfde2c6ccf16807264a132e37940 SHA512 0c5ebab3622aad1f8a02c2530bfb3f6d48c0ac9744fdde94e8a9b151c5773d10ae642c122642d5f7e2bd442d5969863d8f5f0586c8ed484fa22ac42143a06417
 DIST unsymlink-lib-17.tar.gz 10550 BLAKE2B 036cf63e3619113763f01086fbd952fb2a6efda4d4f4989a5d8cadc0d47b439cba0fab84d53336d615ccbec4e0815519cd4709162f11bbf5fa42c770b928f6f2 SHA512 b981419e320da74f983c184f2b9739b0f1cdae7adf1b9d29c3221b7d010432f6844ff3bdf93793b2f701e2337acebc28a6bd2df0763a081cd8e53a8400aaea42
-EBUILD unsymlink-lib-16.ebuild 629 BLAKE2B 32273fe1ebf5cdd62d540031fac1b309316082c950b120ab9e42817b6cdeea0db482f9261cc604cc1abdcd6b557c1eb1ae1a7b82d1fbd5168f1e9106c066b587 SHA512 f6ef422a235e4fab924f53b5d6ad88666c13cc5532422c65eaddfee1859611fcee3fb0244656ae82bd080720b25d8e2bd69ed9e853841ba227283cc25c8fdb8b
 EBUILD unsymlink-lib-17.ebuild 629 BLAKE2B 32273fe1ebf5cdd62d540031fac1b309316082c950b120ab9e42817b6cdeea0db482f9261cc604cc1abdcd6b557c1eb1ae1a7b82d1fbd5168f1e9106c066b587 SHA512 f6ef422a235e4fab924f53b5d6ad88666c13cc5532422c65eaddfee1859611fcee3fb0244656ae82bd080720b25d8e2bd69ed9e853841ba227283cc25c8fdb8b
 EBUILD unsymlink-lib-9999.ebuild 568 BLAKE2B c9759f261cf2c0e79b5250f7a9cc80a4f64d489152833cfc163e475071278d83e5c22946433da0a1659c247fbbe33a6904d91d1ab05bdffac75b7e499d537342 SHA512 4e97c29a2633b030c81151cad3348dd7fe3eec2d7908c21153b3fdde4fe0566f3be9c6036730769520525e851bcbd4597ddde767c0300b9397f29657e9e819a0
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-16.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-16.ebuild
deleted file mode 100644
index 562293f6186a..000000000000
--- a/app-portage/unsymlink-lib/unsymlink-lib-16.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit python-single-r1
-
-DESCRIPTION="Convert your system to SYMLINK_LIB=no"
-HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
-SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	sys-apps/portage[${PYTHON_USEDEP}]"
-
-src_test() {
-	# tests are docker-based
-	:
-}
-
-src_install() {
-	python_doscript unsymlink-lib
-	dodoc README
-}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index de64ef0d34be..a1a7d880e031 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 4415da5c3f2f..f0c795dd3c40 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,12 +1,8 @@
 AUX bash-completion-2.1-escape-characters-r1.patch 1084 BLAKE2B 62a9ccb7b1cc4162db2f8e35fb20d3a24f9e4c067e5297816d91a85ffcdd3ff43695f3c361959cba59b887afd0d12e75fa317899054d3a615ee3da615a4409ec SHA512 b7cb548024fbc68e87d781208a378299c399d2661121290c500d62cd66855acc02848710b44c363917c3c4923e063212a2b56c9b0c08deb71aba308d75939cab
-DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aaa9d9b1d86dceade388a726ac7f3caff2546597695c3f0cbd5dd64e20472d0cf3e98e0f367898b81d696d4ccb8f2fb73 SHA512 514709ad2e5f6bd4e20027c7049a1144c1854a37b653d5c11fad1cdf7a46d0e1afca725d6ce75d49691149e0de57be85747f704ac1c429ef4cea114bfbff8fcd
-DIST bash-completion-2.8.tar.xz 286128 BLAKE2B a99faeb3c9ee2ea6d1cc9988e61951f4e688ac0b3c6837d1fd43381519fedf5f95167e8dbc166543b0235f3ac61d92af35eb8399efc0cd297a62849071dee5c7 SHA512 d839ef5a98811a2aade7ebdc0bc84c84a41c74db384f89913b06f3c25add1ba22528ac25392b19d27280685d258c74dcdc11247cbaae5b8d82f2c0b546abc268
 DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
 DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
-EBUILD bash-completion-2.7-r3.ebuild 4109 BLAKE2B b19159a733eb34738622add375c11d71dad1b5bee4c16b3d7bf2b2d588757e0b412807601a3e9ab9a2bb9e1a796354d59f3fbe796f91577d7eb5368c499896f5 SHA512 2e91fc722b51b39cef6ba2892645cac41321d840e14d3774732084f6a091859d5ff01282e10a7ce1cc5ed89ed8e1473fe7afee551f0df4c1104b4d44dd7c770a
-EBUILD bash-completion-2.8.ebuild 4057 BLAKE2B 09f82c80d498f02154d144730a7b8d2d4ddf254fe2e52d972bd1107d0ae3bdb583d161e04a3bd3c3a45d41b87c1bfbf187697d2789926e0af410dbb09cfefc9d SHA512 081ead91d74f818f4c3fdfeb3643fe55f744afa26730284b79242379d7358c957549efda8091cf108aaa5f8195d2fb3610474072a141eda1573d68121a7d7b23
-EBUILD bash-completion-2.9-r1.ebuild 4816 BLAKE2B fb10aa20dcace7020a209d479aa2346bdbddb28eb73f3d7a7aeda1cbd02820b8e2ddbc63ecc46f7ea255aa1a442a4341ab4416a1b566fe99657827f3f1adeaa0 SHA512 62f99d0f540441b5e14c26de777e0c41b40c1bb8eb03faf194d93ffcd3923b0adf573512a2056544e44a798f9645b7cf30c6dc870ce6a8774aaea66e710fdf6d
+EBUILD bash-completion-2.9-r1.ebuild 4809 BLAKE2B ab3b06022c1bebd54a5758c72fddbcb480806fdd51cef1a662dc82a9d350aedf667b82ea5e77a7f589ad64aed44dc55aacb2f7d495c4768136437388d2fe499d SHA512 9e30b42e39c6b4b96a46c61e49fbf5560cb79fdb4107496a49fdfc6932c5823b4e8c02bf5a140d8f350fc6efd409ef0b239882f0904ff674dfecd7ad36e472b7
 EBUILD bash-completion-2.9.ebuild 4694 BLAKE2B 5bff08075de6af572d855425a249eff6a858593128f59864601f77aa2526a6a59b7dd73a27eb7d7926104d1e8e269222931c59bb0bd11504ed3814efaffed28b SHA512 5559c40fbd2881cd9de31134721d2e7c7bea57c241820673e0cd8b9b495375e4c2f9b38cc4a1c7cc18e95bd36082e608fac41498201d9ad495fd258d497b2df2
 EBUILD bash-completion-9999.ebuild 4580 BLAKE2B d974f17d8526f30e9907d2f09ed6024f688e8829499a0069d042404752712e7e70b24182fb71a61acd9820c916b6af9c2bc785629959ca66e0491b8add77c9ce SHA512 1dadaf29fc2ca6c5f42a7eb954b060ad400ab4eac953a581d09d8412fd863343391e2c6f8ca31bad25595aecc2ba515c67ff04417b4c3e490d2a127cb77fb3f0
 MISC metadata.xml 1498 BLAKE2B ebfc4f05a48320d502076d9756cce9f0daf1a0c601ec491cdfb89538627f62c0613dd9e4db53c4791e094d6652e3c9a508003de3fa4f62a84396844c324325ef SHA512 6a83c672f45e7171d5b9959ac59c4e28bacb8ffdefa965288776603673396225b3bb01c149432edb3f901f04eaa39064bc8d813a35ce1e573231fd4b4570c62d
diff --git a/app-shells/bash-completion/bash-completion-2.7-r3.ebuild b/app-shells/bash-completion/bash-completion-2.7-r3.ebuild
deleted file mode 100644
index 58a5adc85144..000000000000
--- a/app-shells/bash-completion/bash-completion-2.7-r3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASHCOMP_P=bashcomp-2.0.2
-inherit versionator
-
-DESCRIPTION="Programmable Completion for bash"
-HOMEPAGE="https://github.com/scop/bash-completion"
-SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
-	https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
-IUSE="test"
-# Multiple test failures, need to investigate the exact problem
-RESTRICT="test"
-
-# completion collision with net-fs/mc
-RDEPEND=">=app-shells/bash-4.3_p30-r1
-	sys-apps/miscfiles
-	!app-eselect/eselect-bashcomp
-	!!net-fs/mc"
-DEPEND="app-arch/xz-utils
-	test? (
-		${RDEPEND}
-		app-misc/dtach
-		dev-util/dejagnu
-		dev-tcltk/tcllib
-	)"
-PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
-
-# Remove unwanted completions.
-STRIP_COMPLETIONS=(
-	# Slackware package stuff, quite generic names cause collisions
-	# (e.g. with sys-apps/pacman)
-	explodepkg installpkg makepkg pkgtool removepkg upgradepkg
-
-	# Debian/Red Hat network stuff
-	ifdown ifup ifstatus
-
-	# Installed in app-editors/vim-core
-	xxd
-
-	# Now-dead symlinks to deprecated completions
-	hd ncal
-
-	# Installed by sys-apps/util-linux-2.28
-	mount umount mount.linux umount.linux
-
-	# Installed by sys-apps/util-linux-2.31
-	rfkill
-)
-
-src_prepare() {
-	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
-	# Bug 543100, update bug 601194
-	eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
-	eapply_user
-
-	# Remove implicit completions for vim.
-	# https://bugs.gentoo.org/649986
-	sed -i -e 's/vi vim gvim rvim view rview rgvim rgview gview//' \
-		bash_completion || die
-	rm test/completion/vi.exp || die
-}
-
-src_test() {
-	# Tests need an interactive shell, #477066
-	# idea stolen from:
-	# http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec
-
-	# real-time output of the log ;-)
-	touch "${T}/dtach-test.log" || die
-	tail -f "${T}/dtach-test.log" &
-	local tail_pid=${!}
-
-	nonfatal dtach -N "${T}/dtach.sock" \
-		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
-
-	kill "${tail_pid}"
-	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
-	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
-}
-
-src_install() {
-	# work-around race conditions, bug #526996
-	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
-
-	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
-
-	local file
-	for file in "${STRIP_COMPLETIONS[@]}"; do
-		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
-	done
-	# remove deprecated completions (moved to other packages)
-	rm "${ED}"/usr/share/bash-completion/completions/_* || die
-
-	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
-
-	# install the eselect module
-	insinto /usr/share/eselect/modules
-	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
-	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.1-r90 ${v}; then
-			ewarn "For bash-completion autoloader to work, all completions need to"
-			ewarn "be installed in /usr/share/bash-completion/completions. You may"
-			ewarn "need to rebuild packages that installed completions in the old"
-			ewarn "location. You can do this using:"
-			ewarn
-			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
-			ewarn
-			ewarn "After the rebuild, you should remove the old setup symlinks:"
-			ewarn
-			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
-		fi
-	done
-
-	if has_version 'app-shells/zsh'; then
-		elog
-		elog "If you are interested in using the provided bash completion functions with"
-		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
-		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
-		elog
-	fi
-}
diff --git a/app-shells/bash-completion/bash-completion-2.8.ebuild b/app-shells/bash-completion/bash-completion-2.8.ebuild
deleted file mode 100644
index 06b8bbba722d..000000000000
--- a/app-shells/bash-completion/bash-completion-2.8.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASHCOMP_P=bashcomp-2.0.2
-inherit eapi7-ver
-
-DESCRIPTION="Programmable Completion for bash"
-HOMEPAGE="https://github.com/scop/bash-completion"
-SRC_URI="
-	https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
-	https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
-IUSE="test"
-# Multiple test failures, need to investigate the exact problem
-RESTRICT="test"
-
-# completion collision with net-fs/mc
-RDEPEND="
-	>=app-shells/bash-4.3_p30-r1
-	sys-apps/miscfiles
-	!app-eselect/eselect-bashcomp
-	!!net-fs/mc"
-
-DEPEND="
-	app-arch/xz-utils
-	test? (
-		${RDEPEND}
-		app-misc/dtach
-		dev-util/dejagnu
-		dev-tcltk/tcllib
-	)"
-
-PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
-
-# Remove unwanted completions.
-STRIP_COMPLETIONS=(
-	# Slackware package stuff, quite generic names cause collisions
-	# (e.g. with sys-apps/pacman)
-	explodepkg installpkg makepkg pkgtool removepkg upgradepkg
-
-	# Debian/Red Hat network stuff
-	ifdown ifup ifstatus
-
-	# Installed in app-editors/vim-core
-	xxd
-
-	# Now-dead symlinks to deprecated completions
-	hd ncal
-
-	# Installed by sys-apps/util-linux-2.28
-	mount umount mount.linux umount.linux
-)
-
-src_prepare() {
-	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
-	# Bug 543100, update bug 601194
-	eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
-	eapply_user
-
-	# Remove implicit completions for vim.
-	# https://bugs.gentoo.org/649986
-	sed -i -e 's/vi vim gvim rvim view rview rgvim rgview gview//' \
-		bash_completion || die
-	rm test/completion/vi.exp || die
-}
-
-src_test() {
-	# Tests need an interactive shell, #477066
-	# idea stolen from:
-	# http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec
-
-	# real-time output of the log ;-)
-	touch "${T}/dtach-test.log" || die
-	tail -f "${T}/dtach-test.log" &
-	local tail_pid=${!}
-
-	nonfatal dtach -N "${T}/dtach.sock" \
-		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
-
-	kill "${tail_pid}"
-	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
-	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
-}
-
-src_install() {
-	# work-around race conditions, bug #526996
-	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
-
-	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
-
-	local file
-	for file in "${STRIP_COMPLETIONS[@]}"; do
-		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
-	done
-	# remove deprecated completions (moved to other packages)
-	rm "${ED}"/usr/share/bash-completion/completions/_* || die
-
-	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
-
-	# install the eselect module
-	insinto /usr/share/eselect/modules
-	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
-	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 2.1-r90; then
-			ewarn "For bash-completion autoloader to work, all completions need to"
-			ewarn "be installed in /usr/share/bash-completion/completions. You may"
-			ewarn "need to rebuild packages that installed completions in the old"
-			ewarn "location. You can do this using:"
-			ewarn
-			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
-			ewarn
-			ewarn "After the rebuild, you should remove the old setup symlinks:"
-			ewarn
-			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
-		fi
-	done
-
-	if has_version 'app-shells/zsh'; then
-		elog
-		elog "If you are interested in using the provided bash completion functions with"
-		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
-		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
-		elog
-	fi
-}
diff --git a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
index 91aa3bb0061a..1c4d9fb20c3a 100644
--- a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE="+eselect test"
 RESTRICT="test"
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index c9fef5ceb5ce..824081c24761 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index df82a9b6629a..9415ec6c4f4e 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -4,9 +4,7 @@ AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbd
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
 DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1
-DIST aspell-0.60.7-rc2.tar.gz 2064871 BLAKE2B 74760cc10804d964bd7d7ee0097198ab26026e0bca2987223b7b58e67491e2d0914c7e24d63cb5540764017dc15358c023e1a3cf6240d5feec8d1dd25ddf6450 SHA512 f9f81efaaeaac4d2bc5b3018fe2cef9ed2406f2c648298465d983a012cf8ba3e25a46593c9833ac5d8b4c8cfca2ac3b76b476a4893ba880e4753770d134bead3
 DIST aspell-0.60.7.tar.gz 2071890 BLAKE2B d0c8780179cca304361b9d58be667f3dd99d9319cbcffd92a0cc69c65c3a40410b10f6953471ddd9d6df355b557761ffff71ccb5bc6995a57de69a9adb07db66 SHA512 6f5fcd1c29164ee18f205594b66f382b51d19b17686293a931ca92c1442d3f7228627ca7d604d860551d0d367ac34dfb2ae34170a844f51e84e390fb1edc4535
 EBUILD aspell-0.60.7.ebuild 2782 BLAKE2B 0be6cd8d70288dd38578afc22aacd6bfc433d5d2e13f6d8f1de94229c528aa08acef3acc53c61ea5a42b3b36cf265f837192a787d3d1d3436ead0d8c8acbe974 SHA512 d77f9b0a7f8479121c68c1ea6d0b9971125245aa06a96ffd70489ceed9de548f857d7ba47aff14275d1750d662af179ee9881314a65f5d598b61917da9fb8c5a
 EBUILD aspell-0.60.7_rc1.ebuild 2715 BLAKE2B 06d035fba952118b6248e50644780a4645eb8706b65c64e55247272a9dfc8005589fe6dea4c42e3b52145f3ffa055a4d18032645b257e2cdcb9a23554b10962c SHA512 23ba2fb29445c969461a4cf00a1e4e21dc2d26cc4351f6a6f6f3784dd4f652bfcd91ecb1159fedec6dedd5ffd18b35e1c225cd7da92c6786bd3ad9fba38cda32
-EBUILD aspell-0.60.7_rc2.ebuild 2782 BLAKE2B 0be6cd8d70288dd38578afc22aacd6bfc433d5d2e13f6d8f1de94229c528aa08acef3acc53c61ea5a42b3b36cf265f837192a787d3d1d3436ead0d8c8acbe974 SHA512 d77f9b0a7f8479121c68c1ea6d0b9971125245aa06a96ffd70489ceed9de548f857d7ba47aff14275d1750d662af179ee9881314a65f5d598b61917da9fb8c5a
 MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
diff --git a/app-text/aspell/aspell-0.60.7_rc2.ebuild b/app-text/aspell/aspell-0.60.7_rc2.ebuild
deleted file mode 100644
index 676475350502..000000000000
--- a/app-text/aspell/aspell-0.60.7_rc2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic libtool toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-if [[ "${PV}" = *_rc* ]] ; then
-	SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls unicode"
-
-PDEPEND="app-dicts/aspell-en"
-LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
-hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de-alt"  ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
-done
-unset dict lang LANGS
-
-# English dictionary 0.5 is incompatible with aspell-0.6
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	nls? ( virtual/libintl )
-	!=app-dicts/aspell-en-0.5*
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS=( manual/aspell{,-dev}.html )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.5-nls.patch"
-	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
-	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
-	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
-	# includes fix for bug #467602
-	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
-)
-
-src_prepare() {
-	default
-
-	rm m4/lt* m4/libtool.m4 || die
-	eautoreconf
-	elibtoolize --reverse-deps
-
-	# Parallel install of libtool libraries doesn't always work.
-	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
-	# This has to be after automake has run so that we don't clobber
-	# the default target that automake creates for us.
-	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
-
-	# unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set
-	# any more.  Fix this.
-	[[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && \
-		append-cppflags -DNCURSES_WIDECHAR=1
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_enable unicode)
-		--disable-static
-		--sysconfdir="${EPREFIX}"/etc/aspell
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc "${S}"/examples/*.c
-
-	# install ispell/aspell compatibility scripts
-	newbin scripts/ispell ispell-aspell
-	newbin scripts/spell spell-aspell
-
-	# we explicitly pass '--disable-static' to econf,
-	# hence we can delete .la files unconditionally
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 09616e986535..ca3a74ddceab 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
-DIST blogc-0.17.0.tar.xz 338212 BLAKE2B 19c5119b5d877a70ccfd6b4c8fca0c31141efd4c47c1d457d53d3bfefc1573553c69288e628dbcfffb23420461b8f0f08955b40f949d5b7390c5160faae94db1 SHA512 10522ecb218a7f09fd57e4d67e1c6ac2a17dfaf04f322c56ef77c939fcff22f6ae619e6a7e659ef14d069955d87b790701758e48ebc373d2175883b8908ef857
-EBUILD blogc-0.17.0.ebuild 1117 BLAKE2B 3a7d101207b6828738eb3c7e9896af1c8820bc3db4352b45dacd01d19ba8d0bd6d6b316617e92e5e6cdf1b35577406877c978796cbd60f344bafd250be0b19ea SHA512 4e439eb3dfaac7ce6eb5bc8c6d832f829e4049b95ce9fd35f442876f91e27732a24ee5b53be5ef8a993bfe38272e205739810ad0df2e444eb8121a48fb66d689
+DIST blogc-0.18.0.tar.xz 339920 BLAKE2B 03dce446c60c5337e85dedda8516a8417b770f294e019794ba6e3216b93f79896c851d690a37c3e24f218c8f9080f8271256647909b7dfaceaafb8a7d62d52d8 SHA512 db015d00b96af19b9f8cdb3023d073bdce45d41f731beafc0eba7219abb6bf31e435a08644145e56e2d783939542245dfcb6c20bbd27f27348de84ba4ca9e41a
+EBUILD blogc-0.18.0.ebuild 1117 BLAKE2B 3a7d101207b6828738eb3c7e9896af1c8820bc3db4352b45dacd01d19ba8d0bd6d6b316617e92e5e6cdf1b35577406877c978796cbd60f344bafd250be0b19ea SHA512 4e439eb3dfaac7ce6eb5bc8c6d832f829e4049b95ce9fd35f442876f91e27732a24ee5b53be5ef8a993bfe38272e205739810ad0df2e444eb8121a48fb66d689
 EBUILD blogc-9999.ebuild 1120 BLAKE2B 234392dc7c1e42c3bcd2c3ac4b1a648ee9e4fa6fc486cfcc60ef0af1c0cfb97ea68bc2b2ce3da820bdd88f05ef5993b7dc6589e52137d8d1e7cbce19d9c0a064 SHA512 ed4c808f2cfa1435972a53ae17f76a9e3423943713759cb7ad7378e6417a3912dbb16e0964d963dac8a476be37c90a42d8f875128101ee806f12a8ab11a519d9
 MISC metadata.xml 785 BLAKE2B 90817e117dbf1f0e60d655206ad0cc3f3cecf2b97a16ba43fdf84ae0f621ee6296af2ab6a17bb205d82b1d107be3f62b75d9c740aeab0267b02947a4bcc50aea SHA512 31230bdb8113bb73662328e0e657e710cd33e65f126d638f0cefdacbe97525643604f48ce3da27f80b8163d129092c7df7eee265cd6d6194cd0181b138230206
diff --git a/app-text/blogc/blogc-0.17.0.ebuild b/app-text/blogc/blogc-0.18.0.ebuild
index d5c7c49e8ea5..d5c7c49e8ea5 100644
--- a/app-text/blogc/blogc-0.17.0.ebuild
+++ b/app-text/blogc/blogc-0.18.0.ebuild
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index b7c7080727d7..fe5fd525d41c 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,13 +3,9 @@ AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc910314205944
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
-DIST calibre-3.44.0.tar.xz 38643008 BLAKE2B 7eb1412aa5de6ba2f48ea13e922dffff7ace0f4f475832ebe122db967c71df05b6bbb45092bdd53ddfe35d7a0c2af566ed83dde9aac64200d41ea2adc4cb1886 SHA512 a97f45f5f788357f62b4088c4d8190cd3e3b790685871d5a024342d5d21ca978d46fa4e47f85eef4b9fbc0774923732938a812dd188cd4a315445cf25b187d28
-DIST calibre-3.46.0.tar.xz 38750284 BLAKE2B 5590ba422d0323ea7c0cea67d88d448f00f5a470e7a8fdf9851b488c0856c88175bd107715a856706e95b2e1a45604713d061f4a7a3603ecaa01dfc018c1ed58 SHA512 d8eb014ba4d943e1c2ed05104d9b0c13f45a8b0085fa240248210cd43ab3739036936324183ae8a63dc636f7f8603484e3ddf50a260308ce1127745a8d3c6763
-DIST calibre-3.47.0.tar.xz 38720656 BLAKE2B 4626eac9f0940c1cd6ebab69c16b69eba3c01f62594bc7c60fb9bd097e513f0767a8b5706d07429f7529ed29ed5a7c47621ec6e62a9db82dc99accaaed028524 SHA512 b34d69f31e37ff528b22b6fab43836d53cabfaa4d4c03af42a8c2b73301bd737927f03eb256da765262f73dbb0631484ed164d46230f730e4b742b837c2dfce6
 DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 60915345dd756d085386af61128e92569304be64aadbc21b69973e93adf3fb5cc88f7250153c238ecf423546f408bfc094b5bce329a54e7f080f831c4a8c23c1 SHA512 010796b3ac3fc6adcdf26dbc7966946be0f48b2684e1317da11d77fa55151d1f6ad2b86adf3c8eced5559823567e6672bfdfd953c17e6cc978894544131fb6bd
+DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
 EBUILD calibre-3.26.1-r1.ebuild 9203 BLAKE2B 9e3bc1630f915a8548e1480f0b00d6acb4001dee3be5a5119dd9b2eb8b984c4eecaa0a0742e550a36eca359e8806d2444d21f8bf344321c11ffeca59e7e10877 SHA512 98407a3605b58125ca783dadbe7dfed5f3bb526f816d79a167fb0358202cc56870601d16b7eae46d2464a0f64761168d9f0a00d69a5a184e17d705eb540afb97
-EBUILD calibre-3.44.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
-EBUILD calibre-3.46.0-r1.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
-EBUILD calibre-3.47.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
 EBUILD calibre-3.47.1.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
+EBUILD calibre-3.48.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.46.0-r1.ebuild b/app-text/calibre/calibre-3.46.0-r1.ebuild
deleted file mode 100644
index 9b8c29fcc23b..000000000000
--- a/app-text/calibre/calibre-3.46.0-r1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C #684484
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-3.47.0.ebuild b/app-text/calibre/calibre-3.47.0.ebuild
deleted file mode 100644
index 9b8c29fcc23b..000000000000
--- a/app-text/calibre/calibre-3.47.0.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C #684484
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-3.44.0.ebuild b/app-text/calibre/calibre-3.48.0.ebuild
index 9b8c29fcc23b..9b8c29fcc23b 100644
--- a/app-text/calibre/calibre-3.44.0.ebuild
+++ b/app-text/calibre/calibre-3.48.0.ebuild
diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
index defaec75ae75..ec746abfef6b 100644
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@@ -1,3 +1,3 @@
 DIST diff-pdf-0.3.tar.gz 132862 BLAKE2B bb3fa163337482785778fa7cbeab3e9f883d8537e4a905592eb20f4bb876597f500beaa2d9f13706887e1d340dd378c68c231b91a4dd478fb206b32f2cbd768c SHA512 b85585162b498c5abf14020ad04616ebdb5efce25b20604dab81c6068a036a818d7e10ddbbdb69d278d4b5a46ab9b9aa782a52e37f278f3e9db7b4d2259aaa08
-EBUILD diff-pdf-0.3.ebuild 1284 BLAKE2B 3fac12175666e53660c24b8273ba498103cbbfca53b81b3fd5cfb83586a49d98d06ff015e5c497594f45dc9befe788784315850591a52b9ef479bbf8c5a4d6e0 SHA512 e2e620af68029e94af9905cc3545a0c864f24744a8fa31a6ffba938a87d91f078ec744dd3a8dd6620a9ae270beb19c89bea96c622345e9090f3d27d2a4599814
+EBUILD diff-pdf-0.3.ebuild 1283 BLAKE2B 66f12a1fe1ca1c927b153ddae62d646106aab6fe54cfbbb5fda35bda57da46b1b63b4a5b9fd751943f031cee79018a97f8ac04f445b0945492de03c3bd84a2bf SHA512 b32216c901892d7b3c754cf9fb033969d909e7c55f7b1af4bad1f76bcd021986cb3823c68b878c0c31d149b44a1e40408772a03eb6a681dee2205e454b4b9d8d
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-text/diff-pdf/diff-pdf-0.3.ebuild b/app-text/diff-pdf/diff-pdf-0.3.ebuild
index 1f289d32bcb5..5127655c04ef 100644
--- a/app-text/diff-pdf/diff-pdf-0.3.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
 # version 2.16.5 of GTK+, which is licensed LGPL-2+.
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 # The build system checks for "poppler-glib", which is provided only
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index ca966e4da5d3..0d4f1bd8fdbc 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,3 +1,4 @@
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
 EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1551 BLAKE2B d1f490d4cbee15aab1a5902bf143b791c7cff874a1b5726ade3bb84c3431491a15b84e165f547cf456c3fba1104009fd0c4f32dfcfe555d023d2241a8bb3bdee SHA512 222a78a676a75071ad75d58c7c78904ff8fe0345e6a2f0c0088482926b60089fba5ab4a5937fbf22d658b8bdcdc91a7a1b790e2a08dc0f33bad661495fe42837
-MISC metadata.xml 297 BLAKE2B 33f8b636a483011e6561d078c58c16a477925ea41543b150c11ea7ecb3465151a5404689d8cf263a6e9f6ede4d2d5a55fc8fd02fa89814c7b7b0e93e7c6077aa SHA512 e5cc7a9b4aea0e6cd29246bb44f1bd2713495d58b243bc78bceb760c827c415ec30459f5b9acf2ddab615e39d9ab5c4a9d4eb41e7bd53684032a08f7a4fbce3e
+EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2454 BLAKE2B b808b29e1b654329853dfbfdf293e5ae3fd4ec116a650ba98ce2399289d54d4ba6eec92a314a4e4359369b30f237111665c66f85ccc3ab40e589f4c4e6b82822 SHA512 c773f6f1ed2f86a85f519111f6cb192238a1ea228381f3dd31c9ec7b05d351e394d0785c21550b62afd821b588606ca896f03de157248014654c61669a60c751
+MISC metadata.xml 377 BLAKE2B 035eb23363be52cbeb11b0ca2fbcedbb608dad9d4b26dbd2155a538db51cafe7296614f5005c0460ec4ce02a35378d98f2c7834fe2f098d7b05ef835bdbf520b SHA512 c965e64e4582a7452d8cf7eb46b794788cc8ccd9d93a48ab14e7ef606979cee706f682545bfebc2c5e380e9e18db0b671ce0f9ad935a0812472fc1586c989c28
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
new file mode 100644
index 000000000000..8603dfc7f360
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit sgml-catalog-r1
+
+MY_P=${P/-stylesheets/}
+DESCRIPTION="DSSSL Stylesheets for DocBook"
+HOMEPAGE="https://github.com/docbook/wiki/wiki"
+SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+RDEPEND="
+	app-text/docbook-sgml-dtd:3.0
+"
+
+DOCS=( BUGS ChangeLog README RELEASE-NOTES.txt WhatsNew )
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	local d catdir=/usr/share/sgml/docbook/dsssl-stylesheets-${PV}
+
+	dobin bin/collateindex.pl
+
+	insinto "${catdir}"
+	doins catalog VERSION
+
+	insinto "${catdir}"/common
+	doins common/*.{dsl,ent}
+
+	insinto "${catdir}"/images
+	doins images/*.gif
+
+	for d in html lib olink print; do
+		insinto "${catdir}/${d}"
+		doins "${d}"/*.dsl
+	done
+
+	for d in dbdsssl html imagelib olink; do
+		insinto "${catdir}/dtds/${d}"
+		doins "dtds/${d}"/*.dtd
+	done
+
+	insinto "${catdir}/dtds/html"
+	doins dtds/html/*.{dcl,gml}
+
+	insinto /etc/sgml
+	newins - dsssl-docbook-stylesheets.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/dsssl-stylesheets-${PV}/catalog"
+	EOF
+
+	dodoc "${DOCS[@]}"
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/dsssl-docbook-stylesheets.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/dsssl-docbook-stylesheets.cat ]]; then
+		cp "${T}"/dsssl-docbook-stylesheets.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	# this one's shared with openjade, so we need to do it in postinst
+	if ! grep -q -s dsssl-docbook-stylesheets.cat \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat; then
+		ebegin "Adding dsssl-docbook-stylesheets.cat to /etc/sgml/sgml-docbook.cat"
+		cat >> "${EROOT}"/etc/sgml/sgml-docbook.cat <<-EOF
+			CATALOG "${EPREFIX}/etc/sgml/dsssl-docbook-stylesheets.cat"
+		EOF
+		eend
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		ebegin "Removing dsssl-docbook-stylesheets.cat from /etc/sgml/sgml-docbook.cat"
+		sed -i -e '/dsssl-docbook-stylesheets/d' \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat
+		eend
+		if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
+			rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
+		fi
+	fi
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-dsssl-stylesheets/metadata.xml b/app-text/docbook-dsssl-stylesheets/metadata.xml
index df1f6e962108..9842e9a0785d 100644
--- a/app-text/docbook-dsssl-stylesheets/metadata.xml
+++ b/app-text/docbook-dsssl-stylesheets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">docbook/dsssl</remote-id>
 		<remote-id type="sourceforge">docbook</remote-id>
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index b7251ec56671..6989b4a4e690 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -1,11 +1,11 @@
-AUX docbook-sgml-dtd-3.0-catalog.diff 2144 BLAKE2B 8d68e85da15d660058135348b901a30aee7b32dc832493ba5a12e5ce0d6a59ef30fe1186ef8f6658eef1532607e88e32d56f12720ccc09a2621996cc422a0fa1 SHA512 e0ae3b49da83fcbd95fd12ae268d414d12e72c16f5d4342f3d2268f378b9c57ccd1c4daf1ed739a3ffc4b36c2b2842bd2f18ff2d1081c65ccca2aae694613654
-AUX docbook-sgml-dtd-3.1-catalog.diff 2125 BLAKE2B c6eb346817455012b289e8b511ecd0eb1fb3394438d7a10760ebb5d73779b992344dd4cbfd9202354827ac7a4259e1ec638c396075f8bb30ce2a77f44a341888 SHA512 cf4162f0b318bfb0e2a95384eb7520a1cc07971637a07f97841515c7ab3c6eba3ab4e45a39c406f24a10a79069b506e5066c436c59e569347a798827db3b8ff4
-AUX docbook-sgml-dtd-4.0-catalog.diff 2096 BLAKE2B c94662c30aea2a20aace83712e47ad4f831fcdfeb5e7e15cad463c7850a00ab97a457e67763f0aafb68c3a81c30e4dba46964fdfa979ce99eca0b00cf7ddf5aa SHA512 933f0f6ed79f749b82bc265fee41b01e0c1272f5b45bc298b77636cc9e527e722061300dc9acb5e39ed9af92177c0df03746f761702dd42091c423d5147cf3ba
-AUX docbook-sgml-dtd-4.1-catalog.diff 2096 BLAKE2B 7f0a1fd57f1a6c846665d5648c6e884c9755f9cf9f8ec38441d323b11bcf6b32688051d5eb5c0f9ae57b5f27d888fc4033965f1b3fbbc6a4ee87005b7c19500a SHA512 fcbf05b86f4d2290160929049f3599b34a7c88f3fe92f36b539d8cce0ce9d3dea74acfff164a8176f5e28b50416abfc9057623013edd59e18ec6fa8e254fba6a
-AUX docbook-sgml-dtd-4.2-catalog.diff 2528 BLAKE2B edee561d2ee6cf8ddc0c7101b32462daf2ec4250708ba4c585c325515daf9d230eca1cb64a6acd9ebe8ab099f683a12577d38cb78aa3e037134cc7457928b026 SHA512 23a61f2cee28e997e16a33177212578dc6a99c84868fae338f3fb5d2ac7a01322d22824785009711fe70462169118c88d57a928849da8c94af847d423b6449d0
-AUX docbook-sgml-dtd-4.3-catalog.diff 2471 BLAKE2B 378ced1d5aa8a3124e1a790953bb81bc4b1085508f47514e0d6adeccd4348d29a110d74c6b02b7fedaaaf7a3ff4496605c0af7d4a961e3877601b3b79dbe11fb SHA512 8143551df2b88963e1acb29ca281ea30629e6fbc41d1966c9d967dd00e1411bb55b0847069c25403f15fd814bddbb7552589e9682ba30c74656c291dc4906f49
-AUX docbook-sgml-dtd-4.4-catalog.diff 2471 BLAKE2B 94ad3fe3d68c7c7670c76fe7ed1eb067f674eef81666acc91c768d0d9a1ccf26edcfe5aac6417a9562df6cf6ad87efa3cb852d06d65c224c2fdee3725ba2c8c8 SHA512 86f1db81e539e4e76d2f3f799b1c5e3297ede2fc2f448f6a2b69d1fbae3d2d4a2a444f66186b5b9525c171e32082f9e213ea31715456cc17d998e15c68fe14da
-AUX docbook-sgml-dtd-4.5-catalog.diff 2583 BLAKE2B b08550bdc040423adcfe5f7e3f34d5c66c9d8ca863a5d6cadc9fd7379e6b83e71994ffa850571162c3f87d525fb18c7f3cbcd014672e148f5e16f95a616a2c61 SHA512 a2c35b12043db3b0676d29b9525e669a13c7e892a7f4a2a47392fbe16febb7727508d75a45deaacca0af386930236c4889e86e4a17c727c98a9c600b28fd392f
+AUX docbook-sgml-dtd-3.0-catalog.diff 2152 BLAKE2B 7f8e80f81aaa7800d5e1b578be6251fda06731078e98d81af9ae27d82f9e96b99baf27fb50dad8e56b63956dfe8ece8840f6fca4c25786978fa3550f058f4e49 SHA512 3e1a374118b514a98f9797ece5c9c43a89b3dc4bfe6515250689add9f55b50ec181433cd3d3885750eee2668f053c64515c803ae4274db65e5781c43564b7e77
+AUX docbook-sgml-dtd-3.1-catalog.diff 2133 BLAKE2B 5fecc78f39f7f47f67b21f5d1bf5fcb419086a72031d7ff904eb1e923a7ae04a1f557b7d438309a04eff47d28cdb405df988439c023e15cf57d3237e8a10832e SHA512 69da9f12eef8d4948e317abe03dabe8aba097caa66f1a46416bb99f065953f61f548b4f14f43b581522a930333803c477d1ef4bd2c4b6206e368437ad8b90d95
+AUX docbook-sgml-dtd-4.0-catalog.diff 2104 BLAKE2B 3cc8a2f3de4363416b1a4ed174a778aa71bbe1592077a2d678e75a731010d8c6aa8a8bd880a54970a0425c9fac5fb6ca81e8525b3c4b7d7c87fdc169ef3ae4c5 SHA512 6b24f09ee22db380c62833236ce1832d938377b5e806fe1006c290e5948bebe8ed37e93c6c9806964b32843dbe197b3511428ae39c1979c7737cfe639ec7125b
+AUX docbook-sgml-dtd-4.1-catalog.diff 2104 BLAKE2B f2c5ed707e4eb51b40f2468051f39bafe31e396e40edb1b0bbaba732252a6e007937e581e149d4411f8f1511f9d167b97cd5589471233f0b47000cf9baf73479 SHA512 83e4f2ffff68083b31c947facc46a83de373464852b0b6af28e67df4129fe5c5f4929e7a5d8d8f258ce1d673c3e61bcd16251601d85f09b573e32e164448e870
+AUX docbook-sgml-dtd-4.2-catalog.diff 2517 BLAKE2B 71cf7aa745e56190526b8973f1b5b9895974ec0a8a3598b66e9549e822a3e031fc1e3098136e813be82a32d0c97f740745036bde70f6cef65cf30a803a97bd92 SHA512 c2e70f701b3d8d4afcab963dccc61949c5b33b12f787d528e1b45d2d9b413b9ce5b137fb8cfc078680a9df1c5c9f10de9d0dfb3aae87053da66c8d80398986be
+AUX docbook-sgml-dtd-4.3-catalog.diff 2468 BLAKE2B 1f56f4869f35633ec19a978050455dd6d3d6624dddb254edab8396db985aeebc23b03591cb6940cf635b0a79e0da14a1a7316812beb8e84cc2f19418dc4116a3 SHA512 8378a6aa3636499e3f66b88d6f0caa449203fb47ccb10441420a6366d7dc6167d720e0876ab2539059c90d50b0cfcbeb3149ea81b87435f7f75751f5acadf538
+AUX docbook-sgml-dtd-4.4-catalog.diff 2468 BLAKE2B 1cca3e22c8d2879639d7464c46c355ca59e84e2d7dcddfc57b6b834c3b1b274b2761a3e7b84fe37923dad7244971d8d9e3c9f0eb6f5c0ccb846c756dffd58c38 SHA512 3f044b85621f4c03c956a33ca771f8cc6851a47e2aadb2b7b09c7c554a287de019f63e94a44cff5c03a87f493f6e59121e04cfc15d6bbff08d25a27fa847e5a4
+AUX docbook-sgml-dtd-4.5-catalog.diff 2547 BLAKE2B b947f076b008da5ddbf649cd8666c1084996d2734352019ca0bbc40c6ba53b3a3094829b37567cdebe700786c4d782b82f5e51c81e537a79d98318331a366502 SHA512 470aa232c6d1061e0eae2ccd837fe1fa5017157341a2c45ab8dada0b507f24f377e42dc9df1946a3e9ce34aca96a0743960473853fe46627a998379204fe6db7
 DIST docbk30.zip 43441 BLAKE2B e6711bc48f22fd9426f6c05b42270f03c2f5a2f0457df81bf7f4c930a432f55c288a07b834aeeaa21f91e0c258130f8f36fbbac55ce7af402c124793bd17acc8 SHA512 4e186c7b38bf70a3225bd9fca4edf99d3e7f316308b561aad9a0548f8e0ba941b54f20f6e653819de8a26db5eb54fc7442c3e2d740c2ba60311b3038a4bb9198
 DIST docbk31.zip 55952 BLAKE2B 6856fc7c15f3ae2b97251757df485deea8ffcd9f496284575ce290d4c336e1c45d7c5568acd1c93dcb6b0fcb91ca8011fc2bc90d2e78be76b75b3fc0c97cd875 SHA512 397c9df011007b71ddc9c052d28db7ab38ac2c05e7f575aaad41a6b4995b910cd147f9a822d162271bc073cbfca0788d7f323be381c900c3a32c352e658d37fe
 DIST docbk40.zip 55742 BLAKE2B e504c61b7c1402b5afa9036b9aec8fac89a39a0d2a24ec08044a84928c101a5abef17882e73704fd59fcdc7df0667e3ec1d9b97978a26b29489e2c027c61d1d4 SHA512 ae1078190bd34c2b7f0eab667a2502822eb80e17243c447849736ea8d7eeb65c71b571cc39106763c6c9f75c83f3b684a40a18e1dd6da5d235c63a107c931276
@@ -15,11 +15,19 @@ DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
 EBUILD docbook-sgml-dtd-3.0-r3.ebuild 1000 BLAKE2B ab544f870b642843cac5852c3bd1a13144bac23f757b35d4eeb9294fa20bf33b457dd262a2c9a99493f916ca52c9003fd1997fd612b94a6f0fa53046c6f5031d SHA512 4800ab46cd04af41a618a979b8890e235c83aeb6079f6644539bcaf703c776774e69a231137fda037257882e2de2eb7ca673ffeb0083c4f8dc364f4dd98cf57b
+EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1232 BLAKE2B 100b3dfb97a48aaaed20a5a7f0358ec30563f193da7576f21c457f88ad4ff7828d8a7e9a218e3ab9cd8cb98f781c1ea4aaa5699c47e12acbf2080c13a359c459 SHA512 80f2a1eabb0a800531bba61404e335be72e42d9ca4c394b84789d19196e511f68b833e201c413044584f43936a4699f5b3ce4ac51eb56abba4a73a03c6b7983e
 EBUILD docbook-sgml-dtd-3.1-r3.ebuild 1000 BLAKE2B d8130fc975e1acf1d569960b3b74b6dcc3c4fb68624d9ea56834bd9f3c94ca3876ca8359ee090fca5049f4eb502a22c3632746a6441e35b1946944b416563cbf SHA512 6af8de74f63b01e446fd43a1be7c37494a773a6b4a62a23b020732071c06870e0631206964f911d6a15a4031a9158848b57362eae1a1d44937a6c11e70c02b28
+EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1232 BLAKE2B 100b3dfb97a48aaaed20a5a7f0358ec30563f193da7576f21c457f88ad4ff7828d8a7e9a218e3ab9cd8cb98f781c1ea4aaa5699c47e12acbf2080c13a359c459 SHA512 80f2a1eabb0a800531bba61404e335be72e42d9ca4c394b84789d19196e511f68b833e201c413044584f43936a4699f5b3ce4ac51eb56abba4a73a03c6b7983e
 EBUILD docbook-sgml-dtd-4.0-r3.ebuild 1000 BLAKE2B bae479fa462beef6bc0ad59b46ee470ed71677356ff1e25f87777daa5d4fd1c2e98dde26b65e32ad5333d0be81c281f16cf94e335759ddf137ff36476f3d7f23 SHA512 f4b8f6b23055c21d3f36f059666413c8d488f314756b23fd411e0d5471409c458d7bc1012aac29b02b3c82eadee8f9c2c12c758a1c498e40cb09ff0fe519e5f2
+EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1232 BLAKE2B 100b3dfb97a48aaaed20a5a7f0358ec30563f193da7576f21c457f88ad4ff7828d8a7e9a218e3ab9cd8cb98f781c1ea4aaa5699c47e12acbf2080c13a359c459 SHA512 80f2a1eabb0a800531bba61404e335be72e42d9ca4c394b84789d19196e511f68b833e201c413044584f43936a4699f5b3ce4ac51eb56abba4a73a03c6b7983e
 EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1000 BLAKE2B dbb46cff1a33f8f0770588c18cf087fa75074a3ed26e7e56a2f569635cbda0b37ce2be28fbcfb4e989030b153862d05470d8c0b408e56389d0cc7c92b0bcff31 SHA512 4aafa37378a6315835af91a37aac7842b1d04745ef8f4f6c8543e21d1c4aae51593b391b71a624a5014deadac058eb619e1eca6c5f9179ae0fafe249b6402c8a
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1232 BLAKE2B 100b3dfb97a48aaaed20a5a7f0358ec30563f193da7576f21c457f88ad4ff7828d8a7e9a218e3ab9cd8cb98f781c1ea4aaa5699c47e12acbf2080c13a359c459 SHA512 80f2a1eabb0a800531bba61404e335be72e42d9ca4c394b84789d19196e511f68b833e201c413044584f43936a4699f5b3ce4ac51eb56abba4a73a03c6b7983e
 EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1015 BLAKE2B 1dd036ea95d19b8bdbc825c4bf60b30dbd26ddcb97c4cecd020ccbdbb57294d5841882ef39dca414bab1e33533d390dd8ba0aee4f663c0bf35e0c5e7b9048c32 SHA512 8ddd813944172d0f8a858029292d7b22318e6795b1338f07057472e7042912c0c642d18876caabdf0d83aceb60c1852256bd36249741616510fbbb9abe69eaec
+EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1243 BLAKE2B 8073ee23378197bbda7469828fb67eadbce9c0daf295da8a16f413d5f06923c96568f12f2b5e3e8b737ad95c9b795cce30ff7ae19188f33694a57e35e9422dec SHA512 ca4494a09284bace59bbb0aed2b551ace8e818bdab081f872443ef57da704b7d8a3fcab42b312918a8b80c2b7b55f33ea66504ebad5ea40d1b838a42bf0ac016
 EBUILD docbook-sgml-dtd-4.3-r2.ebuild 996 BLAKE2B 0368e87e3debadf66d48791a0e5044dbf6b047aa7461ac2ef190e7df56e619ecaddf16942d34570fff853b358ad030d67ba195793e79c061016e2834bab2185c SHA512 a1b777d1620c54fc30fa1d8ba1bfbded15eeebdc6a5289b8c15b7bf91577e4809db10bedc5929d1ea134a94d398929d9241b989e146012ad12b8564d84b10217
+EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1228 BLAKE2B 138a635b5cdccd1d7867994755b5ac095c6e5ddab8281ba7eadb82df6c345eb593e7717a4d0c6be65bc7d959d5bf99880099884333cd5f0b4f6dc36692607da9 SHA512 8a6d7ea4d78b65d21c73dcf72ab773d16251fd60e41295af1b5f018241ba63ebb5215607c51803152aa3d941f805b307cdb30e8abd07d6f7062e57313596dbc5
+EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1228 BLAKE2B 3ba0c8ad0c452fa03d84d9dee9058a70437987902c5177f39bdfb7e6fce4d9b2e8bd644a8613611953b014cb383316a61be99e02c7af4b27bf4b944d614e4022 SHA512 a900c02795aa9b36a7cb3bf8f5a08cede197e354c974c94fc6e6e7d09939f9cc3269b0d9f120500a02d85d6e17a1d485f2ec87e55e33adfae9c71a1e305e6533
 EBUILD docbook-sgml-dtd-4.4.ebuild 1006 BLAKE2B 895942f94fb5e43c0cec90080720378b675751ea55657c759a372642f960c9e58d8427d4d8270aa8624b25847cd7556320bf0f754b81b6e3501d6ee6746607b9 SHA512 bb0b2a4b95c8b9ef77bdafb2e9129415de1be53fcbff278811049964eb9e5ab6674fd7083edd1dd502ffac560b27ee4a4d0238cfac8901c04e3f0b34a5c8894f
+EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1224 BLAKE2B eb7b397c296a5f43be9c44bd29995421bcb0fa951968d989d03659830e3b8755aeba89bf2158b41073dec03cb6fcfc3ffa91d8d02c8c2b3cd340486ae3938c04 SHA512 e994152a8a89df35fae119816cf2d0db57456ac6966c7b2b37f32a7982483af6af841d4294c773a7222b3a0bcf3440ff8da888f9c94e67fa0d12b5413751f26a
 EBUILD docbook-sgml-dtd-4.5.ebuild 999 BLAKE2B 47395c84eb27c599d8dc014d052b96e113c6040a83b5c2f1ba0e5d73f37d848b53b3ac6969af8d0e9e12b063918b203fd60f65f6367332e7e48628aac5a86a99 SHA512 a36d36f45f89866f6f66e5a3b97467459b7e22bcc322c63aaf738e1b95f6b6259d1078f7945ae76e5f493f0721e5b7f2981ab54ca63cc902e42b8ab84d29a7e6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
new file mode 100644
index 000000000000..d72a82568092
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbk${PV/./}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc *.txt
+}
+
+pkg_preinst() {
+	# work-around -r3 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
new file mode 100644
index 000000000000..d72a82568092
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbk${PV/./}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc *.txt
+}
+
+pkg_preinst() {
+	# work-around -r3 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
new file mode 100644
index 000000000000..d72a82568092
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbk${PV/./}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc *.txt
+}
+
+pkg_preinst() {
+	# work-around -r3 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
new file mode 100644
index 000000000000..d72a82568092
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbk${PV/./}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc *.txt
+}
+
+pkg_preinst() {
+	# work-around -r3 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
new file mode 100644
index 000000000000..868d3429aece
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc ChangeLog README
+}
+
+pkg_preinst() {
+	# work-around -r2 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
new file mode 100644
index 000000000000..65e94280b8f3
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc ChangeLog README
+}
+
+pkg_preinst() {
+	# work-around -r2 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
new file mode 100644
index 000000000000..8e65feba19dc
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc ChangeLog README
+}
+
+pkg_preinst() {
+	# work-around -r0 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
new file mode 100644
index 000000000000..f72a63fe7579
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD ${PV}"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}"/${P}-catalog.diff )
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod *.xml
+	newins docbook.cat catalog
+	insinto /etc/sgml
+	newins - sgml-docbook-${PV}.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+	EOF
+	dodoc README
+}
+
+pkg_preinst() {
+	# work-around -r0 postrm removing it
+	cp "${ED}"/etc/sgml/sgml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-docbook-${PV}.cat ]]; then
+		cp "${T}"/sgml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
index 224f98ca59c9..b08003c09ca6 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat	Tue Dec 10 16:35:22 1996
-+++ catalog	Mon Jun  5 11:08:34 2000
+--- a/docbook.cat	Tue Dec 10 16:35:22 1996
++++ b/docbook.cat	Mon Jun  5 11:08:34 2000
 @@ -41,29 +41,6 @@
  PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"
  PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
index 51afa752ad2c..df1507975ac9 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat	Tue Feb  2 06:53:32 1999
-+++ catalog	Thu May 25 11:45:01 2000
+--- a/docbook.cat	Tue Feb  2 06:53:32 1999
++++ b/docbook.cat	Thu May 25 11:45:01 2000
 @@ -35,29 +35,6 @@
  PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"
  PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
index dd83fdf12b52..82944d0b871a 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat	Mon May 22 22:38:05 2000
-+++ catalog	Mon May 22 22:12:36 2000
+--- a/docbook.cat	Mon May 22 22:38:05 2000
++++ b/docbook.cat	Mon May 22 22:12:36 2000
 @@ -35,29 +35,6 @@
  PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod"
  PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
index 656ee333f45f..a68644aa1735 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat	Mon May 22 22:38:05 2000
-+++ catalog	Mon May 22 22:12:36 2000
+--- a/docbook.cat	Mon May 22 22:38:05 2000
++++ b/docbook.cat	Mon May 22 22:12:36 2000
 @@ -35,29 +35,6 @@
  PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
  PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
index d9b232fd8115..d328fdbb3228 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
@@ -1,6 +1,6 @@
 diff -uNr 4.2/docbook.cat 4.2-gentoo/docbook.cat
---- 4.2/docbook.cat	2002-07-18 00:14:28.000000000 +0800
-+++ 4.2-gentoo/docbook.cat	2003-01-18 22:25:05.000000000 +0800
+--- a/docbook.cat	2002-07-18 00:14:28.000000000 +0800
++++ b/docbook.cat	2003-01-18 22:25:05.000000000 +0800
 @@ -19,6 +19,8 @@
    -- ...................................................................... --
    -- DocBook driver file .................................................. --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
index ce532355e4a7..207460ba6f96 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat	2004-03-31 20:44:16.000000000 +0900
-+++ docbook.cat-gentoo	2004-10-17 20:37:51.000000000 +0900
+--- a/docbook.cat	2004-03-31 20:44:16.000000000 +0900
++++ b/docbook.cat	2004-10-17 20:37:51.000000000 +0900
 @@ -19,6 +19,8 @@
    -- ...................................................................... --
    -- DocBook driver file .................................................. --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff
index 5c16801a0902..c473d70db4f4 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff
@@ -1,5 +1,5 @@
---- docbook.cat	2005-01-27 08:59:49.000000000 -0500
-+++ docbook.cat-gentoo	2005-07-11 21:12:28.000000000 -0500
+--- a/docbook.cat	2005-01-27 08:59:49.000000000 -0500
++++ b/docbook.cat	2005-07-11 21:12:28.000000000 -0500
 @@ -19,6 +19,8 @@
    -- ...................................................................... --
    -- DocBook driver file .................................................. --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff
index b7405283f88a..cde8f541e988 100644
--- a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff
@@ -1,6 +1,6 @@
 diff -NurdB docbook-sgml-dtd/docbook.cat docbook-sgml-dtd_patch/docbook.cat
---- docbook-sgml-dtd/docbook.cat	2006-10-03 15:27:50.000000000 +0200
-+++ docbook-sgml-dtd_patch/docbook.cat	2007-08-14 00:43:31.485987458 +0200
+--- a/docbook.cat	2006-10-03 15:27:50.000000000 +0200
++++ b/docbook.cat	2007-08-14 00:43:31.485987458 +0200
 @@ -19,6 +19,8 @@
    -- ...................................................................... --
    -- DocBook driver file .................................................. --
diff --git a/app-text/docbook-sgml-dtd/metadata.xml b/app-text/docbook-sgml-dtd/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/docbook-sgml-dtd/metadata.xml
+++ b/app-text/docbook-sgml-dtd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 8b6ac28da3d5..51112c0c75a8 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -3,4 +3,5 @@ AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
 EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1909 BLAKE2B 75a5d7f4e6c773bd3c2cda8c6879f176df05d9818a3f0e3b3745a4531d42096148b705d80b0c375a67919c5cc0c72badf6f9fae901cc9d8d19a3a5d0a7f914a7 SHA512 3c7960d9d6a12ab50b0e735531b2ff4bdbc15a7a8548fb8b4c6a1e6a2f70a7533a4b65e6e83cb6a15196ef5490d6e763c562ecd7afd84ed599febf4025fdd6a7
-MISC metadata.xml 328 BLAKE2B 03a0d4494de5507fcbddbcaf14fd0da4002abe3ae6c00ec8afd922f0f8034eeb1c3918fa7662da1d3c2016b1ce22980dde08c59d74cbbf3489e6eba3ff434867 SHA512 258243842db06c12a0751afd612ada57c02433da50c419be86dea6ed655b11120e30b8299228bbb81b6efda1574915d69933c4cda8bc9b0ad79c506a6172bb06
+EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1865 BLAKE2B 4f137c567b36e19551ac741be3ca0a165fb07b70dcc633a674a617c539b6eb37a57c81c752533ec93597099da802fa6032fabf9ffcf7bdfce330374852f1a9fd SHA512 7550d98f3e04b6c3690cfcf4fc42869dde344c5d153001bfd4ff2b465eeb2b9dde8ae9fa5c3394f4bdd16fbe1925ab26ba66f63ebf4152c525fe9306e0adf8b9
+MISC metadata.xml 409 BLAKE2B 326a67b502158f75dcbbd01ef2772bbab0099a4d4a1fc1e7463655abbcd807fbec8761edfd1d312b4d3c845d72506fbf53245779e657cc0baf7d2fa44b3e147b SHA512 abc9fadc1fe1a7a863308a566932f958df7b13800336db521acdb6cc93773fa6c8310a34d702bb996baff5718c2329ef790bedacc5f1d849810c174fd8b281ea
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
new file mode 100644
index 000000000000..16dc32cb7b0c
--- /dev/null
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools prefix
+
+MY_P=${PN/-sgml/}-${PV}
+DESCRIPTION="Shell scripts to manage DocBook documents"
+HOMEPAGE="https://sourceware.org/docbook-tools/"
+SRC_URI="https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="jadetex"
+
+DEPEND=">=dev-lang/perl-5
+	app-text/docbook-dsssl-stylesheets
+	app-text/openjade
+	dev-perl/SGMLSpm
+	~app-text/docbook-xml-simple-dtd-4.1.2.4
+	~app-text/docbook-xml-simple-dtd-1.0
+	app-text/docbook-xml-dtd
+	~app-text/docbook-sgml-dtd-3.0
+	~app-text/docbook-sgml-dtd-3.1
+	~app-text/docbook-sgml-dtd-4.0
+	~app-text/docbook-sgml-dtd-4.1
+	~app-text/docbook-sgml-dtd-4.2
+	~app-text/docbook-sgml-dtd-4.4
+	jadetex? ( app-text/jadetex )
+	userland_GNU? ( sys-apps/which )
+	|| (
+		www-client/lynx
+		www-client/links
+		www-client/elinks
+		virtual/w3m
+	)"
+RDEPEND="${DEPEND}"
+
+# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
+# transition to simple-dtd 1.0, <obz@gentoo.org>
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${MY_P}-elinks.patch
+	eapply "${FILESDIR}"/${P}-grep-2.7.patch
+	if use prefix; then
+		eapply "${FILESDIR}"/${MY_P}-prefix.patch
+		eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in
+		eautoreconf
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" \
+		htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install
+
+	if ! use jadetex; then
+		local i
+		for i in dvi pdf ps; do
+			rm "${ED}"/usr/bin/docbook2${i} || die
+			rm "${ED}"/usr/share/sgml/docbook/utils-${PV}/backends/${i} || die
+			rm "${ED}"/usr/share/man/man1/docbook2${i}.1 || die
+		done
+	fi
+	einstalldocs
+}
diff --git a/app-text/docbook-sgml-utils/metadata.xml b/app-text/docbook-sgml-utils/metadata.xml
index b44d8c52bbfb..c09afbf4330d 100644
--- a/app-text/docbook-sgml-utils/metadata.xml
+++ b/app-text/docbook-sgml-utils/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-    <flag name="jadetex">Add support for <pkg>app-text/jadetex</pkg>
-    (for processing tex files produced by the TeX backend of
-    Jade)</flag>
-  </use>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name="jadetex">
+			Add support for <pkg>app-text/jadetex</pkg> (for processing tex
+			files produced by the TeX backend of Jade)
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/docbook-sgml/Manifest b/app-text/docbook-sgml/Manifest
index 227d8adbf6a1..e4b7f0d74610 100644
--- a/app-text/docbook-sgml/Manifest
+++ b/app-text/docbook-sgml/Manifest
@@ -1,2 +1,2 @@
-EBUILD docbook-sgml-1.0-r1.ebuild 557 BLAKE2B 03a73fce2b117fcdc0edee1fa7444b05df6ed6dcbf97f8e3d7c18d3f211ea4795324358ecc7f94d6d5fdf402c698650c13014318cae84708643a5f300d9f82a4 SHA512 98b7ebeec8ab5a8ac8ff8a424c8e7184d54cb84df030b0be3c1539d5d18b363f34fd55c500f8dd3667da4a0c4f849e1718b0a238608d1f9c7cfe95275072d3a6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD docbook-sgml-1.0-r1.ebuild 566 BLAKE2B ef606f79e6fb3477a86853d06782a8280f6ef13cfdb85b3fcda4ceed25d4d447afc5a87c0ad090a48f91dfa6212e1be2bd512b1e87e53907a8b7311825dce557 SHA512 5434b64587487ba1066a4203c7e0865a23beaa425953f386538dff59aeef3926d36261faec63d41f971c7e349d8cc967d53a3c6efc45325427bd78214a80c6f8
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild b/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
index aadcacdb95fe..33fc3d59f4c1 100644
--- a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
+++ b/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
@@ -4,16 +4,18 @@
 EAPI=7
 
 DESCRIPTION="A helper package for sgml docbook"
+HOMEPAGE="https://www.docbook.org/sgml/"
 
-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-HOMEPAGE="https://www.docbook.org/sgml/"
 
-RDEPEND="app-text/sgml-common app-text/openjade
+RDEPEND="
 	>=app-text/docbook-dsssl-stylesheets-1.64
-	>=app-text/docbook-sgml-utils-0.6.6
 	~app-text/docbook-sgml-dtd-3.0
 	~app-text/docbook-sgml-dtd-3.1
 	~app-text/docbook-sgml-dtd-4.0
-	~app-text/docbook-sgml-dtd-4.1"
+	~app-text/docbook-sgml-dtd-4.1
+	>=app-text/docbook-sgml-utils-0.6.6
+	app-text/openjade
+	app-text/sgml-common"
diff --git a/app-text/docbook-sgml/metadata.xml b/app-text/docbook-sgml/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/docbook-sgml/metadata.xml
+++ b/app-text/docbook-sgml/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index 9625c564b8de..f90be347cca4 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -4,8 +4,13 @@ DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3
 DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
 DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
 EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1370 BLAKE2B 2e10950d21be0d91a19be85f59c83ffb8409ca15c69e84d8110e13af7c9857cce2a21fedd50ac4445ca5f9a70eb6a40bf0de38494ba33d27f2ad6efc9db554f5 SHA512 e3d82053cb65cc80fd05ce3a811211dc5c3522752da9a8884cc23bc245859f8401036d6c9bddd385c5eb433d9154913e18d430b87bed876d9375477b9a3f678a
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1615 BLAKE2B 2870ffb3edd954243fb2885775515eab545cc8e7f4c42f18ac8344fe1fc4c27b61f8eaecf86e12cdbcb0d1862f9fb0c515475c90faf48e3992629f97cea50366 SHA512 0d68f033c54fe73e720a632d3fd124033d41dc3b74a6e7a95093e2fde6d25d878dfc4819a2020020e7020ea4db27df8ddf97625d948066f7346ed1d069ffa2d0
 EBUILD docbook-xml-dtd-4.2-r2.ebuild 1332 BLAKE2B 95ba0206c2ed1233e5a8a0e964c8c16cd626aa50f2eb7b59335017cc54eeecf19cc613e4747f319a50a824fe92cd66a36c3ffda73d1566d852935b59351fbc8f SHA512 98842a6ca697911b794d296e1600b7d1b8c05ab1f2521161c52bfe02eec7fc831eb5b3d97f5ce8dc000d455098b93b8ae9258c33cec4cd51c7f3197879f57d23
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1609 BLAKE2B b307a081697d13b3527c035b78d75b4eb4a8ae6f68f99ff794b930836b958c860503aa67b33b1da13caf0dc9c29185481af4ca573236cba5687317485fc6e94a SHA512 ba63e4bd7c73980f3a6ef29874d7240dc653542d361c0853936f6c11e98508fd23fa80107e1f9012253ad9dc130f010304dc3d44d95b996a85749ce8e9779517
 EBUILD docbook-xml-dtd-4.3-r1.ebuild 1349 BLAKE2B 278696d5de52ec6085421c3f705b8282fbb4917ba9c54a4ecea9bd9d95bf4ca23b938cc4594b30aa9234d30e5d332eb09b955f97e38414269cef047a742bee2b SHA512 663725a89c4be4ea58e50082445923bfe277674d450a320444f916577065302abb373b5c51fbe080a4fcb063fb08407dc2a57ee8703e1fe92277159a5d5150b7
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1609 BLAKE2B b307a081697d13b3527c035b78d75b4eb4a8ae6f68f99ff794b930836b958c860503aa67b33b1da13caf0dc9c29185481af4ca573236cba5687317485fc6e94a SHA512 ba63e4bd7c73980f3a6ef29874d7240dc653542d361c0853936f6c11e98508fd23fa80107e1f9012253ad9dc130f010304dc3d44d95b996a85749ce8e9779517
 EBUILD docbook-xml-dtd-4.4-r2.ebuild 1531 BLAKE2B 273c0acb1c86c9c757d514e6823d0130b566a54569b18d4320acc8ca1d02a1d4a3555c6b2f6df3966bfa9e458e040398ebc09b6f9be667321895a3ed4beec7e5 SHA512 de6f19e5f6e49f2498dcf0202760a7f5209e55f88bb39c55efdf572d7eaa859bdc5993ed6de4c8aadcc42008d23bbeed58841c73b5cd2bbf06bb06a082db1062
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1642 BLAKE2B cc09d208af49e55fb9aadff814b029a7b631a71b1fbc0b3fb26da3bc473a83625f7ee64ed0ad3b3d85b7341330b04c989c440ba087335ee63574fbf545eee7c9 SHA512 f8059823de61be1c224fa8c7295e6010870b6e37c8acb33ccff8dbb37d9f1e758d26760f17e20b0631024e39dd7bf47c562798864843f091b30754930c8ca1ca
 EBUILD docbook-xml-dtd-4.5-r1.ebuild 1583 BLAKE2B 831aaba6b2b304312726fb03ec666489ca4f1cc7abd01e66dd654dfef1fadeabf36ea3f9e739c24b77e35f9443a234fb83f4e7f0b2a08bf0bb9381591d1dd56f SHA512 6f0a101f815f12a8a48231f5b685e46ef24c2bd93a78907b44ff187abe9a680375d324d0d82cb69d67426a2a7f9556495f8567a0f565fe56473c6d9a46e628ed
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1642 BLAKE2B cc09d208af49e55fb9aadff814b029a7b631a71b1fbc0b3fb26da3bc473a83625f7ee64ed0ad3b3d85b7341330b04c989c440ba087335ee63574fbf545eee7c9 SHA512 f8059823de61be1c224fa8c7295e6010870b6e37c8acb33ccff8dbb37d9f1e758d26760f17e20b0631024e39dd7bf47c562798864843f091b30754930c8ca1ca
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
new file mode 100644
index 000000000000..fdf2ac2ad673
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="docbkx${PV//./}"
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+	default
+}
+
+src_install() {
+	keepdir /etc/xml
+
+	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
+	doins *.cat *.dtd *.mod || die
+	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
+	doins ent/*.ent
+
+	insinto /etc/sgml
+	newins - "xml-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+	EOF
+
+	dodoc ChangeLog *.txt
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
new file mode 100644
index 000000000000..db788fca68f3
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+	default
+}
+
+src_install() {
+	keepdir /etc/xml
+
+	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
+	doins *.cat *.dtd *.mod || die
+	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
+	doins ent/*.ent
+
+	insinto /etc/sgml
+	newins - "xml-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+	EOF
+
+	dodoc ChangeLog README
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
new file mode 100644
index 000000000000..db788fca68f3
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+	default
+}
+
+src_install() {
+	keepdir /etc/xml
+
+	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
+	doins *.cat *.dtd *.mod || die
+	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
+	doins ent/*.ent
+
+	insinto /etc/sgml
+	newins - "xml-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+	EOF
+
+	dodoc ChangeLog README
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
new file mode 100644
index 000000000000..d0987c01141c
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+	default
+}
+
+src_install() {
+	keepdir /etc/xml
+
+	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
+	doins *.cat *.dtd *.mod *.xml || die
+	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
+	doins ent/*.ent
+
+	insinto /etc/sgml
+	newins - "xml-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+	EOF
+
+	cp ent/README README.ent
+	dodoc ChangeLog README*
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
new file mode 100644
index 000000000000..d0987c01141c
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="https://docbook.org/"
+SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat || die
+	default
+}
+
+src_install() {
+	keepdir /etc/xml
+
+	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
+	doins *.cat *.dtd *.mod *.xml || die
+	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
+	doins ent/*.ent
+
+	insinto /etc/sgml
+	newins - "xml-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-docbook.cat"
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+	EOF
+
+	cp ent/README README.ent
+	dodoc ChangeLog README*
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/metadata.xml b/app-text/docbook-xml-dtd/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/docbook-xml-dtd/metadata.xml
+++ b/app-text/docbook-xml-dtd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
index db3a2bd9837a..3a31d57e6b84 100644
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -5,6 +5,9 @@ DIST docbook-simple-1.0.zip 31173 BLAKE2B b19054783553be68eaa2a689cb673bb4a270f5
 DIST sdb4124.zip 35199 BLAKE2B bee2de887a662978b6f0bf8b9ae663d37c4da1859f07a09e869cff91943bd65946dfd493b9bbe9244ffb8794f3cc5c828c647ab00b183326b63e179540765664 SHA512 b5c158cfcaaa4150d5ee719d11f3fc2b5a207cace241a147b39ab4a9f721cae2a894a88cd3dd944ecd24feae850b387faa03c669747b02de839f5d6a3ff0821f
 DIST simple4125.zip 29839 BLAKE2B 83f2b65e5192334bf6a9b5b5388a77d8b566a924837d041329d16f0ab864d5e69b7ea0a60b70fec4affcf0161fb724c5ed99fe16dd230dc0984100e40642709c SHA512 21c8d411f5b37c82442283dadbde99352778efe90fcf7eab7cc6a74fe9b702f14ffa5bd39e058d8f29fada7dbcdb197d5c880c29b207e3509ba856c5d19cfef1
 EBUILD docbook-xml-simple-dtd-1.0-r2.ebuild 1013 BLAKE2B 9454e1ad486ffcf7190af51cd750eb3aaac42aa4a5f07f485887cbd650fda46543c53cd721f5985f1faef89049373c7059f8a3f1a51753b714b903b6f5da321c SHA512 ce84d4cf08eb0c64b174a33ecd7a0064c09e72c2dcb5b65a2e009f227b561f3fe4306bafe7e3695dcadb404315a0fa6892122eb35f337c72d521d5c70763cdb1
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1063 BLAKE2B 863f55c0428c2457ebf5e88435f86969fb20c1d4279f2e7d2fdd16227b42e93b3095f6d2d4574203b8d8b3f5bc38aa7043ae75b2eb46376f200992f77876e9db SHA512 023e19c364bc970672a790c96b9b6ada643af26c15659928560dc7964ff6adfc5da0cda464d1330b9d6dca0c060169ed8737953993ae4b1537d6f547014a6c4e
+EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1313 BLAKE2B 93097fab66aab39c48bd03a88a599e01a84aeeebec870b93c54d5f9cfb2af9b2203ff337e2d63717e29016335cf21a5cf8528312aeef68a58426433fcc4b644d SHA512 cd0f3838e79112a35bb40122fb3e0d351f47e433fdbde20df81def60f603f02ecf9cdffb41d97809e7946a23d36c28ebedb3d433134413ed394865a81eec7fbe
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1069 BLAKE2B 45c664a32fc1988d5ec95e608dfc9204f774e5208dd9ac4d93867e760b983db58f609c01ec7ee2c83cc625e4bbcdd06aa10d95b7021e18cb7e48816e73b44c99 SHA512 ee24ec7b14126ae353d0e1c11cb819f1f34e31a60603b407769149189ac38a998322960281f81d9549be00b60bb69e80a2571453251bb9ec225c648f6861de42
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1343 BLAKE2B 49aa0a94ac4a8458dc7607614a3e4828db08289401a5c2fe2e3d646b345ff086f8151adec378b66a1fc0ee25f020fbfe47eed5ddceb579515bf0a2b601bbfbee SHA512 c0bd4de6cc0286af03c0438bae24ac6d607a6bb711007e09fa87a0925745bc584d44cc7ce98a57b530b02fc7a61c983ad885a82bed89d87f45d8199de607de79
 EBUILD docbook-xml-simple-dtd-4.1.2.5-r2.ebuild 1005 BLAKE2B e0e590a732cff3961f31c47422fbb8474905270996b886395e21decd03bb792ccd1b74834598905b69ff70e36218291bb2de49ce222b8f9879b6b113af5adf5d SHA512 b48010392f3787199881e89e0db87289cf7764abd2cdab4025d9a011e96f14b58eb5c33646a48c4558d90dc94e5789624fde873e210834873dbe4b2c1e0fbdc6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1330 BLAKE2B cefa748827ac7484b92d430cf6f8b6d0f798caf8d4109e408ca7b95b22f3ce9379a9b402d0bbb43630c249453640cd98342f7734cf83fd2799477dd5df3dfdd8 SHA512 a74fc344fd2c0cdc7600c8484180ab472c878a1e807bbaf679abe9c2062b0189215e4fa6b264d0d79871cc9f691984661539f88a8adbe6847b2b43d262cfed84
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
new file mode 100644
index 000000000000..ca6929bbed33
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=docbook-simple-${PV}
+DESCRIPTION="Simplified Docbook DTD for XML"
+HOMEPAGE="https://www.oasis-open.org/docbook/"
+SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/build-docbook-catalog-1.6"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+	newins "${FILESDIR}"/${P}.cat catalog
+
+	insinto /etc/sgml
+	newins - "xml-simple-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-simple-dtd-${PV}/catalog"
+	EOF
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-simple-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
index d8f17a55a964..df073bcf5490 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.oasis-open.org/docbook/"
 SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
-SLOT="0"
+SLOT="4.1.2.4"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
new file mode 100644
index 000000000000..d4e1735315d0
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P="sdb${PV//.}"
+DESCRIPTION="Simplified Docbook DTD for XML"
+HOMEPAGE="https://www.oasis-open.org/docbook/"
+SRC_URI="mirror://gentoo/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/build-docbook-catalog-1.6"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+	newins "${FILESDIR}"/${P}.catalog catalog
+
+	insinto /usr/share/sgml/docbook/${P#docbook-}/ent
+	doins ent/*.ent
+
+	insinto /etc/sgml
+	newins - "xml-simple-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-simple-dtd-${PV}/catalog"
+	EOF
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-simple-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
new file mode 100644
index 000000000000..b818a587508e
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+MY_P=simple${PV//./}
+DESCRIPTION="Simplified Docbook DTD for XML"
+HOMEPAGE="http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/"
+SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/build-docbook-catalog-1.6"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+	newins "${FILESDIR}"/${P}.catalog catalog
+
+	insinto /etc/sgml
+	newins - "xml-simple-docbook-${PV}.cat" <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/docbook/xml-simple-dtd-${PV}/catalog"
+	EOF
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xml-simple-docbook-${PV}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xml-simple-docbook-${PV}.cat ]]; then
+		cp "${T}"/xml-simple-docbook-${PV}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/metadata.xml b/app-text/docbook-xml-simple-dtd/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/docbook-xml-simple-dtd/metadata.xml
+++ b/app-text/docbook-xml-simple-dtd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 6eb79eea0942..ee9481afd722 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,4 @@
 DIST ghostscript-9.26.tar.xz 33059724 BLAKE2B 7ccb9730db8ae056e67bf8d7fa097a4cb529605e12214ab81253d2d354d26c24e393c8bec2ecdb51a1fefe8443b8af47758705c2fb6b1dab59932140c5de07ca SHA512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e
 DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
 EBUILD ghostscript-gpl-9.26.ebuild 5150 BLAKE2B 24cd87418056e9ebc8505d87ad0046d158126f3c0eb66a1895ac89ad88075fdf8820d2f9f09d6ae06f2635610131f74647c250bac9dd0de608888ea761d96376 SHA512 6bc420cff6e84d3db7fd7fc860d34c00ae1366586f458fc636539595b8d18961ce79cfce0e66198faa44590b4ca770b0ad05ea10fde497279b4ad9bd78b53c92
-MISC metadata.xml 516 BLAKE2B 6afad0e1422537a40a445465a9ae3b974d40e45b177cced532a8b1cee0163cc8af68e1d0f8c79212876e8439a0c3826892d6d639fdcfdf4fcf7d4e22116e837b SHA512 2f20a51f4716d8581748520da0c353f3b9846182ab77ac459abe178f6fd68942c9fc15614ac5a01ae183ff94f3db318037038f48fae54620d6aa7a25de9834d6
+MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
index 9f69512715cb..61a1c44676ca 100644
--- a/app-text/ghostscript-gpl/metadata.xml
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Printing Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:artifex:gpl_ghostscript</remote-id>
 		<remote-id type="sourceforge">djvu</remote-id>
 		<remote-id type="github">ArtifexSoftware/ghostpdl-downloads</remote-id>
 	</upstream>
diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
index ab5253bddb28..ba15a9745202 100644
--- a/app-text/html401/Manifest
+++ b/app-text/html401/Manifest
@@ -1,4 +1,5 @@
-AUX html401-decl.diff 469 BLAKE2B 7b7e98352b9650b06fa7c9e792e1538873827ffd8d7c043d45a3035c1c1099be9c2aed632717f959a92b2b5f0dc646104c81f13fe612cbcabb3531afcf3d4b9a SHA512 066d1c3672e2b8fd86a696c511c4eab92c8772f147503a986f6c89d1c33720325d15c22157c81d7f121ee441328b89f73a194d5e7e40af4408b0f9b8e0cc65d2
+AUX html401-decl.diff 468 BLAKE2B 4854afffaf01650a2c7997976a17d0e72e0fe71271047c362fa2956fa533035b5f2df4363c46c86fe39f3373357716d5913f5727644ecb91cbf65411bc697f42 SHA512 3f79a67c39f8c7a07b1bf0ec451620dd2ba1a8ee935751714262488bb50a5191c4f92362cd26f0438e0251d138d923ff2ebf6e216fbbbf8312c4010b7e3ce7e0
 DIST html40.tgz 369830 BLAKE2B c6fc0f65a9c65df34f534ce1db3cc53ba6ded4481df78f168c1b05b7e3b81fad7ddf3ee519ff1a901f0256af89285eefb39400ebc5b4089c1a16dfe935c6cf21 SHA512 f7423b55f8a5ad2806555700f450e1f46ba4370d1e47f1332e18b01ecd5a41217fc4426ad29c852b6e17100dc4c0a7add9961df35e87660df0e087ad03e4918e
 EBUILD html401-19991224-r3.ebuild 767 BLAKE2B fb6c509178154e010191683b1b3a26449b3136e6e662b9033134314b7587ba69c2583046366e1d7b0cead226dd2e6e3f24e1ba97eb4270a15080d4fa3086164f SHA512 f1669367c90b57b5d53e296736e511fc84561532d61f58caf6b7d76064ec178dcda9b0b02f6f27467c2e0f50059e0cfa37ba78edd6fd0841dbd4eb5d4d296e4b
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD html401-19991224-r4.ebuild 972 BLAKE2B 92c5a0227d0a61c64859976635630607721c4afdb1f5afb29e5286d3c0dfcfdf0a430bedbb3cac0af58a09457bf867b65d215c5fbed2c38f5a02d69a27374515 SHA512 9f40fde225a46bc749347c21994c6c0f53b7fe4f1f4b01d0dc29bbccb42d27f74d7fdf935b76821202d1b41d924e0cc9de403e5289d65df9c17803a5fe3331e3
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/html401/files/html401-decl.diff b/app-text/html401/files/html401-decl.diff
index 27819a8afd17..e5c5bd4b22d9 100644
--- a/app-text/html401/files/html401-decl.diff
+++ b/app-text/html401/files/html401-decl.diff
@@ -1,5 +1,5 @@
---- HTML4.cat.orig	2004-11-06 20:25:39.000000000 +0900
-+++ HTML4.cat	2004-11-06 21:16:08.543377286 +0900
+--- a/HTML4.cat	2004-11-06 20:25:39.000000000 +0900
++++ b/HTML4.cat	2004-11-06 21:16:08.543377286 +0900
 @@ -1,5 +1,9 @@
  OVERRIDE YES
  
diff --git a/app-text/html401/html401-19991224-r4.ebuild b/app-text/html401/html401-19991224-r4.ebuild
new file mode 100644
index 000000000000..8f75a577ac4d
--- /dev/null
+++ b/app-text/html401/html401-19991224-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+DESCRIPTION="DTDs for the HyperText Markup Language 4.01"
+HOMEPAGE="http://www.w3.org/TR/html401/"
+SRC_URI="http://www.w3.org/TR/html401/html40.tgz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+S=${WORKDIR}
+PATCHES=( "${FILESDIR}"/${PN}-decl.diff )
+
+src_install() {
+	insinto /usr/share/sgml/${PN}
+	doins HTML4.cat HTML4.decl *.dtd *.ent
+
+	insinto /etc/sgml
+	newins - html401.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/html401/HTML4.cat"
+	EOF
+
+	docinto html
+	local dirs=( */ )
+	dodoc -r *.html "${dirs[@]%/}"
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/html401.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/html401.cat ]]; then
+		cp "${T}"/html401.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/html401/metadata.xml b/app-text/html401/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/html401/metadata.xml
+++ b/app-text/html401/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 0b2f4463931c..fa5a2ae5b3d0 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -4,4 +4,4 @@ AUX htmltidy-5.10.26-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f5967
 DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
 DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
 EBUILD htmltidy-20090325-r2.ebuild 2003 BLAKE2B 43116843d4c9eaacdb91822247b6a96868654c87ee92f180fb7112e87644ab66a09d4e105c1e4f983e700708b46aafe3bec67168698e890a42a90042ca68ed80 SHA512 c16aa9a70389e21ba8260fc2118bc36889350d95fc53ea7350279f8fb70252182156cb21efdcd8c2b31181ef18e0e53a499859064cc73149cb6d60ed328ef09a
-MISC metadata.xml 241 BLAKE2B bd724ebe3c99c206e2e78f9bdab811083ca54eafaf1e283f4913af473e6e9710f380021fcb71cc863bfc3cc0984475adff5d5f5e938b55c533ebc7460c597ee1 SHA512 3f74e1d47cf7af59d7255fbb4e6f04fc372447cc101a524779ac59bdc4acba08d53756350575e377f2ccf0ebf309f499ec81fda9d7cd93d234e53dd06cf504ba
+MISC metadata.xml 299 BLAKE2B 45af58b9f27f8329d072008a1089edae34741b855b1626cc56eb97efef684b316ce5573308ef1e73d4aa7e1cde74b0c10d5d7becee71707f5b3439f451a433ea SHA512 cd21089fbc56a2608734a5821826da373a5112e1676bf3c3481320236f5583ff1240e118e0021130625826c76cb426ca681e0dec3c6e4d2df22f8967da15321d
diff --git a/app-text/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml
index 3fbef354e7d1..295e70001214 100644
--- a/app-text/htmltidy/metadata.xml
+++ b/app-text/htmltidy/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<remote-id type="cpe">cpe:/a:html-tidy:tidy</remote-id>
 		<remote-id type="sourceforge">tidy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index c7bd5c2bc615..e75bb93be3d3 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -1,3 +1,5 @@
 DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
+DIST libabw-0.1.3.tar.xz 318808 BLAKE2B 234ff797bf3798bc7f14f2b3f0d0cc2d80eda2a6ba2d656288c26e58d53b9798003d7f45ad7c9a0f504da36c8c8ba367f8fe5b565a85fbc6a1f1627d89e7e353 SHA512 0d2646e1bad1e11b3da43714ac5931fc67ffdbc4e7a25a44ef5b6e6a41de1e0ae14596b4a87cceb07bf56dbbe9344622b3d60afcb054ee0ab8577ca8e9b5c289
 EBUILD libabw-0.1.2.ebuild 854 BLAKE2B 605b465b931a138beac45a6084d9cc2b0000e57f7cee102681cd56fe3f56c963309d0556ad5bf1f146b5de33246a5337ad024ef3f028b3530281f4a99aed6b5c SHA512 448e45210f18856a9713b959256dc4b861ae7004efa546a0295ea261fbc13a1aea5244e1ddeb93ec075dd6579c301b1a60526b84c0272221e1226b6af292ac33
+EBUILD libabw-0.1.3.ebuild 837 BLAKE2B 2516f00319717c8b58eea0efd67dab51311ae1502cad970109b408389f22bf97a729651c383233ee5b9c37e8141651a57b2e5737c10efc90a8631d8bc671b6ad SHA512 f062383db73798464d34a5f207f4d471e68f6050e32bd1d66783ad30a464986a135af58ffa2144292e4db8f7559a299a6fa10a995a72e3236ac01872fc74667d
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libabw/libabw-0.1.3.ebuild b/app-text/libabw/libabw-0.1.3.ebuild
new file mode 100644
index 000000000000..bae7f1dcebdb
--- /dev/null
+++ b/app-text/libabw/libabw-0.1.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Library parsing abiword documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
+SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	sys-devel/libtool
+"
+
+src_configure() {
+	# bug 619470
+	append-cxxflags -std=c++14
+
+	local myeconfargs=(
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 2200ebf1bf12..9bacf02e4bae 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,4 +1,4 @@
 DIST libetonyek-0.1.9.tar.xz 1477064 BLAKE2B 088d27c83d4aff41cb208cf840def78e323f378a1b7d456448db3abf51d1e850c8159ace75c8836958b533c2b84e583d5a622e638081230d2f862f6d1d175e98 SHA512 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
-EBUILD libetonyek-0.1.9.ebuild 1294 BLAKE2B 2d883f5908e5fd97babe59e62909de01e9b751ba0d6bf4322dd7106ec46cf0fdcdde759ba206ad674c14c79fa4c40c69e1afe66d5998f637c5fe8f9adc500d04 SHA512 0af622bef1e7896021bc7f614b6503a22545e5715c58c1676303d12ce0346fa1bf319b27a61d7eeebda53f1209644ce8f486ef608217a235fa6eb99d92814495
-EBUILD libetonyek-9999.ebuild 1297 BLAKE2B ef85c5b3f63b108d7a9ba562b83e1650210da5cac71f2868d2f0fed2c5a47d796459af36d2c1442db39e2b2cb48c4f3616c48c82b6620a8cebb961e49b3bfb10 SHA512 667aace5bf321077a711dfe37ad01ef56a1b206b6c25c27ce68eb8b1546721c1961b71b75fb85a49612df1c9a9ac92740852b39332778277d0cc1e980a5bd449
+EBUILD libetonyek-0.1.9.ebuild 1186 BLAKE2B d15463f4377588211f8d33f4dfabfc9e4fd1bf62fc4ee3d5828e9953edc7106f8f3e9f71827339beb21facf55b9737be53e6dfd45fd27098a9129fd8d84dd157 SHA512 70639675fc3b07a94a107fed5b40f72d8df2e2885db176ad5275f1a0e1fde0f7b2e945d5a42d438a34a83f311a2629638436eb7f613f782e7153883cf35fcee6
+EBUILD libetonyek-9999.ebuild 1297 BLAKE2B af489ee7a31f718a3670b3fe2ff212855cf9f43ff72112963f20a5b418996a8ac3b27828a2902947b91e769ad173c78eca148e6ad7cd2c301aee9a11db52e445 SHA512 fb33aaca7764969b2aed14955d5cd547e7b2718d33b27196642f1bacb18062e99b7e5ae7a2ed2468007273171cb4392148761709ceb3d96c85d6358eb26f62cb
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/libetonyek-0.1.9.ebuild b/app-text/libetonyek/libetonyek-0.1.9.ebuild
index bd8b3c336f21..e690d1468504 100644
--- a/app-text/libetonyek/libetonyek-0.1.9.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.9.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	app-text/liblangtag
 	dev-libs/librevenge
 	dev-libs/libxml2
-	>=dev-util/mdds-1.3.1:1=
+	=dev-util/mdds-1.4*:1=
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
@@ -42,15 +42,11 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--disable-werror
+		--with-mdds=1.4
 		$(use_with doc docs)
 		$(use_enable static-libs static)
 		$(use_enable test tests)
 	)
-	if has_version ">=dev-util/mdds-1.4"; then
-		myeconfargs+=( --with-mdds=1.4 )
-	else
-		myeconfargs+=( --with-mdds=1.2 )
-	fi
 
 	econf "${myeconfargs[@]}"
 }
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index a59ca6e00967..5a2e3527e53a 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ RDEPEND="
 	app-text/liblangtag
 	dev-libs/librevenge
 	dev-libs/libxml2
-	>=dev-util/mdds-1.3.1:1=
+	>=dev-util/mdds-1.4.3:1=
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
@@ -46,10 +46,10 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable test tests)
 	)
-	if has_version ">=dev-util/mdds-1.4"; then
-		myeconfargs+=( --with-mdds=1.4 )
+	if has_version ">=dev-util/mdds-1.5"; then
+		myeconfargs+=( --with-mdds=1.5 )
 	else
-		myeconfargs+=( --with-mdds=1.2 )
+		myeconfargs+=( --with-mdds=1.4 )
 	fi
 
 	econf "${myeconfargs[@]}"
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 23265a98edf8..266d4901fcc0 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,5 +1,6 @@
 DIST linuxdoc-tools-0.9.72.tar.gz 614429 BLAKE2B 404b311c0560780bd81f021760d32e47cd6ebe8abc9aa64a181b8ce727dd0edbbd88d286cdfdcc97a51981bd0bd299563d7b1b2945e06f83ff32c7d3e56abb19 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408
 DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
 EBUILD linuxdoc-tools-0.9.72.ebuild 1777 BLAKE2B b61585eaf79a55b9acc1f4711cbaec19d421db998f091a4fb5827292bb30c5720de9ba5a300ad0cf248b509a8ec4d1a0415a4ee498edb18f49279cf673ff35cb SHA512 40632a82dc9252a4bac966174c4e87f6f1adf075fb2ef125ea07ccc5796b98e74d8823d1afff11f98e042ded4eb5b7da82a8b8c5ab052e4f7d53357b84cbf649
+EBUILD linuxdoc-tools-0.9.73-r1.ebuild 1915 BLAKE2B a693c89988854a7efdabb270efd5d9ed3fd9888d6732b8cfe875cb9f34ca31a3f6718e090957f51ebc55a1a753cdadfac86eabb8e95a276f0a706b05f8b2366d SHA512 a8dc786ba14a8a89a5c05fe45bfa2e2deff57530a9235877791a6d9240a4e6ffc4871bbf6946ee497097fff6053c1af5f397e4362930ff4e4772147c96f0bb55
 EBUILD linuxdoc-tools-0.9.73.ebuild 1667 BLAKE2B 7610425455383b2de6e6d2192b1efe2ff91f177cb7d57db0244c7a5318bff2676e52b383c973345797b4322ef6d67166ef6376d7d3d2eac14a17137b59d0ef41 SHA512 1cc1811a713b4b255daf959fb45294ce2aff9c97a6c8b8fefbe0ef4d229da09c98ea4be56087b0a185ad6fde30788ee6b578c72e3f2c82673918233581c0b726
 MISC metadata.xml 911 BLAKE2B a78b50af9faf588a872f75b94f1278ce1ef5e16edb8c6f6c953dcc29b466be53f70a63275e5df54bd46f58d726e80f07b8cd8ae051d93f7c6ee11f0c8e63b8fe SHA512 6afd802552b700006b38a5eee516e5e1f59d0af0dff294bc2807804f8a85823ca2c5a928c0cfe2d5ef74d8c34521ecdd2a54d4ff5a1d322f17d42a6e5e6ad0f4
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
new file mode 100644
index 000000000000..4f2129a2644a
--- /dev/null
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools latex-package perl-functions sgml-catalog-r1 toolchain-funcs
+
+DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
+HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
+SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+ MIT SGMLUG"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="
+	|| ( app-text/openjade app-text/opensp )
+	app-text/sgml-common
+	dev-lang/perl:=
+	sys-apps/groff
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/awk
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		virtual/latex-base
+	)
+"
+
+src_prepare() {
+	default_src_prepare
+	# Pregenerated configure scripts fail.
+	eautoreconf
+}
+
+src_configure() {
+	perl_set_version
+	tc-export CC
+	local myeconfargs=(
+		--disable-docs
+		--with-texdir="${TEXMF}/tex/latex/${PN}"
+		--with-perllibdir="${VENDOR_ARCH}"
+		--with-installed-iso-entities
+	)
+	use doc && myeconfargs+=(--enable-docs="txt pdf html")
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Prevent access violations from bitmap font files generation.
+	use doc && export VARTEXFONTS="${T}/fonts"
+	default_src_compile
+}
+
+src_install() {
+	# Makefile ignores docdir configuration option.
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
+	dodoc ChangeLog README
+
+	insinto /etc/sgml
+	newins - linuxdoc.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
+	EOF
+}
+
+pkg_preinst() {
+	# work around sgml-catalog.eclass removing it
+	cp "${ED}"/etc/sgml/linuxdoc.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/linuxdoc.cat ]]; then
+		cp "${T}"/linuxdoc.cat "${EROOT}"/etc/sgml/ || die
+	fi
+
+	latex-package_pkg_postinst
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	latex-package_pkg_postrm
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 285daeb9b226..a6d1d3e0ac63 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -3,7 +3,6 @@ AUX mupdf-1.14-CFLAGS.patch 395 BLAKE2B cc841dc186ac09892789664395bf632a33af3fd1
 AUX mupdf-1.14-Makefile.patch 1294 BLAKE2B 228ab49a5814e24b0fb1995c5137ce513a303f495973699a370a13a2af17e436ad67ecb47bab739740f7593b71087e167461ff188ef0fe8edf3980450d54984a SHA512 33be7134f8f469a4c72daf59d705de2ed2952ba4ff518ab54f5dc44279d4af8c5d05919bd19d4c6b84085f47f3713a752d678e708aa736e703d2f47d94391b84
 AUX mupdf-1.14-fix-big-endian.patch 4086 BLAKE2B c5104e808a83f122f1c1e80fd57b5aabadc017458e1d2383b09eef457ff6bd8809a42efac01d1f5fdfcbc55789696a2ab62dfd7f6f83150a1016e4c07c4fdfea SHA512 2519b33703976465f1411cad10daebe7646c2830ac385df642b326e82ca608bb4662f824ff98a1cc434994191f222ee02f56b296cac526abaa9e69d5786d50be
 AUX mupdf-1.14-libressl.patch 1362 BLAKE2B b52ccec0a03d97b357d5329317143595e0cf3029179b91f3d6134f6b59e313ed71063aee97d1192630fb64bd237997b1a56a6a55461b5e434297756e234990ef SHA512 3094d427a7beedc756e47a367423ffe7c8221f9078bd7bef5e8dddba615e918824778cc8118cd656b2dd1d8c235c770631241eb84a46551c96c32906a7986281
-AUX mupdf-1.14-openssl-curl-x11.patch 1799 BLAKE2B 62ae64baad844a13379f8dd1e1a1fed7cc0675fafe79e92a1029a968f59aa0aa3557734f2aa8e56d84f9bbeffbd148ae12255538d2f7b27a07fad5030621d33e SHA512 b6892c58c8a0d7561af16cc3e45e666b8bd1a6824f803d7500dd2db09b4bb477c45ab71b955bf76eedea8352d62d062ee656157c55d635514e464afdef1c2583
 AUX mupdf-1.14-r3-openssl-curl-x11.patch 1256 BLAKE2B 49bfda1f434fbfcf85c7b38b714b3c471d8d4ce02d625a6716582e0a9b3d1d0f623d401a0e9f4fc8ce4a1a6109925199c9c2b188be8739f274804217fb829efb SHA512 387f282fdd2e450585743de7fa297c24685d12c199c801f930da37795c6406aa9ee0bee335c54ca6ccef46726ebf6b49b389753f061542cf7e5381c979e0786d
 AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed
 AUX mupdf-1.15-Makefile.patch 1189 BLAKE2B 21447e2fd8ca7c396b9b2bd5e1e70ac6ebff5dc8dcbde273e0b23e17281cf2fe16f7a53587f9b0a3b2af1837f3ed5fc4a19666a4cdfa5d491e8b9be71519e1a8 SHA512 6c696b5a522116d075ee1a4759cdf3cae2e8836315f2898a51c15e227d4d57b44095a9927e7d66ab7d522ba6e0c65eed10a379d9e80b791ee8b6022933f615ab
@@ -11,7 +10,6 @@ AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7e
 AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3
 DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
 DIST mupdf-1.15.0-source.tar.xz 39828864 BLAKE2B 15d0e4244062a91c7055b98fa61f2b02e0e3effbcf5374fe589f5a0d2ba2a2d4a59318ae3c0f28d866c6b07554e4b1e65ee9264c26a5f4524ef34e998d6c3320 SHA512 ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd
-EBUILD mupdf-1.14.0-r2.ebuild 3116 BLAKE2B 1700ed8f0eacc1c986393b597df20d4b45a2158ddedbe472281e900d8dc79ce4a76aafc5be0e3f35977afd6cecb643b7a382c6a7e0a422987d23b20bf2697343 SHA512 442a258938c868062ddd3de127da51c475c89908f466aa12d8baf44b4c29fa961c99f3e1eb3649672e1855cc447eb1b30f2aa31ed80ff1c2c751716b743ee6d8
 EBUILD mupdf-1.14.0-r3.ebuild 3229 BLAKE2B cea1f272cbf41f3fd1bf7b576124cb279e0f6cd9aa52c3ced218c09d77f6f1968bce066288afba74666d6bbe20cdf61958f5b721ed347b1667811900fb852069 SHA512 292695fe366b7f1688b90841d7d1cf5cf11a4d56ad0b6ea8fb3b87bde92c6a21183d42a1ae0baf4ef017d748be6d3a31d3616daa22ca17f797ac86ffa994fbb1
 EBUILD mupdf-1.15.0.ebuild 3505 BLAKE2B be357aae0944fda68a0e95cf12e2936ec94428d5baa645399add9f87ca5127de85898f22fb56762d7fb88d6ed3e61874723f7668fb9c4a2ac942585e3ddbde6f SHA512 41209dd40db318acaa224a031672fb9281dd674a6803b789da1cd673ab18af08c4fcdd2f5d82ccc5076026fec056986d2b67f1adc4b4cf3a7a0aca56787d7b75
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch
deleted file mode 100644
index a1284a63d670..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-openssl-curl-x11.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/Makerules b/Makerules
-index fc9bf998..5c0fffa4 100644
---- a/Makerules
-+++ b/Makerules
-@@ -113,10 +113,14 @@ else ifeq ($(OS),Linux)
- 	SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
-   endif
- 
-+  WANT_CURL ?= yes
-+  ifeq "$(WANT_CURL)" "yes"
-   HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
-   ifeq ($(HAVE_CURL),yes)
- 	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
--	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-+    # We have to forcibly add -lpthread to avoid linking errors.
-+	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -lpthread
-+  endif
-   endif
- 
-   HAVE_GLUT := yes
-@@ -125,17 +129,29 @@ else ifeq ($(OS),Linux)
- 	SYS_GLUT_LIBS := -lglut -lGL
-   endif
- 
-+  WANT_X11 ?= yes
-+  ifeq "$(WANT_X11)" "yes"
-   HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
-   ifeq ($(HAVE_X11),yes)
- 	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
- 	X11_LIBS := $(shell pkg-config --libs x11 xext)
-   endif
-+  endif
- 
--  HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
--  ifeq ($(HAVE_LIBCRYPTO),yes)
-+  WANT_OPENSSL ?= yes
-+  ifeq "$(WANT_OPENSSL)" "yes"
-+  ifeq "$(shell pkg-config --exists 'libcrypto >= 2.0.0' && echo libre)" "libre"
-+  ifeq "$(shell pkg-config --exists 'libcrypto >= 2.7.0' && echo yes)" "yes"
-+    HAVE_LIBCRYPTO := yes
-+	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
-+	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
-+  endif
-+  else ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
-+    HAVE_LIBCRYPTO := yes
- 	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
- 	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
-   endif
-+  endif
- 
-   HAVE_PTHREAD := yes
-   ifeq ($(HAVE_PTHREAD),yes)
diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
deleted file mode 100644
index 8e081a7e46aa..000000000000
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X curl +javascript libressl opengl +ssl static-libs +vanilla"
-
-RDEPEND="
-	>=dev-lang/mujs-1.0.4
-	media-libs/freetype:2=[static-libs?]
-	media-libs/harfbuzz:=[static-libs?]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/libpng:0=[static-libs?]
-	>=media-libs/openjpeg-2.1:2=[static-libs?]
-	virtual/jpeg[static-libs?]
-	curl? ( net-misc/curl[static-libs?] )
-	opengl? ( >=media-libs/freeglut-3.0.0:= )
-	ssl? (
-		libressl? ( dev-libs/libressl:0=[static-libs?] )
-		!libressl? ( dev-libs/openssl:0=[static-libs?] )
-	)
-	X? (
-		x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="
-	opengl? ( !static-libs )
-	curl? ( X )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14-CFLAGS.patch
-	"${FILESDIR}"/${PN}-1.14-Makefile.patch
-	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
-	# See bug #662352
-	"${FILESDIR}"/${PN}-1.14-openssl-curl-x11.patch
-	# bug #672998
-	"${FILESDIR}"/${PN}-1.14-fix-big-endian.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use hppa && append-cflags -ffunction-sections
-
-	use javascript || \
-		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
-			-i include/mupdf/fitz/config.h
-
-	use vanilla || eapply \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iLD = $(tc-getLD)" \
-		-e "1iAR = $(tc-getAR)" \
-		-e "1iverbose = yes" \
-		-e "1ibuild = debug" \
-		-e "1iprefix = ${ED}usr" \
-		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
-		-i Makerules || die
-}
-
-_emake() {
-	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-	emake \
-		GENTOO_PV=${PV} \
-		HAVE_GLUT=$(usex opengl yes no) \
-		WANT_CURL=$(usex curl) \
-		WANT_OPENSSL=$(usex ssl) \
-		WANT_X11=$(usex X) \
-		USE_SYSTEM_LIBS=yes \
-		USE_SYSTEM_MUJS=yes \
-		HAVE_OBJCOPY=no \
-		"$@"
-}
-
-src_compile() {
-	_emake XCFLAGS="-fpic"
-
-	use curl && _emake extra-apps
-
-	use static-libs && \
-		_emake build/debug/lib${PN}.a
-}
-
-src_install() {
-	if use X || use opengl ; then
-		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
-	else
-		rm docs/man/${PN}.1
-	fi
-
-	_emake install
-
-	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a build/debug/lib${PN}.a
-	if use opengl ; then
-		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
-		dosym ${PN}-gl /usr/bin/${PN}
-	elif use X ; then
-		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
-		dosym ${PN}-x11 /usr/bin/${PN}
-	fi
-	use curl && dobin build/debug/${PN}-x11-curl
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index b0f57964f33a..cbb6143ff199 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -11,4 +11,5 @@ AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
 EBUILD openjade-1.3.2-r8.ebuild 3707 BLAKE2B 2330414eb9f418cec64dd1bcc2775fc63ebac0ff2404f611d08563bfebc615bb4002bd3740f86aba08aa5da62fb12a4cc24c2d50904ad1516f67fec11382a4fc SHA512 0e532bdabd29029898127229238b1404a57a0e3fc6b747c424c8bfbfe0bbf2e1c53633a839ade8452b8c705873b6fa261ed3b3c9093e42839c81dbb8c7147d3f
-MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
+EBUILD openjade-1.3.2-r9.ebuild 4311 BLAKE2B dd023c69bd4d5c5650e30c3073563618f10f810ec093b727d71c63f167ddd616740fa6ca6187b15f1a6b33de9790598b72354770d45e43c77823024c6490981d SHA512 0a9ad74203fe2d184f7d4d32cc6823298528947ef5c5294839b0729b3a471787c4224337eea2c91da68e317b5d40020751fec642a1908a35b47a2999c27dcf61
+MISC metadata.xml 325 BLAKE2B 3cecdaaecd44faf19571367fbe80cb75e687e6231c26c696cc9e7412aae427b95a4967cad7415b9df5e499bdb74c6b6fed54edc52470ff207cbba43e423ae223 SHA512 4e1e28e8c1722c9bcbbc2a8487ad373eff6679f51a5213850e11ce2d7d569afbaa093d215965e4fc010a9fa3e80121949a3db9fb98bfaf8ab70eafead9e14657
diff --git a/app-text/openjade/metadata.xml b/app-text/openjade/metadata.xml
index a4a5fdce9de1..1a3a16228acc 100644
--- a/app-text/openjade/metadata.xml
+++ b/app-text/openjade/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openjade</remote-id>
 	</upstream>
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
new file mode 100644
index 000000000000..2d63798c3d74
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic sgml-catalog-r1 toolchain-funcs
+
+DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
+HOMEPAGE="http://openjade.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	app-text/sgml-common
+	>=app-text/opensp-1.5.1
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}"/${P}-deplibs.patch
+	eapply "${FILESDIR}"/${P}-ldflags.patch
+	eapply "${FILESDIR}"/${P}-msggen.pl.patch
+	eapply "${FILESDIR}"/${P}-respect-ldflags.patch
+	eapply "${FILESDIR}"/${P}-libosp-la.patch
+	eapply "${FILESDIR}"/${P}-gcc46.patch
+	eapply "${FILESDIR}"/${P}-no-undefined.patch
+	eapply "${FILESDIR}"/${P}-wchar_t-uint.patch
+	eapply "${FILESDIR}"/${P}-chmod.patch #487218
+
+	# Please note!  Opts are disabled.  If you know what you're doing
+	# feel free to remove this line.  It may cause problems with
+	# docbook-sgml-utils among other things.
+	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+	strip-flags
+
+	# Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault
+	# on hppa. Using -O1 works fine. So I force it here.
+	use hppa && replace-flags -O2 -O1
+
+	ln -s config/configure.in configure.ac || die
+	cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
+	rm config/missing || die
+
+	AT_NOEAUTOMAKE=yes \
+	eautoreconf
+}
+
+src_configure() {
+	# avoids dead-store elimination optimization
+	# leading to segfaults on GCC 6
+	# bug #592590 #596506
+	tc-is-clang || append-cxxflags $(test-flags-CXX -fno-lifetime-dse)
+
+	# We need Prefix env, bug #287358
+	CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}" \
+	econf \
+		--enable-http \
+		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
+		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
+		--enable-splibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
+		--disable-static
+}
+
+src_compile() {
+	unset INCLUDE #412725
+	emake -j1 SHELL="${BASH}"
+}
+
+src_install() {
+	#dodir /usr/$(get_libdir)
+
+	make DESTDIR="${D}" \
+		SHELL="${BASH}" \
+		libdir="${EPREFIX}"/usr/$(get_libdir) \
+		install install-man
+
+	find "${D}" -name '*.la' -delete || die
+
+	dosym openjade /usr/bin/jade
+	dosym onsgmls /usr/bin/nsgmls
+	dosym osgmlnorm /usr/bin/sgmlnorm
+	dosym ospam /usr/bin/spam
+	dosym ospent /usr/bin/spent
+	dosym osx /usr/bin/sgml2xml
+
+	insinto /usr/share/sgml/${P}
+	doins dsssl/builtins.dsl
+
+	newins - catalog <<-EOF
+		SYSTEM "builtins.dsl" "builtins.dsl"
+	EOF
+	doins -r pubtext
+	insinto /usr/share/sgml/${P}/dsssl
+	doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
+	newins "${FILESDIR}"/${P}.dsssl-catalog catalog
+
+	# Breaks sgml2xml among other things
+	#insinto /usr/share/sgml/${P}/unicode
+	#doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
+
+	insinto /etc/sgml
+	newins - "${P}.cat" <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/openjade-${PV}/catalog"
+		CATALOG "${EPREFIX}/usr/share/sgml/openjade-${PV}/dsssl/catalog"
+	EOF
+
+	local HTML_DOCS=( doc/*.htm )
+	einstalldocs
+	dodoc -r jadedoc
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/${P}.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/${P}.cat ]]; then
+		cp "${T}"/${P}.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	# this one's shared with docbook-dsssl, so we need to do it in postinst
+	if ! grep -q -s ${P}.cat \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat; then
+		ebegin "Adding ${P}.cat to /etc/sgml/sgml-docbook.cat"
+		cat >> "${EROOT}"/etc/sgml/sgml-docbook.cat <<-EOF
+			CATALOG "${EPREFIX}/etc/sgml/${P}.cat"
+		EOF
+		eend
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		ebegin "Removing ${P}.cat from /etc/sgml/sgml-docbook.cat"
+		sed -i -e '/${P}/d' \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat
+		eend
+		if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
+			rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
+		fi
+	fi
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 754f98b73367..d67c0c1a9d49 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -8,4 +8,4 @@ DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec2669
 EBUILD poppler-0.79.0-r1.ebuild 3518 BLAKE2B b1788df48fbc4300fc64ba2ab94bec0f1fd6fcce577ed5180fe2508043834c1894fef44096bb5d30697df5215999ec871798df1d7e936a82f604bbfe46fedece SHA512 9e04527cbacec01d734b737f9ebaa729300c987198a53c69079c198d9ace244f81eb1b6e516ad81e8afaca1ff6d44d8de3df92afc22a684fc6f389de37e5f0de
 EBUILD poppler-0.80.0.ebuild 3506 BLAKE2B ba82b892b343c3acf9029f0cdfe8f6fafa5b25f896a802b214373082295282e577f19ed3eea5a0e55d9fb23cb1a36b09e91b84d9b4e3cb65008858a34c9bec9b SHA512 bdc23a2cd987ae8f0fee3d80931b7f7e9c0a705acb58ea5eadc16c7ebf1276b9b0880130743b4c6e29b8b0acf7c442183a41a45fd626ff8830d9af7c5df5bd48
 EBUILD poppler-9999.ebuild 3506 BLAKE2B ba82b892b343c3acf9029f0cdfe8f6fafa5b25f896a802b214373082295282e577f19ed3eea5a0e55d9fb23cb1a36b09e91b84d9b4e3cb65008858a34c9bec9b SHA512 bdc23a2cd987ae8f0fee3d80931b7f7e9c0a705acb58ea5eadc16c7ebf1276b9b0880130743b4c6e29b8b0acf7c442183a41a45fd626ff8830d9af7c5df5bd48
-MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
+MISC metadata.xml 995 BLAKE2B 41ffeea7d766a1d5c86020673522c94ebb243b75e21b761f8c202bea7789464d2e3097a74f6ff6ee42f41ce34221ed378b6fcd6912f472249aa9e5ff01721346 SHA512 9d9134ae26b37d2d3a1859cc4d8c67a02257f7cfa33c5863260f8ec8afcde28f7430fcec557e6a5cb1c9d03cb0b5c116c074ba4034f94fa0ece4e957f718d319
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 3f8d6be9f980..e88e31fc283b 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -17,6 +17,9 @@
 	<email>office@gentoo.org</email>
 	<description>Please CC on stabilisation bugs</description>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:freedesktop:poppler</remote-id>
+</upstream>
 <use>
 	<flag name="nss">Enable signatures handling with <pkg>dev-libs/nss</pkg></flag>
 	<flag name="utils">Install command-line PDF converters and various utilities.</flag>
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index b9948d7a1561..20c22236c53f 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -10,4 +10,4 @@ EBUILD qpdf-8.2.1.ebuild 1268 BLAKE2B c62c4bdf99ebd71593689e7918d57cba7031d2c0d4
 EBUILD qpdf-8.4.1.ebuild 1277 BLAKE2B a7a4b94e2fe88c4a4a10e82bcb85673b1425b56c76347e21101a0f0e94f92c4e7304d110ab003b731a8315b618dd35c071e102f486b726f30899d6081807bab6 SHA512 771c029e75a25d1d7c2ea14f9bbc364051a9419f513e070f7ba548b675d1e11dd4198d6dbd853de88b603d3183af8c65ced0c33498dd2df11c43be1229feb529
 EBUILD qpdf-8.4.2.ebuild 1278 BLAKE2B e32c28130f8b8e90cb022fcf78fbbd4f07b94455557f41b74c6645113d89ac2f33ff7c277d89e5dc16bd3b5e0b2502aa35f99c5e74804a3422a5e9c8848aa8f9 SHA512 c589c5ca6d96c9e5b48c62e5f1bac9ca26025c6a97925443805c64d51f0267a8b05497531fe55f2c352eae14f0349bffbe275fc79cd7ee672b5e54db7776ef5a
 EBUILD qpdf-9.0.0.ebuild 1278 BLAKE2B 8ea12d44646d8c4835b4576c118708b15ba31e3d8296aa94ba6c3421a0e7e4c063dd597d1758f242a5e6ed9677b02089eacfac454d728d75f2ad8c2f97cb9b2e SHA512 377db56c3e509884111642b0f379a4c3d965caa50db1b242173c63970d716376931440145c6e992da3f6277ee98bf6032aa1efadfd402f47a32502f9663b1b3b
-MISC metadata.xml 438 BLAKE2B ccb3c4e7dace8650c11418fecc8c5fdd7062692f83c99f60d3b73fd698f1fea19dd429a92014267388d04ea57e00652499768c88aaffd7e0e3f66e53c84f6449 SHA512 4c1aa514207b18e7b4de0585545d1c7b5def7f42be9d43726801f9a9ae7b129b91802dedf4e3eb9f2595a26e3863918c029b927ab42b6aab7ab0130c000ff843
+MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
index ce823e597ac8..fda6f880d912 100644
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="perl">Install fix-qdf tool (for reverting PDF edits) written in perl</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:qpdf_project:qpdf</remote-id>
 		<remote-id type="sourceforge">qpdf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index 4c9f48bd3af3..d9010c9638a3 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -2,4 +2,5 @@ AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898
 AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
 EBUILD sgml-common-0.6.3-r6.ebuild 2474 BLAKE2B 0150bb9a950459ddccf7b4959a9e96aa570a32c0aff6badec54fce4f8a4aa2a3bfbf8ae667d39830dc9fc17bcbfb41366eb0a76e6eb7e231922d7667e1d2569b SHA512 2fb7a94b16c1c7b582f968c2f3916f1d1193811c5bce9541ed110daa87c3bf9228db5da7531da4d473ba9d28e4253a92fb44c98a58bb84be4c42e8660b4e1ead
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD sgml-common-0.6.3-r7.ebuild 2581 BLAKE2B 91a3c0829b37d952c3dce415234e5b7e8efdbdcb268559e33d058024671ef54020a1873dad6a912cf5f1d55b6199ce65c15c95d2bf51368e8bea2ca83990929d SHA512 ee74b80fc9aee9925da1a56ae3c315f4c0b5fe438a1233a049272bbe1cbff4767e8a3febf7a8ea3a9008c5d1e038ca96bf544ae7f7c8cdbc7611cb34d30ea9d5
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/sgml-common/metadata.xml b/app-text/sgml-common/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/sgml-common/metadata.xml
+++ b/app-text/sgml-common/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
new file mode 100644
index 000000000000..a9d675c8206a
--- /dev/null
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix sgml-catalog-r1
+
+DESCRIPTION="Base ISO character entities and utilities for SGML"
+HOMEPAGE="https://www.iso.org/standard/16387.html"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
+
+# install-catalog is GPL
+LICENSE="FDL-1.1+ GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-prefix.patch )
+
+src_prepare() {
+	# We use a hacked version of install-catalog that supports the ROOT
+	# variable, puts quotes around the CATALOG files, and can be prefixed.
+	cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in" \
+		|| die "Copy of install-catalog.in failed"
+
+	default
+	eprefixify bin/install-catalog.in bin/sgmlwhich config/sgml.conf
+}
+
+src_install() {
+	default
+
+	# own /etc/sgml/catalog
+	insinto /etc/sgml
+	newins - catalog <<<''
+	newins - sgml-ent.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
+	EOF
+	newins - sgml-docbook.cat <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-ent.cat"
+	EOF
+}
+
+pkg_preinst() {
+	# preserve old files
+	local f
+	for f in /etc/sgml/{catalog,sgml-docbook.cat}; do
+		if [[ -s ${EROOT}${f} ]]; then
+			cp "${EROOT}${f}" "${ED}${f}" || die
+		fi
+	done
+
+	# and back them up in case postrm killed them
+	for f in sgml-ent.cat sgml-docbook.cat; do
+		cp "${ED}/etc/sgml/${f}" "${T}" || die
+	done
+}
+
+pkg_postinst() {
+	# restore backed up files if necessary
+	for f in sgml-ent.cat sgml-docbook.cat; do
+		if [[ ! -s ${EROOT}/etc/sgml/${f} ]]; then
+			cp "${T}/${f}" "${EROOT}"/etc/sgml/ || die
+		fi
+	done
+
+	# re-append sgml-ent.cat if necessary
+	if ! grep -q -s sgml-ent.cat "${EROOT}/etc/sgml/sgml-docbook.cat"; then
+		ebegin "Adding sgml-ent.cat to /etc/sgml/sgml-docbook.cat"
+		cat >> "${EROOT}/etc/sgml/sgml-docbook.cat" <<-EOF
+			CATALOG "${EPREFIX}/etc/sgml/sgml-ent.cat"
+		EOF
+		eend
+	fi
+
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		ebegin "Removing sgml-ent.cat from /etc/sgml/sgml-docbook.cat"
+		sed -i -e '/sgml-ent\.cat/d' \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat
+		eend
+		if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
+			rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
+		fi
+	fi
+
+	sgml-catalog-r1_pkg_postrm
+}
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
index f82107d6af3d..4bade9984277 100644
--- a/app-text/sgmltools-lite/Manifest
+++ b/app-text/sgmltools-lite/Manifest
@@ -1,4 +1,5 @@
 DIST nw-eps-icons-0.0.1.tar.gz 8733 BLAKE2B 467fa3f341c1d6ea20af059cfa88529a0b3bc729cefac72d5b3c264d3a224e8bfb05a89b5f491a22aaf4c194b72cd27ac103a381adb671d9867ef8fceb41f030 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a
 DIST sgmltools-lite-3.0.3.tar.gz 61342 BLAKE2B 8fcac5b48fcdbb8fbbfdbf8ad055ab00cb3fb6a8447a27bf5b14faef968845554a86f04b4984c1ccc1e26d9c64dc5654d5831896bbc44bd3dee0ef3fc28109e5 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81
 EBUILD sgmltools-lite-3.0.3-r14.ebuild 2205 BLAKE2B 030bdf9b6258b0768b3098c17d4cc820110cfff79ce9a2d6becf6d1c28c18977d2cbceb083cec512cb64380bd5cf8ef012a773357d328a08f4cef607229fd237 SHA512 f1cf3035547d1626ace249218a75399e7ad9374f60de3203003393418324628dce27f28cd608f4a4c310306d36043a6856db273307c8ec5a9a3642307e1cb351
-MISC metadata.xml 413 BLAKE2B b4a1d8afb18583b1b8a16bcfb3f29f547a233ba6742ec4998a101f0e97344554f7e404f51673a646f9200bbda586df213dc33fd21fa3120f4fc4394c9174bcb2 SHA512 e5b3ccaf5308d1509e4921035d83396d3357e4845798689ff03fbe4898d7b02da344e5ab21847d84c99f40371ab4c9ac04b57d7d060fc62c59a800e22e71611a
+EBUILD sgmltools-lite-3.0.3-r15.ebuild 2506 BLAKE2B 79ed87b6b2f2cb3c9e0ed72289d174916521969e5b35dc95b9cc75a1567ec440d759e87dc155fe773c07e322192f974dfeb9e6b984adce86fdadd8c75d56d245 SHA512 403ea71788c32b9865a9b0b77dfe52181c968f80eb5c0946eb1810e65577caccfb0df5958beda9add0ebe30976dcfa33f1b8d30ba44338d2bfd5560473e2e3e3
+MISC metadata.xml 493 BLAKE2B 36e972b80b557e131d5decb41945968ce24de810197ea457e50081017e50e3926baa419082222cbdfb494a55e9bae125bf304a431234efb4c4a67a8c3536852a SHA512 9f2e53faa5f07d791f7c4cfa7972ed42a26d1abfa5c11faf3e36dce18c2c30d086462e9c0a2c7664153333cb10c3923d47b4bb9e873b7e48dd144e667719a14e
diff --git a/app-text/sgmltools-lite/metadata.xml b/app-text/sgmltools-lite/metadata.xml
index 465570abcce8..dae13712da5b 100644
--- a/app-text/sgmltools-lite/metadata.xml
+++ b/app-text/sgmltools-lite/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<use>
 		<flag name="jadetex">
 			Add support for <pkg>app-text/jadetex</pkg> (for processing
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
new file mode 100644
index 000000000000..b8d8da45abc7
--- /dev/null
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 sgml-catalog-r1
+
+DESCRIPTION="Python interface to SGML software in a DocBook/OpenJade env"
+HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
+SRC_URI="
+	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
+	https://downloads.sourceforge.net/project/${PN}/support%20files/0.0.1-1/nw-eps-icons-0.0.1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="jadetex"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/sgml-common
+	app-text/docbook-sgml-dtd:3.1
+	app-text/docbook-dsssl-stylesheets
+	app-text/openjade
+	jadetex? ( app-text/jadetex )
+	|| (
+		www-client/w3m
+		www-client/lynx
+	)"
+DEPEND=${RDEPEND}
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_configure() {
+	econf \
+		--datadir='${prefix}/share' \
+		--mandir='${prefix}/share/man'
+}
+
+src_install() {
+	# yes, it does not respect DESTDIR
+	emake install \
+		prefix="${ED}/usr" \
+		etcdir="${ED}/etc/sgml"
+
+	dodoc ChangeLog POSTINSTALL README*
+
+	insinto /usr/share/sgml/docbook/dsssl-stylesheets/
+	doins -r "${WORKDIR}"/nw-eps-icons-0.0.1/images
+
+	rm "${ED}"/etc/sgml/catalog.{suse,rh62} || die
+
+	# Remove file provided by sgml-common
+	rm "${ED}"/usr/bin/sgmlwhich || die
+
+	# List of backends to alias with sgml2*
+	# Do not provide sgml2{txt,rtf,html} anymore, they are part of
+	# linuxdoc-tools
+	local backends=()
+	if use jadetex; then
+		backends+=(ps dvi pdf)
+	else
+		# Remove the backends that require jadetex
+		rm "${ED}"/usr/share/sgml/misc/sgmltools/python/backends/{Dvi,Ps,Pdf,JadeTeX}.py || die
+	fi
+
+	# Create simple alias scripts that people are used to
+	# And make the manpages for those link to the sgmltools-lite manpage
+	local b
+	for b in "${backends[@]}"; do
+		newbin - "sgml2${b}" <<-EOF
+			#!/bin/sh
+			exec sgmltools --backend=${b} "\${@}"
+		EOF
+
+		dosym sgmltools-lite.1 "/usr/share/man/man1/sgml2${b}.1"
+	done
+
+	insinto /etc/sgml
+	newins - sgml-lite.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat"
+	EOF
+
+	python_fix_shebang "${D}"
+	python_optimize "${ED}/usr/share/sgml/misc/sgmltools/python"
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/sgml-lite.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/sgml-lite.cat ]]; then
+		cp "${T}"/sgml-lite.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+}
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index a5adf084a9e3..1d5484ccd22f 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,4 +1,5 @@
 AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
 DIST xhtml1-20020801.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
 EBUILD xhtml1-20020801-r5.ebuild 2174 BLAKE2B 2029974397a6deb6848f5310a0c3078e70219c204406d1ef115241cf22f870f10ce8c18a965b035cdead98db36e4f0833053a67c765d1e538cdad172abada25b SHA512 57294051e859fd17a6942d180026f3d8e74c84e5ddfcf012e1f04f1870a867d908c4b7343b1a99c5a1d52844e86bc4a5754e6488e8ce45973d25e578b0d4a478
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD xhtml1-20020801-r6.ebuild 2332 BLAKE2B 702b13ee18e2549625e0651139b59bd5be8c8b73a980847fba8ce1523b9bdb65993e0bafc4a410048386b652ac65704aa9dfc042427b429c03fa2de13dee19fc SHA512 6ca481cc0f985c80a872fd031c2e982e776ee8b1ef96d3a5fe2fbfa1ee37d236102a6244be85b8b786e407e9b5a8a065405a1638027fffc131b1aac01dc8dd19
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/xhtml1/metadata.xml b/app-text/xhtml1/metadata.xml
index 6f49eba8f496..0319eec4c8be 100644
--- a/app-text/xhtml1/metadata.xml
+++ b/app-text/xhtml1/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
new file mode 100644
index 000000000000..306fefc150cb
--- /dev/null
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit sgml-catalog-r1
+
+DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
+HOMEPAGE="http://www.w3.org/TR/xhtml1/"
+SRC_URI="mirror://gentoo/xhtml1.tgz -> ${P}.tgz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="app-text/sgml-common
+	dev-libs/libxml2"
+
+PATCHES=( "${FILESDIR}"/${PN}-catalog.patch )
+
+xml_catalog_setup() {
+	CATALOG="${EROOT}/etc/xml/catalog"
+	XMLTOOL="${BROOT}/usr/bin/xmlcatalog"
+	DTDDIR="${EROOT}/usr/share/sgml/${PN}"
+
+	[[ -x ${XMLTOOL} ]]
+}
+
+src_install() {
+	insinto /usr/share/sgml/${PN}
+	doins DTD/xhtml.soc DTD/*.dcl DTD/*.dtd DTD/*.ent
+
+	insinto /etc/sgml
+	newins - xhtml1.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/xhtml1/xhtml.soc"
+	EOF
+
+	dodoc *.pdf *.ps
+	docinto html
+	dodoc *.html *.png *.css
+}
+
+pkg_preinst() {
+	# work-around old revision removing it
+	cp "${ED}"/etc/sgml/xhtml1.cat "${T}" || die
+}
+
+pkg_postinst() {
+	if [[ ! -f ${EROOT}/etc/sgml/xhtml1.cat ]]; then
+		cp "${T}"/xhtml1.cat "${EROOT}"/etc/sgml/ || die
+	fi
+	sgml-catalog-r1_pkg_postinst
+
+	xml_catalog_setup || return
+	einfo "Installing xhtml1 in the global XML catalog"
+	"${XMLTOOL}" --noout --add 'public' '-//W3C//DTD XHTML 1.0 Strict//EN' \
+		"${DTDDIR}"/xhtml1-strict.dtd "${CATALOG}"
+	"${XMLTOOL}" --noout --add 'public' '-//W3C//DTD XHTML 1.0 Transitional//EN' \
+		"${DTDDIR}"/xhtml1-transitional.dtd "${CATALOG}"
+	"${XMLTOOL}" --noout --add 'public' '-//W3C//DTD XHTML 1.0 Frameset//EN' \
+		"${DTDDIR}"/xhtml1-frameset.dtd "${CATALOG}"
+	"${XMLTOOL}" --noout --add 'rewriteSystem' 'http://www.w3.org/TR/xhtml1/DTD' \
+		"${DTDDIR}" "${CATALOG}"
+	"${XMLTOOL}" --noout --add 'rewriteURI' 'http://www.w3.org/TR/xhtml1/DTD' \
+		"${DTDDIR}" "${CATALOG}"
+}
+
+pkg_postrm() {
+	sgml-catalog-r1_pkg_postrm
+
+	[[ -n ${REPLACED_BY_VERSION} ]] && return
+	xml_catalog_setup || return
+	einfo "Removing xhtml1 from the global XML catalog"
+	"${XMLTOOL}" --noout --del '-//W3C//DTD XHTML 1.0 Strict//EN' "${CATALOG}"
+	"${XMLTOOL}" --noout --del '-//W3C//DTD XHTML 1.0 Transitional//EN' "${CATALOG}"
+	"${XMLTOOL}" --noout --del '-//W3C//DTD XHTML 1.0 Frameset//EN' "${CATALOG}"
+	"${XMLTOOL}" --noout --del 'http://www.w3.org/TR/xhtml1/DTD' "${CATALOG}"
+}
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 02b1b947a6a5..aaba4e0d88f6 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,5 +1,3 @@
-DIST xmldiff-0.6.10.tar.gz 45827 BLAKE2B f4b97d4fa7063f1edb66ab1bd465dc81cd66f35233dcd3d8ae2cc1f13e9e841645ddf8848dcd3bafc45d44da218c8260b36f5210883f3963572b375173e6d687 SHA512 b183a6e94258c4d693fa97e759868dae2dca6088e3cf12cf08b40e82d18a375f02b12d62d0cfc03fb74a5138f32f6614f555b95a3062ba768d1cdaf3391cc95b
 DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
-EBUILD xmldiff-0.6.10-r2.ebuild 522 BLAKE2B 6d012cfec8f200441be4e5e27e9cbd4ca927843b46a5b8d24108440663d619c36b1f4bf11f256bd7c8478e88a9b01805d12c112cbba2a82fb96887aec40d9265 SHA512 b16ceed0a37b133b1f61b9e47529bd61469bc933ad99218f5d3a345baa6bfb2d4908754bcce5691be68085ace23f3049bc1ae12b855073f33bddce20620fc879
 EBUILD xmldiff-1.1.1.ebuild 631 BLAKE2B 9462cbfb0eb42b9b9afff994bc9b87ed32f7e23c054ae5ae554db138e2df9bdb1064d68857fa2c3908e696cf16eb14bae6aaa777ff2c2df093046af787c5180b SHA512 38f6c5ff6aaad0c787af614ba2a2f5c1171aed47b38f32c4e998c85c90aaca3d9250bd404c088bb16a08696e7337e147aff32d87f36b5234e591e3a6c12dd789
 MISC metadata.xml 578 BLAKE2B ae500988e52962a46d0c79c948a163f7d3414c230d14ae344d33b09979085cf400ec38e911fe54f71da6035f40a795cdb9b70ed2c3299b9e37d0e6e3a77fcb7d SHA512 09529a22484d9b660b11b70137cf7e113ee07af4de0c58247d9f6dd7c9e85e222111b209b71dcdb342e734897fa0243b5f9a83688fdbd649584fa226a36acefb
diff --git a/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild b/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild
deleted file mode 100644
index 7f33b19bd77d..000000000000
--- a/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool that figures out the differences between two similar XML files"
-HOMEPAGE="https://github.com/Shoobx/xmldiff https://www.logilab.org/project/xmldiff"
-SRC_URI="ftp://ftp.logilab.fr/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
-IUSE=""
-
-DOCS=( ChangeLog README README.xmlrev TODO )
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 24f6df0ac2c1..dbb22b4f132f 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -2,5 +2,5 @@ DIST zathura-pdf-mupdf-0.3.4.tar.xz 8092 BLAKE2B 5e47a9db7fede440c10f8270e02430d
 DIST zathura-pdf-mupdf-0.3.5.tar.gz 8901 BLAKE2B 63595d6a4b305d8cd09eced1cfa3840a5ab3d37a61c42738603691621f1f1dbdfc31d5963b14c7af32f8c504f2470bf1cadb708fefbfd49fb25b2848b2564153 SHA512 1f7a748fee74296a008cef42c8f2e443409c77e16caa8441f74136260aaac7dee4d3c03e8a88532c45a0f9972e1b4965d4cffd488a00123d4d8cee9bcec2cf30
 EBUILD zathura-pdf-mupdf-0.3.4.ebuild 793 BLAKE2B 480774b820e6390885f0a6901fde83b5c7ee777d4921bd4e6a105e325743222c4c8793879249734e33ab2ddb6170056105454e52ed6d358870c7a1f24778d166 SHA512 f0e9fe25289a90e838062f37522255ee6256b04a0deaadc9357f996eb7b8d735903bbec10421c4e985461d4454e697004806a83c756568adca76c54a7ccbdfb4
 EBUILD zathura-pdf-mupdf-0.3.5.ebuild 809 BLAKE2B 848d3a8bd80d7b253fa42f2fa352946cc4f6d6a3da0568f230ee504c6c46c58470fb228e75142313769ddf86cbeadd674a978d70e56b713aadc9f4aa7873c9dd SHA512 b928e7582cd71e4135bc0967f3eea887e9657b41baf83c5b0995580fbac13ef4bc12583029e346b99a15b9a6de99733232f67954033cc6326c1562af9ca92766
-EBUILD zathura-pdf-mupdf-9999.ebuild 796 BLAKE2B 623e1c0f435e95826791a71c3ce66c4448ff8c47f9e13dae411d86e8c78b4e6cc630333263eb9b2fc94bb41f6d86fcb871da340fc78509e894fa13613785d934 SHA512 54e52e1405959ee3fdf0ac819dcc1941a370369291c9b480256fc2b404a16f2c839d1f29110cc2e7728de148423bf372c33c2aae413fb3d658a74777bb577fe2
+EBUILD zathura-pdf-mupdf-9999.ebuild 809 BLAKE2B 848d3a8bd80d7b253fa42f2fa352946cc4f6d6a3da0568f230ee504c6c46c58470fb228e75142313769ddf86cbeadd674a978d70e56b713aadc9f4aa7873c9dd SHA512 b928e7582cd71e4135bc0967f3eea887e9657b41baf83c5b0995580fbac13ef4bc12583029e346b99a15b9a6de99733232f67954033cc6326c1562af9ca92766
 MISC metadata.xml 672 BLAKE2B 539ab88c5ef3fe3ad7ca25d9856bcf6a7755e09c479631c1cbdd835aeb398d2f6052af0980afc35771312397b6858fca2271f5aa8ee64fa8a57130f05b7594ee SHA512 288bfcdc265543b1d5d364af4fe0c6dbdeec0f30019b683ef0bf32619d87ada509cce47c141aac08cf0942f7ad74d1a453e6b5303175ea591e2f661ba044882a
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 07030bc38d87..a8c73f86302b 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://pwmt.org/projects/zathura-pdf-mupdf/download/${P}.tar.xz"
+	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 77c815011db6..214c0f474333 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
+DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
 EBUILD zathura-0.4.3.ebuild 1333 BLAKE2B ad5146cdea9826b8d22bf95d47dc0dcfc02989ae7acd5c085cdbccb61a3b69fe2eb3aa7a44866efe71387da6d63490f37f4d19f01a4a0cdffdd680a52cd60e02 SHA512 cca06811020ead3fbc6d56aa54f1d6e5b73ab03874c5a59c885db015aeb8a9841f6f3d43562bcd0dc3a305d1faec8b7f4473f16ff7107740fc02b330869390fd
-EBUILD zathura-9999.ebuild 1374 BLAKE2B b1935313606001d9dac20406d05fde7fe1720afd0380885577fbf4ae88e78e989226f01651f59279fe863c67b552f0e4b9e6b8dcc00dbbee2b06e80622e8acc7 SHA512 a904dacf3ac21794e27aa8ebc84c2faf7cfbecde519a52936a91ec7d0d317552fd64ef95d0481ef2eb43ca19183e14075b6dc442ca2732ca6958e17cb2fde2c6
+EBUILD zathura-0.4.4.ebuild 1349 BLAKE2B 1e27a0335f223fcab2330c4650a736f6c7c595c711ba1be8f04eec3375ead89f735c347eb2231d3ea2ba29153d713e63b354d4623012cf4ad94bcca338154ea6 SHA512 bc8c191d8c2bd6e507080cc845f71ea4533791499af345b23742d6a5710d2d5322884e8c6a2ebb3e8087eeda25fc09bc839dc72d1e03ec6a1f30daf28627a322
+EBUILD zathura-9999.ebuild 1349 BLAKE2B 1e27a0335f223fcab2330c4650a736f6c7c595c711ba1be8f04eec3375ead89f735c347eb2231d3ea2ba29153d713e63b354d4623012cf4ad94bcca338154ea6 SHA512 bc8c191d8c2bd6e507080cc845f71ea4533791499af345b23742d6a5710d2d5322884e8c6a2ebb3e8087eeda25fc09bc839dc72d1e03ec6a1f30daf28627a322
 MISC metadata.xml 763 BLAKE2B 1a98b02634dd4017052820cb2103b81d7bc8308c8832edb28f65127f43e9a673926b76091e2062a66c701b25e9d5866051e2268fa3fb4f53a681257132618789 SHA512 5afbabe1726a25ba2b0ae5c66533bbc247deaf1c745534487895bfafa2671ba87d9fc4333ac824176f78db64a940cc53a87d018fa4d7e5d201cfc6f41cfb50d6
diff --git a/app-text/zathura/zathura-0.4.4.ebuild b/app-text/zathura/zathura-0.4.4.ebuild
new file mode 100644
index 000000000000..83ead1f313eb
--- /dev/null
+++ b/app-text/zathura/zathura-0.4.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc +magic seccomp sqlite synctex test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-libs/girara-0.3.3
+	>=dev-libs/glib-2.50:2
+	>=sys-devel/gettext-0.19.8
+	x11-libs/cairo[X]
+	>=x11-libs/gtk+-3.22:3
+	magic? ( sys-apps/file )
+	seccomp? ( sys-libs/libseccomp )
+	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
+	synctex? ( app-text/texlive-core )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="doc? ( dev-python/sphinx )
+	test? ( dev-libs/appstream-glib
+		dev-libs/check )
+	virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		-Dconvert-icon=disabled
+		-Dmagic=$(usex magic enabled disabled)
+		-Dmanpages=$(usex doc enabled disabled)
+		-Dseccomp=$(usex seccomp enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsynctex=$(usex synctex enabled disabled)
+		)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index fcb0645c0898..83ead1f313eb 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils meson virtualx xdg-utils
+inherit meson virtualx
 
 DESCRIPTION="A highly customizable and functional document viewer"
 HOMEPAGE="http://pwmt.org/projects/zathura/"
@@ -13,36 +13,41 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 	EGIT_BRANCH="develop"
 else
-	SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
+	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"
 SLOT="0"
-IUSE="+magic seccomp sqlite synctex test"
+IUSE="doc +magic seccomp sqlite synctex test"
 
-RDEPEND=">=dev-libs/girara-0.3.1
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-libs/girara-0.3.3
 	>=dev-libs/glib-2.50:2
-	dev-python/sphinx
 	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo
+	x11-libs/cairo[X]
 	>=x11-libs/gtk+-3.22:3
 	magic? ( sys-apps/file )
 	seccomp? ( sys-libs/libseccomp )
 	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
 	synctex? ( app-text/texlive-core )"
 
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
+RDEPEND="${DEPEND}"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="doc? ( dev-python/sphinx )
+	test? ( dev-libs/appstream-glib
+		dev-libs/check )
+	virtual/pkgconfig"
 
 src_configure() {
 	local emesonargs=(
-		-Denable-magic=$(usex magic true false)
-		-Denable-seccomp=$(usex seccomp true false)
-		-Denable-sqlite=$(usex sqlite true false)
-		-Denable-synctex=$(usex synctex true false)
+		-Dconvert-icon=disabled
+		-Dmagic=$(usex magic enabled disabled)
+		-Dmanpages=$(usex doc enabled disabled)
+		-Dseccomp=$(usex seccomp enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsynctex=$(usex synctex enabled disabled)
 		)
 	meson_src_configure
 }
@@ -50,13 +55,3 @@ src_configure() {
 src_test() {
 	virtx meson_src_test
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index fdee975782e2..2ef4674d5a10 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 87fec053d7d8..9b33793775ae 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,6 +1,4 @@
-DIST gentoo-syntax-20181023.tar.bz2 18299 BLAKE2B ea037425ab00b05e4a52f943817fb264492793c842b6c9250450ab715fafebc55d0b5b95ff49945f62258f2dc70f357eeef3a5d908592c995cdc6e940f2f15af SHA512 a6bd592dd46ad80a4126321826dbbc4c130624027e7e71f0ea87fb164963e980e3ab3e1db1e87ee0ddad602f2ea2e9e7d955a0016c00eb8aef4c01c29057b737
 DIST gentoo-syntax-20190609.tar.bz2 18401 BLAKE2B db738540fc85d8edd0269ade33e174db08b9231237f1138da9a3f6ecff7c188a041b312975629be652a5384d0c914ad8d7a3ac5ef14670e4bc0859fbdf3dcbc7 SHA512 70fbf6e37eee2e5b007eb59b76492f41046884a8310a6074ca5fbab666ec74d46ab3e57bbf2ae784db2e17bfd1c4801b18b71cf37f746e02ff640de1f6821ec7
-EBUILD gentoo-syntax-20181023.ebuild 1289 BLAKE2B eb217dfaed0680a9dd2e4c6727ee4f07255b04187887f5cff6eada0b56a77ba290173db5394212fe6700750bf9dc73d68170be347f2590723b8c381d2e0e42c9 SHA512 0992ed4df494b14567d259b65e6d15978e3f92f29d54f72c7f72920bbdb2d8fa796d4bfd659b5653c522998eb7f4073a688da84aa1637fa2f6409107f8a880f1
 EBUILD gentoo-syntax-20190609.ebuild 1289 BLAKE2B eb217dfaed0680a9dd2e4c6727ee4f07255b04187887f5cff6eada0b56a77ba290173db5394212fe6700750bf9dc73d68170be347f2590723b8c381d2e0e42c9 SHA512 0992ed4df494b14567d259b65e6d15978e3f92f29d54f72c7f72920bbdb2d8fa796d4bfd659b5653c522998eb7f4073a688da84aa1637fa2f6409107f8a880f1
 EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
 MISC metadata.xml 585 BLAKE2B 7f904a47ab12627ae911fa96328c50af2cb16b785fa0b60cace8a586b17de344625b749b52ef6b89b4751aba74bc25339b3e6c9105ee47d15b5c6539b5d902ee SHA512 dfed3c4c2b3697b00896591dc4b23eb6433ce77b4aaaab05119ca0b11e355e321b2cf5f0ab5e0b2dd075abd1a266908e07b80846a11d50f17155d7ab35e6c742
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
deleted file mode 100644
index f1853ed776bb..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-20181023.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
-	default
-	if use ignore-glep31 ; then
-		for f in ftplugin/*.vim ; do
-			ebegin "Removing UTF-8 rules from ${f} ..."
-			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
-				|| die "waah! bad sed voodoo. need more goats."
-			eend $?
-		done
-	fi
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use ignore-glep31 1>/dev/null ; then
-			ewarn "You have chosen to disable the rules which ensure GLEP 31"
-			ewarn "compliance. When editing ebuilds, please make sure you get"
-			ewarn "the character set correct."
-		fi
-	fi
-}
diff --git a/app-vim/pydiction/Manifest b/app-vim/pydiction/Manifest
index cfdd017e4729..5de811d040c7 100644
--- a/app-vim/pydiction/Manifest
+++ b/app-vim/pydiction/Manifest
@@ -1,5 +1,3 @@
 DIST pydiction-1.2.3.zip 475441 BLAKE2B 709d4de30d21ff0ba27b5b0c11276731bdef03d754c1799857ceba7edbea4fc0640714cda4103ed58878b02cc00feed5d6b08df2647139fa84910cf92db51dea SHA512 91da1d8a9be89095072724d77bdcaa342fbd5479f5027d7ed7bb2d4a382c7385b2b7fae91c1cd94605232b34a96370a86096e3c32db0d106cbcda2a82f409922
-EBUILD pydiction-1.2.3-r1.ebuild 696 BLAKE2B 3cbe5ad26cdf78fe9b7b5b86a4874fada7ec0807e1672fde592bbf8948bcefc42e7efb9e4551b254d442a22aa017609d5f74265cec1cfaab8a731252d0d41469 SHA512 0c879875cd8dc4928d385048fa9b92a1c8f2f25810764d3d2417232b6e62b58398d0dd4d2bc5b2d2797d0829f73d165c8b83e9800640ac016e2ebf3d166718d5
-EBUILD pydiction-1.2.3-r2.ebuild 943 BLAKE2B a47b3f982ead8e42ab6b70a093adb22db14e56df41e5a9cb56e6b9a6448ca0d352ec35c8d29b460d117dba24f24cc0dcaab63fd8eee1553c5ab6110bb95d61b6 SHA512 b21910ce6ed256798b36398230a86d761022cdeabdf6de06a54389c864b69faeb115e3472da16e8e5e27719818c6edfc83abf378832fc4700b0061ac77064969
-EBUILD pydiction-1.2.3.ebuild 598 BLAKE2B 240a494c6547fafa7d1f98a241a9e3072e4c758b1dcb7bc9f3bd6996d33ba94df765fd5ff8993729d49570e96416bc59b60c15644971625fec7e7786e79b2b56 SHA512 11d845c3d011daab5bcc676581a347974731166f689e7c2e41f6a0fe680f865079c2275d14632c3cbd901b187bb1ee3a829a07ceec77f32332f66ec74ca6d5e6
+EBUILD pydiction-1.2.3-r2.ebuild 939 BLAKE2B 644f6d8d022791ca1c7f9f6f41d0ca0f01efeeb7dd7dd0b76a83652baa4004e849c730724b56f0ccd507aa14e032a3784d2be8c8f4280d2f5f256dba6125a161 SHA512 1bfac6b60ee74c5adae8215034a9fa62558fbf805645cb72cd299ba3608f08a246d55ee72516dab49953613e80e1b32efcf1896f68f57bbf9f5aa1cff1dc5f14
 MISC metadata.xml 361 BLAKE2B 4cd18ca933890f32a2aca909c66c48ea1539fc4d4d558657e5fb76c66a26be7c9b24882b7688b54407e044ba1e4d641e659da10065360ddba91dad4aa391da5e SHA512 f205ce2b8f61bcc7d966345b9928efccdc2adb4ce6a36166c774134bd8959a3757a3a9a556aaa2d6c6f7b71b945be84e41903a58e66f844c4258326a66b2b667
diff --git a/app-vim/pydiction/pydiction-1.2.3-r1.ebuild b/app-vim/pydiction/pydiction-1.2.3-r1.ebuild
deleted file mode 100644
index 12ae4f48a14f..000000000000
--- a/app-vim/pydiction/pydiction-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit vim-plugin python-r1
-
-DESCRIPTION="vim plugin: tab-complete your Python code"
-HOMEPAGE="https://rkulla.github.io/pydiction/"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
-
-LICENSE="vim"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="app-arch/unzip"
-RDEPEND="${PYTHON_DEPS}"
-
-S="${WORKDIR}/${PN}-master"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	local pyfiles=( complete-dict pydiction.py )
-	doins "${pyfiles[@]}"
-	rm -v "${pyfiles[@]}" || die
-	vim-plugin_src_install
-}
diff --git a/app-vim/pydiction/pydiction-1.2.3-r2.ebuild b/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
index 7e8c76ffa53d..8ef22c6cc197 100644
--- a/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
+++ b/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://rkulla.github.io/pydiction/"
 SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="app-arch/unzip"
diff --git a/app-vim/pydiction/pydiction-1.2.3.ebuild b/app-vim/pydiction/pydiction-1.2.3.ebuild
deleted file mode 100644
index c4fae8228716..000000000000
--- a/app-vim/pydiction/pydiction-1.2.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Tab-complete your Python code"
-HOMEPAGE="https://rkulla.github.io/pydiction/"
-SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
-LICENSE="vim"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-lang/python:*"
-
-S="${WORKDIR}/${PN}-master"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	local pyfiles=( complete-dict pydiction.py )
-	doins "${pyfiles[@]}"
-	rm -v "${pyfiles[@]}" || die
-	vim-plugin_src_install
-}
diff --git a/app-vim/vimpython/Manifest b/app-vim/vimpython/Manifest
index 2fd22460adc8..dd98aa64c14d 100644
--- a/app-vim/vimpython/Manifest
+++ b/app-vim/vimpython/Manifest
@@ -1,4 +1,4 @@
 DIST vimpython-1.13.tar.bz2 4270 BLAKE2B 7973aea8ea397f3f2edcf8a2845ab47cad3015925dd9e42e37a7ada47f25073b68d6d8f8c378a86d90e39c0aae63aba784753679b4d04a5aad268db157400ae2 SHA512 467217ad160f02d3ecdc8c43e35966e496e6c5f99bef115bd4905795c0fd5b8f68f68bc8edd64ca1dbb1c6fbc088ef6ae996f524f0343943702f2a92dcc144ce
 EBUILD vimpython-1.13-r1.ebuild 385 BLAKE2B fb67a5dc1f6072159f92d02dbbc205e8869ddbc8b62669098cae1533f7b7fe5fd80e2783690e2b504ea4a5cf390d1a3a7df4a9d98ed9a97a47b42ae749f0c15a SHA512 5427cad779f09e12eb12510db56ebd6eee635127725120a0a95276de44121a9d757223eff8e2ec52b7ef44b64892db8ed60628c00acd31e52c3309c6d5cdbfa4
-EBUILD vimpython-1.13-r2.ebuild 484 BLAKE2B 59b60e61cd592de8ee530d111daad2b0ebf65d5c2a74789e9fc1b7a8f5db6a3bbe23108add554e83da7af8da6331a925aa4dad02a9085893b2c1875b547a13db SHA512 7caf3cffd51c23816c6a94ea57ffea9e2ebc6231f721901e1f793724b503b74be0d551f0444ad499d9433842052da44284c849675eff3d59a045f3b847378cf6
+EBUILD vimpython-1.13-r2.ebuild 479 BLAKE2B 2faef39f1207b4bbad70251fb373c13e6a6fcf1280e1ab8a8ceeb0b6111ed95c1c1de0903dcb23354a3397f2af7a27e05b71aec6a7e7fc3efa4bfd839266ef8d SHA512 4cec1c9c4a22d0a7641da4c6199fa273bb8217bda44afaa0b061e61dd4b93149a8e16ad06fdaa9ab3b23f7ce62c0d5f81425e7762d88ffa9ff45fb51a407ccb1
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vimpython/vimpython-1.13-r2.ebuild b/app-vim/vimpython/vimpython-1.13-r2.ebuild
index 994b4447c131..3713d9288a6a 100644
--- a/app-vim/vimpython/vimpython-1.13-r2.ebuild
+++ b/app-vim/vimpython/vimpython-1.13-r2.ebuild
@@ -10,7 +10,7 @@ inherit vim-plugin python-single-r1
 DESCRIPTION="vim plugin: A set of menus/shortcuts to work with Python files"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=30"
 LICENSE="vim"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index bd097bf098a9..cc06e3f1fdad 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 1597af2b7522..f9119a43e857 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -6,5 +6,7 @@ DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6
 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4
 EBUILD gprbuild-2017-r1.ebuild 2207 BLAKE2B 50a99fa4729a7cb8a9689fa23b6f764be7077094101aa7dbe7452002b7b0c5602dbd82924ef1a6252ce6c973ec5f1ed687ef1d773b43ada1d0a5c707c97d564c SHA512 0c0d40bcd506f86da9e9b1e2d1d57163de5e3dc12095e6566251a673ddc236e099460a83be1a47e2b103d30474c168240257a442ebc5f727633fa6608e105b7b
+EBUILD gprbuild-2017-r2.ebuild 2014 BLAKE2B dd2cb7b034c31a40680fd678660910201a91ec23ec3b129a8fcde8c0f758925ceaf163255b49e3901ce5b0ce453aea1f3f8a6d8749c2445df50fab9989b1f220 SHA512 e3814bdcec878ee688fe139fee18ec9ac4e7518c9ba56c6e39c3b0f69851f545fbf299e834c653ada165b05f33bc0886ae19a17c08fcd9134067c858c61569bf
+EBUILD gprbuild-2019-r1.ebuild 1879 BLAKE2B 2f997113f251f4df41965a0db7a0959142d9b6906424054e3bc2104800385fb7e41d17f9a7929de4d30a217c3f8de47227cd75a277b08c08b4b38cdafd01bba4 SHA512 9c3b31e13b4bf08d16db59b390e7882b1842f1feaa28d142915141cb43fbe25e2c485817f4586c5c7af3af76a0b02dd5da86c8ae658474e25de6ae5f69bdadd2
 EBUILD gprbuild-2019.ebuild 2173 BLAKE2B 9d2e45af39dc7ba00768f6e2dad33b45bb41d356302e3b95ba8f563723ef6a1c6a963feebbfe7b48a11b674a81eb10953c406a5db6194d65fb87e6e1c82f0ff0 SHA512 971ff937c6b44df9d953b0e229bee3a09fd958b64925c295f7c75bffb20a7db693899731c46971f790c550d1c850163af63b711ed0474102adb7ee4124178519
 MISC metadata.xml 806 BLAKE2B 9d6978348f59b502b01b50115341a30ee205bc7022197e70be4048e59b510bded9a1b292e8c33085a59291b2322bb14a1bbcb6f1a779f13189aa7d8e816c8d62 SHA512 76843dcfafdee7a423975793838849602b7ecc437704932d852cff87000bd1ab98c36ea33cb9a07ca09ee40eb728df1c78b4f6aa37a11ae9fe3f8bd74d83138f
diff --git a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
new file mode 100644
index 000000000000..4f38907463ff
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_201{6,7} )
+
+inherit ada toolchain-funcs multiprocessing
+
+MYP=${PN}-gpl-${PV}
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="
+	http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7
+		-> ${MYP}-src.tar.gz
+	http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
+		-> xmlada-gpl-${PV}-src.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${ADA_DEPS}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}-src
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-config.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@VER@:${GCC_PV}:g" \
+		share/gprconfig/compilers.xml \
+		share/gprconfig/gnat.xml \
+		share/gprconfig/c.xml \
+		share/gprconfig/linker.xml \
+		|| die
+	sed -i \
+		-e "s:@GNATBIND@:${GNATBIND}:g" \
+		src/gprlib.adb \
+		|| die
+	if use ada_target_gnat_2016; then
+		sed -i \
+			-e 's:"-no-pie", ::g' \
+			share/gprconfig/linker.xml \
+			|| die
+	fi
+}
+
+src_configure() {
+	emake prefix="${D}"/usr setup
+}
+
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+lib_progs="gprlib gprbind"
+
+src_compile() {
+	local xmlada_src="../xmlada-gpl-${PV}-src"
+	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+			-largs gpr_imports.o || die
+	done
+}
+
+src_install() {
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gprconfig
+	doins share/gprconfig/*
+	insinto /usr/share/gpr
+	doins share/_default.gpr
+	einstalldocs
+}
diff --git a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild b/dev-ada/gprbuild/gprbuild-2019-r1.ebuild
new file mode 100644
index 000000000000..025a4ab8e393
--- /dev/null
+++ b/dev-ada/gprbuild/gprbuild-2019-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_201{7,8,9} )
+
+inherit ada toolchain-funcs multiprocessing
+
+MYP=${P}-20190517-194D8-src
+XMLADA=xmlada-${PV}-20190429-19B9D-src
+
+DESCRIPTION="Multi-Language Management"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="
+	http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093
+		-> ${MYP}.tar.gz
+	http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5
+		-> ${XMLADA}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${ADA_DEPS}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MYP}
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@VER@:${GCC_PV}:g" \
+		share/gprconfig/compilers.xml \
+		share/gprconfig/gnat.xml \
+		share/gprconfig/c.xml \
+		share/gprconfig/linker.xml \
+		|| die
+	sed -i \
+		-e "s:@GNATBIND@:${GNATBIND}:g" \
+		src/gprlib.adb \
+		|| die
+}
+
+src_configure() {
+	emake prefix="${D}"/usr setup
+}
+
+bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
+lib_progs="gprlib gprbind"
+
+src_compile() {
+	local xmlada_src="../${XMLADA}"
+	incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
+		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
+		-I${xmlada_src}/input_sources"
+	${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
+	for bin in ${bin_progs}; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \
+			-o ${bin} -largs gpr_imports.o || die
+	done
+	for lib in $lib_progs; do
+		${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \
+			-largs gpr_imports.o || die
+	done
+}
+
+src_install() {
+	dobin ${bin_progs}
+	exeinto /usr/libexec/gprbuild
+	doexe ${lib_progs}
+	insinto /usr/share/gprconfig
+	doins share/gprconfig/*
+	insinto /usr/share/gpr
+	doins share/_default.gpr
+	einstalldocs
+}
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index ebbdc81c6afd..9d09c620dc85 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -3,5 +3,6 @@ AUX xmlada-2019-gentoo.patch 1053 BLAKE2B 33403adf7bf4f774d7fbcf9f07fe0d248a0c7e
 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380
 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430
 EBUILD xmlada-2018.ebuild 1871 BLAKE2B f36dba5e21dadead63933f44e9b62da81ba3a40e523f92485515c7b9ccda27a84ba454325cbd7155de2da0552708266d4d05907255c852eef685e7ff007093fb SHA512 0753455dcdcc5f9e95d3966cdfffaf4fc7598f75efdc175f401ef759edcf86f89039b5035ca469399b3c67ef6e73387ec5aa53ff2145632e0b0809979d0a2580
+EBUILD xmlada-2019-r1.ebuild 1760 BLAKE2B f000cdddea75795f2055eae70c5b6f14008360ebe94a1b7f8a61f09aff4d16b0c16ab5ff08b54bcf6cd5192487e25fd38b1d67e32e35f061ca5123723f4dafff SHA512 74539bac335d7fd8af83648b303573d067df44250e79679d4ce224bbfc5b55838e1e3d54c538121163a8a93b0aff36a9f3177c80cb386a84ec062f7db25fc338
 EBUILD xmlada-2019.ebuild 2007 BLAKE2B 41f019a98cdbc81ac952ed4048de4f9bb9371f24edcbfd60fcf2c1f5cc33f275719a981723bc0542155df065d3c1df5f2dd6f18ccb21512fec7f4883ce67816e SHA512 bba6ad966ebb6ae63668856446b646be6f6a90e33030760f1d9b734084c52663dbf05d2ba096afd18a29772e0b735b76226781b8370b95ddfe5344bd426d5f0f
 MISC metadata.xml 907 BLAKE2B c57fbc3e91a6647b5687dc02c78986d161d6a8482119984a420685ce5366a4e0901aca404d066259b1e8384ba45875f15e54810d6d0fe97812ed3fb1983f1a91 SHA512 eb1acaf3359b0ca8544e07e5681ec2ab800581401644f3ee2313dcca9be163e2bdeac16b551aacb19402fd13c18e0787850fb5529382e3e0e77ba4a1b420f53a
diff --git a/dev-ada/xmlada/xmlada-2019-r1.ebuild b/dev-ada/xmlada/xmlada-2019-r1.ebuild
new file mode 100644
index 000000000000..994bc36f6f57
--- /dev/null
+++ b/dev-ada/xmlada/xmlada-2019-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_201{6,7,8,9} )
+inherit ada multiprocessing
+
+MYP=${P}-20190429-19B9D
+
+DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
+HOMEPAGE="http://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5
+	-> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure () {
+	econf --prefix="${D}"/usr
+}
+
+src_compile () {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
+			-cargs ${ADAFLAGS} || die "gprbuild failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+}
+
+src_test() {
+	emake test
+	emake run_test | tee xmlada.testLog
+	grep -q DIFF xmlada.testLog && die
+}
+
+src_install () {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
+			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
+			--install-name=xmlada --build-var=LIBRARY_TYPE \
+			--build-var=XMLADA_BUILD \
+			--build-name=$1 xmlada.gpr || die "gprinstall failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+
+	einstalldocs
+	dodoc xmlada-roadmap.txt
+	rm -f "${D}"/usr/share/doc/${PN}/.buildinfo
+	rm -rf "${D}"/usr/share/gpr/manifests
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 7e96e89812cb..759d12f2f833 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index 5707a960f503..bff61aa05416 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -5,9 +5,7 @@ AUX glog-0.4.0-errnos.patch 4580 BLAKE2B 9a7f86fb2dbcab68948914dcef74e1e08750462
 AUX glog-0.4.0-fix-test-on-ports.patch 804 BLAKE2B a06a45c977ab55f086e707ad2ea113d93dedb2710fc1cf12fafc700702eb8be5812b73ea4b941355ec948d4659963e1bc7829df12a4da9ba7b80caa3d6ca20e7 SHA512 dd787c363a08810abec89f64b5aa0f77206a0963af1a0fcf5b91549528df875e83cf736cfc2d9eff63007c2d25d0ba71092368272bb5588525cf9af6300ea9a0
 AUX glog-0.4.0-fix-x32-build.patch 913 BLAKE2B fc7d4e452580b8ca073439782204da8d04fd36dfc6f06e19426d980127b505a68fc8044b62b04fee5a9b218167a2e119307ea4ec1915807ee6a3ebf89aea83a9 SHA512 2c0bd65824e0ed9923c328554a6dad25d9a02b776e465044a8197416a14da5d986ea9b9394e2da2e6981a1d4149ad67d22b753566177da8c13c0e481432f4e54
 DIST glog-0.3.4.tar.gz 522508 BLAKE2B 4a188d5998005b29afc52f2ea548f33e06a68da993bb74960e5aedb214ec52ef9e9fc39efb1a34f38f217b92df7db064ff01d58df36c3e4ad789becc97335ec2 SHA512 139525b546a9eccacc9bebf7cc3053ba52229e9488485ad45344c3d3134ca819d3b571250c0e3a6d84097009c8be89b0f4fa16ef5ec838ffcc237ae11c3a034c
-DIST glog-0.3.5.tar.gz 532275 BLAKE2B a455f3ff8fc7cf2861a4351a0305db9455bb79977e57c49b6269b3fa2c147cd9627bfaf4c7aaa04fe4a49158d79abeb5b985813fe8c473d6005e915335c0d693 SHA512 a54a3b8b4b7660d7558ba5168c659bc3c8323c30908a4f6a4bbc6f9cd899350f3243aabc720daebfdeb799b276b51ba1eaa1a0f83149c4e1a038d552ada1ed72
 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
 EBUILD glog-0.3.4-r1.ebuild 1204 BLAKE2B 9d42deb4393209103cfe12326f38ed5b43fb5ba7237716b92b011846686512ba83c6e703993dee40307ea6a66406467d90eaf199ac8d271c83ea775c0e2ded30 SHA512 184fb374d97f3b0ce68fd2eac0c39fc60e35b774f200eb38f91be810ccf7b4adc2bc2f33e3fc77949ed1134f32648dcdd52f49602976a9e80ea6edeb39e8f232
-EBUILD glog-0.3.5.ebuild 1211 BLAKE2B c76e952b0489c8bfc94312add2d7ba4bed10f88417113cad09584da561cc3bf64d19af57f56a586fc839f9df92704bf0fe0d65d629d2ccc3a8b434f21bdad42d SHA512 696272905be2648db792d8b74d43b6a36e2a5ba2b1848f301b78a45dc1e3c2921687fc748a7704ae23b7b8962c7ce9b50a81fdf37711f00dafa9ef10321cf1ca
 EBUILD glog-0.4.0.ebuild 1026 BLAKE2B fa3e86848379b11f6e5b150546eca725117e8f1aa831612c9ec8a04fbb6c77df47c78eefe570d8e19c4cb1831e87065adbbc81a9600f50a5146f340bd302309f SHA512 a5daf1580a22396713804053736893290fa0fc5784074719ebd1b4b1fd270253427f59e3e00120c33706a9142d8530b8bf67a7e815b6321628c9e605d1aa748c
 MISC metadata.xml 527 BLAKE2B a0ed7bafa31a61313d12431237947a4a1871df9bd13a6c95eee61d638d79a0ac5695a3fd4cdf22b696ccf632c1fa1d25c64b834649747fdd0b869cb2ba836b8d SHA512 37ba0ce628370098503c572a1af684a262872f4af72418ea7f8d3311fc46ce5a81940c762a1cc81ed779e2919b32d10d1c0eaaccb8025fdbb171f0e6c5300d53
diff --git a/dev-cpp/glog/glog-0.3.5.ebuild b/dev-cpp/glog/glog-0.3.5.ebuild
deleted file mode 100644
index 945371f45537..000000000000
--- a/dev-cpp/glog/glog-0.3.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Google's C++ logging library"
-HOMEPAGE="https://github.com/google/glog"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="gflags static-libs test unwind"
-RESTRICT="test"
-
-RDEPEND="
-	gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
-	"${FILESDIR}"/${PN}-0.3.4-fix-build-system.patch
-	"${FILESDIR}"/${PN}-0.3.4-fix-gcc5-demangling.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable gflags) \
-		$(use_enable static-libs static) \
-		$(use_enable test gtest-config) \
-		$(use_enable unwind)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-cpp/sparsehash/Manifest b/dev-cpp/sparsehash/Manifest
index ca9af6353664..ea9622ae7661 100644
--- a/dev-cpp/sparsehash/Manifest
+++ b/dev-cpp/sparsehash/Manifest
@@ -1,7 +1,4 @@
-AUX 1.10-gcc46.patch 344 BLAKE2B 1fc47b87541612868ec90f9460f191938660a54bfcae7ebd894140b54d979700359def84c62627e53560524c84e5ca17f809eb79d103aac91939243ad7ccbd63 SHA512 10ba18dd4d102c92c467846d46288080f712f7d82b9a786daab13e74b9cbd0dd9923075d7e12288adaac68e31b96c8eb0a7d010e5d2fe3a2d2321413f2dd51a8
 AUX sparsehash-2.0.3-fix-buildsystem.patch 2649 BLAKE2B d7a5e7d4343279af069e0b8eb00ad2b8fc33e26840ee0a9ca63c73ea37aa99548d3c741d70647078424f27906946f261b07d764be9adaf47c1d13bc4bf6d302f SHA512 6732a3197550f75ce7a83d61882938d841694f41e9daec51ef36206306fdabdd33dd46eaec106a8877826098b8227368c1ed0962d36aa220abd0336713667bd4
-DIST sparsehash-1.10.tar.gz 289819 BLAKE2B fb66d945a52862465a870931b83846619fb7034b2acae053d75d859b359d866257a779d522d9267ab729d19aeac1365fc699e4a541b446f874c323f7c8ceaa0b SHA512 ecc01e755885b8da5927f4f56c95c02ce9a43e5c0280cdc1cdfa812f787396646925c0f602a35decdf94144e8d2f3ac31b80f5ed98b70ccca607a29bb11f8a35
 DIST sparsehash-2.0.3.tar.gz 322046 BLAKE2B 3749875bfbfa0ec9b92cfe68496a318208539745ca1b76910193879cb9ac790952b390cfbd941ff6e9714bd61546844e8f2d958d9b24845efeb54743facac136 SHA512 bb00d0acb8eba65f7da8015ea4f6bebf8bba36ed6777881960ee215f22b7be17b069c59838d210551ce67a34baccfc7b2fed603677ec53c0c32714d8e76f5d6c
-EBUILD sparsehash-1.10.ebuild 532 BLAKE2B f217f5ff5252e8516fc6e6817e073de8d500df0dbe296d78b3ddc8f63c1c020f83a4294e146d2328ff0a249b24c2a3863478d671da23cf61d89e00d61317d5a9 SHA512 768f1ff2c47d97ff663774a86b9540005810826dd7bf1ff5867452ef00f7f22f11dffabddc78389b09d00cdbfd27f2b5d765f90e030c32bbead6368747405184
 EBUILD sparsehash-2.0.3-r1.ebuild 520 BLAKE2B 13fdb6d8404479aa367344b2f5c49bb12074856d164123793240577aa3133214246549485cbfcf064aaf25045f2e3085ba5a1a696976b5d8a39d68ada4ffe273 SHA512 805380e93b7ef20ed633ac1971b76c0d1dba9a27687772cb1bfb067d63a575a8c59d95ffb9658a9b550b14d04927685d66dbaec00a93426c64c18dea1ff9b284
 MISC metadata.xml 253 BLAKE2B 66113301c8da953a7e3d95c7ab09c131d69d22e983dee362829ee45535b85317f752be7094a7aead5026613dbef089a39bf3ea245746c6296feea6c251508219 SHA512 35cf1768d75e03240940117dbdbc97f4e7713013af6c728eadd621576233da89dc9134e4163b41619fbd42b76fcb31707786d643fe3b09c78f26c0698b9fd427
diff --git a/dev-cpp/sparsehash/files/1.10-gcc46.patch b/dev-cpp/sparsehash/files/1.10-gcc46.patch
deleted file mode 100644
index 4339b487eca0..000000000000
--- a/dev-cpp/sparsehash/files/1.10-gcc46.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/google/sparsetable |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/google/sparsetable b/src/google/sparsetable
-index 0eeb22e..e8580b9 100644
---- a/src/google/sparsetable
-+++ b/src/google/sparsetable
-@@ -83,6 +83,8 @@
- #endif
- #endif
- 
-+#include <cstddef>
-+
- _START_GOOGLE_NAMESPACE_
- 
- #ifndef HAVE_U_INT16_T
diff --git a/dev-cpp/sparsehash/sparsehash-1.10.ebuild b/dev-cpp/sparsehash/sparsehash-1.10.ebuild
deleted file mode 100644
index b3855b668231..000000000000
--- a/dev-cpp/sparsehash/sparsehash-1.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="An extremely memory-efficient hash_map implementation"
-HOMEPAGE="https://github.com/google/sparsehash"
-SRC_URI="https://google-sparsehash.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gcc46.patch
-}
-
-src_install() {
-	default
-
-	# Installs just every piece
-	rm -rf "${D}/usr/share/doc"
-	dohtml doc/*
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 732aff873376..7191259ede93 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest
index 468b95de347d..78a5ee0b7c65 100644
--- a/dev-db/clickhouse/Manifest
+++ b/dev-db/clickhouse/Manifest
@@ -16,4 +16,4 @@ EBUILD clickhouse-19.13.1.11-r2.ebuild 5060 BLAKE2B 9dd106fcbf56f676668613defe98
 EBUILD clickhouse-19.13.1.11-r3.ebuild 5150 BLAKE2B 3224340a5229b176f033481560373c62ba3493e4f75d2d946379db1c1da8ff17180c382478572803d638e67614a4c4385a8bf1e13fb46293f0ea4a07fb9ae812 SHA512 ce24527a8c9c5802d6fb1cdc9a6c6fafa49a71d20199ae77e45da1190cd720719591009a0f2ecaad867f4f9952432d3af7ad5a39a9618f2467b2aee817d31f3b
 EBUILD clickhouse-19.5.3.8-r1.ebuild 5041 BLAKE2B aad165d484fd9a978057e57f57a12146ae97f82455ff47909a9476f04c28c95e719a7867cb2b2fe6acde25fa2e43c12de4c7c19c2c8e6f0810f4ddcf08b311ad SHA512 253de2e46d5eaba79d5d79a149e0fcc582dd08dd30a0b04fe39e2900ebf5ca68cfd7619f4c9af5d662d7baa795649a37a4db48efc6067c92fb79956a2ca9e847
 EBUILD clickhouse-19.9.5.36-r1.ebuild 5041 BLAKE2B aad165d484fd9a978057e57f57a12146ae97f82455ff47909a9476f04c28c95e719a7867cb2b2fe6acde25fa2e43c12de4c7c19c2c8e6f0810f4ddcf08b311ad SHA512 253de2e46d5eaba79d5d79a149e0fcc582dd08dd30a0b04fe39e2900ebf5ca68cfd7619f4c9af5d662d7baa795649a37a4db48efc6067c92fb79956a2ca9e847
-MISC metadata.xml 738 BLAKE2B 861f40f506964d64cf646f043406945dc54950f48e27d4eb28b6fc0f96bf0ceb093520a0b60d813460fbe8b99ba4858f0a49d30abcb25567f44411c78a02f6e7 SHA512 6d87cc967c081b5a5e60136f5928d7b17c65c3a1c26aa1e45a50e74d5383bb665682a8b0cb5cce0496bebcac1f5e27aace8a8373253c031acc3c166c382e0056
+MISC metadata.xml 657 BLAKE2B ea02627178df53a81cf2cb46f47e51ebf0437d5e70ec745a7d5d92d430e2055f3112280d3cbed5d7d7eccd1ce892ff1b184f042b850de1f9071716bda5176e82 SHA512 1a3810659c43b9191a8a37aac652c070fb05e663090575c4908e5dc248dfb1e20d9dd3d832a71b95c36b17a6f3a802dacbea2866f33c530c3d5d6c93f8a58690
diff --git a/dev-db/clickhouse/metadata.xml b/dev-db/clickhouse/metadata.xml
index 0583e43c96a1..bb224e97f7c5 100644
--- a/dev-db/clickhouse/metadata.xml
+++ b/dev-db/clickhouse/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>civil@gentoo.org</email>
-		<name>Vladimir Smirnov</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">yandex/Clickhouse</remote-id>
 	</upstream>
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 37b411a1acbc..c166424c156e 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -11,10 +11,12 @@ DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B e2cd300946a873a94beab13d9d1
 DIST mysql-connector-c++-8.0.11-src.tar.gz 2322951 BLAKE2B a1ea47c0440beae1892144186ad6b99a4519369845e1f37f5ce42088df6c29a458bd41840a1f9401dbd29827bc3a7c96ba34563a3a4cf3176e29e377cc254b9f SHA512 5113efb473b7cc63f680c04dacf5bee78d0a58ee20b41c8203edb92f8720c31c52c24de838996f25476eaa3d734c845531440317e82cb5e5f635bc03b057a148
 DIST mysql-connector-c++-8.0.13-src.tar.gz 2174609 BLAKE2B 5293ccfb7ad3bd6d50e0518db402d93f707535498ff1f608acc5c642cdc2c671601cbb7c14c7e6ec66fea8bdcb22effbb90e0ee2c207e8e82be7a2b446512f24 SHA512 0c260eff0002f5abc177049b9d050daf3b7860634355c10c02cb0ece18a3d1505454d67d8742d7e879c0cc6b44f8045f75e64d79bdd0bbfc211de9903abec902
 DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931 SHA512 9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14
+DIST mysql-connector-c++-8.0.17-src.tar.gz 3111144 BLAKE2B d828ea0a37344719ff57017c7602597e8d419456d17313bddeaa1b69c239405ba584be2961ce833f2961b6b87ff7b29560be30d3a7412955c5b7db2399802ae9 SHA512 63b3e6e4c8bae3fd9bf23342f3684cc290b98d9fcf8af1e4eb5936ad37afce1169ea0cac211be1eff6827a0517cf56f4d215fbe2165a47591d940c77e1ecfa87
 EBUILD mysql-connector-c++-1.1.11-r1.ebuild 1621 BLAKE2B fdf824ec8993976294bbc03467c63da10206bd04ed066ec33a2d7ce9310e654a0cdd1440e57517bcb22c37851310da0fb2e8e8c48696a99800da3e45cdc0c47a SHA512 7c05b18bac4af342c9feab9622e63afc916bd408a8f2b88dcf59c6192b5a62fba481b3e3f5cbca6826f61d092e7c91e9ef8f20f29b7272c11454c28a836fb15c
 EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1648 BLAKE2B 4f16129647c28a35338981d7b0efe867acc6a0aba527d26c9c79c695073d4eed57219cd740bb046a2c869326f75c101a589c4383ea876fcbd619aab15bab1db8 SHA512 382856ec409b13e3c5e96ef7f5b9282b97dcf02f6715f5c6b786e46a2859e30ee64e5911ff81b9691a379f35904fb94f7e895e747d1ed6d5804c21390ffbdbbc
 EBUILD mysql-connector-c++-1.1.9-r1.ebuild 1570 BLAKE2B 2f5d17177fe53a0ab0a70efe13d225a6982746819191719d1378b072881037ce81b0d63beb1e0e3dd9106dc04d17ef29b6ac010831734fca2f184901568ba2b2 SHA512 ce9598a2a5f8924cb24822dec8b5349f1655148ba7aba234e324912999d7a5df054a3b3d78c7e9c33c909d046d28bceb9322dc1848370fbed00b27941d49d387
 EBUILD mysql-connector-c++-8.0.11.ebuild 831 BLAKE2B cd00b3ef8d70e64c8fa7d4852a45d58f060fa443dfb90ebffdb3fa11310d4afabf0396eb05ec4af04b2d3fb3115f38b10eb76a1a302d9d7a1cbb5b4f7e61fda0 SHA512 8de6feaa69664b8faea224769777b7050470fd0b60c0d317e00049bc0e29471bac94274ae0da4239ff211651bf3775df0526d29a02d39d88b1d107bddbb44ee0
 EBUILD mysql-connector-c++-8.0.13.ebuild 840 BLAKE2B ad79745000c37f90f50ffb434613bdabcdf7cc8c8fb93e24e2148f08e65414f5bfcbd792a6b942494b776bbcd8b0717760d8576dc77d78607aeba473a2e5878a SHA512 8ed227a9269efc07223a71798225f4e573904aae94126c549e32abcf4e02459269c570a7d8e4e4db3ec7a825636a77feab6b1752ceaf23d4416cc42d4ea94e8b
 EBUILD mysql-connector-c++-8.0.15.ebuild 909 BLAKE2B 3a0fa261424e3ce299cf1d10ff5ace8e8bedc4e91fd0eb098916ca1b2d2353562a21d4aaf3fb73c119a665ad64da113036fba6ad9a02a6199306cece67b1f835 SHA512 32c8692e66ed3805c3e01ad5b4e66b04bc0a750e1fd270fc52f70777242abd21d5f11acdff27210b9194190e2ea1bfb3d203e264986c985f0d13210618e51047
+EBUILD mysql-connector-c++-8.0.17.ebuild 909 BLAKE2B 3a0fa261424e3ce299cf1d10ff5ace8e8bedc4e91fd0eb098916ca1b2d2353562a21d4aaf3fb73c119a665ad64da113036fba6ad9a02a6199306cece67b1f835 SHA512 32c8692e66ed3805c3e01ad5b4e66b04bc0a750e1fd270fc52f70777242abd21d5f11acdff27210b9194190e2ea1bfb3d203e264986c985f0d13210618e51047
 MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.17.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.17.ebuild
new file mode 100644
index 000000000000..2b7374017ca9
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.17.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-utils
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/"
+URI_DIR="Connector-C++"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+legacy libressl"
+
+RDEPEND="
+	dev-libs/protobuf:=
+	legacy? (
+		dev-libs/boost:=
+		>=dev-db/mysql-connector-c-6.1.8:=
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${P}-src"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.0.15-fix-build.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSL=system
+		-DWITH_JDBC=$(usex legacy ON OFF)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4bc29699cba4..0a9474c7ab07 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -12,8 +12,8 @@ DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B f9f46e5fdc3e9869b203626bc09edfb
 DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830 SHA512 c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28
 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
 EBUILD mysql-5.6.44-r1.ebuild 27130 BLAKE2B d42d26aa3282093b81c795f1ef909487831cede065a996d814850fb4c638c848d278ba0ef0d8275a2ef1c91c5832977d7c2aa3085f324ddb03a2ac25b1607916 SHA512 16e437ee7e8497b84dabf1698f701ff46c096530acfa5d211c9ca96fa538b0014f8571e2fce64182c2d497155383353bdc38a69a68dd7d333c96e9175cea804a
-EBUILD mysql-5.6.45-r2.ebuild 27084 BLAKE2B 41a60964a02aed1f7e63bfac0f162cb53a6afcb3cb9bd8813930449798ef799647a540edd201f20f4ceecef4548073dd47395bac2a5c81fa8db96b15d08f7837 SHA512 8546965f0a26fe6349322b90b7f83e27815e5da9dcd78ab290e70293e7c52cc579dfe6830e3f65f5f2b944cd7ae122a87ffbe3b3dec687d3a4410bbb0be423c5
+EBUILD mysql-5.6.45-r2.ebuild 27083 BLAKE2B 123764be11a68c1b0b157c826ec8d17aad850ee0d926c2fce2ee8ac3e3ff3ffa78c2836b640a0cdfc47000393d49d904d202a863c17777bd15ff55d49ee96f7a SHA512 f443c66a8432da00c7b4d1b77ed822e62340b29c81de20715ff501984eab186cc50b6b1506257e53f17c4b3318388ec32d762021ec88006d372d3e86ae841494
 EBUILD mysql-5.7.26-r1.ebuild 31717 BLAKE2B 3085f70b4a76baaf7f94ac8fe5e37b9c3470b6537a88a626236232dec1c2cf234f4d25f83ab7bfd92fba1881b4080039c0259c4485259be472c8833cfcb71b6d SHA512 6663432102f90d9d2cbda3937c1a5e1dc9a01e4d6599bc517e0303e73beda60766be930cd9695fb4d0a65ea6e746c27f5449eda2e64e0268e670d0f5660040fb
-EBUILD mysql-5.7.27-r1.ebuild 31748 BLAKE2B 230fa18f6fc87a0e8d9528a08dd91707cfbedb308c9586cb84eaf185a027a7e875ec2af35565c804ae5156cc50cc08b3439e6ffc353ba95c5cef7e05ddbe4f7e SHA512 0da16aeb3fd930b128dd938b898804ba2e41f7f55fca167ed046af08e9bdb2ccbf0324ea06d11bc236105ca3b94181d8110449ff293935f907d823741ed78c58
+EBUILD mysql-5.7.27-r1.ebuild 31746 BLAKE2B f9141ed6a27a8b68ac39fd1085a56b9f30f05a45861080731c24de0eddae3485a46f466f1d0e7d0a71022e665807365a674cf21dee4769b6308378dba68dd8a7 SHA512 21dae5e90669bae488ab165751da1978fd5c4b4be67a6a14da876ca9d031d3eda2b25afff5584c1f803a6e031fcdafe3ffcc29f6cc30b697124b63838bda12e1
 EBUILD mysql-8.0.17.ebuild 36451 BLAKE2B 9e81d30e5f0569790047ba7484ebe47cd70bc709ef4eca59caa5fdd2aeed4c4fddada4cfa1bbe5f298d759fc30e496d9fbe5ece7925d08eb8153cb507ada30d6 SHA512 ceeefc52d0a62cba8af57fed0a137e0317c4db39f237d31a9991611ef84ddade142287194d84e3f1dcba4ebd5c1a63c85821a2bfc2642adc0f0ebd45ed6270d2
 MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
diff --git a/dev-db/mysql/mysql-5.6.45-r2.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild
index da38c876ad50..a465deed7e25 100644
--- a/dev-db/mysql/mysql-5.6.45-r2.ebuild
+++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild
@@ -37,7 +37,7 @@ RESTRICT="libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-5.7.27-r1.ebuild b/dev-db/mysql/mysql-5.7.27-r1.ebuild
index 2edc05182a40..99df72c5e56c 100644
--- a/dev-db/mysql/mysql-5.7.27-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.27-r1.ebuild
@@ -34,7 +34,7 @@ RESTRICT="libressl? ( test )"
 
 REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index 3af572363979..56122b928d14 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -38,5 +38,6 @@ DIST instantclient-tools-linux.x64-18.5.0.0.0dbru.zip 1143747 BLAKE2B af5e70e1ad
 DIST instantclient-tools-linux.x64-19.3.0.0.0dbru.zip 1085243 BLAKE2B abcdf61f01e2bc67610043f1a66015050908f2c09f6aa8b615fd9e8b19a94a161d20b372119bc1bfc1a8ca8511a3859f67c48a39a3c2509fa326a350d7614721 SHA512 33df3a1c19d55ba94e0851bb4eaa83e0bfa72a132de2f5b98bb2a1b0528abee319b20211c7f08719c58250579506cda5c1f4de726f7b1e7c1c484dcb3986e43b
 EBUILD oracle-instantclient-18.3.0.0-r2.ebuild 12167 BLAKE2B 40c852da52c88e48aad4b36a10bd391b92295fd7ed45a6bb054c6e2766e70e1ca9c2aeb78768c724f4a191130aa32421ab1d946c2a9b0d700f46afb9ae9877d9 SHA512 fedd20c039cd8d8dfc0b0b10ddfa0939177fa5e393cced2b713642a1b74710e265221b7eb4b0c1436407bc4ba84362f766aca54c7b5bda0d6445c8e7426a5a6b
 EBUILD oracle-instantclient-18.5.0.0.ebuild 11891 BLAKE2B fd3cef07338af39b511497540c8527fceb0e7f5c47366413f6245cf0c36dbe560bbe49a5b748c003eff61f3e5758227ff7b2cd2975a3f5fbc2a8260fbfc7fae6 SHA512 02a4b7dca6942aa10d920419e06c31493e4256fd47dd72f88d94c650ff6baae2216ecf63c73b463019d7aa5268f462277b0cdf559461d074dcb7179a8a14b8f7
+EBUILD oracle-instantclient-19.3.0.0-r1.ebuild 12164 BLAKE2B ecec46f9af808ab224ab1ea2af4139ff3fd7bf61d1c9ecc85cf56f07c2f8cf527fcf2721ed1f7e43dd69ee66c2e5888cbac8e3f263268cf57205d60eaa7faa67 SHA512 6f9a018423d8887a9e7da46e1ad9706928b9173a96b6cb23a9621cd5986a9b689c0f7c12d1bead88f39ee54114207aec8f37afd013c9d236933c4a66582aa7be
 EBUILD oracle-instantclient-19.3.0.0.ebuild 12160 BLAKE2B ea7c78ea1443b4a606b1721646f73fd5f221d7cb53426d1c2a9873988537b1063b91a44fed8b5b8c700cf1c268d78b1e0476a562df0644d0b8af08f868f82ecc SHA512 84592ce3a943e79c91f4d845229149d917a786e5f9ba133f47a5801b28fb338d6c77fb16e93b9e23104a429a2d2d22bddced643a0e0838e59e65c57de2246e95
 MISC metadata.xml 957 BLAKE2B dfe01a80765d0ec1afac4a5045e2081e39ee9060a17f278b6eb7cfae7670ec102a504397d037b2b8d8ad82d242a9fa3ed1d4309b25158b934f8674a062dec53e SHA512 dd8c982f1ce276e7701e6b82b71e2464eaa21e413115c2a4d3bbd49053539ff3a9bcfc84252ef7aa9c39d36054fee119002716de5d525a20bb1f2da0d44b3c89
diff --git a/dev-db/oracle-instantclient/oracle-instantclient-19.3.0.0-r1.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-19.3.0.0-r1.ebuild
new file mode 100644
index 000000000000..27567e45538c
--- /dev/null
+++ b/dev-db/oracle-instantclient/oracle-instantclient-19.3.0.0-r1.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils pax-utils multilib-minimal
+
+DESCRIPTION="Oracle 18c Instant Client with SDK"
+HOMEPAGE="https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html"
+
+MY_SOVER=18.1 # the library soname found in the zip files
+
+IUSE="jdbc odbc precomp +sdk +sqlplus tools"
+REQUIRED_USE="precomp? ( sdk )"
+
+MY_PVM=$(ver_cut 1-2)
+MY_P="instantclient_$(ver_rs 1 _ ${MY_PVM})"
+
+MY_PV=$(ver_cut 1-4)
+MY_PVP=$(ver_cut 5) # p2
+
+MY_PLAT_x86="Linux x86"
+MY_BITS_x86=32
+MY_A_x86="${PN/oracle-/}-basic-linux-${MY_PV}.0dbru.zip"
+MY_A_x86_jdbc="${MY_A_x86/basic/jdbc}"
+MY_A_x86_odbc="${MY_A_x86/basic/odbc}"
+MY_A_x86_precomp="${MY_A_x86/basic/precomp}"
+MY_A_x86_sdk="${MY_A_x86/basic/sdk}"
+MY_A_x86_sqlplus="${MY_A_x86/basic/sqlplus}"
+MY_A_x86_tools="${MY_A_x86/basic/tools}"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_BITS_amd64=64
+MY_A_amd64="${PN/oracle-}-basic-linux.x64-${MY_PV}.0dbru.zip"
+MY_A_amd64_jdbc="${MY_A_amd64/basic/jdbc}"
+MY_A_amd64_odbc="${MY_A_amd64/basic/odbc}"
+MY_A_amd64_precomp="${MY_A_amd64/basic/precomp}"
+MY_A_amd64_sdk="${MY_A_amd64/basic/sdk}"
+MY_A_amd64_sqlplus="${MY_A_amd64/basic/sqlplus}"
+MY_A_amd64_tools="${MY_A_amd64/basic/tools}"
+
+if [[ ${MY_PVP} == p* ]]
+then
+	MY_PVP=-${MY_PVP#p}
+	# Updated 9/22/2017: instantclient-odbc-linux-12.2.0.1.0-2.zip
+	MY_A_x86_odbc="${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
+	MY_A_amd64_odbc="${MY_A_amd64_odbc%.zip}${MY_PVP}.zip"
+fi
+
+SRC_URI="
+	abi_x86_32? (
+		${MY_A_x86}
+		jdbc?    ( ${MY_A_x86_jdbc}    )
+		odbc?    ( ${MY_A_x86_odbc}    )
+		precomp? ( ${MY_A_x86_precomp} )
+		!abi_x86_64? (
+			sdk?     ( ${MY_A_x86_sdk}     )
+			sqlplus? ( ${MY_A_x86_sqlplus} )
+			tools?   ( ${MY_A_x86_tools}   )
+	) )
+	abi_x86_64? (
+		${MY_A_amd64}
+		jdbc?    ( ${MY_A_amd64_jdbc}    )
+		odbc?    ( ${MY_A_amd64_odbc}    )
+		precomp? ( ${MY_A_amd64_precomp} )
+		sdk?     ( ${MY_A_amd64_sdk}     )
+		sqlplus? ( ${MY_A_amd64_sqlplus} )
+		tools?   ( ${MY_A_amd64_tools}   )
+	)
+"
+
+LICENSE="OTN"
+SLOT="0/${MY_SOVER}"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="fetch splitdebug"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
+	!<dev-db/oracle-instantclient-basic-12
+	!<dev-db/oracle-instantclient-odbc-12
+	!<dev-db/oracle-instantclient-jdbc-12
+	!<dev-db/oracle-instantclient-sqlplus-12
+"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_PREBUILT="usr/lib*/oracle/client/*/*"
+
+set_my_abivars() {
+	if multilib_is_native_abi; then
+		MY_WORKDIR="${WORKDIR}"
+		MY_S="${S}"
+	else
+		MY_WORKDIR="${WORKDIR}/${ABI}"
+		MY_S="${MY_WORKDIR}/${MY_P}"
+	fi
+
+	local abi=${ABI}
+	[[ ${abi} == 'default' ]] && abi=${ARCH}
+	MY_PLAT=MY_PLAT_${abi}          ; MY_PLAT=${!MY_PLAT}         # platform name
+	MY_BITS=MY_BITS_${abi}          ; MY_BITS=${!MY_BITS}         # platform bitwidth
+	MY_A=MY_A_${abi}                ; MY_A=${!MY_A}               # runtime distfile
+	MY_A_jdbc=MY_A_${abi}_jdbc      ; MY_A_jdbc=${!MY_A_jdbc}       # jdbc distfile
+	MY_A_odbc=MY_A_${abi}_odbc      ; MY_A_odbc=${!MY_A_odbc}       # odbc distfile
+	MY_A_precomp=MY_A_${abi}_precomp; MY_A_precomp=${!MY_A_precomp} # precomp distfile
+	MY_A_sdk=MY_A_${abi}_sdk        ; MY_A_sdk=${!MY_A_sdk}         # sdk distfile
+	MY_A_sqlplus=MY_A_${abi}_sqlplus; MY_A_sqlplus=${!MY_A_sqlplus} # sqlplus distfile
+	MY_A_tools=MY_A_${abi}_tools    ; MY_A_tools=${!MY_A_tools}     # tools distfile
+
+	[[ -n ${MY_PLAT} ]]
+}
+
+oic_distfile_status() {
+	: # We must not access DISTDIR in pkg_* phase, bug#612966.
+# Not removing this lines yet, we may eventually specify this feature.
+#	if [[ -r ${DISTDIR}/${1} ]]; then
+#		echo "already here"
+#	else
+#		echo "still absent"
+#	fi
+}
+
+pkg_nofetch() {
+	eerror "Please go to"
+	eerror "  ${HOMEPAGE//overview/downloads}"
+	eerror "  and download"
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		eerror "Instant Client for ${MY_PLAT}"
+		# convenient ordering like Linux x86-64 download site
+		eerror "            Basic: $(oic_distfile_status ${MY_A}) ${MY_A}"
+		use sqlplus && multilib_is_native_abi &&
+		eerror "         SQL*Plus: $(oic_distfile_status ${MY_A_sqlplus}) ${MY_A_sqlplus}"
+		use tools && multilib_is_native_abi &&
+		eerror "            Tools: $(oic_distfile_status ${MY_A_tools}) ${MY_A_tools}"
+		use sdk && multilib_is_native_abi &&
+		eerror "              SDK: $(oic_distfile_status ${MY_A_sdk}) ${MY_A_sdk}"
+		use jdbc &&
+		eerror "             JDBC: $(oic_distfile_status ${MY_A_jdbc}) ${MY_A_jdbc}"
+		use odbc &&
+		eerror "             ODBC: $(oic_distfile_status ${MY_A_odbc}) ${MY_A_odbc}"
+		use precomp &&
+		eerror "      Precompiler: $(oic_distfile_status ${MY_A_precomp}) ${MY_A_precomp}"
+	done
+	eerror "After downloading these files (for *all* shown architectures),"
+	eerror "put them in your DISTDIR filesystem directory."
+}
+
+src_unpack() {
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		mkdir -p "${MY_WORKDIR}" || die
+		cd "${MY_WORKDIR}" || die
+		unpack ${MY_A}
+		use jdbc    && unpack ${MY_A_jdbc}
+		use odbc    && unpack ${MY_A_odbc}
+		use precomp && unpack ${MY_A_precomp}
+		if multilib_is_native_abi; then
+			use sdk     && unpack ${MY_A_sdk}
+			use sqlplus && unpack ${MY_A_sqlplus}
+			use tools   && unpack ${MY_A_tools}
+		fi
+	done
+}
+
+src_prepare() {
+	local PATCHES=()
+	if use precomp; then
+		PATCHES+=( "${FILESDIR}"/18.3.0.0-proc-makefile.patch )
+		# Not supporting COBOL for now
+		rm -f sdk/demo/*procob*
+	fi
+	if use sdk; then
+		PATCHES+=( "${FILESDIR}"/18.3.0.0-makefile.patch )
+		rm sdk/include/ldap.h || die #299562
+	fi
+	default
+}
+
+# silence configure&compile messages from multilib-minimal
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	# all content goes here without version number, bug#578402
+	local oracle_home=/usr/$(get_libdir)/oracle/client
+	local oracle_home_to_root=../../../.. # for dosym
+	local ldpath=
+
+	local ABI
+	for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
+	do
+		if ! set_my_abivars; then
+			elog "Skipping unsupported ABI ${ABI}."
+			continue
+		fi
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		# shared libraries
+		into "${oracle_home}"
+		dolib.so lib*$(get_libname)*
+		use precomp && dolib.a cobsqlintf.o
+
+		# ensure to be linkable
+		[[ -e libocci$(get_libname) ]] ||
+		dosym libocci$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libocci$(get_libname)
+		[[ -e libclntsh$(get_libname) ]] ||
+		dosym libclntsh$(get_libname ${MY_SOVER}) \
+			"${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
+
+		# java archives
+		insinto "${oracle_home}"/$(get_libdir)
+		doins *.jar
+
+		# runtime library path
+		ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
+
+		# Vanilla filesystem layout does not support multilib
+		# installation, so we need to move the libs into the
+		# ABI specific libdir.  However, ruby-oci8 build system
+		# detects an instantclient along the shared libraries,
+		# and does expect the sdk right there.
+		use sdk && dosym ../sdk "${oracle_home}"/$(get_libdir)/sdk
+
+		eend $?
+	done
+
+	local DOCS=( BASIC_README )
+	local HTML_DOCS=()
+	local paxbins=( adrci genezi uidrvci )
+	local scripts=()
+
+	if use jdbc; then
+		DOCS+=( JDBC_README )
+	fi
+	if use odbc; then
+		DOCS+=( ODBC_README )
+		HTML_DOCS+=( help )
+		scripts+=( odbc_update_ini.sh )
+	fi
+	if use precomp; then
+		DOCS+=( PRECOMP_README )
+		paxbins+=( sdk/proc )
+		# Install pcscfg.cfg into /etc/oracle, as the user probably
+		# wants to add the include path for the compiler headers
+		# here and we do not want this to be overwritten.
+		insinto /etc/oracle
+		doins precomp/admin/pcscfg.cfg
+		sed -i -e "s%^sys_include=.*%sys_include=(${oracle_home}/sdk/include,${EPREFIX}/usr/include)%" \
+			"${ED}"/etc/oracle/pcscfg.cfg || die
+		dosym ../../${oracle_home_to_root}/etc/oracle/pcscfg.cfg "${oracle_home}/precomp/admin/pcscfg.cfg"
+		dosym ../.."${oracle_home}"/bin/proc /usr/bin/proc
+		# Not supporting COBOL for now
+		# paxbins+=( sdk/{procob,rtsora} )
+		# doins precomp/admin/pcbcfg.cfg
+	fi
+	if use sdk; then
+		einfo "Installing SDK ..."
+		DOCS+=( SDK_README )
+		scripts+=( sdk/ott )
+		insinto "${oracle_home}"/$(get_libdir)
+		doins sdk/ottclasses.zip
+		insinto "${oracle_home}"/sdk
+		doins -r sdk/{admin,demo,include}
+		# Some build systems simply expect ORACLE_HOME/include.
+		dosym sdk/include "${oracle_home}"/include
+		# Some build systems do not know the instant client,
+		# expecting headers in rdbms/public, see bug#669316.
+		# Additionally, some (probably older ruby-oci8) do
+		# require rdbms/public to be a real directory.
+		insinto "${oracle_home}"/rdbms/public
+		doins -r sdk/include/*
+		# Others (like the DBD::Oracle perl module) know the Oracle
+		# eXpress Edition's client, parsing an rdbms/demo/demo_xe.mk.
+		dosym ../../sdk/demo/demo.mk "${oracle_home}"/rdbms/demo/demo_xe.mk
+		# And some do expect /usr/include/oracle/<ver>/client/include,
+		# querying 'sqlplus' for the version number, also see bug#652096.
+		dosym ../../../.."${oracle_home}"/sdk/include /usr/include/oracle/${MY_PVM}/client
+		eend $?
+	fi
+	if use sqlplus; then
+		DOCS+=( SQLPLUS_README )
+		paxbins+=( sqlplus )
+		insinto "${oracle_home}"/sqlplus/admin
+		doins glogin.sql
+		dosym ../.."${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
+	fi
+	if use tools; then
+		DOCS+=( TOOLS_README )
+		paxbins+=( exp expdp imp impdp sqlldr wrc )
+	fi
+
+	einfo "Installing binaries for ${MY_PLAT} ..."
+	into "${oracle_home}"
+	dobin ${paxbins[*]} ${scripts[*]}
+	pushd "${ED}${oracle_home}/bin" >/dev/null || die
+	pax-mark -c ${paxbins[*]#*/} || die
+	popd >/dev/null || die
+	eend $?
+
+	einstalldocs
+
+	# create path for tnsnames.ora
+	insinto /etc/oracle
+	doins "${FILESDIR}"/tnsnames.ora.sample
+
+	# Add OCI libs to library path
+	{
+		echo "# ${EPREFIX}/etc/env.d/50${PN}"
+		echo "# Do not edit this file, but 99${PN} instead"
+		echo
+		echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
+		echo "LDPATH=${ldpath}"
+		echo "TNS_ADMIN=${EPREFIX}/etc/oracle/"
+	} > "${T}"/50${PN}
+
+	doenvd "${T}"/50${PN}
+
+	# ensure ORACLE_HOME/lib exists
+	[[ -e ${ED}${oracle_home}/lib/. ]] ||
+	dosym $(get_libdir) "${oracle_home#/}"/lib
+}
+
+pkg_preinst() {
+	if [[ -r ${EROOT}/etc/env.d/99${PN} ]]; then
+		cp "${EROOT}/etc/env.d/99${PN}" "${ED}/etc/env.d/" || die
+	else
+		{
+			echo "# ${EPREFIX}/etc/env.d/99${PN}"
+			echo "# Configure system-wide defaults for your Oracle Instant Client here"
+			echo
+			echo "#$(grep '^ORACLE_HOME=' "${ED}/etc/env.d/50${PN}")"
+			echo "#$(grep '^TNS_ADMIN=' "${ED}/etc/env.d/50${PN}")"
+			echo "#NLS_LANG="
+		} > "${ED}/etc/env.d/99${PN}"
+	fi
+}
+
+pkg_postinst() {
+	elog "${P} does not provide an sqlnet.ora"
+	elog "configuration file, redirecting oracle diagnostics for database-"
+	elog "and network-issues into ~USER/oradiag_USER/ instead."
+	elog "It should be safe to ignore this message in sqlnet.log there:"
+	elog "   Directory does not exist for read/write [ORACLE_HOME/client/log] []"
+	elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
+	elog "If you want to directly analyse low-level debug info or don't want"
+	elog "to see it at all, so you really need an sqlnet.ora file, please"
+	elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
+	elog ""
+	elog "TNS_ADMIN has been set to ${EPREFIX}/etc/oracle by default,"
+	elog "put your tnsnames.ora there or configure TNS_ADMIN"
+	elog "to point to your user specific configuration."
+	if use precomp; then
+		elog ""
+		elog "The proc precompiler uses the system library headers, which in"
+		elog "turn include the headers of the used compiler."
+		elog "To make proc work, please add the compiler header path of your"
+		elog "preferred compiler to sys_include in:"
+		elog "  ${EPREFIX}/etc/oracle/pcscfg.cfg"
+		elog "Remember to update this setting when you switch or update the"
+		elog "compiler."
+		elog "For gcc, the headers are usually found in a path matching the"
+		elog "following pattern:"
+		elog "  ${EPREFIX}/usr/lib/gcc/*/*/include"
+		elog "The exact details depend on the architecture and the version of"
+		elog "the compiler to be used."
+	fi
+	ewarn "Please re-source your shell settings for ORACLE_HOME"
+	ewarn "  changes, such as: source ${EPREFIX}/etc/profile"
+}
diff --git a/dev-db/percona-xtrabackup-bin/Manifest b/dev-db/percona-xtrabackup-bin/Manifest
index 19ae01172a5f..416518ec9dfc 100644
--- a/dev-db/percona-xtrabackup-bin/Manifest
+++ b/dev-db/percona-xtrabackup-bin/Manifest
@@ -1,7 +1,4 @@
-DIST percona-xtrabackup-2.4.12-Linux-i686.libgcrypt20.tar.gz 85181957 BLAKE2B b066ff9efa8c57829a441c2e416ac1eeeff60cb0839ccdab4cd685bff9b2ead552ba9b7105541e0a824ca8aaeeb47d89d66180fe428842470c4743dfd149f31d SHA512 adbaae8ad3347e15b13fe360dd5d4721330d6b17e75696128dfe770d03ad85056abeb861ffcbfe1d08020c8b9d726dd9e5650f63b7199804fe4d3cd9806debe2
-DIST percona-xtrabackup-2.4.12-Linux-x86_64.libgcrypt20.tar.gz 87975175 BLAKE2B b21ab8dd4fac27ae8c731b5fbd816dfc39572bc52a9273255a4c89ddf99ee490cc66ed4f92945b18f4ec58e731ae036a16e08674cb9837544ca5150cb6b91c7b SHA512 355b9f7f052a1242e502ddcbdc26cb931d16366be4db405730a2bb04de3030e0d0e6d4d15eb87f68fe232648dd435c85505a6d895b7c27b3baea0cb851214766
 DIST percona-xtrabackup-2.4.13-Linux-i686.libgcrypt20.tar.gz 85192746 BLAKE2B 7df4fee162587830a19499cd692d5e81ba67bb445ad0bea7bb93a9857bae5e4671740d01b817b6d04043abfd436ef88e0983dc7ab80d5d20426d9c05b470c79e SHA512 c2fa43aa4654cfcf06aa47ee20ee48e9b725aa3b0514419c5af5872d7ed37a971d5afe5aa4dc9475cf4d0738354a0ec35e6dd97a24ec00b2330465e94bafb365
 DIST percona-xtrabackup-2.4.13-Linux-x86_64.libgcrypt20.tar.gz 87985226 BLAKE2B 937518b96d948098f2026397947250fbe4952752cf6f83fee5fdda4031564916bbfa07cd77a5db5db16150d446593b52fd82d6ee919ceb9fb0fb41de2f6ca631 SHA512 824ad9e94c38d51291afa1c9f1b9114c88c2b777ac9e5eb41a523463355521233b682920940084f8771820ccad6bd2a9ca280f6397eebd99ca26995712e68007
-EBUILD percona-xtrabackup-bin-2.4.12.ebuild 1555 BLAKE2B c912f2732191d8036ab4b02190ad39f44c344e68879984155d24a58358377539194b2786ba09e08f78af8bedbdc83f2963c6484b82c1eaae01091a68ee52e96a SHA512 ca9acf57354277fc17f22b8b96d37310d9e7b2981bbdf79051e1da23e2ba4bccdbd80f86e7ebc265fc31bf76fc440e44f2fa4a9a2746fcc0439d829b79433401
 EBUILD percona-xtrabackup-bin-2.4.13.ebuild 1555 BLAKE2B c912f2732191d8036ab4b02190ad39f44c344e68879984155d24a58358377539194b2786ba09e08f78af8bedbdc83f2963c6484b82c1eaae01091a68ee52e96a SHA512 ca9acf57354277fc17f22b8b96d37310d9e7b2981bbdf79051e1da23e2ba4bccdbd80f86e7ebc265fc31bf76fc440e44f2fa4a9a2746fcc0439d829b79433401
 MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
diff --git a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.12.ebuild b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.12.ebuild
deleted file mode 100644
index 791c5b01275b..000000000000
--- a/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.12.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases"
-HOMEPAGE="https://www.percona.com/software/percona-xtrabackup"
-SRC_URI="
-	amd64? (
-		https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-x86_64.libgcrypt20.tar.gz
-	)
-	x86? (
-		https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-i686.libgcrypt20.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# NOTE: dev-perl/DBD-mysql still necessary, now for bin/xtrabackup?
-DEPEND=""
-RDEPEND="dev-libs/libaio
-	dev-libs/libgcrypt:0/20
-	dev-libs/libgpg-error
-	dev-perl/DBD-mysql
-	sys-libs/zlib
-	sys-process/numactl
-	!dev-db/percona-xtrabackup"
-
-QA_PREBUILT="usr/bin/*"
-
-src_unpack() {
-	default
-
-	if use amd64; then
-		S="${WORKDIR}/${MY_P}-Linux-x86_64"
-	elif use x86; then
-		S="${WORKDIR}/${MY_P}-Linux-i686"
-	fi
-}
-
-src_install() {
-	# Two new tools with an old libcurl.so.3 dep...
-	# TODO: Wait for a new release using libcurl.so.4
-	# net-misc/curl dev-libs/libev
-	# dobin bin/xbcloud{,_osenv}
-
-	for tool in xbcrypt xbstream xtrabackup; do
-		dobin bin/${tool}
-	done
-
-	for man in innobackupex xbcrypt xbstream xtrabackup; do
-		doman man/man1/${man}.1
-	done
-
-	dosym xtrabackup /usr/bin/innobackupex
-}
-
-pkg_postinst() {
-	ewarn "innobackupex got deprecated in 2.3.x series and is just a symlink to xtrabackup"
-}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index f1534a2ee87c..34b5d5cbb29a 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -13,4 +13,4 @@ DIST sqlite-src-3280000.zip 12477204 BLAKE2B e62e0f36f0bebf89990f8ec91cb1e508a5e
 DIST sqlite-src-3290000.zip 12557725 BLAKE2B b1aeb80734a2cb7d45c6f2e278bad2996b56ecaf792a8f26322bf50aeaa430eea267f23edb1721bb80ecb6e0c8e14c7a5d8f26178d056fd23efb52f496cc03e1 SHA512 575398fbe20c6471ee2abcbde170b8d48efbb3cb2716a65f42f05c52429a45d14e8046e50c59bbf75bfe2d8f151c34abd50b440c50af571f19e19f3290b230df
 EBUILD sqlite-3.28.0.ebuild 10089 BLAKE2B 4913c8929b24cbea00d1231b6cf6a6bd0c630ab1cc13577e1e9cc728da80f1f48c11f2a19d754fadc59b33f21dbcb7051b1e5249a536e1c3f94ca6a71a1f2ca2 SHA512 73eb7223d5d6fe6b5b2ee954dd04fcd48d6743ae2cf0a85489437e5183921b46edb39547c865e9f245f2a30a0cb272d26e0419dcef0c3431b15181ebea2b233f
 EBUILD sqlite-3.29.0.ebuild 12045 BLAKE2B 64ccc0e483577de360627a95b1550d8c7d4566d0d78500b3668b16a5bc66a8cb9d5076be5e4961794d04a7427a9a8188837391b39f7c24608fcf33e897871fa9 SHA512 abed3dc42f0ae4f07a9add0c17595eed046bf376458ee37743f6307f13e33f44236adaa6d023e5ad1b772d94885eecd5c98dd2d384e0137bb1915e25c492b0dd
-MISC metadata.xml 606 BLAKE2B 003e4c40dcfdac591df25e197f037d5f8a9b3dca515f71d85f6d5bd91705fd5053f99fcaf4a3e55d9aa827048597f84aba861e3507cf88de571cb7a134a179c5 SHA512 19d616062c139eb0f32379c6f7d69c5ced561f1799785732e51cbd7f8ec2ca600ff724feed4c594ceedd7fc50ea76400fa1563c8fcbe789279cb743f31ae7575
+MISC metadata.xml 748 BLAKE2B c58da3e33e12b7747bbadacfd1a6137cf847fd5bd0525fc02ef854eb5bcad7bad0b29739257b632e19190995659768fdea418ffa7e485e55ef15f40f58b8382c SHA512 66f3f134065f76229b74a7ab7b469066a93da737a9037435e6fe78e85f45c980ec561537f2bb9b95db9de026bad025d8b06682187c97dedd2741717e893d43da
diff --git a/dev-db/sqlite/metadata.xml b/dev-db/sqlite/metadata.xml
index 271ee2dfe208..c7b127a748ee 100644
--- a/dev-db/sqlite/metadata.xml
+++ b/dev-db/sqlite/metadata.xml
@@ -5,6 +5,11 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 	<use>
 		<flag name="secure-delete">Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty</flag>
 		<flag name="tools">Install additional tools</flag>
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 844c13c31eab..befb52637dac 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,7 +1,4 @@
-AUX sqlitebrowser-3.10.1-unbundle.patch 3313 BLAKE2B 91dda803cb2eed55a56568f4d2cc0519b33b59447fcdfee49705aa0bfce84009092b0e73ab0ae79b03fc30f20220b1ca8cebbd83b66d1f8fdd36c47669403019 SHA512 71b758dc1f412b1ed5d778e8ca5fc65eb99276acf5c81fc4812bf31251a0380b8e4fbc84a00718e5959ae7cb504cda06339e24cf070b8a2de1b0fce46cfb595f
 AUX sqlitebrowser-3.11.1-unbundle.patch 3194 BLAKE2B b2015e90e7f79409fb16d0490081634c47208956a53f4c24aeec3fa217dd165b1fec2bc51b818b82f39fae55a3ca7bb9a79dc58746781e1622707e0b051e845c SHA512 b0082e6373d54a2aee87b84f0194a91139f535da0c7d741e68458e05a6c7e6a46c1b027e8cf0dff455de0cf2c484d2be51bc829bdbedb2169c8fa44d553afd95
-DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
 DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253 SHA512 31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916
-EBUILD sqlitebrowser-3.10.1-r1.ebuild 1209 BLAKE2B adc80a02c5628ccd6b31b9125639a51a1c3cc07b4f00ab96e02a644d1d0a5327fcdcfdbedb06233b96def7c357928d962ddb4dce0e5076551e687a851210f4f9 SHA512 3069b2174fbe27b7fe313b832d970d2d3633906e46bbdcecc588b5f79c058c28030d5343fb2f0925b6ce22a3ee92c7e28947e1e53af9dbb9d2e746694a45193c
 EBUILD sqlitebrowser-3.11.1-r1.ebuild 1363 BLAKE2B 5d773b3181600829e6746740deb37a0f9885eebc9f79a0ca6ce4e0a3f19907dc3f235f2a311b0f54e1b729159fc123e0c2a810e38de16cd7f0cc30d1d7f02209 SHA512 ffa03523d2b79218f1e82958c4624e6f36418dd1e6567264ade56600af450b9f0a290873ddb1846007ff0cdeae4e31c44a59ea760e0361ff347611e56313ea6e
 MISC metadata.xml 659 BLAKE2B bf5f352f0227c1408cd9c0720fea6b7bf35e6f843f4e1f6fb3e340d3e7e5ddc09843484da6c54254345cde615993acaeba50027f44f33e0134ac05414e80e8ca SHA512 defe9a90cbcdee9750f9a5dffb8620445efd4d855fa789bad01d80151f4e64676245c2a51670c7418d2e19faa72bf26f4322c3953d610933a5b479985acedca2
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
deleted file mode 100644
index b774e41ecd83..000000000000
--- a/dev-db/sqlitebrowser/files/sqlitebrowser-3.10.1-unbundle.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
-index f469637..92c2d37 100644
---- a/cmake/FindQScintilla.cmake
-+++ b/cmake/FindQScintilla.cmake
-@@ -43,9 +43,12 @@
- #=============================================================================
- 
- 
-+SET (QT_MIN_VERSION "5.6.2")
-+FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Network Widgets )
-+ 
- find_path ( QSCINTILLA_INCLUDE_DIR
-   NAMES qsciscintilla.h
--  HINTS ${QT_INCLUDE_DIR}
-+  HINTS ${Qt5Core_INCLUDE_DIRS}
-   PATH_SUFFIXES Qsci
- )
- 
-@@ -81,6 +84,6 @@ endif ()
- 
- find_library ( QSCINTILLA_LIBRARY
--  NAMES qscintilla qscintilla2 libqscintilla2
--  HINTS ${QT_LIBRARY_DIR}
-+  NAMES qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5
-+  HINTS ${Qt5Core_LIBRARIES}
- )
- 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fdf5b4c..ffba6d7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,26 +47,20 @@ if(WIN32 AND MSVC)
- endif()
- 
- if(NOT FORCE_INTERNAL_ANTLR)
--    find_package(Antlr2)
-+    find_package(Antlr2 REQUIRED)
- endif()
- if(NOT FORCE_INTERNAL_QSCINTILLA)
-     find_package(QScintilla)
- endif()
- 
- set(QHEXEDIT_DIR libs/qhexedit)
--set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
-
--if(NOT ANTLR2_FOUND)
--    set(ANTLR_DIR libs/antlr-2.7.7)
--    add_subdirectory(${ANTLR_DIR})
--endif()
- if(NOT QSCINTILLA_FOUND)
-     set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
-     add_subdirectory(${QSCINTILLA_DIR})
- endif()
- add_subdirectory(${QHEXEDIT_DIR})
--add_subdirectory(${QCUSTOMPLOT_DIR})
- 
- find_package(Qt5Widgets REQUIRED)
- find_package(Qt5LinguistTools REQUIRED)
-
---- sqlitebrowser-3.10.1/src/tests/CMakeLists.txt
-+++ sqlitebrowser-3.10.1/src/tests/CMakeLists.txt
-@@ -49,9 +49,6 @@
- else()
-     target_link_libraries(test-sqlobjects antlr)
- endif()
--link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
--add_dependencies(test-sqlobjects qscintilla2)
--target_link_libraries(test-sqlobjects qscintilla2)
- add_test(test-sqlobjects test-sqlobjects)
- 
- # test-import
-@@ -118,7 +118,4 @@
- else()
-     target_link_libraries(test-regex antlr)
- endif()
--link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
--add_dependencies(test-regex qscintilla2)
--target_link_libraries(test-regex qscintilla2)
- add_test(test-regex test-regex)
---- sqlitebrowser-3.10.1/src/src.pro
-+++ sqlitebrowser-3.10.1/src/src.pro
-@@ -153,10 +150,7 @@
-     }
- }
- 
- LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit
--LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7
--LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source
--LIBPATH_QSCINTILLA=$$OUT_PWD/../libs/qscintilla/Qt4Qt5
- unix {
-     LIBS += -ldl
- }
-@@ -197,9 +193,9 @@
- }
- 
- UI_DIR = .ui
--INCLUDEPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5 $$PWD/..
--LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2
--DEPENDPATH += $$PWD/../libs/antlr-2.7.7 $$PWD/../libs/qhexedit $$PWD/../libs/qcustomplot-source $$PWD/../libs/qscintilla/Qt4Qt5
-+INCLUDEPATH += $$PWD/../libs/qhexedit $$PWD/..
-+LIBS += -L$$LIBPATH_QHEXEDIT -L$$LIBPATH_ANTLR -L$$LIBPATH_QCUSTOMPLOT -L$$LIBPATH_QSCINTILLA -lantlr -lqhexedit -lqcustomplot -lqscintilla2_qt5
-+DEPENDPATH += $$PWD/../libs/qhexedit
- 
- unix {
-     # The executable
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild
deleted file mode 100644
index 259f09b86cb3..000000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop xdg
-
-DESCRIPTION="SQLite Database Browser"
-HOMEPAGE="https://sqlitebrowser.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )
-"
-DEPEND="
-	app-editors/qhexedit2
-	dev-cpp/antlr-cpp:2
-	dev-db/sqlite:3
-	>=dev-libs/qcustomplot-2.0.0[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtwidgets:5
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.10.1-unbundle.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die
-
-	sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon images/sqlitebrowser.svg
-}
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 9a5961b20a36..079f753ce13a 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,8 +1,6 @@
 AUX unixODBC-2.3.5-CVE-2018-7485.patch 5224 BLAKE2B a21d659f75f9ae11a6d78a4a74b0591786800e14f22d7fb4c7ef5005e0630b95453a319d9254bf3f5e423e74ae36c6a7bd097f3193869757b2bea34f8974e358 SHA512 a4d5dfafe75ea0e85feed76cf18474a89fcf6719ee58d0b56d57959526db2511df2df691bf9af2e1a34c716d2d90f6d274b48a11cfb7add74df799d1f1f67387
 DIST unixODBC-2.3.5.tar.gz 1633390 BLAKE2B f7c70740471b0c6ff298f2377a3895efbf160764adc4f607dfb65de2873ea3a39a2852399feaca50fc389875e20a10b3cd0389ba9e9f02d0548312d8063f5af5 SHA512 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
-DIST unixODBC-2.3.6.tar.gz 1661914 BLAKE2B 75162344e2b2713ae056dae0a2c1be31994ef350b4aa3ee7ae924b17527f35e0b7c9bb5a23763ab71553ef67a025d2a6549e564507b95991d6a193e165f1e774 SHA512 6518a4169946e847dd710d54724a44d268b98954d30064eadadb703edbbeafac05bd1f42a6845c2fdcdab7ae8987800acd1a5f6b4b96de5f3c8c3e4bc370fe30
 DIST unixODBC-2.3.7.tar.gz 1669501 BLAKE2B 0e6b2130b72ccfed3a26877ff1c8af9adc7cc514002d3198d5249a12da5de03322178bf0847b92336b5a373893751bf3cb5aec4c251163a3c9f0ef98c90e5db8 SHA512 a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70
 EBUILD unixODBC-2.3.5-r1.ebuild 1821 BLAKE2B 36ffb4ef10060b6f17a1e277b64ad9e44cb31f007886f5501168c7433986c8380c20a877105a7ded42d3df1085645432c054e37d6df593eefadde47df659e048 SHA512 a69a33a4e7333b69cf10e615c67ce26de192f92eb7a2af6e2a144bdeba8759e898bde1760f571bc3271fc5c284dc3c4e408ab8c384e692e5d474437428f519ff
-EBUILD unixODBC-2.3.6.ebuild 1785 BLAKE2B aa3ba92f38344e7a48517ecc302ea184dd9eb67831c19c34825266f7f75c71eec9c49b681d5278d72807a210d748764d260044f54f5e2ecea965729dfd387be2 SHA512 e4fd0ecdd6c81b331e4ff4f6a8e9aafb483712c8dab16c2334a04b29764eb500764c258969636696594db40af820b0421f91388c3627c7d7108e8a15169b6a3f
 EBUILD unixODBC-2.3.7.ebuild 1787 BLAKE2B d9cecf0a58bbcd498c80f66930381b18e51ed10244ba1a04cc2f5e94be441349836cab4e99dea4ce8a858f99450a32717459002e1ed85b5276f6c3f05ae472c1 SHA512 b561ae090a96faed044b69fcb140a4530ef2b03a8c9cd6fb730454415db77ccbf7c816141b9fa5aeeeda63246759109188739031162b4c9e7a7ed61c4c662d85
 MISC metadata.xml 393 BLAKE2B aae8c823c6e3d1a3b21910c6aece373e66e62c6686b152f1f6c8fb980a4c58b19dce1144afb76219d4d4e451ee097afe0f031130e82cbf933e6ac1ba3d4f1cc5 SHA512 76f899e62d86b476cc9f97daffe5c67fba8fe217fb0d6c0b1b39f2de8e6a92350e6d0433f37f54f57875d3cbb3be7908eaa9a3b1717fc1da687a1789062c0f86
diff --git a/dev-db/unixODBC/unixODBC-2.3.6.ebuild b/dev-db/unixODBC/unixODBC-2.3.6.ebuild
deleted file mode 100644
index 50b7a38b6389..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit libtool multilib-minimal
-
-DESCRIPTION="A complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+minimal odbcmanual static-libs unicode"
-
-RDEPEND="
-	|| (
-		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
-
-multilib_src_configure() {
-	# --enable-driver-conf is --enable-driverc as per configure.in
-	myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/${PN}
-		--disable-static
-		--enable-iconv
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable !minimal drivers)
-		$(use_enable !minimal driverc)
-		$(use_with unicode iconv-char-enc UTF8)
-		$(use_with unicode iconv-ucode-enc UTF16LE)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use odbcmanual ; then
-		# We could simply run "make install-html" if we'd not had
-		# out-of-source builds here.
-		docinto html
-		dodoc -r doc/.
-		find "${ED%/}/usr/share/doc/${PF}/html" -name "Makefile*" -delete || die
-	fi
-
-	use prefix && dodoc README*
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index b50184a550ec..9835c655d9fb 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/dfu-programmer/Manifest b/dev-embedded/dfu-programmer/Manifest
index e68d21a381d8..4b3aaeaef771 100644
--- a/dev-embedded/dfu-programmer/Manifest
+++ b/dev-embedded/dfu-programmer/Manifest
@@ -1,3 +1,3 @@
 DIST dfu-programmer-0.7.2.tar.gz 146613 BLAKE2B 85222185bdbfdb90c06ece2a284f6f6e15fe5118a1934948a0bca6364902743a86429ea13d5aabc2a948f6f2ce41177b6021ae85a8ad22b75a026507253380d8 SHA512 429b89192bb5a9653ad8678dfc182bfc30eb057d0d1f72fe88efdf85005d3ad557e0f572f4fad3346f1f1078cd273a289f4bba2663bb1f840e6bf724d5293db4
-EBUILD dfu-programmer-0.7.2-r1.ebuild 1271 BLAKE2B 9fe3fc243d5cb4ccb4cab584439049983c04935f0a70dcbf5a66c938b428523acb6b82e4df315ab59c780d962b3d84f64369ccdbe93b3c1a84720557fbee9eb1 SHA512 906960d349bda4a531b229e7e4583d7721f28cf02cd900b8b19314545e3fbadef9fb37571804a0e80bf72496e09e712442e7108ef03667d81e4a1b115f068f80
+EBUILD dfu-programmer-0.7.2-r1.ebuild 1249 BLAKE2B 6b5514b68e5df5f5306968c805076a9415885f5c3a453c3a407822acd77665877dc6811d44d4eda38d79d025b579122c8cfaa9329c7f3165806823ab9706b933 SHA512 e057406ed55053d0c8f04f923fa73229f3d633fa72b31055444b31afb23c29ea3cd2aef58826840c25f2b2b734c6327becbdddb1644c20b38fe49e972d4b0f4e
 MISC metadata.xml 441 BLAKE2B fb5651aaeac357109390fd1b83fe5259369ca3613eec202f3c263db19e111bab5ac28d43312dbb5f7751f0258318c2845fc65100cfdf1c35b1a31dc1c2446df7 SHA512 97cf04d36796543c7fde8bcff89a8a5e3f19a665e4a20f84dc9493a46a0543038ca262ab26b149a3c514771f21963247dbf8f751f3dd26b6d505c3bc43cb4fe0
diff --git a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild b/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild
index 08ab0f766244..92c21ee77fca 100644
--- a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild
+++ b/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit udev user
+inherit udev
 
 DESCRIPTION="A Device Firmware Update based USB programmer for Atmel chips"
 HOMEPAGE="http://dfu-programmer.sourceforge.net"
@@ -14,15 +14,13 @@ SLOT="0"
 KEYWORDS="amd64 arm"
 IUSE=""
 
-RDEPEND="virtual/libusb:1
+RDEPEND="
+	acct-group/plugdev
+	virtual/libusb:1
 	virtual/udev"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
-	enewgroup plugdev
-}
-
 src_prepare() {
 	default
 
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 10942809c28c..bb5875901f3f 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,9 +1,5 @@
 DIST esptool-2.1.tar.gz 68974 BLAKE2B 4aaddc9bf22a624de18e7d58b35a42f6fa27cf8bdfff119a270b9531f1e19ecb3f4d7eebad319a799068a19941bf0c843fc464fd5ae891d8e03e1a2bad54dd68 SHA512 be657df04a345d2c91bbe3a9cbb93cd7bb0bc68e61388ff4d134c88d514c74fe3f2c5e7c64f4100264bc5973b1d3e66251cdb16a77894fb9e116d9c6a54a8dc3
-DIST esptool-2.2.tar.gz 70585 BLAKE2B ea4553d7857987233d1488e6db1993ec687ce10c9c810c7a5327043283fab19b10863106ecf8bfac6d7585a8bbf2823b90d7e225dd4a27bfb784f183e86c796a SHA512 a84b61875a8f227b8103fcc546eb1323547159fbdc962d0577eb6498126589c9fa3b23ca840d33ab2636d7c05de3eb048bdfbdbd86d895c8e37f9bbc169a4caa
-DIST esptool-2.3.1.tar.gz 72312 BLAKE2B 4e44a2be2a72ab25e85af9b380f5f80896a84490f30180a98ed20822ac087d24511613d205bed04c8c92d1effc6b2074c2208d4ba5f72b6b661aff7c1b4e02b5 SHA512 8025e1e7a378c0fce27c5ea2d3290cd12e7f657039f0fed6b4bd938a10d971739b678714c2f19f0d2edab3d2215e7975ba685604f870d45a18d60f3147c643b8
 DIST esptool-2.6.tar.gz 4336261 BLAKE2B 1da9ea1ed24d1bf91e2bbac079016c4813012946977ca6da7f6b4eac52ea77f501f4185efca39a636cab438720f0a14ca2faf49920228656fcb4786690824208 SHA512 dd2e1815df07a491d5b41b709aafecb642f5b642c83b11e309986ba0ad827257e6b7bb93f4decd7ee37fd10a1ee7b36c836598c0c2e1e60118bf96397c187dfd
 EBUILD esptool-2.1.ebuild 736 BLAKE2B 041a3feb1e25f49b9374eb7400d0c44a53fda0da2b7c637f68cb3fb467ae731752dd24333c7ed7c41cf03e2974d9258cd6708caf10a49ab7a2eef1a070338fff SHA512 7fade88dd6bd6f1614dea002034d02988486c2adc11d3c69139d0ac5ba5e98aee934b0177d2f2c36900e6e605f5ad6619042f1f9f93fbd93efcb14c8bd207232
-EBUILD esptool-2.2.ebuild 727 BLAKE2B 6bf88ce9d4d68bec4b589f89bb52456c2757058e9cca0b682a1a586c5243f44e48a6144bab63b8ef153d3c2fb50dc4f6e918fed33829fa0a3a207fdb1f441a6c SHA512 8f58ab45041fc241ffbdcb6c1ddf46c334abd001b3aeeeb9f246b0e33015c4211aec5dd3ea84b8df0a4c617179d5864cb645583675919b0f12e44847af3eb0e6
-EBUILD esptool-2.3.1.ebuild 737 BLAKE2B 2dc29c9215371927c29518a9c8f3cea3a2d52c3c487060e036bb168f13e8c5ddec01c30ddec6a8502326fd9a160e1dc6a174fb57b0622ee5e3331ac0bcff0338 SHA512 e6d90310c3069c4b44575ed9a593cf911e28e205d70e665b861a7a32d996273f7e071cc901da1ddf24916d769188995515142a4559bcbeeeb58045c65d1d587f
 EBUILD esptool-2.6.ebuild 902 BLAKE2B cbaf5875ea8b230ae4ec47cbd2aa5731aabe46d6cd5d5456b3537da52f5553d5b47bc2bf7168a0db9b3b2fcae26c512233f15d8f82ab0cf12c63bf1fbd56d827 SHA512 04d089065dec17ee8198621033b5dbbfba6b7897222caec9e29502457506387ca173453ecbd1f74de9da2fd499ed3818326b2183438c85db8628319e07a90356
 MISC metadata.xml 247 BLAKE2B de14ccb6beade685c72b668396bd67f8e1be50bc4d143a5aff8d27c077a5bd91664c90c1273573966b7dccaea71b16d6d7e6dd8b2c5ed6f4afbd1a9ba3353475 SHA512 cce6a10f270c88b3639c39f5caaa891598409a573eaab14f0362781950746afb36cbea3a0384542a89e4fe8e287ca74cc62c2ca4f47de9fc39fffcfa4513e693
diff --git a/dev-embedded/esptool/esptool-2.2.ebuild b/dev-embedded/esptool/esptool-2.2.ebuild
deleted file mode 100644
index fc375443446a..000000000000
--- a/dev-embedded/esptool/esptool-2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-2.5[${PYTHON_USEDEP}]"
-
-RESTRICT="test" # Uses a device connected to the serial port
-
-python_test() {
-	${EPYTHON} test/test_esptool.py || die
-}
diff --git a/dev-embedded/esptool/esptool-2.3.1.ebuild b/dev-embedded/esptool/esptool-2.3.1.ebuild
deleted file mode 100644
index 3a5259cd84b3..000000000000
--- a/dev-embedded/esptool/esptool-2.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-2.5[${PYTHON_USEDEP}]"
-
-RESTRICT="test" # Uses a device connected to the serial port
-
-python_test() {
-	${EPYTHON} test/test_esptool.py || die
-}
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 12ca3747cb2b..fc16aa351f13 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,7 +1,7 @@
 DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a
 DIST openocd-0.9.0.tar.gz 4970346 BLAKE2B 96421b32a3e64fc1ed362288f5a444cc1249f3d6daab6307f920c86fff11cb74a0bbb9f021788b848a8755139ee1c43c54793ac57a429f4e39df47f0775c2538 SHA512 698b43867f8134da43a50f5d2ff2ae33b71df8ccffc45fb5c3d0bd7a6289fcd9e7bb3d89287ad4dbdb02e1871db69f3913db950965335eaf8559247f2e58c227
-EBUILD openocd-0.10.0-r1.ebuild 2825 BLAKE2B f18eb669df565c32504a0194082dcc58d4a872475fda87b5cf8abf3f509fbb2e6a65abf1374bda1c06d9556789b3a7c665493e6a243b0094506094c283271b6d SHA512 9b306e9dafc7bdf1c88caeb023b3f350db5d84e826523b1a31f9edef41a86960fb6a9dbc5d743f9ffd5b56ba1f7796510ab31eeafc31db9d4b246a204c6e0170
-EBUILD openocd-0.10.0.ebuild 2806 BLAKE2B d46464e208310d3ec2a615535b4e54e4f73aa1977b1c72b94cc5fb9a165b6d53c2b2042d85c60b49559e64631b109adfceb55dc083a0fcf5836a1e3368da658f SHA512 90ce1e9b75251e998c4bb7ab2570154ebfa401e7f5b5fcf4d669b3c30505431e224bba45c5f2b26255cd8fb84f89cdafb00a615029acee993413a39552eb30c8
-EBUILD openocd-0.9.0.ebuild 2667 BLAKE2B 31aabad3b6f6e5006c007a28f7e8a5af4e946b5fb41f269cca67711a10e4a6a7f679b04529422cd25d6db154ca16321fa06a43518a76cce49d7a342cc72fc1ff SHA512 8acf019ba88414e2984edf5398bc98bc8eec74a267a7862c715aad851c76e9f369b40d35793cbfef0c04da159ff5a87e495ef01b42aeb4aab025daff0f3ce0c4
-EBUILD openocd-9999.ebuild 2825 BLAKE2B f18eb669df565c32504a0194082dcc58d4a872475fda87b5cf8abf3f509fbb2e6a65abf1374bda1c06d9556789b3a7c665493e6a243b0094506094c283271b6d SHA512 9b306e9dafc7bdf1c88caeb023b3f350db5d84e826523b1a31f9edef41a86960fb6a9dbc5d743f9ffd5b56ba1f7796510ab31eeafc31db9d4b246a204c6e0170
+EBUILD openocd-0.10.0-r1.ebuild 2806 BLAKE2B 0ebf96676f1f826d64de6af8ac4311bf5973ef1781b2f4f038637fbe6ca4d57dee3405eb2828e51b84e48efafe89fda6c89462cb637b2c34815f0f0f0df797e5 SHA512 2741dbac39b556681a78690c14be02947c467171cfa1a628b66e1e9fb54abc2ce212253ab5ca39ae5fa0e1ad84e759ca9abba046e07ad9042ab7e8879185de0a
+EBUILD openocd-0.10.0.ebuild 2787 BLAKE2B 33c90c335a3b21eafa6d62eef353fc93f767044f1643d6b75335173dff63a8324a9a740a516a5d640763e46082bf28fe802d055b36d5ab372c936da026f353a7 SHA512 bd33f8487f420ce308c157580ba56604fb37e8f53bca6c37ce28118cfeeec1419ac0d01da6e78afe540634b64fc509c228f1d6ebb764d5672a7ff8c519d8aeb6
+EBUILD openocd-0.9.0.ebuild 2648 BLAKE2B b97c24d80399668aa3dbbf9ad03a358f779da66b38bee58a29c704125de6e0d5ed85f12b19687c2fce3e08ad7c9489c76266bc606bc64f0e00f878cd5a2cabc9 SHA512 7b437860ca4ea98c2bf37e7f69bea3b080d3c47a5bf72473d4fb31aa36631239d349a2a38199f222367a9fb2d92c2096b61d6021a2a803010c13db0545f49e17
+EBUILD openocd-9999.ebuild 2806 BLAKE2B 0ebf96676f1f826d64de6af8ac4311bf5973ef1781b2f4f038637fbe6ca4d57dee3405eb2828e51b84e48efafe89fda6c89462cb637b2c34815f0f0f0df797e5 SHA512 2741dbac39b556681a78690c14be02947c467171cfa1a628b66e1e9fb54abc2ce212253ab5ca39ae5fa0e1ad84e759ca9abba046e07ad9042ab7e8879185de0a
 MISC metadata.xml 882 BLAKE2B f7ec7fcd46485cf4f0c9039718cda564607f6f048646b326781cf09b2383c8665b8d624a19070a659df718673f4639bc918808ae950d6013016a0349a9fa6cb3 SHA512 bd6d73764a65fb4df85ce70552f0db5d18d876a54f1f1b4f75cba7865bdc425de78797f747b77f96b1c1e5b342106dd883d02f9c638875914d91987604ea8b76
diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
index 3afa1fad8b47..168fc2499564 100644
--- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
+++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit eutils multilib flag-o-matic toolchain-funcs udev user
+inherit eutils multilib flag-o-matic toolchain-funcs udev
 
 # One ebuild to rule them all
 if [[ ${PV} == *9999 ]] ; then
@@ -25,7 +25,9 @@ SLOT="0"
 IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-RDEPEND=">=dev-lang/jimtcl-0.76:0=
+RDEPEND="
+	acct-group/plugdev
+	>=dev-lang/jimtcl-0.76:0=
 	cmsis-dap? ( dev-libs/hidapi )
 	jlink? ( dev-embedded/libjaylink )
 	usb? (
@@ -38,10 +40,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 [[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946
 
-pkg_setup() {
-	enewgroup plugdev
-}
-
 src_prepare() {
 	default
 
diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild
index 72a0bbe07a5c..671c16ab48f7 100644
--- a/dev-embedded/openocd/openocd-0.10.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils multilib flag-o-matic toolchain-funcs udev user
+inherit eutils multilib flag-o-matic toolchain-funcs udev
 
 # One ebuild to rule them all
 if [[ ${PV} == *9999 ]] ; then
@@ -25,7 +25,9 @@ SLOT="0"
 IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-RDEPEND=">=dev-lang/jimtcl-0.76
+RDEPEND="
+	acct-group/plugdev
+	>=dev-lang/jimtcl-0.76
 	cmsis-dap? ( dev-libs/hidapi )
 	jlink? ( dev-embedded/libjaylink )
 	usb? (
@@ -38,10 +40,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 [[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946
 
-pkg_setup() {
-	enewgroup plugdev
-}
-
 src_prepare() {
 	epatch_user
 
diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild
index d6d36ec4b0a1..c7878693cd02 100644
--- a/dev-embedded/openocd/openocd-0.9.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils multilib flag-o-matic toolchain-funcs udev user
+inherit eutils multilib flag-o-matic toolchain-funcs udev
 
 # One ebuild to rule them all
 if [[ ${PV} == *9999 ]] ; then
@@ -25,7 +25,9 @@ SLOT="0"
 IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-RDEPEND=">=dev-lang/jimtcl-0.76
+RDEPEND="
+	acct-group/plugdev
+	>=dev-lang/jimtcl-0.76
 	cmsis-dap? ( dev-libs/hidapi )
 	usb? (
 		virtual/libusb:0
@@ -36,10 +38,6 @@ RDEPEND=">=dev-lang/jimtcl-0.76
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
-	enewgroup plugdev
-}
-
 src_prepare() {
 	epatch_user
 
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 3afa1fad8b47..168fc2499564 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit eutils multilib flag-o-matic toolchain-funcs udev user
+inherit eutils multilib flag-o-matic toolchain-funcs udev
 
 # One ebuild to rule them all
 if [[ ${PV} == *9999 ]] ; then
@@ -25,7 +25,9 @@ SLOT="0"
 IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-RDEPEND=">=dev-lang/jimtcl-0.76:0=
+RDEPEND="
+	acct-group/plugdev
+	>=dev-lang/jimtcl-0.76:0=
 	cmsis-dap? ( dev-libs/hidapi )
 	jlink? ( dev-embedded/libjaylink )
 	usb? (
@@ -38,10 +40,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 [[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946
 
-pkg_setup() {
-	enewgroup plugdev
-}
-
 src_prepare() {
 	default
 
diff --git a/dev-embedded/zmac/Manifest b/dev-embedded/zmac/Manifest
index b869b19fcef9..e28ae01cc927 100644
--- a/dev-embedded/zmac/Manifest
+++ b/dev-embedded/zmac/Manifest
@@ -1,3 +1,3 @@
 DIST zmac13.zip 82067 BLAKE2B 8f15cc17d92ed8bdfc16504c2c958db1f158cf8cceda6aba01e626342961975c68e41321349c95721053b1d10f07373b76385ebf9c1b74dd70f69c5d6fd82b70 SHA512 84c1206e3abf19809ab4358c0b5d46771cdcfdeb4ded14aa39d81ca7f9d3780ca1917823bd06f49ee9fafaaa079bdbe8b614ce842d44181f55d4287515a187a2
-EBUILD zmac-1.3.ebuild 590 BLAKE2B dc7fbcf2db2205c91374c147468fd8a943dc38b7d5c050b9faaf46a53ff435a63b37637a3ad0cc738d2e1e5c82950ca525cd3d1c513f3af114e79af8b1e4215e SHA512 9cca780d0b13649081505c902c110d0457718ec69df796ed8a994a53e465f8c161a4c672134085f64e35e6aa3aa6c7d13db1e409b02dc5f3c85c1cf95d72e68a
+EBUILD zmac-1.3-r1.ebuild 541 BLAKE2B 66c3ebd531a991a28c46bfb182dbc4084eac2ab62e6b81f092763a9011be40c4becf9ae4e55d554231c745804a15d81cb955f537c247a02c20dde9cb2c838ed1 SHA512 f2ebe349bd5d00c8d50d23604811a4a3dc81db06cc72bb63f47f42ed6b77d5bf92035e03736cc200ed3d8ecf87e205acaef54d2316b7f3eeb0368c8839aecc3f
 MISC metadata.xml 635 BLAKE2B bb2ec2e726bb24ab5f0010979b01368ce0644a46ad589433377609863d3da769c5660f6613d2b775a9359aae44eee3fee7e7a578e320d840f5ade31a78b14fa0 SHA512 ce5a690df0362dfd32802e9e3d64bec1a00ca4a15c9dbbde2d3383baed657f701c516ff24dfc42f459f0fc7796386ce23ba249af7a6d88e98f9b9f3f345a43f0
diff --git a/dev-embedded/zmac/zmac-1.3-r1.ebuild b/dev-embedded/zmac/zmac-1.3-r1.ebuild
new file mode 100644
index 000000000000..bb78b19a8768
--- /dev/null
+++ b/dev-embedded/zmac/zmac-1.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Z80 macro cross-assembler"
+HOMEPAGE="http://www.tim-mann.org/trs80resources.html"
+SRC_URI="http://www.tim-mann.org/trs80/${PN}${PV//.}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin zmac
+	doman zmac.1
+	dodoc ChangeLog MAXAM NEWS README
+}
diff --git a/dev-embedded/zmac/zmac-1.3.ebuild b/dev-embedded/zmac/zmac-1.3.ebuild
deleted file mode 100644
index 7ae9a9a0270e..000000000000
--- a/dev-embedded/zmac/zmac-1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="Z80 macro cross-assembler"
-HOMEPAGE="http://www.tim-mann.org/trs80resources.html"
-SRC_URI="http://www.tim-mann.org/trs80/${PN}${PV//.}.zip"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" || die
-}
-
-src_install() {
-	dobin zmac || die
-	doman zmac.1 || die
-	dodoc ChangeLog MAXAM NEWS README || die
-}
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index 04f19282f338..0c0c744a2c13 100644
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
diff --git a/dev-erlang/base64url/Manifest b/dev-erlang/base64url/Manifest
index 6a14b8a5649f..09738e3d9919 100644
--- a/dev-erlang/base64url/Manifest
+++ b/dev-erlang/base64url/Manifest
@@ -1,5 +1,3 @@
 DIST base64url-1.0.1.tar.gz 2726 BLAKE2B 38bf2e8d31cbd39a29d444f682692b6128ff41b0bd1496ea2db82f869a4f8f760a8cadaf81facee259bcf06b344cb340def8ed25af25b7b1f8b2e2213f81339b SHA512 7398dc99078053b6e0544eb8ca93e9616549493c02245084c220ec854f429139dcaba38dd522858dd74b95067979a3ec4378eb3abd5f6d1662af27687381c738
-DIST base64url-1.0.tar.gz 2759 BLAKE2B 7a9e1c4bd5343af2556b21255fed82375400088b461ad6aa5b308c49eb5fefe3597419a6cc6990ad8e29a11f4ac8814624f7c043ca19cecdfc1a4822e230693f SHA512 f9f5062d8a45c5d0fbfb7179359137e88a1af10e29c1329506446d2142331176f6be2aa30387e4c98855440c1da943ea16a655ed2ad5168d4f5f8a2cd1c47c5f
 EBUILD base64url-1.0.1.ebuild 419 BLAKE2B a71ca9d4703739b7e2799ba512dec58a2143a35bf29f41e14058575a040b557f8e479577fd840aea3b2db1bbb5d4fb1b2548988b7038750b931cc26ed33474c5 SHA512 7161ee9a67e20edeb5949b6f561fc17a1e3336a58b0389677eb9215ffe0ec658f00e6f50cab39db56a5ad521bc6f0417b623cf9f3f2e8b64ecaa727247a4dbaa
-EBUILD base64url-1.0.ebuild 423 BLAKE2B 293473eedb48581791f5e025ad92c3572907e33e14c67b2774f6bc5ea12f2945648e616ae55746e1b91ad8fe81000dcb8cb810c92ce8cded09acf686d6a0c272 SHA512 2214273c3fd6409dd5e70baa6b15cc9dc513ac04e6c977a4ee5f62a8d4fea39a370e89c869e9c4ba0985519aa8c5a6f7de7b0f885ab916089e53ea8ac15bfaac
 MISC metadata.xml 245 BLAKE2B 3328a7fe4ecf14ca85853187069c8c0aee48c99c35c44acc926ae3d8df68650132045273227fcbe99b9bd2cdf7cc7b4cc41e50b2d1380134eda85287b9e54773 SHA512 3bd1a8e0b458708f79cec57a377c3c4ecd100b7a10ae6c841175e3193a21fe1794be8e9c0ed746a967764d675e0cc105d78b0fe6ff40bf8dc8da1f0f16deda14
diff --git a/dev-erlang/base64url/base64url-1.0.ebuild b/dev-erlang/base64url/base64url-1.0.ebuild
deleted file mode 100644
index 4710ed85dd81..000000000000
--- a/dev-erlang/base64url/base64url-1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="URL safe base64-compatible codec"
-HOMEPAGE="https://github.com/dvv/base64url"
-SRC_URI="https://github.com/dvv/base64url/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/cache_tab/Manifest b/dev-erlang/cache_tab/Manifest
index 77e22a8567e2..328962d60418 100644
--- a/dev-erlang/cache_tab/Manifest
+++ b/dev-erlang/cache_tab/Manifest
@@ -1,15 +1,5 @@
-DIST cache_tab-1.0.16.tar.gz 18736 BLAKE2B 7701ac2dbc57a8a2f3ebde2744ad27864e1e12d8a30bde5196789d702c0270345a74b9f064ca61835ace54d65d28f7b52e394abbcc155044f440752d13359862 SHA512 d4a81a64fc34ba6c784e9ade3575e6f6964d6273f84de4c0d81e18a9f9fa59547f6f270d76a42cf0061a63fddd04171e7de10abbc52de4c215f39697b7619746
-DIST cache_tab-1.0.2.tar.gz 12414 BLAKE2B 15c8d1bfe8e774b123bfedbe3ce7aaf006575670f8a41639effc7d9e4ad4e1717a47f02d195be7e60fabf8f0495ef05aa02ef91029cace32c7f66f147f723beb SHA512 9a4e225b4a1776771d964ef2b96b8eb976b930bb2e9c5ac93e1e8b238f6e259d086a550d41b4931fbde293306892cdde2a38a4af3afa581a74e9e76b5feef111
 DIST cache_tab-1.0.20.tar.gz 22903 BLAKE2B a083812091fccf085170db96a542e30caf924c09e6d55a35882e956b8660e2bdad9b9f428953cbb21e12c2dacb965713e9f2dd1f2772924cfdb190a436b55455 SHA512 5f2945c68b77dbce77c1e96c26e5d0d91e9d43df0228b4b49cd00335e272c81cc134ce465027cb14e9da6d92708c628dd841e676df0e7104f968506b3209266a
-DIST cache_tab-1.0.3.tar.gz 12600 BLAKE2B 5474ea27ee872893f1b834f361aeca17755d54571c853b39c87622daca03526529612c4ac04c5d7554d65ff838ef6bd32cff654ddbdd031b08deeb653f041591 SHA512 d6d6f23834144b58a590dcbda57c2f0d14fd6030a2ea1e1675d56ac1038618f275bb9f9f9c0f80fc03510f775c1a04637eebcf927daeb9af51e2c70efa8239f4
-DIST cache_tab-1.0.4.tar.gz 12611 BLAKE2B 191ea58bf29cd9bfe8b56a5418008e643199ac1a2f7e9b624a29a25d1f3a8a5fc85c6fc7f483b545458f3e1e4143e5cd5b79e06fbbfc60433806daed930559bc SHA512 c0f7167631eb11de59303a7cc96592c172c109019004f52759c6d5c02d581ca515a81568f2dca0bc1a38ea8303d48b5e415cf12629d27730318433843a1ff3eb
-DIST cache_tab-1.0.5.tar.gz 12632 BLAKE2B 12495a005982f23e3e2ec8fab85a1afbd6b1a49d7de8c8fcb784d9a0fd1aa21654d9df23670ad5418562a3c9854e5bb029f41a6c287cdde94e1724a220dd2314 SHA512 1a49f3e8c12f032d33fac18aab04a4fbfb0dfc31c22e1e47ee3005d65c80b6cc15cb8fccf955fee1a88002ce7b5dc1fd5fb13fd10196449117f21ac51c0abb39
 DIST cache_tab-1.0.7.tar.gz 12827 BLAKE2B 57d669e67a980550fb4d671b22e69ff2ebd0482aef9d6163ff831390135c7ee1e83e87ed50fdb8e331402398a7cae2b081ac2861125c92cff6e9570c564b2c40 SHA512 9727a0103f47d63e5a07d630ebf45b86d1f1ca7ab5006f127a749fb633a8a6b73b00ed5ddde6f420073a96542d0e073a420020947775bdadef5257675137787b
-EBUILD cache_tab-1.0.16.ebuild 515 BLAKE2B a987f4b454a11e3f56ff0c5bccc34393bc248fc3d3762cef06922bf7ec74f5b07cbf5934df081d597223858cfcba6078156871271732e592050db1e76bb2db28 SHA512 44e2eae89ea01030819ed5a562ca930f34e36df9e293201758b6f121bdab03ecbeecac51a7fde7b8658ee1243a412e1de6c05709885d30211a2e8b9b93a67110
-EBUILD cache_tab-1.0.2.ebuild 511 BLAKE2B 1b57e3e41b22e2625f111e54faf2f9fe9067ba54697c39a8fbd1feda9733dbd1e3894c4455469e6702e33ede06a21c255d252de2ec6b34a630e5938f50702496 SHA512 28f180faefccfe35c9f58f897f8fa0c87dc163c831a631833ec2f7f84fbb35b84792fa02b894ad12913b6c3ac3f2d793e49325c0a5a62a8839806673b7c680b2
 EBUILD cache_tab-1.0.20.ebuild 511 BLAKE2B dbeda452932672fdc4c40305c6e9c2b8d4ac66a112fe473abb154bf20bfbba0b46aa12252a6ee58bd53681f7cacfa927b8eab42287f7a00a5e0199eaedaf924d SHA512 f821bcad6a8a368e06414a5a805f6c3bb1861b883ba2fd87cc5cda204d872983fcfb4db01f32af2da5345a53e6571394d8612b1dbd97f6298b5f656d9b1d4972
-EBUILD cache_tab-1.0.3.ebuild 513 BLAKE2B 969f0afb070dc203f06944aa1c9e3265e01129998461efac0df89be570e9f3cae04099ae8e73abaf74d0e3beab832888519d9d19ab2deb31ba03732e178f9cd0 SHA512 debf2c7af326ca421de0af51fd6043fd30d14dc167826247edafc08257884bb7b901a515874b0e9c5b26953e09d31fa55de0f5fd4bcec57f12228e55594c5a9e
-EBUILD cache_tab-1.0.4.ebuild 511 BLAKE2B 75d469c04eaa18787523fb1d15e018b09808022224f657b7a7c21b25dd9d8fd898c8a3e1ee12bdd04a3c634a7fbedd657afa58cbebf1444a41f263cab1a4e9ff SHA512 d4eab4d39cada64eee3a95c74053e56ccf203e31c1c2e8f8abaa8793faf0db47deb496b38def8295981730769a38ccf18705c846a6950240db7372f8b2952f76
-EBUILD cache_tab-1.0.5.ebuild 514 BLAKE2B 0989ef23b83501b652c0dcf465beeb9b87aa8c71154fb4f25e1e7ba66db021695e437efc29bcbd4b75829d2ed8576d30385f5811838c040f2a748588c2e78347 SHA512 96f222f12c4cfc4162a18015445c95674a991d1bd6f3d68a1200396e188b9fbc69ff1779e704af0ccc2f3269f18d4bbe7f7cb57b1e863f500f456d3e658b727c
 EBUILD cache_tab-1.0.7.ebuild 511 BLAKE2B 15eef954f50ab6dac96f7ba74d5a0a925035fc64eca78e4947ca0e9076e1ae13f6fefb1b2efc297ee4fa010092a1ca4bbab2f1d17713de76b7fa5bac460f59a7 SHA512 f4b2f28083b53fe04da214f6a8c46892f9c7dd5b5fa92f263ac9a8a017a48d901431e386ba966ba7988be5ed67a6acb637e8134f08b87655d7733c0913896c3c
 MISC metadata.xml 712 BLAKE2B 7875963f74c78c5fde85021cd9a69d4ceaa2bcb5cf4bac1492f228c895dcf0f2200d1a25d7fcea149df7d94ab22f2053e3535b6e0c1eb8c360c03de39476d37f SHA512 c73d49fd74157761a1d95c84278c102adc37fbd64ac8faee924019a2260101704714315b2f6018307d6c5b05df91ec7bed57253efa37dfdee128cbd2a1090be3
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.16.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.16.ebuild
deleted file mode 100644
index 2c670bedbf40..000000000000
--- a/dev-erlang/cache_tab/cache_tab-1.0.16.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="In-memory cache Erlang and Elixir library"
-HOMEPAGE="https://github.com/processone/cache_tab"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.13
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.2.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.2.ebuild
deleted file mode 100644
index c585638ad58c..000000000000
--- a/dev-erlang/cache_tab/cache_tab-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="In-memory cache Erlang and Elixir library"
-HOMEPAGE="https://github.com/processone/cache_tab"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.1
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.3.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.3.ebuild
deleted file mode 100644
index 4fa824f23a5c..000000000000
--- a/dev-erlang/cache_tab/cache_tab-1.0.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="In-memory cache Erlang and Elixir library"
-HOMEPAGE="https://github.com/processone/cache_tab"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.4
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.4.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.4.ebuild
deleted file mode 100644
index f7676827a7bf..000000000000
--- a/dev-erlang/cache_tab/cache_tab-1.0.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="In-memory cache Erlang and Elixir library"
-HOMEPAGE="https://github.com/processone/cache_tab"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.5
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.5.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.5.ebuild
deleted file mode 100644
index c27e13a3e1d4..000000000000
--- a/dev-erlang/cache_tab/cache_tab-1.0.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="In-memory cache Erlang and Elixir library"
-HOMEPAGE="https://github.com/processone/cache_tab"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.6
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/epam/Manifest b/dev-erlang/epam/Manifest
index d20e0e28884e..073576907f69 100644
--- a/dev-erlang/epam/Manifest
+++ b/dev-erlang/epam/Manifest
@@ -1,10 +1,5 @@
-DIST epam-1.0.0.tar.gz 44008 BLAKE2B 5dcb21b17bd3e4a2dca5ab4776aa609cce784f0df1f6192acaa35024a342d72f6233c03997218113bc54d18e9ef3473dc420f93a6f00fb2c2c8079c4ce6dc353 SHA512 c0b1fbdc1e910f24b2f39ea34cf6fd5859f3ab0cf762a16cf9ef71b1e49129c8238001151dd9031046049967f31fd2cb3d0c06a7d8bdd46e49f19862c143f374
 DIST epam-1.0.2.tar.gz 43720 BLAKE2B 39a1056d068bdceb7ff640a498b0766aa59649228b03e03f9385bfc106f45aa210315162d4386907a1e9cbc8f177289adebf72f527a4eaf270cd62413f1daa13 SHA512 a3fdb379d8c25e56e51dcf1e683d289e9f3d19a537b1a55ca4c09185eb5731fe073a5bf0dd1449f09f8ee5b7d868b0e63f04473c1f3d1b97722dcd9832e4e030
-DIST epam-1.0.4.tar.gz 43816 BLAKE2B a8070e45be428e1cd55dbe369051f2c5566d6d8d41af5d4258ec8dc86b70d7e55f316df10d0a65687d0ad8c5de2bd493859fd0c839ad57c90bb0eb1e4ea9db96 SHA512 46cbdfa683f48f24c4709837cba49745c3b7f87b6c1223b01ced65d547a8ec1a0467997070daf40bedeeb8298d7bb31eb33b331098b406964642f059b77fd313
 DIST epam-1.0.6.tar.gz 47494 BLAKE2B 8120e4f10222468ee2adf2f0ec9cffcaaea8c1fc92faf9889de0f970562631cb54cd9ba34d01994dcf657108c4232158d5617e4b9c884bc84e5eb383028b8e3f SHA512 2c316a46ac734be2c74a86e767b413fa8ff1b296622b85de4828fdd60c84e5b3962f8b76004fcb39ab43a345ec967e3f3db4ac6d0e7335dc982dbcf1edf02c4b
-EBUILD epam-1.0.0-r1.ebuild 724 BLAKE2B 539568b8b5af26822d3006ba2c320282b3c4d478e786374726f7ac54c28b44bfb0e341daf555ff6df5ecc09e2e0b8facbaaaba3feed47d4bca582ea8567da028 SHA512 6d2303c6ede3cb85e1cecfc2fe241480d1408dfcfcb2d79569f1d7a108153656a47d37129f0a89f45c6996ba0e542248ea6818bb90f7abdd1250a40c14903635
-EBUILD epam-1.0.0.ebuild 521 BLAKE2B 82b76739f0107e3ebbaa3dea319ffdb51e93a451089d9a6aeee5ef5ca4f57503f0a709ef4481d9209798241494914c77cb916bb9a5b13aff8f19d543e1cfe987 SHA512 6366da961a17a92992372a47466c68b9a8e4134193d3b60750309b41e882c43a128988a175d90081cc8d0cfe4a4c8687f78bcd81de02db904313cc31fbec0088
 EBUILD epam-1.0.2.ebuild 695 BLAKE2B 216a0bed0ecb446a80516d41717e1de8ef9c6166128cb57159091e8003463af9dae2ea60c6923c4a17e391a1e9fe57f469052b8cd8f2b01477de29f9a64ac283 SHA512 3c2f8248b6ed3a4312f584c2273eb872b01cae0df8aa65b64196e5fc1d95376c7069dea7efb5e97e97ec8b645d2e3a84988b09f19dcc2fed168c34f26a8724a5
-EBUILD epam-1.0.4.ebuild 704 BLAKE2B 86d57a174d9536f23d3c98bd2565a36d65535d586b65b8c1502d79dc15e572a2d5a3eeee082b7328660f6eb76c5e47a4c95ad702b9606936dad86a22f6edf403 SHA512 fe759cfbb16d47bcaac1bc82521ad1aa38433cc8306ea8be6ce7e2c02ca58bf74614b764b60c16035284c81c639f6d785b3933a16c4a0debbc16339308ee7875
 EBUILD epam-1.0.6.ebuild 714 BLAKE2B 930d2af514070e5ab7bebcfca1ffb073559ded4fdd22a28cfae427fcc2735ba22a28af897215a61812c85be6eb0e43b6327439c8f600b0b91f0e0a4a96c68f84 SHA512 dbe7ca91c073812bbecf78b34f80b95d89956ba4844e9082ccd4c9ce97f4477a2b3ce00f7b4010096c4c511edb43f25c5a306f562bdd86ca546805fddb49e304
 MISC metadata.xml 247 BLAKE2B 78e5b61eec19aae349a48d3a4d94596e49bdac8ab75348af4e77fcca33223a5207ae7c9c0384e4358187a107ce597fe7fd90ac766a24e31d51fcb2bdb0770199 SHA512 426d73c00f932bfdf3c95d2d7cb48f663263491a8affa8d8304af69fc3b4d891e95450c5e19dfee8e7d793dbc40cec9f9acb902b39ada35677e486760de03247
diff --git a/dev-erlang/epam/epam-1.0.0-r1.ebuild b/dev-erlang/epam/epam-1.0.0-r1.ebuild
deleted file mode 100644
index 58d8b83046af..000000000000
--- a/dev-erlang/epam/epam-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-REBAR_APP_SRC=src/p1_pam.app.src
-
-inherit rebar user
-
-DESCRIPTION="epam for ejabberd to help with PAM authentication support"
-HOMEPAGE="https://github.com/processone/epam"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
-
-pkg_setup() {
-	enewgroup "${PN}"
-}
-
-src_install() {
-	rebar_src_install
-
-	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
-	fowners root:"${PN}" "${epam_path}"
-	fperms 4750 "${epam_path}"
-}
diff --git a/dev-erlang/epam/epam-1.0.0.ebuild b/dev-erlang/epam/epam-1.0.0.ebuild
deleted file mode 100644
index eacf6aecb144..000000000000
--- a/dev-erlang/epam/epam-1.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-REBAR_APP_SRC=src/p1_pam.app.src
-
-inherit rebar
-
-DESCRIPTION="epam for ejabberd to help with PAM authentication support"
-HOMEPAGE="https://github.com/processone/epam"
-SRC_URI="https://github.com/processone/epam/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/epam/epam-1.0.4.ebuild b/dev-erlang/epam/epam-1.0.4.ebuild
deleted file mode 100644
index faddaeab02f0..000000000000
--- a/dev-erlang/epam/epam-1.0.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar user
-
-DESCRIPTION="epam for ejabberd to help with PAM authentication support"
-HOMEPAGE="https://github.com/processone/epam"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
-
-pkg_setup() {
-	enewgroup "${PN}"
-}
-
-src_install() {
-	rebar_src_install
-
-	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
-	fowners root:"${PN}" "${epam_path}"
-	fperms 4750 "${epam_path}"
-}
diff --git a/dev-erlang/esip/Manifest b/dev-erlang/esip/Manifest
index 61f2c335852e..4682efd59202 100644
--- a/dev-erlang/esip/Manifest
+++ b/dev-erlang/esip/Manifest
@@ -1,13 +1,5 @@
-DIST esip-1.0.10.tar.gz 84598 BLAKE2B 14a8260c24a7fd9e74231e7f95d7fc910fe473037a974c3ad712c9ba2d1922a9f701cbf4096f0935fe54ba5c6b5738a97f31eed1052d631353152dab9f7e6e22 SHA512 d551b2120d630e85181c2cc867f2c3e6efd5b6c31066fd58fdc65605c00d8a5ea0bddb821d018bd9401bfe3746b95777fe98ecbcbeaea62e14f1a138ad390bbe
 DIST esip-1.0.11.tar.gz 84816 BLAKE2B 8cf1f872496097965d40e6bb1e776318056735e12cf48e746a88861602c32edccdab902fb989305e804054a220aad26ae3931cc22d9d1b2282d6aeac0795df64 SHA512 b62f99b9a9e160e2303a28dab3133c15ce25eae067e3dc16d64c9d60640fd7d5b1b7f69742fc2b94bd6993402ef618454e771ef76dea1ccf24c9ee708f59771f
 DIST esip-1.0.26.tar.gz 85846 BLAKE2B 03d3ba5d9706794eaec99cfd074c8fda548fc0911ae8cdb11cb991c910955c47a69280b5cabb384cfbc48a580cc862ac54e3c795e641e417019313ebecb9795f SHA512 4bdbd94c1e6cd029603bbc4b5166f2793293ac0041c79a4c3672387f5217a998ab950cba0a6cbef70c2c5eca393b3f3a4917ec87ab4e5edc08b85cb46e7c667f
-DIST esip-1.0.4.tar.gz 84478 BLAKE2B b2b040269e0d8f74f812cc8b8be862e3d7ac9e3dc6877deb66e16c4a56ef97f07b5ec0885f68017caeb9e7a8df1f46bc901f85f5b88b6b98ddba86a9b80dbb99 SHA512 50915831796f76986a00f5a2a08f308aa9fee71e92fbb6978e9e20f0c00007c0d442991cc7fc2f6df82560a1509f8189865afe8d0b6f94410c39e07ca4f1092b
-DIST esip-1.0.7.tar.gz 84522 BLAKE2B 4e9c95e72b2e4898f972759d80390bb32c2e2527768dfc99f5094b7108dc5fa21f0e7d224ac13831040660ab63a017accbeb0f028d83652fad7317cd444eefa2 SHA512 f25f2ea146a8fbea8f727210fc222649a6d434b5f2f9c2eaab62d56ecaddcd2f2986a96befb1e1291cff9130276d146321c20948d0469c36797c323f94431f3a
-DIST esip-1.0.8.tar.gz 84534 BLAKE2B 25e705d4d466ce2fe5464fac73714e898dea5654fce945507afe2c00ec954ac72a8e2bc4c19bd75fafe0f489c9da56f63a2a0b02cbc3161435c929bd9001d190 SHA512 c5ed3e4e25d8db7aa67002e7b0bc0f6e7355e4227339ed507064832c3f329d78f6aa7d71eaa80108629b7bb6141f68c2f079decc4799517ac886e7bb3c1415e6
-EBUILD esip-1.0.10.ebuild 707 BLAKE2B 9b3c5d21f56719efe646c763b7d6a06ee8ad6f1c13c38bc2dfa30dc228a4e5e7975ffeffb33af0e577c5478e251f2bf0d2d15491e30ff070cdb9e89154dbf644 SHA512 c25ae0cda0cf5b0bd79935292bbe64964301b848abb58baa3afc4781da565160a0c2791e000c124f542974fe554aeb4e497c64f95863440f6b186746c424684b
 EBUILD esip-1.0.11.ebuild 706 BLAKE2B 4712ad3a2b0157488138e4ee0f80a1f35280410fe80eb2ffc74a8dc895c1731f874c0790bf4268d8fcb833e0e6bb3706efbbccafc1c04b9a3867ea336bd6802c SHA512 5dadc0c98049fb26b5dab4c6e840f4cf3f9a520ceaff6fb2405233228ddee71537270077b754c22187d16c85224ee777b569fa73d331b0357072fa5e95a2fa69
-EBUILD esip-1.0.26.ebuild 710 BLAKE2B 7703708798a8af74eecb64842cdd517d38e53f098d02a5ae3c36958332e25f06ec378d568e244867462bc4f79b3178cadbca4d575b90cfe3dba9106c440c0c6e SHA512 c64030b253f73701be632c10f4a7ce6a7415846e5a3ba6e764933f22140e3ace84aebc0ee671fc6ef05370549e676b7c44eb3bfc38feb07e406f9deac1e3a2be
-EBUILD esip-1.0.4.ebuild 704 BLAKE2B 3005b344095148ef84e14c82454434f1f7908ad3ae7bd359b2edc705d24c651c6c96834c0baadbc859c13f576ae18c3766c37d0c3c0816b4a2c4a09c17b91224 SHA512 4c82c6df5ea2a7ed8067b6a3d86200caf1387530bd48b104482fd3f1d6c299f37b0dfd2b821ffe3a1e234264e4c5d5441c063c3b1f69a202521c32c84b8072b3
-EBUILD esip-1.0.7.ebuild 706 BLAKE2B 25bcd8eebdff281b2b4118d3b735975233ecf0b12709df983fe149170237960b3c9ef39c1c3fb3169202828cc5812084c95ffe3b64d554628c2875db45e09736 SHA512 27eef9025b2169fa6b28330011407e1247e73b4afbc9e5c0c3bba7a58539c753eb47aa0aeda1cd1df20cb44f3b5c5c4482be7d3649be99fd4dadde2c931cd934
-EBUILD esip-1.0.8.ebuild 704 BLAKE2B b0cbf81997f89045cc9d24ac4f6b7c72d2d9e1c9cdc4dd3e9aa72dddbab7262ecc77a4f72bb0e683fc93620b56a0cf39c572a83bc0c34e661d85caa596379cb2 SHA512 e54fe2eef6c98626887a1d7f4b09abbce48ca0ebf14b3059808499b6b6cb7b58e50ac58d30fb3fb46a2d2dd0a6c5cf31b9d34cf2949ca502c59d637513576b4d
+EBUILD esip-1.0.26.ebuild 704 BLAKE2B 0a36f9e2fe5305fa2001816184fe1315cb628100af25bb8cefb7ebe06add3ca3ab94684dc5a2a11d5e84165a6ebc6496f71437d1f738188481c1f07e624d41ca SHA512 4cb36043c9032f146250801de18113ab58c032c4eb70b89a26df6bab905e7701cac1f03e5fafd82bee818b5a165afa396d107e61c7e57d9a46e177d9ea8d8d73
 MISC metadata.xml 247 BLAKE2B 40f867281579bf5e11f2a0d0f5339af3f57c446c71ed6f4b01272617efec9e96ed24db889658a1aac39aff57ac24bd722d27667a563d754188d8c32d2223b9de SHA512 49f3ed5733391eab50c5b1123ac0da4082dcbef402c5570bf781b72a0f6aa42ee8621f96bbf50e562998b2be39f92f6013bf0c1ef64f6b12e1a560ba8133a8ff
diff --git a/dev-erlang/esip/esip-1.0.10.ebuild b/dev-erlang/esip/esip-1.0.10.ebuild
deleted file mode 100644
index a4fdcf360d4b..000000000000
--- a/dev-erlang/esip/esip-1.0.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="ProcessOne SIP server component"
-HOMEPAGE="https://github.com/processone/esip"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/fast_tls-1.0.9
-	>=dev-erlang/stun-1.0.9
-	>=dev-erlang/p1_utils-1.0.6
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
-
-src_prepare() {
-	rebar_src_prepare
-	rebar_fix_include_path stun
-
-	# ebin contains lonely .gitignore file asking for removal.
-	rm -r "${S}/ebin" || die
-}
diff --git a/dev-erlang/esip/esip-1.0.26.ebuild b/dev-erlang/esip/esip-1.0.26.ebuild
index 6f530f6161b2..30876d8a8c2a 100644
--- a/dev-erlang/esip/esip-1.0.26.ebuild
+++ b/dev-erlang/esip/esip-1.0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 
 DEPEND=">=dev-erlang/fast_tls-1.0.25
 	>=dev-erlang/stun-1.0.25
diff --git a/dev-erlang/esip/esip-1.0.4.ebuild b/dev-erlang/esip/esip-1.0.4.ebuild
deleted file mode 100644
index e59d8a897920..000000000000
--- a/dev-erlang/esip/esip-1.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="ProcessOne SIP server component"
-HOMEPAGE="https://github.com/processone/esip"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/fast_tls-1.0.0
-	>=dev-erlang/stun-1.0.0
-	>=dev-erlang/p1_utils-1.0.2
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
-
-src_prepare() {
-	rebar_src_prepare
-	rebar_fix_include_path stun
-
-	# ebin contains lonely .gitignore file asking for removal.
-	rm -r "${S}/ebin" || die
-}
diff --git a/dev-erlang/esip/esip-1.0.7.ebuild b/dev-erlang/esip/esip-1.0.7.ebuild
deleted file mode 100644
index f8f8e9b12fd8..000000000000
--- a/dev-erlang/esip/esip-1.0.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="ProcessOne SIP server component"
-HOMEPAGE="https://github.com/processone/esip"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/fast_tls-1.0.6
-	>=dev-erlang/stun-1.0.6
-	>=dev-erlang/p1_utils-1.0.4
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
-
-src_prepare() {
-	rebar_src_prepare
-	rebar_fix_include_path stun
-
-	# ebin contains lonely .gitignore file asking for removal.
-	rm -r "${S}/ebin" || die
-}
diff --git a/dev-erlang/esip/esip-1.0.8.ebuild b/dev-erlang/esip/esip-1.0.8.ebuild
deleted file mode 100644
index 3919b93556c9..000000000000
--- a/dev-erlang/esip/esip-1.0.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="ProcessOne SIP server component"
-HOMEPAGE="https://github.com/processone/esip"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/fast_tls-1.0.7
-	>=dev-erlang/stun-1.0.7
-	>=dev-erlang/p1_utils-1.0.5
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
-
-src_prepare() {
-	rebar_src_prepare
-	rebar_fix_include_path stun
-
-	# ebin contains lonely .gitignore file asking for removal.
-	rm -r "${S}/ebin" || die
-}
diff --git a/dev-erlang/ezlib/Manifest b/dev-erlang/ezlib/Manifest
index 8ce869b582c2..1960657631d0 100644
--- a/dev-erlang/ezlib/Manifest
+++ b/dev-erlang/ezlib/Manifest
@@ -1,9 +1,5 @@
-DIST ezlib-1.0.1.tar.gz 45307 BLAKE2B 1226319144df02963618ace22ee2e3031226677703dc6a68c011794b336799a48eabe8b9262ca5501c6d5feec6256e517f757aa9f9986dfee9133bf9b4954a33 SHA512 7ec02dd91034eeaad3556071ef78ff6d8e890bc49b2ce5010280db48f9eb65ebfe62628fbbb89110310e359847f0da616f9281683926fb7d0f72972ee77a463b
 DIST ezlib-1.0.2.tar.gz 45369 BLAKE2B d2d23cf9fcd530a76ed4a386df15401cd9598e158f20cba3eff19332e25532fdaba8cae93e576f5756559e74f169f6a01f9d09c41e844d3af4a9d9d3cac15185 SHA512 90671fdf0bbc23a7f54da665dfb31a3ed2d92180ff5c58d872001481584e6c8b39cd84b3dc947f1efdae10792c2547218017381cbc7056070d22b140e941c9bb
-DIST ezlib-1.0.4.tar.gz 45510 BLAKE2B 685935b2aad9d20dc0d367c1edddb701d3d12fd24ec3fab617d35f9207e3994ddb57aafa9083337d0752b5e1fe15941dbff2f9b916400f0e7a3c6350a3c6ff3e SHA512 16495a6756cd60ad921695d87136e399446850ce1160d92b825673fa1e0e7d3cd4a6b49f274debbfe7dfe4285370362ece64db8843afd564ffaffe9eeba0dc7a
 DIST ezlib-1.0.6.tar.gz 49136 BLAKE2B 596e3580a20d7b8174ded16656fd5f15b8558ffe16a1278e76a25dcff935c258b2df37fb5be0c4e78de566823c41c58941fffa95cdae8b02a21bf6ea5d6f5417 SHA512 6f2a459f773eeba9a7d1316a5c38c686b54c5c68bb3d90e38ac4698fb1140c2d1b961e981af5013711fbfd854f3b3f206a828b6eda9071fd437ccdf4871d8e39
-EBUILD ezlib-1.0.1.ebuild 492 BLAKE2B bfdfa1bd5d14874377a2eb534b64438fba5930d623b9f4f0da8569a7d2e7493fe8cf1b0116ef47f207c51feef211f861a33b057855d61ba7bed0368f14d0b4dd SHA512 7f99ab77b621cc1229cebda4865f461b5438cda0c209a0c0726bdf861679d4aa1b662835c026ec1b9fc82c9bd0f5c113fec4c8543deae05236329a35dc3e74b6
 EBUILD ezlib-1.0.2.ebuild 492 BLAKE2B 59600080ee8431b029b01a7280361f1c175ee261ac8134e38939ce4ad283f4547061bc64d39b17e72e857495443fa0a65b2473fd3e9d180c6a7ad32fd7048638 SHA512 94b6c1921510ec68c9f0c6300a064aa3efdff8fbde795e2c9f08ba697aa6dc95fd79e3a7e614630eefaf0a1928617cdfc0287dc691d0faa591c16ab80e69bf7e
-EBUILD ezlib-1.0.4.ebuild 495 BLAKE2B 8e8039025f74c16cb50bbb0edf84473b908828bed5c626a916a255257b702d214a77214d1f19afc32ee2b191c294593213f7fba9363e8d62c1fa70266cbae00b SHA512 3211bd7daf4663e2ce371608e8cf1cec7136eed0ee3ed52d8653766497caccb0378e83a14761683150e18aef083649306842433dc3e2ff34ce47d219f3d518a6
 EBUILD ezlib-1.0.6.ebuild 491 BLAKE2B 31a37acf65fa9941660376a0b05af68245a7ee15b779dbbd22bed120a26b242c78d342f89f841affc4e79f908bdc7a062b0d4687daf5c437f611f8be7e6a8a36 SHA512 674dfcaf54b98737d39226ea644962c1d979b68078636799d0e3b83e6f97de6779a530852c0c6b2328696533512753a5df6ed07691f504cdb64a718086a2f356
 MISC metadata.xml 248 BLAKE2B 9ec5b64020c33ec61484a87c3d3f36ba4a2d51d768c8eb52ad89a99a2cd74acfc4445068578d8b5ed69c799f0bf9970fbcea47eba30910a7f727e8b355f7e11d SHA512 9453f3c83241ed048494c430d855107c2871661afd3a4625e8681f351bfb30e5f091d3954496a351f9812e04951252fac433b8073c5beb757f394e7a76737747
diff --git a/dev-erlang/ezlib/ezlib-1.0.1.ebuild b/dev-erlang/ezlib/ezlib-1.0.1.ebuild
deleted file mode 100644
index 98d089491da3..000000000000
--- a/dev-erlang/ezlib/ezlib-1.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Native zlib driver for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/ezlib"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/ezlib/ezlib-1.0.4.ebuild b/dev-erlang/ezlib/ezlib-1.0.4.ebuild
deleted file mode 100644
index 78a239ce2a97..000000000000
--- a/dev-erlang/ezlib/ezlib-1.0.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Native zlib driver for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/ezlib"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/fast_xml/Manifest b/dev-erlang/fast_xml/Manifest
index 829eb71ecfd6..8ec4deda88f5 100644
--- a/dev-erlang/fast_xml/Manifest
+++ b/dev-erlang/fast_xml/Manifest
@@ -1,5 +1,5 @@
 DIST fast_xml-1.1.22.tar.gz 92408 BLAKE2B efd6c69c4dcfe3c36162c0b47ee8b56561102fde130f8be503c767e40d66c0f698876ed384bd27aea41e18f6530bf712eeeca2ea497c4b1aafc630fe1b016981 SHA512 33c79cf34d6b0093cf98d11c5b68855d4201a6891786cc3caabd7dded81a04118638ce091cda1f1c86729ea8c8765214332cc34a361bbfb3c5958dbc2027a384
 DIST fast_xml-1.1.34.tar.gz 93530 BLAKE2B f4db5fd718f66e34b305d04ca7be5a72770ca9c749154c668072c6ef88eb545f3ff200d549fba6395eed46605ce384559dadda66b4281429b57706c579f4c47a SHA512 e2b29e1307c0513046de2ac8afe6c1a6ed8a8640b62451777233607a656517ac1b4d68f725b05712d3c254f68e76e49716b1e913c3d3c34222fe2a5a62fa378a
 EBUILD fast_xml-1.1.22.ebuild 574 BLAKE2B 89e167c6f9c89d3ff5c93a1e196932d8d719d82fa76d3710c7154951ca6a28336f71ec5d5e22a7eb3970a4b1a8ef5777eb609eda0f9e8a2593dfe6ee3531f58b SHA512 21fbfd5238e37bfe1a65696b3f41a2069403ba76c17dfb786e158ea308939e69ef450d23789540015ca1b65c2aa6c05fcd576131c8fe92cb02a35c332c7c7524
-EBUILD fast_xml-1.1.34.ebuild 578 BLAKE2B d9cc1eff851ee6d47e6170556393221c7e530117bc672d0196249e5b925a492c242d619d39a4ea2f11018dcdf16753d7f4f8377848dc5f90f6f22b2883291d85 SHA512 b25e2b972d0f6cf0d4abd547c6837e8aaff20fa3cc992eb31d59dc422e49c48a0e3286b5ad90cdd4bfc8ddbc571cda8376a8ff78a99a351b51ca68b31bba112f
+EBUILD fast_xml-1.1.34.ebuild 572 BLAKE2B dbca3dd9c30bcdf773fad31c952a2c6600ee8c0a538bf4aee39d5fc2517bf178875c28d53130be4e4cb8dd37ccf1dff9c18a161e02a70964132c91dbb3a8db54 SHA512 2bd92262efb5cd0cf832ff08306e24500c3d0d4c70a2cb8dc2d913a350e6832554feb43c85975b1cd6427211664f71cef84c4598c82e6af610db37653caadd89
 MISC metadata.xml 251 BLAKE2B 372cd79efc44370b5f07b6282b66d182854f7bb964b204c0b829d3ae8193d4b24420ac4f77c92931bac171a9bde1042426ba11f420f0ffc7eff128a260231d88 SHA512 98e5b036a53064c5e6a94ee411071ccd9c4ea1fa0934a879dc07b7c9ffe6e35e78c8857dbaaf5d9f5062f63afa181325e636118073a4be8d8c4cbe9394fc6fda
diff --git a/dev-erlang/fast_xml/fast_xml-1.1.34.ebuild b/dev-erlang/fast_xml/fast_xml-1.1.34.ebuild
index 4165cbbc37b4..0b1c27f42890 100644
--- a/dev-erlang/fast_xml/fast_xml-1.1.34.ebuild
+++ b/dev-erlang/fast_xml/fast_xml-1.1.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 IUSE="test"
 
 RDEPEND=">=dev-erlang/p1_utils-1.0.13
diff --git a/dev-erlang/fast_yaml/Manifest b/dev-erlang/fast_yaml/Manifest
index ef34ab6d8db7..028d9fbc9cfc 100644
--- a/dev-erlang/fast_yaml/Manifest
+++ b/dev-erlang/fast_yaml/Manifest
@@ -1,16 +1,6 @@
 AUX fast_yaml-1.0.20-dont-escape-simple-quote.patch 1240 BLAKE2B d9ce45488944ce4c3cb7cfe5cbb504363bdf0a795a418ab8cb7532c4fe5869a8d4f83dd6efc059380d05837f63d0fd314694778de9de7da68b6108a36645d238 SHA512 d7392cb834b36ceb18a306263c90c16ad48a3e85c76945e2bd660daf76f7c123fb23a55d1fd0fda8f909e3c08796801df6494dacc79bd9ec2c908e757fc6de7f
-DIST fast_yaml-1.0.17.tar.gz 49925 BLAKE2B 654a8f6ed516fc851a78a360c5f57faa302b068dbb84f9f26f3b0b8204e2cd55569ca27699181415453de469e524348b0db990736647df41843070446a20c9de SHA512 596e834a63b9ca78eee9b5021c711fdac2d7bd148dbbd6b0c162ec87f94dc41ebf7c8cd3d86c8a2c94da07d0926d31601d63123103678d42905243bb86c5f4a4
 DIST fast_yaml-1.0.20.tar.gz 54476 BLAKE2B 553b433a4cbfa859b25f39e74766047f490cd11d327f73e948237fd4321e7a9f160656cb312b60fc1379c8e35f3c613ad76dc0a44a2f73b8ca09ce61a8e036e7 SHA512 583c36caf0dd492518b631bc4882530a12f83bc1de952aa8b053f4c3fb828be65d127954a5277b320a0ef28cf8b8df6db88e76b323f2774af061a9e9bd88e061
-DIST fast_yaml-1.0.3.tar.gz 49351 BLAKE2B ef705ef36f3ab2e43ac434abcce58f8fc3e0f1b0c0cfa88596c9b34b76ece0a2277a5f97046c789176231010711f906d5ec961b2053622404418e6a6d9380778 SHA512 321de1c0ff830de8a556bd661e600a66bccd944d6503a87a02111bcfb0b23c8c60b128296e7bb07ea39f923a04ebc7cd15e33971ca6691f16a75340c0695aee9
-DIST fast_yaml-1.0.5.tar.gz 49463 BLAKE2B d321ef3bbb4b51ad058b4c4125d7f53e65d5267fb0d3a6eedf2ab7b302d0b5cb9b1a2ac1cb60959ec74e8cc32684b6bf31f5247c26e61d810159d0b731541e96 SHA512 9d6b173f6086b2543273493cca460f161d16a4c3cfd8f84945a7040991fecd24a193bf0af47f3d0a326d2ebea3d46fcf5cfa0ff21607ee98e9a0bb6f2a535bab
-DIST fast_yaml-1.0.6.tar.gz 49461 BLAKE2B e79acf46f9ab85fc99774d727d3d64dfbfb583eb3e9a5379e95bde44a3a3703a1ad8aa22d9629d11f2c4346c8b0136b8076b67a4bd70a6a39c576f2df81bcf68 SHA512 04a466ebac30ee08827c9ba6d18861867571eda599e68937bbc8c924dab2387444db1f02da3cbf493ef63f03bc73cb6de32a90ee54901d269b3230611ee9600e
-DIST fast_yaml-1.0.7.tar.gz 49524 BLAKE2B d731cdbef28767ec0ef71ffcac7ae7150efcbf4e801ef1395ff95e22f9cc89909908ca26e493281487876bca361f82aeca852bb5a27ffe0ecdd1b658d6c0a78c SHA512 7d8dfd759fb6c406cb1e514b8bf66768b52e6be726067843035b037e88fa1986a465b173ead680971457059743d42829f0a9c0d9259fd0918e07804b6fbae89f
 DIST fast_yaml-1.0.9.tar.gz 49696 BLAKE2B a8cbda580e9c2bacdf046f82dc579eb5160d130f9af6c93e05e5c3e4fd7f8f30c9d767cb150a30c2abbd3d8fb3c62fa7c76bab3addb5754d04b9303e6c5bd3e3 SHA512 dd826643d1c841218bae1ccb6ea3dc0c35c64c20720c47e90b3dfad3231c4944216729bf3d46f19b06cd2d54a9487336e39a9ef15201cc315ab10a7ee950bf6a
-EBUILD fast_yaml-1.0.17.ebuild 538 BLAKE2B 208440244c10328d490bace4243f0d9d53cfb48064c6867385c83ade8d600d48a5d58eb7ed0dd7fa44633fdff569e463d49d806a2cbd09b6be72c9e7d063bf04 SHA512 85b15d8fc5b1c9f0b2887c786b31a104a1cf4ca6b3bc4fcdf2e8ebf887cdf8772dc0e7aa551ed74253770311ee1569d283c1bfac685e7697bca477b5136ed2d2
 EBUILD fast_yaml-1.0.20.ebuild 705 BLAKE2B 4e0326eac6917392e8fd96f4798d34ea075d91893be5f780aab1a21413d7d5eac7a1b36f94496b56c7bacc9015633859414d9d1ab6f566a000dbcda19f937cd9 SHA512 f280522c5f1968ba4cabd95e66e011bc75019970a676b0e8ac62ef54d527ca31be1c22efb57e24dd0ea4fae5ffed7377719b747d5c9b05bf00df8895395e8bf0
-EBUILD fast_yaml-1.0.3.ebuild 534 BLAKE2B 0d00c4102fa84821254bf7dfc942baf36b1b5b21ad9724a333af17fe9f30c4a7abb6645236fc351518851517bdc295f88f0a37c2ce5101298cb3c472d8442de8 SHA512 c73ecbdb62eb67e43ef0f52c9c9b0d1bda7e9ca6beb9945b61d78ce2c4cb0ad706fe009dad5f60f59f7bf13b05519b8fc9b538d58c92c55ede0830dda134c2ec
-EBUILD fast_yaml-1.0.5.ebuild 536 BLAKE2B e4837d431aed4780b061cd9db21ca066add911809057f83fe90da066a0eca164d84cd5f4489b0d68238f06ec731f3b14a18a90a4dec5702301be04d3013e5606 SHA512 1ecb41e6f8be61c5ae5436de14e48eb118dffede1a95bbf13c05ee2335eb414f269363497e83d40b147aa8f7bda00ff77425ca3d85476fe5b4efffe6eb66f2f8
-EBUILD fast_yaml-1.0.6.ebuild 534 BLAKE2B 9f24ada95572184c9d28b063dae707ae763174523008e6bc01c1335b01aaf60add36a748f9bb049141eb3d3ef90e213216835777e17b01dc3e87a0a84d66ac25 SHA512 9cc01d7a6cce598a7f9d809dfdf2d27d763e3ca8f9648a652a1794cbc32cce51680a00852f1c8c5d1c2bf1a4e10bcb184af125b657e5b4312656cac6685742ee
-EBUILD fast_yaml-1.0.7.ebuild 537 BLAKE2B 5fa3f7b89433fccaa96640b8f0e962849e6162173f36f0d4f42b1fa7abec727390a2124b8abad848de2db996848b8de9eb53700277a49cd7d0daaadcea41594c SHA512 36339885ba0c2ee4b355bed6b88b4e185078b2200fc2a516c025b81b4de218209c650c25aefdf4f92b10b8e4bece09e701bec401f79f143f06a8b012aaafb2d0
 EBUILD fast_yaml-1.0.9.ebuild 534 BLAKE2B 926fb402ff133a9313ed786210d2abb05f949f58f745552f34507de99e1d841f0680c23b5d74ac9d5d0b882000157be5f45f0d3190f92fba424bf50eccb6ad56 SHA512 95e01ed8cc6a9053430d01dbc09178dd153afe224fe12c2c955879deed0e610f959c1947e259982c0054070ad0a245c397409fd3faecae78cd8137209ffe022b
 MISC metadata.xml 252 BLAKE2B 461508866f011a203d6b2068bb57828e91d9b8b5e9e250634c38f76c59d60519fb0b4e0f4f982dc57f9b145845fc35760ff70cf8e9f7c6c0a2b08479551cedd0 SHA512 640d13ac39e5d2b1b4fd0049b4ad78d7f438a9c33dac808055ea88623210ddf827f9c005a0e4da546afab57e0a6dc771636d457bdcfce2512595c1c8a7560483
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.17.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.17.ebuild
deleted file mode 100644
index 926060b6460c..000000000000
--- a/dev-erlang/fast_yaml/fast_yaml-1.0.17.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/fast_yaml"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.13
-	>=dev-lang/erlang-17.1
-	dev-libs/libyaml"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.3.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.3.ebuild
deleted file mode 100644
index 1d56c48ede8a..000000000000
--- a/dev-erlang/fast_yaml/fast_yaml-1.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/fast_yaml"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.2
-	>=dev-lang/erlang-17.1
-	dev-libs/libyaml"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.5.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.5.ebuild
deleted file mode 100644
index 67ebb9ace70e..000000000000
--- a/dev-erlang/fast_yaml/fast_yaml-1.0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/fast_yaml"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.4
-	>=dev-lang/erlang-17.1
-	dev-libs/libyaml"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.6.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.6.ebuild
deleted file mode 100644
index b787979a6df1..000000000000
--- a/dev-erlang/fast_yaml/fast_yaml-1.0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/fast_yaml"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.5
-	>=dev-lang/erlang-17.1
-	dev-libs/libyaml"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.7.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.7.ebuild
deleted file mode 100644
index 934160c67d2e..000000000000
--- a/dev-erlang/fast_yaml/fast_yaml-1.0.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/fast_yaml"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.6
-	>=dev-lang/erlang-17.1
-	dev-libs/libyaml"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/goldrush/Manifest b/dev-erlang/goldrush/Manifest
index 8fcfa8cb06d2..069fcd2e7916 100644
--- a/dev-erlang/goldrush/Manifest
+++ b/dev-erlang/goldrush/Manifest
@@ -1,5 +1,3 @@
-DIST goldrush-0.1.8.1.tar.gz 22050 BLAKE2B 06b1372a9442f9e66c4b2da39ab18cf3aa79e9730cb3b1ccf9011bba4e383aa9395d008c9b30f4f650714ec1f56d86d3eb4a07e8bab90e525d2bdc938f2b64d6 SHA512 291b340ad67e09e1bb92d97844fee9d0cc87abe19fb9a9bdae382c407bfd41c0269562fce5716133e8db8e4f1340dbb9bda24b57130ba89b3713d85ba6c4a007
 DIST goldrush-0.1.9.tar.gz 24548 BLAKE2B db1599ac8009a76558fbb451790f7d8d2fa0ab5a339edfa119afc8a8512160542061b363787599a4d1e5c69c70b35fd21160e73ac508589f1a55666978049d38 SHA512 3e1efcfd1ed26641dc054f4f0b4b6a8c40959c8462f6fac9d1bde4818d46700d64bf727c39e27e3428a5717d2ef917b9e35b5982e32546482451a403f0b206d3
-EBUILD goldrush-0.1.8.1.ebuild 691 BLAKE2B bf03648258f4f754ff82aa41a65b002401d409d8753598fc5ad1be1b9067b7c4fbeba4231f72176d4d07cde7ea13355f1dabf6ef38e9b8fbef165c245e490e44 SHA512 8a29cbd5a70eb6dac1a6736e668a135f24c979fb00b4af216de5d1d31216b089c764ae7a9dc3029433df32137fdbb67f158623922a69aeabe29fd6326dd7f6ce
 EBUILD goldrush-0.1.9.ebuild 614 BLAKE2B d19c7105a5ca0ceddabf274e524941dcf49f5d268cc38f2048ccaeaa96bbdcd65b35ecc709aaf6ddea574e1a81c5c52e941dccdc9f792630a0b5535ba260b428 SHA512 680b589b124689a0d9f4cde8c5abccd16e4184e77f89b7e53f9f677343bd5aa33c7963ba4adddcd172c183d13233d7e26dbe0f6258cf09feacd94ba54c4e75c7
 MISC metadata.xml 248 BLAKE2B f421b23a781880f1e547640fb243b1b8cf57877edf6ab546d4dae4451fb0202ba24847aceb50d65129119f0d351919150190755cd0d20a2f3905b53fabb76529 SHA512 0dfa50c7bec42d40202becdc8cb5ce48f7fee8d6a989e026afdbd0986103be74ec4f245c8372cc608ef15f83582a9806000717a27770dd44a7c545f9c176960b
diff --git a/dev-erlang/goldrush/goldrush-0.1.8.1.ebuild b/dev-erlang/goldrush/goldrush-0.1.8.1.ebuild
deleted file mode 100644
index 7b6383881324..000000000000
--- a/dev-erlang/goldrush/goldrush-0.1.8.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-MY_PV="${PV%.*}-${PV##*.}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Small Erlang app that provides fast event stream processing"
-HOMEPAGE="https://github.com/DeadZen/goldrush"
-SRC_URI="https://github.com/DeadZen/${PN}/archive/${MY_PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.org )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	rebar_src_prepare
-	# 'priv' directory contains only edoc.css, but doc isn't going to be built.
-	rm -r "${S}/priv" || die
-}
diff --git a/dev-erlang/iconv/Manifest b/dev-erlang/iconv/Manifest
index 560cb58e64e9..ea0813b5d926 100644
--- a/dev-erlang/iconv/Manifest
+++ b/dev-erlang/iconv/Manifest
@@ -1,13 +1,5 @@
-DIST iconv-1.0.0.tar.gz 91905 BLAKE2B 50903abf4cdc9c13de00875b6b253d8649e876b06f9a5c13d621d3d997b7bcfef56eb9635552ff34141e1449079e178b91f6a73355c53fc896de33db46e92811 SHA512 858ec07e2a8c2699c553de068451dc6dacf3fb1cf8a8e6727a746b72b191b5647a75a5b01443719a8625c1328c6b502a1f51fc1d367767e71792e38e1e34c1f1
-DIST iconv-1.0.1.tar.gz 121318 BLAKE2B 57d92de2599c018638f91eeea9d79fc5d59a81063be980186513b0ad5dec89afe61f0cf933a459f859088aee3bbd7b4f92ce1519e42d784ac9aaa3efb9809704 SHA512 bbccdc206c027e43a13388fc6c23ae5cd7084686ad56e39593b4a3db2abfe89e8000d2a88706d4b083b21e1399d5e7a527e72fa83c7f5e631ad39c8d39293bc1
 DIST iconv-1.0.10.tar.gz 121594 BLAKE2B 407a6cbe51aa50c561c577bf447dbc781c22bdc4ea20cacdcd2772e3cd7d262a1577381985ddafeb6fb48be94b35070de025b5d2301dbb4a3b9b9c0defd6a4be SHA512 c0537db617b83184111ce6f3be2e381c4a9f6a96d4887a2cf5bde3b275974411fb997f4a2f6a9c2b25c8e783e26af92b531788e9354be413d1837dd0482d41ef
-DIST iconv-1.0.2.tar.gz 121331 BLAKE2B 6b5533670c6e81c7fbfb00b9d5bbc0842f76ddb528becd2b9ab5aea2c741dcc15741b2a47fdc389474deeb14563c3646e5bbd642aa577fd5ab35372bf2f06a9b SHA512 910614320109993f359697bd78bb9c31275eb1e3a45f583f7caeeaff77d0f8aa513ebcb12110dc2ef1bf5ecc59e0f5f1c3e67f0cf47cde837a8af524e951901d
-DIST iconv-1.0.3.tar.gz 121413 BLAKE2B 0bbb79ebba8eb684895d2cf2524cf7cfd4f36535232474c0aa526d2e1e74715553e8880cb69c6ff47a3bfceef06852fcb5ee630f77c5e27cd86720f5f3ea98d3 SHA512 33b98d592eb0122b72894e7c06bd31763657615ecd9deefbd2ef6735150347708043bc574d8056be33d1d1bbc07a2bff4c65c504bb2a5170e6b8a2034cb803d0
 DIST iconv-1.0.4.tar.gz 121506 BLAKE2B ba2b3414feb8cd57681b8a866ee8862feae7a5cfce01077d94d0b2b90604a1f4757d138548deff9dad38e2ee88db54fc4e27c6a5120262d6620edfeadbbc388c SHA512 697f65a20aa42d92e2fe62bd88a6a6c7b1f6eff3a3ab14db3a17231875d2d36f5f36332c71db490b014cd3ea9b68abc0d815f3cf2b9cd72c18e1a94f62ff48a3
-EBUILD iconv-1.0.0.ebuild 495 BLAKE2B f3d55540c3350dc0701720a548cbd398a1548aa1470745248b745729f75547fff206ffc50c4cca40d627c004c8f1f886a50d686ca13c0734c9cb70c940cbddd9 SHA512 5157cd946fca930f18eec465af671b0f12cae83a82291e2681eb9e53499a6804e0166c7f8ab0edc46b2d9e14f3e85c6f59a33466ce84c901b9a0dee3b6022407
-EBUILD iconv-1.0.1.ebuild 526 BLAKE2B 55c6189591c4fc010064323f9f044efef049e93c9b0f1c5727129b6872802dbd072362879377bf469f96757b5c415d77685cecbee2305c986ea9b5ce666c8196 SHA512 28439fef5a728a17104256b92d23724bdd507da1c653168b3ce8f1dec54e00bdd2f47cfba12fb311898aa1175d1e2a96afca3ce9e467598b542c19605acf555f
-EBUILD iconv-1.0.10.ebuild 528 BLAKE2B 9eacacc4a12fbbec9700da95c9b72b771067083548073ba0540dbedfcf8d68fbae2978505e10386f2f7208b7263ce06989171a4c5bc5aae03b72ff93958e3c7a SHA512 9f4ae1190c3ac0197e32f572a0a17842b03919ed22a1cce53341418d3f774c43ad47ddb15716bc0d1ef3c9dba604a23730f57860b312a40044d337725cd31093
-EBUILD iconv-1.0.2.ebuild 524 BLAKE2B 6f8799774690486df93a3f84e790a4284a25a40da45bbac304db96cec17f3dca5b1ea80971e719abbf4db8c069957b2819e4b04d66472fa1e8dda8ae35aef014 SHA512 6ebda1d08f2c938ea0baae76f3ef69b783aa02d97ce3bae36bcde791cdfc2f4279f464df200104db6b3b921e887422363b490ae0b382dc4f9a29d5ec97d7debb
-EBUILD iconv-1.0.3.ebuild 527 BLAKE2B c3c8c23e5b9e11229e26acf80f788be76d84dc418dab4d066d541257f9d7aea5930c88b4b3650b0a02cc38dec2212b5d32167788fe19679f1c0db4b7c1330474 SHA512 4a309ea985fdcfab7babd104c2d6319c1d29ca89f15d07ea163a20e1eacd7341b0c029ceba71a502e18109e82b5aebe9d737ad6ab91c23cec9f7481c789f2a18
+EBUILD iconv-1.0.10.ebuild 522 BLAKE2B fb5bea03131cc9394bfe1dd0a0fc0e37d1e7d55527e78b23583621d573e19cfcef1270264a129877cb75cc09e4b06c1c13adfd2f4806fde10fec646759a04b88 SHA512 145230b339a86c6e19a31b2746ff026c70aa85e4002f3925b421c464c4727c5c7fd105bc1edeca8541d638a22d633984d1cf2f3c3c06229c6eb9f51862490bdb
 EBUILD iconv-1.0.4.ebuild 524 BLAKE2B a4948172fd4e838cd86b828cf9471d35a6bd83bbfa2d1745e7f87163b855cf9dc9c179b308e7f2d34ce2fa1c07b773d3fd321c9c17643b9b6878441a59fd19cc SHA512 1669e7cb5678618745bb5e93b28af874e27553e2fd25336ab9f6327c6a89b5dd4803848159d776c3be931eb0d4dfc26efde98b068dd29f8bc74a62ef5eefa8a9
 MISC metadata.xml 248 BLAKE2B 4304134df15df3127bf83b694b8056258d906a9ae6655f35277a78e527121ccae0545557c96c9b0df7093308f4874a4b70126b4a6b786c51338f22dd97ddd09a SHA512 a412162dc6bf45e973e2511d463f412b6fba8c3162b0577aaadff52b2e15e39a78eec278e93be22cec103b13866aeeda3fe21fc2b580a99cdaef0cbccca1c6d2
diff --git a/dev-erlang/iconv/iconv-1.0.0.ebuild b/dev-erlang/iconv/iconv-1.0.0.ebuild
deleted file mode 100644
index 295f16f0c3e8..000000000000
--- a/dev-erlang/iconv/iconv-1.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast encoding conversion library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/iconv"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/iconv/iconv-1.0.1.ebuild b/dev-erlang/iconv/iconv-1.0.1.ebuild
deleted file mode 100644
index c93ce4da874b..000000000000
--- a/dev-erlang/iconv/iconv-1.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast encoding conversion library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/iconv"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.4
-	>=dev-lang/erlang-17.1
-	virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/iconv/iconv-1.0.10.ebuild b/dev-erlang/iconv/iconv-1.0.10.ebuild
index a90f949116cf..4d308812da7b 100644
--- a/dev-erlang/iconv/iconv-1.0.10.ebuild
+++ b/dev-erlang/iconv/iconv-1.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 
 DEPEND=">=dev-erlang/p1_utils-1.0.13
 	>=dev-lang/erlang-17.1
diff --git a/dev-erlang/iconv/iconv-1.0.2.ebuild b/dev-erlang/iconv/iconv-1.0.2.ebuild
deleted file mode 100644
index c8aa39468e8a..000000000000
--- a/dev-erlang/iconv/iconv-1.0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast encoding conversion library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/iconv"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.5
-	>=dev-lang/erlang-17.1
-	virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/iconv/iconv-1.0.3.ebuild b/dev-erlang/iconv/iconv-1.0.3.ebuild
deleted file mode 100644
index bf79ebd2e633..000000000000
--- a/dev-erlang/iconv/iconv-1.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast encoding conversion library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/iconv"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.6
-	>=dev-lang/erlang-17.1
-	virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/jiffy/Manifest b/dev-erlang/jiffy/Manifest
index 71c77e8519ab..c8e7fa6a06c4 100644
--- a/dev-erlang/jiffy/Manifest
+++ b/dev-erlang/jiffy/Manifest
@@ -1,9 +1,5 @@
 DIST jiffy-0.14.11.tar.gz 1878494 BLAKE2B e0240c0dcd81e1e505c41197772ecf659c76b7f91f1435c5a2debe558d9aa30291a6bd564b13fa617f801150dc4386d2d5f53ee6d64b1a7f8a59ea1e2f320d57 SHA512 0530958c04ecd3c479b432d15aa5c8c86ce9e39a828bf4e48eaa096a2a9b9c593b9cf07836346bf82e27ffcbaa6e923bc298e856701460e44c9c62a7c888028e
-DIST jiffy-0.14.7.tar.gz 1856522 BLAKE2B 0f3354592ec6147443976e9017d0bea3a5f8080a10d69fa3fe3cffe48367ccbc1e75d97c569f08f010928382e48427b75dc0ab6168fa1e1af929ad1832312853 SHA512 b790b47857a063070da1c06a1c4b94af6085cbe8c70ecf079d8ae36c58844e7055a399f843a78ee92bf4e90320b9c6e53753f109eaa99008df793436fa8d4df1
-DIST jiffy-0.14.8.tar.gz 1856737 BLAKE2B b8606ce779f724f162a0116bbaf4e972fd0f1fb6ccc6666aa9b2af4221220229e9d49f3c52f2a3aae2685c84e5e75231d30539ab663a4d6bbb60117c2aba17bb SHA512 c91f39ba877daf845ac80d611fee88310e1e3368c36da722c22af841285dcc0b7fd7712b0107dcb1a60155ac58dd7cc0faa4e4295e4aa9c33d79292c5b2cf045
 DIST jiffy-0.14.9.tar.gz 1878413 BLAKE2B 6df392a6849b012d6a635191fec90f116b729d2602342b85ff4e0585f5db7c1319bf2d622d74f1807476af879a117b8e7d7b45c1d834f81309d96f184cbe36dd SHA512 2c8e7b2ea95c69cb0c6a7d02e341591e6807d0d81577050bf6f884dc7af7335e909f01cf7017ea27fae922d9a50ca4709fe0603b5de282b58d71afe4e06f7813
-EBUILD jiffy-0.14.11.ebuild 435 BLAKE2B d8559f864f3c997dcbea15dd91f5bd553af1ab3b5587d509a01eb9c913476f2b9875550a5cf333cbe4a8397ad8e758cd482ac0b92a43f59f5759449e7b768dc6 SHA512 1735cec7a7649091907421c97a6d47dcafdc8049bed393f7edb9cd1ef548061c385bcf56eced46bf67143d63d713f0cf0423b9d75fda058facde0b34933f63b2
-EBUILD jiffy-0.14.7.ebuild 432 BLAKE2B 56f12d4a5680ba5fb51ff6de5fad429b2c2be1b7d2f1eaf27f024e4d39147195b33c4ffda3a79fc0915864d2af6974a0942b38258968a4005ffc506dbea219d9 SHA512 955c586a352489703efc2ff8f5e533da4daab60e8e58c5a6ae14673edf11f9e047a45226c8e8e8e6e7a6e2ea5f500a0fb50a8063f120f8947e633f8c6131a61a
-EBUILD jiffy-0.14.8.ebuild 432 BLAKE2B 95dbfe69e155185616627ba6b24eb4159c656db10932beb1b2359f6167c7d129ca83b8c52971cdfdaa2fef4039858666bc5a6adb104b0f55f7e8c5e6aa08349f SHA512 4606d0c9e1175d32669dc400790cd395b52b77a4730d9b5ada03bbb5d0ee88c7b9049adc2d558bbbb2ad9e307e07d2e5f13a33484131abe483a7fb2860a5e167
+EBUILD jiffy-0.14.11.ebuild 429 BLAKE2B a57d881e7f2fdb2486054307a61e4f6c78415df531e17678e9924a930bace7b3e1731f578031edd679bdbbf4d93ef72f0cb512954c9b90f24953a3602678f2ca SHA512 d6620816da5153529280e7d68acc8d4f5d0530f37cb46bcba5c2a22d3112b1daa457fbe27eec20d33391cd682180aa1a2b5b69a75094eb05c139a68359fef1b5
 EBUILD jiffy-0.14.9.ebuild 432 BLAKE2B 95dbfe69e155185616627ba6b24eb4159c656db10932beb1b2359f6167c7d129ca83b8c52971cdfdaa2fef4039858666bc5a6adb104b0f55f7e8c5e6aa08349f SHA512 4606d0c9e1175d32669dc400790cd395b52b77a4730d9b5ada03bbb5d0ee88c7b9049adc2d558bbbb2ad9e307e07d2e5f13a33484131abe483a7fb2860a5e167
 MISC metadata.xml 244 BLAKE2B 619590dc80a77bfb17e42ebd88c8b9432950aab7b879879733b7a6ff480cb892930ceb938a0154eea3427bd0209aac2058eeba57f2bf743a510ff9252a2bb95e SHA512 3d0a7fc01cc1b1ac3fc3d83902f0bf3a31bf3bc7a4e0fd37f7b728588b8546f9b76fbbfd4cc985564e99d0ab3707ce8f99346187ad497007736de7f00ffc0621
diff --git a/dev-erlang/jiffy/jiffy-0.14.11.ebuild b/dev-erlang/jiffy/jiffy-0.14.11.ebuild
index a7da3d1b9333..9c32d6746ea7 100644
--- a/dev-erlang/jiffy/jiffy-0.14.11.ebuild
+++ b/dev-erlang/jiffy/jiffy-0.14.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/davisp/${PN}/archive/${PV}.tar.gz
 
 LICENSE="MIT BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 
 DEPEND=">=dev-lang/erlang-17.1"
 RDEPEND="${DEPEND}"
diff --git a/dev-erlang/jiffy/jiffy-0.14.7.ebuild b/dev-erlang/jiffy/jiffy-0.14.7.ebuild
deleted file mode 100644
index 63381d067036..000000000000
--- a/dev-erlang/jiffy/jiffy-0.14.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="JSON NIFs for Erlang"
-HOMEPAGE="https://github.com/davisp/jiffy"
-SRC_URI="https://github.com/davisp/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/jiffy/jiffy-0.14.8.ebuild b/dev-erlang/jiffy/jiffy-0.14.8.ebuild
deleted file mode 100644
index 32fbdb970553..000000000000
--- a/dev-erlang/jiffy/jiffy-0.14.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="JSON NIFs for Erlang"
-HOMEPAGE="https://github.com/davisp/jiffy"
-SRC_URI="https://github.com/davisp/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/jose/Manifest b/dev-erlang/jose/Manifest
index eaf15a184389..9d3d4bf44f4f 100644
--- a/dev-erlang/jose/Manifest
+++ b/dev-erlang/jose/Manifest
@@ -1,5 +1,3 @@
-DIST erlang-jose-1.8.4.tar.gz 230947 BLAKE2B 18bfd6b710295575d0547afcc866674f2c65fec2742ee4dedbbe7a883fef45a9abbccfc669c90d75f5091e70b91bd7b478f4fea5d3beaa3f65510d92db07da39 SHA512 47171b4e5f6b61735a15365b4130c110c14de1f4b157cdbf97b448550d48de4ab27a30537e9d9f613d87862d592b3bd95638daacee60f3f5b9877d80a3de773b
 DIST erlang-jose-1.9.0.tar.gz 258407 BLAKE2B c6036e743b062cd18518537ffee03cc138f55f3973a2ab538410d362757747e2c8880a899326d494914068f36ffaf2bb902e83ba7899c3256d6cfc7b89f07156 SHA512 59f7123fe589c8e9bf0bab5a21089301d6b3a1c35316b9f530386bd0d9de8da8f5f956769ea6b1166c545a51d119668ed18db57e8adfa02e6f4327b01168db68
-EBUILD jose-1.8.4.ebuild 721 BLAKE2B 88ca0c5a17bebbc9e42759b75048652f5ddde5b67b6fbe2b1761bca8faba4086bd31b13a04a636eb96cdc39aac7dc31844a41c47e07e7bcc815859e3719b645b SHA512 b826312015b2f8f6764796fc1581cbf3c4138626ca6b8a5f37b6469d840c1d841015d6dca0c830e734d8a5cf13b836058861890d50d2bb5ee0a218db4e819ef7
 EBUILD jose-1.9.0.ebuild 758 BLAKE2B e48f6253daca6746cc534cea3a66ebf5d477763d2bcf1fe955ba83613c5dbf7f58a691b91d1d2a776c4f7424dfaa4bdc87c66029ebe999ce52519def93b78089 SHA512 2c811754d4d59acf2fd9e369b41fd19a7ea45a75f8f49115fcfce611c1157ffaa8361e229ccd75dc1f2d427bbee01e1e036e1202bc74ab791c3c3bb1aba28a1e
 MISC metadata.xml 255 BLAKE2B 85645b1186b8fc16acef6bf88c8b2211cc6f48d5a662c69f474ab0e2be81f4908b5eaa863c9f2a906cac3b7d1f4874e8393cd94360876f349ba5a32f58fd3008 SHA512 eb09213d23a64b2c8f77f77c1a4ab437ce8588a690d693ff0c01104ec6d2b27bbab782043f27ab105a442446c387132f714d016f8276e75ff29fd32b93e457a1
diff --git a/dev-erlang/jose/jose-1.8.4.ebuild b/dev-erlang/jose/jose-1.8.4.ebuild
deleted file mode 100644
index ac1b010be61f..000000000000
--- a/dev-erlang/jose/jose-1.8.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="JSON Object Signing and Encryption (JOSE) for Erlang and Elixir"
-HOMEPAGE="https://github.com/potatosalad/erlang-jose"
-SRC_URI="https://github.com/potatosalad/erlang-jose/archive/${PV}.tar.gz
-	-> erlang-${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/erlang-17.1
-	>=dev-erlang/base64url-0.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
-
-# TODO: jose has test suite, but it require lots of dependencies. It may not be
-# TODO: urgent, but it would be nice to have those sooner or later.
-RESTRICT=test
-
-S="${WORKDIR}/erlang-${P}"
diff --git a/dev-erlang/lager/Manifest b/dev-erlang/lager/Manifest
index 6da1fa3f7548..3d07053448d7 100644
--- a/dev-erlang/lager/Manifest
+++ b/dev-erlang/lager/Manifest
@@ -1,18 +1,5 @@
-AUX 3.2.0-0001-Support-typed-records-newly-exposed-in-OTP-19.patch 2396 BLAKE2B 67540f9bdbd7cfa833c4b48814f6570237b9fddc8467a364497c6bbbc83c8f6229ae8ed9286446f526a789a6f932d9e1caeed1fc01bb1498cd14488ff5857327 SHA512 ca025f6ed283763fb3df7f4f9776ad606dd4c80bb5b02b66f2c5ffd6680e9153d0c10c0c138ea61b7225c43b2a4185a537953fef00ec9e57417bcd8d752437ee
-AUX 3.2.0-0002-Fix-get_env-bug.patch 2610 BLAKE2B 04904d35d9fbf5ccfb05ec3a49a8fe2fd0c6bb6d2f2620f4f7aabf81e708718cf510d3ba4282b9f2c9d832aa4d25bebcd58b135b41f64ac4a58f4a50d35f937a SHA512 ab83662a9445c25098e34f908db1ff3bfdd35ddd6205292bfc6a6332934db8b0035585b14ce1fa6268e50709a28d4da841fd541d502f55939007fd29df0e06f8
-AUX 3.2.0-0003-Add-get_env-unit-test.patch 1774 BLAKE2B a24bf911e8aa079542f16d0ba69a93a79667bc474d705d86b609dffa61f5d474856e78417375b85cbe028276be24fd2ffd071178d1b3a9fb15daefc869739cd6 SHA512 098470f9e0a34c56aa9f26ad84652593b4c752970c5eaf930cb2d67a89b7158f3829277406c8deb55581df04f6f612e30cbb8184f9c6ae3b29c485a66cd20e37
-AUX 3.2.0-0004-Undo-unnecessary-whitespace.patch 3308 BLAKE2B 42d43fc29d02460751e40ed665b2ff1d7340a82e0c7c80d185dea1e5e4e772826b1fcd274a91dc1cc65df4d0862afc4db094f28662be2f3e239805ab99527389 SHA512 9d6cb91fccfe98d12ecb74850597859175e323df8c0a5547cd0f64ab889e55edd8a0b59ca217dcfa7685997424d46f91309ca7fc909a263e7bc4142546d87330
-AUX 3.2.0-0005-R15-does-not-appear-to-properly-handle-the-export.patch 634 BLAKE2B e33bac45265ba19be4f5a03a349d12ddfb61edc9dfa8ec714576e24dd5895e50e46393a15e1aa8e6d92eba2832f10b3dc04d7e3024632a427e0db21d74206c09 SHA512 2fa0f5b926e3b90fee5fb7d25597edaa568ee7e231d6c165928cb5662657263fd6349c63ea75b30e8a84842a78d88863d7cade2b0f8d1ff90951d31d2e692528
-DIST lager-3.2.0.tar.gz 244340 BLAKE2B 4330956a82e376bb2527f1883d8481982d313d64ad22662950fc29376db0b902df64a96b086c6f065a7c2cf1b7acb231e5da0725eccd4da8d20b32e8d8908b3a SHA512 136274c8d1715d996b599317e4ac02e597c084351d3f7aea806ed9f0236a47c41dfff0b42a989dd4b6404e75e66b334600643aaec20d182edc9504d123920092
-DIST lager-3.2.1.tar.gz 244701 BLAKE2B 03d09c1fd42b4b1365264a2c5bd9f67032bd1f725c73bc06e875d60e9d5abd8eb38da44c75c1eada11d782d859c154dab40ace6d93d2e234201e6a39d34aa347 SHA512 2b9f82224943fd196f8aa12f228618996c3dcb2e83c8bf2633375e38771a4817e791db1d54493ab02835382796444266b623fce5686c864e21e49affddabea32
-DIST lager-3.2.2.tar.gz 244979 BLAKE2B 79b895c2a4df313fa582c3573c23d2ea233db1ad694d9425dc5217853c14d2ea1d40524ff634ba0f001ca85ac7833b52709840b9bb68d6b609e19d2acd906a36 SHA512 c183f141b50343c5892ee4417ab76cdd69862a53ccd9c0840b2df52c7034f08e5ac92546d6bdfc8014c8e7561cb75cfb20b3967e0146996907c9594d341095b6
 DIST lager-3.2.4.tar.gz 245002 BLAKE2B 4d6197cbefed0f9d53d4ef522b2f0827e86e404e108710a0c615befb8d033b77cef3a2fd53a9c9b8a98fd0f708be95e7d0a6d5f64802cf061d5171f343971c7c SHA512 765e132c19c46593f79f73400d04801d27767192dfeb75c3d3aef5a20963dc6113e544db35dccee2a975476a5653954a79ac49eb923d84daade0dc64a8c1e6f7
-DIST lager-3.6.7.tar.gz 266527 BLAKE2B b26fbd07b8db0a366d5adf74e56a28f3898fa4853f5c3383cc32043b7fefb58e996309d12c77ea0d94ee98eefe2b81c32a4d0c40a0f5608ed94e71c9d754d992 SHA512 7dde8196204c6e65f78a95705151d4681edd4d2e9c3a1a3b37135e777ed3b653124fbfa43192ebf56328b5f2d6daec1b4e1055399c3cd47d5969bfc3cbc822bc
 DIST lager-3.8.0.tar.gz 271830 BLAKE2B 13e84cfb561493d3fdec2d8fe9d585eed8716aa831425616b73e84cbca1c1951186bf7c378dcf21df0006a910e56458b9d9cdbf69eefd85e519fca2a1d98e8f3 SHA512 bcbd522bdc39e19466dc3e6fe8fc81ba10358cbcc167e278402e91164992fc0ee7c02e02a5bc223664c0d5974a1ba107756b073509453386003c9d02b3dc388b
-EBUILD lager-3.2.0.ebuild 954 BLAKE2B f10515f21ba6f65f8e390b80f024395f61fd07b7b744de8a7c518ca947e9a7541398f8a153242df50e9cf9d82a7eb238a4c3f0ed37756da9dcae5ee809a64502 SHA512 5f4be585916c907e3b49ec88d942b3993e75f8e04e389e90fbae1698da371f6e671d178a32f1a0bd9a08e3ed8648a1687d13bdca3c87b58669a283cc0262e385
-EBUILD lager-3.2.1.ebuild 622 BLAKE2B dfbe24e43293dedb1bd499194ce96670037955f6b610ccfa1849e31be633fbbb7df5fd7646d94b3bac6794251ff3b2085b6d1d66bd4c23b8653292c50d0c4393 SHA512 0d7578d6071ab7c0deabb7fc9d42542d1277b3925d1608ab98dfdb11755a7cfcc1894d7b67126f9466264a0d3f0b0e161e061181253e3a0a136fba3e276a895a
-EBUILD lager-3.2.2.ebuild 620 BLAKE2B 3dc58df5990d62cddc2e54eb7d8038567e4d337ac6a6178ed3da0f056f19a3a09e2dbb507c399219ac8deb00a0c72f802205d6985217be923a1b880f48c0a493 SHA512 84a39cb102fd5c2aef9407aef471b229f51c164c42f5e568d70fd088984e23921f7c65e79950cccbc95b3739488c090b0685c8a216d126e8ca3a8fed7271125f
 EBUILD lager-3.2.4.ebuild 620 BLAKE2B ee3115a7797801c911d810fa9bcbf5ce11d133203202f7a855135fe4a04401c98d48883757a7621c1b4b5281d683f0dd3d7341c9f2f1e2bdc1c0b9147bbc36d5 SHA512 b37681d6a2dd33988bf8eacd8fa14c31c052694d8cf2b5d50e2a7f231adc8d37524683046d088244c131ad5b013687d9b9270a82c46a25dbc6aebe4566541918
-EBUILD lager-3.6.7.ebuild 679 BLAKE2B 0bad13586bcb8eade43685949d58fbd54b005262341edee9d00bc0ab86bc68ffdbe76b59e4e309aa2acbee13da348b4b111e1a489b87dd7a515099b520e6f60e SHA512 0bcc949049920d4b7f2ebc50d4117a557d5ffbc31fe37bf7a690ac7377b7b2b5c884b5f866849b6d80e86e7e2748f69056f2b3779b2064a6b4964af8d81bec8c
 EBUILD lager-3.8.0.ebuild 676 BLAKE2B 699135bd286b9feefa26432bd66725602d9fd60c7b8138d7fa45444c0da51875a977f693b2e91539030973ed3965ef47d6648cfd063866e6487842800cdb8295 SHA512 fd793aac2a08a7875f88d54034bc16604a30db5b10e447e2752610720316c013cf7f4c806b8d69dbe0552cb1d3aaf5370c1b9728c99acbd0fd7ed4e1e10f71e7
 MISC metadata.xml 590 BLAKE2B 316095d1f337d8a6aaea80b791915abcc9a3eed96185885d8b69136c0875b6844bad0fe2ca7a070fdea5a9976bf6b8170b919a615ba0aec56df998324aeba1d3 SHA512 a2159430a2862e138ea7beb61bb7324a97a997249cda7232c9ffde3227f04ad9401fb3b52a970f3c572a09f3851805588864074a99853e7b0d7b7d53c4e9c5b0
diff --git a/dev-erlang/lager/files/3.2.0-0001-Support-typed-records-newly-exposed-in-OTP-19.patch b/dev-erlang/lager/files/3.2.0-0001-Support-typed-records-newly-exposed-in-OTP-19.patch
deleted file mode 100644
index b9ade5f5698f..000000000000
--- a/dev-erlang/lager/files/3.2.0-0001-Support-typed-records-newly-exposed-in-OTP-19.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From d35670e01a3c6f9f9bcb3150217d26cc92513586 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Johannes=20Wei=C3=9Fl?= <jargon@molb.org>
-Date: Sun, 21 Feb 2016 14:22:28 +0100
-Subject: [PATCH 1/5] Support typed records newly exposed in OTP 19
-
-Otherwise `lager_transform` fails after https://github.com/erlang/otp/commit/de9012628a6b0e97d2f1325bf2f72817f69f84ee
-
-The error message is:
-
-    test/pr_nested_record_test.erl: error in parse transform 'lager_transform': {function_clause,
-                                                 [{lager_transform,
-                                                   '-walk_ast/2-fun-0-',
-                                                   [{typed_record_field,
-                                                     {record_field,5,
-                                                      {atom,5,field1}},
-                                                     {type,5,term,[]}}],
-                                                   [{file,
-                                                     "src/lager_transform.erl"},
-                                                    {line,62}]},
----
- src/lager_transform.erl | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/src/lager_transform.erl b/src/lager_transform.erl
-index 7648c46..8cea5a3 100644
---- a/src/lager_transform.erl
-+++ b/src/lager_transform.erl
-@@ -59,16 +59,19 @@ walk_ast(Acc, [{function, Line, Name, Arity, Clauses}|T]) ->
-     walk_ast([{function, Line, Name, Arity,
-                 walk_clauses([], Clauses)}|Acc], T);
- walk_ast(Acc, [{attribute, _, record, {Name, Fields}}=H|T]) ->
--    FieldNames = lists:map(fun({record_field, _, {atom, _, FieldName}}) ->
--                FieldName;
--            ({record_field, _, {atom, _, FieldName}, _Default}) ->
--                FieldName
--        end, Fields),
-+    FieldNames = lists:map(fun record_field_name/1, Fields),
-     stash_record({Name, FieldNames}),
-     walk_ast([H|Acc], T);
- walk_ast(Acc, [H|T]) ->
-     walk_ast([H|Acc], T).
- 
-+record_field_name({record_field, _, {atom, _, FieldName}}) ->
-+    FieldName;
-+record_field_name({record_field, _, {atom, _, FieldName}, _Default}) ->
-+    FieldName;
-+record_field_name({typed_record_field, Field, _Type}) ->
-+    record_field_name(Field).
-+
- walk_clauses(Acc, []) ->
-     lists:reverse(Acc);
- walk_clauses(Acc, [{clause, Line, Arguments, Guards, Body}|T]) ->
--- 
-2.8.3
-
diff --git a/dev-erlang/lager/files/3.2.0-0002-Fix-get_env-bug.patch b/dev-erlang/lager/files/3.2.0-0002-Fix-get_env-bug.patch
deleted file mode 100644
index 51972d8c4fcd..000000000000
--- a/dev-erlang/lager/files/3.2.0-0002-Fix-get_env-bug.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4c87abcd4f9d70a1136fff8f573dc7adcc833e43 Mon Sep 17 00:00:00 2001
-From: Alexander Petrovsky <askjuise@gmail.com>
-Date: Tue, 10 May 2016 22:37:22 +0300
-Subject: [PATCH 2/5] Fix get_env bug
-
----
- src/lager_app.erl | 20 +++++++++++---------
- 1 file changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/src/lager_app.erl b/src/lager_app.erl
-index 8f1464d..8efd26b 100644
---- a/src/lager_app.erl
-+++ b/src/lager_app.erl
-@@ -138,11 +138,10 @@ maybe_install_sink_killer(_Sink, HWM, ReinstallTimer) ->
-     error_logger:error_msg("Invalid value for 'killer_hwm': ~p or 'killer_reinstall_after': ~p", [HWM, ReinstallTimer]),
-     throw({error, bad_config}).
- 
--start_error_logger_handler({ok, false}, _HWM, _Whitelist) ->
-+-spec start_error_logger_handler(boolean(), pos_integer(), list()) -> list().
-+start_error_logger_handler(false, _HWM, _Whitelist) ->
-     [];
--start_error_logger_handler(_, HWM, undefined) ->
--    start_error_logger_handler(ignore_me, HWM, {ok, []});
--start_error_logger_handler(_, HWM, {ok, WhiteList}) ->
-+start_error_logger_handler(true, HWM, WhiteList) ->
-     GlStrategy = case application:get_env(lager, error_logger_groupleader_strategy) of
-                     undefined ->
-                         handle;
-@@ -200,13 +199,16 @@ configure_extra_sinks(Sinks) ->
-     lists:foreach(fun({Sink, Proplist}) -> configure_sink(Sink, Proplist) end,
-                   Sinks).
- 
-+-spec get_env(atom(), atom()) -> term().
- get_env(Application, Key) ->
-     get_env(Application, Key, undefined).
-+
- %% R15 doesn't know about application:get_env/3
-+-spec get_env(atom(), atom(), term()) -> term().
- get_env(Application, Key, Default) ->
--    get_env_default(application:get_env(Application, Key),
--                    Default).
-+    get_env_default(application:get_env(Application, Key), Default).
- 
-+-spec get_env_default('undefined' | {'ok', term()}, term()) -> term().
- get_env_default(undefined, Default) ->
-     Default;
- get_env_default({ok, Value}, _Default) ->
-@@ -235,9 +237,9 @@ boot() ->
-     lager:update_loglevel_config(?DEFAULT_SINK),
- 
-     SavedHandlers = start_error_logger_handler(
--                      get_env(lager, error_logger_redirect),
--                      interpret_hwm(get_env(lager, error_logger_hwm)),
--                      get_env(lager, error_logger_whitelist)
-+                                    get_env(lager, error_logger_redirect, true),
-+                      interpret_hwm(get_env(lager, error_logger_hwm, 0)),
-+                                    get_env(lager, error_logger_whitelist, [])
-                      ),
- 
-     SavedHandlers.
--- 
-2.8.3
-
diff --git a/dev-erlang/lager/files/3.2.0-0003-Add-get_env-unit-test.patch b/dev-erlang/lager/files/3.2.0-0003-Add-get_env-unit-test.patch
deleted file mode 100644
index affc347fdc45..000000000000
--- a/dev-erlang/lager/files/3.2.0-0003-Add-get_env-unit-test.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 09aee4b601e0a11b31e99392bdb14ec67a79c80f Mon Sep 17 00:00:00 2001
-From: Alexander Petrovsky <askjuise@gmail.com>
-Date: Wed, 11 May 2016 22:52:09 +0300
-Subject: [PATCH 3/5] Add get_env unit test
-
----
- rebar.config             |  4 +++-
- test/lager_app_tests.erl | 22 ++++++++++++++++++++++
- 2 files changed, 25 insertions(+), 1 deletion(-)
- create mode 100644 test/lager_app_tests.erl
-
-diff --git a/rebar.config b/rebar.config
-index 77272c7..278df9c 100644
---- a/rebar.config
-+++ b/rebar.config
-@@ -40,9 +40,12 @@
- 
- {eunit_opts, [verbose]}.
- {eunit_compile_opts, [
-+    export_all,
-+
-     nowarn_untyped_record,
-     nowarn_export_all
- ]}.
-+
- {deps, [
-     {goldrush, ".*", {git, "git://github.com/DeadZen/goldrush.git", {tag, "0.1.8"}}}
- ]}.
-@@ -53,4 +56,3 @@
- {cover_enabled, true}.
- {edoc_opts, [{stylesheet_file, "./priv/edoc.css"}]}.
- 
--{eunit_opts, [verbose]}.
-diff --git a/test/lager_app_tests.erl b/test/lager_app_tests.erl
-new file mode 100644
-index 0000000..80fe985
---- /dev/null
-+++ b/test/lager_app_tests.erl
-@@ -0,0 +1,22 @@
-+-module(lager_app_tests).
-+
-+-compile([{parse_transform, lager_transform}]).
-+
-+-include_lib("eunit/include/eunit.hrl").
-+
-+
-+get_env_default_test() ->
-+    ?assertEqual(<<"Some">>,  lager_app:get_env_default(undefined,         <<"Some">>)),
-+    ?assertEqual(<<"Value">>, lager_app:get_env_default({ok, <<"Value">>}, <<"Some">>)),
-+    ok.
-+
-+get_env_test() ->
-+    application:set_env(myapp, mykey1, <<"Value">>),
-+
-+    ?assertEqual(<<"Some">>,  lager_app:get_env(myapp, mykey0, <<"Some">>)),
-+    ?assertEqual(<<"Value">>, lager_app:get_env(myapp, mykey1, <<"Some">>)),
-+
-+    ?assertEqual(undefined,   lager_app:get_env(myapp, mykey0)),
-+    ?assertEqual(<<"Value">>, lager_app:get_env(myapp, mykey1)),
-+    ok.
-+
--- 
-2.8.3
-
diff --git a/dev-erlang/lager/files/3.2.0-0004-Undo-unnecessary-whitespace.patch b/dev-erlang/lager/files/3.2.0-0004-Undo-unnecessary-whitespace.patch
deleted file mode 100644
index cefbc7ea4203..000000000000
--- a/dev-erlang/lager/files/3.2.0-0004-Undo-unnecessary-whitespace.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 0d428368e3c71fdefab39927ca142e3bccabd543 Mon Sep 17 00:00:00 2001
-From: "John R. Daily" <git@epep.us>
-Date: Thu, 19 May 2016 14:55:51 -0400
-Subject: [PATCH 4/5] * Undo unnecessary whitespace * Make
- lager_handler_watcher test more resilient by scanning for   messages of
- interest rather than assuming we know exactly what   messages will arrive at
- the test backend
-
----
- src/lager_app.erl             |  4 ++--
- src/lager_handler_watcher.erl | 22 ++++++++++++++++------
- 2 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/src/lager_app.erl b/src/lager_app.erl
-index 8efd26b..7b02e54 100644
---- a/src/lager_app.erl
-+++ b/src/lager_app.erl
-@@ -237,9 +237,9 @@ boot() ->
-     lager:update_loglevel_config(?DEFAULT_SINK),
- 
-     SavedHandlers = start_error_logger_handler(
--                                    get_env(lager, error_logger_redirect, true),
-+                      get_env(lager, error_logger_redirect, true),
-                       interpret_hwm(get_env(lager, error_logger_hwm, 0)),
--                                    get_env(lager, error_logger_whitelist, [])
-+                      get_env(lager, error_logger_whitelist, [])
-                      ),
- 
-     SavedHandlers.
-diff --git a/src/lager_handler_watcher.erl b/src/lager_handler_watcher.erl
-index d5fe140..4e595e4 100644
---- a/src/lager_handler_watcher.erl
-+++ b/src/lager_handler_watcher.erl
-@@ -178,12 +178,10 @@ reinstall_on_runtime_failure_test_() ->
-                     try
-                         ?assert(lists:member(lager_crash_backend, gen_event:which_handlers(lager_event))),
-                         timer:sleep(6000),
--                        _ = lager_test_backend:pop(), %% throw away application start up message
--                        _ = lager_test_backend:pop(), %% throw away gen_event crash message
--                        {_Severity, _Date, Msg, _Metadata} = lager_test_backend:pop(),
--                        ?assertEqual("Lager event handler lager_crash_backend exited with reason crash", lists:flatten(Msg)),
--                        {_Severity2, _Date2, Msg2, _Metadata2} = lager_test_backend:pop(),
--                        ?assertMatch("Lager failed to install handler lager_crash_backend into lager_event, retrying later :"++_, lists:flatten(Msg2)),
-+
-+                        pop_until("Lager event handler lager_crash_backend exited with reason crash", fun lists:flatten/1),
-+                        pop_until("Lager failed to install handler lager_crash_backend into lager_event, retrying later",
-+                                  fun(Msg) -> string:substr(lists:flatten(Msg), 1, 84) end),
-                         ?assertEqual(false, lists:member(lager_crash_backend, gen_event:which_handlers(lager_event)))
-                     after
-                        application:stop(lager),
-@@ -194,5 +192,17 @@ reinstall_on_runtime_failure_test_() ->
-         ]
-     }.
- 
-+pop_until(String, Fun) ->
-+    try_backend_pop(lager_test_backend:pop(), String, Fun).
-+
-+try_backend_pop(undefined, String, _Fun) ->
-+    throw("Not found: " ++ String);
-+try_backend_pop({_Severity, _Date, Msg, _Metadata}, String, Fun) ->
-+    case Fun(Msg) of
-+        String ->
-+            ok;
-+        _ ->
-+            try_backend_pop(lager_test_backend:pop(), String, Fun)
-+    end.
- 
- -endif.
--- 
-2.8.3
-
diff --git a/dev-erlang/lager/files/3.2.0-0005-R15-does-not-appear-to-properly-handle-the-export.patch b/dev-erlang/lager/files/3.2.0-0005-R15-does-not-appear-to-properly-handle-the-export.patch
deleted file mode 100644
index 9c27abd5c430..000000000000
--- a/dev-erlang/lager/files/3.2.0-0005-R15-does-not-appear-to-properly-handle-the-export.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 124ba14f188fd3b63735b73828fa3d99ebfdb7af Mon Sep 17 00:00:00 2001
-From: "John R. Daily" <git@epep.us>
-Date: Thu, 19 May 2016 15:26:02 -0400
-Subject: [PATCH 5/5] R15 does not appear to properly handle the export_all
- directive added to rebar.config
-
----
- src/lager_app.erl | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lager_app.erl b/src/lager_app.erl
-index 7b02e54..b76da53 100644
---- a/src/lager_app.erl
-+++ b/src/lager_app.erl
-@@ -23,6 +23,7 @@
- -behaviour(application).
- -include("lager.hrl").
- -ifdef(TEST).
-+-compile([export_all]).
- -include_lib("eunit/include/eunit.hrl").
- -endif.
- -export([start/0,
--- 
-2.8.3
-
diff --git a/dev-erlang/lager/lager-3.2.0.ebuild b/dev-erlang/lager/lager-3.2.0.ebuild
deleted file mode 100644
index 3c88ed5979cb..000000000000
--- a/dev-erlang/lager/lager-3.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Logging framework for Erlang/OTP"
-HOMEPAGE="https://github.com/basho/lager"
-SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/goldrush-0.1.7
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md TODO )
-PATCHES=(
-	"${FILESDIR}/${PV}-0001-Support-typed-records-newly-exposed-in-OTP-19.patch"
-	"${FILESDIR}/${PV}-0002-Fix-get_env-bug.patch"
-	"${FILESDIR}/${PV}-0003-Add-get_env-unit-test.patch"
-	"${FILESDIR}/${PV}-0004-Undo-unnecessary-whitespace.patch"
-	"${FILESDIR}/${PV}-0005-R15-does-not-appear-to-properly-handle-the-export.patch"
-)
-
-src_prepare() {
-	rebar_src_prepare
-	# 'priv' directory contains only edoc.css, but doc isn't going to be built.
-	rm -r "${S}/priv" || die
-}
diff --git a/dev-erlang/lager/lager-3.2.1.ebuild b/dev-erlang/lager/lager-3.2.1.ebuild
deleted file mode 100644
index 33d8d1ae27cc..000000000000
--- a/dev-erlang/lager/lager-3.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Logging framework for Erlang/OTP"
-HOMEPAGE="https://github.com/basho/lager"
-SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/goldrush-0.1.8
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md TODO )
-
-src_prepare() {
-	rebar_src_prepare
-	# 'priv' directory contains only edoc.css, but doc isn't going to be built.
-	rm -r "${S}/priv" || die
-}
diff --git a/dev-erlang/lager/lager-3.2.2.ebuild b/dev-erlang/lager/lager-3.2.2.ebuild
deleted file mode 100644
index 4be62a4907a6..000000000000
--- a/dev-erlang/lager/lager-3.2.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Logging framework for Erlang/OTP"
-HOMEPAGE="https://github.com/basho/lager"
-SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/goldrush-0.1.8
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md TODO )
-
-src_prepare() {
-	rebar_src_prepare
-	# 'priv' directory contains only edoc.css, but doc isn't going to be built.
-	rm -r "${S}/priv" || die
-}
diff --git a/dev-erlang/lager/lager-3.6.7.ebuild b/dev-erlang/lager/lager-3.6.7.ebuild
deleted file mode 100644
index 126dde8f4bb1..000000000000
--- a/dev-erlang/lager/lager-3.6.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Logging framework for Erlang/OTP"
-HOMEPAGE="https://github.com/erlang-lager/lager"
-SRC_URI="https://github.com/erlang-lager/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/goldrush-0.1.9
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md TODO )
-
-src_prepare() {
-	rebar_src_prepare
-	sed -i '/goldrush/d' rebar.config.script
-	# 'priv' directory contains only edoc.css, but doc isn't going to be built.
-	rm -r "${S}/priv" || die
-}
diff --git a/dev-erlang/luerl/Manifest b/dev-erlang/luerl/Manifest
index 1dc757a184d0..1285425ab70b 100644
--- a/dev-erlang/luerl/Manifest
+++ b/dev-erlang/luerl/Manifest
@@ -1,5 +1,5 @@
 DIST luerl-0.2.tar.gz 94603 BLAKE2B 47e04b93791c6e9342878a1d3da8f1b757822e5fcf7278fc7f13441e1bacd96c3716744d303ce087d8f0dbc98b2c8c74c32777f291470e02b02f9c7bdd26eeb7 SHA512 80fb76609ad42df880d67919c352785781adb1d815b4c625bb93c35caf17ecf5455e82aab61f95c6c2f522d554b2858748d295db7c487c26e90c6afa957faaec
 DIST luerl-0.3.tar.gz 95182 BLAKE2B eca0317c823fb3649f87e6e872780e06aa6288f7e7fb10dcdff345680f0112e2928a54bd061bc258e95da160ddd335500c6ed123e1e8cf77d37822634c42da05 SHA512 490e4cd5d26b18d4102e83b6a8440fd31588f3888ac1942c44ac0985f68250b440eabeecdae648f076a6b8290a5ae838a59e0a517d745c5febfbc00b6d5dba44
 EBUILD luerl-0.2.ebuild 433 BLAKE2B 2c7f1bb5b041b9145f08b80f733cf6591b42a0da5a4042d3361f436b2c39d461b4f46817918de188fea9b1ae50fba8663aa8b36fc02c8f946eae3be9ecaa98eb SHA512 22dd3f993d57404d9085be3ce11a811a03ad642447ca979ac19ea78be3936794e3ee2399dffef5be2b0b1bbb47f65cf857ad8d0944cc8ded8b2ef4c5e50dbbc2
-EBUILD luerl-0.3.ebuild 436 BLAKE2B ca00a8f6981c1238154ddef1d44db34c75240483780306f52e385d1e9cac70fb6a6aa7dc8acc08a1d87b6a30f71bec0e4efe667e451defefa981eacc1cfe4a60 SHA512 714c3d42408849014e9ba298582861082fbb686a457fda07ac498e6a78255e8628d497ba826dcd250d0c9fd3be80cf707ced7646d74c41e539f5c0d78d87f236
+EBUILD luerl-0.3.ebuild 430 BLAKE2B 815170173d2f5710980822d12ed5a1ccfa3e758c943f08e86a08a032eba86e4cbe114e9d8f51589d45f1db069594685798f7881e77f244ab27b07f9957b0b80f SHA512 d527ad1eec687295d5e3d96811fcf17a7b9de43ce02ffbbb5362ffee55729390a9986c166916e7fb8152cb68848c8b224933c4f110dc3fd989ddca84bb1958d1
 MISC metadata.xml 246 BLAKE2B 3818a0a6cf9184275f139029d3ddcdc7aac026fbb817f9e31f01119e59d4edab594cec6a9ac0fcf89a3ff48914630a1fa5c74b43d39d3c890f1d66882c304aa4 SHA512 f10ab9b6bfdcd816a2c7f42eb01edc8e2ed1f0b6fe46fb9c45e5f58ec23f814ec45721e64000d5f61baff06753a15b3eab42a4af8406a1cfffa0529e34343bd5
diff --git a/dev-erlang/luerl/luerl-0.3.ebuild b/dev-erlang/luerl/luerl-0.3.ebuild
index 32da7ac5fc5b..fc9a03e4738a 100644
--- a/dev-erlang/luerl/luerl-0.3.ebuild
+++ b/dev-erlang/luerl/luerl-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rvirding/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 
 DEPEND=">=dev-lang/erlang-17.1"
 RDEPEND="${DEPEND}"
diff --git a/dev-erlang/meck/Manifest b/dev-erlang/meck/Manifest
index c09e914a354f..6551518316f1 100644
--- a/dev-erlang/meck/Manifest
+++ b/dev-erlang/meck/Manifest
@@ -1,7 +1,5 @@
 DIST meck-0.8.12.tar.gz 50998 BLAKE2B fc87c0472e5e5063b2247366654e8fd5d6310e8f16e3f324ad721cab35e88527f2bacd7eb0d686a44137ebe758d77a24357002c29ff2e979fb54efc82c8ff160 SHA512 d70c878474a300465c7b439f25d363362f376135f0bf5f9a1e74e2c620a59b20ceb0e47d2cf0dc44ae80ec5215c60f696084b21aa94d72220632d8012827147d
-DIST meck-0.8.3.tar.gz 232910 BLAKE2B 8ea00214e5760eba20b4aaf0c2e9d16643ac764c7225df1f1f841cc9614820cbd707ce5e24761dc416d15e997ac5a76844ce4b7f1dc3f2e6d908378ad8949077 SHA512 2009bba7d9e7825142c335a03f3f67ef1a9407fa0f93d360c3f4854851af789dc3ad65935e42b1f0bc69d0f47a8854d311eaf68628a4088d1bcbe05c4010c5bd
 DIST meck-0.8.4.tar.gz 234157 BLAKE2B 0f8abb2bda2afa3c41e18d51ec8ba6add17e69343f298c595dc4c6e6edab05770c875e158ba73314e1f5289bf6692bc5bf1e779e0e9edbe7d39a88ba44724be0 SHA512 e6d8caf385e93daef70382f2efac59215628cc200dfaeb74437571d24131b49eb8328af452133ce3c9393d14a1f84b90c2432c83af25cf0cb17cd19a236373a7
-EBUILD meck-0.8.12.ebuild 623 BLAKE2B dc96b65178aaa5ca39b227a18c4f7ad5009dee2379510644cb7dc4efb57f738ff91417a7ab0504f634361547ee6539a8a97d6bdbed3a135b66d415d0ceec84b4 SHA512 d0c3386a286aaedcbd027a09d69e9972f5b227853785ca876b206f5d9e4ad7edf437c73528e8be64bf62532796a171f9d14b28f5d32329ddf48506ab0f530273
-EBUILD meck-0.8.3.ebuild 663 BLAKE2B 50825c167bb8ce83bfc2267c5ac85c13629d43f11e6dda0d06b58d060b7256ece4914f59233fa6b75d81a90090a0f0f7fe3dbd2af11a78e87a57cc661a4956ed SHA512 b319f9886b43e88e4bbf64333e2a17e89ceb1757dc3477c5618bf27c18a97fc5cbae37770bc4cb94c21b9036515cc871500b2f72e8492d27a4dbd997124f2b08
+EBUILD meck-0.8.12.ebuild 617 BLAKE2B 4f3c446a686e24a9d49a22f37df502ea7439ce2d17041e37de72094005341df6e5ce134c475ee4ce878e937a90985f5e3146f76e6be44c55203906cc08147c2f SHA512 8c50d285258d4d077adb4e6f63275c0ac781cb05ddad54f531b5c6ae09ded90c60fc4285312218733803b14bcae3ccbca925673989179fb150194fb2a0a2b0ee
 EBUILD meck-0.8.4.ebuild 663 BLAKE2B 3845fae12bb5e3174e1e4fe31ec140682a455dadc9e0cc0d69e026e15e3cc1837c12367bb6840a00ed85bacfa29849ae2f45e2fa2d0ebf47f1363fcf41ca36b5 SHA512 2a6862437a2cbc54bf60a1d2d317e575779454ee10cc9d5027636506e847aa6efa80948e8c219eea8dfbe0f7bdf8cbd65f4dc3390bec53eaa73d41b36e6b3201
 MISC metadata.xml 244 BLAKE2B 3f0de1c6c5ae0fd858980c990dccb9a98441e4b5a70b31b6a1c42d40e93babe68c07aad7f7384bfc225f8e759e49f902b93bfd4a89c1302d815d325986d63ee7 SHA512 f727a58dc29bf7db2b5014fbc97721b26b4e2ed3db4d8599917558bd75e378093acd1f119978f3d24c656dc1a06d6ca21c119277a2c140735cc3cfe511f2c611
diff --git a/dev-erlang/meck/meck-0.8.12.ebuild b/dev-erlang/meck/meck-0.8.12.ebuild
index a4ffc5751947..f8a6220386ee 100644
--- a/dev-erlang/meck/meck-0.8.12.ebuild
+++ b/dev-erlang/meck/meck-0.8.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/eproxus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 IUSE="test"
 
 CDEPEND=">=dev-lang/erlang-17.1"
diff --git a/dev-erlang/meck/meck-0.8.3.ebuild b/dev-erlang/meck/meck-0.8.3.ebuild
deleted file mode 100644
index 24e102976d86..000000000000
--- a/dev-erlang/meck/meck-0.8.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Mocking library for Erlang"
-HOMEPAGE="https://github.com/eproxus/meck"
-SRC_URI="https://github.com/eproxus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-IUSE="test"
-
-CDEPEND=">=dev-lang/erlang-17.1"
-DEPEND="${CDEPEND}
-	test? ( >=dev-erlang/hamcrest-0.1.0_p20150103 )"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGELOG NOTICE README.md )
-
-src_prepare() {
-	rebar_src_prepare
-	rebar_remove_deps test.config
-}
-
-src_test() {
-	erebar -C test.config compile eunit
-}
diff --git a/dev-erlang/p1_mysql/Manifest b/dev-erlang/p1_mysql/Manifest
index a81a52108baa..0a7c000e137c 100644
--- a/dev-erlang/p1_mysql/Manifest
+++ b/dev-erlang/p1_mysql/Manifest
@@ -1,9 +1,5 @@
-DIST p1_mysql-1.0.1.tar.gz 19329 BLAKE2B b5904a12e8ce5c1b58ff789adb5df7fd9040b8a874b6e1054f3086fa1c28b1347e21d6809fa00fb8281816d2bfaccd7889cb2c2665376a40e87b36eaf315e269 SHA512 2e5d3baa255ab7b6d3271e633793bfb265648b260c104256980a1229ea20bf3701d8f665f65fb4785272ea7e4e6a346a262ffbf609de10aec6d8029ef1d4f567
 DIST p1_mysql-1.0.11.tar.gz 25958 BLAKE2B 6c94287fc584ed530d70e9609cc565c2c66a2b90b8bb47d85e370353e8e56dd9cb8e902406eaf330692f70c264f44977f22534e6805017a12accdcb5828a45e1 SHA512 2929b1e66aa887258b46f7dcda71f935230b9b7ea9fccf0baff2cda0782a5b7da26b9b396ed2bf3b16f07d397c88f5881ea93913a11e262be802654ac46dd9ed
 DIST p1_mysql-1.0.2.tar.gz 19512 BLAKE2B 8cf7cded80d6ca1239019f3d1bbb7d4babbe0336a09b6c8ebb55e116eeb592e35a6f332ee6950c78ac6559a3850bdc1dbfa50ded2d30e008deb8e8d50b5c86d2 SHA512 ac0656b3134cfae47161a4643188784cf71e8ea19bbd5856e58d4f1d508a8771534975a631da51e7574e5adb3f64cdd250ab59ab7e9138fd5cb865e80522bd11
-DIST p1_mysql-1.0.8.tar.gz 21914 BLAKE2B 74c5ab5358347cd956b6d5fec2f96dedd97a0e832c39db8d44b4e7bd810d94237f87a70fe779c54e5e45efe0c574edfb7df1e608cafae226452fb8eb7d0b92a5 SHA512 68382135f96f3edb51fbdd6381a03773f99f39b9fbbcd63add159a7fe6f37a9f19f1ffa39eb248d9b490926ff3c6f393aac6449cf0d88c10eee50c807aba1ab7
-EBUILD p1_mysql-1.0.1.ebuild 457 BLAKE2B cb4272455df95ed5f69702c52842358b812244cc4a828ed5c756f33b8fe7d5ea3addcad809273bcf056ea43a9aec43f18f278553c2707277deeb6a6d0b8eecfd SHA512 33263eed86382a1a2d6f6eae1ca2400c1974ebd9fe638b22e8703e0fe25d73344dc64c711e777c844021c94025d037d8f8aa0fdd40a6bdbb54e30824b08c2a41
 EBUILD p1_mysql-1.0.11.ebuild 456 BLAKE2B 4f81320eb54b32a52c970610f809c18afe0341fc521c679af106db04302ac87aee15de37f27829669a4fddcd97ffa4c8af3e7e845d2bcd1150c09950bb4bcf30 SHA512 496f4b8f818a2918e7bdbfd9b7e61e0fac6fdd1f01719f55851032d1436d464f9f566420864e74e4c76924ffd211aa623b67ba205c8cc89186d211884b5517e7
 EBUILD p1_mysql-1.0.2.ebuild 457 BLAKE2B 990dcac1c89710c99d384dacd9af2c81680f424cd0879ef7fbae4c6f938a58e551caae225eed4ba0391a9c1856f589a9c08cd9cbac16890710effe747de6c90c SHA512 15c3ad3a348419c06ba15b1c8a906fd7ebd987a93022e3ee033b38ca58b111cfdfe5b0a25305cd75d064400a7f78022d6785e8e72070bfd5ee8ddbe7e41e8c88
-EBUILD p1_mysql-1.0.8.ebuild 460 BLAKE2B 1a28c03e9282dc452d5ba612ddf567e9798617ad2f9862e190c79c3d782e8d2a8d0aba08b2db15f7674a8ecb4f0ec8277d309fa479838e875949ee0d0edec785 SHA512 e57c57311b10be37c2a2371f3ebe8f56b300244d3df97f383f3e5b528fb17f8c38e961221408cbf19aba5f26e0fe995276c25e95e2c1b1c34c3797536db662b7
 MISC metadata.xml 251 BLAKE2B 22f743177474ea4e950f081f967da459711ff2404edc3ac810ef5943f18905cb2c88fdb5584dda80cb543cf6399150d5248bf3a0c5c2a942aee4bee0d95ffbfd SHA512 f8e20b38195b2abbb1695b361e2aaa7f84ed0bb9d05b46462dc1fe28cf475778c90527953061f540ce6a22ffdcbaa257b11bc102a907aa332f14837155de1bba
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.1.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.1.ebuild
deleted file mode 100644
index e00062c49a6c..000000000000
--- a/dev-erlang/p1_mysql/p1_mysql-1.0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Pure Erlang MySQL driver"
-HOMEPAGE="https://github.com/processone/p1_mysql"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.8.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.8.ebuild
deleted file mode 100644
index c711d6db7a0e..000000000000
--- a/dev-erlang/p1_mysql/p1_mysql-1.0.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Pure Erlang MySQL driver"
-HOMEPAGE="https://github.com/processone/p1_mysql"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/p1_oauth2/Manifest b/dev-erlang/p1_oauth2/Manifest
index 0991e3ae8eab..45bd020a2606 100644
--- a/dev-erlang/p1_oauth2/Manifest
+++ b/dev-erlang/p1_oauth2/Manifest
@@ -1,7 +1,5 @@
 DIST p1_oauth2-0.6.1.tar.gz 212804 BLAKE2B 571341aaa4d3a4bac6ac2f8f46d2e4b9caf5e00622a392635d79ff11b520a3cab71d360220c99a46035ce851974d975d69a71ac9b1be626c9b126941fc4a73cf SHA512 2509d48775579a26178fb5a082e628a8487c986b1b4d4abe974b653a1e0b7605bed934d59f6d62927582bdb95a53ba454816d326d99a77c5360928c4973ade4a
-DIST p1_oauth2-0.6.3.tar.gz 213860 BLAKE2B a610f7911ce46c30760dd8da42531ff1f4e4953f3158a42f360cec9090ca9901647bdedff5eacd7416e34bb64987cedcbb675c1c39de3a4172e337ec50c07495 SHA512 634606530f90810fb998baf26d14afc092699144506c9be771e74d5c965698d81b93bdc35ce53ff94d0b3ad1c4557a16660cfe74bc75586fbab2baa45b1d9c46
 DIST p1_oauth2-0.6.5.tar.gz 213847 BLAKE2B de1b9dc238efacf5682ad12b1b563fc311f1e0515673003286b31f42ebd33fb8dd9e384aed194047cd6ab38d4769ab128e8de5241004ce49f72d56ad9ca22d21 SHA512 5664aba423c85d90321533878b73e58b50d7ef3bc4183c8108c99e075ef4e75041eb28620de4dc14be23dfaac3623a858a9c8e191e54dae62eb9688ea0812312
 EBUILD p1_oauth2-0.6.1.ebuild 769 BLAKE2B 5f526765741fbf73fa473a0c6ac8bc241bc265b226e343a51acc7710e2e6e6ada8a93d86cf0e42bbe419c9cdac90412f1fab69102eaa09430df63746423f7fb4 SHA512 12d79503761861d0de76bd0768024d26b82f8e16524f2ea8b1608902c97a91b6a2277ac89b5fca2969fe03f549bfb3177dd97c37e8423f97fe05e24595f8c655
-EBUILD p1_oauth2-0.6.3.ebuild 772 BLAKE2B 7a4f773917e2aa2cb354491b8bbd20debd8fc0540da4d8132542f011a58866741590e3a8c8fea1f701ce962dd14dd7f7a4a98f85551ad8fb918d2be46cd8f8bf SHA512 92eaef1379086855db6ea107d602bf87aa0a83c918ce3f546d6fc7e92d75cb40d849cddf3efab434a6b2bd97806ca488567c63e14b54ab7cd94e83dd3ec22956
 EBUILD p1_oauth2-0.6.5.ebuild 696 BLAKE2B 6d3538f3013a20e52c2470a2ae7480aafc384fc0e9a3028bd45d29217d6037bb36ff3dbeff41c865d6f78483a7d2e3080d4c0eda89ab58e5bf04eefdc8a3a655 SHA512 116e06c4cc3d0e194d3f08b35d76edf7ad80933f929a2a709f8369796e54ded2521a1603e8a92a5e2808917d61a082c76105ab9b21d065e682e91e9e81e0b2e9
 MISC metadata.xml 252 BLAKE2B 464637d08055afd228df7e0e75123bb0d32fac43fdbca81888471cc8645352ef1441862f842688295cbbba2d29fbb8014a2f65e1e3516f2f4e3d9a85e57dac54 SHA512 ba29c61f7e9f57a00dfd053e9c0b0537a65938ae99e9672dd3c535e98a23f0e32dbcb1411a86da88ea176c051b0039f4ff4ac628e47d7b660873d93c8d2cc18c
diff --git a/dev-erlang/p1_oauth2/p1_oauth2-0.6.3.ebuild b/dev-erlang/p1_oauth2/p1_oauth2-0.6.3.ebuild
deleted file mode 100644
index e5eb8b1ecc8f..000000000000
--- a/dev-erlang/p1_oauth2/p1_oauth2-0.6.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Erlang OAuth 2.0 implementation"
-HOMEPAGE="https://github.com/processone/p1_oauth2"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="test"
-
-CDEPEND=">=dev-lang/erlang-17.1"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-erlang/meck-0.8.7
-		>=dev-erlang/proper-1.1_p20150814
-	)"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
-
-src_prepare() {
-	rebar_src_prepare
-	rebar_remove_deps rebar.test.config
-	sed -e '/, warnings_as_errors/d' -i rebar.test.config || die
-}
-
-src_test() {
-	erebar -C rebar.test.config compile eunit
-}
diff --git a/dev-erlang/p1_pgsql/Manifest b/dev-erlang/p1_pgsql/Manifest
index f0c9e772fcd8..48869883b8f2 100644
--- a/dev-erlang/p1_pgsql/Manifest
+++ b/dev-erlang/p1_pgsql/Manifest
@@ -1,9 +1,5 @@
-DIST p1_pgsql-1.1.0.tar.gz 18634 BLAKE2B 9049192142f43bd4685de59cb62e38139058111066720dcfb4a5ad67670823739789b9d291efa046d102f1042f1726467cdf6c455d5e8567928b5029fef4cb80 SHA512 0907d7aba238dfc561aea4b536aff198b7eb9f365cdd3e0a0f826201299cd146802629572862684b2b1b336341afd1778abe471056b09d14b21953a7c3cb4ba4
-DIST p1_pgsql-1.1.1.tar.gz 18797 BLAKE2B e6374d98c2417074130f4cf6cedcc54b51ed0d57dd9f28e3d1dee6ace47fe3d807eab4906b25ec392affa09243fe30fc98cb4b8231d50ae1b2b9048428027b89 SHA512 6eaf443528d410a23086b267acbd6ebebe1503e0dc079ff9774d8c30018857c97a29f8aae67dfc9a399c35fdb7aa6e800cfe22a0b4d7836db286e05c9c7f4fad
 DIST p1_pgsql-1.1.2.tar.gz 19347 BLAKE2B fc8d052dd77037b20a99fc147c55392c4d731eef6f098b6b805c4441e44b7a16ce6dce44c88ac2fa325d47fbadfa11fdc9c75b1f2039112699c2ab1b1dc6af42 SHA512 e5ead1e41e5dd0b9ec1ff96e6d133b8a5eaea38f6eb343391f5a7cc9757c3255730b147a621a8d55f7e0be2798186aedba0af2434ed96a981fa8f19c4ba8927e
 DIST p1_pgsql-1.1.6.tar.gz 20545 BLAKE2B 17e5f2dc5f08ff830ae2b17a80950e45a0df7f939b8d42bf6a4a373c76818997c040b57f5db4cca3d0767d98c4684c0f61a610822d4c43c5138e61589cf57b8f SHA512 7bed2f44a134cdae1738c2a09257a406fe292a0f6bfb587eecb6597c1b4c6e9ea45d2ed6022ccc6a9a00fe008e4d99b2df4896ac2f0654e1daf7369a39dd60c9
-EBUILD p1_pgsql-1.1.0.ebuild 468 BLAKE2B 0a1232ef912ea062eec28e413303db88198e58dd6e3f13d71f1023e6191fd05f2dd5aaedb2f0e6ef998833b64d7dc5cccdd1f1c01b7686050da4309f151a304d SHA512 e85d7f61dd84c2b92193e05739b3309a827d7193e87d594e6cbfcec0ca6fa85ca17b5cca61ce859ce4426cbc6dd852d8209ba6ca6e02ddcac2343304df57e1b5
-EBUILD p1_pgsql-1.1.1.ebuild 471 BLAKE2B 1345de46bbaaf0d5e100095cb139c6e22fecba07990b334803d3c98e798c3120118f337f649119fc3807c1d370b78168984d40cf2c840c5730a9c73ae085230b SHA512 11b25a76eadebe85b5fa9ebf0c2c3bd7092bad426d80e6a9656bb6e078bab5f5eabc892b222e67806cf3378a78f0b99916e5449cfdffed76256f52c4eb959ecb
 EBUILD p1_pgsql-1.1.2.ebuild 468 BLAKE2B b11272bb55904acb2a06c4151d6514ac0a675e133d5cd7a9bb9e403f5f191954bf4d45db1372958237a2397b554950bdf31193fe25fbbb2a5277cd166ef68a13 SHA512 382ec76355d60ea689e8db4f80ee9fc26e24ff37ce2064ec27d9691e5919ab56bd2ef44dc787ce18ca1eca3c7098eee0547daa9f12a0cd35fbaa095fd577a9b1
-EBUILD p1_pgsql-1.1.6.ebuild 471 BLAKE2B d600e25f910446e9e5a85bcfa14d2ce2a2039be3a9857e65e9109343f3d9736f319117288c0fc29b6d3db105e1f0bc0fc5eafebabb7d7720ecd6370f3d39c45a SHA512 5ebb92f61559bf08be5295827f5a91574825e3288e17e1c26eacea6414fb2ffae159caf415fd453cf2bbcc4db92d699ba7a01a92abe1e7f1c3daa71eea91517d
+EBUILD p1_pgsql-1.1.6.ebuild 465 BLAKE2B 8d1d820aaa492e81ee359f6baf2a0a10624934c6abf7f1c03ca9eff91ac4da4b778f1246f72bd289d2db419037e5dc18428807bab8f97016fc15fea73902a517 SHA512 cd9ba3186da8bd1b04c94c3de9fa8ebf26cf742a40b0f98bda8fbfa436811991ed9fe3f0f11121704dd59f24719e8ee21cfa5e36c2b7dbc8c443e7ed64bb5b53
 MISC metadata.xml 251 BLAKE2B 7232f013bc31fcaa660df7c84c1b0978a1311e715d98080f6284a29d00dddd2733a455c6e8452a7931c713a73390bea9a283dd85e1b0469d0edd843c2cf9e8f9 SHA512 3a930e426e96a9abbb0b5238fbf02769c2ae76edaa1117f04ed3de710192ba0c5b37d4268b7299c8924991eefd8805659cc74e109cbd5f75cf25c9be0e70be87
diff --git a/dev-erlang/p1_pgsql/p1_pgsql-1.1.0.ebuild b/dev-erlang/p1_pgsql/p1_pgsql-1.1.0.ebuild
deleted file mode 100644
index addd1a47565f..000000000000
--- a/dev-erlang/p1_pgsql/p1_pgsql-1.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Pure Erlang PostgreSQL driver"
-HOMEPAGE="https://github.com/processone/p1_pgsql"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="ErlPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/p1_pgsql/p1_pgsql-1.1.1.ebuild b/dev-erlang/p1_pgsql/p1_pgsql-1.1.1.ebuild
deleted file mode 100644
index b68b38e6fb19..000000000000
--- a/dev-erlang/p1_pgsql/p1_pgsql-1.1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Pure Erlang PostgreSQL driver"
-HOMEPAGE="https://github.com/processone/p1_pgsql"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="ErlPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/p1_pgsql/p1_pgsql-1.1.6.ebuild b/dev-erlang/p1_pgsql/p1_pgsql-1.1.6.ebuild
index 96828d577d2c..0806c222c3e6 100644
--- a/dev-erlang/p1_pgsql/p1_pgsql-1.1.6.ebuild
+++ b/dev-erlang/p1_pgsql/p1_pgsql-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="ErlPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 
 DEPEND=">=dev-lang/erlang-17.1"
 RDEPEND="${DEPEND}"
diff --git a/dev-erlang/proper/Manifest b/dev-erlang/proper/Manifest
index 83ad0eada103..73c64a7055cf 100644
--- a/dev-erlang/proper/Manifest
+++ b/dev-erlang/proper/Manifest
@@ -1,5 +1,5 @@
 DIST proper-1.2.tar.gz 291892 BLAKE2B 6c69f449c8794c1a957c78e7c478385bb4590f13752856c8695fadcad5f25943da8939d028b21e8615042fccda20561479e1906e4e1c701c281d29123000bd65 SHA512 07030eaf63d7e28d5df168ab6b49bf1ad1850b962453079f8421ce4b682caa0e6bf166a71e7abebff3d61c3ada7da86fe3b6ffee3a8ddadb9686e75733cbf75e
 DIST proper-1.3.tar.gz 385139 BLAKE2B ff161c9ef694a039105a4ef863952b1a9377bcdfcecebe760de15bfe722291aaf2098a1e187357c6c30586024313f746abf52c89f6c337977deb6caeb448d404 SHA512 4d57ad4fb2a73aedbc9d839c953f0a844bc13acfbcc7e7ec2f0fcf3570a6b877589c1684a28e30dea93f469f6a7ab6db46bb95bb9b539721f6273eb6909dd2bf
 EBUILD proper-1.2.ebuild 518 BLAKE2B 44a79fe2f8be97aa2234b7eed13ac1a4f4727515151322aaafa791cba746f512349c9d43ada13cf67669b87452f4d81f462887ecbbc4cdc42f2f28c92b238c48 SHA512 b104e8c05fe9415f214421ed25bb072bf93ecd0186cda4b981d3ac0beab56d4c1d8ebe7f6ed8cab4c3f23a8aafaf93d9d26b239720686c8adb3b06e6b9c94ab2
-EBUILD proper-1.3.ebuild 521 BLAKE2B d8a4986cd216388e2d0c4983b5b61abacf584926752dece3e42a9e979b28ce72cf4f6b53954b53fba6141cc768032da72c919f16cc5043e8016651fc244cc66e SHA512 b0aabb02b84ff8f9ee7f8d5ab54d6441303f8b4ba36a5d22f801293fa13050ab17e9d9e22cb7ca3626a67bb4a4f78e59b44db9957808a13fcd1cce9db0935457
+EBUILD proper-1.3.ebuild 515 BLAKE2B 531f03e4c2458fefee28cb8c977c96e59eab3e160df0190c3634ede9f26b656717bd78277d21b3ced1277478f7f2b6d24db912962ec8514cde238b83b8c3e2fc SHA512 e2c3d06f659c782f946a5fc78f2ecce68492cc4855e96bb96a4dfb8878a992e673d4130f29072eace657a3baec50786726991fc15440349002f7dbaa7d22e1d2
 MISC metadata.xml 248 BLAKE2B 6af6e4abb01ae0a27b0b81589345ad4769c4a96f8ed7d98b92f31da3fd76b98698c816bb673ea17423e82be0eff86091b27b954ac6b313890c19461d47de760c SHA512 a5900d7f9d01f754f6950c90d146980774f9d0af582be73cbab36009714c04960bb8cd8c9b2560b4ff464ab24f4a011ff336e846185ae16defe83882a12cb969
diff --git a/dev-erlang/proper/proper-1.3.ebuild b/dev-erlang/proper/proper-1.3.ebuild
index d7a318582266..050bf653bc01 100644
--- a/dev-erlang/proper/proper-1.3.ebuild
+++ b/dev-erlang/proper/proper-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/manopapad/proper/archive/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 
 DEPEND=">=dev-lang/erlang-17.1"
 RDEPEND="${DEPEND}"
diff --git a/dev-erlang/protobuffs/Manifest b/dev-erlang/protobuffs/Manifest
index cdf6d0bd96b8..4cfd421fb48b 100644
--- a/dev-erlang/protobuffs/Manifest
+++ b/dev-erlang/protobuffs/Manifest
@@ -1,5 +1,3 @@
-DIST protobuffs-0.8.2.tar.gz 132660 BLAKE2B a8480b14bfd5007cc8f43218fb669330049c19e5cbad3d8359ed921d0f50e03fea7001c9f901644f3d2ed1868be70576af65aec7d293f0403b058e9e64bd1a3d SHA512 56e9f8d41c500769724adadf025e3915e2b1ab6b68f1664080a49e783facf3d79b5ec20eb8664db9babeea21fc0637c88b1e4a121ca810247e32831a79171b11
 DIST protobuffs-0.9.0.tar.gz 237560 BLAKE2B a29964deae465e0762570a04e6bbe65eea4ab5b60aebf8639724cd7db85716a69d61aa89fbb6dd3464283b1f343dd62f12b8cc2ab6dc0c0e6930d925a4943fbc SHA512 f5838723c5e5ae55f412848978729347186075917893e0b74e5af966ced9f12e8bc65906f3e591c78a99e64d70461df46e5719b83c262e9bbc5acfd1e50ae1d2
-EBUILD protobuffs-0.8.2.ebuild 863 BLAKE2B e59957c9fbcd9b60096643bd61b81a2454ba93970af8cb267cef2160a2b1cb305237beb7a863fda2dbd646915fccd8295f11f93b21c7e6c98534036e06dd3c19 SHA512 e145c7324ed8c549e6136782df7890a65a8ada0cd4d45504798c4a0add915a869782051ed04d9f65cebf93ba5ad0bde6883476ba02cc9b821b298ef0c001f7d6
 EBUILD protobuffs-0.9.0.ebuild 869 BLAKE2B b390e1beac416faf59456ffcfdefbf268d984b559f68846c527da0a205551a76fb3b6f60201a4e4ddf2d4fa206c3785cd394148165728a00e2c617969b92e6ad SHA512 490422a88a470e2d509511fce01aa4c8820b910197c76dee059ba3f3ec8fa6473441f515769995740f7ed1e6a34eaa83747017e707e2addc3cedb14c54d097e5
 MISC metadata.xml 255 BLAKE2B 7bb202710c4823bf62a99def164ebac4ee36a011ba2c814d24bd7a2c9c103f42bd40e0bbd2b03be6ecfae3970c792ba5bde95a4700add7b7ef3beb845be6fcf9 SHA512 66811a88665deeba9438af85c1493dc7e3a493617edeefbf6d45d9aea1de08b53beb04f0238653c779c74804da39080d29fb6791e8d5f7251990101109c03637
diff --git a/dev-erlang/protobuffs/protobuffs-0.8.2.ebuild b/dev-erlang/protobuffs/protobuffs-0.8.2.ebuild
deleted file mode 100644
index 380ee4f02da5..000000000000
--- a/dev-erlang/protobuffs/protobuffs-0.8.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-MY_PN="erlang_protobuffs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Google's Protocol Buffers for Erlang"
-HOMEPAGE="https://github.com/basho/erlang_protobuffs"
-SRC_URI="https://github.com/basho/${MY_PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-IUSE="test"
-
-CDEPEND=">=dev-lang/erlang-17.1"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-erlang/meck-0.8.2
-		>=dev-erlang/proper-1.1
-	)"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS  ChangeLog  README.markdown )
-
-S="${WORKDIR}/${MY_P}"
-
-src_test() {
-	./scripts/generate_emakefile.escript || die
-	erebar ct
-	# FIXME: 1 test fails, reported upstream:
-	# FIXME: https://github.com/basho/erlang_protobuffs/issues/100
-	# FIXME: erebar eunit
-}
diff --git a/dev-erlang/riak_pb/Manifest b/dev-erlang/riak_pb/Manifest
index e04827962a4b..870407a85e21 100644
--- a/dev-erlang/riak_pb/Manifest
+++ b/dev-erlang/riak_pb/Manifest
@@ -1,11 +1,3 @@
-DIST riak_pb-2.1.0.7.tar.gz 224466 BLAKE2B e92a0455247491df21f43ec4ba7981779448c3f6cc83e49efef0871f4969a6fc6da0cb87dd14b9f1bb9ab9a27cbde9c4b29f56e25abe55a668eed503c14d488f SHA512 671b164e1eeaf99ccf726f834bc7e819c5cb232361348b45480411f49c1b0a59158abde016b2fdff47240f275bb594ce70f1deeed0c0b2067e79721f6eb13048
-DIST riak_pb-2.1.4.2.tar.gz 235730 BLAKE2B c45c6b90c5e52177c05c101b584ca6f24bf1aeb9a798fa959ea38e1ec9e6f19d55d86966af6123498a1049c7a039be47595cc24462e834af4d1480ebf92d4ecb SHA512 82d06323fe1e1528319ed95dcff4612a27625df2684519739329e92dcba46864ee23684154f28f312952cc7c341a30b6ad3c72feeab4a9e0ad5101cf9218bd0f
-DIST riak_pb-2.2.0.0.tar.gz 236478 BLAKE2B 3ecbcd05d19e96efc3f9582aba08d433a127a0b9bae7b5c0968de44b47674b4d87733c4f5a356b69c5ee365f11cbcdbf3a3c7702b6bbe56d70e7177d73650507 SHA512 969d4f98d99d1061c6372c50650a6be8e3bda907efb3f1fb3f6553a1e88b7ae0b17bc9301fbaa844ee4c656df2c439252c233ea49b77378eee0bf1a2817d1b01
-DIST riak_pb-2.2.0.1.tar.gz 236488 BLAKE2B 195c9f446b6c3178bebadc65eea5d59bb575878f01767c8c0a45b56a9931509f6c4b2b15c88f7bd1048f3a32c60b3eeb7b140d5e08cc68787cbdded48ada0148 SHA512 27e48e915164fe9f7a335fc3aaf62f20412a0a31a76ef64c101d34d49e506255b96c3797f6313cbab65fc144b004bd7d08ee9975273cf2a70ddb082c25b36d0d
 DIST riak_pb-2.2.0.2.tar.gz 237485 BLAKE2B 5ca10bffcdf68562c9d61ffde0480be134a7b09f9040001bff2cdcf12e87c7256021829ab8c467a73cfd16c3e7e7c48229400d32b2e9f5442b05888de537c8be SHA512 f730d7bedc8152e5764c82df38a594e0113df7ab729008ecb9a231ea36d590e2240d7a5d0d3f57a6856b41748d5a525e0ab195887265d7cf5ab95563a6216992
-EBUILD riak_pb-2.1.0.7.ebuild 476 BLAKE2B 527ae9e26d460dca3a48d5fceedba87d6643b17b305d47995e62ba0a316948566415912ba5b406d6ca02c38f4347f8f221c4deaadf7c088b26587b680d19f71d SHA512 c517689f39da8598a3111b2bc7ab9b619037a87b194eedaf70efdea7e3d459fbd3f89fd630d045359069def3278b080f89cecec4baa4d0a1b5c08992ae0c2f40
-EBUILD riak_pb-2.1.4.2.ebuild 527 BLAKE2B 6c2819940ba2df5f7a3bb09531aa8f491248c9dce2f695ad21d8710e4a609a070989cb850a03df8b265a532bc904ea4307f891bd436e4732bd7c37fafb27f616 SHA512 b9d6417cb833754cdfbc71adf0f3cbd20d6b5ebe5fc9392eaa5bed5119df376d00c672ce68793d83221c2547c50fd0134fcd5420386fb956e26b1fc7455e548b
-EBUILD riak_pb-2.2.0.0.ebuild 528 BLAKE2B e29668575a0a8d412f0649fd835ca47438c7496f85f11b1f2ebdb01a99dc45b82bcb6773fbea8f9a040f2b4e253bbf8a664e2c5f902750c9e8d4eff635a4612d SHA512 9a1659ef8dc43898233878365d7163fc0401ceeeb6645c480d9305da3462c8a14346c90afc4e1f5b011cf3c6d0594e8c972f581cfa1c41ff0818dc2351d38ddd
-EBUILD riak_pb-2.2.0.1.ebuild 530 BLAKE2B 8725d3859d99b7e9a9441c5d42ffe6af541ab783073100b487328a2f65a2eb6ee1f23f7a5b1605070d477940ea7af54b546f02037d7307411ee7ed7868b1b255 SHA512 78f327e28e1fde1c9517a52c4023c18b5155e243f5f07f05a440f17561e86de17816733d6372ef20081c8129b4c626e8aae8c6b1a541debcfd8df734b2de4878
 EBUILD riak_pb-2.2.0.2.ebuild 527 BLAKE2B 6c2819940ba2df5f7a3bb09531aa8f491248c9dce2f695ad21d8710e4a609a070989cb850a03df8b265a532bc904ea4307f891bd436e4732bd7c37fafb27f616 SHA512 b9d6417cb833754cdfbc71adf0f3cbd20d6b5ebe5fc9392eaa5bed5119df376d00c672ce68793d83221c2547c50fd0134fcd5420386fb956e26b1fc7455e548b
 MISC metadata.xml 245 BLAKE2B 5ce7c22ba3e9e685d6e6cee9387439065b5ad107f0e3f262324774c6ac466e2a49fb4a0ceefd37c0c956451b1ed2743dff85a8eaa789dcffa5c93835cc1600d0 SHA512 66061bd485dceaf463ad259fe5b66bf0e7036f45ed1482b1ac777aa5922957877094c8a088d73ca3651a3862a71b6402762f9cc8078319bd9d1f18b8380a428b
diff --git a/dev-erlang/riak_pb/riak_pb-2.1.0.7.ebuild b/dev-erlang/riak_pb/riak_pb-2.1.0.7.ebuild
deleted file mode 100644
index 041941197d2c..000000000000
--- a/dev-erlang/riak_pb/riak_pb-2.1.0.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Riak Protocol Buffers messages"
-HOMEPAGE="https://github.com/basho/riak_pb"
-SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/protobuffs-0.8.2
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/riak_pb/riak_pb-2.1.4.2.ebuild b/dev-erlang/riak_pb/riak_pb-2.1.4.2.ebuild
deleted file mode 100644
index b164a87852cb..000000000000
--- a/dev-erlang/riak_pb/riak_pb-2.1.4.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Riak Protocol Buffers messages"
-HOMEPAGE="https://github.com/basho/riak_pb"
-SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/protobuffs-0.9.0
-	>=dev-erlang/hamcrest-0.1.0_p20160709
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md RELNOTES.md )
diff --git a/dev-erlang/riak_pb/riak_pb-2.2.0.0.ebuild b/dev-erlang/riak_pb/riak_pb-2.2.0.0.ebuild
deleted file mode 100644
index 21842002c4b5..000000000000
--- a/dev-erlang/riak_pb/riak_pb-2.2.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Riak Protocol Buffers messages"
-HOMEPAGE="https://github.com/basho/riak_pb"
-SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/protobuffs-0.9.0
-	>=dev-erlang/hamcrest-0.1.0_p20160709
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md RELNOTES.md )
diff --git a/dev-erlang/riak_pb/riak_pb-2.2.0.1.ebuild b/dev-erlang/riak_pb/riak_pb-2.2.0.1.ebuild
deleted file mode 100644
index b9f8d649136c..000000000000
--- a/dev-erlang/riak_pb/riak_pb-2.2.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Riak Protocol Buffers messages"
-HOMEPAGE="https://github.com/basho/riak_pb"
-SRC_URI="https://github.com/basho/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/protobuffs-0.9.0
-	>=dev-erlang/hamcrest-0.1.0_p20160709
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md RELNOTES.md )
diff --git a/dev-erlang/sqlite3/Manifest b/dev-erlang/sqlite3/Manifest
index 0918dd51d778..09749a72a4f1 100644
--- a/dev-erlang/sqlite3/Manifest
+++ b/dev-erlang/sqlite3/Manifest
@@ -1,5 +1,5 @@
 DIST sqlite3-1.1.5.tar.gz 1833901 BLAKE2B 19b02655962e4f70b01826e1346c93119a2a9bc8474083b0cb7719cdf8096d7fe7e33c3e8f17bb1d1bf11e32f4f9707fc2bb15ba6bfa848d2318a9e6c517d85b SHA512 894f39ba0760d15c4adf396d277cc30414c28acbc62135395af6939f769cab9237e836d5c3dcb5250c41917bec3db577902c01dbad1d2600480b3647c3c61c30
 DIST sqlite3-1.1.6.tar.gz 1834834 BLAKE2B 43b8bb8c10888aebd8842ffe410c1aa2506606dd99c551778b08b2c70788c4bce201758a0bb950e949d25a1d49351c17e2d225c2ad165588378d166959b7485a SHA512 f3781c186f4f677340bf752884559e9afe745726b6e8dfeb8b701ab34a5e58af0e7dba8bd852443f44fac874a1af66970ea29b044ff2f0cfbbeafbb4996cdc8d
 EBUILD sqlite3-1.1.5.ebuild 562 BLAKE2B d06a61c8ea8c5afdd99fbd141aef17bbd3f575b49811bbd881efef48ff186e8162584dbd4dd99247bcc4051bd569983e2399510cd7e5243f7d4667a98b4b9d30 SHA512 5385ec725fc763f672d4af06d926d2e9d0ebc8a06b1c460640f91fba3273a6977992bf0e667c28173d6fd3f2ea0347d5b8cf3bb2fd1044b17b2759eadc72d70a
-EBUILD sqlite3-1.1.6.ebuild 565 BLAKE2B e351e595e41aa6445c931b765d9865b867e9162a020efa549a0e0e602cd0c688287de844d6fa0f7dc425059d138f69af899edf38a43c12972d1e804c7c5e45b6 SHA512 f1fd7ef51e3d9529ed9b08eb4f754969c91f6f9e920ee4831ab2b9feee5b5860534544692aed0d80116359d714dd30930ef58594cbdc7d741e6d3933b001c7c9
+EBUILD sqlite3-1.1.6.ebuild 559 BLAKE2B c22f7a013c04791cdf8a284774dc111fcf5682b7842f11137bf339fa5822e0c92d286fe772cf2cf022ae73e4c2ca81c6b3cad2f8e94584308cadb2ab2a4ad309 SHA512 3ffe525f476ff07b234f1fdb5e8bb0d7fe3601a9d7d6001cb6c4895f9c220246d3b31bf1fa42794d2b2e7ce1901d4a5dfe5c55b8d71b87365ba801cbe31e9c73
 MISC metadata.xml 257 BLAKE2B 98bf33a44f9f40733f0bec4629905ba837f330b78ee411815c1f1a13ef3ec4f2191319151a1f90e74f4f3f9af2f1b0f5ee9ad8560f92c956a88ba5f91bb4cd2f SHA512 c759963783071462dc040e7f461038beae4b5cd35a61cc502c2854da0e102ea5dfdfa82414208bd2f897fff6ceb14391adce2045c8468c90c0cc71de7056b65b
diff --git a/dev-erlang/sqlite3/sqlite3-1.1.6.ebuild b/dev-erlang/sqlite3/sqlite3-1.1.6.ebuild
index daf585d02438..66a221f881cb 100644
--- a/dev-erlang/sqlite3/sqlite3-1.1.6.ebuild
+++ b/dev-erlang/sqlite3/sqlite3-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/processone/${MY_PN}/archive/${PV}.tar.gz
 
 LICENSE="ErlPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 
 DEPEND=">=dev-lang/erlang-17.1
 	dev-db/sqlite:3"
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index 82fc7bc8c269..09dccd9801cb 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -1,15 +1,5 @@
-DIST stringprep-1.0.14.tar.gz 95662 BLAKE2B 5bba174aa4bad36b230143e6b598149a62237039482811641fb80e35437f49f5ef99d66d020f715de5db4ccfe98f8a1fd4aeab2eacae74b3093907254442c0e9 SHA512 665eebd8339405c87c810f89e7671ee9490ad960da21da9b45ea867df962c39d727f1b00c2b441b60294122db5cfad64c768497db7772cbace7391ab50fe3cb0
 DIST stringprep-1.0.17.tar.gz 98819 BLAKE2B c1db7be3bd3618c4c1a943080a39104342b11102b9e894e457ee6f7510696a4e160b3bd50fd945be9d8d7dda4bf9eb5e5517e59f7e69cffd9b71e1db9e022e4a SHA512 170d4c96882eebf4602f0a6c87764b6c10d6a063b832c4473df11741656ac03c7b7bbb7d176a991747364f7fb9487ed0cbdbf6792378daefd41672ed685e9dd8
-DIST stringprep-1.0.3.tar.gz 95189 BLAKE2B 448a5447d9974f20e110a2359a5e1e92e449784bcb3915fc7f33d4676e6de79fe42bac40c3d404fe582edb45fa90ef4fa725aade9a0ef3f67927240cae498e17 SHA512 a42ad55ddfe69f34025fb4ce8f357b13ca3f24449da7ca1e4dc5d78dd350d39530c39d1f3542fe0cba8081c6bc5d3441a606f227733d7a6d87d658a703a0feb1
-DIST stringprep-1.0.5.tar.gz 95323 BLAKE2B 1ec1a66856c707d0f34ae5e257828a9b301ce2d4d9137dc52e1b5911d4ceadaa8d6925168cd4f58207c639893048095d873b27997cfc7999815f80c74ced94b7 SHA512 08132b1c6ceb7e4d069677e8a49ef2543b7d2491d745b3b68cc59b1786ad9884db5e694317ea44059c285ce63df4e7ababc6e0fbad2f36105479e6a07e159a05
-DIST stringprep-1.0.6.tar.gz 95340 BLAKE2B d8250653ba6b0f0e0f51303dfa3b90e0695a0b51692c1005ef3ad68e07bec3c831dba7d97be00ceb75a392c2c98baa99a15dc53813ebe9c57dc594053a1f048c SHA512 930399b8a33f6f4aac9db12f0cc46197e94b6964eca6b913bea6ad331b8c2dcfb521331245858b4480f0c9bf472f7cfa98101349c4b2624c10718410d49cd040
-DIST stringprep-1.0.7.tar.gz 95491 BLAKE2B 23cb8ca266ef11f2b37db692dea2078faab0d50bdf5774743fb3d8470e62dd4ecda11ffb50cf676464f0345a63360be9422df6d440eda94757de8111078cd10a SHA512 07b9268951dd7071f652ed034404def67895846dbacc226b4d3a43306f48106d2393c4f879ae6d8bc89e16ee181b83efaf8cc9cefde74a4ada87ed9eab85747b
 DIST stringprep-1.0.8.tar.gz 95586 BLAKE2B 62fa68021c32dfc6d1d46473d9cc756cd5f0e2d3932f6f4dc78f71a1ba05e5124574a4b210d74ab555b2cc40f2c43b5eb6d0aac709a028f7cc6324189fde5ee9 SHA512 6680450a3e6226b088b06c79dd6ef1ca689ee8787b9f7eaa53ec073e9dcd70fac48ed2f5fb0b12871607092514db71f63b0617a938912a88a51d36518738a911
-EBUILD stringprep-1.0.14.ebuild 532 BLAKE2B f188866429a3caf453e9967ec6faf4c0cb96ed5c4a45b0707ed33fd4f3c43ee0436005349072f2724b5f75e164d2caef62eb5ccbf73eb4cdd5ca8eebbaa68b4b SHA512 dc95046cf0cde6a9de5612b5867257f4b5b035c563bb96bfc7659de5349ac79e0e3aa270376be0f62f61ec4a0bda14c2e3f6ef648ffbe915cc99a93b3c4ea88d
 EBUILD stringprep-1.0.17.ebuild 529 BLAKE2B b53b1940e8322880fe1c21abdde0bb449bf47cfb795af6e20ae9196a6a99db92e07b85a0a149e806fe2945e26cc82b467b8ef7bf60683b6af077f5bb43321bbd SHA512 2b96dd621935ff427012ef112679275b9178d19337d6fdae9f9abd5d1226c169e171d0cdd6d1b2fe75801a598211db735dc4190e5c00b46bd5c6042bb561bce1
-EBUILD stringprep-1.0.3.ebuild 528 BLAKE2B 8ee5039d27f0d16c20f4df550a015f1f2cbd77b5cc35327d8e8f862d50417a4dbee89d5516761bd60218372d211e799039ab87cb77de3a4279a36db363c261cc SHA512 17dd1c39a9e29bd993357aaf12ea37ac3fde9250e66d74e87c663cc6e273031c89b67a089dc2fda3c78434c4bcdc5fc0a8f0d10db5b887ce358596e517d0fdd9
-EBUILD stringprep-1.0.5.ebuild 530 BLAKE2B 8bd07c63c2e613054732c541235f6b9681c9b1e993e7cce2e00a5d057ab64ed9e8f9c10036b086ca944b9a6bc7fe1ab053344594b35abc48aa656d2d52f7c6e5 SHA512 2b29cb157e3f2136939642e25a5bb7b27722480ceb2ba390f51c945df87ae3a18d0290986e022197f43d07dd55dbb5afa7de8afac04ebda06860a20302676256
-EBUILD stringprep-1.0.6.ebuild 528 BLAKE2B e1d1c2cb2d27201473012f5f325f269de941480817dc5564ddd5b44873371cd62b1a40e002148104f13134d863982504f41ecd7604725f4411ea433c1de86cb4 SHA512 3053c458afb02e79f379dfeb14f02f2f9ef24a6aedfda6e51ec5cac4843becb4b20d0128ac08925bd3fb017a59952ee7c949676d801947eb0c3d83321c7b2fa6
-EBUILD stringprep-1.0.7.ebuild 531 BLAKE2B 871f9af12155b3a261851e8afad8ede2c66b690ae52d2042e083726f381c13f5dfd23f1eb9893e2abf8609814008ffdba7a7460e19a7d250a2588f0ad3a9d0fc SHA512 29cb51f2c5b8bb54492a2f04bb7b4150fbeb19f8784eb1ec13f4ea38def180e5f407771a0a9437aa00dd7e8c828c46fa4095e889806fa70b8d248d76d3b8f60a
 EBUILD stringprep-1.0.8.ebuild 528 BLAKE2B 9eae5c11327107f306caab041a663cbde0146c6b0cfecd1c67babc005d6145b7b056a018d5847807f3167028d899e3ee9eb68add933df9daff601a195a682105 SHA512 86ab90fd3311779ee8caebe44b9dea9dfcc8c79e31eb9b2b703e3c47c18e9ba8880eafd8cf7d1ac9a7bf6d518009cdfef778c0b3ada2f053390efb4848662532
 MISC metadata.xml 451 BLAKE2B ddebfa6399e28ae5023934236c5b99ad2fbb40029ea1014cd0ce2fd382b67a3460bf073dc3b478be8ed6d157f7b24adac5519cb7f5bda62774661da4647f42f7 SHA512 7290c0e5618385803931ea5a58df071ab0186a984b23d4b95b469d48eb66b7b8d3b536d6f58fdcf056e313f62a6f18742f29e0423eb6b1c7c34cdbffad682f6b
diff --git a/dev-erlang/stringprep/stringprep-1.0.14.ebuild b/dev-erlang/stringprep/stringprep-1.0.14.ebuild
deleted file mode 100644
index 9848954c4175..000000000000
--- a/dev-erlang/stringprep/stringprep-1.0.14.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/stringprep"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 tcltk"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.13
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stringprep/stringprep-1.0.3.ebuild b/dev-erlang/stringprep/stringprep-1.0.3.ebuild
deleted file mode 100644
index cc14f19c53e4..000000000000
--- a/dev-erlang/stringprep/stringprep-1.0.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/stringprep"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 tcltk"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.3
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stringprep/stringprep-1.0.5.ebuild b/dev-erlang/stringprep/stringprep-1.0.5.ebuild
deleted file mode 100644
index a21cf915742e..000000000000
--- a/dev-erlang/stringprep/stringprep-1.0.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/stringprep"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 tcltk"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.4
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stringprep/stringprep-1.0.6.ebuild b/dev-erlang/stringprep/stringprep-1.0.6.ebuild
deleted file mode 100644
index ffab416c6e18..000000000000
--- a/dev-erlang/stringprep/stringprep-1.0.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/stringprep"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 tcltk"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.5
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stringprep/stringprep-1.0.7.ebuild b/dev-erlang/stringprep/stringprep-1.0.7.ebuild
deleted file mode 100644
index 389982db9ff4..000000000000
--- a/dev-erlang/stringprep/stringprep-1.0.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/stringprep"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 tcltk"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/p1_utils-1.0.6
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stun/Manifest b/dev-erlang/stun/Manifest
index da19f922b96e..d5766d7a5e9a 100644
--- a/dev-erlang/stun/Manifest
+++ b/dev-erlang/stun/Manifest
@@ -1,13 +1,5 @@
 DIST stun-1.0.10.tar.gz 28715 BLAKE2B ef8ba4d383df4374df065236b17d547d863bf8f323ce60779c772e7c8218872b0d460c513cc735001e7074c4defe0a36f3c0d41422d0bc9bb7f5139287f89c70 SHA512 9aba8c614af2f132c2a1cbeb96caa441934df389d24789f2d52b33b878f02a1b47602c95e717c7afd2a46ae85ceb70b4ba5c6eb96cd4fedf6ac56b0cd888ff74
 DIST stun-1.0.25.tar.gz 29332 BLAKE2B d234af437cbdd11116ed373c4ff4c5b67f80136d2c92e05a462138d3e31f6120363d0ad8af275eb753f4e724c1435fc4b5ec7399e30c25e7a6ad69c3e49d3ad9 SHA512 9c0eaa5cf21ca5305d6883f24d09a55fea2df261a1b32ab94770b9487c292f12ee3c55b101a4923a65407f0dd23149fef91bc35d2e754ab253c1c67adf584a3e
-DIST stun-1.0.3.tar.gz 28646 BLAKE2B f99ff996d8b228d89f2121aca9f25330a833d78bf974ebee22efd66f3ee44a6d0c94faf5556389786dcb2d118736a151633ef05e37736c041f252964184eb876 SHA512 c15918f4b1f81477a7834dc5ba837fcd512249bda569cf3ffd3066056e6f1abacfeab3d0dde575402291d841f257a3b33e27d6c76250ae353d77e3fdd87f9786
-DIST stun-1.0.6.tar.gz 28681 BLAKE2B dba8fc380670069f6b725aad71edc509fe7a6e1f142515adb6787a8de75f411b7030f5516e19c163ab9c7aa3a27a2ef86758a744db96223dce6d5e4361fea94d SHA512 30a34a660d246ed33015e2f4b890203a2648553ed6e2dced87e30bca2eb9d09486684947332f7239d535ce19a36028a0642136e5b574f3c5b867f598341bcaf9
-DIST stun-1.0.7.tar.gz 28689 BLAKE2B b1e32ad7a2e2da13fd514fca5318cb8695af2f818eef0053c3c290e0eaf32496e993095ee6bf865924caf5dc30e29d4409472f12c9743fa56a7f67680afd0ea5 SHA512 d494e020741e3e098c2ff9221a03cdb6f26a474a859e8e7dc41221050d7a99e8e7285b812556b95fd3f1e30ace45feb2e5613eccfc08bc99f9bbdcfd2d82687a
-DIST stun-1.0.9.tar.gz 28709 BLAKE2B d35baf946fdf07c27332de4a567a43824f2cf762be99efea5891ed5342b71bb7948a5e012a239742f8140cd5fc753b70f7e03dfc1ac8e521eb18c4ff49ff0979 SHA512 0ce53920194c4d020b1e0e302353eda24cbdab27ff45b1247d2aa7ab973944f89a0f3498508966daec43a0dc40a64cff15a31cab7837f7b105ebcbba8df63754
 EBUILD stun-1.0.10.ebuild 530 BLAKE2B 6936de72e2b09e848595cc7a128f105dc03d7bda49e12fb9a699ade7b862f434a1420434367d8cf645620c6588e26a8b5b1391a9868e75fc7670bc4720cdf68a SHA512 1ff462644a0f47ca55a27c41aec240fca2b10c3f2b5bade7f0d3178ebb456b0907c8e3d181da27c96a523ea3e7661574b827e114491cbad1ceb87e0b08e7b916
-EBUILD stun-1.0.25.ebuild 534 BLAKE2B b2183b3fabf5d6363603f854bc4db6a668a7cba80109863295fa639e8a8c60b7c37901b6b38717f271f234c395fa1188f229b10f14c0da4819d7ff72bbd0e6a4 SHA512 89e1ad27b1e97062b7772718c4a5d7ae687683626c1bc2e5c2caddda824abe9ccce589562410953248323f14ad2af81a3a3181d87264134d76cff536ff87ecdb
-EBUILD stun-1.0.3.ebuild 529 BLAKE2B 970d6cba01347a0055bde064fc7e23bc2f9d7b421cf5ce21b9d8c7d69bbc65767854931418928bd37931646195c1ffd6a92f71e0db25fe8009a2f1559492fb06 SHA512 34f189f5b2c82cdc778c05c88396d780bc5bdd27432b609c2f6fb2acdb4f71135bb1ad8eedbfe2ca1274ed774df895251d5e41e64c28b2646a3277690834ae1c
-EBUILD stun-1.0.6.ebuild 531 BLAKE2B cc415b5d2e1cc89d71590c3a0ab76d71dd53ab6c9400b31330c8d404ae80cf3377067daee84ac82e085c07f8b6f5e2aaf806f8bf74a5501bd04431af1ca4ac2b SHA512 e18819e6d67c4369fe403c46b27bb14b81c57c90265df4c458a85990f3a64fadbf7ef4185511ef28e712543a24615d3a3aec664522c38d31dcc81997d3fd9e58
-EBUILD stun-1.0.7.ebuild 529 BLAKE2B 184bb2f76d5f17ec92f3d8a5b367477e694319cb85a61b16b63f4607d3d267d331cf5e727e139f5cb6132c4b1de528908025ae427a633173c3863b58e6784bcb SHA512 7e7ced8943afaee99d256e4d1ab309ce18c5b537ffa7601e4beb1eda95a25b8e5538d94d720ecf6d0ab9e0bc38667a2c5c8eb8c110dd7ff6830d573067222eae
-EBUILD stun-1.0.9.ebuild 532 BLAKE2B 7d1f1e5d2343fd7416e7661fddd0f28f4582b861e4dbad926459cf0db87d6628a931b175e060bf35b6d79bfd56bd6eddc8145d647be4831b96f24c7a035da4ec SHA512 b0ef3c14dbdd11bd1e57bfb8068e7090720412ce76f7ac92221952cfcc8951da92a2917509839f17da77c05b9a19438becc84e2db61dec14042366d82a013447
+EBUILD stun-1.0.25.ebuild 528 BLAKE2B d0dc21b703277242d3286f8b8088067768f893c7bc64420cc0b0e84819089d515dab129de63e1356193e9d94167f0b3e764f95cae46b235b9ee98ffcad857537 SHA512 fb52eef93b3163fcc9ff55da332d6caea63d15f8a218ca52f23f5e69b9ebf55849181db7d931e74e2296e037e460f7f22801f205bd0c2931e119d11dba944540
 MISC metadata.xml 247 BLAKE2B 0c561f7b690161f95ba6729bfa5e2c3ab5a2fd75086e2a47d5ecef2442daf029f632f87665c6322c41f63941afbc3cdde75e2778e9638f82ccd45db10bd7f8cf SHA512 ceb4cb57189a8f655e344de53df45ac6cc1ba230d60f0d4f9be5ccc737431f589dec9bf47902477b21751b6ec15c59d77b8f9394730878dd80534d32377f5d65
diff --git a/dev-erlang/stun/stun-1.0.25.ebuild b/dev-erlang/stun/stun-1.0.25.ebuild
index 244fbc48606a..9d87bec41f84 100644
--- a/dev-erlang/stun/stun-1.0.25.ebuild
+++ b/dev-erlang/stun/stun-1.0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 
 DEPEND=">=dev-erlang/fast_tls-1.0.25
 	>=dev-erlang/p1_utils-1.0.13
diff --git a/dev-erlang/stun/stun-1.0.3.ebuild b/dev-erlang/stun/stun-1.0.3.ebuild
deleted file mode 100644
index aa267875e1ed..000000000000
--- a/dev-erlang/stun/stun-1.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="STUN and TURN library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/stun"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/fast_tls-1.0.0
-	>=dev-erlang/p1_utils-1.0.2
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stun/stun-1.0.6.ebuild b/dev-erlang/stun/stun-1.0.6.ebuild
deleted file mode 100644
index 28e68899d074..000000000000
--- a/dev-erlang/stun/stun-1.0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="STUN and TURN library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/stun"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/fast_tls-1.0.6
-	>=dev-erlang/p1_utils-1.0.4
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stun/stun-1.0.7.ebuild b/dev-erlang/stun/stun-1.0.7.ebuild
deleted file mode 100644
index 0106906ef3c0..000000000000
--- a/dev-erlang/stun/stun-1.0.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="STUN and TURN library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/stun"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-erlang/fast_tls-1.0.7
-	>=dev-erlang/p1_utils-1.0.5
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stun/stun-1.0.9.ebuild b/dev-erlang/stun/stun-1.0.9.ebuild
deleted file mode 100644
index 71134182d48d..000000000000
--- a/dev-erlang/stun/stun-1.0.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="STUN and TURN library for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/stun"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/fast_tls-1.0.9
-	>=dev-erlang/p1_utils-1.0.6
-	>=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index ec1a0d0b2519..823f4c4e612c 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index 25f6da532794..477960d3f6b6 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,4 +1,5 @@
+AUX freecell-solver-5.6.0-cmake.patch 462 BLAKE2B f1ca838179c2bfdfe8d2d3d49eb062bfb0e337a534cb6b3122b57d21373fdc595e7f88781c17d8f6cc877d03248887e32b8ec4fff85870e5a89e9684c26c4325 SHA512 b2bdeac670f110011fe5c1ab332d285b13bdeadeebe422482beae999e295fd94d58cc2578744064eca69cd86d0ea6b595147f942c60da94a9638137ef7b23328
 DIST freecell-solver-5.6.0.tar.xz 392468 BLAKE2B 9b8a22eca95da8675a252bec947dc5edad35a492ce9b04db5bf956e9a8c7051a9ca38902f9704e1f789fe28ce3326515690b2070cbb0318d299fdb8446ec9d1a SHA512 aac86e9bfb5849ffd99c669d8cfdd79272bc2f2a9a7f085e22f775b26fa45fc404efbb7520d23469e96c54c3596e776c8f459e679127de9ec0bc065c82bff246
-EBUILD freecell-solver-5.6.0-r1.ebuild 1046 BLAKE2B 31702eaf480bdccb3a3e3edb88de47036f2d9d8826a3372eb78e2d3d3f017ffe1c4ef84ef9b567e7ca9d24dc20c0a894e206faae39b153d272057d8320d06789 SHA512 875bf53ed93a52c03f76fb4006f424d61f2006ac344f743bc4900c9193b8488fda5bca7e4d4a743d5e4fcd823597145f495400e35ab61f1919c66e1e79ed94f8
+EBUILD freecell-solver-5.6.0-r2.ebuild 1202 BLAKE2B 54978bbc9db08745705ced3dcef0a1446ee8813a9cd32d4e2b705e4d548de53afdc8a1c5c3af5261cb1d41ed346e4486868f3d86ba8de28afe7b35131dd32cb7 SHA512 b2395415225498a9832def6e944b4f7d3f64dddd4eb413f7563b362b7e69e88195114942af7a919bd205366e054ad0a89302e68f50879dbfd29f7e868c3a4abc
 EBUILD freecell-solver-5.6.0.ebuild 1039 BLAKE2B 085ed7a82910b9840e9c7a1a6bea7857e61969c9ffe5e124b78440d3b33aa0575ac79246b0ebd5adbdafa86f835905a00d17380dd73c05913405b8b7c5f485b1 SHA512 bb1dbc40f0627815ddbd8ac4f50a2cb3ef8958c652205de6a247f8358333a267fda9ba54cf03065643b8316bff4826d8a15d39337c1743deb0406e5b14732ed7
 MISC metadata.xml 330 BLAKE2B 2d2fad43c972b00253e7740bb472027d4edc54537d6d2564f2804b13c7b02b43a34598bf698255d0f42962b14e207da31cf69f021793d0ae16e198d0a1765e8a SHA512 8e5d4cfa7283a489ea757e3dede6b82334b2ceee2a28a98a8dd3b269a2f8bba02e2f0e6a169712e5ff890dcb7bec2feeedef496143bde90ad587771c87a12726
diff --git a/dev-games/freecell-solver/files/freecell-solver-5.6.0-cmake.patch b/dev-games/freecell-solver/files/freecell-solver-5.6.0-cmake.patch
new file mode 100644
index 000000000000..322482ce6dee
--- /dev/null
+++ b/dev-games/freecell-solver/files/freecell-solver-5.6.0-cmake.patch
@@ -0,0 +1,19 @@
+Package wants to install all kinds of doc files. It does not help us.
+
+--- a/CMakeLists.txt	2019-09-12 23:04:19.628187073 +0200
++++ b/CMakeLists.txt	2019-09-12 23:06:38.928231282 +0200
+@@ -858,14 +858,6 @@
+     INSTALL_MAN ("${fc_solve_manpage}" 6)
+ ENDIF ()
+ 
+-INSTALL(
+-    FILES
+-        ${docs_to_install}
+-        "README.win32.txt"
+-    DESTINATION
+-        "share/doc/freecell-solver-5.6.0"
+-)
+-
+ SET (dest "include/freecell-solver")
+ INSTALL(
+     FILES
diff --git a/dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild b/dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild
deleted file mode 100644
index 159cc4f198b0..000000000000
--- a/dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
-HOMEPAGE="https://fc-solve.shlomifish.org/"
-SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pysol_cards[${PYTHON_USEDEP}]
-	dev-python/random2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-perl/Path-Tiny
-	dev-perl/Template-Toolkit
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt || die
-
-	python_fix_shebang board_gen
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBRARY=OFF
-		-DFCS_BUILD_DOCS=OFF
-		-DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild b/dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild
new file mode 100644
index 000000000000..681a115f0356
--- /dev/null
+++ b/dev-games/freecell-solver/freecell-solver-5.6.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
+HOMEPAGE="https://fc-solve.shlomifish.org/"
+SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="tcmalloc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pysol_cards[${PYTHON_USEDEP}]
+	dev-python/random2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	tcmalloc? ( dev-util/google-perftools )
+"
+DEPEND="${RDEPEND}
+	dev-perl/Path-Tiny
+	dev-perl/Template-Toolkit
+"
+
+DOCS=( README.html )
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_prepare() {
+	sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt || die
+
+	python_fix_shebang board_gen
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBRARY=OFF
+		-DFCS_BUILD_DOCS=OFF
+		-DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
+		-DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index e722c01389c9..8436d5c3773b 100644
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index cd25de2091fa..eb7ce95f3b53 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -1,5 +1,3 @@
-DIST go-bindata-0_pre20151023.tar.gz 17860 BLAKE2B 281a4ccbac82af31017728dd309cc32852a959cbe4e468bb2cf7e05266de748a22d062d8863350caaa713a28efb3c0dc7543abcf1fd1812543364ed6ff166c65 SHA512 ed1d2fd1c5a833b6efdc731eb43f72fc072a701c447a926ad6c1f9be3c0f1ed92c689639d02a288230a49d53795f41092deab132389871a5b9f79abdc525fc43
 DIST go-bindata-1.0.0.tar.gz 17871 BLAKE2B d461d863f099c705dbee5d32b188f1fde369c6e7497dfb8a1434d54f1c7bbf462357956960671f85813ce63fe1a3744578fa7a474362149aa115ac7c36a22fc8 SHA512 e6b46f80e39ad5463d67289fcae102eb7c18e8390daee99e495a94c97ed35df390dbfa6a36e11f43663ce38f05cafafdb5b3dd2896885fab7fd1f33e865d82a4
-EBUILD go-bindata-0_pre20151023.ebuild 623 BLAKE2B 201b739fe6392d5fd564e0cff5b31b06e956b8d19580e7b72702262e1a12b698deb47a46153a90cf959be7d4aaf8224b3754b8e475deb4f22c71490c4bd94991 SHA512 da03a7c0182681abf10f8eb8b4a4baf45dd9277bb1e35319ccda89fbc39793ced0cc9d4f66744867130d8b3d18c1e4f1550e576ed9058bbfe5f69f9fda571241
 EBUILD go-bindata-1.0.0.ebuild 547 BLAKE2B 16e8db22c36cc256db6fa7525fa7f1ce604cb28afa4ddb40397b3f6c6a38611af4a897017cc235906fc1b5eb436d0618fe2e642d8c087384db74a8b257f2e989 SHA512 32c2a16bf31e6afd3438a69240cc6d2c03920d9fe6e2333f3c7fa89579e8ba80c0a70b52e8c650638f36d4dd61f52e64b7b20db2cd8d892a591ee722f2cd28e0
 MISC metadata.xml 251 BLAKE2B 78b1289c2746a6805eeb73edc062b5309b69d11585038e4c26d863ad9c3b202b9ce1589a97e1e41f4b1c2472b45456dc0a555fd22387ffeea319d1fb3806c229 SHA512 d241954967f8571d47611771a1655e0719a0cdf7c339df0a8b7d184b01fb773a8e311465f18afcfe9dffcdbff427e1165bafb0aaca0d2837b2d1b55729b1b6cc
diff --git a/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild b/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild
deleted file mode 100644
index b70a94ebc66c..000000000000
--- a/dev-go/go-bindata/go-bindata-0_pre20151023.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/jteeuwen/go-bindata/..."
-EGIT_COMMIT="a0ff2567cfb70903282db057e799fd826784d41d"
-ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64"
-
-DESCRIPTION="A small utility which generates Go code from any file"
-HOMEPAGE="https://github.com/jteeuwen/go-bindata"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="CC-PD"
-SLOT="0/${PVR}"
-IUSE=""
-
-src_install() {
-	GOBIN=${S}/bin \
-		golang-build_src_install
-	dobin bin/*
-}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index c729fa2fc84d..cb095cc4f206 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/language-docker/Manifest b/dev-haskell/language-docker/Manifest
index 21b1b0e7314c..a24b768db745 100644
--- a/dev-haskell/language-docker/Manifest
+++ b/dev-haskell/language-docker/Manifest
@@ -1,9 +1,5 @@
-DIST language-docker-6.0.1.tar.gz 33814 BLAKE2B eea7d16895774435ed4b6dee3df48acaf032a289b70d9ac00efa057cb3d947c6de64df5b8e60cb4ae4f876e26091d40df78469dcbb2e3e9d54969aa7280c3ef7 SHA512 a50675309b177d2e2ba305046ba60cb0f9a071cc27c1483d9d244ab89c747be5a7ba022579cca94689e623210e2f518df0e59c05ffca3a386a18e981f4971cf8
-DIST language-docker-6.0.3.tar.gz 34438 BLAKE2B 1d324b1519583c4feec1d9dd132c977e3fed1d6dd2d8fef7e4a9dc15dc1a294294eaa0831cb97bbb2d22d0bf178195ba0e834e262d1ed3fcd4d9b118a3b474db SHA512 912f24db37cc2f2feac74fe89205e4538d4bae6426cf626cd090a7d38e451331db43f69e87c58b9f168145a4b0f5d90b203fac2c5165c834729099d6b47bc242
 DIST language-docker-6.0.4.tar.gz 34481 BLAKE2B 18819f6f4e733232183a92e3c56ecb41e884ac7d5dc86a54c34a7bb6e66be1f260f64c042a9b29f4fff7dee28622f0eaed65a60696d603ed5afcdb396aad9cea SHA512 a97e931c11fd76362f1e9efa2605800e4a43c9a1c42cc09e829bec9be91010925c1542806c4e9daef4c887a38c9e92383fab14463615dc0b1bd11e5e3a1ef808
 DIST language-docker-7.0.0.tar.gz 34576 BLAKE2B 3a8c85abbdc0f08bf1a6931bb3ca8d513949961591cefa331a3d3ca4c3b67faedebbb8f7fea9c9e7b1b3f786ee87161ec6f7ca1e66e81061ebf92fa71826b4ae SHA512 35763ceb0e3afb2c292b53017ee14e4a714fd3eb433c2b765445d01f507f556e1760b49a6bc2c124b07d4b6c32cd86641ed5a57265e6854cc7129972d6045d71
-EBUILD language-docker-6.0.1.ebuild 925 BLAKE2B 7e2dd861432d37f7accf3970265ac64ea63a3e41ad9b97613175ba3385958da82c34ba26074ebb85e097946479f698aa76b8c6ec8a234d704ebd0a1dc3d7e771 SHA512 5e63984863f76640f96d332448c6b58c324d58d86fbc81f687e0fc4c3d8de63471331b99851abfe753a607df4d693e78f9587f9e4e21c62759c0e4b5ff4fe273
-EBUILD language-docker-6.0.3.ebuild 925 BLAKE2B 7e2dd861432d37f7accf3970265ac64ea63a3e41ad9b97613175ba3385958da82c34ba26074ebb85e097946479f698aa76b8c6ec8a234d704ebd0a1dc3d7e771 SHA512 5e63984863f76640f96d332448c6b58c324d58d86fbc81f687e0fc4c3d8de63471331b99851abfe753a607df4d693e78f9587f9e4e21c62759c0e4b5ff4fe273
 EBUILD language-docker-6.0.4.ebuild 925 BLAKE2B 7e2dd861432d37f7accf3970265ac64ea63a3e41ad9b97613175ba3385958da82c34ba26074ebb85e097946479f698aa76b8c6ec8a234d704ebd0a1dc3d7e771 SHA512 5e63984863f76640f96d332448c6b58c324d58d86fbc81f687e0fc4c3d8de63471331b99851abfe753a607df4d693e78f9587f9e4e21c62759c0e4b5ff4fe273
 EBUILD language-docker-7.0.0.ebuild 922 BLAKE2B d5cf310483eff86acd0aa4be62eb709736c49e0c80c1b2b382c6d906dc354e79afe731c428b057870cfcc72b639b42b17b0b9fb6d89df0c977cf2da00347e59f SHA512 fb2d057b6b2b9db73409b93969156a5e8262b07c10affb37081b1a4d667dfc8e34466086ebfbdf3758438ddaf7bd0bb7153f3df703414137eb15bcf53ce2638e
 MISC metadata.xml 511 BLAKE2B 3ea9c78a66dd9b58cfc98817b59ba299e994adac70721cd1bb14c61b4859d5f73cb08e5bd451f2703be67cb2dd47243b538b801fa006339a7699d9806665717b SHA512 a654329d707ce888ab55e0d1b50bb3ad7f87dbff7f423fc72f7d5eb3bac3dd911fe88dd41ee0c0f7dbd1a92ec6f1a8f27aaebc4dc42830e1ab9eb1d70e2aa75d
diff --git a/dev-haskell/language-docker/language-docker-6.0.1.ebuild b/dev-haskell/language-docker/language-docker-6.0.1.ebuild
deleted file mode 100644
index 2692f0261474..000000000000
--- a/dev-haskell/language-docker/language-docker-6.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile parser, pretty-printer and embedded DSL"
-HOMEPAGE="https://github.com/hadolint/language-docker#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/free:=[profile?]
-	>=dev-haskell/megaparsec-6.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/prettyprinter:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/th-lift:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/glob
-		dev-haskell/hspec
-		>=dev-haskell/hunit-1.2
-		dev-haskell/quickcheck )
-"
diff --git a/dev-haskell/language-docker/language-docker-6.0.3.ebuild b/dev-haskell/language-docker/language-docker-6.0.3.ebuild
deleted file mode 100644
index 2692f0261474..000000000000
--- a/dev-haskell/language-docker/language-docker-6.0.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile parser, pretty-printer and embedded DSL"
-HOMEPAGE="https://github.com/hadolint/language-docker#readme"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/free:=[profile?]
-	>=dev-haskell/megaparsec-6.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/prettyprinter:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/th-lift:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-	test? ( dev-haskell/glob
-		dev-haskell/hspec
-		>=dev-haskell/hunit-1.2
-		dev-haskell/quickcheck )
-"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 81785de1c6c0..6d9f71ddc5a3 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 777f6a5b9105..4c3bce2f1b6a 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -5,43 +5,15 @@ AUX epmd.init 534 BLAKE2B 34230f6c6edaed48123369df02f5fb71deb90491ebbb6d17984220
 AUX epmd.init-r1 457 BLAKE2B 1aa451203bf629a1d4f752ab87a91c0a27ade1a74f8edbd69b9dfe7d667bf68e4d41fc369f4aa1b67e7773ee96882cc0c95721a53b43122abf25b69600009527 SHA512 e0e507feae94bd3b6897c46c67c5a74a28771c3c9c367662d297faef52a1336c202c532a0c04f84464bd1829076bd8272244cd018e0badaa4f81872de00d89d7
 AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab557e3f71cab48baf59b5a9533a4dccb2cb61a4434e3a51d44eae06010718dbf9a732d605c40f73 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28
 AUX erlang-20.3.2-dont-ignore-LDFLAGS.patch 1337 BLAKE2B 7272c96b1ee947a98f0a5b1f3bd1fce11e8d02f121348208196ae60af965dfde7fac15263ca0a58df96dff21785a1a63f4fc10f7e7e10c0f68a618e760e5ffd7 SHA512 59d39b1680ac3406e4c37f81a0207588208a873279920258235af54700f80bd67584c3e55c9278f893cd7813573bbec8b13195e47ba00101fc578d5a2b40fa34
-AUX erlang-21.3-lto.patch 5277 BLAKE2B 32bfdda0c1deb8bd7d2403ad6810b6f8cd8bf6ec3bfd54d02ab4637d800ef0fe77b4da883877ba3c08a9c24596c7af09069aab5449fc22627d811ccc6257f18c SHA512 fb3460e4d881e8c9bc256840d62f8ba988456abc581c01e2b8c43d1302549cdb59b179f613f65139bd89b6e1fb8395e74472ba0a000ff0dcf8af84c4593dac03
-AUX erlang-21.3-pgo-loop.patch 420 BLAKE2B e0ad61bd592c7a3ddf2410ecbcd38a3f72ad34a58223af9b73eba586cc1970b289886c71a7d7e23a69318d86bd2bb220c21bb4b7e5db1984586ed5bd81990159 SHA512 97f7239b729e9f809a4b6226a4e69a833db94cdd4f5d937b26b33ae432663ceab1c0bab7c3168ca729bd8eb3bb5ead2fbf0510ef88bb124a44541d6b18f0d0f3
 AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24
 AUX erlang-add-epmd-pid-file-creation-for-openrc.patch 2359 BLAKE2B 54a3148144bcbb9a4dd68e89fd609a09a9e9a0a9c7a71a4e9eaafc12632e23da44411d72c1590e482fda73d5464b1071386aa564b8d9a73b032b62c474d20570 SHA512 301aed1980a8638a8cd069ecb6e968e5c15d3e82b38580861a0ed6a2fc7a9505d99525a53a6ac19c2d9b786703aac6bf51751275a6a7fafd8f530c07ea0c7e8c
 AUX erlang-custom-autoconf.patch 398 BLAKE2B c99d3bc311bbca379786b9e4d29ee4983354a069508328c95e99a62bdfb8d15dbf372124acdf66c603f64acd9cabeb146e5bd5ec1e1ffd09af125fc4a076abdc SHA512 b82e09d0cd686c07b9d370e397edda10bd96435e70f4a0995ec06638e237e3b8fd0e1195ecc036b51367ffa36a0b4db5a2b1fe5d389a0b97e19d32aec51755d9
-DIST erlang-20.3.8.10.tar.gz 53511918 BLAKE2B 5f430bda415a5b59e9dec3222abe311264277ee91b2e7e9e69dba1016169492dc621df314c057e39f16b7bfe01686f405b9ccde362f84c5c2f0ffde68a923ffa SHA512 0d5ab27d17ff203d2c719fd5a03d843e3046037240e97ae9ad59d9f0690cf46cfb5fac2569590ce68f62169b1b2b2bc693e9a9b82f6ab0371693c5324bd3288b
-DIST erlang-20.3.8.20.tar.gz 53523729 BLAKE2B d245f0bd80d8ee41b8e832b30864d4539f5333a84d8a74126adcc99203a7646af933d6c80efdbb1f88b955107a7e637487c00ed951baf767f09082c41a8dc8eb SHA512 463c9563ed114f7a4d0364640f7c0e20e234b443d4b9d72687113fbbf106d52b07adad890a58473101311dcb34d072cb27b7ce871c61edc38ba2bd65024fa9cc
 DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c573966e7565d98aa6ba986ce42eb955a46130b9f33dbb415f48de5c179b308a8b06b345a844afcb2700f7e3f257f27e SHA512 dc11aace126aad5411b0d583579fe95a7263be328612fdc9f9c02d917aef7ea7a128b1e54ddcf7a52232980d2c81fc8e90ae5a8806ee5ae6ea97f00a9cf3faab
-DIST erlang-21.2.6.tar.gz 53956256 BLAKE2B a39e57df65afef7a746ef5b6feb6041621607e9209fa3e81f91be31a4b736238c7fef73db436d3ae57ab3cee856531684d2ffb8ea5bc608b4166c81d1cd8a3ea SHA512 0d43a5eb6e9d01e2997b7c82a15b2bd7483a0623f86f8aaff3ec59b5da6aa2cd8135d48cf66233e28c780473f83b90ad56c076374273cefa79b79622e57027f9
-DIST erlang-21.2.7.tar.gz 53954838 BLAKE2B 1f81e439a9f6cc6f560791043c6f84847fa1dd71a94b0195e1141d805e9c327b88afda233dc426215679107661b22c5b93448b7d1a1b55af5669e3fdd6753356 SHA512 2a5cec5b9e0ae7b8f53060c95ac1d7a61dbf7b591199c7bc2d527d643dd2a09484ae27055bf3135fb32a69500dbbae8ae95258cea22f2c100ea9f892b87715f7
-DIST erlang-21.3.tar.gz 54021160 BLAKE2B 1a65fa67df3a7227abb1fd99eb5c77a60cf5e156dd54b2dfca89befeb85c6eb30ab8afec1ae1d54ac57b574b3b6a915e758b93e89234f668478cf7cfd933cc43 SHA512 7001b6a37597e8d78b9b071d517e7be449592d7d7f9f8bf6f555dd3ed58caec429644adf52d9c5669c2e06dafc61149544a730f3dae138a8c25da0f61d06ba83
 DIST erlang-22.0.2.tar.gz 54805264 BLAKE2B d30fd8a7a4ada892f4b8e14c82ab7e20f77caa78573774d0b591a1abcc26c63ae5e0a65ae5c30f0f5cc8a6e4c5e13d167929eb049cbb172fcf2899d61f5ec8dc SHA512 6dbc3705a8b9ba5c8b6694e256c226c882521d87c3af4deb9212c33fff83b510191ea547888d15ced17dd66857fb1d7ba72d9fbd54a5c63091aa86680b960436
-DIST erlang_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4
 DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
-DIST erlang_doc_html_21.2.tar.gz 32798331 BLAKE2B 7c0606186caa36fe9ff6099a11930cf457f5f67dc276d5d75bd4c2934943e0adaa71658d701b5ef9102063db07a67fd66c5fe0c74f4839ac24f96d845a9e8902 SHA512 a7be67ff704aee78377b986e2425691937a1d53253ab3ec520eb689fcb7cf7595dae8026dc2b5dab73e25ae2ae76f8458a034eb0dfeb320ddc61306dcf52f3f9
-DIST erlang_doc_html_21.3.tar.gz 33069226 BLAKE2B d2a9b3154b1b91d15864d9398e145ce18c2a9a409e01b12d726946836939a5a7dc80221da9ec493471f97d854e9fb385ff589f23a6ab584188d55a423c49c69d SHA512 eaa3bd14717cf5f27bdc605b215d20b63126c4e0b7201c28e3f59dd560bf90c239d79bf028e1862318db511135ba7237b27a2f701964d14df3e7763a73a28a34
 DIST erlang_doc_html_22.0.tar.gz 33737075 BLAKE2B f49aba36e9b84e5bc4422052e33aab5cb407dfcf2086ddb8a2370003dc63842acc79a67d9d453ee9e59d7b69416b23527e2d9f564b2d8a58d4c46bc3a93881c4 SHA512 89229a97fb5c78246ce9fa6a2d23446c6c3c2de15617911739e133b7e58714a91b1360af64bf61659d96808a816d84e4c410f8c8efe1e544930f88d73242b6e7
-DIST erlang_doc_man_20.3.tar.gz 1339710 BLAKE2B 00aba848940914b3d98f9500b8201b0679d7d63d066cee296c8fbb399f132340b989f3cdcdd6c45a46e432efdb7c40c39d8ab4f3dbd64570316d649efc9faed1 SHA512 22c398ce3b42c7ef8abec1db85745eeb4d8804bc679d40b6a786fdc40dc241e43b5551df5d1eccb3ca8d4a64b833bf6663e77044f4564bb49cf67c4b74c5ea25
 DIST erlang_doc_man_21.1.tar.gz 1317726 BLAKE2B 5e5c2b77a41da6ab9ae1264ba5824a9f3bda6d3b7a824b372e01356888db437ed9e45bf987d678aca3fd8d0f0e6dce25080c7a2aaa4e061936f1e6ac4717e843 SHA512 94c6191ba9f42bffeb398e865026fbc79f3b233389c7d471f0c680799aa3669e97ab5305cd53f26d6525aed33d738ebfc4eb79a8f1a0b29dc4b79a2a37a29a4f
-DIST erlang_doc_man_21.2.tar.gz 1325975 BLAKE2B c46e0f8a9198f4deee46e3f845cfd5bb6f7cf306ecf3165960add0e3d09beb1ac9221d630c10d3d7d3ff874c7579db9ff04b3c5c1251a4bdf102ce573db6f6ea SHA512 adfb62815ced0010585772f2de4ca8fc4fa513929881ed5dc5ec5367ff279778f4f69fffcb05b52ef9bf3a6d79c3999c7343fafd9920a9a5570f8a09ef6b50cc
-DIST erlang_doc_man_21.3.tar.gz 1332545 BLAKE2B 964c8031203d384053366ec27a7731af5c257afee44730f98a081e387e4ca08b220db8880c8939f4257acbed4c093527459615c64ca165d8218880e8cd5f6c11 SHA512 24e012a30436d63cfef10d53696b03cd5564ca0988850b5d497f526d7afed33354824f04ce937d43063d8a5745e427380920d50a2fe9b67adb84195569dc65f2
 DIST erlang_doc_man_22.0.tar.gz 1347830 BLAKE2B 52fd7adf46c9727dba70edc73150b2c7e9b96728ccb0af6d717ab9881bcb38fd98cd1d9d8ff9b28688889cf162230dc0f054377446a21d9114ad70e706aef863 SHA512 f980439d21aea6e1487afbd2e22a1a909cee40bd2464569219159bd38048d7d8d7adc9c5c639c04d5fe3160d090b51f2fd33b3ef479969731ce1861338278e41
-DIST otp_doc_html_19.1.tar.gz 34624316 BLAKE2B e3a5edfe1645d58e4cbd6537c775190716eed7613610ddfa112692fdbace2077b1ccdf7df5987973d2ae4ef529e4ec45d44a240265157816e2a15dabe9232b83 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8
-DIST otp_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4
-DIST otp_doc_man_19.1.tar.gz 1405580 BLAKE2B 93b79b88f81a00d7cbb934dbac811c6ea0ec59413e073fe613038eab71087908ed4e4bcbb6c8ed2f0c5bdd03ab4a570f20c4460f233c040ae0c4238e1cfa097a SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334
-DIST otp_doc_man_20.3.tar.gz 1339710 BLAKE2B 00aba848940914b3d98f9500b8201b0679d7d63d066cee296c8fbb399f132340b989f3cdcdd6c45a46e432efdb7c40c39d8ab4f3dbd64570316d649efc9faed1 SHA512 22c398ce3b42c7ef8abec1db85745eeb4d8804bc679d40b6a786fdc40dc241e43b5551df5d1eccb3ca8d4a64b833bf6663e77044f4564bb49cf67c4b74c5ea25
-DIST otp_src_19.1.tar.gz 68103074 BLAKE2B 48e06ce5998929a8ca9804e51f07a4153e7fb1c8b1b4b1b60132e255c29c475534ce018a7902ed29b696b783a21daa73d1778435aada1a77064ab46e915af87d SHA512 bd1c243393c867c91768367613aedb40d56889add149390c81f22e022e76b716d6e9a4d5db7e6477ceb1216c26c18c962abdfd8215a87420758f5ef2063b9714
-DIST otp_src_20.3.tar.gz 88170904 BLAKE2B 3f92641e4eb4079572c0cc1cbc6ba1f56977efd182efcef6c466a0ac6232e18d9481823624cdd49a866feb38e96db6150f40927f25f2daaa64fe4aafd02089b4 SHA512 4169e2e653055c62dd66e214dcab577b49cadb8328dcc43adb8a2d44850b12c02db8323992c21852409697c5a48493068316417be9d97519b039a8f1cde143da
-EBUILD erlang-19.1.ebuild 4479 BLAKE2B 671c00139feb254a2d053abd6006504aac816ad56b68291653f663d482138c4b8672b0893ef4e7d37f1610a581aa07695a722fcefa4c233523ab459b9adb292d SHA512 61ed8db5368a33c031588f896ea7f62cd770567dd61e8dbbb1793e4020cc540877e2823291a90227a9bc55811f7057448e49becdba792c600bd5d6168dd3af18
-EBUILD erlang-20.3.8.10.ebuild 6713 BLAKE2B 99d8e6c2e71fc01c815cafb7cdb2b6aa730f3ff07d174d82ee1ab44bfad140395fa6c5e0eb121d32ccd6c98f6bd37a5b384dd3cc02215fc96f229d3bf220f8f0 SHA512 e718298bb175bf3c7fc2828a603d504b474294258b46c6941a20a367e77b460e3f396d425b805c69a310aa428ce3477e8af38c40ea1abbc026c4e5488f8c1a44
-EBUILD erlang-20.3.8.20.ebuild 6713 BLAKE2B 34ca2b5c2e31d4bbc742d5e06320695d010fb3f76a785f2a4ec111c90d3ca9b315a881f4df02fd9fbd5ed28f1b6d9516c79bb6156b053d47dd9fa6bb74f68e84 SHA512 6247240df690ae70699f443528b30b1c96581b6a50b08da7ae06c4fb7bfcf9fa5f92ead01fbf84556d6a452a00d3c49b0a502d8dc762cea0eb8cdda000da5811
-EBUILD erlang-20.3.ebuild 4826 BLAKE2B 80ccf3e15c5cb5fc585c4b014b8093ce2306222d6b32c9653aab92e3bdcba2d66e9cfc18b6132ec0a1907495acb13cfa1e5e0f8baa3d12b0a5a8975ea0989e16 SHA512 41682162335ded8341591393fff4bd35aac71e49418a36da6e3c4b41066a39cf0c711ab5a73a61811ee82fb365db15fbb4cbd466dc985a58262303694c2f4cb5
 EBUILD erlang-21.1.1.ebuild 4428 BLAKE2B 06350debf91e3d7d376579d6444377fc019b22826f8d4bd6dcc3c70a7a92d2a41aebe1ba8998e241f35b0b149430541cedb0a214a5b8c191cef50d3d9c57a2c4 SHA512 c8568a460b18fd5c816f3cd3f654bb66298f0e5cf9b08d7dd6b80a6f8ab1ce141c704ac1eafef684cdd6c757af974fde0f8fb75e5a9e0a2a7f6364cee4582281
-EBUILD erlang-21.2.6.ebuild 4434 BLAKE2B d0a694be6cf620a6034235d8fa0a8bbbc9a419ba44ade3d3c946e2af662aa11fb26c1fb6b58d4541c805bcb979c8f8390374a1f423c54101f180d803e5e4a059 SHA512 734b4ca60ed34ffabac86fc4f5bd5d32c8b22ded33a12bacf9c76cfbce62590a4e8faba2ec0344d69ec6d58613ee02e9f73dbdb8eaf927d452f97421b01ea0ef
-EBUILD erlang-21.2.7.ebuild 4434 BLAKE2B d0a694be6cf620a6034235d8fa0a8bbbc9a419ba44ade3d3c946e2af662aa11fb26c1fb6b58d4541c805bcb979c8f8390374a1f423c54101f180d803e5e4a059 SHA512 734b4ca60ed34ffabac86fc4f5bd5d32c8b22ded33a12bacf9c76cfbce62590a4e8faba2ec0344d69ec6d58613ee02e9f73dbdb8eaf927d452f97421b01ea0ef
-EBUILD erlang-21.3-r1.ebuild 4511 BLAKE2B 2c6845a8bb9ed75313108397a7231188904f27c92fb711da841c04a57bc0559724b6f9b0c761149f8801efb1d778f55e4f3bcf5576a05edd7367b788372b65e8 SHA512 f6ef4c7613150745520302652d4a322e7a333e480c9b41838b0b83545ba6b8d89691208fe18482ec5636de3d7c0e9a91af490ee52bebe14e475f032a4de88c0b
-EBUILD erlang-21.3.ebuild 4434 BLAKE2B d0a694be6cf620a6034235d8fa0a8bbbc9a419ba44ade3d3c946e2af662aa11fb26c1fb6b58d4541c805bcb979c8f8390374a1f423c54101f180d803e5e4a059 SHA512 734b4ca60ed34ffabac86fc4f5bd5d32c8b22ded33a12bacf9c76cfbce62590a4e8faba2ec0344d69ec6d58613ee02e9f73dbdb8eaf927d452f97421b01ea0ef
 EBUILD erlang-22.0.2-r1.ebuild 4140 BLAKE2B b490b4dd9d3f9bcd1104a2e87f826d6e1063bb301bdde4523b906e07f52b0e694fdc6e50d53cb09c3569555b2db8ffd49dd4f8695303de37c2dda9860e3c5e24 SHA512 6220b41788af18e7069f5e06a378857e1829e93f213f95d0f379c2d44523fff18d9383cb5ffdeb226999f980c481bc4b83d56473a1f06de1f58a0fa42f6e7420
-EBUILD erlang-22.0.2.ebuild 4097 BLAKE2B 62317e5f3a47b4c4bdfff3e0c1a736c1f55bd79bba19e8d90ac952c8f3c5596336add108793d535dbc492d24e7189d0677bd42a982c4cbaf06ec5e50f39451bf SHA512 ae5d0a24c628a4de58de10f4b7781d6d98326fb929f426b88ab8249fb8c7b05ec6616aaf26e99223df091cd4a6de4061b68a04c51626359fa391bfc808bf4c4b
-MISC metadata.xml 767 BLAKE2B 7b4e24e035cc581418aa0509baad9913b3abb195414f2e91136510a5910b69a186853b352557f1e49280aae7871cc2e033b6e2ea6f22b3b73c88d78853937309 SHA512 c816f414d07fac9433a22bdfb083db600200f45cc0fcc0eb06389056df4ccdfa31767ff0a25b8f7caf1b17dffc303ff3f766a642cfd263c0c723623c31c5a716
+MISC metadata.xml 598 BLAKE2B 96580b32a3828261a05374d0559fefc496f8e9ac272e7b5886cc40c1540c378a5931f433a3526d433286c90a376fc98baab9abee390010c419cdfa196b48d65a SHA512 63aa9d7744c3f609ecf3069972959c1c1c1f7d5f32ff79d78c7f438fda88f2f35774b2761ee9cb714f59013465e8f9f70f493bd93225d53e079c39b782ba34e4
diff --git a/dev-lang/erlang/erlang-19.1.ebuild b/dev-lang/erlang/erlang-19.1.ebuild
deleted file mode 100644
index de5385b19eec..000000000000
--- a/dev-lang/erlang/erlang-19.1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER="3.0"
-
-inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="http://erlang.org/download/otp_src_${PV}.tar.gz
-	http://erlang.org/download/otp_doc_man_${PV}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
-	sctp? ( net-misc/lksctp-tools )
-	tk? ( dev-lang/tk )"
-
-S="${WORKDIR}/otp_src_${PV}"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	epatch "${FILESDIR}"/18.2.1-wx3.0.patch
-
-	use odbc || sed -i 's: odbc : :' lib/Makefile
-
-	# bug 263129, don't ignore LDFLAGS, reported upstream
-	sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
-
-	# don't ignore LDFLAGS, reported upstream
-	sed -e 's:LDFLAGS =  \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
-
-	if ! use wxwidgets; then
-		sed -i 's: wx : :' lib/Makefile
-		rm -rf lib/wx
-	fi
-
-	# Nasty workaround, reported upstream
-	cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
-
-	# bug 383697
-	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
-
-	cd erts && mv configure.in configure.ac && eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && need-wxwidgets unicode
-	use java || export JAVAC=false
-
-	econf \
-		--enable-threads \
-		$(use_enable sctp) \
-		$(use_enable systemd) \
-		$(use_enable hipe) \
-		$(use_with ssl ssl "${EPREFIX}"/usr) \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_enable smp smp-support) \
-		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
-		$(use x64-macos && echo "--enable-darwin-64bit") \
-		$(use_enable dirty-schedulers)
-}
-
-src_compile() {
-	use java || export JAVAC=false
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs
-		elisp-compile *.el
-		popd
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
-	local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
-	local ERL_ERTS_VER=$(extract_version erts VSN)
-
-	emake INSTALL_PREFIX="${D}" install
-	dodoc AUTHORS README.md
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-	dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${ERL_LIBDIR}/Install"
-
-	for i in "${WORKDIR}"/man/man* ; do
-		dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
-	done
-	for file in "${WORKDIR}"/man/man*/*.[1-9]; do
-		# doman sucks so we can't use it
-		cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
-	done
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	dodir /etc/env.d/
-	echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
-
-	if use doc ; then
-		dohtml -A README,erl,hrl,c,h,kwc,info -r \
-			"${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
-	fi
-
-	if use emacs ; then
-		pushd "${S}"
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
-		elisp-site-file-install "${T}"/${SITEFILE}
-		popd
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-20.3.8.10.ebuild b/dev-lang/erlang/erlang-20.3.8.10.ebuild
deleted file mode 100644
index 0e30f8b86d26..000000000000
--- a/dev-lang/erlang/erlang-20.3.8.10.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
-REQUIRED_USE="dirty-schedulers? ( smp )" #621610
-
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sctp? ( net-misc/lksctp-tools )
-	sys-libs/zlib
-	tk? ( dev-lang/tk )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-		virtual/glu )
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-		"${FILESDIR}/18.2.1-wx3.0.patch"
-		"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
-		"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
-	)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-# Taken from the upstream build script, build_otp
-erlang_create_lib_configure_in() {
-	local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
-			 lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
-	local sdirs=
-	for lib_app in ${bootstrap_apps}; do
-		case "${lib_app}" in
-			lib/*)
-				if [[ -f "${lib_app}/configure.in" ]]; then
-					mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-					app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`
-					sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die
-				fi;;
-			*)
-			;;
-		esac
-	done
-
-	local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	sdirs=
-	for lib_app in lib/*; do
-		local is_bapp=false
-		for bapp in ${bootstrap_apps}; do
-			test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }
-		done
-		if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
-			mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-			app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die
-			sdirs="${sdirs}    test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"
-		fi
-	done
-
-	local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	rm -f lib/configure.in || die
-	sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"
-
-}
-
-# Taken from the upstream build script, build_otp
-erlang_distribute_config_helpers() {
-	local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
-	local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
-
-	local aclocal_master="./erts/aclocal.m4"
-	local install_sh_master="./erts/autoconf/install-sh"
-	local config_guess_master="./erts/autoconf/config.guess"
-	local config_sub_master="./erts/autoconf/config.sub"
-
-	for dir in ${aclocal_dirs}; do
-		"${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die
-	done
-
-	for dir in ${autoconf_aux_dirs}; do
-		"${install_sh_master}" -d "${dir}" || die
-		"${install_sh_master}" -t "${dir}" "${install_sh_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_guess_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_sub_master}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Determines which directories to recurse into with autoconf
-	erlang_create_lib_configure_in
-
-	# Move local autoconf files into the neccessary directories
-	erlang_distribute_config_helpers
-
-	java-pkg-opt-2_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && need-wxwidgets unicode
-
-	econf \
-		--disable-builtin-zlib \
-		$(use_enable dirty-schedulers) \
-		$(use_enable hipe) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_with java javac) \
-		$(use_with odbc) \
-		$(use_enable sctp) \
-		$(use_enable smp smp-support) \
-		$(use_with ssl) \
-		$(use_with ssl ssl-rpath "no") \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable systemd) \
-		--enable-threads
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
-	local ERL_INTERFACE_VER="$(extract_version lib/erl_interface EI_VSN)"
-	local ERL_ERTS_VER="$(extract_version erts VSN)"
-	local MY_MANPATH="/usr/share/${PN}/man"
-
-	[[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version"
-	[[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
-		docompress -x /usr/share/doc/${PF}
-	fi
-
-	einstalldocs
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-
-	if use smp; then
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-	else
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	fi
-
-	## Clean up the no longer needed files
-	rm "${ED}/${ERL_LIBDIR}/Install" || die
-
-	insinto "${MY_MANPATH}"
-
-	doins -r "${WORKDIR}"/man/*
-
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die
-	doenvd "${T}/90erlang"
-
-	if use emacs ; then
-		pushd "${S}" &>/dev/null || die
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-		popd &>/dev/null || die
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-20.3.8.20.ebuild b/dev-lang/erlang/erlang-20.3.8.20.ebuild
deleted file mode 100644
index 22c4fe4d937a..000000000000
--- a/dev-lang/erlang/erlang-20.3.8.20.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
-REQUIRED_USE="dirty-schedulers? ( smp )" #621610
-
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sctp? ( net-misc/lksctp-tools )
-	sys-libs/zlib
-	tk? ( dev-lang/tk )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-		virtual/glu )
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-		"${FILESDIR}/18.2.1-wx3.0.patch"
-		"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
-		"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
-	)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-# Taken from the upstream build script, build_otp
-erlang_create_lib_configure_in() {
-	local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
-			 lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
-	local sdirs=
-	for lib_app in ${bootstrap_apps}; do
-		case "${lib_app}" in
-			lib/*)
-				if [[ -f "${lib_app}/configure.in" ]]; then
-					mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-					app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`
-					sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die
-				fi;;
-			*)
-			;;
-		esac
-	done
-
-	local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	sdirs=
-	for lib_app in lib/*; do
-		local is_bapp=false
-		for bapp in ${bootstrap_apps}; do
-			test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }
-		done
-		if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
-			mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
-			app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die
-			sdirs="${sdirs}    test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"
-		fi
-	done
-
-	local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
-
-	rm -f lib/configure.in || die
-	sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"
-
-}
-
-# Taken from the upstream build script, build_otp
-erlang_distribute_config_helpers() {
-	local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
-	local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
-
-	local aclocal_master="./erts/aclocal.m4"
-	local install_sh_master="./erts/autoconf/install-sh"
-	local config_guess_master="./erts/autoconf/config.guess"
-	local config_sub_master="./erts/autoconf/config.sub"
-
-	for dir in ${aclocal_dirs}; do
-		"${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die
-	done
-
-	for dir in ${autoconf_aux_dirs}; do
-		"${install_sh_master}" -d "${dir}" || die
-		"${install_sh_master}" -t "${dir}" "${install_sh_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_guess_master}" || die
-		"${install_sh_master}" -t "${dir}" "${config_sub_master}" || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Determines which directories to recurse into with autoconf
-	erlang_create_lib_configure_in
-
-	# Move local autoconf files into the neccessary directories
-	erlang_distribute_config_helpers
-
-	java-pkg-opt-2_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && need-wxwidgets unicode
-
-	econf \
-		--disable-builtin-zlib \
-		$(use_enable dirty-schedulers) \
-		$(use_enable hipe) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_with java javac) \
-		$(use_with odbc) \
-		$(use_enable sctp) \
-		$(use_enable smp smp-support) \
-		$(use_with ssl) \
-		$(use_with ssl ssl-rpath "no") \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable systemd) \
-		--enable-threads
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
-	local ERL_INTERFACE_VER="$(extract_version lib/erl_interface EI_VSN)"
-	local ERL_ERTS_VER="$(extract_version erts VSN)"
-	local MY_MANPATH="/usr/share/${PN}/man"
-
-	[[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version"
-	[[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
-		docompress -x /usr/share/doc/${PF}
-	fi
-
-	einstalldocs
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-
-	if use smp; then
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-	else
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	fi
-
-	## Clean up the no longer needed files
-	rm "${ED}/${ERL_LIBDIR}/Install" || die
-
-	insinto "${MY_MANPATH}"
-
-	doins -r "${WORKDIR}"/man/*
-
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die
-	doenvd "${T}/90erlang"
-
-	if use emacs ; then
-		pushd "${S}" &>/dev/null || die
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-		popd &>/dev/null || die
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-20.3.ebuild b/dev-lang/erlang/erlang-20.3.ebuild
deleted file mode 100644
index afdfa64d151c..000000000000
--- a/dev-lang/erlang/erlang-20.3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="http://erlang.org/download/otp_src_${PV}.tar.gz
-	http://erlang.org/download/otp_doc_man_${PV}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
-REQUIRED_USE="dirty-schedulers? ( smp )" #621610
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS="--disable-silent-rules"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
-	sctp? ( net-misc/lksctp-tools )
-	tk? ( dev-lang/tk )
-"
-
-S="${WORKDIR}/otp_src_${PV}"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/18.2.1-wx3.0.patch \
-		"${FILESDIR}"/${PN}-add-epmd-pid-file-creation-for-openrc.patch
-
-	if ! use odbc; then
-		sed -i 's: odbc : :' lib/Makefile || die
-		rm -rf lib/odbc/
-	fi
-
-	# bug 263129, don't ignore LDFLAGS, reported upstream
-	sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
-
-	# don't ignore LDFLAGS, reported upstream
-	use odbc && sed -e 's:LDFLAGS =  \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
-
-	if ! use wxwidgets; then
-		sed -i 's: wx : :' lib/Makefile
-		rm -rf lib/wx
-	fi
-
-	# Nasty workaround, reported upstream
-	cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
-
-	# bug 383697
-	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
-
-	cd erts && mv configure.in configure.ac && eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && need-wxwidgets unicode
-	use java || export JAVAC=false
-
-	econf \
-		--enable-threads \
-		$(use_enable sctp) \
-		$(use_enable systemd) \
-		$(use_enable hipe) \
-		$(use_with ssl ssl "${EPREFIX}"/usr) \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_enable smp smp-support) \
-		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
-		$(use x64-macos && echo "--enable-darwin-64bit") \
-		$(use_enable dirty-schedulers)
-}
-
-src_compile() {
-	use java || export JAVAC=false
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs
-		elisp-compile *.el
-		popd
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
-	local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
-	local ERL_ERTS_VER=$(extract_version erts VSN)
-
-	emake INSTALL_PREFIX="${D}" install
-	einstalldocs
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-
-	if use smp; then
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-	else
-		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	fi
-
-	## Clean up the no longer needed files
-	rm "${ED}/${ERL_LIBDIR}/Install"
-
-	for i in "${WORKDIR}"/man/man* ; do
-		dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
-	done
-	for file in "${WORKDIR}"/man/man*/*.[1-9]; do
-		# doman sucks so we can't use it
-		cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
-	done
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	dodir /etc/env.d/
-	echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
-
-	if use doc ; then
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* )
-		docompress -x /usr/share/doc/${PF}
-	fi
-
-	einstalldocs
-
-	if use emacs ; then
-		pushd "${S}"
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
-		elisp-site-file-install "${T}"/${SITEFILE}
-		popd
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-21.2.6.ebuild b/dev-lang/erlang/erlang-21.2.6.ebuild
deleted file mode 100644
index ec653705b1a1..000000000000
--- a/dev-lang/erlang/erlang-21.2.6.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit autotools eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.8:* )
-	odbc? ( dev-db/unixODBC )
-	sctp? ( net-misc/lksctp-tools )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( sys-apps/systemd )
-	tk? ( dev-lang/tk:0 )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/18.2.1-wx3.0.patch"
-	"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
-	"${FILESDIR}/${PN}-custom-autoconf.patch"
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	./otp_build autoconf
-	find -name configure.in -execdir mv '{}' configure.ac \; || die "find failed"
-	eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-		$(use_enable hipe)
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_with odbc)
-		$(use_enable sctp)
-		$(use_with ssl ssl "${EPREFIX}"/usr)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(use_enable systemd)
-		$(use_enable pgo)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-		--enable-threads
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if use pgo; then
-		# disable distcc and ccache
-		export DISTCC_HOSTS=""
-		export CCACHE_DISABLE=1
-	fi
-
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	local path="$1"
-	local var_name="$2"
-	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
-	local erl_libdir_rel="$(get_libdir)/erlang"
-	local erl_libdir="/usr/${erl_libdir_rel}"
-	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
-	local erl_erts_ver="$(extract_version erts VSN)"
-	local my_manpath="/usr/share/${PN}/man"
-
-	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
-	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
-		docompress -x /usr/share/doc/${PF}
-	else
-		local DOCS=("README.md")
-	fi
-
-	einstalldocs
-
-	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
-	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
-	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
-	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
-	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${erl_libdir}/Install" || die
-
-	insinto "${my_manpath}"
-	doins -r "${WORKDIR}"/man/*
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	newenvd - "90erlang" <<-_EOF_
-		MANPATH="${my_manpath}"
-	_EOF_
-
-	if use emacs ; then
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	use systemd && systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-21.2.7.ebuild b/dev-lang/erlang/erlang-21.2.7.ebuild
deleted file mode 100644
index ec653705b1a1..000000000000
--- a/dev-lang/erlang/erlang-21.2.7.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit autotools eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.8:* )
-	odbc? ( dev-db/unixODBC )
-	sctp? ( net-misc/lksctp-tools )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( sys-apps/systemd )
-	tk? ( dev-lang/tk:0 )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/18.2.1-wx3.0.patch"
-	"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
-	"${FILESDIR}/${PN}-custom-autoconf.patch"
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	./otp_build autoconf
-	find -name configure.in -execdir mv '{}' configure.ac \; || die "find failed"
-	eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-		$(use_enable hipe)
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_with odbc)
-		$(use_enable sctp)
-		$(use_with ssl ssl "${EPREFIX}"/usr)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(use_enable systemd)
-		$(use_enable pgo)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-		--enable-threads
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if use pgo; then
-		# disable distcc and ccache
-		export DISTCC_HOSTS=""
-		export CCACHE_DISABLE=1
-	fi
-
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	local path="$1"
-	local var_name="$2"
-	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
-	local erl_libdir_rel="$(get_libdir)/erlang"
-	local erl_libdir="/usr/${erl_libdir_rel}"
-	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
-	local erl_erts_ver="$(extract_version erts VSN)"
-	local my_manpath="/usr/share/${PN}/man"
-
-	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
-	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
-		docompress -x /usr/share/doc/${PF}
-	else
-		local DOCS=("README.md")
-	fi
-
-	einstalldocs
-
-	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
-	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
-	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
-	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
-	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${erl_libdir}/Install" || die
-
-	insinto "${my_manpath}"
-	doins -r "${WORKDIR}"/man/*
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	newenvd - "90erlang" <<-_EOF_
-		MANPATH="${my_manpath}"
-	_EOF_
-
-	if use emacs ; then
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	use systemd && systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-21.3-r1.ebuild b/dev-lang/erlang/erlang-21.3-r1.ebuild
deleted file mode 100644
index ed159555d82f..000000000000
--- a/dev-lang/erlang/erlang-21.3-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit autotools eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.8:* )
-	odbc? ( dev-db/unixODBC )
-	sctp? ( net-misc/lksctp-tools )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( sys-apps/systemd )
-	tk? ( dev-lang/tk:0 )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/18.2.1-wx3.0.patch"
-	"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
-	"${FILESDIR}/${PN}-custom-autoconf.patch"
-	"${FILESDIR}/${PN}-21.3-lto.patch"
-	"${FILESDIR}/${PN}-21.3-pgo-loop.patch"
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	./otp_build autoconf
-	find -name configure.in -execdir mv '{}' configure.ac \; || die "find failed"
-	eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-		$(use_enable hipe)
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_with odbc)
-		$(use_enable sctp)
-		$(use_with ssl ssl "${EPREFIX}"/usr)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(use_enable systemd)
-		$(use_enable pgo)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-		--enable-threads
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if use pgo; then
-		# disable distcc and ccache
-		export DISTCC_HOSTS=""
-		export CCACHE_DISABLE=1
-	fi
-
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	local path="$1"
-	local var_name="$2"
-	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
-	local erl_libdir_rel="$(get_libdir)/erlang"
-	local erl_libdir="/usr/${erl_libdir_rel}"
-	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
-	local erl_erts_ver="$(extract_version erts VSN)"
-	local my_manpath="/usr/share/${PN}/man"
-
-	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
-	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
-		docompress -x /usr/share/doc/${PF}
-	else
-		local DOCS=("README.md")
-	fi
-
-	einstalldocs
-
-	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
-	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
-	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
-	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
-	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${erl_libdir}/Install" || die
-
-	insinto "${my_manpath}"
-	doins -r "${WORKDIR}"/man/*
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	newenvd - "90erlang" <<-_EOF_
-		MANPATH="${my_manpath}"
-	_EOF_
-
-	if use emacs ; then
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	use systemd && systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-21.3.ebuild b/dev-lang/erlang/erlang-21.3.ebuild
deleted file mode 100644
index ec653705b1a1..000000000000
--- a/dev-lang/erlang/erlang-21.3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit autotools eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.8:* )
-	odbc? ( dev-db/unixODBC )
-	sctp? ( net-misc/lksctp-tools )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( sys-apps/systemd )
-	tk? ( dev-lang/tk:0 )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/18.2.1-wx3.0.patch"
-	"${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
-	"${FILESDIR}/${PN}-custom-autoconf.patch"
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	./otp_build autoconf
-	find -name configure.in -execdir mv '{}' configure.ac \; || die "find failed"
-	eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-		$(use_enable hipe)
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_with odbc)
-		$(use_enable sctp)
-		$(use_with ssl ssl "${EPREFIX}"/usr)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(use_enable systemd)
-		$(use_enable pgo)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-		--enable-threads
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if use pgo; then
-		# disable distcc and ccache
-		export DISTCC_HOSTS=""
-		export CCACHE_DISABLE=1
-	fi
-
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	local path="$1"
-	local var_name="$2"
-	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
-	local erl_libdir_rel="$(get_libdir)/erlang"
-	local erl_libdir="/usr/${erl_libdir_rel}"
-	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
-	local erl_erts_ver="$(extract_version erts VSN)"
-	local my_manpath="/usr/share/${PN}/man"
-
-	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
-	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
-		docompress -x /usr/share/doc/${PF}
-	else
-		local DOCS=("README.md")
-	fi
-
-	einstalldocs
-
-	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
-	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
-	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
-	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
-	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${erl_libdir}/Install" || die
-
-	insinto "${my_manpath}"
-	doins -r "${WORKDIR}"/man/*
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	newenvd - "90erlang" <<-_EOF_
-		MANPATH="${my_manpath}"
-	_EOF_
-
-	if use emacs ; then
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	use systemd && systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-22.0.2.ebuild b/dev-lang/erlang/erlang-22.0.2.ebuild
deleted file mode 100644
index 0887db0d747d..000000000000
--- a/dev-lang/erlang/erlang-22.0.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-UPSTREAM_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="https://www.erlang.org/"
-SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
-	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.8:* )
-	odbc? ( dev-db/unixODBC )
-	sctp? ( net-misc/lksctp-tools )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( sys-apps/systemd )
-	tk? ( dev-lang/tk:0 )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-S="${WORKDIR}/otp-OTP-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/18.2.1-wx3.0.patch"
-	"${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch"
-	"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	./otp_build autoconf
-}
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-
-	local myconf=(
-		--disable-builtin-zlib
-		$(use_enable hipe)
-		$(use_enable kpoll kernel-poll)
-		$(use_with java javac)
-		$(use_enable sctp)
-		$(use_with ssl ssl "${EPREFIX}"/usr)
-		$(use_enable ssl dynamic-ssl-lib)
-		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs &>/dev/null || die
-		elisp-compile *.el
-		popd &>/dev/null || die
-	fi
-}
-
-extract_version() {
-	local path="$1"
-	local var_name="$2"
-	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
-}
-
-src_install() {
-	local erl_libdir_rel="$(get_libdir)/erlang"
-	local erl_libdir="/usr/${erl_libdir_rel}"
-	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
-	local erl_erts_ver="$(extract_version erts VSN)"
-	local my_manpath="/usr/share/${PN}/man"
-
-	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
-	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
-
-	emake INSTALL_PREFIX="${D}" install
-
-	if use doc ; then
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
-		docompress -x /usr/share/doc/${PF}
-	else
-		local DOCS=("README.md")
-	fi
-
-	einstalldocs
-
-	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
-	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
-	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
-	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
-	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${erl_libdir}/Install" || die
-
-	insinto "${my_manpath}"
-	doins -r "${WORKDIR}"/man/*
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	newenvd - "90erlang" <<-_EOF_
-		MANPATH="${my_manpath}"
-	_EOF_
-
-	if use emacs ; then
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
-		elisp-site-file-install "${T}/${SITEFILE}"
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	use systemd && systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/files/erlang-21.3-lto.patch b/dev-lang/erlang/files/erlang-21.3-lto.patch
deleted file mode 100644
index c41e89f42c6c..000000000000
--- a/dev-lang/erlang/files/erlang-21.3-lto.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-https://github.com/erlang/otp/pull/2194
-https://bugs.gentoo.org/681778
-
-From ed751968d8dc4c0b58210247e94409a8a52cc501 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 28 Mar 2019 08:38:56 +0000
-Subject: [PATCH] stdlib: fix re:replace on LTO builds
-
-Fabio Coatti reported elixir build failure in https://bugs.gentoo.org/681778.
-The minimal reproducer looks like that (from otp git tree):
-
-    $ ./configure CFLAGS='-O2 -flto' LDFLAGS='-O2 -flto=8'
-    $ make
-    $ ERL_TOP=$PWD \
-      PATH=$ERL_TOP/bin:$PATH \
-        \
-        bin/erl \
-        \
-        -noshell -eval 're:replace("a","b","c",[{return,list}]).' \
-        -s erlang halt
-
-    {"init terminating in do_boot",{badarg,[{re,replace,["a","b","c",[{return,list}]],
-        [{file,"re.erl"},{line,362}]},
-         {erl_eval,do_apply,6,[{file,"erl_eval.erl"},{line,680}]},
-         {init,start_it,1,[]},
-         {init,start_em,1,[]},
-         {init,do_boot,3,[]}]}}
-    init terminating in do_boot ({badarg,[{re,replace,[[_],[_],[_],[_]],[{_},{_}]},
-        {erl_eval,do_apply,6,[{_},{_}]},{init,start_it,1,[]},{init,start_em,1,[]},{init,do_boot,3,[]}]})
-    Crash dump is being written to: erl_crash.dump...done
-
-The failure happens in libpcre2 where stack overflow is mis-identified
-at function entry of
-
-    erts_pcre_compile2()
-        compile_regex()
-          if (PUBL(stack_guard) != NULL && PUBL(stack_guard)())
-          {
-              *errorcodeptr= ERR85;
-              return FALSE;
-          }
-
-The stack "overflow" detection happens in
-
-    thr_wrapper()
-        ethr_set_stacklimit__()
-
-because the stack usage code relies on the fact that ethr_set_stacklimit__()
-and similar functions don't get inlined into callers for stack growth
-measurement.
-
-Before the change inlining avoidance was achieved by putting functions
-into standalone translation units. LTO makes this technique inefficient.
-
-The change marks functions explicitly as __attribute__((__noinline__)) on gcc.
-
-Reported-by: Fabio Coatti
-Bug: https://bugs.gentoo.org/681778
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- erts/emulator/beam/global.h            |  9 +++++----
- erts/emulator/beam/sys.h               | 10 ++++++++++
- erts/include/internal/ethr_internal.h  |  2 +-
- erts/include/internal/ethread_inline.h |  3 +++
- 4 files changed, 19 insertions(+), 5 deletions(-)
-
-diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
-index f9bbe4167f9..4c8d3d3dbe6 100644
---- a/erts/emulator/beam/global.h
-+++ b/erts/emulator/beam/global.h
-@@ -1216,10 +1216,11 @@ Uint64 erts_timestamp_millis(void);
- 
- Export* erts_find_function(Eterm, Eterm, unsigned int, ErtsCodeIndex);
- 
--void *erts_calc_stacklimit(char *prev_c, UWord stacksize);
--int erts_check_below_limit(char *ptr, char *limit);
--int erts_check_above_limit(char *ptr, char *limit);
--void *erts_ptr_id(void *ptr);
-+/* ERTS_NOINLINE prevents link-time optimization across modules */
-+void *erts_calc_stacklimit(char *prev_c, UWord stacksize) ERTS_NOINLINE;
-+int erts_check_below_limit(char *ptr, char *limit) ERTS_NOINLINE;
-+int erts_check_above_limit(char *ptr, char *limit) ERTS_NOINLINE;
-+void *erts_ptr_id(void *ptr) ERTS_NOINLINE;
- 
- Eterm store_external_or_ref_in_proc_(Process *, Eterm);
- Eterm store_external_or_ref_(Uint **, ErlOffHeap*, Eterm);
-diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
-index a6312293cc8..24b6738e082 100644
---- a/erts/emulator/beam/sys.h
-+++ b/erts/emulator/beam/sys.h
-@@ -63,6 +63,16 @@
- #  endif
- #endif
- 
-+#ifndef ERTS_NOINLINE
-+#  if ERTS_AT_LEAST_GCC_VSN__(3,1,1)
-+#    define ERTS_NOINLINE __attribute__((__noinline__))
-+#  elif defined(__WIN32__)
-+#    define ERTS_NOINLINE __declspec(noinline)
-+#  else
-+#    define ERTS_NOINLINE
-+#  endif
-+#endif
-+
- #if defined(DEBUG) || defined(ERTS_ENABLE_LOCK_CHECK)
- #  undef ERTS_CAN_INLINE
- #  define ERTS_CAN_INLINE 0
-diff --git a/erts/include/internal/ethr_internal.h b/erts/include/internal/ethr_internal.h
-index ac27ff2ed09..17ec84c52b6 100644
---- a/erts/include/internal/ethr_internal.h
-+++ b/erts/include/internal/ethr_internal.h
-@@ -90,7 +90,7 @@ int ethr_init_common__(ethr_init_data *id);
- int ethr_late_init_common__(ethr_late_init_data *lid);
- void ethr_run_exit_handlers__(void);
- void ethr_ts_event_destructor__(void *vtsep);
--void ethr_set_stacklimit__(char *prev_c, size_t stacksize);
-+void ethr_set_stacklimit__(char *prev_c, size_t stacksize) ETHR_NOINLINE;
- 
- #if defined(ETHR_X86_RUNTIME_CONF__)
- void ethr_x86_cpuid__(int *eax, int *ebx, int *ecx, int *edx);
-diff --git a/erts/include/internal/ethread_inline.h b/erts/include/internal/ethread_inline.h
-index 8e6bcfc4a8c..f25ba4ae721 100644
---- a/erts/include/internal/ethread_inline.h
-+++ b/erts/include/internal/ethread_inline.h
-@@ -62,12 +62,15 @@
- #  define ETHR_INLINE __inline__
- #  if ETHR_AT_LEAST_GCC_VSN__(3, 1, 1)
- #    define ETHR_FORCE_INLINE __inline__ __attribute__((__always_inline__))
-+#    define ETHR_NOINLINE __attribute__((__noinline__))
- #  else
- #    define ETHR_FORCE_INLINE __inline__
-+#    define ETHR_NOINLINE
- #  endif
- #elif defined(__WIN32__)
- #  define ETHR_INLINE __forceinline
- #  define ETHR_FORCE_INLINE __forceinline
-+#  define ETHR_NOINLINE __declspec(noinline)
- #endif
- 
- #endif /* #ifndef ETHREAD_INLINE_H__ */
diff --git a/dev-lang/erlang/files/erlang-21.3-pgo-loop.patch b/dev-lang/erlang/files/erlang-21.3-pgo-loop.patch
deleted file mode 100644
index 82add992a448..000000000000
--- a/dev-lang/erlang/files/erlang-21.3-pgo-loop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/686786
-
---- a/erts/configure.in
-+++ b/erts/configure.in
-@@ -682,7 +682,7 @@ elif test "X$PROFILE_INSTR_GENERATE" = "Xtrue" -a "X$PROFILE_INSTR_USE" = "Xtrue
-   PROFILE_COMPILER=clang
-   AC_MSG_RESULT([yes, using -fprofile-instr-generate])
- else
--  if $enable_pgo = yes; then
-+  if test $enable_pgo = yes; then
-     AC_MSG_ERROR(cannot use PGO with this compiler)
-   else
-     AC_MSG_RESULT([no])
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index 2f3f0770a55f..da056a8cdd3f 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 	<!--maintainer-needed-->
 	<use>
-		<flag name="compat-ethread">Enable compatibility with pre-pentium 4 CPUs in the ethread library.</flag>
-		<flag name="dirty-schedulers">Enable dirty schedulers</flag>
 		<flag name="hipe">HIgh Performance Erlang extension</flag>
 		<flag name="kpoll">Enable kernel polling support</flag>
 		<flag name="pgo">Build erts with profile-guided optimizations</flag>
diff --git a/dev-lang/f2c/Manifest b/dev-lang/f2c/Manifest
index c00b2c13de79..1e721af2dd73 100644
--- a/dev-lang/f2c/Manifest
+++ b/dev-lang/f2c/Manifest
@@ -1,9 +1,6 @@
 AUX f2c-20100827-Wimplicit-function-declaration.patch 210 BLAKE2B 2e6d30a41919db1f5d35d69cd49987771a17600d7aa0c8ddce2bc8133eaf1b63c78076325a408e84895b6b9cdc552ede22b2fef91b031a782b3e89bdb4b11b3c SHA512 213ef8b066ddf1a4b798e3bc87be4ae759b749f398caffc5a4ddc1757914ab95f67b4931b077bc899547eb4b5e6511ee9f328a481d1e89cc22c00564b912de95
 AUX f2c-20100827-fix-buildsystem.patch 721 BLAKE2B b7e6ed4156413bf21889abc8790c07bddc27c7b8da0f2387749fa031c8269b197fed14dfadaa412f9ec54e615739732df2d9e4641b15c0ab9427ada8587da4ac SHA512 1538129a256dab87fddbe8962164edc89a551a054667b65a9877cf37bdecbc1964c68353315aafb4cde991392657fc377ac7118d6bc175a8ad6ce223c277b3b2
-DIST f2c-20060507.tar.bz2 186677 BLAKE2B 972b55dc95372fc479d6fabd91b495bf4d7e055755c2f9fc5197045207bf8b494948b89c441ae9930c7a247e91707b379f2747e1d9299d04f0b27086bdd1248e SHA512 d0c9019b65a8ad2fd769ada596646a1cd9b682dcc8afa2cd99081376d967fbe959186a38d74570ab4bcce7622c58c8c10042948fa56e0a7080b12111c2b99b1e
 DIST f2c_20100827-1.debian.tar.gz 15659 BLAKE2B 4773a939e51074df34b48540ed67d0bd3dce85b64d6118c480217b569bbe11a9907a7a8bf2d68f0ec5fae51c65ec29a9dafdac1a009a90b5c6d02306496a72d5 SHA512 784d3f1a74311a933b54103d36dd18eb879bef1816ea82e8d93ef5a0eb7582d4ddde3a2b764d15b78194bab4cdf940480089e8b920002134af66cdf095708535
 DIST f2c_20100827.orig.tar.gz 417930 BLAKE2B 4ccd59762947de9d316520f213d33e095a559dfe914c06d58f4db21a031b6dca332d75473dbaa6a6167ef3f0459c68235fdddac3ed4dcea34e9597a8ab0ae982 SHA512 2c28d8c06e53b569816e7982725133d46e9b145a84ec51771f4cca2409098f894648ebe5b8089a1ddd8468be62394b0edb5985e50baeea8129e4f507236d6c0d
-EBUILD f2c-20060507.ebuild 743 BLAKE2B 57179198c83f6a6961cf56fef1c6222bb61a8faa5c1ba2a74ad39268914b28c30fac158c79d15451ebe10436d97afe5317c88df2af370823161e7319fd747db8 SHA512 02164e7c3e8f9b451c4970b16e0b2604638be62ab72fee20d2930b48760461422cc938a3e3ed38adc91631828cc0d1c497ccc3c6b9fd57cfbdad48021e1d65f4
-EBUILD f2c-20100827-r1.ebuild 1209 BLAKE2B 5625b40fbb740719dcbf0af6611e6b245eee0d0aefd3eb8a71d0598ded2b604cfb30b10bc3da6fd93b9b77bc7a43ac2bb35536994905ec2e9ce3d27860fc9040 SHA512 faf1e4759d1ce2e3f840adecf5a003475997022ab81f593070e8b20de0667e1c43158bdcede70cd19664d79e3345dd66ad0e9114804fee0df3cd61eee31f6fe6
-EBUILD f2c-20100827.ebuild 1171 BLAKE2B a6019cd127034be532733d94d8f4f02b51ac7cf2b28451ce118430cc68bbf4cd2604b8159984bd458f1bc0dcc283ec7290dc8bcb986163eeb50f600208217845 SHA512 332f261f4284a191ec7a1b83e000c0c7660767d8c4ccdd264603ede7c210dfc2fe4dbb14e115cdb0e41b6212812c8bc5e76c2f32ab01aef18a7b0da61320062f
+EBUILD f2c-20100827-r1.ebuild 1205 BLAKE2B 71653dac233a856de2149cf6568d129c6184c4896d7e5de275b83defbed37541e9b4cc9fc43864ebe7ee7369fbab17378869532a791da69389f997a94a1c66d4 SHA512 debcbd3265bd77650faadc1c21923b080dfcaabec4c0b518f11cb7a7f25f761a15cd79bc273f7127cd30cca6015b12a1f64fdc442c515ca28c35c418aa6795fa
 MISC metadata.xml 726 BLAKE2B c706f880ddcb69efcc16a8424098f60d920447b0d46e2becfa4202cf8365fd6b8cb7cdd4007995def055826d7240a19ec780c3fc8a147e222bc8dbd4e407a3e9 SHA512 37fef3d63140a9aecff3dd5b99594cf1425b37bc433fd12109e105be79698654fa244cbfb5d95587f297791d6c118461d10885945893fd02cae8bba4a3089e03
diff --git a/dev-lang/f2c/f2c-20060507.ebuild b/dev-lang/f2c/f2c-20060507.ebuild
deleted file mode 100644
index 32862f0a7377..000000000000
--- a/dev-lang/f2c/f2c-20060507.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Fortran to C converter"
-HOMEPAGE="http://www.netlib.org/f2c"
-#SRC_URI="ftp://netlib.bell-labs.com/netlib/f2c/src.tar"
-# To create, download src.tar, ungzip everything inside, then tar.bz2 the whole
-# thing.
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-libs/libf2c"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/src"
-
-src_compile() {
-	emake \
-		-f makefile.u \
-		CC=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" \
-		|| die "make failed"
-}
-
-src_install() {
-	mv -f f2c.1t f2c.1
-	doman f2c.1
-	dobin f2c
-	dodoc README Notice
-}
diff --git a/dev-lang/f2c/f2c-20100827-r1.ebuild b/dev-lang/f2c/f2c-20100827-r1.ebuild
index dd624e40d486..5d8216b1ff07 100644
--- a/dev-lang/f2c/f2c-20100827-r1.ebuild
+++ b/dev-lang/f2c/f2c-20100827-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-libs/libf2c-20130927-r1"
 
diff --git a/dev-lang/f2c/f2c-20100827.ebuild b/dev-lang/f2c/f2c-20100827.ebuild
deleted file mode 100644
index 0b14e397a542..000000000000
--- a/dev-lang/f2c/f2c-20100827.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DEB_PV=20100827
-DEB_PR=1
-DEB_P=${PN}_${DEB_PV}
-
-DESCRIPTION="Fortran to C converter"
-HOMEPAGE="http://www.netlib.org/f2c"
-SRC_URI="
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}.orig.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.debian.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="dev-libs/libf2c"
-DEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# selective list of patches from debian
-	epatch \
-		"${WORKDIR}"/debian/patches/0000-prequilt-tweaks.patch  \
-		"${WORKDIR}"/debian/patches/0002-prototype-rmdir.patch \
-		"${WORKDIR}"/debian/patches/0003-struct-init-braces.patch \
-		"${WORKDIR}"/debian/patches/0004-man-dash-hyphen-slash.patch
-	sed -i -e '/^CC/d' -e '/^CFLAGS/d' src/makefile.u || die
-	tc-export CC
-}
-
-src_compile() {
-	emake -C src -f makefile.u
-}
-
-src_install() {
-	doman f2c.1
-	use doc && dodoc f2c.pdf
-	newdoc "${WORKDIR}"/debian/changelog debian.changelog
-	cd src
-	dobin f2c
-	dodoc README Notice
-}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index c27bbc5cc53e..8bf6516aa2d3 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -13,7 +13,7 @@ DIST go1.12.8.src.tar.gz 21978756 BLAKE2B 65258c101d729bbd82f69ba4286ba8e64f9d31
 DIST go1.12.9.src.tar.gz 21979950 BLAKE2B dca7e3afcabd513c4b8193e93c0a1ed1a2326dccfce9b909d97b3731fffbe7e26712ab164645e06a316baa949b1e0b14a2fea8d23e6f90fd5b72afa0d15b432b SHA512 57041e7fb767f528aa9fc2592d205d3a7c120c73f92dc8d91f17f816e12aa6152c8421b333081800a5f50b1bb656f203a25faf8ed92c69a6ec164ce0a5619c13
 DIST go1.13.src.tar.gz 21621948 BLAKE2B dff6024287c0805ec735cb40aef4ffd872bdc17df6e0d531be3d16806292edde2a63299fe7b9b3c97a79f6f864ab0f95962a0cd2e1a0ba0216b3f4bc59bf4bcf SHA512 c6346b1ab256cb743dd98625d8b16cdcc1365b186e039e99747d6c18041045daa065f6bdce17cca0a9800be2dbb34e90adf5518d5295693f80435c02fe5b2cd8
 EBUILD go-1.12.8.ebuild 6459 BLAKE2B 11cc998ff708a26c833e7ac2ff72c7fd2aabf0e3a3bfaa7558820d4726e29e22e5d0ad0b3100bd8e982b54074fc1230a43d288cf873810024a3fa1b3b77450e5 SHA512 deff55ebb12c4a915b439a1d598e02b8fd03a1d1ee873f9e6f47c6ff22cef82c3624aa68eac89968a3f01f7b91794d501675a59871fe9dd022fb2ee8cd29cd26
-EBUILD go-1.12.9.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f
+EBUILD go-1.12.9.ebuild 6460 BLAKE2B fdd3ca731eda7778d0792f009ea151efb81a3a57c15ca3958f2f01ec83287bef3b4c9428c8db32cf646302c74a19258673936d6ba375ede5f1ed6f16ca05e408 SHA512 b3f2d86b543f44ec7c2af7ecbd8a961b25517e30ce796c3aa2e12edc3f22eb2136ac4e5905c8d1030e1bc631256cf90f2883569e13334c34c26b6abe603c5e9a
 EBUILD go-1.13.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f
 EBUILD go-9999.ebuild 6462 BLAKE2B 865d384352a841289541d6ae0c8fb5993eee183d3f1c30944987f7010faa41c79cdaa0b1b5e9d54fbebf2ca3ce312a9532a30421b43b69216b517936f56f3c21 SHA512 107d6f1187ade0eef80f52b0bc54e430a03705c8234185a665549d3a4c63c356f1554610885dd8fad23a8094bbfe6bdd89963f97da54dc6b7cdaef62b7c3568f
 MISC metadata.xml 663 BLAKE2B fc92966e1b4a155b4d442842988d0404c0148b029d187ab7294d49dabad771296d63ca3184128ac27cea4e74e7d6cfc8852084ca8f1d15a1d0755586a0bf68de SHA512 f67b7e312cfb2a896552ae73e835d53ffbb0a7c71c30f0a7cb44c65e2753055e185e7a5c48e2cfff33a42609629cc3c32ee56a9d8f61d8429798c1e8424e36bf
diff --git a/dev-lang/go/go-1.12.9.ebuild b/dev-lang/go/go-1.12.9.ebuild
index a6151a8c829b..35c5de1d232e 100644
--- a/dev-lang/go/go-1.12.9.ebuild
+++ b/dev-lang/go/go-1.12.9.ebuild
@@ -37,7 +37,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
diff --git a/dev-lang/jimtcl/Manifest b/dev-lang/jimtcl/Manifest
index a3f3e4a723dc..0448aa6fd889 100644
--- a/dev-lang/jimtcl/Manifest
+++ b/dev-lang/jimtcl/Manifest
@@ -3,6 +3,5 @@ AUX jimtcl-0.78-no-bootstrap.patch 1370 BLAKE2B 1f584727970d7103a183b9099818bafb
 DIST jimtcl-0.76.zip 2326715 BLAKE2B 50ea032cf46d2edeeecde1dc3b4deffcbd09b5dd3a6880963608b3f20616bf162fafc4ec2869bfe5de90231c4c9a29fb04710bd299cc5e8728ff20a86e46f32d SHA512 50763ea897fb5393083749cdd9e57a3f3d2d6dbebc40ee6371b1b86ebfc2f515e9775cd2acd6627f0f81b54bd72cd8c74be5aa9d0dbefc7c16372887e07f6ea4
 DIST jimtcl-0.78.tar.gz 3073533 BLAKE2B f0cdaf2807c7dd0e7c64e37cbc8dd019d8460e6a0320c239b0d01549aede8c86a89d84d7a3c5200c8d8cea428dbd1038d57dc66f5b580bdea8fe39710f967bbb SHA512 2a2cff12d7fdc4cf36734e41727eef08f6d74fb13d70bb0a3e01839e66859e57dd927ddedc161a6a7928881d640bd4e20a1bb313ed24aa2bb7bcb00eaf64fbf6
 EBUILD jimtcl-0.76.ebuild 1506 BLAKE2B 675ac6813883875b02d8cc8d14a8e531d2907b94a3c3eb2725157c8da8249f54e8f8f4688cd8b211687d89b522db3b33a5c4aeaeeb10def9e7ee53a671dc726b SHA512 41b03bb2e030f04eaa82a42fec86109d4d5e5712c85db86c79d26c8738161448ca21ffe858d3deea3b55fc8fc104f2d3cc6270e2e8dca53450a4a90ab49ffc1f
-EBUILD jimtcl-0.78-r1.ebuild 1205 BLAKE2B 5ab6e5788df002334a84513dbba4a2eb27adffbf6111f0e0507de8f06c3d370cd738b9e258ae7305bc66f94fc36c235616a3f41d3fdfe1b9daccfe7b89847407 SHA512 dc6d73167ecd36b59846533701eeb2466f57893152ff1e25a929fa5bd4064e8c331b4a183feebf63c882c92a0e408e62d94a0bcfed0df5f5f6fcac90bd2d0243
 EBUILD jimtcl-0.78-r2.ebuild 1308 BLAKE2B a88642fd912ff845f018d34314c6872a9bb16479ae75eb81abc9b598bbd385b8b5aed0697e9b643c1ad1c2ff0e8eb2f5a21bd3268047be6a422e9b3821397880 SHA512 b801b7c5599ffeece4f1710120cec5cf034cb12ac4e5b5e33ae982221b39ceae6183a27dc612aeba5dc1abf6db6f97fa0fbbfd9752c51c470830d1151d85ab4c
 MISC metadata.xml 251 BLAKE2B f23df3a2dcf096cee2f8d5cf2ef4fcc6c741ae312d2193f1d449aac7cd19126aa8197d4f3e2bd7828abf1aeeabf60f4a3ef8cc05b8152e6f6ce55b4897de5eb0 SHA512 0186a63dbf97f1800694d0bcb67528a7da92d30412398d5916452cc45c17d823f84ba7ffeae533476b7a48e7da19dabd0e431155ab66c19e68b113c910a4c03c
diff --git a/dev-lang/jimtcl/jimtcl-0.78-r1.ebuild b/dev-lang/jimtcl/jimtcl-0.78-r1.ebuild
deleted file mode 100644
index 812fe0d263f5..000000000000
--- a/dev-lang/jimtcl/jimtcl-0.78-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit eutils
-
-SRC_URI="https://github.com/msteveb/jimtcl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86"
-
-DESCRIPTION="Small footprint implementation of Tcl programming language"
-HOMEPAGE="http://jim.tcl.tk/"
-
-LICENSE="LGPL-2"
-SLOT="0/78" # SONAME=libjim.so.0.78
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-text/asciidoc )
-	app-arch/unzip"
-
-src_configure() {
-	CCACHE=None econf --with-jim-shared
-	if use static-libs ; then
-		# The build does not support doing both simultaneously.
-		mkdir static-libs || die
-		cd static-libs || die
-		CCACHE=None ECONF_SOURCE=${S} econf
-	fi
-}
-
-src_compile() {
-	# Must build static-libs first.
-	use static-libs && emake -C static-libs libjim.a
-	emake all
-	use doc && emake docs
-}
-
-src_install() {
-	dobin jimsh
-	use static-libs && dolib.a static-libs/libjim.a
-	ln -sf libjim.so.* libjim.so || die
-	dolib.so libjim.so*
-	insinto /usr/include
-	doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h \
-		jim-win32compat.h jim-eventloop.h jim-config.h
-	dodoc AUTHORS README TODO
-	use doc && dohtml Tcl.html
-}
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index a9e0adf5be45..b118f40fd22b 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -19,7 +19,7 @@ DIST perl-cross-1.2.3.tar.gz 106861 BLAKE2B 1fd23ecafd1450010c6703e43fb84da68f73
 EBUILD perl-5.24.3-r1.ebuild 17393 BLAKE2B 999d7df269e15390e4f7d146ff94eda5301981353083c933dd89af42a9ce0cece3f6e87d8917572cd38141f0e25e9c864660624fa4c4459940d0dd190527d53f SHA512 61a2760d1a17ffe0ae6cde23b4b707876822aa2355fa834b23a878a3df3d5d070e5b0a74a991d617ad1e026c0fcc3d2a05609d575567edc57b2cf101bde8e0bf
 EBUILD perl-5.24.4.ebuild 17363 BLAKE2B 84744ba06ce9dc0cab51aae3da10917679a20b5997f13154c269285173a6c6b0ec20ae365b059daa52f86f2addcf97dbe8866a29cd2c9c32ee51030de9a44bf7 SHA512 d393349752cfcdb53bd6d99559ad1eb5385e716f772bc4377e07bc3d7064a293e5cc0369feca2094513e710e8724c2a0a82fcf342ad68c4e1d2c1d0d42200071
 EBUILD perl-5.26.2.ebuild 20018 BLAKE2B 35fc87f0fd3d14255553214e5d16a15390469265e7a1dbd9942668d96ffea825228da4c63fdddbfa70df869746559d7966b81dd1343c1bcebb1c87718bb1a3b3 SHA512 23672000c34668a207d3ec6629950310542996be5225271500f52d42779e6b77370db02a32c28953cfc7d479153d418af8ad6ddfb90ceb6437fdd4086b5a5a92
-EBUILD perl-5.28.2-r1.ebuild 20154 BLAKE2B c76cfdb77c4973a345810a0f1c51b1c222222cd7562f532366c00d2c7f30aaa5edb24063c4701fb515f788bfce99e9539e8d8b90b53850832cd08522e868fafc SHA512 90d34571f8d89fd36feb6439a83acdc90c05413dcf360cd5f8fd9b088f95054a00445ff8ff2a279e01338efc46f9a9887a34a675efb60617ef5e066866a2ec88
-EBUILD perl-5.28.9999.ebuild 20136 BLAKE2B 6d8f6a6c78449cb40996c32c4e72ea5d7679b0e998857d6abfe6b28874cc40c135330d4d1ee9429ea3c1fc819c3695323b803ade4c25feedfc155ce694295d0b SHA512 d787969c98d92df22cb158b3cc6885fa2937e42da0df67168cc9757ac1fa28ca7156570042e941cfdebe4b4fe6e2befcf15dcf43d93f856212db65f9578391d9
-EBUILD perl-5.30.0.ebuild 20331 BLAKE2B 915d0eb8b798f273a0abc9b9506e1b2c1ffcd71331d7c1c72d3396a76e398d8955340dcb3abf73978f07be497a13b14147524aaf71963fcc6b19c1e312cc2b29 SHA512 9e32fdd048664e2ffdb2916d44cdad728facd79b8d85f400b0a938fdc3687f7084bb053bba548b30deb81c2b042d8d40e9b4e8192fbe1348f3451e3d53630ea7
+EBUILD perl-5.28.2-r1.ebuild 20197 BLAKE2B 25a04dde291b8556aaca90dfde3430d7a9c4172c9435e4d1760824b97fdf3abbcc4578e705aec5934edbce1f4b03c93945a897cf289ceb7aa6e50c860ed6dac7 SHA512 9f93a656254a65b947f0dacabc97f8cad7941c21ff0183e4830aeedc0573bd5526d5db70555fb0fc559bedef420b01bd0b4551826dfb791eda4ed114288c034e
+EBUILD perl-5.28.9999.ebuild 20180 BLAKE2B 9296cb4488d91bf5579f6abea426ef2aa3e84f375a15c92d844ccd97bd1af18995c80e803ba8968700d293606f46d9e1818c3bf60539538813a2eb49798bf67e SHA512 46c6606a076b5fc2ea65d39498d9abee1ca6b658c4891c17ff6a3b86dd8af261f7053c236894abb468329acb01e51159b8bf6eb5913d44de3b1adcb4ce13426b
+EBUILD perl-5.30.0.ebuild 20164 BLAKE2B cac6cb07a24b0bf885cd35036752fa8b7b1c623798247e520811118be4741f0c979c637e246be3da5e4716a09875e9cb128c52ba17a2ef8b603803fde7803cd8 SHA512 b7d4321b1fa0d3061828c884769f9fb6b9010553f99bfb44e5244631de722984706d452d1eaf0affc2d99f2ae9ebeb3258addf3028fbebb817e34ace712f7dff
 MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583
diff --git a/dev-lang/perl/perl-5.28.2-r1.ebuild b/dev-lang/perl/perl-5.28.2-r1.ebuild
index 2eae9534112d..a63c8091115a 100644
--- a/dev-lang/perl/perl-5.28.2-r1.ebuild
+++ b/dev-lang/perl/perl-5.28.2-r1.ebuild
@@ -51,7 +51,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 
 if [[ "${PV##*.}" != "9999" ]]; then
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 IUSE="berkdb debug doc gdbm ithreads"
@@ -468,7 +468,9 @@ src_configure() {
 
 	# fix unaligned access misdetection
 	# https://rt.perl.org/Public/Bug/Display.html?id=133495
-	[[ ${CHOST} == sparc*-solaris* ]] && myconf "-Dd_u32align='define'"
+	# bug #676062
+	use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] && \
+		myconf "-Dd_u32align='define'"
 
 	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
 	# Prefix itself we don't do multilib either, so make sure perl can find
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 88f49401029e..c5309aeccc88 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -466,7 +466,9 @@ src_configure() {
 
 	# fix unaligned access misdetection
 	# https://rt.perl.org/Public/Bug/Display.html?id=133495
-	[[ ${CHOST} == sparc*-solaris* ]] && myconf "-Dd_u32align='define'"
+	# bug #676062
+	use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] && \
+		myconf "-Dd_u32align='define'"
 
 	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
 	# Prefix itself we don't do multilib either, so make sure perl can find
diff --git a/dev-lang/perl/perl-5.30.0.ebuild b/dev-lang/perl/perl-5.30.0.ebuild
index 8f0c0cb48d1f..8f02f4a820cc 100644
--- a/dev-lang/perl/perl-5.30.0.ebuild
+++ b/dev-lang/perl/perl-5.30.0.ebuild
@@ -357,9 +357,6 @@ src_configure() {
 	export LC_ALL="C"
 	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
 
-	# some arches and -O do not mix :)
-	use ppc && replace-flags -O? -O1
-
 	# Perl has problems compiling with -Os in your flags with glibc
 	use elibc_uclibc || replace-flags "-Os" "-O2"
 
@@ -372,12 +369,6 @@ src_configure() {
 	# This flag makes compiling crash in interesting ways
 	filter-flags "-malign-double"
 
-	# Fixes bug #97645
-	use ppc && filter-flags "-mpowerpc-gpopt"
-
-	# Fixes bug #143895 on gcc-4.1.1
-	filter-flags "-fsched2-use-superblocks"
-
 	# Generic LTO broken since 5.28, triggers EUMM failures
 	filter-flags "-flto"
 
@@ -473,7 +464,9 @@ src_configure() {
 
 	# fix unaligned access misdetection
 	# https://rt.perl.org/Public/Bug/Display.html?id=133495
-	[[ ${CHOST} == sparc*-solaris* ]] && myconf "-Dd_u32align='define'"
+	# bug #676062
+	use hppa || use sparc || [[ ${CHOST} == sparc*-solaris* ]] && \
+		myconf "-Dd_u32align='define'"
 
 	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
 	# Prefix itself we don't do multilib either, so make sure perl can find
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 6b51087ad593..09033e93b743 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,19 +6,23 @@ AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd235506
 AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875
 DIST php-5.6.40.tar.xz 12472236 BLAKE2B f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc SHA512 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329
 DIST php-7.1.31.tar.xz 12370928 BLAKE2B 18b7d5398380324243321a39d337bd10a7eb82812f3dbb9b2ea9eb4808ef585d6452cc5953b56d24bcf817994e249b8b20cd9b4658e1df6c77de78eecb48a3a7 SHA512 989cd157e0d67c6f03192ce9e1afaa01ff72ccc83f3e6b94ac8dc3d4c2717258a46bd64fb20e4649baec1fe2545805013eedc1de78e556d09c2b0ae64d4272d8
+DIST php-7.1.32.tar.xz 12369916 BLAKE2B 26f3756bfa15d8caa9f99f48526eabe66cb389d0ecf534700dcf9e2514de12c1b9d45c634b8e5ce07d1e28cce4c5b5a9cda7780013a7af070fd5e3d250a92616 SHA512 090dd6d79514f97be125e86d741094c149250a11a4f7d5f8dd08e028ae5f0b347afc58787b2002cc7b183d08a56562042e33ef7f1eeb060aafaf6fef67646ab1
 DIST php-7.2.21.tar.xz 12298448 BLAKE2B f82b35fd3cdf45d8c84639d044729602340c2d34695b5603a194e2d504627c0e041ab156c3720d218d8d6ca51c9ef71d8d0ee37585142aa30ed0cce51fbcb91e SHA512 c7fe01626c1e25e8882d8f2b69d77a5479567d2daa3bf25d1ce3f45314a882f79ce9914a2aa1b3052b6289b46873f466e457049ce1db6e31b60ba4995187507c
 DIST php-7.2.22.tar.xz 12271632 BLAKE2B be3089066ba1c25c479eedaf3e6dd8f7773a6d87a16ce49d8c5379bc9b25d073b497004ccb219795bcfdc3af1310570f94f109754120c254ea5bbaaf1a5e953f SHA512 526dbcc03726d6e2f146adbdf8d89f0c8acb2575a3c21e5ef14ae256f29447d82154e0b1869c0143d831f81c2da0d943957c51144fb458457d3681cdfbc6d49b
 DIST php-7.3.8.tar.xz 12064620 BLAKE2B cfe2fde5e48080e13bd21cb2e2ca0c0ae38da03c94d0692e11bfe6722e50bd0b864d629a0ef6aed4ac5d9830ec4b4b214b9abdf917519a0c0cb70a4362fc8390 SHA512 9e9e13845350f3d4a8a80c3e2fe8291996e2749b2c862261b96346c01e5e24640cb81adad5e3b7668b56b2266c1fcbb713e8c38da4f9aa474f5f632f91378a8d
 DIST php-7.3.9.tar.xz 12064244 BLAKE2B 2837463a74a0ccffc1a2193f9fbce78c98c15dd60214cb5d5d704aed7d74449696c3a516e86f440aed9ff3dc2ed8e7bbebcaf0a1268afa55aca2b642e958abf1 SHA512 017d2ae3cd499a7f6ee30111baf0a119e2f404919575acc5ae91fa6e53a303c9d1b5d165205eec3943c3547ff8759e21fbccc62845e3269176f6fc0f2ba88490
+DIST php-7.4.0RC1.tar.xz 10212396 BLAKE2B 5ec878ee88c1828f36e4f23d289813da14417a4f0f79ec743e7cb3171acaa37d0e6c5c217f2f1efceee87af23e134d2582e1a254e64d971e25e1d6f47273a348 SHA512 17e4641496a7503a4d7a1f658a2a0a4c2db8b3d459f32459c97a40370e71b687b8bd44cc397408788ef697e879d20e1de0c4a655c1da7bc1e82598267460f57a
 DIST php-7.4.0beta1.tar.xz 10200060 BLAKE2B f49c49fcebe0309bbe266dec5c468037499fc96908a4130454403e57caa3ef7da3c46dbc83829bb290c46edfc14921f71fafddb8b0777c23adec35fbb57ad68c SHA512 3e4307201c91cec238c9bc6c27a629a93de8baba0307f2e61cb4bb242720178382dd50b38e7a18fbd65baf25068b358faf571dcb895e7cd6fb292038dee3ed6b
 DIST php-7.4.0beta4.tar.xz 10207868 BLAKE2B b7fe60ec6b98c00e58b88e59aeddee7750df4480e505eab78f6ad4268bbcdba53fea36a4a0fb4e2b4e140247adc68946dcdcbc13ae339fe85570b91145025201 SHA512 c87c519453a8ba7f06b921b214b3315938b77c7d6f4f88f173f9c1e48a578937e4aa9bdb4d5a23c922b5cedaafc4d6bc29067dc55103fdecaa3a8ab4b381f203
 DIST php-patches-7.1.31bp.tar.bz2 37219 BLAKE2B 4f3ead2f69adf00ac1317371172c8adbb823f597cd8e3cafe7044d6a46671437fd2e5eaef4309a6fd5825123394044543284d3cbe892c918353a5b07c12b7401 SHA512 eb52679d035ceb4124c8e9175024f4f753e20d139479af4a57e01de941991716b2ce37f6190242c1bec46fd5305bad1f91613b04ee849a0d94f4a33ce013781e
 EBUILD php-5.6.40-r6.ebuild 23012 BLAKE2B 2c7ae50a94373c6025bb0c3aca204892d73bbe425da47603a4148927ded5d2becbd60fc19261b945ab0f733bbcf9e37a94209ccb4730ba07b9d7e7ace0ed6b55 SHA512 18d9134631d8aaca982f7fd0269f7aeaeb20a488c22d8ba013cf6fd96cdbdad0a818265512b5ce7ccdb7c478e944ca4f20706612929bbc2cc5381a5f58371a59
 EBUILD php-7.1.31.ebuild 21986 BLAKE2B 0a9f4e8fa3d742b98eb013d015cd53697421d28ad5aa649cfaf1e557d5a03567be2c32fec1dc5751721189911da14d9788bbd5d5f4fab24126b26d3259b0b322 SHA512 fbaa854f58fb9d0a634aaf6296964256970a41a0d9c7a972ac35b2124d453404fa0a67b1c4477ae5b7a47e58e6498e3bf47fafb7154995ba7c623500f506346e
+EBUILD php-7.1.32.ebuild 21992 BLAKE2B cb0935b72c294b51193ea42d42e5ed6d225cb9ec651274ff4c3d79e657878be28102e37abe3d981fb0f0bb556487a8c0ddb9345a51727a0a2aac4a4e298b4ec8 SHA512 6bb81a20fd64f8fbe0460c0d18b8e5d360deac3fba2c2b4431122279d1544bbadd3a68a4ff9ae36c7e5e082f834a59a3811ca2fef193a78c5c11015566ef3d48
 EBUILD php-7.2.21.ebuild 22517 BLAKE2B 490812bcbbb78997bfa3922bca6d635be9f1b5cc69189c465a073fbaa67d21875d4f38dc9c02c856e708fb683961446b5db0fb6f223d15018703af52d7181200 SHA512 cf7668d34d56ae10bbac60dca6d35d0c8aab93a48fc5043b8098459637b404f6832afdda80014f4a6c60b0ad061cb1f287e12ee73dbcba1c8b2afc18fb3d3b98
-EBUILD php-7.2.22.ebuild 22553 BLAKE2B e09d5f3da73606c72a1521d4395fe5419b864507e98778b634c98986e5b9b1e745aa04249a1e9fb94f1cc7686ac950ecea052184924da3935e7b947567a95319 SHA512 dc4e455d08d0af10d5800fbbdbf98a2e447ec40e79e5d25ddea082beeecdece29e63a31fc11724dacbcae3c7918a26f24a4305316e3bc1417d5aadc14373ea59
+EBUILD php-7.2.22.ebuild 22546 BLAKE2B d37fb3f6eb043d9a85fbd174ffc82e24e93cdaa9a0c81424e76724eb54a70219340d802beb7c2e0f9c818371a49fe1f142c035d89c75a5457e3133ed79f36c5b SHA512 30424e11ea7c5aacd3ddde60f5f72c225360b54e8e3089da947c9e6fbe5d6b56b5a364e99c8eb2f8d607f664be2990171cc216743e6842f273ec2c21612f2de1
 EBUILD php-7.3.8.ebuild 22529 BLAKE2B 7f8bd6851381d324070b93e7c7bb46aee62175560861318f25f0cdbf95d231d9ad1f02a6173816a409e0ae06df83ea84010c2099024fc11b526e2fc5378b1a9d SHA512 ce6c664a8686e6270a788f291b759fdedb98a920de43fb07046f83e65b0296595d82df3da177376f02ea2c3e6540edcb406fe2edd4709bf143696bcb8c5f713d
-EBUILD php-7.3.9.ebuild 22539 BLAKE2B b964d8dfd1c5b48e3fc36ab639a26dd5ccdd483e4f2400a6d7152ce8b3894066a27bc7961357138414bb062cc8b6dc7166e4a9d3a4ef6b5959b102b4da27d515 SHA512 4bad50b0f54b83d7b50a0312cadd1d19d1301557b3a066fb46201cbb3b8774bbdc10ca6fc124d73ece41992a04bd9b902bc8e6d489fd638ece294f21dec3bd94
+EBUILD php-7.3.9.ebuild 22532 BLAKE2B d7325c7c6d6bd26c75e848f5d828cfb0fc5f17e4c92186c523759ea77c4cbd424a47ad5ed45a32c1dbb4ba3de9a3474a3c18d66afe4bc960b427faa05c304542 SHA512 b47374b989d308328212648b3fa5e4cab926a1cc5ad13b2c1a730f567406118ec89051a35b7af8281b4b7e3aa9f148e5ef8b584dc2ef2889b71ddc2d9bee88ea
 EBUILD php-7.4.0_beta1.ebuild 20931 BLAKE2B d5c697c0b381e359078cbfe8d3eeffcc5509ec08db0bf8b5b7c159f0b5875f28eac283cee086d185e220b1c4a6d6a67df07adba2ae4d8f90b79321ca20e8fa92 SHA512 7d7793f1d4b99d3703f4a032418e755294c7275404d8c6c735452df2750587bbbaf9e35975ec59ff9e3e805dc326b5829bedca41602b34727f09454d2bb94db6
 EBUILD php-7.4.0_beta4.ebuild 20931 BLAKE2B d5c697c0b381e359078cbfe8d3eeffcc5509ec08db0bf8b5b7c159f0b5875f28eac283cee086d185e220b1c4a6d6a67df07adba2ae4d8f90b79321ca20e8fa92 SHA512 7d7793f1d4b99d3703f4a032418e755294c7275404d8c6c735452df2750587bbbaf9e35975ec59ff9e3e805dc326b5829bedca41602b34727f09454d2bb94db6
+EBUILD php-7.4.0_rc1.ebuild 20942 BLAKE2B df996958687c70aa940ec3e86a398f9f1ba9e663949d4c0c5f85ba4ab444de108907db6604d7e2e755a2f180329fb90606258f51cbdd04d1dccd2a1e26116c2c SHA512 22655d8af0b3cf012e8a63b17510c45f4051ec40b6e2d195fd5e8703c443bbad04af562452d6fa4c06936bbf638001ed5d41d4e3ccd05d8f0b9bcc55f2169d02
 MISC metadata.xml 3352 BLAKE2B 155c08bb52b049c3f79557d27ab6be9402cd35797cd385d53fc8c239c0eca089f65e106d54beca0642b8d182bfd0e172886b863a692575e9002140af7a62fa08 SHA512 f37c4c7b709bf91da6db41b0468c36cebffc630dabdcf4d43259017be5cf0577bb329ed0e206ff14d68bacc33425fba4789fc13fa34aa61acccce9fda11eee86
diff --git a/dev-lang/php/php-7.1.32.ebuild b/dev-lang/php/php-7.1.32.ebuild
new file mode 100644
index 000000000000..e373315e3cc9
--- /dev/null
+++ b/dev-lang/php/php-7.1.32.ebuild
@@ -0,0 +1,737 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+	coverage crypt +ctype curl debug
+	enchant exif +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer truetype unicode wddx webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	recode? ( app-text/recode )
+	session-mm? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli !mysql )
+	session-mm? ( session !threads )
+	mysql? ( hash || ( mysqli pdo ) )
+	mysqli? ( hash )
+"
+PATCHES=(
+	"${FILESDIR}/php-freetype-2.9.1.patch"
+	"${FILESDIR}/php-7.1.25-intl-use-icu-namespace.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+	)
+	if use webp; then
+		our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+	fi
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.2.22.ebuild b/dev-lang/php/php-7.2.22.ebuild
index 4156c8c952e9..5353cc24ec3c 100644
--- a/dev-lang/php/php-7.2.22.ebuild
+++ b/dev-lang/php/php-7.2.22.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.3.9.ebuild b/dev-lang/php/php-7.3.9.ebuild
index eb9e3727c510..4bd913cea378 100644
--- a/dev-lang/php/php-7.3.9.ebuild
+++ b/dev-lang/php/php-7.3.9.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-7.4.0_rc1.ebuild b/dev-lang/php/php-7.4.0_rc1.ebuild
new file mode 100644
index 000000000000..4c04d93e4d4d
--- /dev/null
+++ b/dev-lang/php/php-7.4.0_rc1.ebuild
@@ -0,0 +1,723 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://php.net/"
+SRC_URI="https://downloads.php.net/~derick/${PN}-${MY_PV}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( <app-text/enchant-2.0:0 )
+	ffi? ( >=virtual/libffi-3.0.11 )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( dev-db/postgresql:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.7.6 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlrpc? ( xml iconv )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Bug 669566 - necessary so that build tools are updated for commands like pecl
+	cp "${BROOT}/usr/share/aclocal/libtool.m4" build/ || die
+	eautoreconf
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xmlrpc)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc)
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-external-pcre
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index 10cfd491b50f..299b0c372cd7 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -1,4 +1,4 @@
 DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050
-EBUILD python-exec-2.4.6-r1.ebuild 4306 BLAKE2B 59fd3edded4bd678980e12e658996dda7bb74a140040a1902d07cfeb226bf1a2088fccc5b1f725d23d936d57404adad67e175e63b5ad7c8ca0a929142ca37230 SHA512 91017a7b1a1c10d8536d4587e0d7d27caa74cfa63d1823a354abbf47bb8e2e48022401addb3b8e7cd111a1e2ae7bbc21ae88650c795b3f573c996d220f50b596
-EBUILD python-exec-9999.ebuild 4101 BLAKE2B c9a38a540fb5548d34bb239d3f23bfd3ce3e8f8eea9e01f9d64a92218bced4e15212e25f12a28ff165a80412d7a62dad08f86f8183704da67dcff6238d6c239f SHA512 a57aa9bd6a88ea62e1f8d6b01a3c25491d4b405eda4de05f64a03575f737493700d73581ee2de2d79f3b3a681532f04433c33748a90dd615010340d44a316277
+EBUILD python-exec-2.4.6-r1.ebuild 4715 BLAKE2B 616fc3530ef6941a016a3b8dd270e4010627f7f6bf6c70eac168080d0fc4199a79d885633859fa3be4fa01e970247003c7bfc42c0dfb7e2fee704a16a425ef9b SHA512 bde8d8c34527ab4aacd164d9b31eb92acc886fc21f11f3c9bbddce6aef453f73dc892b5b65fa964f448e58900d2787d5c328372aa354dceb1d1062b3a78d4507
+EBUILD python-exec-9999.ebuild 4510 BLAKE2B 85c32e0ddd596272424d0c511dfeff5656badff0a0bbcbb596c0d38dc08c63bffed41d7237403d8bc19c204e500ce2b6ce102bdcd588ca08593436898a5a6011 SHA512 aeff34fe79ee3f082a8743cd4ecc6ed0f7abc3f63bc1009f66228e4f146b54449d94aa92404e5bb075f9d5eea042e5a5958c20378107fffd7ee14a01a010bc39
 MISC metadata.xml 589 BLAKE2B 7f9fa9750915db8b546b52a560a7fd8d9a63c4f310e423ebdc0508fe9b14363001b30f3c3db26f6d05eec8a44176d62a9335153dff2d55a41a31d3b428cc9ca6 SHA512 2ac0223af0a2cf95d2b18ef415eadb325af0094e4ec361a414b0d68b203dc1c937d3d680af96bdad1e8a48cb5786683bdbbd451f47a0f3a777c075e1690ccf7a
diff --git a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
index 18343cded128..d18086c2f138 100644
--- a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild
@@ -27,8 +27,10 @@ RDEPEND="
 src_configure() {
 	local pyimpls=() i EPYTHON
 	for i in "${_PYTHON_ALL_IMPLS[@]}"; do
-		python_export "${i}" EPYTHON
-		pyimpls+=( "${EPYTHON}" )
+		if use "python_targets_${i}"; then
+			python_export "${i}" EPYTHON
+			pyimpls+=( "${EPYTHON}" )
+		fi
 	done
 
 	local myconf=(
@@ -47,13 +49,29 @@ src_install() {
 	newins - python-exec.conf \
 		< <(sed -n -e '/^#/p' config/python-exec.conf.example)
 
+	local programs=( python )
+	local scripts=( python-config 2to3 idle pydoc pyvenv )
+	local i
+	for i in "${_PYTHON_ALL_IMPLS[@]}"; do
+		if use "python_targets_${i}"; then
+			# NB: duplicate entries are harmless
+			if python_is_python3 "${i}"; then
+				programs+=( python3 )
+				scripts+=( python3-config )
+			else
+				programs+=( python2 )
+				scripts+=( python2-config )
+			fi
+		fi
+	done
+
 	local f
-	for f in python{,2,3}; do
+	for f in "${programs[@]}"; do
 		# symlink the C wrapper for python to avoid shebang recursion
 		# bug #568974
 		dosym python-exec2c /usr/bin/"${f}"
 	done
-	for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do
+	for f in "${scripts[@]}"; do
 		# those are python scripts (except for new python-configs)
 		# so symlink them via the python wrapper
 		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
diff --git a/dev-lang/python-exec/python-exec-9999.ebuild b/dev-lang/python-exec/python-exec-9999.ebuild
index f5c7a17a180b..b37d3e0c3b6f 100644
--- a/dev-lang/python-exec/python-exec-9999.ebuild
+++ b/dev-lang/python-exec/python-exec-9999.ebuild
@@ -33,8 +33,10 @@ src_prepare() {
 src_configure() {
 	local pyimpls=() i EPYTHON
 	for i in "${_PYTHON_ALL_IMPLS[@]}"; do
-		python_export "${i}" EPYTHON
-		pyimpls+=( "${EPYTHON}" )
+		if use "python_targets_${i}"; then
+			python_export "${i}" EPYTHON
+			pyimpls+=( "${EPYTHON}" )
+		fi
 	done
 
 	local myconf=(
@@ -53,13 +55,29 @@ src_install() {
 	newins - python-exec.conf \
 		< <(sed -n -e '/^#/p' config/python-exec.conf.example)
 
+	local programs=( python )
+	local scripts=( python-config 2to3 idle pydoc pyvenv )
+	local i
+	for i in "${_PYTHON_ALL_IMPLS[@]}"; do
+		if use "python_targets_${i}"; then
+			# NB: duplicate entries are harmless
+			if python_is_python3 "${i}"; then
+				programs+=( python3 )
+				scripts+=( python3-config )
+			else
+				programs+=( python2 )
+				scripts+=( python2-config )
+			fi
+		fi
+	done
+
 	local f
-	for f in python{,2,3}; do
+	for f in "${programs[@]}"; do
 		# symlink the C wrapper for python to avoid shebang recursion
 		# bug #568974
 		dosym python-exec2c /usr/bin/"${f}"
 	done
-	for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do
+	for f in "${scripts[@]}"; do
 		# those are python scripts (except for new python-configs)
 		# so symlink them via the python wrapper
 		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 7a98fb2679a0..7fa5f36df831 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -20,9 +20,9 @@ DIST ruby-2.6.2.tar.xz 11889840 BLAKE2B 817919c078869c2ad8d5c9d8c8b7ee77e8b0e333
 DIST ruby-2.6.3.tar.xz 11904360 BLAKE2B 8113e5a19b967cdf995a3c8d3c83aeab3bf89e975d3b039c64259e97f20dbe9ebd96ada093f9d330516d16ef78bb0ecbbac8f3facd467aa13f1f70b23b992f82 SHA512 959a613f5cf5b3185a1d7a7ba0e1921166b3930f30461b391b1c9fcfe396f56dc3c736123dfc7b4e72c32a97dc5a1eb1fd7f09bcc3793a3c5526f6644ba421c8
 DIST ruby-2.6.4.tar.xz 11727940 BLAKE2B abeff89d50612d6426e1dc5fd7c15c83ef9714ddb38c64ed14bff6331c619b0a55d4a64bff49177576c3fae8cfcee30127e808f49d11b3e64a2230a043e16bd3 SHA512 930a4162fdb008d2446247908c14269fd13db4dc80bd2bb201a65a69c03f5933f97b4c5079ccd2a12db4934ff97b2debaa10a6c6f5c3060e55873f4397747eaa
 EBUILD ruby-2.4.6.ebuild 6643 BLAKE2B b2fd05964cb115f3a0b7509f176b7fb855c2feb666dd46d12bc3d7f532e9214152406df18ce2bc7081e0a0e68199e55c91c8a18aec70280e0416517c42110ea3 SHA512 f218259c93463e4a360ced99544fd147b77826ac0b40450e6461c5f34425cee7e50bcce316622dee56f71168f74720b77cd04aed80add2839b5c0c805b31af5f
-EBUILD ruby-2.4.7.ebuild 6649 BLAKE2B 475ae84754b435f87e6f8f54263f1504c587a4bf4048f7abe70d12e84e4df0e84fbd252478b4edb76ee13ddb6a94761b3045cf181976fe65dd6dc5db73ccf805 SHA512 00c66008aef631f25635425cfdd73281a61bfcbb733af0fa0fd56ac14bff03cfc14a6ec753eff157be4d9807fdde703549df877f73ee12e1543570c508edf04f
+EBUILD ruby-2.4.7.ebuild 6648 BLAKE2B 2ab669ada59327696c3606e0b7f7ec1964d66967a25053455e30f2a49b6705ab09c97c7b008f3048631aa25c98d556171127a3ff7931ade28abcb9ab9694ce8d SHA512 c8a4f5275ef2432f883f2a99f6fe5ad5656b9ecb3ecb0734a3506f0a876af451152b2095ae5a184d27ca5350f70306b266529f4d28e84b40902c5d8ca1afe641
 EBUILD ruby-2.5.5.ebuild 6438 BLAKE2B 95a3c3b1766d29dc8eed92909adec55407f435b0321eda9b9b53897395afca16672b5988e46d2f6fa1e5e24c697c2a0403f8331c0efda29fd3e03bf7c20a3302 SHA512 507daf247cd2df63cb0b7ce5851cd7e4e485492ff67b092138b8d6d19c593be185ae5efab7249cdc17f3d6ab6eebdb387f8a9abf35b59155a5675723b7ba217a
-EBUILD ruby-2.5.6.ebuild 6439 BLAKE2B 5ed061b811b200af15fc839ea23d38c4de0351b6637ea282eb4de97e97dd38192e9a8f056b4e84b07dff3b933a02b928d6b92e1673b9b739599da980ff5c755e SHA512 96c263959a7a0b859987f0c2c24f7e82397a05edd7cf41ad32a058d2a57a812665ed0f4e280772c52bb5a86c06ecdf8540d0750f2a7e2a1c749fd4cfeafcdce2
+EBUILD ruby-2.5.6.ebuild 6438 BLAKE2B 3dee873f6cc96c17d2943071e5bfba40bfbd492e04e7222b45cad666e2e29c084ecf655d36443a5d37df09426dbaf06f5609ac99a3bf6d0fc1c0786700da1402 SHA512 d025320ad4452e99c636a957be6e52c979c6b9cc9c562686a4171cde8ba7ae4d7b7e51f194317a0cab87868244cf740194ea867db57553eb3c16f52b9abadc33
 EBUILD ruby-2.6.2.ebuild 6891 BLAKE2B 5e59babfae786171568cfad90b3111cfc543667a0e41afafaa453c9447c21377c9cc20e6ffaf1d5fe6621d8664df73edf48913818b72dd725aef076164c962cc SHA512 c7dd27222c81ef318cd42f2222912ab9eab62015687d7589306457f5001f026b0f330317ce1115b78ddd23278a333c0c3b8052cd37f900966cf1f9b6652c601a
 EBUILD ruby-2.6.3.ebuild 6891 BLAKE2B 5e59babfae786171568cfad90b3111cfc543667a0e41afafaa453c9447c21377c9cc20e6ffaf1d5fe6621d8664df73edf48913818b72dd725aef076164c962cc SHA512 c7dd27222c81ef318cd42f2222912ab9eab62015687d7589306457f5001f026b0f330317ce1115b78ddd23278a333c0c3b8052cd37f900966cf1f9b6652c601a
 EBUILD ruby-2.6.4.ebuild 6891 BLAKE2B 059de0ac210fbac3e69eb0905b6363dd17c6cf9851e13d980413f4ca2d2d0f4622753a2d01764bf46b60faaacd0c85fa2ca4bf799cc13e68d68dd9a949de0686 SHA512 f2e334927ec9a3ea69f44542367d408bdba0cec9a0c511010dd1a7066cbe1aece971a73c7c816af49de8d91cfdce73cc134eeff6f3709462f3b4f6fc86014f4e
diff --git a/dev-lang/ruby/ruby-2.4.7.ebuild b/dev-lang/ruby/ruby-2.4.7.ebuild
index 728daa1020f2..674de06cf22f 100644
--- a/dev-lang/ruby/ruby-2.4.7.ebuild
+++ b/dev-lang/ruby/ruby-2.4.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-2.5.6.ebuild b/dev-lang/ruby/ruby-2.5.6.ebuild
index 36623a66a2fc..f485382282be 100644
--- a/dev-lang/ruby/ruby-2.5.6.ebuild
+++ b/dev-lang/ruby/ruby-2.5.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
 
 RDEPEND="
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 92867d7b0c11..f5b84cb6ec31 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -9,14 +9,14 @@ DIST vala-0.40.15.tar.xz 3406020 BLAKE2B aaa2967a140fae94b4609f4b54f2e37c71fe794
 DIST vala-0.40.16.tar.xz 3412776 BLAKE2B 0cfe072ce3dfd8b95e804582899ff002869bc005b93ad1ba68e9b085e12444a3ef967c6282d65bab7f8302018edc075077ae8de65182b9123f8f74a91ea062bf SHA512 e37c8573fe6104c0ad6f29748cd28564638d62ebe499ce084481c74d2601a19334c431575904fbbed490b44ea117246516580a5d658dfba30c63de7e7c3fa3e0
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
 DIST vala-0.44.7.tar.xz 3355928 BLAKE2B 172e9fee6edec63324b9babc125d2bdb53c2025b2cb86339b54a4c8017ccdf78a848076fdd6a8f5200c15c48864542d711896160f78790d36a29d30980177d34 SHA512 5a645e1b1929644ec6b53d06895afcf62d41d6fd63f82c3be3aa4e28847173071621ec857cb973df38d36e60eb960954c2fb48fb4189e1afcbb25a2376ff0d77
-DIST vala-0.45.91.tar.xz 3358640 BLAKE2B e51e1e30042cce60f58f9c63698222d40e719f2cd9258d264bdffc2226cd0c126dc0c256d557a2bc600cd2c0cd9f1f55987f9e96ac666d9d57fdd7b1501afb1d SHA512 7bddbd0d711b50154be6e6d3ebe0576c3ead0f533a0b177c3eb181555eb3d096353157cc490b49c9453686e765739283e30d3881652a9bfb82baeed9be4817b6
+DIST vala-0.46.0.tar.xz 3362148 BLAKE2B d0263aeaf19477e1f511004456f8ac575a7de406179fbf152d2e8c31cebc70570fa4072102007aa57f5a019a340401a2b0610c027c987bc10bafcd9dfdad7fff SHA512 d7d31926936251054b66c3e53df264bafd0ee56c4c2168bc77eea3308d80a0b5b250eb4cd3df31a4cbef8b1954a47ce70655629910e071bf5b46ada47aface2d
 EBUILD vala-0.36.18.ebuild 798 BLAKE2B 6def4d1f13ee1fd84f2405da15b6cab064ec882b2ba4fd497636966414308dddefda9357d0559b052277476becf2856ca923f62007f0a319ea90cc3a0fcf572d SHA512 2bbd7d899f35cfbe72ee2c9304ff2d68e87babb06fa6f8c2ea94edbe95cb3b039e33e565d5af6cda978cf6e8517cc5cd51f763dcf6f9963c5c5ae30ae434555e
 EBUILD vala-0.36.19.ebuild 799 BLAKE2B 6dad69eb7e269525d33eba9e093a41a521b4de2eb6b7f4b933a2eb4e377de2c3dd6dedc0f17c03c4c0d77c85913b3d61d4d92f6b225a237a17c0b1bccc6a5100 SHA512 4a492eb53d12c62d04c5f4b574e71c88a81c28291682ac16a0f4ad02263193860fdf0f965a8c81e9aadca79e62872e833d3db8d5f97833b3a40971d2d1739c6f
-EBUILD vala-0.36.20.ebuild 803 BLAKE2B 9bdfc3b9ea2ad19f212ecf671a73e1a7a285ab21d125590755950551366bc368855102e3f91b304ad975bc6ac2e0744130629ae56643a92210b97cfef1896d16 SHA512 a19224046df529f1dc98159e92b32c57a18c89a4791ecc2420182ff047bef6bd77461c3dda0164e7af8a33981180b15a0d22ddfcca4beffabf2887a12629698f
+EBUILD vala-0.36.20.ebuild 802 BLAKE2B f2aa221aad5963948a3cda66a9d3a5d66ffe661db95f21af025d8b9b22fd7b1ffa48f0eb651f39ff636dea01fe0bdbf816623f01c077d2901ed14f7f5eb27d95 SHA512 e757c2eea5df6529b70070fe9c966de9342dcf936c594607be41ed2cafcdf7db90c069c6ed59dcbdc18d835eecbb0346431afa2cd8cf74c2d35562d922156dfd
 EBUILD vala-0.40.14.ebuild 1185 BLAKE2B 1cb8b3efdd6f010c5524aabced06132f9f90920d3345e216df0dcb555ab2d4c10afa196271b2623d71d5b4dc57ce2705677275c1da7c0099925e82d5cb1eac26 SHA512 5e271726a2e71902440df5c03897f9c1960d83bb6eff5d2f4a1213d791190a2f34a81fdefb165427c9ca3a92aacdc801c5bb4be5b98fca27ed0b9adafc4d5158
 EBUILD vala-0.40.15.ebuild 1186 BLAKE2B be9ce6de6adbaa89caaec477d2cc774af7f55533d217d74845e780b628e0d17cd124da1a7f8312b8b4f30f74eaedd4d556647f13934c953e0831bce0413b6c87 SHA512 915aabe3dac3f293517e3166c7aff81591b3aadca06034ad3ac2aa53ae3b8f6d6262fd6acbfde54f2cacaa9ab9fd5454ad611c009f909e3cce8184d256245689
-EBUILD vala-0.40.16.ebuild 1190 BLAKE2B 6acd9bc1639f16dc6ba933abd675903ab68d832170eb6342caddea8dc4a8a6ff6c7fcea12d42b7f9b2a9a4e059f96ddc499f97baf9f2612061000c9116426c2f SHA512 543ee0e1469bc4d569bc6b97889d2ba14d2175ddf3104eb56bb363ca9f0968ef0de04e679d830a9a2011ce342cb07657a7f6af770ce426f15027de8af228557c
+EBUILD vala-0.40.16.ebuild 1189 BLAKE2B b6cbda5e4ea712ccdece61e847f88e82c511194306a70e5e48829f455e6c76c1a50c840c831702c8bb8412cdfcc4aa1fc9d24d915df98d89cd40200ebbdfcb1d SHA512 ac63b83443f6401fb2ff4f863becc85152d14613827f59c5617cfe014a9c2befe005c66cfeef14ba2eecb7ba9d480010bb71068438532b77264d47fc1b3ef9ee
 EBUILD vala-0.42.7.ebuild 1185 BLAKE2B bbf7accf72f7d5370762acdbcc44efe46e56a05b4a08a5cd7ada34ecb81ce6ef30a1a96880ad0a8ca38b264f06a10e464aa11b4c2e15119a4c84485cb358c42f SHA512 1d32eaa0fa1883351b774cf31863624d595f2b840383b14d88790de48ccea776a498bb9bef7dddace1878f9a1fa2b59ef0e9c4e23a881a1238165a62d3b2781e
 EBUILD vala-0.44.7.ebuild 1118 BLAKE2B 7cbf0d0ed9c91f24e4089e0f3399e9c1b37b5a4f3d437323988d6b2ded2c7fefb58c5e3628f42a486ca8efc32cfed41a22bb339509b129f4949dfa77795a402b SHA512 173584f83ac6b82bb35ea858f5898a4e88ec6f3c84bd2efe613f3aa46a710447ff8dfdaf7e707bdf197caf4e142c2a12f22db5de3e29894aa496f8a7c8396df4
-EBUILD vala-0.45.91.ebuild 1311 BLAKE2B 86cf90f253b4a0901da423160e9bb013a7726ad3aa56f1e2db5b668429493331e123049806af5912b68ff9ea785be484b50b773c67864243718eb645a81ca742 SHA512 c11f735374ef683a908279cded712b0120ee0dc5c5836b688800c1ab6d6c4e9b5e8facc9aac2b6d9c375c74fe0d5dd914e807f003a6ccdc8d95ab303ba56d58d
+EBUILD vala-0.46.0.ebuild 1311 BLAKE2B 86cf90f253b4a0901da423160e9bb013a7726ad3aa56f1e2db5b668429493331e123049806af5912b68ff9ea785be484b50b773c67864243718eb645a81ca742 SHA512 c11f735374ef683a908279cded712b0120ee0dc5c5836b688800c1ab6d6c4e9b5e8facc9aac2b6d9c375c74fe0d5dd914e807f003a6ccdc8d95ab303ba56d58d
 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283
diff --git a/dev-lang/vala/vala-0.36.20.ebuild b/dev-lang/vala/vala-0.36.20.ebuild
index 8065118e097b..6b540dec378b 100644
--- a/dev-lang/vala/vala-0.36.20.ebuild
+++ b/dev-lang/vala/vala-0.36.20.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.36"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-lang/vala/vala-0.40.16.ebuild b/dev-lang/vala/vala-0.40.16.ebuild
index fada0b1047f8..18e37a04e68d 100644
--- a/dev-lang/vala/vala-0.40.16.ebuild
+++ b/dev-lang/vala/vala-0.40.16.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.40"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="test valadoc"
 
 RDEPEND="
diff --git a/dev-lang/vala/vala-0.45.91.ebuild b/dev-lang/vala/vala-0.46.0.ebuild
index 48608c5585be..48608c5585be 100644
--- a/dev-lang/vala/vala-0.45.91.ebuild
+++ b/dev-lang/vala/vala-0.46.0.ebuild
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 8f552173cf5a..35624bdc82d9 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -2,4 +2,5 @@ AUX zig-0.4.0-r1-build-artifacts.patch 2149 BLAKE2B 7d2ac6a9d3cca4a13a4ad932f71d
 AUX zig-0.4.0-r1-suppress-warnings.patch 1106 BLAKE2B 3e4cac7325789a3ef954f35814a63e554710afd00d5d913c1ae597913df05409e475cea652b4219f7cf1a8c0233391cf4bd82fec19f98552f66df5dddbb5d4ae SHA512 a401c6c88ab3b1f8e5344502a53b9c2157ff310625735b54d9e91bbc4c726fc5e97ea3a1678cbe1fe6bf7ce3087f6ef68778900c40fb633daee96f2bdef3dc2f
 DIST zig-0.4.0.tar.gz 8924757 BLAKE2B 5ca3377f205694ff02360900b49eee7347cdf1cdaef90f1be071eff2610425ed453dfb35928fbe65b25f151b7153ab838c887d362ed3cd746f07833ae42510fd SHA512 423915730bc4ae9a67db3731a96471467826d16e59b87b3541f3e8ed2436f941939f22ccbebdb9a958a195b05360eb65f5be1658b32a01cc8db55c6e581eb039
 EBUILD zig-0.4.0-r1.ebuild 1250 BLAKE2B 43219ec7395eb7bb27a1d039c97773e76bb0d3b19656b692b804ad5bd991200b89bfd0af7c4b9bdc56f93886533243f3d0cbc411b2d5ce34f63906712a498665 SHA512 d61ca59a5205c8bdcf113ee0f317763808073b9e1480c551b1a71b34fa4e0bc3dc191e8961fdeb0b1ebe283b6f504c9403ca2c138f8afabbbf9200a7729e56f1
+EBUILD zig-9999.ebuild 1536 BLAKE2B a30bd58d1d13c793b3d236ca8cb984c60c8b5f85942368b5d4bf996827bab60fa797bfb5a17c8f73e3b6a93b32ecb1591395ae2358c621a4aeadabbc536718ca SHA512 110251909cc152897b89ae14aba2c6bc7417db9453ca2ae609fb4838bdbe1d00eacbe45ab162af340d7e2f6553e3b6e4a622806c89d5d6f73d0adc6b111df7c7
 MISC metadata.xml 549 BLAKE2B 1f79da87db9888bc7a1c12163f7ee36dcb37645f5bdeb61034144f76b03b7e464c05f62a8753b0b85fd0ed4fd33ea1066da552d29d28bdd2502918697b3d94a0 SHA512 5867cda8d47f181e93b4aa4763efa5e12d7a6bbf1001e496cd82cc892a43b144a2d8a0a4d26466ac171622acf3590866d9d75a16c8337ae06734d5d4f8b2e908
diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild
new file mode 100644
index 000000000000..055f1f17b8a7
--- /dev/null
+++ b/dev-lang/zig/zig-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils llvm
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+LICENSE="MIT"
+SLOT="0"
+IUSE="+experimental"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX
+	PowerPC Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+# According to zig's author, zig builds that do not support all targets are not
+# supported by the upstream project.
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
+
+RDEPEND="
+	sys-devel/llvm:8
+	!experimental? ( sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}] )
+	sys-devel/clang:8
+"
+
+DEPEND="${RDEPEND}"
+
+LLVM_MAX_SLOT=8
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_prepare() {
+	if use experimental; then
+		sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
+	fi
+
+	sed -i 's/--prefix "${CMAKE_INSTALL_PREFIX}"/--prefix ".\/${CMAKE_INSTALL_PREFIX}"/' CMakeLists.txt || \
+	    die "unable to fix install path"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCLANG_INCLUDE_DIRS="$(llvm-config --includedir)"
+		-DCLANG_LIBDIRS="$(llvm-config --libdir)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c704af5a8192..c38f3cd367fa 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/actor-framework/Manifest b/dev-libs/actor-framework/Manifest
index 040c8c23ec67..c30b86d4068b 100644
--- a/dev-libs/actor-framework/Manifest
+++ b/dev-libs/actor-framework/Manifest
@@ -1,17 +1,9 @@
-DIST CAF_0.13.2-benchmarks.tar.gz 46365 BLAKE2B f663bc5294ff2de9af2a2ed365961440f36ade8595e363042b40e390db75e84c217d4d3019a6f78e61eb18c71116a498233f194e02e43eb86bfc4b867a89b5d1 SHA512 8b0bc0ad21b454c70fbeef50bce3246a87b8f5ff0bd10ccd196aa2f6c155e252863b1c22e98c589519a5efc43601172dbcf1f9f2e961d49d2babd4f548b0b672
-DIST CAF_0.13.2-cash.tar.gz 7705 BLAKE2B 7c0d8142c52721cf9ca2dd8ad2762af7f812e2e4d754b44996881cd3acc9664843ca1d8dd6ef7bbbe616bcf660319f955c1d4308229d6b45d38a3a0e6ff36d49 SHA512 a264bdc9573b71675b7a8c30fa1a985d1b7e5c39b603b01b53660f52bfcf09c4bd80fe942ef917bc0ecbe305941bf6df5f0305b43d1cfc015992fdf7520e2911
-DIST CAF_0.13.2-nexus.tar.gz 2920 BLAKE2B 87d1df36df423d4c8f88394e6fe5297a5f9b10f825195cfb3c84815c9be7ecd882c921345d802dd40163f447a62f95a1ca9e8e47b5116ee828d9b78670b4fdc6 SHA512 4991ae663bfb5bbb71be9c17c23bef29903d2b797299d52cb68cd5f02681c826ce495ff2badc66442b7cdb0638bfe94209e5226ec5ee3031dc1a63573fe94ad6
-DIST CAF_0.13.2-opencl.tar.gz 15040 BLAKE2B fa92cae918a8a82776e52e7e98bf3616398a9588f70278755201c251e371fffe532c04df31258d00e081b6a88e499deea4e7c3c9f182ad69fb365871c97db64b SHA512 bc18469d2e63f504981cc803e9b08698c4eab100fbbe412caea674a619eece9c30f1ad9537eac833bd55b08ceb92cfd6a1f539ae8d908b46a682712b91d23eaf
-DIST CAF_0.13.2-riac.tar.gz 6481 BLAKE2B a0b6b2c496109bef23ce63893ecb2b91e973ec646b6bde7e87cb0188f12d4564c8a1199a46f10400a4cd54cb1b0c2fff7e3950bc64f1b200a91bb5e0c31b0479 SHA512 ceba0926fa8f28b3af74f6af1d464934674a67daf74abd8c23547b464a64247fbcd5a7cc58d1852c616c477d50ad7b3f9c827b16cd32d81dbd3b0fd4b4f3b2e4
-DIST CAF_0.13.2-sash_cash.tar.gz 36108 BLAKE2B 845be2db87736d673719fdb8305930e307532f45bf48cba5adfcac6412400837d3ac2feb914ce2234cd744dfd5dfcddf6620549035a8f3951ddd7576b9848088 SHA512 e78d694268ddb0979781a0fc1ac9e7d70d4bfa73579afa0008e0b58bc0d7f9d853aec25a4badf90d6d398f9538b46ecdc25a66dfed6d24b9813e3100eec07aff
 DIST CAF_0.14.5-benchmarks.tar.gz 46245 BLAKE2B 1e9477faa604bad9ac73ee7d8fe58bb793f0120a733eddef881fea0c0717f292059190e813358bb089219bc75ad3e581ea120dd84553ee4ef33809ebafb427ec SHA512 11edb5337be18b106c852fe95a7a0d50c9eaf2c21d9e64cee84a60d2e8443083447440a463a24d6cf376bcae421a0d5942b1b3fa6debb7f7102dc8648d1bb15f
 DIST CAF_0.14.5-cash.tar.gz 8182 BLAKE2B 59c1e66b05f509d3d126cd5026949105d9ffaae12013262749e7775ef41b01e725769ea2cd2bcf762827a9b8be1bc970cf1d39c8405ca6fd31a0be949c1f9621 SHA512 0e4fe9dd433a6dc353404eb1a10b898c8589db455f550bafefcea3b0f04659cab3e2b63e353b5dab709080aaa1319942fd56d9eaf3c2d0e244f6eed202f81deb
 DIST CAF_0.14.5-nexus.tar.gz 1510 BLAKE2B 43d09f1b1d4e6202d7c4e4c0b09402f8cfdd38920d9e6b99c0948602fa267fbdd6f285a76935ed7f58d9abae6ada93da6459a1daea5204a4763e9113ed543b27 SHA512 e71cfd629adf83a3fe5a0a33656d9cb499bb4de10cd73fdccf81c9235cc69b277de63dde035f9cd28c8dbc9a6311ce45af13e3d40d14b6c07c5ad9b714dccec1
 DIST CAF_0.14.5-opencl.tar.gz 22047 BLAKE2B 1ea9c4c76b5711a0f4122c1f6a8982a39319f3a8e9accdc1985a39fc01ea83894bc6f51ec0d4bd0f1dfd0ab55f3ebf06def23cd875ddf2fdc30844a8fc106811 SHA512 fb8ea40b16be7646ede25f054688945b21b90719526bdefc786f80581b3f1472945c643f4cc1641f1688252e73e0a0d388e4477c8055b685318d6bf1639cda00
 DIST CAF_0.14.5-riac.tar.gz 8452 BLAKE2B 31e06f80e90b877e085038439a5437d392095b10a0d9f5c643a53ca8c0b0f215fb308030df54bbfde05ab6b130d78c87325271f9418e1352906c25300e58c212 SHA512 b4a70548dd2a839dafadd091334a367d1ba7c8632c47f8df8f6c3ee730b4b4b75c8e00d7c335d719dd9f044e0d40436ea265b7717940ac81531b266b8cbcb5cf
 DIST CAF_0.14.5-sash_cash.tar.gz 36600 BLAKE2B 85e698f774948628779736a69631862e07a6a579c0d05b739fd2730b518701c6910c5744b5f685f45987bdfb76a868206fcefe1087b5b248ea6c2f5493005e6f SHA512 dc90af883553ac67ff8e7bfcc2213200892137a5f9bcbaab95561898bacddaa5687a39a23eef7fd08b9be54fed2816d4c7d6bb31848cfbbc337ac81312f68542
-DIST actor-framework-0.13.2.tar.gz 570416 BLAKE2B e149737c7259d04294fc2a2e15a12eea740de50328f637cbb8b27bbab4411228cfa89e83780c294284f36bf18dab604c95525e1c0afe57522d958349df951950 SHA512 fce8eaec477a1d1f141e631b3160eb4f39d6334023b325545035ab20546e4920cd9418378bf5bd6fadae995d793dfc618309556b541cdf125b377ba413658e6e
 DIST actor-framework-0.14.5.tar.gz 1239461 BLAKE2B 33fc2aee5decc138d3489df9168364efd73781d963b8b5d371bfdbbeb0b1b812489c982099692e2125f4a58f4c0e64c13fa4954b95ed738336ad614cd7bdf162 SHA512 6bf9cd9868b633cdd249f4e5d503bb9d489a68f5a86e9ba505b3b65984ecf5d931878620ace504a8baed34da7a396a68a7c425ba8c8afef15e0557ed9aa19be9
-EBUILD actor-framework-0.13.2.ebuild 3618 BLAKE2B 78afd86e6c9d4ab24d4936a09819328347ff8d0228ad44d6efc70deb8479e32b4775b2ca027370e1d6bcdd9909e73e95bf89576f6f453e1d9f7c051ea2733df9 SHA512 b8ceacecf1139ba562ffd804319a4e7252e9978b1ae412321175f2f4fb5c173213a085c954c1d7ff6385175a1d6e84fcc2f9ff9c0b76bc35b0a4b3117b34aba6
 EBUILD actor-framework-0.14.5.ebuild 3605 BLAKE2B b8aea37d42f8120c27d3232f3382dff58741dcf18d59c2df47b7fd31abd73e507e0dce65307c9c449649184ba1dbd633256135a544034720288df4f079571ca9 SHA512 3b4978bf1ab416e79ded80ccc679e988fbe54d40ad5b3f977de27e4c2d442077bcd0536f79982d20cdbc338cb79d5527a107aa6ed8fe976e94e75dc6f82e7e46
 MISC metadata.xml 1327 BLAKE2B 9019ed54e682bb647a7bd0168d17e36efcaac7966ad1bf1164bfdabdff51aec613e6a568b6eb957f7249e5cf117a6a80417e19936a11d6883c6fba6cb171d8f2 SHA512 a984b1557bbe7845f587ba500bdc3396fb878868ac8b04295c2a2aedeb139ea1d18ab926ee484aae79a09e6c995428afaee92ee79f396db3cda9ff6be3783f6e
diff --git a/dev-libs/actor-framework/actor-framework-0.13.2.ebuild b/dev-libs/actor-framework/actor-framework-0.13.2.ebuild
deleted file mode 100644
index 49242e511bc0..000000000000
--- a/dev-libs/actor-framework/actor-framework-0.13.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic cmake-multilib
-
-bench_ref="78c746269bb53ff0b2026e7b1a8fe11fabc69e64"
-cash_ref="847edfb18afa6b755a91a203872bcd66bbeb5868"
-sash_ref="9da5a40793d77e7f6d3afb504cf02c0acb59d35c"
-opencl_ref="91ebbda2986f3f32a873d02ca5eb550f26c6b70d"
-riac_ref="855e725739b7688290f66f592f858149c92375c5"
-nexus_ref="90d42335ff3a2fe67ac4ae41a844f0b245bb123c"
-
-DESCRIPTION="The C++ Actor Framework (CAF)"
-HOMEPAGE="https://actor-framework.org/"
-SRC_URI="https://github.com/actor-framework/actor-framework/archive/${PV}.tar.gz -> ${P}.tar.gz
-	benchmarks? ( https://github.com/actor-framework/benchmarks/archive/${bench_ref}.tar.gz -> CAF_${PV}-benchmarks.tar.gz )
-	cash? ( https://github.com/actor-framework/cash/archive/${cash_ref}.tar.gz -> CAF_${PV}-cash.tar.gz
-		https://github.com/Neverlord/sash/archive/${sash_ref}.tar.gz -> CAF_${PV}-sash_cash.tar.gz )
-	nexus? ( https://github.com/actor-framework/nexus/archive/${nexus_ref}.tar.gz -> CAF_${PV}-nexus.tar.gz )
-	opencl? ( https://github.com/actor-framework/opencl/archive/${opencl_ref}.tar.gz -> CAF_${PV}-opencl.tar.gz )
-	riac? ( https://github.com/actor-framework/riac/archive/${riac_ref}.tar.gz -> CAF_${PV}-riac.tar.gz )"
-LICENSE="|| ( Boost-1.0 BSD )"
-SLOT="0/13.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost benchmarks cash debug doc examples +mem_management nexus opencl riac static test"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-tex/hevea
-	)"
-RDEPEND="boost? ( dev-libs/boost[${MULTILIB_USEDEP}] )
-	net-misc/curl[${MULTILIB_USEDEP}]
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )"
-REQUIRED_USE="cash? ( riac )"
-
-src_unpack() {
-	unpack ${A}
-	for i in cash nexus; do
-		if use ${i}; then
-			mv "${i}"*/* "${S}/${i}/" || die "died copying sources for ${i}"
-		fi
-	done
-	for i in opencl riac; do
-		if use ${i}; then
-			mv "${i}"*/* "${S}/libcaf_${i}/" || die "died copying sources for ${i}"
-		fi
-	done
-	if use cash; then
-		mv sash*/* "${S}/cash/sash/" || die "died copying sources for sash"
-	fi
-	if use benchmarks; then
-		mv "${WORKDIR}/benchmarks-"* "${WORKDIR}/benchmarks" || die "died moving benchmarks"
-	fi
-}
-
-src_prepare() {
-	find "${S}" -name CMakeLists.txt \
-		-exec sed -i 's#\(install(.* DESTINATION \)lib#\1${LIBRARY_OUTPUT_PATH}#g' \{\} + \
-		|| die
-	rm examples/CMakeLists.txt || die
-	append-cxxflags "-std=c++11 -pthread -Wextra -Wall -pedantic"
-	append-cflags "-std=c11 -pthread -Wextra -Wall -pedantic"
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCAF_NO_EXAMPLES=ON
-		-DCAF_NO_BENCHMARKS=ON
-		-DCAF_USE_ASIO=$(usex boost)
-		-DCAF_NO_CASH=$(usex cash OFF ON)
-		-DCAF_LOG_LEVEL=$(usex debug 3 0)
-		-DCAF_ENABLE_RUNTIME_CHECKS=$(usex debug)
-		-DCAF_ENABLE_ADDRESS_SANITIZER=$(usex debug)
-		-DCAF_NO_MEM_MANAGEMENT=$(usex mem_management OFF ON)
-		-DCAF_NO_NEXUS=$(usex nexus OFF ON)
-		-DCAF_NO_OPENCL=$(usex opencl OFF ON)
-		-DCAF_NO_RIAC=$(usex riac OFF ON)
-		-DCAF_BUILD_STATIC=$(usex static)
-		-DCAF_NO_UNIT_TESTS=$(usex test OFF ON )
-		-DLIBRARY_OUTPUT_PATH="$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		emake doc
-		emake -C "${S}/manual/build-pdf"
-		emake -C "${S}/manual/build-html"
-	fi
-}
-
-multilib_src_install() {
-	DOCS=( README.md )
-	use examples && DOCS+=( "${S}/examples" )
-	use benchmarks && DOCS+=( "${WORKDIR}/benchmarks/" )
-	if use doc; then
-		HTML_DOCS=( "${S}/html/"* )
-		for i in pdf html; do
-			DOCS+=( "${S}"/manual/build-${i}/manual.${i} )
-		done
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index 4a72a2423b81..187813c118d0 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -10,5 +10,5 @@ EBUILD boehm-gc-7.4.2.ebuild 1248 BLAKE2B dfc41bb8278e4dc25ce02f6ee6c48d74111904
 EBUILD boehm-gc-7.6.10.ebuild 1382 BLAKE2B 3de675fa3d346ca7ea2c94ab32e1b7f09fc28a5632365e159e6081785c95e3fe302c1a54d2be3b4ada0ed4ce81080c331cbd52b40afb3b422bb4690a9cc35628 SHA512 1ded4ce2941cd04c7f06991803c6402435d43f587bb5c7e98ee6da0642115284d2b859636e0f6d65d12225bf84e21ad905046bd2c8a89bd9e6e70d01ec89c124
 EBUILD boehm-gc-7.6.4.ebuild 1371 BLAKE2B 6639a3da75dcd877ca4d0396619bc5256040b3e3fb9f2b38dec22bb72bb4f51687cc5722cac8b564632459fda7e69f44417f15ddc22e0c03eb14a5ed0a0bbc0c SHA512 940f6d91db5904b846f4e10108c472d9402ebe383ba76ba74b025336f1eca867c7361bfa8127588ad612494cc1c79b74b52b8972bd8fa78e2109f17d17ef0f0a
 EBUILD boehm-gc-8.0.2.ebuild 1380 BLAKE2B 74f6b8a142175c187959d6041b930fce4e96461677312de1cdb418d6983093da979eaed7c0fef6d9d3e9dba8952168348706b866a064e18cb000e892783552aa SHA512 8e56b92e1d1654ae1f7b74dfaf6feb975adf6e07ad8a07bdf3b61d7ed55b24312e7dfeab6e18edfdb34a511e90885942138ad48c934cc02fffb3bc0403cf19e7
-EBUILD boehm-gc-8.0.4.ebuild 1387 BLAKE2B 176bda007a0a91f0248d01230b0aff15ccb8304b7d4a988f249d78caba03585ade0086a97c97e6f6b1f43f6d28fa1c073f1b90174616111704eba12cd711de4c SHA512 303611df723241e67fd03e73aca5c863fad719b3a961274138c842c35aafc06cb6b1b75e4c0cd3315d448d27b8ddf5463bd58d572aa3baefd5a77dd150c64b01
+EBUILD boehm-gc-8.0.4.ebuild 1380 BLAKE2B 905fe659236563f69abbe522c352980f8d2e02ac5c0ad3e4857975c3330df7cac65707fc27fa71c34b8669b80c991dd03b97dcfaf5b663754beea3f245f1746a SHA512 f761f4774e40cd2627708700bc105500a2ab5814000028153ad1e3c7ad7482c76caa614c7466caf0d5d2590c8bcdf23964a3146499d4180428f734f8300159af
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
index 9c7b747a2e59..c5d611379c00 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="boehm-gc"
 # SONAME: libgc.so.1 libgccpp.so.1
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs +threads"
 
 DEPEND="
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 2d958dc05284..bd9c47dfdc35 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -7,4 +7,4 @@ DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3
 DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
 EBUILD boost-1.65.0.ebuild 12435 BLAKE2B 6d676b8dad7340828f95a16aece6296c006cae693a1ee7bf2e8dbcb82da443f8aa0c460eaf2ab1f5f0a5c26ec50073db463919c3a3cff2015065d371b1bdc375 SHA512 f04be75c396b21449cde08f40a79e40a733fba706a7170fa233d0c6a4e568bb55d9a539ec9eaa65316de41e24c0b5e739f3ca08fd6a8760e1999caf6c2b0a688
 EBUILD boost-1.70.0.ebuild 10162 BLAKE2B 67b85064587e5f5efdd73492914dd650c53fbd00d4fcaaa02982308db30f77f7adca171b22f0be37d478a56861a61ac74d30f1582e8d5e053c770a19c331d893 SHA512 85c2302eb83645f0e9033efae07acf8b2c66ba1bdaccc8597509a8ba6e001913ac1e235257bf248fab2590761db881f1a2fca8ca093b0331d52cdc6be48eab63
-MISC metadata.xml 1343 BLAKE2B ef8b2150e8e0b69fdb1c6878c8ca7da10bf74a896514139b6e00053803d9e4271e7144661e975d0b497ba298e8f9ae74104ce7ccc4ef0e824a6db8695b0fde14 SHA512 4fd2419b80d6f55d5cd41eb6d464d6a04b036e032a5f5361d91f2911190129af017b6b15203ac282c88c3f256cfb0d171d73b51d1a0f3a570e4a23076f5bc2b0
+MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
index 9d4579b80fb2..997c258c600f 100644
--- a/dev-libs/boost/metadata.xml
+++ b/dev-libs/boost/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="tools">Build and install the boost tools (bcp, quickbook, inspect, wave)</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:boost:boost</remote-id>
 		<remote-id type="sourceforge">boost</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/cgicc/Manifest b/dev-libs/cgicc/Manifest
index 278dd5317b14..2b2c8ba73561 100644
--- a/dev-libs/cgicc/Manifest
+++ b/dev-libs/cgicc/Manifest
@@ -1,7 +1,5 @@
 AUX 3.2.10-fix-pkgconfig.patch 419 BLAKE2B 345f161cc6365dfc34e9740e83d44378fee197849dc2a79e96a40e205ab979970ce530a4e701efd5c3fd9e02e0de96987648b6244bc7b2b09514554b8c747789 SHA512 f2b688795317f11f67070b94227ef75afed02353cba5d0d98918a6107fc3a1ec107ab1b33ec29b32047098ca0d2acfda087016eef7de16be58af72ea7dd53977
 AUX cgicc-3.2.16-fix-doc-building.patch 812 BLAKE2B fe7a218331dca0618ce473d60968241ef19d5cce0008bb20018f0effdaa63a5f5c607b0f78df3eefbfb49cd2ed37e2f77d8a65bb781fccaa6014311986618f2d SHA512 c31d72d32dc0df5ec5b5d2286865e969d4ec432b3551c533d2b23c1acae8c4a821ea7891980f2af22da16c71f0561a19a38070a4394f43b4cfc4ec9ec5ed51e1
 DIST cgicc-3.2.16.tar.gz 1409037 BLAKE2B 414f0f9e1cfe8cac0bc55ed34bdd6d745595e2fd55329923fa47d269bb7abb3f1d2761ff9810c96930657c563f5f8aa5285c58943fca072273af3088205629ed SHA512 3334777204f3de57e80f759503db08076fe8e7a12cf779bb50345e7d06c6be4cc612b473bd74eded5debd79684b49c5bb79bcfff1b631a815c7fe9d14960d537
-DIST cgicc-3.2.9.tar.gz 2087796 BLAKE2B ed8049397edb1a232c4636e27bd6e37153df853e08b9a4c9cc34a0f7f196cd1fddb32f968a6bd63bf669e482781f1706ae61c3b5c1e07bc0b5a71a24616f4ba6 SHA512 bd02750a0ad81a64c017e8ccf6cee0c6801506bdc00ea4b0a5e4ea28e35e453122e3e25b3578cb1cb7b22011d5147b99ed79bf7c4702d4c7ab404096aabca623
 EBUILD cgicc-3.2.16.ebuild 937 BLAKE2B 1770a5d37e03b1fa9ea56ba19393ab75fa3855ec6dec254df8a3efc079ec122db7da54757684d18dec53f022a5299d7bbdc6fb8075a14becd3ce80423817acfb SHA512 71f02a35b62b36e57064776817b4407f5ab32d404f8760e92a93c4131fce786536cdbd0807636df5c8fff23f11589b9b36d7fd1b21596b176291c37bc6d0047c
-EBUILD cgicc-3.2.9.ebuild 898 BLAKE2B 7b1d06160131dbe1640af50e8ececacba051be1af684ffb63bdfbf3230f9facdf854de054f18a9f9d390d293bb7f1ba2be2690a168150ad184b212f1a596c35d SHA512 429e72a2428969da7d93ef99f6be25148cc25f980305bb929957ff8775a2dc1308f31d972e48dd653fe74bba83a09b23749e663a2d83a427f3c58ef42c97f77f
 MISC metadata.xml 796 BLAKE2B 8b502996ad54d8dabf3c8279440115f39fb64bb70c1e72bd5ddb90b224f0103c0e011dc0f5985b5fd279a3bd24a05e98d6ea2f408d13cf7881b90bf71efb230f SHA512 5cf675335892f7f230841d62bb77fb947207869083f340c735d3a5b78d39b43b9f0cb911e206f854c2291481420e72fea1abcde2853566b2e6fea858b2695fbc
diff --git a/dev-libs/cgicc/cgicc-3.2.9.ebuild b/dev-libs/cgicc/cgicc-3.2.9.ebuild
deleted file mode 100644
index 393b55599081..000000000000
--- a/dev-libs/cgicc/cgicc-3.2.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A C++ class library for writing CGI applications"
-HOMEPAGE="https://www.gnu.org/software/cgicc/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 doc? ( FDL-1.2 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	if ! use doc; then
-		sed -i \
-			-e 's/^\(SUBDIRS = .*\) doc \(.*\)/\1 \2/' \
-			Makefile.in || die
-	fi
-
-	econf \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-dependency-tracking \
-		--disable-demos
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README* THANKS
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/contrib
-		doins contrib/*.{cpp,h} contrib/README
-
-		insinto /usr/share/doc/${PF}/demo
-		doins -r demo/*.{cpp,h} demo/images demo/README
-	fi
-}
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index b4a3a6d72389..56c705dacb1c 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -2,4 +2,4 @@ DIST confuse-3.0.tar.xz 449144 BLAKE2B c8e913aa8b074d55535c35ddce7de1a0f21dade78
 DIST confuse-3.2.2.tar.xz 473912 BLAKE2B d8df03f4543291afa6d46a36c48f78d25aee7cdcd0fab7a37a639a73cd0562b52a70057075f83f7e4e56bb542a27561a65e3217c458d757345c46a29203e6187 SHA512 c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9
 EBUILD confuse-3.0.ebuild 1147 BLAKE2B b093e1e0ae54d28daacf0f44053c03e028dff3e39a584105a0a98089afa064876ae733838eae4eea571fbf5045dc96ebfcff02509ca3d239ab7e492aa0bba91b SHA512 a25765ee079b156f33aedd4e9ba0c76a497452ab993c373e67b2d5eee1b74999ff88bd1741c4b5b7383d7d8d71ec720bb69d779e79758479c27bef2d9fb08416
 EBUILD confuse-3.2.2.ebuild 1176 BLAKE2B ccf43f41a046556423e2cf72739fe108d6c647218a7e54b7045c575e4412001b9f9a61446d9be9f259eaddef12392b8592477fff58b3930897811513fd927523 SHA512 c435f6b693d892840adaf9d9e33c4a0306666c864cc4215397380495660e553c2787525be1e7f313b09049261a701f94f18c92c4c74adc862b73696f42823e0b
-MISC metadata.xml 330 BLAKE2B 91be3657843f0a430fe8002a9496e3831c4f6d3d9ac0a04a549835403f01c216ecc95802e023695158ed60a0f194baac91cb75c0f856978aad97e31d2ef5eb12 SHA512 240e353d9f2dc60b40eab3def6e661a9a40e22bf9cdb3e3d0bdc351cc26f45a8104dd5ab487d0248087b6be702640bafc8851c6dddaa315a6260fb61858d790c
+MISC metadata.xml 403 BLAKE2B 5d262f11d79e80fdec33ec5f50e2d008a2ab9610ef1823a38a6db0a9e211d63200bb33ab2251b46b117ca7f68ab061602eb664cfe8758928696bc260c463c905 SHA512 85ff2055d87b94e9da3afa22885ef494764fcaa686e1487f7a9c87a4f172333d1c9effa28544e2683da507e2b6e52ac0fd1d8662a0cc97a9ce5f462d98d703be
diff --git a/dev-libs/confuse/metadata.xml b/dev-libs/confuse/metadata.xml
index d7752ca1cd39..3b320c11f642 100644
--- a/dev-libs/confuse/metadata.xml
+++ b/dev-libs/confuse/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Sergey Popov</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:libconfuse_project:libconfuse</remote-id>
 		<remote-id type="github">martinh/libconfuse</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index af335b3209e3..f92fbeae7c74 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,19 +1,5 @@
-AUX cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch 714 BLAKE2B 7943685af8707162db33ba2970fb8336f9f25af844357216b9e5e01ea92010f71485c85979ffe30dac5734b0f4cd104e58502821856194cdf9f33530b6acae92 SHA512 39dcd0d96cd7c5baaf09b5cd36279e45618498cc545696665a54a5fdccfddd351ef178e888c138e945669814ff2bb72e57161f1d77ef78dd0dbba1d730ee8619
-AUX cyrus-sasl-2.1.25-as_needed.patch 1083 BLAKE2B d6a2c9e2bf6d41ea4a30f2043b6cbaff5a26acf6f8da8f681afcb9c9b4dbab2b52dbd6a37c219b337acf35ea2c67a0afe6ebdcbdc3d8f9ad489c4317656cd4a7 SHA512 8fdc7039fda79e95ec310cd63d72871d7b5b35b5a1b6cf30b9693f6a02e265d924e375ddc65158f38de129b5da058ecd26038f988153ff0aacf2665d66f40abb
-AUX cyrus-sasl-2.1.25-autotools_fixes.patch 3926 BLAKE2B 33817cdaeb79b03ecd6f75eb98b4946f4c7ca9a7f0ccc194200409d045d158642fecfc7dded004b25735d85e8fd55b378625ffc2bd97f045490414b9eb6b55fc SHA512 d1e39d856addf6b53a278669df6e87f0fddd9a1ceadc0fadf2bdac239fcec8540c797118be642a58e65e2ec667d3c2a4b604f68f659433e64dbcd5bfe35b9a82
 AUX cyrus-sasl-2.1.25-auxprop.patch 552 BLAKE2B 2d932e05863da6b108eec405e792003d6d8df4bde07bd044537729232a9b23e7261cbb33b82df7c5685ee96aae3e0aed62317f89e970fbedffea65bf9d89ccdc SHA512 73ae914e684ae698eb56a1579ba9a477a946625a3b079e2b400d88583074f1701d8a6926ed17dea36b923050f21c04fbf746d54284568bd21c14be3d10283b6f
-AUX cyrus-sasl-2.1.25-avoid_pic_overwrite.patch 1076 BLAKE2B ed64d970d3321d4f4e8dcfc0ea28638cbfbbe9dc29f585462c81cde945759d3ef9dde275b1472377176973fa8ba15d0beddfa4c32f30762e5e71b618e2a7bbe6 SHA512 033e3634116e1d3b316052dbe0b671cca0fcfb6063fca1a97d990c422c2ce05109a1e424e84ed9928dc0312a325a7248f2d2e3f9547f84453b36331c01f63be5
-AUX cyrus-sasl-2.1.25-fix_heimdal.patch 465 BLAKE2B 63a7eac7a5a36010d73be0d522a83036125025f8996e555ca31291826fb8d9455b4eabce816a0db5056033c6ab36df74a01d572acfbf9443b3cc30e5c382bdec SHA512 fcf498e70069205d07a5bd4de781d2005d762faca620a39094c9e3885bc1208b7bac499bb959ab91cf09a927476ce80ea995ba701dfa35f6c7404382a9549492
-AUX cyrus-sasl-2.1.25-missing_header.patch 224 BLAKE2B 5b42d952bf72e8886fd0e6f470cf0e23aca49942d31698aac9e271884b95fa4ab3f49d539a3dfe34d08c734c7f5a13c5063d5169c1ae73c6c788692d7ab4316f SHA512 6da051b45a47db2852d9ff0fdb1bfeb28b7f4d1fa450a9e15d96a67c4b9d3f376cb8dc1c544b5e9e6e1354a85965001e87306a821b7e48437db702a7a16d574e
-AUX cyrus-sasl-2.1.25-saslauthd_libtool.patch 280 BLAKE2B d65e15151232a0c8812b4ba48d796c1948965525f092dff1c0f70bc19bbfe2318355a54d8e1ae6d6ebd955adccd19f5487e4f0c4c519be7cf7f047d230740f1f SHA512 1e79230a3891f1492c7d6f5969f6a4890aaae2f488e9f3942cafeda574bf8810c4fb3e004836f769244db02bae663fa3ac1eeca19658e6fd3c94f2a891ed2653
-AUX cyrus-sasl-2.1.25-sasldb_al.patch 555 BLAKE2B 27a9ca344098a361bdf2aa5089c87e48d8e7717f7c97b965d8e8eda8b00629fbce9d9aebabb4c02f59ffdf50bcdb667dc3fb7bbadd140eac8e3363321a033fb6 SHA512 2da553298b482ca3115294de7264428925911f8d1b6a15ae1af38ee7e0a3191a0f4ad90bcbaeef599c994842a86eea5157b663cb6944f035d9a377dba91dbbf0
-AUX cyrus-sasl-2.1.25-service_keytabs.patch 796 BLAKE2B f41ec0639e0c592dbeb78ac41f85f517742056dacf151a502ac0c4978045d56b3f7e09753ba40c7e2bd05c316409ec46850e5e3683f6c19330c0cab2c207de67 SHA512 1635c20938d7dcfc53f5bf2d48881846e9167d27883eaa8eff8715ce6cebba7307aa0e44d9264f42a8c8d6a1485885b0661a7821703127d8d0f147e44e4a4267
-AUX cyrus-sasl-2.1.26-CVE-2013-4122.patch 3838 BLAKE2B 5a124ef7e4af8749881339a30e66286b83462e10113b51168fd3d67ca77dac34506293fd949688731ea51e8b857157cef6ef071a6828aabf2d16a82f7c0d725e SHA512 3df09f16dc2f4efc601339743eb6e66087977fae4e174aa82c4abb7f85a77aa9eb98629837079236446ef3b494fb48931c9dc8850362a49615749e162b4699c8
-AUX cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch 284 BLAKE2B 77ce4733f92515a98a8f74c68c7e7479d9f0f84302d91d9c3b0e92230f644d59a74588113447320c389c7e48768415f26dbb62fa1a48f3b283b739657f141350 SHA512 f3b789b7dea3f6a51fca6fd1877c81b5f5a3be342fa5c90ddae98a822e0c2a71e8fa582c6cb60c696363aa5cb99db8609cd6b3a91c5d402a0ad1e6124c726f5f
-AUX cyrus-sasl-2.1.26-fix_dovecot_authentication.patch 2467 BLAKE2B 83acc34ebe969d2b7cd0868d7811c182181c2588e5973b88c09469e599ae6fbd854762438ce672a4e23d4d0c1000b3da8158b6f1ea2a9428915c472c35aeea94 SHA512 38095e3f6a832893fb1c342f6e19f684a6ee7621fc44b93649b3f301dbc08e2936aba52533ffa97cfd33f320941e19de824e495af26ba628d574548749ef1ade
 AUX cyrus-sasl-2.1.26-missing-size_t.patch 280 BLAKE2B d686930b0b04f994ef9f5315ee86e69b61b8e800e192ab45f0b891d3f13a12c2bbd11f99a15533169d0690e9558dcc0327f6632a1a3baaa68679784079884088 SHA512 d6ed3a981da06f60d63b0364d8d841922bb007bf478b67558e88e9b297a4ed7c8eee9501e232d9ca17601f63f6c1cf04962a59c4f0c24fc641868d56006b3616
-AUX cyrus-sasl-2.1.26-openssl-1.1.patch 10798 BLAKE2B 4b304d0767b0467ef8df20ca51d6f64339e7b0eb7204dd630e364fa760c532f54d655365d7c96887e7276d40e42377a546e847827a93487318716dd2438a321e SHA512 8fa8370853d0e1f03b701453f79edf783015b354f221467cb64770d88cd0c7bb56b813a16a3777811082b3a2492699264c0447d254b32d033d2c6eaced19486e
-AUX cyrus-sasl-2.1.26-send-imap-logout.patch 1897 BLAKE2B 4b817b78cfb81181bc2c57402e2e621ccf1cea346c1460d46e76a605cdbd426aefc0fcae5c18c193dcde1562e8fe16a177ead00b3bc3084c03dd0e2466866ac3 SHA512 b30a4faea9fb66d8fab95a27b8ec87371d3650c5d2d4475449b8cebb223631d1afe9cdebd8c9b076e77bc3d2e2f5c32b24fe9292db26523212a72754cbff9995
 AUX cyrus-sasl-2.1.27-as_needed.patch 1141 BLAKE2B 7d289e96ef1f4593dd48db270dd698a7cf6f21aae3c58043b0f8af30c2d935b24d2a4902f39c9fcfc3261833d1b09032511919f15fc94f62527e46ea25cb2fcc SHA512 9eefa6d45e3dd9157a5672909acdd88f0ae35e76d64c3723890a474bbb05b22499cfadb0c077924d27f34da3710b2b700094dd7d5704050138c08dabcefdde94
 AUX cyrus-sasl-2.1.27-autotools_fixes.patch 749 BLAKE2B b7f832a5e937053deaf1696f8dbf777ebf789df8165fe90f6d1be7efc47e4114a8a467c74f4acf06245e7ffab22f62436159cd610ebe5c5b0cef61f1cb01fb71 SHA512 0d99ca049e76c11500769079d94f3bdb634bddb4c8d45a83b383e9bb9777edda66b17566800acbd450e1f4842d070ec3fbc236e7f0ef8759c36e6dd5ea8e3c64
 AUX cyrus-sasl-2.1.27-avoid_pic_overwrite.patch 866 BLAKE2B 1e117d9d07ad3937066c7b4ef8415df55bf9c5ce821902331792056e6df63e366fd3adebfdf09f0292aae889d0db632521f37ec5ebf74005b71a474ccc6fe250 SHA512 4ca601839b023ef790e48dae567ffbbd57c632384c980946639ec7437ad23874961451718569455e6e25afaeff1728ecbc71a8686f6b43246f83465f95a2c904
@@ -28,12 +14,6 @@ AUX saslauthd-2.1.26.conf 687 BLAKE2B da252bac77b65ba2ac680e51573ac4f9f82221af68
 AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563a7e5e504987a6e3089070cf01dd5af73a05c1b43b8b7787f55972a13c4afb05997e6fa3783dccf00696e91 SHA512 14fcfc0f69dacd25ac9b298cf44b0b44146d418424ef16e66edf8893353e418ef53beebb7199bd516b828c40954e4875ab5659f50a09af12ef2a371b944b45b1
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
-DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
-EBUILD cyrus-sasl-2.1.26-r10.ebuild 7743 BLAKE2B 26b36b8f68ae6af768e41dba4b7946c814411c70fab471dc9c93dc1487d39079306a1e3eb768920720dc7369883804a0b2a92b8a3c1ed6c997879001ea198eb6 SHA512 2b3f5221dfd76f463642ba9fee1d983c383bd9e490dda8cf41ab63e1f63723866faba25bb2042bc35ab954fb4021d9e2450c99da778185c92aa1527dd53eb9e7
-EBUILD cyrus-sasl-2.1.26-r12.ebuild 8431 BLAKE2B 0b769d0f97c9607da49eb82b57203513d7f3c8a82c410085c487f39a54706741700025164188dcef9a8b4622c7491ea995e8c33f374b893044a4a608dca3e1c3 SHA512 741e51ddbe4393927fd637ef84d953126c5fc2c5a877077113e36973239cfd3b0879d20c69dafc74a8b108ba363bc8e87db8bfd533da818ede78f20010efdc5e
-EBUILD cyrus-sasl-2.1.26-r13.ebuild 8465 BLAKE2B 48ad450be4078bea4077b8e22d664eab654136b264af31cd08037d78846d4989d3ca16d31123cbd266af0e62f29b0b5017a26dad4673fe56dac61a6e5519edd0 SHA512 80635f22cebf55ab59ae7575d3ea3e6eeeffaee25ad452577ef5af16c04eb9c5dbf300cd824814c09dfe701415b19343951dea40b8cbe957de848693c2d609b9
-EBUILD cyrus-sasl-2.1.26-r9.ebuild 7662 BLAKE2B 8a7b96ca43d133164a9818727486f2d15bd6f66d66e083dee2ac0a8d83c921a86e3e1f34dfa04689c81b5227cf80f06d1fea3c1da74b48c828e4a31f51b67c9e SHA512 6515a66682bc8c0d18b13a3cc540d00f07d26374a6bbefdcb6c974b3184164cfcce80e965b29bc10e81345e2abb8c04eb7edb21adf4097af741d5df1557ae04d
-EBUILD cyrus-sasl-2.1.27-r1.ebuild 8080 BLAKE2B e5ec4df72f32f8e29cb06fe0ab9015dfdc906721065ea09d1a625b04687a02cdcdf93df8aa1661849d8341c3a9432d49fbf052f3f9adbaf8d59e1e0827503cec SHA512 345fe84f61ff18b8fb6917d264db8db552d029937d9de242cfc6df0c36e2728d02bac6a7c7a1975b64ffdf1e0922da27339304b9fa5984689382b2650c94ac0a
 EBUILD cyrus-sasl-2.1.27-r2.ebuild 8139 BLAKE2B 1221f7bd37df906bf75b6dd46dd57e443ae429315b85dbd644acb12e02437b6a2d725e1a1a10b19bc140e7acd0faad5ec9750c6b5553bf8f3aaa3f578d0b89c1 SHA512 64fb3438115b5c2539d788bb4067c6f279720b0342cd87c830e8045bb20142dfec7ab8633757c100fbd8fb029f6733126f1e7a9556e9f0d927129ee0fa231fd1
 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
deleted file mode 100644
index ab28a3dd43bd..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="https://www.cyrusimap.org/sasl/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	mysql? ( virtual/mysql )
-	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-	java? ( >=virtual/jdk-1.4:= )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-sasl )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sasl/md5global.h
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-fix_dovecot_authentication.patch
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.in || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# #486740 #468556
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		configure.in || die
-	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		saslauthd/configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Java support.
-	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf=()
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf+=( --with-authdaemond=/var/lib/courier/authdaemon/socket )
-	fi
-
-	# Fix for bug #59634.
-	if ! use ssl ; then
-		myconf+=( --without-des )
-	fi
-
-	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-		myconf+=( --enable-sql )
-	else
-		myconf+=( --disable-sql )
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf+=( --with-dblib=gdbm )
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf+=(
-			--with-dblib=berkeley
-			--with-bdb-incdir="$(db_includedir)"
-		)
-	else
-		einfo "Building without SASLdb support"
-		myconf+=( --with-dblib=none )
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf+=( --with-devrandom=/dev/urandom )
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--enable-otp \
-		--without-sqlite \
-		--with-saslauthd=/run/saslauthd \
-		--with-pwcheck=/run/saslauthd \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(multilib_native_use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_with java javahome ${JAVA_HOME}) \
-		$(multilib_native_use_with mysql mysql /usr) \
-		$(multilib_native_use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	if multilib_is_native_abi && use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		if use sample ; then
-			docinto sample
-			dodoc "${S}"/sample/*.c
-			exeinto /usr/share/doc/${P}/sample
-			doexe sample/client sample/server
-		fi
-
-		# Default location for java classes breaks OpenOffice (bug #60769).
-		if use java ; then
-			java-pkg_dojar ${PN}.jar
-			java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-			# hackish, don't wanna dig through makefile
-			rm -Rf "${D}/usr/$(get_libdir)/java"
-			docinto "java"
-			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-			dodir "/usr/share/doc/${PF}/java/Test"
-			insinto "/usr/share/doc/${PF}/java/Test"
-			doins "${S}"/java/Test/*.java
-		fi
-
-		dosbin saslauthd/testsaslauthd
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /etc/sasl2
-
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r12.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r12.ebuild
deleted file mode 100644
index fab53dab97ee..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r12.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="https://www.cyrusimap.org/sasl/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
-srp ssl static-libs urandom"
-
-DEPEND="
-	net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	mysql? ( virtual/mysql )
-	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-	java? ( >=virtual/jdk-1.6:= )"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-sasl )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sasl/md5global.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.25-sasldb_al.patch"
-	"${FILESDIR}/${PN}-2.1.25-saslauthd_libtool.patch"
-	"${FILESDIR}/${PN}-2.1.25-avoid_pic_overwrite.patch"
-	"${FILESDIR}/${PN}-2.1.25-autotools_fixes.patch"
-	"${FILESDIR}/${PN}-2.1.25-as_needed.patch"
-	"${FILESDIR}/${PN}-2.1.25-missing_header.patch"
-	"${FILESDIR}/${PN}-2.1.25-fix_heimdal.patch"
-	"${FILESDIR}/${PN}-2.1.25-auxprop.patch"
-	"${FILESDIR}/${PN}-2.1.23-gss_c_nt_hostbased_service.patch"
-	"${FILESDIR}/${PN}-2.1.25-service_keytabs.patch"
-	"${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
-	"${FILESDIR}/${PN}-2.1.26-CVE-2013-4122.patch"
-	"${FILESDIR}/${PN}-2.1.26-send-imap-logout.patch"
-	"${FILESDIR}/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch"
-	"${FILESDIR}/${PN}-2.1.26-fix_dovecot_authentication.patch"
-	"${FILESDIR}/${PN}-2.1.26-openssl-1.1.patch" #592528
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.in || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# #486740 #468556
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		configure.in || die
-	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		saslauthd/configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# getpassphrase is defined in /usr/include/stdlib.h
-		append-cppflags -DHAVE_GETPASSPHRASE
-	else
-		# this horrendously breaks things on Solaris
-		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Java support.
-	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myeconfargs=(
-		--enable-login
-		--enable-ntlm
-		--enable-auth-sasldb
-		--disable-cmulocal
-		--disable-krb4
-		--disable-macos-framework
-		--enable-otp
-		--without-sqlite
-		--with-saslauthd="${EPREFIX}"/run/saslauthd
-		--with-pwcheck="${EPREFIX}"/run/saslauthd
-		--with-configdir="${EPREFIX}"/etc/sasl2
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
-		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
-		$(use_with ssl openssl)
-		$(use_with pam)
-		$(use_with openldap ldap)
-		$(use_enable ldapdb)
-		$(multilib_native_use_enable sample)
-		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable java)
-		$(multilib_native_use_with java javahome ${JAVA_HOME})
-		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
-		$(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
-		$(use_enable srp)
-		$(use_enable static-libs static)
-
-		# Add authdaemond support (bug #56523).
-		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
-
-		# Fix for bug #59634.
-		$(usex ssl '' --without-des)
-
-		# Use /dev/urandom instead of /dev/random (bug #46038).
-		$(usex urandom --with-devrandom=/dev/urandom '')
-	)
-
-	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-		myeconfargs+=( --enable-sql )
-	else
-		myeconfargs+=( --disable-sql )
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myeconfargs+=( --with-dblib=gdbm )
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myeconfargs+=(
-			--with-dblib=berkeley
-			--with-bdb-incdir="$(db_includedir)"
-		)
-	else
-		einfo "Building without SASLdb support"
-		myeconfargs+=( --with-dblib=none )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	if multilib_is_native_abi && use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		if use sample ; then
-			docinto sample
-			dodoc "${S}"/sample/*.c
-			exeinto /usr/share/doc/${P}/sample
-			doexe sample/client sample/server
-		fi
-
-		# Default location for java classes breaks OpenOffice (bug #60769).
-		if use java; then
-			java-pkg_dojar ${PN}.jar
-			java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
-			# hackish, don't wanna dig through makefile
-			rm -rf "${ED}/usr/$(get_libdir)/java" || die
-			docinto "java"
-			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-			dodir "/usr/share/doc/${PF}/java/Test"
-			insinto "/usr/share/doc/${PF}/java/Test"
-			doins "${S}"/java/Test/*.java
-		fi
-
-		dosbin saslauthd/testsaslauthd
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /etc/sasl2
-
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-
-	docinto html
-	dodoc doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	# The get_modname bit is important: do not remove the .la files on
-	# platforms where the lib isn't called .so for cyrus searches the .la to
-	# figure out what the name is supposed to be instead
-	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r13.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r13.ebuild
deleted file mode 100644
index fd823635a6a8..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r13.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="https://www.cyrusimap.org/sasl/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
-srp ssl static-libs urandom"
-
-DEPEND="
-	net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
-	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-	java? ( >=virtual/jdk-1.6:= )"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-sasl )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sasl/md5global.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.25-sasldb_al.patch"
-	"${FILESDIR}/${PN}-2.1.25-saslauthd_libtool.patch"
-	"${FILESDIR}/${PN}-2.1.25-avoid_pic_overwrite.patch"
-	"${FILESDIR}/${PN}-2.1.25-autotools_fixes.patch"
-	"${FILESDIR}/${PN}-2.1.25-as_needed.patch"
-	"${FILESDIR}/${PN}-2.1.25-missing_header.patch"
-	"${FILESDIR}/${PN}-2.1.25-fix_heimdal.patch"
-	"${FILESDIR}/${PN}-2.1.25-auxprop.patch"
-	"${FILESDIR}/${PN}-2.1.23-gss_c_nt_hostbased_service.patch"
-	"${FILESDIR}/${PN}-2.1.25-service_keytabs.patch"
-	"${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
-	"${FILESDIR}/${PN}-2.1.26-CVE-2013-4122.patch"
-	"${FILESDIR}/${PN}-2.1.26-send-imap-logout.patch"
-	"${FILESDIR}/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch"
-	"${FILESDIR}/${PN}-2.1.26-fix_dovecot_authentication.patch"
-	"${FILESDIR}/${PN}-2.1.26-openssl-1.1.patch" #592528
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.in || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# #486740 #468556
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		configure.in || die
-	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		saslauthd/configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# getpassphrase is defined in /usr/include/stdlib.h
-		append-cppflags -DHAVE_GETPASSPHRASE
-	else
-		# this horrendously breaks things on Solaris
-		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Java support.
-	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myeconfargs=(
-		--enable-login
-		--enable-ntlm
-		--enable-auth-sasldb
-		--disable-cmulocal
-		--disable-krb4
-		--disable-macos-framework
-		--enable-otp
-		--without-sqlite
-		--with-saslauthd="${EPREFIX}"/run/saslauthd
-		--with-pwcheck="${EPREFIX}"/run/saslauthd
-		--with-configdir="${EPREFIX}"/etc/sasl2
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
-		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
-		$(use_with ssl openssl)
-		$(use_with pam)
-		$(use_with openldap ldap)
-		$(use_enable ldapdb)
-		$(multilib_native_use_enable sample)
-		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable java)
-		$(multilib_native_use_with java javahome ${JAVA_HOME})
-		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
-		$(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
-		$(use_enable srp)
-		$(use_enable static-libs static)
-
-		# Add authdaemond support (bug #56523).
-		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
-
-		# Fix for bug #59634.
-		$(usex ssl '' --without-des)
-
-		# Use /dev/urandom instead of /dev/random (bug #46038).
-		$(usex urandom --with-devrandom=/dev/urandom '')
-	)
-
-	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-		myeconfargs+=( --enable-sql )
-	else
-		myeconfargs+=( --disable-sql )
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myeconfargs+=( --with-dblib=gdbm )
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myeconfargs+=(
-			--with-dblib=berkeley
-			--with-bdb-incdir="$(db_includedir)"
-		)
-	else
-		einfo "Building without SASLdb support"
-		myeconfargs+=( --with-dblib=none )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	if multilib_is_native_abi && use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		if use sample ; then
-			docinto sample
-			dodoc "${S}"/sample/*.c
-			exeinto /usr/share/doc/${P}/sample
-			doexe sample/client sample/server
-		fi
-
-		# Default location for java classes breaks OpenOffice (bug #60769).
-		if use java; then
-			java-pkg_dojar ${PN}.jar
-			java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
-			# hackish, don't wanna dig through makefile
-			rm -rf "${ED}/usr/$(get_libdir)/java" || die
-			docinto "java"
-			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-			dodir "/usr/share/doc/${PF}/java/Test"
-			insinto "/usr/share/doc/${PF}/java/Test"
-			doins "${S}"/java/Test/*.java
-		fi
-
-		dosbin saslauthd/testsaslauthd
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /etc/sasl2
-
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-
-	docinto html
-	dodoc doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	# The get_modname bit is important: do not remove the .la files on
-	# platforms where the lib isn't called .so for cyrus searches the .la to
-	# figure out what the name is supposed to be instead
-	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
deleted file mode 100644
index 023e07bfe40a..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
+++ /dev/null
@@ -1,242 +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 multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="https://www.cyrusimap.org/sasl/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	mysql? ( virtual/mysql )
-	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.4:= )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-sasl )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sasl/md5global.h
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
-	epatch "${FILESDIR}"/${PN}-2.1.26-fix_dovecot_authentication.patch
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.in || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# #486740 #468556
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		configure.in || die
-	sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		saslauthd/configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Java support.
-	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf=()
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf+=( --with-authdaemond=/var/lib/courier/authdaemon/socket )
-	fi
-
-	# Fix for bug #59634.
-	if ! use ssl ; then
-		myconf+=( --without-des )
-	fi
-
-	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-		myconf+=( --enable-sql )
-	else
-		myconf+=( --disable-sql )
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf+=( --with-dblib=gdbm )
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf+=(
-			--with-dblib=berkeley
-			--with-bdb-incdir="$(db_includedir)"
-		)
-	else
-		einfo "Building without SASLdb support"
-		myconf+=( --with-dblib=none )
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf+=( --with-devrandom=/dev/urandom )
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--enable-otp \
-		--without-sqlite \
-		--with-saslauthd=/run/saslauthd \
-		--with-pwcheck=/run/saslauthd \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(multilib_native_use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(multilib_native_use_enable java) \
-		$(multilib_native_use_with java javahome ${JAVA_HOME}) \
-		$(multilib_native_use_with mysql mysql /usr) \
-		$(multilib_native_use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	if multilib_is_native_abi && use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		if use sample ; then
-			docinto sample
-			dodoc "${S}"/sample/*.c
-			exeinto /usr/share/doc/${P}/sample
-			doexe sample/client sample/server
-		fi
-
-		# Default location for java classes breaks OpenOffice (bug #60769).
-		if use java ; then
-			java-pkg_dojar ${PN}.jar
-			java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-			# hackish, don't wanna dig through makefile
-			rm -Rf "${D}/usr/$(get_libdir)/java"
-			docinto "java"
-			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-			dodir "/usr/share/doc/${PF}/java/Test"
-			insinto "/usr/share/doc/${PF}/java/Test"
-			doins "${S}"/java/Test/*.java
-		fi
-
-		dosbin saslauthd/testsaslauthd
-	fi
-}
-
-multilib_src_install_all() {
-	keepdir /etc/sasl2
-
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild
deleted file mode 100644
index 1b0e7ee417d4..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd eapi7-ver
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="https://www.cyrusimap.org/sasl/"
-#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
-
-CDEPEND="
-	net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	mysql? ( virtual/mysql )
-	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-	java? ( >=virtual/jdk-1.6:= )"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sasl )"
-
-DEPEND="${CDEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sasl/md5global.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch"
-	"${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch"
-	"${FILESDIR}/${PN}-2.1.27-as_needed.patch"
-	"${FILESDIR}/${PN}-2.1.25-auxprop.patch"
-	"${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch"
-	"${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
-	"${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
-	"${FILESDIR}/${PN}-2.1.27-memmem.patch"
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.ac || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# #486740 #468556
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# getpassphrase is defined in /usr/include/stdlib.h
-		append-cppflags -DHAVE_GETPASSPHRASE
-	else
-		# this horrendously breaks things on Solaris
-		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Java support.
-	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myeconfargs=(
-		--enable-login
-		--enable-ntlm
-		--enable-auth-sasldb
-		--disable-cmulocal
-		--disable-krb4
-		--disable-macos-framework
-		--enable-otp
-		--without-sqlite
-		--with-saslauthd="${EPREFIX}"/run/saslauthd
-		--with-pwcheck="${EPREFIX}"/run/saslauthd
-		--with-configdir="${EPREFIX}"/etc/sasl2
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
-		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
-		--with-sphinx-build=no
-		$(use_with ssl openssl)
-		$(use_with pam)
-		$(use_with openldap ldap)
-		$(use_enable ldapdb)
-		$(multilib_native_use_enable sample)
-		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable java)
-		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
-		$(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
-		$(use_enable srp)
-		$(use_enable static-libs static)
-
-		# Add authdaemond support (bug #56523).
-		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
-
-		# Fix for bug #59634.
-		$(usex ssl '' --without-des)
-
-		# Use /dev/urandom instead of /dev/random (bug #46038).
-		$(usex urandom --with-devrandom=/dev/urandom '')
-	)
-
-	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-		myeconfargs+=( --enable-sql )
-	else
-		myeconfargs+=( --disable-sql )
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myeconfargs+=( --with-dblib=gdbm )
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myeconfargs+=(
-			--with-dblib=berkeley
-			--with-bdb-incdir="$(db_includedir)"
-		)
-	else
-		einfo "Building without SASLdb support"
-		myeconfargs+=( --with-dblib=none )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	if multilib_is_native_abi && use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		if use sample ; then
-			docinto sample
-			dodoc "${S}"/sample/*.c
-			exeinto /usr/share/doc/${P}/sample
-			doexe sample/client sample/server
-		fi
-
-		# Default location for java classes breaks OpenOffice (bug #60769).
-		if use java; then
-			java-pkg_dojar ${PN}.jar
-			java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
-			# hackish, don't wanna dig through makefile
-			rm -rf "${ED}/usr/$(get_libdir)/java" || die
-			docinto "java"
-			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-			dodir "/usr/share/doc/${PF}/java/Test"
-			insinto "/usr/share/doc/${PF}/java/Test"
-			doins "${S}"/java/Test/*.java
-		fi
-
-		dosbin saslauthd/testsaslauthd
-	fi
-}
-
-multilib_src_install_all() {
-	doman man/*
-
-	keepdir /etc/sasl2
-
-	# Reset docinto to default value (#674296)
-	docinto
-	dodoc AUTHORS ChangeLog doc/legacy/TODO
-	newdoc pwcheck/README README.pwcheck
-
-	newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
-	edos2unix ${ED%/}/usr/share/doc/${PF}/release-notes
-
-	docinto html
-	dodoc doc/html/*.html
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	# The get_modname bit is important: do not remove the .la files on
-	# platforms where the lib isn't called .so for cyrus searches the .la to
-	# figure out what the name is supposed to be instead
-	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch
deleted file mode 100644
index beea8eb28d19..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Gentoo bug #389349
---- a/cmulocal/sasl2.m4
-+++ b/cmulocal/sasl2.m4
-@@ -217,7 +217,11 @@
-                  [AC_WARN([Cybersafe define not found])])
- 
-   elif test "$ac_cv_header_gssapi_h" = "yes"; then
--    AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
-+    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
-+                 [#include <gssapi.h>
-+                  #ifdef GSS_C_NT_HOSTBASED_SERVICE
-+                    hostbased_service_gss_nt_yes
-+                  #endif],
-                     [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-                                [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])])
-   elif test "$ac_cv_header_gssapi_gssapi_h"; then
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch
deleted file mode 100644
index 67b48b4a4993..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Matthias Klose <doko@ubuntu.com>
-Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
-it.
---- a/saslauthd/Makefile.am
-+++ b/saslauthd/Makefile.am
-@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c
- saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
- saslauthd_LDADD	= @SASL_KRB_LIB@ \
- 		  @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
--		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
-+		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
- 
- testsaslauthd_SOURCES = testsaslauthd.c utils.c
- testsaslauthd_LDADD = @LIB_SOCKET@
---- a/sasldb/Makefile.am
-+++ b/sasldb/Makefile.am
-@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
- 
- libsasldb_la_SOURCES = allockey.c sasldb.h
- EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
--libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
--libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
-+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
-+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
- 
- # Prevent make dist stupidity
- libsasldb_a_SOURCES =
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch
deleted file mode 100644
index 5837921d4f7f..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -44,6 +44,8 @@ dnl
- AC_INIT(lib/saslint.h)
- AC_PREREQ([2.54])
- 
-+AC_CONFIG_MACRO_DIR([cmulocal] [config])
-+
- dnl use ./config.cache as the default cache file.
- dnl we require a cache file to successfully configure our build.
- if test $cache_file = "/dev/null"; then
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -43,6 +43,8 @@ AUTOMAKE_OPTIONS = 1.7
- #
- ################################################################
- 
-+ACLOCAL_AMFLAGS = -I cmulocal -I config
-+
- if SASLAUTHD
- SAD = saslauthd
- else
---- a/saslauthd/configure.in
-+++ b/saslauthd/configure.in
-@@ -1,7 +1,8 @@
- AC_INIT(mechanisms.h)
- AC_PREREQ([2.54])
- 
--AC_CONFIG_AUX_DIR(config)
-+AC_CONFIG_MACRO_DIR([../cmulocal] [../config])
-+AC_CONFIG_AUX_DIR([config])
- AC_CANONICAL_HOST
- 
- dnl Should we enable SASLAUTHd at all?
-@@ -164,30 +165,30 @@ AC_SUBST(LTLIBOBJS)
- 
- dnl Checks for which function macros exist
- AC_MSG_CHECKING(whether $CC implements __func__)
--AC_CACHE_VAL(have_func,
-+AC_CACHE_VAL(_cv_have_func,
- [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __func__);],
--have_func=yes,
--have_func=no)])
--AC_MSG_RESULT($have_func)
--if test "$have_func" = yes; then
-+_cv_have_func=yes,
-+_cv_have_func=no)])
-+AC_MSG_RESULT($_cv_have_func)
-+if test "$_cv_have_func" = yes; then
-        AC_DEFINE(HAVE_FUNC,[],[Does the compiler understand __func__])
- else
-        AC_MSG_CHECKING(whether $CC implements __PRETTY_FUNCTION__)
--       AC_CACHE_VAL(have_pretty_function,
-+       AC_CACHE_VAL(_cv_have_pretty_function,
-        [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __PRETTY_FUNCTION__);],
--       have_pretty_function=yes,
--       have_pretty_function=no)])
--       AC_MSG_RESULT($have_pretty_function)
--       if test "$have_pretty_function" = yes; then
-+       _cv_have_pretty_function=yes,
-+       _cv_have_pretty_function=no)])
-+       AC_MSG_RESULT($_cv_have_pretty_function)
-+       if test "$_cv_have_pretty_function" = yes; then
-                AC_DEFINE(HAVE_PRETTY_FUNCTION,[],[Does compiler understand __PRETTY_FUNCTION__])
-        else
-                AC_MSG_CHECKING(whether $CC implements __FUNCTION__)
--               AC_CACHE_VAL(have_function,
-+               AC_CACHE_VAL(_cv_have_function,
-                [AC_TRY_LINK([#include <stdio.h>],[printf("%s", __FUNCTION__);],
--               have_function=yes,
--               have_function=no)])
--               AC_MSG_RESULT($have_function)
--               if test "$have_function" = yes; then
-+               _cv_have_function=yes,
-+               _cv_have_function=no)])
-+               AC_MSG_RESULT($_cv_have_function)
-+               if test "$_cv_have_function" = yes; then
-                        AC_DEFINE(HAVE_FUNCTION,[],[Does compiler understand __FUNCTION__])
-                fi
-        fi
---- a/saslauthd/Makefile.am
-+++ b/saslauthd/Makefile.am
-@@ -1,4 +1,6 @@
- AUTOMAKE_OPTIONS = 1.7
-+ACLOCAL_AMFLAGS = -I ../cmulocal -I ../config
-+
- sbin_PROGRAMS	= saslauthd testsaslauthd
- EXTRA_PROGRAMS  = saslcache
- 
---- a/config/kerberos_v4.m4
-+++ b/config/kerberos_v4.m4
-@@ -89,18 +89,18 @@ AC_DEFUN([SASL_KERBEROS_V4_CHK], [
-     dnl if we were ambitious, we would look more aggressively for the
-     dnl krb4 install
-     if test -d ${krb4}; then
--       AC_CACHE_CHECK(for Kerberos includes, cyrus_krbinclude, [
-+       AC_CACHE_CHECK(for Kerberos includes, cyrus_cv_krbinclude, [
-          for krbhloc in include/kerberosIV include/kerberos include
-          do
-            if test -f ${krb4}/${krbhloc}/krb.h ; then
--             cyrus_krbinclude=${krb4}/${krbhloc}
-+             cyrus_cv_krbinclude=${krb4}/${krbhloc}
-              break
-            fi
-          done
-          ])
- 
--       if test -n "${cyrus_krbinclude}"; then
--         CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
-+       if test -n "${cyrus_cv_krbinclude}"; then
-+         CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}"
-        fi
-        LDFLAGS="$LDFLAGS -L$krb4/lib"
-     fi
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch
deleted file mode 100644
index 2e5b1750d00d..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Fabian Fagerholm <fabbe@debian.org>
-Description: This patch makes sure the non-PIC version of libsasldb.a, which
-is created out of non-PIC objects, is not going to overwrite the PIC version,
-which is created out of PIC objects. The PIC version is placed in .libs, and
-the non-PIC version in the current directory.  This ensures that both non-PIC
-and PIC versions are available in the correct locations.
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -78,7 +78,7 @@ endif
- 
- libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
- 	@echo adding static plugins and dependencies
--	$(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
-+	$(AR) cru $@ $(SASL_STATIC_OBJS)
- 	@for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
- 	if test ! -f $$i; then continue; fi; . $$i; \
- 	for j in $$dependency_libs foo; do \
---- a/sasldb/Makefile.am
-+++ b/sasldb/Makefile.am
-@@ -63,6 +63,6 @@ libsasldb_a_SOURCES =
- EXTRA_libsasldb_a_SOURCES =
- 
- libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC)
--	$(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
-+	$(AR) cru $@ $(SASL_DB_BACKEND_STATIC)
- 
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch
deleted file mode 100644
index 92be26003488..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix compiling against heimdal
-
---- a/sample/server.c
-+++ b/sample/server.c
-@@ -85,8 +85,10 @@
- 
- #ifdef HAVE_GSS_GET_NAME_ATTRIBUTE
- #include <gssapi/gssapi.h>
-+#ifndef KRB5_HEIMDAL
- #include <gssapi/gssapi_ext.h>
- #endif
-+#endif
- 
- #include "common.h"
- 
---- a/plugins/gssapi.c
-+++ b/plugins/gssapi.c
-@@ -50,6 +50,9 @@
- #else
- #include <gssapi/gssapi.h>
- #endif
-+#ifdef KRB5_HEIMDAL
-+#include <gssapi/gssapi_krb5.h>
-+#endif
- 
- #ifdef WIN32
- #  include <winsock2.h>
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch
deleted file mode 100644
index a413e00bf428..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/pwcheck/pwcheck_getspnam.c
-+++ b/pwcheck/pwcheck_getspnam.c
-@@ -24,6 +24,7 @@
- ******************************************************************/
- 
- #include <shadow.h>
-+#include <string.h>
- 
- extern char *crypt();
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch
deleted file mode 100644
index da1a49f1dd66..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Author: Fabian Fagerholm <fabbe@debian.org>
-Description: Enable libtool use.
---- a/saslauthd/configure.in
-+++ b/saslauthd/configure.in
-@@ -25,6 +25,7 @@ AC_PROG_AWK
- AC_PROG_MAKE_SET
- AC_PROG_LN_S
- AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
- 
- dnl Checks for build foo
- CMU_C___ATTRIBUTE__
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch
deleted file mode 100644
index 8eff5a8bdd12..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Fabian Fagerholm <fabbe@debian.org>
-Description: Fix linking with libsasldb.a when saslauthd is built with sasldb
-support.
---- a/saslauthd/configure.in
-+++ b/saslauthd/configure.in
-@@ -77,7 +77,7 @@ if test "$authsasldb" != no; then
-   AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
-   SASL_DB_PATH_CHECK()
-   SASL_DB_CHECK()
--  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
-+  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a"
- fi
- 
- AC_ARG_ENABLE(httpform, [  --enable-httpform       enable HTTP form authentication [[no]] ],
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch
deleted file mode 100644
index 43b6162a66f0..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Bug #445932
---- a/cmulocal/sasl2.m4
-+++ b/cmulocal/sasl2.m4
-@@ -268,7 +268,11 @@
- 
-   cmu_save_LIBS="$LIBS"
-   LIBS="$LIBS $GSSAPIBASE_LIBS"
--  AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
-+  AC_CHECK_FUNCS([gsskrb5_register_acceptor_identity], [],
-+    [AC_CHECK_FUNCS([krb5_gss_register_acceptor_identity],
-+      [AC_CHECK_HEADERS([gssapi/gssapi_krb5.h],
-+         [AC_DEFINE([HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY], [1])]
-+  )])])
-   AC_CHECK_FUNCS(gss_decapsulate_token)
-   AC_CHECK_FUNCS(gss_encapsulate_token)
-   AC_CHECK_FUNCS(gss_oid_equal)
---- a/plugins/gssapi.c
-+++ b/plugins/gssapi.c
-@@ -50,7 +50,7 @@
- #else
- #include <gssapi/gssapi.h>
- #endif
--#ifdef KRB5_HEIMDAL
-+#if defined (KRB5_HEIMDAL) || defined (HAVE_GSSAPI_GSSAPI_KRB5_H)
- #include <gssapi/gssapi_krb5.h>
- #endif
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-CVE-2013-4122.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-CVE-2013-4122.patch
deleted file mode 100644
index 09c9ce86c9ac..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-CVE-2013-4122.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d Mon Sep 17 00:00:00 2001
-From: mancha <mancha1@hush.com>
-Date: Thu, 11 Jul 2013 09:08:07 +0000
-Subject: Handle NULL returns from glibc 2.17+ crypt()
-
-Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL
-(w/ NULL return) if the salt violates specifications. Additionally,
-on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords
-passed to crypt() fail with EPERM (w/ NULL return).
-
-When using glibc's crypt(), check return value to avoid a possible
-NULL pointer dereference.
-
-Patch by mancha1@hush.com.
----
-diff --git a/pwcheck/pwcheck_getpwnam.c b/pwcheck/pwcheck_getpwnam.c
-index 4b34222..400289c 100644
---- a/pwcheck/pwcheck_getpwnam.c
-+++ b/pwcheck/pwcheck_getpwnam.c
-@@ -32,6 +32,7 @@ char *userid;
- char *password;
- {
-     char* r;
-+    char* crpt_passwd;
-     struct passwd *pwd;
- 
-     pwd = getpwnam(userid);
-@@ -41,7 +42,7 @@ char *password;
-     else if (pwd->pw_passwd[0] == '*') {
- 	r = "Account disabled";
-     }
--    else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) {
-+    else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) {
- 	r = "Incorrect password";
-     }
-     else {
-diff --git a/pwcheck/pwcheck_getspnam.c b/pwcheck/pwcheck_getspnam.c
-index 2b11286..6d607bb 100644
---- a/pwcheck/pwcheck_getspnam.c
-+++ b/pwcheck/pwcheck_getspnam.c
-@@ -32,13 +32,15 @@ char *userid;
- char *password;
- {
-     struct spwd *pwd;
-+    char *crpt_passwd;
- 
-     pwd = getspnam(userid);
-     if (!pwd) {
- 	return "Userid not found";
-     }
-     
--    if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) {
-+    crpt_passwd = crypt(password, pwd->sp_pwdp);
-+    if (!crpt_passwd || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) {
- 	return "Incorrect password";
-     }
-     else {
-diff --git a/saslauthd/auth_getpwent.c b/saslauthd/auth_getpwent.c
-index fc8029d..d4ebe54 100644
---- a/saslauthd/auth_getpwent.c
-+++ b/saslauthd/auth_getpwent.c
-@@ -77,6 +77,7 @@ auth_getpwent (
- {
-     /* VARIABLES */
-     struct passwd *pw;			/* pointer to passwd file entry */
-+    char *crpt_passwd;			/* encrypted password */
-     int errnum;
-     /* END VARIABLES */
-   
-@@ -105,7 +106,8 @@ auth_getpwent (
- 	}
-     }
- 
--    if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) {
-+    crpt_passwd = crypt(password, pw->pw_passwd);
-+    if (!crpt_passwd || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) {
- 	if (flags & VERBOSE) {
- 	    syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login);
- 	}
-diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c
-index 677131b..1988afd 100644
---- a/saslauthd/auth_shadow.c
-+++ b/saslauthd/auth_shadow.c
-@@ -210,8 +210,8 @@ auth_shadow (
- 	RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)");
-     }
- 
--    cpw = strdup((const char *)crypt(password, sp->sp_pwdp));
--    if (strcmp(sp->sp_pwdp, cpw)) {
-+    cpw = crypt(password, sp->sp_pwdp);
-+    if (!cpw || strcmp(sp->sp_pwdp, (const char *)cpw)) {
- 	if (flags & VERBOSE) {
- 	    /*
- 	     * This _should_ reveal the SHADOW_PW_LOCKED prefix to an
-@@ -221,10 +221,8 @@ auth_shadow (
- 	    syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'",
- 		   sp->sp_pwdp, cpw);
- 	}
--	free(cpw);
- 	RETURN("NO Incorrect password");
-     }
--    free(cpw);
- 
-     /*
-      * The following fields will be set to -1 if:
-@@ -286,7 +284,7 @@ auth_shadow (
- 	RETURN("NO Invalid username");
-     }
-   
--    if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) {
-+    if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) {
- 	if (flags & VERBOSE) {
- 	    syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s",
- 		   password, upw->upw_passwd);
---
-cgit v0.9.0.2
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
deleted file mode 100644
index af382181e046..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cyrus-sasl2.orig/plugins/ldapdb.c
-+++ cyrus-sasl2/plugins/ldapdb.c
-@@ -406,6 +406,7 @@ ldapdb_canon_server(void *glob_context,
- 	if ( len > out_max )
- 	    len = out_max;
- 	memcpy(out, bvals[0]->bv_val, len);
-+    out[len] = '\0';
- 	*out_ulen = len;
- 	ber_bvecfree(bvals);
-     }
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch
deleted file mode 100644
index 6fc9de80287e..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Bug #510320
---- a/saslauthd/auth_rimap.c
-+++ b/saslauthd/auth_rimap.c
-@@ -371,7 +371,7 @@
-     if ( rc>0 ) {
-         /* check if there is more to read */
-         fd_set         perm;
--        int            fds, ret;
-+        int            fds, ret, loopc;
-         struct timeval timeout;
- 
-         FD_ZERO(&perm);
-@@ -380,6 +380,7 @@
- 
-         timeout.tv_sec  = 1;
-         timeout.tv_usec = 0;
-+        loopc = 0;
-         while( select (fds, &perm, NULL, NULL, &timeout ) >0 ) {
-            if ( FD_ISSET(s, &perm) ) {
-               ret = read(s, rbuf+rc, sizeof(rbuf)-rc);
-@@ -387,6 +388,14 @@
-                  rc = ret;
-                  break;
-               } else {
-+                 if (ret == 0) {
-+                   loopc += 1;
-+                 } else {
-+                   loopc = 0;
-+                 }
-+                 if (loopc > sizeof(rbuf)) { // arbitrary chosen value
-+                   break;
-+                 }
-                  rc += ret;
-               }
-            }
-@@ -484,7 +493,7 @@
-     if ( rc>0 ) {
-         /* check if there is more to read */
-         fd_set         perm;
--        int            fds, ret;
-+        int            fds, ret, loopc;
-         struct timeval timeout;
- 
-         FD_ZERO(&perm);
-@@ -493,6 +502,7 @@
- 
-         timeout.tv_sec  = 1;
-         timeout.tv_usec = 0;
-+        loopc = 0;
-         while( select (fds, &perm, NULL, NULL, &timeout ) >0 ) {
-            if ( FD_ISSET(s, &perm) ) {
-               ret = read(s, rbuf+rc, sizeof(rbuf)-rc);
-@@ -500,6 +510,14 @@
-                  rc = ret;
-                  break;
-               } else {
-+                 if (ret == 0) {
-+                   loopc += 1;
-+                 } else {
-+                   loopc = 0;
-+                 }
-+                 if (loopc > sizeof(rbuf)) { // arbitrary chosen value
-+                   break;
-+                 }
-                  rc += ret;
-               }
-            }
---- a/lib/checkpw.c
-+++ b/lib/checkpw.c
-@@ -587,16 +587,14 @@
- 	    /* Timeout. */
- 	    errno = ETIMEDOUT;
- 	    return -1;
--	case +1:
--	    if (FD_ISSET(fd, &rfds)) {
--		/* Success, file descriptor is readable. */
--		return 0;
--	    }
--	    return -1;
- 	case -1:
- 	    if (errno == EINTR || errno == EAGAIN)
- 		continue;
- 	default:
-+            if (FD_ISSET(fd, &rfds)) {
-+                /* Success, file descriptor is readable. */
-+                return 0;
-+            }
- 	    /* Error catch-all. */
- 	    return -1;
- 	}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-openssl-1.1.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-openssl-1.1.patch
deleted file mode 100644
index 3b0ffac24f0c..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-openssl-1.1.patch
+++ /dev/null
@@ -1,353 +0,0 @@
-diff --git a/plugins/ntlm.c b/plugins/ntlm.c
-index 79ea47c..554a00d 100644
---- a/plugins/ntlm.c
-+++ b/plugins/ntlm.c
-@@ -417,6 +417,29 @@ static unsigned char *P24(unsigned char *P24, unsigned char *P21,
-     return P24;
- }
- 
-+static HMAC_CTX *_plug_HMAC_CTX_new(const sasl_utils_t *utils)
-+{
-+    utils->log(NULL, SASL_LOG_DEBUG, "_plug_HMAC_CTX_new()");
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    return HMAC_CTX_new();
-+#else
-+    return utils->malloc(sizeof(EVP_MD_CTX));
-+#endif
-+}
-+
-+static void _plug_HMAC_CTX_free(HMAC_CTX *ctx, const sasl_utils_t *utils)
-+{
-+    utils->log(NULL, SASL_LOG_DEBUG, "_plug_HMAC_CTX_free()");
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    HMAC_CTX_free(ctx);
-+#else
-+    HMAC_cleanup(ctx);
-+    utils->free(ctx);
-+#endif
-+}
-+
- static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
- 			 const char *authid, const char *target,
- 			 const unsigned char *challenge,
-@@ -424,7 +447,7 @@ static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
- 			 const sasl_utils_t *utils,
- 			 char **buf, unsigned *buflen, int *result)
- {
--    HMAC_CTX ctx;
-+    HMAC_CTX *ctx = NULL;
-     unsigned char hash[EVP_MAX_MD_SIZE];
-     char *upper;
-     unsigned int len;
-@@ -435,6 +458,10 @@ static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
- 	SETERROR(utils, "cannot allocate NTLMv2 hash");
- 	*result = SASL_NOMEM;
-     }
-+    else if ((ctx = _plug_HMAC_CTX_new(utils)) == NULL) {
-+        SETERROR(utils, "cannot allocate HMAC CTX");
-+        *result = SASL_NOMEM;
-+    }
-     else {
- 	/* NTLMv2hash = HMAC-MD5(NTLMhash, unicode(ucase(authid + domain))) */
- 	P16_nt(hash, passwd, utils, buf, buflen, result);
-@@ -449,17 +476,18 @@ static unsigned char *V2(unsigned char *V2, sasl_secret_t *passwd,
- 	HMAC(EVP_md5(), hash, MD4_DIGEST_LENGTH, *buf, 2 * len, hash, &len);
- 
- 	/* V2 = HMAC-MD5(NTLMv2hash, challenge + blob) + blob */
--	HMAC_Init(&ctx, hash, len, EVP_md5());
--	HMAC_Update(&ctx, challenge, NTLM_NONCE_LENGTH);
--	HMAC_Update(&ctx, blob, bloblen);
--	HMAC_Final(&ctx, V2, &len);
--	HMAC_cleanup(&ctx);
-+	HMAC_Init_ex(ctx, hash, len, EVP_md5(), NULL);
-+	HMAC_Update(ctx, challenge, NTLM_NONCE_LENGTH);
-+	HMAC_Update(ctx, blob, bloblen);
-+	HMAC_Final(ctx, V2, &len);
- 
- 	/* the blob is concatenated outside of this function */
- 
- 	*result = SASL_OK;
-     }
- 
-+    if (ctx) _plug_HMAC_CTX_free(ctx, utils);
-+
-     return V2;
- }
- 
-diff --git a/plugins/otp.c b/plugins/otp.c
-index dd73065..d1e9bf4 100644
---- a/plugins/otp.c
-+++ b/plugins/otp.c
-@@ -96,6 +96,28 @@ static algorithm_option_t algorithm_options[] = {
-     {NULL,	0,	NULL}
- };
- 
-+static EVP_MD_CTX *_plug_EVP_MD_CTX_new(const sasl_utils_t *utils)
-+{
-+    utils->log(NULL, SASL_LOG_DEBUG, "_plug_EVP_MD_CTX_new()");
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    return EVP_MD_CTX_new();
-+#else
-+    return utils->malloc(sizeof(EVP_MD_CTX));
-+#endif
-+}
-+
-+static void _plug_EVP_MD_CTX_free(EVP_MD_CTX *ctx, const sasl_utils_t *utils)
-+{
-+    utils->log(NULL, SASL_LOG_DEBUG, "_plug_EVP_MD_CTX_free()");
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+    EVP_MD_CTX_free(ctx);
-+#else
-+    utils->free(ctx);
-+#endif
-+}
-+
- /* Convert the binary data into ASCII hex */
- void bin2hex(unsigned char *bin, int binlen, char *hex)
- {
-@@ -116,17 +138,16 @@ void bin2hex(unsigned char *bin, int binlen, char *hex)
-  * swabbing bytes if necessary.
-  */
- static void otp_hash(const EVP_MD *md, char *in, size_t inlen,
--		     unsigned char *out, int swab)
-+		     unsigned char *out, int swab, EVP_MD_CTX *mdctx)
- {
--    EVP_MD_CTX mdctx;
-     char hash[EVP_MAX_MD_SIZE];
-     unsigned int i;
-     int j;
-     unsigned hashlen;
-     
--    EVP_DigestInit(&mdctx, md);
--    EVP_DigestUpdate(&mdctx, in, inlen);
--    EVP_DigestFinal(&mdctx, hash, &hashlen);
-+    EVP_DigestInit(mdctx, md);
-+    EVP_DigestUpdate(mdctx, in, inlen);
-+    EVP_DigestFinal(mdctx, hash, &hashlen);
-     
-     /* Fold the result into 64 bits */
-     for (i = OTP_HASH_SIZE; i < hashlen; i++) {
-@@ -149,7 +170,9 @@ static int generate_otp(const sasl_utils_t *utils,
- 			char *secret, char *otp)
- {
-     const EVP_MD *md;
--    char *key;
-+    EVP_MD_CTX *mdctx = NULL;
-+    char *key = NULL;
-+    int r = SASL_OK;
-     
-     if (!(md = EVP_get_digestbyname(alg->evp_name))) {
- 	utils->seterror(utils->conn, 0,
-@@ -157,23 +180,32 @@ static int generate_otp(const sasl_utils_t *utils,
- 	return SASL_FAIL;
-     }
-     
-+    if ((mdctx = _plug_EVP_MD_CTX_new(utils)) == NULL) {
-+	SETERROR(utils, "cannot allocate MD CTX");
-+	r = SASL_NOMEM;
-+        goto done;
-+    }
-+    
-     if ((key = utils->malloc(strlen(seed) + strlen(secret) + 1)) == NULL) {
- 	SETERROR(utils, "cannot allocate OTP key");
--	return SASL_NOMEM;
-+	r = SASL_NOMEM;
-+        goto done;
-     }
-     
-     /* initial step */
-     strcpy(key, seed);
-     strcat(key, secret);
--    otp_hash(md, key, strlen(key), otp, alg->swab);
-+    otp_hash(md, key, strlen(key), otp, alg->swab, mdctx);
-     
-     /* computation step */
-     while (seq-- > 0)
--	otp_hash(md, otp, OTP_HASH_SIZE, otp, alg->swab);
-+	otp_hash(md, otp, OTP_HASH_SIZE, otp, alg->swab, mdctx);
-     
--    utils->free(key);
-+  done:
-+    if (key) utils->free(key);
-+    if (mdctx) _plug_EVP_MD_CTX_free(mdctx, utils);
-     
--    return SASL_OK;
-+    return r;
- }
- 
- static int parse_challenge(const sasl_utils_t *utils,
-@@ -693,7 +725,8 @@ static int strptrcasecmp(const void *arg1, const void *arg2)
- 
- /* Convert the 6 words into binary data */
- static int word2bin(const sasl_utils_t *utils,
--		    char *words, unsigned char *bin, const EVP_MD *md)
-+		    char *words, unsigned char *bin, const EVP_MD *md,
-+                     EVP_MD_CTX *mdctx)
- {
-     int i, j;
-     char *c, *word, buf[OTP_RESPONSE_MAX+1];
-@@ -752,13 +785,12 @@ static int word2bin(const sasl_utils_t *utils,
- 	
- 	/* alternate dictionary */
- 	if (alt_dict) {
--	    EVP_MD_CTX mdctx;
- 	    char hash[EVP_MAX_MD_SIZE];
- 	    int hashlen;
- 	    
--	    EVP_DigestInit(&mdctx, md);
--	    EVP_DigestUpdate(&mdctx, word, strlen(word));
--	    EVP_DigestFinal(&mdctx, hash, &hashlen);
-+	    EVP_DigestInit(mdctx, md);
-+	    EVP_DigestUpdate(mdctx, word, strlen(word));
-+	    EVP_DigestFinal(mdctx, hash, &hashlen);
- 	    
- 	    /* use lowest 11 bits */
- 	    x = ((hash[hashlen-2] & 0x7) << 8) | hash[hashlen-1];
-@@ -802,6 +834,7 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 			   char *response)
- {
-     const EVP_MD *md;
-+    EVP_MD_CTX *mdctx = NULL;
-     char *c;
-     int do_init = 0;
-     unsigned char cur_otp[OTP_HASH_SIZE], prev_otp[OTP_HASH_SIZE];
-@@ -815,6 +848,11 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 	return SASL_FAIL;
-     }
-     
-+    if ((mdctx = _plug_EVP_MD_CTX_new(utils)) == NULL) {
-+	SETERROR(utils, "cannot allocate MD CTX");
-+	return SASL_NOMEM;
-+    }
-+    
-     /* eat leading whitespace */
-     c = response;
-     while (isspace((int) *c)) c++;
-@@ -824,7 +862,7 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 	    r = hex2bin(c+strlen(OTP_HEX_TYPE), cur_otp, OTP_HASH_SIZE);
- 	}
- 	else if (!strncasecmp(c, OTP_WORD_TYPE, strlen(OTP_WORD_TYPE))) {
--	    r = word2bin(utils, c+strlen(OTP_WORD_TYPE), cur_otp, md);
-+	    r = word2bin(utils, c+strlen(OTP_WORD_TYPE), cur_otp, md, mdctx);
- 	}
- 	else if (!strncasecmp(c, OTP_INIT_HEX_TYPE,
- 			      strlen(OTP_INIT_HEX_TYPE))) {
-@@ -834,7 +872,7 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 	else if (!strncasecmp(c, OTP_INIT_WORD_TYPE,
- 			      strlen(OTP_INIT_WORD_TYPE))) {
- 	    do_init = 1;
--	    r = word2bin(utils, c+strlen(OTP_INIT_WORD_TYPE), cur_otp, md);
-+	    r = word2bin(utils, c+strlen(OTP_INIT_WORD_TYPE), cur_otp, md, mdctx);
- 	}
- 	else {
- 	    SETERROR(utils, "unknown OTP extended response type");
-@@ -843,14 +881,14 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
-     }
-     else {
- 	/* standard response, try word first, and then hex */
--	r = word2bin(utils, c, cur_otp, md);
-+	r = word2bin(utils, c, cur_otp, md, mdctx);
- 	if (r != SASL_OK)
- 	    r = hex2bin(c, cur_otp, OTP_HASH_SIZE);
-     }
-     
-     if (r == SASL_OK) {
- 	/* do one more hash (previous otp) and compare to stored otp */
--	otp_hash(md, cur_otp, OTP_HASH_SIZE, prev_otp, text->alg->swab);
-+	otp_hash(md, cur_otp, OTP_HASH_SIZE, prev_otp, text->alg->swab, mdctx);
- 	
- 	if (!memcmp(prev_otp, text->otp, OTP_HASH_SIZE)) {
- 	    /* update the secret with this seq/otp */
-@@ -879,23 +917,28 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 		*new_resp++ = '\0';
- 	}
- 	
--	if (!(new_chal && new_resp))
--	    return SASL_BADAUTH;
-+	if (!(new_chal && new_resp)) {
-+	    r = SASL_BADAUTH;
-+            goto done;
-+        }
- 	
- 	if ((r = parse_challenge(utils, new_chal, &alg, &seq, seed, 1))
- 	    != SASL_OK) {
--	    return r;
-+            goto done;
- 	}
- 	
--	if (seq < 1 || !strcasecmp(seed, text->seed))
--	    return SASL_BADAUTH;
-+	if (seq < 1 || !strcasecmp(seed, text->seed)) {
-+	    r = SASL_BADAUTH;
-+            goto done;
-+        }
- 	
- 	/* find the MDA */
- 	if (!(md = EVP_get_digestbyname(alg->evp_name))) {
- 	    utils->seterror(utils->conn, 0,
- 			    "OTP algorithm %s is not available",
- 			    alg->evp_name);
--	    return SASL_BADAUTH;
-+	    r = SASL_BADAUTH;
-+            goto done;
- 	}
- 	
- 	if (!strncasecmp(c, OTP_INIT_HEX_TYPE, strlen(OTP_INIT_HEX_TYPE))) {
-@@ -903,7 +946,7 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 	}
- 	else if (!strncasecmp(c, OTP_INIT_WORD_TYPE,
- 			      strlen(OTP_INIT_WORD_TYPE))) {
--	    r = word2bin(utils, new_resp, new_otp, md);
-+	    r = word2bin(utils, new_resp, new_otp, md, mdctx);
- 	}
- 	
- 	if (r == SASL_OK) {
-@@ -914,7 +957,10 @@ static int verify_response(server_context_t *text, const sasl_utils_t *utils,
- 	    memcpy(text->otp, new_otp, OTP_HASH_SIZE);
- 	}
-     }
--    
-+
-+  done:
-+    if (mdctx) _plug_EVP_MD_CTX_free(mdctx, utils);
-+
-     return r;
- }
- 
-@@ -1443,8 +1489,10 @@ int otp_server_plug_init(const sasl_utils_t *utils,
-     *pluglist = otp_server_plugins;
-     *plugcount = 1;  
-     
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     /* Add all digests */
-     OpenSSL_add_all_digests();
-+#endif
-     
-     return SASL_OK;
- }
-@@ -1844,8 +1892,10 @@ int otp_client_plug_init(sasl_utils_t *utils,
-     *pluglist = otp_client_plugins;
-     *plugcount = 1;
-     
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     /* Add all digests */
-     OpenSSL_add_all_digests();
-+#endif
-     
-     return SASL_OK;
- }
---- a/saslauthd/lak.c
-+++ b/saslauthd/lak.c
-@@ -729,7 +729,7 @@ int lak_init(
- 		return rc;
- 	}
- 
--#ifdef HAVE_OPENSSL
-+#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L
- 	OpenSSL_add_all_digests();
- #endif
- 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch
deleted file mode 100644
index d8b4b6efc3f8..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- cyrus-sasl2.orig/saslauthd/auth_rimap.c
-+++ cyrus-sasl2/saslauthd/auth_rimap.c
-@@ -90,6 +90,7 @@ static struct addrinfo *ai = NULL;	/* re
- 					   service we connect to.	 */
- #define TAG "saslauthd"			/* IMAP command tag */
- #define LOGIN_CMD (TAG " LOGIN ")	/* IMAP login command (with tag) */
-+#define LOGOUT_CMD (TAG " LOGOUT ")	/* IMAP logout command (with tag)*/
- #define NETWORK_IO_TIMEOUT 30		/* network I/O timeout (seconds) */
- #define RESP_LEN 1000			/* size of read response buffer  */
- 
-@@ -307,10 +308,12 @@ auth_rimap (
-     int	s=-1;				/* socket to remote auth host   */
-     struct addrinfo *r;			/* remote socket address info   */
-     struct iovec iov[5];		/* for sending LOGIN command    */
-+    struct iovec iov2[2];               /* for sending LOGOUT command   */
-     char *qlogin;			/* pointer to "quoted" login    */
-     char *qpass;			/* pointer to "quoted" password */
-     char *c;				/* scratch pointer              */
-     int rc;				/* return code scratch area     */
-+    int rcl;				/* return code scratch area     */
-     char rbuf[RESP_LEN];		/* response read buffer         */
-     char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
-     int saved_errno;
-@@ -505,6 +508,24 @@ auth_rimap (
-            }
-         }
-     }
-+
-+    /* close remote imap */
-+    iov2[0].iov_base = LOGOUT_CMD;
-+    iov2[0].iov_len  = sizeof(LOGOUT_CMD) - 1;
-+    iov2[1].iov_base = "\r\n";
-+    iov2[1].iov_len  = sizeof("\r\n") - 1;
-+
-+    if (flags & VERBOSE) {
-+        syslog(LOG_DEBUG, "auth_rimap: sending %s%s %s",
-+               LOGOUT_CMD, qlogin, qpass);
-+    }
-+    alarm(NETWORK_IO_TIMEOUT);
-+    rcl = retry_writev(s, iov2, 2);
-+    alarm(0);
-+    if (rcl == -1) {
-+        syslog(LOG_WARNING, "auth_rimap: writev logout: %m");
-+    }
-+
-     (void) close(s);			/* we're done with the remote */
-     if (rc == -1) {
- 	syslog(LOG_WARNING, "auth_rimap: read (response): %m");
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index fcf8d45e22b9..29f7fd16ca03 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -5,5 +5,5 @@ AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f
 DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f96a5eefefc4a3a382090eb7cad07c80419218300d853ccbef8f4e2288eb443ff06b3e64bf4511d9fa7aa84f5b794 SHA512 7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b
 DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722ce34d85df01b1ad072b916af9b9da2d0d119cd24e952073bd584ec76b027ba9b6c7d45fb057372b3e700b1f5741a SHA512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f
 EBUILD elfutils-0.176-r1.ebuild 1943 BLAKE2B e919191bb34934b44f7a38a008ad2eb09879fdc6b7b7656505505c97dfb4e82051f6f6ee388fa8a224d4b8374d0f4705a23db9fc30dada09411693a71f9ad719 SHA512 b04f95f56bbdc77d8b610272cda54393757bb76c70fa23f4d72dd09e59ccf1636d189f92a6e1b349a4c69e278d960853f30266208e009cb5a07b1273dcd3e242
-EBUILD elfutils-0.177.ebuild 1962 BLAKE2B 1679323257c950ea3b2464f2e65853f3b2abf1517997ed61c2a2604658971c11463383e8a905ef958f8c5a2db59c318e1ca82a2b10b6955342f1d5a597fee090 SHA512 a36297dc7350ae97453ce1db675d1d4f0c4ea7cb5ba903e74c8bb4a89a8eb8fbcd7f42925aafbc6629f6091ed85c2ab306d2b28a11db8235b804c6d3f8889150
-MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
+EBUILD elfutils-0.177.ebuild 1971 BLAKE2B de7d187c85c9984af4ad6b71f33d23268912298f0273f4ee370d6ad257ca136882301386380185b3b8ec0c5fa53a0324ab5593c23ece3489fbc3625652eaef2a SHA512 fec602e67e6b6517ec7c71877eee13e9c422ca77055fb51c890a300cd555c72363dc376429cd0aceb8c981eb31529955c3156070e8c93f5337f68104944a54ff
+MISC metadata.xml 630 BLAKE2B a868e2c1506f03ed2a36575a7395f4cff5688ef1ffd629d0db737a33305dc58a368aca03179f5a7e428b478c317789a4600b9cf4e2a90a3a34a2f402781b966e SHA512 81099941ba6bca61567b62e353c488b3705408cca1d8c097beb1e0f0baacc4d45dd1708932d8f255efb8691d6b94844d267054251cacc0860a369701203d9b82
diff --git a/dev-libs/elfutils/elfutils-0.177.ebuild b/dev-libs/elfutils/elfutils-0.177.ebuild
index 373a5ff08cd7..0bb7a5297f04 100644
--- a/dev-libs/elfutils/elfutils-0.177.ebuild
+++ b/dev-libs/elfutils/elfutils-0.177.ebuild
@@ -18,8 +18,8 @@ RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
 	!dev-libs/libelf"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )
 	>=sys-devel/flex-2.5.4a
 	sys-devel/m4"
 
diff --git a/dev-libs/elfutils/metadata.xml b/dev-libs/elfutils/metadata.xml
index 14c09d810f33..7d0275bbf23a 100644
--- a/dev-libs/elfutils/metadata.xml
+++ b/dev-libs/elfutils/metadata.xml
@@ -10,4 +10,7 @@
 		<flag name="threads">Build the libraries with thread safe support</flag>
 		<flag name="utils">Install command-line utilities (all the eu-* programs)</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:elfutils_project:elfutils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/foma/Manifest b/dev-libs/foma/Manifest
new file mode 100644
index 000000000000..46c83c5fc1f9
--- /dev/null
+++ b/dev-libs/foma/Manifest
@@ -0,0 +1,4 @@
+AUX foma-0.9.18-clean-makefile.patch 1349 BLAKE2B 7f0dfb37d72ab9db835eff35dd5b79dca40c02c305cba23d89e2495c34592e5e4033b091763dcdb1eb64b7d4845868bf58c4754609e19a2f7ce2cef1ce7b749d SHA512 513ca1681e50c9ca7763364a510a28d86196f0685fc98842078a0b258d72cfbf4fb702e681d1433f242d7079ff4a78541a0765e261a12d7b7c2868fc15c3a7a3
+DIST foma-0.9.18.tar.gz 337134 BLAKE2B b7f1eeaeaa21096f8077f0e81f3c57c49bbba30afe8db280089c40ed6cf475df33a6899fd2b6929d3f58fe8b3660a92566ae41f2bd5d8a46dacc073b48caf030 SHA512 17df4c070d1460855804aa63f97cc4a0d9568755e93de0de80821625faab7a3994a260650c5e8f43f80b5a0702dadb0cfe57136ab50eb2a9946f118991205b1a
+EBUILD foma-0.9.18.ebuild 1007 BLAKE2B a96cc6045f75bdb615375ee48821b446dc141781f887b6a4a0b26a8d7966bd7fab8c0807fc2a81e53579774d4088df6a70b210103f1c70ac356d3d848b2a7f2b SHA512 4391f9d1d2782458af8998d532ace81f54cf3e731b8755bfb6a704e5cd4584237eaed1e813ce9766b326e60779dd922ef2d699196d20747d5b4320324a866236
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/foma/files/foma-0.9.18-clean-makefile.patch b/dev-libs/foma/files/foma-0.9.18-clean-makefile.patch
new file mode 100644
index 000000000000..0ed1b811fc67
--- /dev/null
+++ b/dev-libs/foma/files/foma-0.9.18-clean-makefile.patch
@@ -0,0 +1,35 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2015-06-13 06:24:02.000000000 +0300
++++ b/Makefile	2019-09-08 09:24:22.127655912 +0300
+@@ -1,21 +1,16 @@
+-prefix = /usr/local
++prefix = /usr
+ exec_prefix = $(prefix)
+ libdir = $(exec_prefix)/lib
+ bindir = $(exec_prefix)/bin
+ includedir = $(prefix)/include
+ 
+ VERSION = 0.9.18
+-CC = gcc
+-RANLIB = ranlib
+ YACC = bison -v
+ LEX = flex -8
+ LEXCLEX = flex -8 --prefix=lexc
+ LEXIFACE = flex -8 --prefix=interface
+ LEXCMATRIX = flex -8 --prefix=cmatrix
+ RM = /bin/rm -f
+-LDFLAGS = -lreadline -lz -ltermcap
+-FLOOKUPLDFLAGS = libfoma.a -lz
+-CFLAGS = -O3 -Wall -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC
+ FOMAOBJS = foma.o stack.o iface.o lex.interface.o
+ LIBOBJS = int_stack.o define.o determinize.o apply.o rewrite.o lexcread.o topsort.o flags.o minimize.o reverse.o extract.o sigma.o io.o structures.o constructions.o coaccessible.o utf8.o spelling.o dynarray.o mem.o stringhash.o trie.o lex.lexc.o lex.yy.o lex.cmatrix.o regex.o
+ 
+@@ -82,7 +77,7 @@
+ 	if test -f $(libdir)/$(SHAREDLIB); then rm  $(libdir)/$(SHAREDLIB); fi
+ 	if test -f $(libdir)/$(SHAREDLIBM); then rm  $(libdir)/$(SHAREDLIBM); fi
+ 	cd $(libdir); ln -s $(SHAREDLIBV) $(SHAREDLIB); cd $(libdir);	\
+-	ln -s $(SHAREDLIBV) $(SHAREDLIBM); (ldconfig || true)		\
++	ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
+ 	>/dev/null 2>&1; \
+ 
+ $(OBJS): foma.h
diff --git a/dev-libs/foma/foma-0.9.18.ebuild b/dev-libs/foma/foma-0.9.18.ebuild
new file mode 100644
index 000000000000..778896159254
--- /dev/null
+++ b/dev-libs/foma/foma-0.9.18.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A set of utilities for constructing finite-state automata and transducers"
+HOMEPAGE="https://github.com/mhulden/foma"
+SRC_URI="https://bitbucket.org/mhulden/foma/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/readline:*
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/foma-0.9.18-clean-makefile.patch" )
+
+src_prepare() {
+	default
+
+	# Install to correct libdir
+	sed "s|/lib|/$(get_libdir)|" -i Makefile || die
+}
+
+src_compile() {
+	export CC="$(tc-getCC)"
+	export RANLIB="$(tc-getRANLIB)"
+
+	export CFLAGS="${CFLAGS} -Wl,--as-needed -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC"
+	export FLOOKUPLDFLAGS="${LDFLAGS} libfoma.a -lz"
+	export LDFLAGS="${LDFLAGS} -lreadline -lz -lncurses"
+
+	default
+}
+
+src_install() {
+	emake prefix="${D}"/usr install
+	einstalldocs
+	find "${D}" -name '*.a' -delete || die
+}
diff --git a/dev-libs/foma/metadata.xml b/dev-libs/foma/metadata.xml
new file mode 100644
index 000000000000..6b0a0fb3a729
--- /dev/null
+++ b/dev-libs/foma/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index f1462e1302a0..34fb8a38d270 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,3 +1,3 @@
 DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2
 EBUILD fribidi-1.0.5.ebuild 971 BLAKE2B 23b208bb3e27108ec33623166f546878c44b3b2261c3b3519270eecb2dd474343eda57b351ed12a6bf3db96c5b8b52219bed65cd1ac0454c1d8ca1969743566b SHA512 e77a470f58afa0b647087c90109d009cacffebbe0bdec475a449973eec0f94f3249bfd384c8e69d31df09edec523569afe8021a6610fea642f96f1cdd0fcbb50
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
+MISC metadata.xml 341 BLAKE2B 5270be41f2666b559cee776629574ac71d81f82d273992d8377febd5c22418ef3ed933214a02a39a8de6cdbd4730d2abf547f001cf1d86c9c40b1a344880d276 SHA512 70b910d1fc10d8c0750618d8e6c1b2722a377f71042539f2400d6364a61483bd270d58e3a8f4f4f46f1a018d239902157b0a1d4aaf9e32b33346136f093f40a8
diff --git a/dev-libs/fribidi/metadata.xml b/dev-libs/fribidi/metadata.xml
index 996e7cacd217..8cfcbe768dc4 100644
--- a/dev-libs/fribidi/metadata.xml
+++ b/dev-libs/fribidi/metadata.xml
@@ -5,4 +5,7 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:fribidi:gnu_fribidi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 83ec980609fa..0ec1a709b26f 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,8 @@
 DIST girara-0.3.1.tar.xz 58148 BLAKE2B 7945ca0b417bf09a37f4ce7cc6603adc93cd224d7e449c7f4dae00a4abf254b251230fb40e2f985c293bad95c0bd05ff646418bb5f8e0a1c6d5d2df832900256 SHA512 5c4b2972bfb0296cd1b984c9426b67b50e29e2928fb0e9a3aa3f9bc21aebc28dcc93570e888060e0bb02561022b379cdfcfa3317b52e78cac04e7fc1ba476107
 DIST girara-0.3.2.tar.xz 58220 BLAKE2B d5962a2c8425ab49a23a08d9e2e3db44ca5d721f978070c221cbbf0bf5e16fba9121911d932607e14350abe0e6190e74412c52ea7ccbf24f0159721485170e97 SHA512 ce8b1498c2c5e278a4689f945e6773cbf19b3357711636bbe785d96c8d381cf8ba457268ca154f7bd48b06d79cc03296d2e4350784299a13c4972030bcb0dbed
+DIST girara-0.3.3.tar.gz 72372 BLAKE2B 59171e104f1558ed794e1bb623bb5121007af0cf831524fac5170ce8e55d939d19ecb747b7bc4bb900e978d29fd987d592a0e16982a248adc5b085503ccb2b43 SHA512 2764f339c4b5744330c60fa5c8c902a06952d6c5a38589d236fe290f9934b9128527658d8aa99d42806255403b90f55ea1a85e5bd09da4b3a8f7c48be4d94f51
 EBUILD girara-0.3.1.ebuild 1055 BLAKE2B 31476edfd1e68fc846b2eb339d098d82dbb2fb04d8751b57568661b357d1016b44abafe5a8fe6871120d4807dfd6415da5187b4a00ba98801d6c01eb1912b835 SHA512 1c5f4296473db9674a97be80f7bbd8ec697230853196d175ddf542fc96e2ba215c28f60a1475798c5bcb92eff220cc888eaf458b33d05190a03cac8035f390bc
 EBUILD girara-0.3.2.ebuild 1049 BLAKE2B 042c375f57bf86f8c8af4b57b7e167ca41367238690dbb55aad6b5144e8ba4ab2dbe9d9b83b987e8763b49a8e0a98ec1bfcedc71ad45b94dd348f9b5777bdb4e SHA512 cc415478c8b086aa8a6ebb0296ec5c1b3d276b64dd5251f173002ec414ff3ad34f4f19dab9cb6c7f145a50090c119f79060cdb7400be0a92710677748313eb9c
-EBUILD girara-9999.ebuild 1058 BLAKE2B 3d2cec206425a1d8e392b5012d3328f7667fa2070c1b485377411de87ea5bc3a23463f0df76363178a435dc5958d6de93000cf21b68b43121052d90e3fce93f4 SHA512 b1e88ec6fb934ffc3e3c5d85e0e514aaf18d7fb20b591ef5ec08972bf64a34d3e8959c1c2c74936510f950cf2d30fa0f1566e56dad522c784d257f4ce3b6000e
+EBUILD girara-0.3.3.ebuild 1065 BLAKE2B 94991dc72369eb26fe7b9f42c3f0238d4fb6f809f5ff8afb915ab833b96a0ad1e9e5259d51ef5234701a7cdbf5e70fd105f3d75fe9ecc15c2497a6e8678d0c67 SHA512 af8ae37289f3708d7c97dca7bed33a1e985392429ebf5dad35fcf739a9650dca391a9e2fadda1fe4da6524c3c433d925d0bb2047ade3be3070cff57f8e1ce702
+EBUILD girara-9999.ebuild 1065 BLAKE2B 94991dc72369eb26fe7b9f42c3f0238d4fb6f809f5ff8afb915ab833b96a0ad1e9e5259d51ef5234701a7cdbf5e70fd105f3d75fe9ecc15c2497a6e8678d0c67 SHA512 af8ae37289f3708d7c97dca7bed33a1e985392429ebf5dad35fcf739a9650dca391a9e2fadda1fe4da6524c3c433d925d0bb2047ade3be3070cff57f8e1ce702
 MISC metadata.xml 661 BLAKE2B 23e1208a22b54c7301973769a1b00adc8a2bc79cc7c4e5743e4bfd4f8e99933842466aa853510156f14020657954f35d89466888f03e515e9dbb00bd948845a4 SHA512 fb995def4c0b05dcc8bfc77ced8283bbc8e872586f7eed834291510f037215480fa38cdd4a4ff930337ef3e759e65ab55b417e531c8ff0c058c93cd15b630f59
diff --git a/dev-libs/girara/girara-0.3.3.ebuild b/dev-libs/girara/girara-0.3.3.ebuild
new file mode 100644
index 000000000000..6aba9061dfb2
--- /dev/null
+++ b/dev-libs/girara/girara-0.3.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="UI library that focuses on simplicity and minimalism"
+HOMEPAGE="https://pwmt.org/projects/girara/"
+
+if [[ ${PV} == *999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc libnotify test"
+
+RDEPEND="dev-libs/glib:2
+	 dev-libs/json-c
+	 >=x11-libs/gtk+-3.20:3
+	 >=x11-libs/pango-1.14
+	 libnotify? ( x11-libs/libnotify )"
+
+DEPEND="${RDEPEND}
+	 doc? ( app-doc/doxygen )
+	 test? ( dev-libs/check )"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i -e '/'-Werror.*'/d' meson.build || die "sed failed"
+}
+
+src_configure() {
+	local emesonargs=(
+		-Djson=enabled
+		-Ddocs=$(usex doc enabled disabled)
+		-Dnotify=$(usex libnotify enabled disabled)
+		)
+		meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild
index a650dd0c40b7..6aba9061dfb2 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 	EGIT_BRANCH="develop"
 else
-	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
+	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -40,9 +40,9 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
-		-Denable-json=true
-		-Denable-docs=$(usex doc true false)
-		-Denable-notify=$(usex libnotify true false)
+		-Djson=enabled
+		-Ddocs=$(usex doc enabled disabled)
+		-Dnotify=$(usex libnotify enabled disabled)
 		)
 		meson_src_configure
 }
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 2acaf57453c2..e6b88fe4e3f3 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -6,6 +6,6 @@ DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 EBUILD glib-2.58.3-r1.ebuild 10907 BLAKE2B c600133aa1db3ec6d7171d83c59fdb6da341d2c074847770b88828c34e0616819882ff3604d79291e621b18724b8ae2e57fd5cf1fd9250ac31622d2de2157887 SHA512 011fdbe52c49f32682f5735ba4332e25e87b5ed8efe3da9c5fd543c282ea7932deb11d05cb93b6ab92460f0d545e0c7cb3798c4c3f736b58e9b5ca3ee388e1eb
-EBUILD glib-2.60.6.ebuild 10142 BLAKE2B 1c6567841cbdbdd0bb3d114d33be08b4c5a202c49ddaba8ee5d686682f9c1265535e4547e4ee6f2bafe938c301f0aba24f90cf175e89696e7f29bbaf6daabcdf SHA512 ff1cd340ceefd9bbcb579d87d346e7ad16afa7e30e2c96fbb6639f15fe4f58954da4000a5fe40cd2fc8a80a001ca7cbec426d15014dc66e16fe24092b99ccf7e
+EBUILD glib-2.60.6.ebuild 10141 BLAKE2B 8772b393f4399521373cb02d167de1c3d0d665d91a8ad78081dbdff3e5abc10d3ab077be9aa9bca47c2ffc24fc641f9b851b3398ab70dcc5aabd7efa0cce9808 SHA512 1908ab867dcf7843747b6d6a1ace9dd508ca837c4a7c8771b73e1b48b3e42066feb0228cd1e25bf47641a33ebfcd9113f544f89f747adc8a7f2ae9ff69fa9cf2
 EBUILD glib-2.60.7.ebuild 10148 BLAKE2B 2ebd61ea78d44be8fda45dc9a13690af237bcd8a4002720a5743bbc171e128aea6fae71d6c19eddbaa565a3f5436d85290d38c1cc5ef346b28ed0f027110ee63 SHA512 978271f013dc19b9acb3e62ea47016ec67505c1950f3f8db538fc6d55a238bf1a632735a34af64a33949ea9492bcbc46029efc3fe427494a7edd1a8ea02ba204
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.60.6.ebuild b/dev-libs/glib/glib-2.60.6.ebuild
index 7ea978200ad9..989de333118a 100644
--- a/dev-libs/glib/glib-2.60.6.ebuild
+++ b/dev-libs/glib/glib-2.60.6.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 68c4e3f67f19..8df135d5b80d 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -6,6 +6,6 @@ DIST gmp-4.3.2.tar.bz2 1897483 BLAKE2B 0efecd60c7a585f94ec8cbee77541d409c8e3bdea
 DIST gmp-6.1.2.tar.xz 1946336 BLAKE2B 2a864e80799471037a71c10d871f9782c37fe3a0a1734872e90f14a874ecd6551099d67b2ebd07f82a43b0522249a6b46e79952db11a278f87ca8013198f7604 SHA512 9f098281c0593b76ee174b722936952671fab1dae353ce3ed436a31fe2bc9d542eca752353f6645b7077c1f395ab4fdd355c58e08e2a801368f1375690eee2c6
 DIST gmp-man-6.1.2.pdf 825720 BLAKE2B b96340da5f534353b140b361fc1ff74757168024e8039d97a0ed1f14d874ff5fbc50abae2ff3505adc51d72e4acf2882ae6ca6405ae37b594f7b248e1ca05247 SHA512 85de10b2c03f7381881c3e95aa7fc53d8e018115028496ffbb5a79ab4967106c69ed7e97a5e434e6bb39752498aade8c2caa7cf77a8942b7ffd9150368a0d9c3
 EBUILD gmp-4.3.2-r1.ebuild 1699 BLAKE2B 7f600a9d920bf53a0de5954675d3cf72738ab7f74f2e552b0fbbcf3ec891835153ac6e3b5d0180171fc0356d9b9b1384882d9c4fc13b2d1e03c79b53b8c3d312 SHA512 2df5767cb8e4ae67f0264ad5cdd99888ec465774ddd079c9bc6648058138a28dbe4203552233c62ee02b7b2c6ccf2747ec70d2d078dba1528ffca7fae2fb40b6
-EBUILD gmp-6.1.2-r1.ebuild 2962 BLAKE2B 0321eeae64c04c74aaed54da12803759351f39fbfde7b53b146c31d760f6b9fd79d18a3f7d256a56e6b21a18042b68923bd9ccdd7a68cef3729cbe01aac469c3 SHA512 90090db4b581cb8630e0512c744643157c58fcedb5f6072d7f5a094748f9d724d36bdf1ad8f39118a083473458d26b042461931a10f2f9e0acc1b56c06868b3d
+EBUILD gmp-6.1.2-r1.ebuild 2955 BLAKE2B 2a239bd97fb0f05f0de5c94622c33d101657bd5ef1cb2527ac541616a925d5232a91dc9bb97f8577924b890cb369192203bf98415f95b4c917517f7456376ea5 SHA512 92e7b1f973a4cd587143458cd7c9421ba18a628b0713657e371cbf2f40e028fed6b29ecf34ba90767d18b31df9dc5579e78c619d35b6ac16ff5b1a8192fbb101
 EBUILD gmp-6.1.2.ebuild 3034 BLAKE2B 5de624947cbaa0b8edcc8e79312ae08f5fee41a1fbd31534cd13df246f9ec833142bc5e47501bc0d3da913763481328c83f84942bcb5380ba7ba87d30c5bb382 SHA512 874fb4368d5685dadafc758bd657bd60677207f0d9316ea5ef978acb26a7158e14fd6df5599aeb05dcff0094ca4b66201a09930639737f35eb11947853fd1d96
-MISC metadata.xml 361 BLAKE2B bde6f7cbb7a65e5ac80991eff4a8498b28242b5555ba0ea57718eb47df9f9e5cc681f5ebc047ca1a7bf87fa701e945050dd0a84aac02dabd9bfe5cd8d18393ca SHA512 f78bce3229fea097143ee33259707e6fa9da3adc03b4f10f8881be0f8e772df87a590c0d5a9e37e81a98d955bad63182d4bd5c18467e8f03557de412c18fd86f
+MISC metadata.xml 437 BLAKE2B 74945994e080552031f2fbcf051b5fb638712205d40433225fa010f70376a96903da3945dfafd4594da53624628d1abb9929a854cde7a60fa2e88fd01f0ba025 SHA512 c1d6b6a603472a84703310b3dcc72eefc66858ca397519cc42d06750b57d6f9683c9ac908cd3fc3aa16406957ed23a6ddf12a3cba6b20e97c21758b4ed3425ea
diff --git a/dev-libs/gmp/gmp-6.1.2-r1.ebuild b/dev-libs/gmp/gmp-6.1.2-r1.ebuild
index 090c6d82458f..9682b2ed2d35 100644
--- a/dev-libs/gmp/gmp-6.1.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc cxx static-libs"
 
 DEPEND="sys-devel/m4
diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml
index 5fa58802c03b..84e19205350d 100644
--- a/dev-libs/gmp/metadata.xml
+++ b/dev-libs/gmp/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 	<flag name="asm">Enable use of hand optimized assembly routines (faster execution)</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gmplib:gmp</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 926cdbe0eab8..1594d23fefe5 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -3,5 +3,5 @@ DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
 EBUILD gobject-introspection-common-1.56.1.ebuild 1019 BLAKE2B 8f1d42b739389066c17614960bc214c616a9717d51e845b98ff0dc59fc10d484bda878a4149b358615568544d5b05259e2a788dce281bd4d5a70fe590373f4ea SHA512 db776369d3eb5af2c664aad6bd52a19f3d0371f9b84221c9cf65359cb625089e54b9b1aa9e3cf926b250fcd89e303a7fcffb34c0e5c58893583c82237a0c16f2
 EBUILD gobject-introspection-common-1.58.3.ebuild 1021 BLAKE2B 42f44b301be74849799c2f3b4382090aa2aa419bf50af10c7143c01251ebb9eab93997bef45e25680a3fd0d599e9bd4979bce5d6f50272199a923da6b3c7a2f1 SHA512 07e3ee6f0ec78190f024045a04b9ae3b83c34c4e495ebd99a9ddd1ad8233ca5989aa54158ed5c77bbff1d98bec21698bb46ac007c75ccd71dbfe23b50b3a4a02
-EBUILD gobject-introspection-common-1.60.2.ebuild 1024 BLAKE2B f0374b9d3c75cdc9fdc2f495fbc4d6835f2d90a52d01f54eeea7b09a4760eed6680753f96f4921c6bed78ee06fbabbc7bf1d4c71b6f1bbea0086e8ff612bd579 SHA512 781b22523d1bfbee0edeaddba568cbf51260dff4cabf94329018cca5539ce66d6f2c208e30f1c8428e297bbbd2a2a5f3b335f3446378ac34154a2daaec789c44
+EBUILD gobject-introspection-common-1.60.2.ebuild 1023 BLAKE2B 9e9708d55cc98d99469b86ca9646554f7bdbc0f8806bb4f1e0204d718dbcbd6bbc059de5720354f13c4d4fcd0bf8f84ec254b1b4f38e41326022da2069edc584 SHA512 8cde81b8926f0b625f762a349b01793ec5383f333f45606a6ad4bbd5a1b20c9889a7fb63ce3d20c8d223017dde728005abe2dc68698f4b11204566a91f62cbd5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
index de62f83e3ef0..a0b22e1b18ff 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 51027f33c294..98de3d3fb7a6 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -3,5 +3,5 @@ DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
 EBUILD gobject-introspection-1.56.1.ebuild 2123 BLAKE2B ee5a7866e95a1a70b74e2313e51a0b443ef2effa47aa9a119bb3c06442ba98e54e45c0d2fad34ade22fd0e1a8c9f4bb54fa4182f9acda62d0570ac30685f9893 SHA512 0e4c52cecf5cd72848f62a89402207c97bc6073472af2b0a3933dfc0f44170d06969f0bd9a0bdb692b3fffce4a1f4b40aad3b55fb9e932dc3dfa90637b9a28dd
 EBUILD gobject-introspection-1.58.3.ebuild 2201 BLAKE2B 53844bc18ba8ebe1e7f5e4e290c323bb02378793b43590bf9326c2af5fee6ad72d1083a37a2e16f654cc4c6a01e0dfa496954328ac1b9bca07aaea24791210ad SHA512 ede4515431a1d256694d18801416eb22ffe4bc6feb7cebc714178044acd396f2044c61976a3703add9066c99d08a2cad16e02b2c38cdd83725509584d4558bd0
-EBUILD gobject-introspection-1.60.2.ebuild 2118 BLAKE2B f1ffc01c08f1386c7d8a61d6b86d05ba0108e2c5f7dac3d1f519eb48ca86cf3672ea160c5aa3d2d6f3cb5df1934e179398fea8ca89ecb3b3c701cdf44f6651f8 SHA512 c513a4ecb0cf78cafa477680dcb3f1df773c0175e9b68fb84f6188a5de2523c9551a192e0fe7905581a0d951464ec21bd2c107408b1ed686d9eccdecaed71a2a
+EBUILD gobject-introspection-1.60.2.ebuild 2117 BLAKE2B 7e7ca6e4e201616a22e563fa353918fc7575354d2de5d52e36b909538dce5bb9a3ee59653be39857593490d85aaccda0e5c4f3fe691c9cba3f71e95b3b95f683 SHA512 c94f0ab2e261b369a7fac5b67a5725bf8cb8f4210203da5f259860420bda7484579803f1ed53ff3fa1a48698bc9f7763d671319891d18a777dc96036758bfc60
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
index 5161c5e448da..6cbcd37f2d0a 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index bc800c550845..b7f45c592fd8 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -21,5 +21,5 @@ EBUILD isl-0.17.1.ebuild 1078 BLAKE2B dc9095858fca6bbc1445bec8c7a277a4552f7695ec
 EBUILD isl-0.18.ebuild 1078 BLAKE2B dc9095858fca6bbc1445bec8c7a277a4552f7695ecde0ecd5f102073d4f720da7b8b3429014da53ea0f05c540cca486f3497bb472dea72c21cf230b846bcfed7 SHA512 74a306b624ecceeb45e7f92e5412746e804c366b76a477e0b6b5feb8e4328bc3e8a252d65ddfb59938504ebe99a99e0a7c34970d48bd3aea532bf073c1a36e5b
 EBUILD isl-0.19.ebuild 1362 BLAKE2B d31f140f3168fb1fb25ca106c5953c8c7baa92d338d4bbf361c13061a21cc8a0ee7b27fbbb7259d6e1aa5d0aae7fbe92c5824046473f62a8880116bfbf8bdce6 SHA512 e6215d0e567d46470e446cda506b618d67b2380b2ec8967636197d56ebc6afa46f98bb4c522d03427b6841aa6f89e8edec209b1f9f87aa64fc6220fad8381c61
 EBUILD isl-0.20.ebuild 1362 BLAKE2B d31f140f3168fb1fb25ca106c5953c8c7baa92d338d4bbf361c13061a21cc8a0ee7b27fbbb7259d6e1aa5d0aae7fbe92c5824046473f62a8880116bfbf8bdce6 SHA512 e6215d0e567d46470e446cda506b618d67b2380b2ec8967636197d56ebc6afa46f98bb4c522d03427b6841aa6f89e8edec209b1f9f87aa64fc6220fad8381c61
-EBUILD isl-0.21.ebuild 1272 BLAKE2B 9cc2f1ced33b3a53c25b78ef2b0bd483d00333b0ad271ed6ec8bfa4878aa3eca1b67b7b7e0c3dffd3546c9e631fd925d449a89474aa6c9217c717f93f321bca4 SHA512 8c80585be8c0efbd232bd53d054a17e3561fb6e81e22c73008293924e0c36f571c5ea7b9b0c17a90fb61528b63298eef081fd956e72882bce0de15a60c2ad996
+EBUILD isl-0.21.ebuild 1265 BLAKE2B f7d466ec90d4c133d29f2c9251e9d1d6eb842c3d35f6cca97bbf2403588a568aaeccaf858ce5ec130b504e679f2ba67661906c4264b08e66fab41d30c1272124 SHA512 98a0b368f47c6fbca98660e2dc496518380dcaf8af7c216a673147a5e1287b5b055651ad8cd2fa162958e4541fe24db181667d8254afee11a3eab93b01214bfb
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.21.ebuild b/dev-libs/isl/isl-0.21.ebuild
index 89604d8e331d..24942d622e84 100644
--- a/dev-libs/isl/isl-0.21.ebuild
+++ b/dev-libs/isl/isl-0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/21"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 3da7ec59cd51..542ddd31de26 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -4,5 +4,5 @@ DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b6760
 DIST ivykis-0.42.4.tar.gz 656775 BLAKE2B 9b85dacb74eae99907999d5181029a824c5f0d6aabb41d892353723318f9ff6fc1a2a6296224c7ee407510f7354f2ee934d40b9627a0fd13489bf53b8ff7f115 SHA512 26f4fa28582555004cbe1d80cb042f93deb42b195c7d563ce4048ace25c74bb558455d98d2d8e0e59534fabb2dff6503aff16d0feb7a05fd835b63432f080286
 EBUILD ivykis-0.42.2.ebuild 402 BLAKE2B 9fe4f5097ce2060c52b99c925cd12a9e79742396c7bb3ae84a7a89a1d7d082fc88152a4e06032ad988366f4323a2c10a329f6ff690a2278d0f6bfa4c3f5a6c09 SHA512 ca5974208c11a02c33f7a66c2336e64e054be78b9ed1bad43b55de065ab9a4b939f893c3286544dd87965dcc9a0b1e02a1435b36d02f8b657c41fc0a7c4e7da0
 EBUILD ivykis-0.42.3-r1.ebuild 709 BLAKE2B c101007f21a5ff3c1bbfe36c2382122a571f723e714f50eeb2ef43991c7d2fe622938711d5a80e5eb3a97a0d28297f25aee6e2216bbb867793bf3d9a822f5478 SHA512 a96143d639e6c8165e6e6ecde0cc5c650bdde5ae77f7b05140e02babeddb88b8e4148d9755d53d8983ae94f116a4abf71a291dcde37bf89a579637487ffda9dc
-EBUILD ivykis-0.42.4.ebuild 633 BLAKE2B 0d5864886d7c16e4c605fee8c50696851e52ecff6a908a44ad818b29c0e6eba525e6109a3f7bd2dc80eada9926028bcbadaea526f562e6b942a272a53c7a39d8 SHA512 7f7b9cc57222554c87c36dd4403132a78caa5327ff843211036b5e80a9d1ed2d05ceea85ee365c48bf8219833de9ef99c6648ac7829e90931f854a6449d0734e
+EBUILD ivykis-0.42.4.ebuild 632 BLAKE2B 415b5532803c9654683af1b81c5b51faf43c1f294d9c45c4a783f08fd2a77d3cbcdafd09631d231b110f4cce8fbc43f2fbe0e4a2593ec6ea69061f4003352678 SHA512 99a30826deb913a49b2e905ecc1e3da2fc1d8dd0b1b18d936047779ab32fbd846b576cd1e7524d1841c86ef6e45bb63e852b0479d8989e18a9208b22a2957b67
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.4.ebuild b/dev-libs/ivykis/ivykis-0.42.4.ebuild
index 56b502130939..4fa4e85becbb 100644
--- a/dev-libs/ivykis/ivykis-0.42.4.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/legousbtower/Manifest b/dev-libs/legousbtower/Manifest
index e07a7693eff6..367b1fa86fe5 100644
--- a/dev-libs/legousbtower/Manifest
+++ b/dev-libs/legousbtower/Manifest
@@ -1,4 +1,4 @@
 AUX 20-lego.rules 83 BLAKE2B ac95969960bb86f3b5e18d7c9c00b49e4ecb2fb850f1481ca290de12e76eb3b14d0b4ddf225f569c8a8005bbf5a557590a63d9c7fc1881e2e6884a30e75d91c9 SHA512 1e708d5c5d1169075c6ba626cfb362e473e4d026c8ced32f888eb6874637bf7d655917b08f15738cb53eb4be78f8c243c795293862d109683e895507f30dfc61
 DIST legousbtower-0.5.4.tar.gz 22782 BLAKE2B a77f1e2fbadc7b7ecc93ce1726d4dbc47048cdf9edb7627cc08a4fb571657b0e601f7cd9b7a8026892a596ffaf8c3c9d26e4074c7aef57a78964087e905e38de SHA512 169cf31d4585bf3b7bd9aded76d202bb14e285f644f8aa10a6f4bf6d99e6f28efc33c65922388cdfa17a1bfc0dbc777edc1fb45484155543a42117eaba6fb7e7
-EBUILD legousbtower-0.5.4-r1.ebuild 734 BLAKE2B 67d528bfea0082bc1f2f83062f1db75d12e891fa1a3a6d818951acf0534147d6f448dab3a94e18f46088ea833e673e71452302cea1a14f40427c50c1336ea94a SHA512 43b4d1e9cbc7b7989d1a93d8f4cf5ed25b08d00304dbc2d86f0f9cd8d4cb99898f78da3063418a05f96bd887ed43edf3bad57700b6746a52d42077fa5de7d633
+EBUILD legousbtower-0.5.4-r1.ebuild 905 BLAKE2B b6a1855fccfe7e85933094d15d38308c81f103c9a7bc2f46c2388cac67264eb4274a14b4752b0875ef0246f35079bedcde65f0a841a3ef29b462e396c91ccfbe SHA512 4e52ee06c59bd1ca64ce145521fed6bcb4d9709e394f19ba3e4f4a8964e034e8618697e6aa22bf98bbfce407df078d1c4a317f7c68f49ad63320ded3cdd51bc4
 MISC metadata.xml 244 BLAKE2B 9eceb013695379bbfd076331cd25d5c86c334913652e1f634b1b9dea98d36fa9e9a70e40606f45dffc0c437b96c3213cc446f6d460839d9b87440bb1e984b7c6 SHA512 dd104cf292c56e0c1faced64aec00bd8668ee8925116d795a47b3e1fd88f5a743ec64111e4095b9afbaa2823c20bcb5100bf1ffb5d17e5a19389112249a835a6
diff --git a/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild b/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild
index 51fdecaf027b..f24ec9097bb4 100644
--- a/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild
+++ b/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,9 +10,12 @@ SRC_URI="mirror://sourceforge/legousb/${P}.tar.gz"
 HOMEPAGE="http://legousb.sourceforge.net/"
 
 SLOT="0"
-LICENSE="MPL-1.0"
+# The specified license is wrong as the file uses code from proprietary
+# SDK.  http://legousb.sourceforge.net/legousbtower/index.shtml
+LICENSE="all-rights-reserved"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
+RESTRICT="bindist mirror"
 
 src_configure() { :; }
 src_compile() { :; }
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index c8235eb64e17..d3b60dce4550 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,7 +1,7 @@
 DIST libatomic_ops-7.6.10.tar.gz 503734 BLAKE2B 5ee4adc3b2e9afe22d52a4b390927f79dfce139e9975c75aedd379fcbb34a1f0de82ca98ddc58a386e193080ba75eb1b6161bea75b62b8f3b4941979248290af SHA512 4661445503ef4303e873559af319ad799a7eddad3df45ad602cf338c594a642ad4333a36fa91722f0d8c48acd38bbf45c60a468c7375d14824520a83c1109ec9
 DIST libatomic_ops-7.6.6.tar.gz 498187 BLAKE2B 343ebda3a37aef6541efae9e646778cf8b1ea74e722979de4336d6819007f3fb37121d53c7e789f69fe6411c05ca2557a18d10db47c68e95e59c92c991bf9fa7 SHA512 ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8
 DIST libatomic_ops-7.6.8.tar.gz 503550 BLAKE2B ce8e8757cd20fc5d8e5b62fae0a619f3866e496f552e04c1cca6c63a6d954bf256927fe1fe62192cb24b9f7a9fd1727e108098b09d0f22e0987983ccce035274 SHA512 bc448fadcf8e2936fa933a5872d5550ecdff04b0df27120d3182dcbb2147a6594ec6bfc5b214e21b37ffa1b5100c1c56d301ba9cae7df26cee5e6b999dcda14c
-EBUILD libatomic_ops-7.6.10.ebuild 812 BLAKE2B 18d5d6e76c0826481f41dfea5cb76d33d7d7f63a33ec902de263bbc4f944af33081b65e9e1ccf19889af7584c0e706c91de98b65dce3ceba5f8a937929a77ebb SHA512 4e07f7536e026736b8cbe844ac0a1d72dd5c711bc8a7fe15627248f8e1cdac08f2bec672ecb33b1fb046c372ac107a4699bae01a84b8369384c4a77b659f6b37
+EBUILD libatomic_ops-7.6.10.ebuild 805 BLAKE2B e2bec8c11d5d7115da41570c7c957e9624d45790b7bc055eaeb4a5129693363c0a92879f44dedb7cbe30c9dceae916c62ed7ea736ed54b5f65b5fd8248e2b334 SHA512 2893b22fb92880f345ccd8a6053f36da2ac4a958dce78aadb50cc7f4162bf0a52de8800d5a10f6aa40c2da44798242254a944c0002a1a25d5d2b30a5928d0371
 EBUILD libatomic_ops-7.6.6.ebuild 731 BLAKE2B 38802fab9bde60ad696c1212d51bee17287b47fb1af0219f8a897a241ab9d3c48e73a3503d4b939b811488f9db8e76df4c349380c32b9e5016539c0680a9ce3b SHA512 02090cb3d33b1cc769d99c42f18953585bd266278d7f946d8a8e93607bd1fe0aa3597300a3d639aef3824be04ca8dc489f0bd47ea2a2ce36ca91f1f9e438e5e5
 EBUILD libatomic_ops-7.6.8.ebuild 812 BLAKE2B 18d5d6e76c0826481f41dfea5cb76d33d7d7f63a33ec902de263bbc4f944af33081b65e9e1ccf19889af7584c0e706c91de98b65dce3ceba5f8a937929a77ebb SHA512 4e07f7536e026736b8cbe844ac0a1d72dd5c711bc8a7fe15627248f8e1cdac08f2bec672ecb33b1fb046c372ac107a4699bae01a84b8369384c4a77b659f6b37
 MISC metadata.xml 475 BLAKE2B e8db314b5a92dc7564e61a4f12238f6fb6ac593bb8e50e4899c0bd86eedf542350903aefda7784e406e72b64456e75e4099215767e6897c5f6a558f24b40beb6 SHA512 d7b2e2dcc35f4c402f8305a5cc35579bbf4d2607986810c040282365a230ebd916abd2b9936c1cffd3fd616705b5b6aadeece6170467cc27bbe623af18354dc5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
index 331540a7867e..7a052eac7faa 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index c6cd27824e72..c9258531a3d4 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -3,4 +3,4 @@ DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3
 DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
 EBUILD libbsd-0.10.0.ebuild 1248 BLAKE2B 966ec0504283ad8e6a50e956c75f6125820e5c6c4b4e199dd24b0a84889ba9c52131d09464daf651b45dd0e48b82ffd1f5ef78aed9889e645f7e95a39105906e SHA512 ad524116200a19498374b424f0f34c86ee7e82b176d56b1ed0e5e6b91e98c3ce5f5d3c0d00bde1150df8315fb25f39040d37bd0413899b0aa2b29672b25bd636
 EBUILD libbsd-0.9.1.ebuild 1283 BLAKE2B 7ab75ea2173790f66c0910a9bf913a34b51be3d41fc3c4bcc5186053b8cfb9f3259e4bee24af6096b100ff5f6c8742e86676722be24aae1ea0503f0a07819c01 SHA512 2fe38faadbc7f8a14bd26f10cbd312f82343743b6b822a6e2dc3ec3e552abc1a988fb0addcd6a9e81ceca3184a2ac188872f4bf890a2e3d8fa20269f8f4af3b3
-MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
+MISC metadata.xml 362 BLAKE2B 5ffa8ebebcf0fd8d01f49f14b8f6a210a45a057669f88343e77a25907af8b4608f24898f7ad8b0367b1fa162de3ea7f6ae1692d7655ef899f72760d9b156cc1d SHA512 6bf19529af2e728fd1bb249f5f15875726ceeeb98f820c618aa8d8b9db8aebef20019e38486c5490e2808af57e4531f54201083514e6d3e20415ed08dd22e3bc
diff --git a/dev-libs/libbsd/metadata.xml b/dev-libs/libbsd/metadata.xml
index 0f6db5621bcb..1ff7e0b3b454 100644
--- a/dev-libs/libbsd/metadata.xml
+++ b/dev-libs/libbsd/metadata.xml
@@ -5,4 +5,7 @@
     <email>freedesktop-bugs@gentoo.org</email>
     <name>Gentoo Freedesktop Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:libbsd:libbsd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index a56f1fb28e9e..839107ae4422 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -1,12 +1,8 @@
-AUX libcdio-paranoia-0.90-mkdir_p.patch 635 BLAKE2B ed82c6ad81e3fc9540f9dade8e7b006b37cb98240c867e8673ed9ff6f928ed7e6ac5c7bf1356cf10a1437972a68fdf7d7770825dbfbc1e8b58615137a6168bbe SHA512 e4f96b631c7dcec607878af5b4c26307b9b002ad7a2866f31030f9c5f596607d0ec2df760941220d3ec209919b2cd9f911afe80240d7a0ab67b163e34759418f
 AUX libcdio-paranoia-0.90-oos-tests.patch 1401 BLAKE2B 0b4ba222d667325b2413519e1cc16065c756c17c5739e6edf3ade9dc6e0156b5a769f0f608d75624047ae47ed2187f4c80e182e58cb51bf7433a433e6673a695 SHA512 b8f556f39daa9746a87804d2c35d0458f133a21a026c8e5fb7739826d86972b7ed85255e5c3e6e739da40d56a9b8166f9b096308c844a471d4e152b7d39a7b1a
-DIST libcdio-paranoia-10.2+0.90+1.tar.gz 634050 BLAKE2B 10a7f8b2a45e5605afa6961132f0bf949ba51222a6c23b7a933032e3e430e60104eae8f7d49fc6ec18894fe0e826e9387f67f186af0ba277a9e7341484aa8ac3 SHA512 c3d00b57f22deb19be929ba87f41bbd83fc51ca66e8ccc1da7acb4131d85449fdd38161cc3ec0f1714fc0571e219d72029b5a72f853c139aa479695df783aad6
 DIST libcdio-paranoia-10.2+0.93+1.tar.gz 686055 BLAKE2B 5b4c30687c907cc8dd0917263c20e3d55e425cb7fb2a935a79ec6c5cc82c6165a5504fe71b77e314bd4a828b0c652f948cce62fecf94341d20c920c66450d97a SHA512 2bb418c99ef037aeb90ba3db841ea9182c5bc401e74c6f4b552730e6c8561552f7d3e27be71ef4fbb07b4fcd9db418a4fe330d5278e8f41cdd99c757aa4b8bc6
 DIST libcdio-paranoia-10.2+0.94+2.tar.gz 704560 BLAKE2B babb912a7252b25b1d32f7d3cc80d73235383170b16118c4f6fcddd58ded534b2e5a8bb61aa8ca784270fc4631ea3e53cdc88d03b0a7686f74ab1cef7ca35980 SHA512 0e4ed5cc52d0758e945ac7f956c1ca870068f6444df912e2ba5f597947962c471d1c526b5cdab4e092fecb924ecb317667df454497b2e515a4e985693cd86f47
 DIST libcdio-paranoia-10.2+2.0.0.tar.bz2 588472 BLAKE2B 5593c967cc91e7db922c30a0e4fd6a71c81625527b3e3cd19494328c545237c64c6332969e6964ae27cce70b0a7ed9678c2dcf0cf675ea6ea81602071b5a9e1b SHA512 0398617f9af63632d74c5a93c4efae1bc69d339fb7ab2e36dbfa6d19c0940f3bf27ea3ed482698d2842838d2034df3e40304774f1648db8c274d441130ef40a2
-EBUILD libcdio-paranoia-0.90_p1-r1.ebuild 1574 BLAKE2B dbc8b3712c4e67372d2d5329130fc7bdee625ae7306ad8a61b357ac80446ccac85841f1431ab873d0ff7ad5bf443ce6fa56fb66803261dc469e5b61a32ab6acc SHA512 7aa1a3fb8258978074a86f04ec5bb78253505152a13aea868182b46daa2f7ff4ce97adc130e53a0a7f7a2fa2ab7a9959d3fbd71824eb11f42dfc7ff797af266c
-EBUILD libcdio-paranoia-0.93_p1.ebuild 1754 BLAKE2B 5f61c570e2dc7e958893cfaa5ef3617c597de277e81fbd2c084efeaee47f0876f2657d4a0b298c201e9e66bf0fef16a86b5f6f82b87f25445c4257bc7e5e6bf5 SHA512 1243a48a69fea0103a7782c741148f7a5901541976907eb8ce948374cf691110be9a94c685bd7a7ec80fb297250f5f1d600db2a8bd851ce2317078308a54e39a
-EBUILD libcdio-paranoia-0.94_p2-r1.ebuild 2009 BLAKE2B cff2adbdac88fcf8cee94c35cb1c3f9cefea244a5d51f210ab6c3b19932f7096745a810b83be6a06f5bbe8265f316d36c97e28feb67138c93e1c0ec41b6af482 SHA512 89fb173584c80a3a5aff705e7909f271419b429c3c2f825b87a3b74000b52bc2a12df4444d2fce3a77ff137ed6cc54df0b609e7a4246d1b7c9eb8194b848fdf0
-EBUILD libcdio-paranoia-0.94_p2.ebuild 1982 BLAKE2B fb1b4690d302164cbe4f2f9e6d86fb5349b94916acea665c21a2e917257f4c44cfe702a62e60f3b4931ec7b331d2b7541e11801cd599c6708eb76121b124ca95 SHA512 4760f18a0ee97186eac7be774249f3151d1a96779a0f570368fe426696a5888dddabebd25b8711ed3b8b2cdbcc33267b293052ec0d95767797f0649da46b5c8e
-EBUILD libcdio-paranoia-2.0.0.ebuild 1742 BLAKE2B 4c322cf8e34d896b9d2be87cf4d1acafe519dd800c78b875f8269103df9362f425308bda7573bf269aba7f787cf3760beb7ad63f403f454b13c4b8adf2d4af62 SHA512 f5baff391cff3d32c4199cab608a7546f12203814f966890fdf99735e29dbc4260f1657db7400264933a8a6adde25f428548119f0bd59b97b03a08f6eac86863
+EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1881 BLAKE2B 3972d7584139843181874247aaaa6822f68399eec7eac9a838c4cfc5d758252f51e448efad8973cf55fbfebf1436c5b2b60aa8745e7589504a8651031921999d SHA512 6ddc7284a0cb7583237cab0cdfa406c62d36484d4daa68542b6736e6895a01fc356162afe9991a7ceae148c23673ab0e0a9fbc23f52ba02aa5e99f2c618b8f5f
+EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2112 BLAKE2B ed01b795dd9bdce94ba6fdd1005be383b72948b0edfa21a6b89fb93c3f76ad87550e7ba7933950e00a9c2c2daa840c24a5f9e39bcc55ce9f8abc840166035d4e SHA512 275b23a95e1328e24d87ac4bfcc66547b0bcc5d0348b64f3bed9d7af916d2092ee63d7239549fbab1f0e428c01948c0eb1f3de0140e78457fced65f562fdec25
+EBUILD libcdio-paranoia-2.0.0-r1.ebuild 1872 BLAKE2B 8238f4f7fbd1558c01f268eeb177d4b15a2a3e956315f48e1a5f4c18f89ba0c5cf7a46ad242f928da5df41f3c1f7f223b24ab1651c1d01c0b96d4aab3f1b5052 SHA512 f98deabc1b5b20b2e08da0f7e482568bcc320424fcbcf190be91a53bcb6e47b673c699b476fc347918506eb083a9bdae5e4241d444563988b64620032ce86a47
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-mkdir_p.patch b/dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-mkdir_p.patch
deleted file mode 100644
index 98681d0a08fc..000000000000
--- a/dev-libs/libcdio-paranoia/files/libcdio-paranoia-0.90-mkdir_p.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://bugs.gentoo.org/455374
-http://github.com/rocky/libcdio-paranoia/issues/1
-https://savannah.gnu.org/bugs/index.php?38273
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,6 +74,8 @@
- dnl Checks for programs.
- AC_AIX
- 
-+AC_PROG_MKDIR_P
-+
- if test "x$GCC" != "xyes" 
- then
-   AC_MSG_WARN([
---- a/doc/ja/Makefile.am
-+++ b/doc/ja/Makefile.am
-@@ -25,7 +25,7 @@
- 
- install-man1: $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(mandir)$(mansubdir)"
-+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(mandir)$(mansubdir)"
- 	@list='$(man1_MANS)'; \
- 	l2='$(man_MANS)'; for i in $$l2; do \
- 	  case "$$i" in \
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1-r1.ebuild
deleted file mode 100644
index ed391732a871..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.90_p1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.90-r1[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.90-mkdir_p.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-	)
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
new file mode 100644
index 000000000000..7a6329bc3416
--- /dev/null
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${PN}-10.2+${PV/_p/+}
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
+
+# COPYING-GPL from cdparanoia says "2 or later"
+# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
+# clause "or later" so we use LGPL-2.1 without +
+LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+cxx static-libs test"
+
+RDEPEND="app-eselect/eselect-cdparanoia
+	>=dev-libs/libcdio-0.93[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
+	eautoreconf
+
+	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-example-progs
+		$(use_enable cxx)
+		--disable-cpp-progs
+		--with-cd-paranoia-name=libcdio-paranoia
+		$(use_enable static-libs static)
+	)
+	# Darwin linker doesn't get this
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --without-versioned-libs )
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect cdparanoia update ifunset
+}
+
+pkg_postrm() {
+	eselect cdparanoia update ifunset
+}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild
deleted file mode 100644
index d10701c912ca..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.93[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-
-	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-	)
-	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --without-versioned-libs )
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild
deleted file mode 100644
index 85b83bfa513c..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0/2" # soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-
-	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-		# upstream accidentally default-disabled it
-		# reenable it to preserve ABI compat with previous versions
-		# https://bugs.gentoo.org/616054
-		# https://savannah.gnu.org/bugs/index.php?50978
-		--enable-ld-version-script
-	)
-	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
new file mode 100644
index 000000000000..6bebe13929d4
--- /dev/null
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${PN}-10.2+${PV/_p/+}
+
+inherit autotools multilib-minimal flag-o-matic
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
+
+# COPYING-GPL from cdparanoia says "2 or later"
+# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
+# clause "or later" so we use LGPL-2.1 without +
+LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+cxx static-libs test"
+
+RDEPEND="app-eselect/eselect-cdparanoia
+	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
+	eautoreconf
+
+	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-maintainer-mode
+		--disable-example-progs
+		$(use_enable cxx)
+		--disable-cpp-progs
+		--with-cd-paranoia-name=libcdio-paranoia
+		# upstream accidentally default-disabled it
+		# reenable it to preserve ABI compat with previous versions
+		# https://bugs.gentoo.org/616054
+		# https://savannah.gnu.org/bugs/index.php?50978
+		--enable-ld-version-script
+		$(use_enable static-libs static)
+	)
+	# Darwin linker doesn't get this
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect cdparanoia update ifunset
+}
+
+pkg_postrm() {
+	eselect cdparanoia update ifunset
+}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
deleted file mode 100644
index 8ff3a41accbc..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-
-	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-		# upstream accidentally default-disabled it
-		# reenable it to preserve ABI compat with previous versions
-		# https://bugs.gentoo.org/616054
-		# https://savannah.gnu.org/bugs/index.php?50978
-		--enable-ld-version-script
-	)
-	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..792b56cbaeb6
--- /dev/null
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-10.2+${PV/_p/+}
+
+inherit autotools multilib-minimal flag-o-matic
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
+
+# COPYING-GPL from cdparanoia says "2 or later"
+# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
+# clause "or later" so we use LGPL-2.1 without +
+LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
+SLOT="0/2" # soname version
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+cxx static-libs test"
+
+RDEPEND="app-eselect/eselect-cdparanoia
+	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+src_prepare() {
+	default
+	#sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
+	eautoreconf
+
+	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		#--disable-maintainer-mode
+		--disable-example-progs
+		$(use_enable cxx)
+		--disable-cpp-progs
+		--with-cd-paranoia-name=libcdio-paranoia
+		$(use_enable static-libs static)
+	)
+	# Darwin linker doesn't get this
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect cdparanoia update ifunset
+}
+
+pkg_postrm() {
+	eselect cdparanoia update ifunset
+}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild
deleted file mode 100644
index a4c7136bb411..000000000000
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-10.2+${PV/_p/+}
-
-inherit autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="an advanced CDDA reader with error correction"
-HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
-
-# COPYING-GPL from cdparanoia says "2 or later"
-# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
-# clause "or later" so we use LGPL-2.1 without +
-LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0/2" # soname version
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+cxx static-libs test"
-
-RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-src_prepare() {
-	default
-	#sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
-	eautoreconf
-
-	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		#--disable-maintainer-mode
-		--disable-example-progs
-		$(use_enable cxx)
-		--disable-cpp-progs
-		--with-cd-paranoia-name=libcdio-paranoia
-	)
-	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	eselect cdparanoia update ifunset
-}
-
-pkg_postrm() {
-	eselect cdparanoia update ifunset
-}
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index b1e2ec4cf61c..61c1f569e3fd 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -4,4 +4,4 @@ DIST libcroco-0.6.12.tar.xz 482028 BLAKE2B d43b73ba21f600ec6d549b867a58db956e081
 DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
 EBUILD libcroco-0.6.12-r1.ebuild 1442 BLAKE2B 9f5c7428459553d93c099cb6ed0c1f6b3e0fe0bdeafec490f0e709f08f50045761748639b4b9df2e58fd4ad78e8bf2e30152b5654b2cc277d3467639b4f556ec SHA512 c25781b12bcc99c38e4a55e4dc03b8c27171e60b84c8095313c3b705446e2c02cdabc0d7206bf0aa459296dfc687f3c7b573513a4cbde71b5f9df088c8cd4846
 EBUILD libcroco-0.6.13.ebuild 1345 BLAKE2B 02f486419276fe16673640a4b602245a7c0562dfbba2d34e2857caf78236e56a608eef2968895452ce2972e047a8b075788d7d4233cf316d53b2c67e4bede9cf SHA512 c8c61d4b840d904b68d472d3bf7cd4843559ca88637cad44c0bc4185ece192fed5b5705f6f6d45e165b71540f0516a9e69a1cafa9103bcc38089b951138a96a1
-MISC metadata.xml 597 BLAKE2B 93f85899d5ecfde37206061e57a03b1eaa181d9e2c105999621da011bbed2b11efaae603c2dbba0b405917653adc75cf849e92682e798e9514984e5577fee90f SHA512 9161b1cf0d796d0aeb681374b278be7938bc551316d6d7fc4fc1e19bfff4477f6b12bf606df0eb17c57e08ecb257f358f579a232ce6dbd6cc2f838aee4e2b9bf
+MISC metadata.xml 677 BLAKE2B 075dc643dd13fa706bb3240a389f715e760c6d06c851c5074d6c58843668bbcbda2167fff34f720e57d48f01aaacf61dc2a5a98c11a5240550b7e2500bfef6a2 SHA512 57849cfa0cf0e61f52db3e7a357957d3eb0ea3e93381475ad1821a5e0d63c7971f31b4f52a9a851d303bac59a83edbb5fbdc76d54ccfdd6332ca5c93a43a0b14
diff --git a/dev-libs/libcroco/metadata.xml b/dev-libs/libcroco/metadata.xml
index d296a917b37c..f2d6a4b24c26 100644
--- a/dev-libs/libcroco/metadata.xml
+++ b/dev-libs/libcroco/metadata.xml
@@ -13,4 +13,7 @@ A parser module with : A SAC like api and A CSSOM like api.
 A CSS2 selection engine
 An XML/CSS layout/rendering engine
 </longdescription>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnome:libcroco</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index d2dfdfe7e516..d0303ea91070 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -3,4 +3,4 @@ DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287
 EBUILD libdaemon-0.14-r1.ebuild 1199 BLAKE2B 5dfa0749f2f582edc5003f4c1d9bf4f00d4100ad62d5ff058ea4a996d5e6f23d5f4bd74e18be8b9afebf23bdd45a825c2de0b488652b047c38bbf0c81763e806 SHA512 a4f0679b5702353f0dc05cc959dbe1cacba004093a69430fa71a85e2d0be0a80c07603d3e62152ebc203e8dc0fca412b764614cf9ccabb291e0fbcbd3d0d2070
 EBUILD libdaemon-0.14-r2.ebuild 1446 BLAKE2B 4e43ad8358555b319685431f1f7f3b2598116060cfe0d3dac1f923f06bcfcd84438036dd17fb2e174df5ff8397332ce557d81541b8fe7455cfa2ab1abe3027e1 SHA512 dffc3b0c3bedd18a109b5831009aaa309023645d4b419cf9f3d718cfc6629b2e0de5c738b681a093a3f7207b8076d88abbca880a002c2e7c5e8f1256446ff892
 EBUILD libdaemon-0.14-r3.ebuild 1391 BLAKE2B 47f8159b2a4aa36b67eb2caf540d4635c2f1ab983032a8b7bd6c18e06316a1ce7bb6d6a119f18e6a5a67c0fdb59645590fb346ff4aa1722c83627f15b49c0c14 SHA512 60fea99760cc407023466ba3da6fd2b51e549c710fa59d6d1ce5960a4f4072a13f464581381fcdc800764021b65f4c4bc17f7acb2beace5d01374115a30a148a
-MISC metadata.xml 214 BLAKE2B 33eeb62dd1e0788ebdae4c98136c1c6a3b94a197683d1056a2e0c08566d14cde6469852038c1c8a574141f422d7ed3559332415f8ae79ab0fc223bc5fb55a1b8 SHA512 9b8ba52023f39252d9fc270607a4b928d4c961c893ef4f722d7e2ac567c66a3de509849ef754e3c8fef73923144251e5ebcc19b0d2ec93b94ab79ffb5c17cb83
+MISC metadata.xml 310 BLAKE2B 687f9b62c9f0ba35acf51e9cd7233c2b9c45a072125bea9955b06bdc3bf935f651c379e7a6bb7775335818bb0b331e7774829791bd0c6b598b7d7e12db4cfe78 SHA512 0eaa3a9c6030fbe639a5c0c9dd93e30ea2a5a7d2931a44f3b5491dea49f21313b899b47a5163e878baf37523d2251570116036184ea268bdf63b16bd9a8ec6ac
diff --git a/dev-libs/libdaemon/metadata.xml b/dev-libs/libdaemon/metadata.xml
index 03f633b16af3..f13cc8c4e7c3 100644
--- a/dev-libs/libdaemon/metadata.xml
+++ b/dev-libs/libdaemon/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>eva@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libdaemon_project:libdaemon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libestr/Manifest b/dev-libs/libestr/Manifest
index dc6b4e49c82e..91f76d0a1a17 100644
--- a/dev-libs/libestr/Manifest
+++ b/dev-libs/libestr/Manifest
@@ -2,4 +2,4 @@ DIST libestr-0.1.10.tar.gz 336122 BLAKE2B 7a157d030415bbdc8c289061c4ce1ddac4fdfd
 DIST libestr-0.1.11.tar.gz 355544 BLAKE2B c165212c4a56ee577a76dbb95dfe9d08d84087d490422d4fb7c29cadc5b5d0eed97234369331286433e2d860d3cfa8af3117d3ff94e8833df91f6586905ad2c8 SHA512 0ab98c2fa4b58cf6fee89c88602725b8b5e8e5a171a6976cdd8cff4dfc1cd3e5b747868da74fccd1bca66b9fa524ceae1c4f1ad5ee653a44ff81df6916ab5328
 EBUILD libestr-0.1.10.ebuild 694 BLAKE2B 828faf8e0caca0ee43ebd9906f610d7b2e1bcf02bbb35ca4dbca2c0faffeee953cdc585846dc6f91115a833efd88bfed9885fb0c5ae51e71e0e0b7b01fcd4508 SHA512 8c84b1c09ce8a881527b24b7cac68b5d0508721996ca0b6455f8bdd1d8d207c90c198346df576738c14973db5de4fcb707ad67c8ebaffa82d49e76854a20a8f3
 EBUILD libestr-0.1.11.ebuild 700 BLAKE2B 706aeb3fd6e57b334f42dc2ff1440630c8a26a5ae4c94d0dbfb336f9a651a73fc215c27900898ed9e2b72fc32ff4916809800abd9341aa2b5d35ccc17846d48c SHA512 861acea04e6aa61abbf375f1d4de0478dd1ff919d71353adcffe154de495ec9c3efecdf42d920a964627ded4bd1a9905ac2a5a1fa5645b8a3d59f8103f96a5a4
-MISC metadata.xml 504 BLAKE2B 9be3182332c3b6e62b74573534d7c1099b5bfab19cad517322c1a03df1909afbfc973cc10fa525b6383ba385d9669c86a2bf309a841bfa70cf35faef40b2493c SHA512 7eefcd09976509a7fcefd342543158a06524eaaaa6e2bcd81b1373cbfd43eed1457b5f240be6f38242dc3236d392a5c3691c0f0889d6a71c302b86c8abe5e8f3
+MISC metadata.xml 563 BLAKE2B fb15f2cda9e02291c5a88dc7ac002a69d4504ca2e0d496962986846ff089628064e5334688d9806bb9e3478073e8b6fecdad7ca227723c8e4b8f4c7c83ac0aa3 SHA512 4ebbbbddedbb2ee70c52c73b23ef83c0920756ead3e14d8a75afd5bc994bdeaa63a6e9255083b74bdd80da8367650544c92763e299f3f6d49c930b2f92e7c478
diff --git a/dev-libs/libestr/metadata.xml b/dev-libs/libestr/metadata.xml
index 363a45aabdf8..ac4e1be046fa 100644
--- a/dev-libs/libestr/metadata.xml
+++ b/dev-libs/libestr/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<bugs-to>https://github.com/rsyslog/libestr/issues</bugs-to>
 		<remote-id type="github">rsyslog/libestr</remote-id>
+		<remote-id type="cpe">cpe:/a:adiscon:libestr</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libf2c/Manifest b/dev-libs/libf2c/Manifest
index fca065469379..abad9d22045d 100644
--- a/dev-libs/libf2c/Manifest
+++ b/dev-libs/libf2c/Manifest
@@ -4,9 +4,6 @@ AUX libf2c-20110801-64bit-long.patch 1749 BLAKE2B 3df6f21610863361588417697d77a7
 AUX libf2c-20110801-format-security.patch 345 BLAKE2B 723f79e2fa5015c49bd763473ba62b81d7cccae1c3a68dd4da81f560b06ff23e2884fdf7e276079dd99f3241822b6d23ac830062b3ea88177945aacee34e4682 SHA512 758d7d4c1154193b3a5adf3983009cc258844dc1681edda3ba6a761580353f082ee682fc625275976a34ce5e0d4893c304063105986deec066c82afdb3c6cf5e
 AUX libf2c-20110801-main.patch 1708 BLAKE2B becf5fd72a0d9bad9a6fef4d6013b2e1dbedd2b2d1cb9764a3a04772648f24f2875d6257595c95c09b17159baf47c217d4fbdc3cd4d6dfa37980adb306552e3e SHA512 f2c8574f45580d2bf99e5506266668c615f19a985ffa27eefe38d373f083da61dbe486d5c27e034bd38029b46a4a77285e175a7285b1acb37e7a1ecfea6a2bbc
 AUX libf2c-20130927-fix-buildsystem.patch 1632 BLAKE2B 381a2e03ee75f0553325c4b5bbc1191d7262d0fec6d315791684a761f1be6e0749782a679fce805b1d4eb466d0f219d78bec6ef03968addaa47c3a0d1c212c59 SHA512 40191835f7b5d6a9865c68e0fb8a7168715b2f79cad069192427cc657b9664ac9f242c7b746aa821b81c33ae2c08c6d936f838b2f5228acde35d8aeb7c102b93
-DIST libf2c-20110801.zip 128845 BLAKE2B f948693c0aace5725f3a4ab3406396a9f16fbb3c08681fe200ba2ba0b48dadb3c051a510cf9b4714d9fbfebc43e52ba13d6fdbff3590c19a164acc710ebe2958 SHA512 7a7b7b02ca2b11456aa0deba5094aebc1e9f7070d1742ad76450ec79de7eed967fbd7446524b66c52295ed911471d2dc396d171569b5d37079bdca8220fd2fb6
 DIST libf2c-20130927.zip 129082 BLAKE2B 09f818bde8888b569858784c39e93a6a11b3103039f44c3f6a1246b29efb5f8ae6e45f787ed0c2216bea383a79b9554aff30e1fbb00668bbc872b4bc30d87ba8 SHA512 1a12093dec3c250f4775eebd06f1a9144fdb956ea3162202fb67569fdd956ac5591bc563a0726ca65ea10d465efaac1c1d8024d63bc4a4b5c88bf46242607c8a
-EBUILD libf2c-20110801-r4.ebuild 1256 BLAKE2B 1e22881db8cf4e49fd711c556b169156689dcd5b24bbd7fe6ead5c25d206a022aa9b947abc54af6dcd3d1af18f5867b927b677a7123b70e6be3abdb649a9a16d SHA512 d367309ff9a645e412a5ad2af05bacc2a82df6392e36af6176b950f640337b8b68219e339afe41b147824160e47ef1fcbc85c6a906d13801e4d0a7f202528b69
-EBUILD libf2c-20130927-r1.ebuild 1220 BLAKE2B 5e93fce0762ccd432d9adb51d609a8acdd74e4664e809310fe164f089a64c80ff71601dc2150610f18c0a00791bc62715646155a3b1e333bcfe70ef6e64a17f7 SHA512 9802d19550d4cae2c5b45c8e37489bf92aa3c95936e70b24ba93136281ee65ee798841c5e4eddb7580f87084a6f07227166a0483eb9241571f10d75a728d9a0b
-EBUILD libf2c-20130927.ebuild 1290 BLAKE2B a3468ddd537fa482c38e3d633d47f609c09bbed62f92e4b3a021054ce4957f8a0b6113e27028a1c1ba860349e928833df5a1a0efe75160062a354e40f55c7d84 SHA512 a8e33d4a42adc4559828a2c6c8c2746dff6c76d609bd4a0c63c3be8c8b094c3d44afaa89dcb9395f37ac2c2923c473651def6ebcbbdd8e788bcba05ea4836a49
+EBUILD libf2c-20130927-r1.ebuild 1216 BLAKE2B 394a6539a1036aa5370ef547b1f68908028798c4b59a789fdeea95a54082da61d68ffbbaed48f0efb389759f1aa5cccebf26340788ce7275b72a49fe026f8bc4 SHA512 439acfd3e214057cfbb4828513c55fbd6369f1a402152e39811a0758a6d04108c554e42de1c05a2e04a41d170e6335a5cf561e86fd43b67576c3fd60ebb6d89b
 MISC metadata.xml 363 BLAKE2B 854c5e9e83fb984b31f4def65cb25720bacbff0522fe93e3488211611e15896e562ab86a101ea0f661ffa6de9bb15331dce1e39ca614b1987ed35184029a0d18 SHA512 3c5efbb36dba02cfa31cb0b95c78194bfecfcc128b60eb5c11983da6ac26fb0d75bc02e004443fc6365d3cf53b6d9bffc3a0342c185e61ffdc404cb8b4a3f95e
diff --git a/dev-libs/libf2c/libf2c-20110801-r4.ebuild b/dev-libs/libf2c/libf2c-20110801-r4.ebuild
deleted file mode 100644
index 50e2c97344ee..000000000000
--- a/dev-libs/libf2c/libf2c-20110801-r4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Library that converts FORTRAN to C source"
-HOMEPAGE="http://www.netlib.org/f2c/"
-SRC_URI="${HOMEPAGE}/${PN}.zip -> ${P}.zip"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/20051004-add-ofiles-dep.patch \
-		"${FILESDIR}"/20090407-link-shared-libf2c-correctly.patch \
-		"${FILESDIR}"/${P}-main.patch\
-		"${FILESDIR}"/${P}-64bit-long.patch \
-		"${FILESDIR}"/${P}-format-security.patch
-	sed -i -e "s/ld /$(tc-getLD) /" makefile.u || die
-}
-
-src_compile() {
-	emake \
-		-f makefile.u \
-		libf2c.so \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CC="$(tc-getCC)"
-
-	# Clean up files so we can recompile without PIC for the static lib
-	if use static-libs; then
-		rm *.o || die "clean failed"
-		emake \
-			-f makefile.u \
-			all \
-			CFLAGS="${CFLAGS}" \
-			CC="$(tc-getCC)"
-	fi
-}
-
-src_install () {
-	dolib libf2c.so.2
-	dosym libf2c.so.2 /usr/$(get_libdir)/libf2c.so
-	use static-libs && dolib.a libf2c.a
-	doheader f2c.h
-	dodoc README Notice
-}
diff --git a/dev-libs/libf2c/libf2c-20130927-r1.ebuild b/dev-libs/libf2c/libf2c-20130927-r1.ebuild
index 52fc3a771992..c91d0619c4fa 100644
--- a/dev-libs/libf2c/libf2c-20130927-r1.ebuild
+++ b/dev-libs/libf2c/libf2c-20130927-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/f2c/${PN}.zip -> ${P}.zip"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/libf2c/libf2c-20130927.ebuild b/dev-libs/libf2c/libf2c-20130927.ebuild
deleted file mode 100644
index a9e73c1620a9..000000000000
--- a/dev-libs/libf2c/libf2c-20130927.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Library that converts FORTRAN to C source"
-HOMEPAGE="http://www.netlib.org/f2c/"
-SRC_URI="${HOMEPAGE}/${PN}.zip -> ${P}.zip"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/20051004-add-ofiles-dep.patch \
-		"${FILESDIR}"/20090407-link-shared-libf2c-correctly.patch \
-		"${FILESDIR}"/${PN}-20110801-main.patch\
-		"${FILESDIR}"/${PN}-20110801-64bit-long.patch \
-		"${FILESDIR}"/${PN}-20110801-format-security.patch
-	sed -i -e "s/ld /$(tc-getLD) /" makefile.u || die
-}
-
-src_compile() {
-	emake \
-		-f makefile.u \
-		libf2c.so \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CC="$(tc-getCC)"
-
-	# Clean up files so we can recompile without PIC for the static lib
-	if use static-libs; then
-		rm *.o || die "clean failed"
-		emake \
-			-f makefile.u \
-			all \
-			CFLAGS="${CFLAGS}" \
-			CC="$(tc-getCC)"
-	fi
-}
-
-src_install () {
-	dolib libf2c.so.2
-	dosym libf2c.so.2 /usr/$(get_libdir)/libf2c.so
-	use static-libs && dolib.a libf2c.a
-	doheader f2c.h
-	dodoc README Notice
-}
diff --git a/dev-libs/libfastjson/Manifest b/dev-libs/libfastjson/Manifest
index f346bdbbf105..98ef43497502 100644
--- a/dev-libs/libfastjson/Manifest
+++ b/dev-libs/libfastjson/Manifest
@@ -1,3 +1,3 @@
 DIST libfastjson-0.99.8.tar.gz 433819 BLAKE2B f988c01de8e7becc5a848825c18151fec2b80f81eb5b50e459b1a3bb535f5521fb63e9350eb133eb984f57f42c5f529220a0c9461eb4689e1421ad815c4c4d87 SHA512 1e7eb7eaae2c6ccb78b77ac883808e1d311b03bad083dc72ab7712765a2ed139accd762850d60f54c6fe0ad48c4385714818fd2c8ed76700ce3546e5aff1c823
 EBUILD libfastjson-0.99.8.ebuild 797 BLAKE2B f6609cd4a28e186ed652cd005df3c851a991fd25d5167bffbd4fbb150376ab2afc12b26b3ab37d0de22de0b1beb27f0bab41d1b0de5a6e0a7b83ea6243a3e00d SHA512 1a2cd8e6388436981a589944e2054597fb1c3c799cb74923b5e5b607e523eda8b6ee9d6277cd44277f1060fded8bfde685d8505e2417277b2fedad8fe9822580
-MISC metadata.xml 475 BLAKE2B 946401e3ea48549fde46fe9433a69aadce62be5d9f9f7b5caff83106e1b494405f5765515537d590fb6119f7a262b24f9cece25a751b34efbbc1cb08b9591b2d SHA512 e347c97a42efce88d50f71438072af0cc1c758990873985a6292606b6e2af8797a63c35ab549ace15c50dd0120d465d0f0b38b24ecf08160fdda45738082bf82
+MISC metadata.xml 538 BLAKE2B 55f8eeaa861845ba5d7c7386fe38f1e45ccf57d3c619dee616c890af65cdbccc115df324e873b90fee67375f6caabda26dcb870297e39575188196b2d7275eb3 SHA512 10dc8d8104e44fd107c150d272da317812755a36f44e56521dbf43259e33247f4080273b1dbc0577ebf5430798e48b2c64ed17d311070e31f9191708f79a4f31
diff --git a/dev-libs/libfastjson/metadata.xml b/dev-libs/libfastjson/metadata.xml
index 11529b22803b..a90b6aa3f782 100644
--- a/dev-libs/libfastjson/metadata.xml
+++ b/dev-libs/libfastjson/metadata.xml
@@ -11,5 +11,6 @@
 	<upstream>
 		<bugs-to>https://github.com/rsyslog/libfastjson/issues</bugs-to>
 		<remote-id type="github">rsyslog/libfastjson</remote-id>
+		<remote-id type="cpe">cpe:/a:rsyslog:libfastjson</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index fc85acf25ea8..befa2d6875ff 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -13,4 +13,4 @@ EBUILD libffi-3.2.1-r1.ebuild 2269 BLAKE2B e2075034b9e9bec42427dcacbfc03aa114d9c
 EBUILD libffi-3.2.1-r2.ebuild 2328 BLAKE2B 26926447321e54807371c9e2154b062def22f04e298ee1ccbc5f92fed4bedab44d19622f034460c0727838fa1c6146c42cbd7fe83bc385df03c827535c42b949 SHA512 04a18c564ca898ffc3434ab7d62f2c2380300937726dae6c50f5e0d479009b059d020d48589b52970aa34723f6530bbeddd0f8f5f6fe3a865d90a48dd494e189
 EBUILD libffi-3.2.1.ebuild 1968 BLAKE2B 611f038994a687222d26a6709163e1848d15114dccd3e87c9b0a28cdc5851c6cb769eba5517d18f196cf0d27a1703ed01b40ae73e04d4e15b9cc26c07ecc9acb SHA512 f9f3b0a71a8a57adb563eb6c1ed64602976f18ff8e653f777d8dd14928bfc27417ee1aa81eab2529be1dd6b7fb70af274fe2d7cc1c0c09d29e48f37661ddeec7
 EBUILD libffi-3.3_rc0.ebuild 2110 BLAKE2B e5641dec038a77e1df1e332bc66fcc3d29b8976037321c2cf55775579c5428a0b5f94e3cd6b56d1565f4f78c8b588a68163098d3790dc28208e6a50ce27816fe SHA512 0a380d8d78429531b649ad5b1b6f9240c7af1019db080f6fe45f8e5df8742420303f79c4433dfda5ff9443534dd28e11cb0627c1db4c960cb24f1c9d1bebc2b9
-MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90
+MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index d8fae30b11e1..6e9a28c5ac88 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -36,4 +36,7 @@
 	<use>
 		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 40d0e17b6002..575e036a12a2 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -7,4 +7,4 @@ EBUILD libgcrypt-1.8.3-r1.ebuild 2314 BLAKE2B 6487043c0cdd0129411e11726e29878d99
 EBUILD libgcrypt-1.8.3.ebuild 2186 BLAKE2B d1c56ad5f0182fcac6ab2fa237e5205818a0f61a7edea666b1f0f1fc4fe1f95fc6ad4a410262b293fb6e47f3e570d71f552a717887a9efb921bf902bb4f12061 SHA512 8f902c37512a01fcbc83026281e8ce9f5a8dc18d975c180f4f4206c38538dad8192ff15fc3782bcb6475e37c4bfcb4b3a96ab5321e79268a91a623f890aebbae
 EBUILD libgcrypt-1.8.4.ebuild 2321 BLAKE2B dc12986a53f6b6b61e89ad3a8e40d67115fb477874dbeb864350c196e6368edd20edeb3f2ec2c97591ece373b6868ef93f98c123ac895c6dbdadcaf9e154f3a7 SHA512 9b62ad68c6bd0721a89c683b3d96e0923fdb241e0c468898b0f8db161e7d46a5abc0fbf47adbb356da173e0d52793c04d84a14038b7b86ddbbd626897427a49b
 EBUILD libgcrypt-1.8.5.ebuild 2321 BLAKE2B dc12986a53f6b6b61e89ad3a8e40d67115fb477874dbeb864350c196e6368edd20edeb3f2ec2c97591ece373b6868ef93f98c123ac895c6dbdadcaf9e154f3a7 SHA512 9b62ad68c6bd0721a89c683b3d96e0923fdb241e0c468898b0f8db161e7d46a5abc0fbf47adbb356da173e0d52793c04d84a14038b7b86ddbbd626897427a49b
-MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
+MISC metadata.xml 520 BLAKE2B bad7a2483330a66817b97b268b4bdedc48665f7697d8880263c890e74ca279616d857fbea686329d38385668e7b71c4ed5caaf42eadb49c0e0fecd1b4f23615f SHA512 26704a1e1e8d37cd7ea9002a0e2ad8cd0585b86486dcf8e3a419cce7945fa41b170f1e563ff62cf0a1ecc776b0a04c463cf4e8424ccb953484d2adfb708cfbd4
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index 9b7e9f273f57..f983c8bdca42 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@@ -9,6 +9,9 @@
 		<email>crypto@gentoo.org</email>
 		<name>Crypto</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnupg:libgcrypt</remote-id>
+	</upstream>
 <use>
 <flag name="o-flag-munging">Enable O-flag mangling during build</flag>
 </use>
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 95b3cd9653f4..ced1b7dde534 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -2,6 +2,6 @@ DIST libgee-0.20.1.tar.xz 681464 BLAKE2B 5e7d6d9fb9c2833bd7334f5fb38dd1ff151ee4e
 DIST libgee-0.20.2.tar.xz 675684 BLAKE2B 197eea5f1c4babf203e58c65a3419407c7657f4fb92e4e921afa2408cbe3dcba3f8e554a898766c83d3318a4a7fddc47b17f21daf04d79b5635e3363749cb035 SHA512 4ea312f73046fee5d0ad1d5d1942c9f4aecbec22509ce7f00b51352039b9643d65d2f37d4c0de550f0165ff7f6058cf88ecb55d7c5963706a1b63d5ec14c7d7d
 DIST libgee-0.6.8.tar.xz 443060 BLAKE2B b11275dd27492c0ae80fc354f1167e96def9b7c126089509f83b6d291eb48155224f5449e1b22a2549c6e3f2cb5d5daf5daa3ccc425723b7a203762e09ada091 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a
 EBUILD libgee-0.20.1.ebuild 679 BLAKE2B 56a9571229a501d6116c9c4de19620e8323caf7d5d96402b180ea1b82108fd04445f4e8694fdc9db522c873e956daed754fd974f8f481afcbb363f8e4103dfa2 SHA512 b852c9bb102daeb8bfcafda5c5200861c155ca7635061f5b136cd9a340102cccc8351344f1d7657545a2f0b411fdfe2737cc1f59bb76e6ad0561fab2ce6ef3ec
-EBUILD libgee-0.20.2.ebuild 683 BLAKE2B 92acdad228938f5eaf1c56355d220e594f51b9fb57f470f4158cd7474e6de2df3d762a3e8a00b821264309f4ffeed86cc19789727b241e62aa42e10338065acc SHA512 b953f6bef70bc76c6952f57b9c3603857ea5b235571c25b6604d9fd3f999869d875e9739415bf96f401a582bc1812de203a34d913b87cbd394e21d640c958230
+EBUILD libgee-0.20.2.ebuild 682 BLAKE2B 2b274f26366a84efb4c40862f953deb29ea4a9dc2fedab397590146959e870d7d4b83bde3f0784c8556b1cf455ded52638cb6f96da68863877bc35a1355463f3 SHA512 04101e7bfc81a553db954080009e5337c960e5afbd4106c207a1ef44bb0f5e8da5f608e8f23ce8713d0e408f17ed0c24d0ddb4e0b4f8082714b11efb5d356338
 EBUILD libgee-0.6.8.ebuild 659 BLAKE2B aae1527a96cc83f1408aac93b27aa67f82fa8f2c772fc026b5f4a14e41434ff9381aaca40f4f8fe7127e56d332048badae59eee7eec69e6cff5c1412ea3f7b51 SHA512 be5bb339f217170fa8725f2e02a7c222b023cc3dda19b86bdd67806adf9e6c8197dda762112a702ec72b6d9da5fed335dbc2f32a5bd92dca46fa55379089d79e
 MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285
diff --git a/dev-libs/libgee/libgee-0.20.2.ebuild b/dev-libs/libgee/libgee-0.20.2.ebuild
index b3be4767d4af..a929f90f5448 100644
--- a/dev-libs/libgee/libgee-0.20.2.ebuild
+++ b/dev-libs/libgee/libgee-0.20.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 9f1ddbe4802a..8b1cd5eca738 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,5 +1,5 @@
 DIST libgudev-232.tar.xz 270904 BLAKE2B 90b2ec011f065929bd560398de9cfa8c365f9b84d205c816f2d7a98391d96bde47449eb77bc76b1e486af7dfdb3ed6525f216549e0dc3571b2ee672920438c98 SHA512 f648a41e2a6af7e26634c7cc259fdc47bb6e6ffb329324d157f340e42928e28c2059a0e923b9b0aaecd1ee3ecafbc7b55e5652f1f77bc1b88367b97057a1bedc
 DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
 EBUILD libgudev-232.ebuild 1113 BLAKE2B 1e963ec6a6ea7bcc322d55489203147edcbbde2593bdc9d24461b0bd2c2d6fd806d1b357b9b9ef4e7a47cd49f5826e96ec61506859f8ca6ac59e7a0fa745e63f SHA512 858e3f1db9b255b87115ebeeb7922db41cade10ad7b6cc1a45fb96f0108e20c6f29d54702fd2435a160d96141ea3b07f3eb595ea505f8367b0eecbc53faada64
-EBUILD libgudev-233.ebuild 1117 BLAKE2B 73f951d7c614b83b5fd8185b8be871f212cac1e3e0d6d0dea487b85a1b485382bef29d52b8b4340d38a48b3cb9259676b2d38cee339ab84eaa010da2cfc494d0 SHA512 49298c5be56ca9d509d115cd9a1ad0578c43b43bf8ceb571bec86ad3b4672d0897f216de25ffdfa070dc49e2b8ad387f1585791d42be0d483dde254bd35215d5
+EBUILD libgudev-233.ebuild 1116 BLAKE2B 0a1a9a03cba6b37cb21401d0b703bc7ff9c53101ce3d92c755df69d09097d60bc56991e657180504611279bc9df94bf3824b25c93bb653935c1da0c8eaff8dd0 SHA512 6959781fe0ebb6e99087abc98723179c9e5dcf98916cab86884987dae083fbe088c45f832c7bd3994513be00629ed1c34787b55b2d63e6a0d046f7932f6a5c3f
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-233.ebuild b/dev-libs/libgudev/libgudev-233.ebuild
index dcc92f86ab31..c4c93639be3d 100644
--- a/dev-libs/libgudev/libgudev-233.ebuild
+++ b/dev-libs/libgudev/libgudev-233.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
 IUSE="introspection static-libs"
 
 COMMON_DEPEND="
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 0edb53931af5..a4f140e86814 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,6 +1,4 @@
-DIST libixion-0.13.0.tar.xz 413756 BLAKE2B 04aef61a1cc691bb159d7e8131e2e47fe2590634adc93f2e5771ed106316eb1c92ee7c4aa05ba753a1751cb5e7c55cba9263515671a26f9bc9983a1cfcacceff SHA512 15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0
 DIST libixion-0.14.1.tar.xz 360568 BLAKE2B e4da21f0eff9111272618d1bad87790ed0c4b461478473654f8366b0023c0650b41d355b0737a4fd4ac943e66f919e2f0d6bf04250e597e54a290d4415f3a093 SHA512 e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3
-EBUILD libixion-0.13.0.ebuild 1145 BLAKE2B e5b005971d77f8ead2d0c9132f968934c152f011ffed7ff6ef67403f9b04a5dc28fb12ec30975909021e2c7de9995713ebf35ee02621941cf16e11ae27019b62 SHA512 49f0f2abb804c5da0674a100d6d403d78df2f65a10f2bfbab60ef6cea054882db881c5875deba16d7b43798011809ba492b079b05fdbc3b4c0b49ed8c167afbc
 EBUILD libixion-0.14.1.ebuild 1081 BLAKE2B 9b054acb579d7e2d409386418433caf13e0d2c35559ffe77321e7878c7654ff943582c15785235f3aacc85660f324cabf6205227f0f318387ecca4c275317f0c SHA512 5e85969c94c1abc2ebfed5b1ba2e41bb45ff798e1bfcf1633ab9c11b53562d32d8d0fbcbf61c35cd3450cc29e7dbc32e570163d2c5b0ef53f878cdbcd260e6c5
 EBUILD libixion-9999.ebuild 1103 BLAKE2B 8ca8c29a35df52397f9e0d83671595f11ee97cad1302df5c159cf5ca9bc573bf8dee310d1d39d8bdad088c379d6e917c44fbf4e0bb8a3713df91d0977093c441 SHA512 7885380b0401262c300439b8c3c32f636c58abe65bec7478c8bcb7601ee9cda24bba34e469b0bc024ed6d96e8e4b542d2e247173d3e8c3d35dc27087667f0544
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.13.0.ebuild b/dev-libs/libixion/libixion-0.13.0.ebuild
deleted file mode 100644
index ad201abb3871..000000000000
--- a/dev-libs/libixion/libixion-0.13.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit python-single-r1 ${GITECLASS}
-unset GITECLASS
-
-DESCRIPTION="General purpose formula parser & interpreter"
-HOMEPAGE="https://gitlab.com/ixion/ixion"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/0.13" # based on SONAME of libixion.so
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="debug python static-libs +threads"
-
-RDEPEND="
-	dev-libs/boost:=
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	=dev-util/mdds-1.3*:1=
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use_enable threads)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/liblogging/Manifest b/dev-libs/liblogging/Manifest
index 01fbee7b3ebf..403accc7ab23 100644
--- a/dev-libs/liblogging/Manifest
+++ b/dev-libs/liblogging/Manifest
@@ -2,4 +2,4 @@ DIST liblogging-1.0.5.tar.gz 571051 BLAKE2B 46959fa20d4cf00dff1eaa099ad69c199b18
 DIST liblogging-1.0.6.tar.gz 593393 BLAKE2B c2ca93225b7594c2c064f14e83f475cf2f3dbf608e77e103759371e81e0052e49624740c35f29b7bf9cd1872f4f85f286a2c903f503bebb170a5337d0dfe0677 SHA512 09c90a93b2d32afa44be5a800705a64690810a56d21bed1455cb70680b01fecd4efef3881a43f98ebcafa996b6046ed8e5af935eacc12014f330a7fd23674964
 EBUILD liblogging-1.0.5.ebuild 735 BLAKE2B 9c7d51507c6de7ebb7b040b55aa60e7ebb21108b6092813c7119bd91ffcfd74f2c434f53a9d392069165c985f0d942149af8bec11c57bed6aefac1a9af0106d6 SHA512 9cdb8e7a153da3c646ca9fcaa24c928dc5f8eeca715bdfec6168a924d823ce8871140eb6b049aad3869ab4373d02e17785c580ed7a12ab28d8d102790b045b04
 EBUILD liblogging-1.0.6.ebuild 813 BLAKE2B 9f0f75b4d4cc1f28daf26e33982eb6f338e8569905f8a0f8f9f81fa676cb7bb0aee18a120c988ca909aefa5438b5ded2a2590de3dc7bf1c32c55c2155a573f4e SHA512 adc5da8bdb207461fcd51a15953df1ff00d07ea9bc4ea6467ddbd1889a22041b818e183a3ee795cd008cdf53eb0cd79f408c5f6031ad86c6c58d4f38d580f72a
-MISC metadata.xml 731 BLAKE2B b90fd6b63701e1a86f4ebb4e2c0d2139aa029a2bc7886e53491fae69feb589bc041b6fff7d0cab3f9b818cf0e979e2f51314e8e2d08ea2e64b96f580df1bef34 SHA512 3d8645d66e6e193d29b720ad618ca530ed793d229fe38afeae43a2bc741e3794d993ab97ac04b1e5cc2979472c81265bf43ed27786c1b3663320747c09fd0464
+MISC metadata.xml 793 BLAKE2B a792a73849ac1ed083474948d176fe1329e0685cf4449f4e56a7b3e759e7aa91445a3fa27e39f56c443824c9fa976b501ccc23295fa1a90289ee834930cf5260 SHA512 9e59f30ecb23f2c5662cfea50f03286c7d4ee7250068e17e0a808d3a10334bdd80295cc192ff8d3e8ce62fed0baf041156de62a2e981019054f1d5ef9a05cbc3
diff --git a/dev-libs/liblogging/metadata.xml b/dev-libs/liblogging/metadata.xml
index 50284e1c1566..06391ac7ae29 100644
--- a/dev-libs/liblogging/metadata.xml
+++ b/dev-libs/liblogging/metadata.xml
@@ -19,6 +19,7 @@
 		</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:adiscon:liblogging</remote-id>
 		<remote-id type="github">rsyslog/liblogging</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index 1afbba27b72c..55c42ccd2ffa 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -4,4 +4,4 @@ DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff
 EBUILD libltdl-1.3.5.ebuild 905 BLAKE2B 17a29c9938412946e98535f381d2b52356066803ae38807a2c7291a7bfb5b2c295d245753bd1c90f0404946e33fac288b939d65fe83317a369be8ef8aeb8dce9 SHA512 046ee53a680c7632700f78af5cb917cd8c9e284677020f36d342f88654f2253d47a3ca1ad01ec7b06797b9d8f5f64340618490f68699c23bdf124ccec503027c
 EBUILD libltdl-1.5.26.ebuild 866 BLAKE2B b67843df8ba4070f31ef8924b38a4a8c0607617b08b087dee35be01d2581fc04b6b35f5c81035fb43ed804e4424c38be69460b9c5243a0d1cf6a3206d920933a SHA512 8f5d1ba52a19df56d5efdd1a3dc9cc1085cab22b69badad778f6a10cdc5e9a1771216dfece334cb48d29b713881760a170770d58b66a6ac182a5e58714b94c71
 EBUILD libltdl-2.4.6.ebuild 1142 BLAKE2B f924f6626c14de066d238c6e3e32f601335eea616a5f351b0cc138140729c92899090008167566a9bf56e98f13dae4f5642773300caaf0154fd9433c34d2fd42 SHA512 961583240e659f8c60a6343f30d83944bef8e0d163d9a8d3760d6c2de7651b54a3d067b1ecb1cbd0ae13b4ff491ff6ccdef5dfc16a74a31a48916bc0f58d2781
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/dev-libs/libltdl/metadata.xml b/dev-libs/libltdl/metadata.xml
index 56c124413057..c9dbcd910423 100644
--- a/dev-libs/libltdl/metadata.xml
+++ b/dev-libs/libltdl/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:libtool</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index b74435514872..5ee3f1e22c4d 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -3,5 +3,4 @@ DIST libofx-0.9.10.tar.gz 1433837 BLAKE2B 131be0243b8450d32417dd75f0421744412a31
 DIST libofx-0.9.14.tar.gz 210155 BLAKE2B 1b5ee8503dd9d4837415e53ae79889c32c50146b2b508aab052e8074a277f8181c6866470220758ed7997b0b6e3e524ac6f9e1cac9a673f60c30ce3093e5a3ee SHA512 785c5130fc6f6cfc019d4aee2bf6de6311835e5dc7f2bd56a83f1ecf5e62ecb320a95bf4a5ff8f9e14dcaf5ff1eabc833cd7974927e571a8469c9a02fb8362d2
 EBUILD libofx-0.9.10.ebuild 1113 BLAKE2B 3631d753f719ba404467879b18d68ab9fddebe637b7ddca3e8c3821afe0a3d5527e9e6da69f7e031ef468b844f81ee567954ffde8a6c2939dfbc3965966dc2a4 SHA512 42493172e283ddf49306c5487eb22c5889b45d6c900fb41c1c33ab003cd316f4681ed239dd92a0a5b78f8f8b7bbb54fcb288622aa194b0ef4d602d853eecf9ac
 EBUILD libofx-0.9.14-r1.ebuild 1257 BLAKE2B f7cdc1d8f889624622bfb931ec3a514543c38433221c05df6fc0945763bb7cef7bf624b1353c9053cca1441e62e589c55088305b153e3c2f26c6cd7ab29cb3d3 SHA512 84b23985144ae9dd542306af7554a27bd02988e1ca8480d9e4445824f307c8a30506134d52d2da92dd29ae252584e656e88a6292af4243fbbcc3084e8ddd5110
-EBUILD libofx-0.9.14.ebuild 1226 BLAKE2B 9e56f0f44a875bb1e6548258483a73ceba593786321025bace10fae788b3569e645dff71cd3d489449275de533b036fe1b9d2baf7f68914958de295569976e0a SHA512 b64a98e16ebe5f3b1d5cead085683ec607d8d05e9f4ae33170f2820b1ddc28f084c7e52e80dbe735f7272345649f536c7b064ede0ceca999c3bea14af23f566f
 MISC metadata.xml 243 BLAKE2B 1611cb7b6df68e87374031fa563dcb5388243c0df9537b81e1c53f05cc297789e1f4d178edbbc8906af7a6b0ec549aae225662f87df1d48dc4a6fa2cc2c703c0 SHA512 fc5071bd581b91f72ea6f021641f47d46d1e6038cac7bd34bc13d94e6229441e3b2f7cdd981490a169d7e645339fe4137496a0eb0956014027ffd42a5b9814a8
diff --git a/dev-libs/libofx/libofx-0.9.14.ebuild b/dev-libs/libofx/libofx-0.9.14.ebuild
deleted file mode 100644
index 7896e2e8c5e8..000000000000
--- a/dev-libs/libofx/libofx-0.9.14.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A library to support the Open Financial eXchange XML format"
-HOMEPAGE="https://github.com/libofx/libofx"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7"
-KEYWORDS="amd64 x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	>=net-misc/curl-7.9.7
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}
-	>app-text/opensp-1.5
-	>=dev-cpp/libxmlpp-2.40.1:2.6
-	dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( app-crypt/gnupg )"
-
-# workaround needed for ofxconnect to compile
-MAKEOPTS="-j1"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# we will tell you where we wants the docs!
-	sed -i -e 's:docdir.*::' Makefile.am || die
-	sed -i -e 's:docdir.*::' dtd/Makefile.am || die
-
-	# configure arguments alone don't disable everything
-	sed -e "/^SUBDIRS/s/doc//" -i Makefile.am || die
-
-	append-cxxflags -std=c++14
-
-	# build will fail without this. shenanigans...
-	touch INSTALL || die "failed to touch INSTALL"
-}
-
-src_configure() {
-	econf --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 0b3362288b51..c1fed6eeb866 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,7 +1,4 @@
-AUX liborcus-0.13.4-boost-1.67.patch 1705 BLAKE2B 5c1fb62ff088163d07fceff4e230bee4728bae2bf4cf4f6e9b5cd0e15037560439efaa17a3b1cd4526df57fd0b5747454db54c6b7a382de4ff8afb9d1da87348 SHA512 eeb343ae4ec779e1b5a40ee93d3220d3e18a7bd3b906935d02e0019412a09c3e182a9e9ba67db30aa8f4e7b859a2fafcd68fd2daaa9d6506a004fd8176fc3ab0
-DIST liborcus-0.13.4.tar.xz 1816340 BLAKE2B f8e7251c8688f82604d5ac1212938890e42f23ce45edb09eba9ab26a810e5fd4215a23dd20e86ddf9100db67818fc73fbbee7357642a6390f8f60dc28596be31 SHA512 f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b
 DIST liborcus-0.14.1.tar.xz 1894680 BLAKE2B 0070baf319bf35275f36f3082141f154404ad43d8143588b35c00b8b536f0c1cf5bf38fd9e997c4be45a454f16de1cc1a25186da40e3ed0606a87e9a6a968053 SHA512 a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
-EBUILD liborcus-0.13.4.ebuild 1339 BLAKE2B e3ffb431c8d4afb5f0e77ce8a6c1a6c2bebcf31eba4795161cd81fdb423997aecfdb7d9fea4bf2b4d328866128916f366e38837cea09ae5fb32dc59cbbd37bf6 SHA512 498f4d5deffdfc6bfdf42f41abd05bc4759ad88a0e29d0e1058a7e73eef0507e922cd5f79ea4f0dfddb6050868f0ffa3c6b2fced6f0dd347e5f6eff4a8aa7527
 EBUILD liborcus-0.14.1.ebuild 1232 BLAKE2B 9ce83461f3537a81c8d885b37b02f0d2d7b9db6d1ac3d89d8998c74f91d6f369790fd0c1d9a3086b96710dadcc129fd2b4375442ad2863335d1a3558276ac15f SHA512 59703cf3d056ed1c69de0f2d4a08067afcc1ea81541d9078d51e6bf270352d348d975420aa488e79f6710e321f7e283d8dab3c559694d6b12d46d39ee5eddfd5
 EBUILD liborcus-9999.ebuild 1235 BLAKE2B 9690fc7b0ae34d59f4fc3b96ddf1e590d101763859503e4097e7b63fc92412a57986e10f1b6f8750725dc8feab001636ac0dc4b44aebf43986fa860fd0617278 SHA512 63cc21fc924c9c599dad935ab51d4754e38ed6307dd21d0e6674c3fd74bd7f6fb623ee91a8778a409f1908ce5d6ee6646ecfd5fdecadc7ccaf4f50c651efabb7
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch b/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
deleted file mode 100644
index b1d44b8db4cb..000000000000
--- a/dev-libs/liborcus/files/liborcus-0.13.4-boost-1.67.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From f7485813af8e50f88c77312fb29b7bb489a0a17d Mon Sep 17 00:00:00 2001
-From: Adam Majer <amajer@suse.de>
-Date: Wed, 23 May 2018 10:45:56 +0200
-Subject: [PATCH] Fix build with Boost 1.67
-
-Boost:DateTime that no longer accepts non-integer types.
-In the past, these types were implicitly cast down to integer
-values. Now this requires explicit cast.
-
-https://svn.boost.org/trac10/ticket/11168
-
-This fixes #60
----
- src/spreadsheet/sheet.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/spreadsheet/sheet.cpp b/src/spreadsheet/sheet.cpp
-index 7df1aedb..33b372ad 100644
---- a/src/spreadsheet/sheet.cpp
-+++ b/src/spreadsheet/sheet.cpp
-@@ -289,7 +289,7 @@ void sheet::set_date_time(row_t row, col_t col, int year, int month, int day, in
- 
-     double days_since_epoch = (d - origin).days();
- 
--    double ms = second * 1000000.0;
-+    long ms = second * 1000000.0;
- 
-     posix_time::time_duration t(
-         posix_time::hours(hour) +
-@@ -606,7 +606,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
-     if (time_fraction)
-     {
-         // Convert a fraction day to microseconds.
--        double ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
-+        long ms = time_fraction * 24.0 * 60.0 * 60.0 * 1000000.0;
-         posix_time::time_duration td = posix_time::microsec(ms);
- 
-         hours = td.hours();
-@@ -615,7 +615,7 @@ date_time_t sheet::get_date_time(row_t row, col_t col) const
- 
-         td -= posix_time::hours(hours);
-         td -= posix_time::minutes(minutes);
--        td -= posix_time::seconds(seconds);
-+        td -= posix_time::seconds((long)seconds);
- 
-         ms = td.total_microseconds(); // remaining microseconds.
- 
--- 
-2.18.0
-
diff --git a/dev-libs/liborcus/liborcus-0.13.4.ebuild b/dev-libs/liborcus/liborcus-0.13.4.ebuild
deleted file mode 100644
index 81e4c1673a31..000000000000
--- a/dev-libs/liborcus/liborcus-0.13.4.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
-
-EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit python-single-r1 ${GITECLASS}
-unset GITECLASS
-
-DESCRIPTION="Standalone file import filter library for spreadsheet documents"
-HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/0.13" # based on SONAME of liborcus.so
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="python +spreadsheet-model static-libs tools"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib
-	python? ( ${PYTHON_DEPS} )
-	spreadsheet-model? ( =dev-libs/libixion-0.13*:= )
-"
-DEPEND="${RDEPEND}
-	=dev-util/mdds-1.3*:1
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}/${P}-boost-1.67.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable python) \
-		$(use_enable spreadsheet-model) \
-		$(use_enable static-libs static) \
-		$(use_with tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index defabea2dba1..c6cb7fd30ed0 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,3 +1,3 @@
 DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
 EBUILD libp11-0.4.10.ebuild 786 BLAKE2B 9a8f418682368369a9db4a8e98f51f28a4034d2ca4c9e7d5f431fc966390f99c9a5c2678b9f30b27c2bdb0b1111a6b3661d229366ba20951ca26d8a9e2ab1863 SHA512 9ab3cd1b4ec99218d14d6e8af3ccbec6fce882bf8eebc84b4440f55d9e27b2137197ea94904e0ae17fc15dcab8bb015fe9bb6371ce0c3ffb5c594adc64af7ad1
-MISC metadata.xml 612 BLAKE2B 603fa1505d9001be83c192a30130fd3a2aed2c817fabbaa7970e9c883290eda3aafa41a6e9bcec57ee993fb97fe6edf448eaddbd68bf8246ae272ef4066ebb7e SHA512 85d70948ec35a42c1707729c325159abf0a097a7b0c07b4db36453e25a8dbc713b6f7c347b545cae71104d166be9b8c93e4835f79633bee2e06d64a1c28e15b7
+MISC metadata.xml 677 BLAKE2B 1978fa530cb22a95932fe30b3a4a317aa5be5ec105b2202d06d4076a5f7c320c261f1ba40363651c35eb0aa67511ab93f73656821657edce4df3dd2214b15d81 SHA512 735a547360535a34ad22c4bc81aa4d2d20c5717b33c6e1fe89cb8da17810e1226d7990141c1cc3c195e1e2ac8dbc3c52d78d50161241e8f65ea1406336269905
diff --git a/dev-libs/libp11/metadata.xml b/dev-libs/libp11/metadata.xml
index d6d0837d385c..831b8dce3afa 100644
--- a/dev-libs/libp11/metadata.xml
+++ b/dev-libs/libp11/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="doc">Generate and install API documentation for the package.</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:opensc-project:opensc</remote-id>
 		<remote-id type="github">opensc/libp11</remote-id>
 		<remote-id type="sourceforge">opensc</remote-id>
 	</upstream>
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index fe655e437dc7..570799850057 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,3 +1,3 @@
 DIST libqtxdg-3.3.1.tar.xz 66004 BLAKE2B a676f22144ddbf67e02686fc25b381a911e5d0391e2f735c6d85914362433aad20ad0a3740ea7101d26b5b5692d0504c3798489333b1bf9585c3be88f6636beb SHA512 f0fdb95f20ee49becf770455a513178bb3ce63ee460e8bbaac8d40f50ae47a139ff518021c8fc19254bbd777b67bc7f2754302de7e2bb6cdf929bc559a1b51f3
-EBUILD libqtxdg-3.3.1.ebuild 945 BLAKE2B 6d2d8add873c6a95d6492c4b930ae23116a24ce0bf0875fbd5c026389556edf50a6953edfffb89a8b9a915f26abb6a0d8853a59df1b365597c0f1595737c76e7 SHA512 a7ec712996a2cd6eb195845bba8cf27cd6c8ede78fee0f0aa15dd97064b4e5abbc62a90f147d72b1ba81148e2ea03bfa3c0bf925cb4f86df0b68aaf452b1ce05
+EBUILD libqtxdg-3.3.1.ebuild 952 BLAKE2B 700cd5434c978398171cf87d762e35968b598abbc2cb2dfa1303796fdade01ce41da61f6c17a0702f9ddfcbccd43cc7fdd241adef57718f4cf448a2512e400c3 SHA512 d3dcaa7c980c02ea089cceb8de12801f3aa8a907e49ced5f62756e21fe5147fd22e67281d1aa1efc2acb5f691eba96cc414dfa90ba8b1fcfc46ea22c8251edfd
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
index 91b64f8020e3..b9a18597a1c9 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 9ee274c1c275..4da4db862b76 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,8 +1,6 @@
 DIST libsass-3.5.5.tar.gz 327298 BLAKE2B 4127722343394bca4ed054987eed6113788e10dc4d03a869778c10b56135406c1fcd72dc101bfe405c96267b628735e8ee74d3812ab392f097dc941b78bef882 SHA512 dcb73a5080c00023b60a19ea037ba5af481253a7b47492bd7114bf45ab78ed931c7b207fa8f12ed200a39760553d72ae92dbe4eb80b826b59a6201fb34008fe5
-DIST libsass-3.6.0.tar.gz 332747 BLAKE2B be4ad469aa55f89ce54e6cf1cc5cf0a72f4727610bf2d5aeca7321fde4e4cbc009f59bee46c1e5e5b88825d5bd2f3b4fa427ab3cd535584956f7541c16339f1d SHA512 9665e50ee964ca3cc323f26c2b8322677102d26a7a102558ffbc5bef7a4c4ea44ca5096a967e4044dac1404bfa343a37d846f22d1e1adc27592023d5d4ac40c8
 DIST libsass-3.6.1.tar.gz 333609 BLAKE2B ea6cb0285a6d741614bb900ff0f3b74660c74ec9ed071abf2d980bfe3f55b02fa2873d3860e5b767ca82b5f202f3d2aef28b73357bf8d2b3117c925b4dc78791 SHA512 e9a3a30851e26145d049c4b20951c663a9d48c781a732acd3cc2cdb30df3449e445b57211f666b58afa137431fbdb149add48ff8a0dec92bd8abb514c90adebb
 EBUILD libsass-3.5.5.ebuild 1121 BLAKE2B 1be11be93f262d319d986335d725388e2fc4b1ea18841e5a89841d761873d24a36aa4d602ee0e8714ca852f4915c4e2e4d9eb9efc07c307253bd1912ac95ede3 SHA512 a955b393ca0180f6ead993584d544a9a2bf6a0d5b0652377369a94716e41167898237ec7c8e9d8c7a7f2e181adb8ec0ea2db599ba30b3bfa9ffcdb9b2a7fd95e
-EBUILD libsass-3.6.0.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 EBUILD libsass-3.6.1.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 EBUILD libsass-9999.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 MISC metadata.xml 555 BLAKE2B 5bf541c7be60dbded36d2dbf944111095a7b911809236b110a9d5d79fb99d2315019c8082489699e0c984a5cc6b1fa07b845afef28f887191dd6f9243cb93ace SHA512 b4b4252aefabd61569690f83ec264a19ac00aee9559f7e1857770b560f74de1134aa3e628d12f3d04bebf426d779eb7bbb40a5d714d841ed480c8178763eb8f0
diff --git a/dev-libs/libsass/libsass-3.6.0.ebuild b/dev-libs/libsass/libsass-3.6.0.ebuild
deleted file mode 100644
index 7bb47a910936..000000000000
--- a/dev-libs/libsass/libsass-3.6.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/sass/libsass.git"
-	inherit git-r3
-	KEYWORDS=
-else
-	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
-HOMEPAGE="https://github.com/sass/libsass"
-LICENSE="MIT"
-SLOT="0/1" # libsass soname
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-DOCS=( Readme.md SECURITY.md )
-
-src_prepare() {
-	default
-
-	if [[ ${PV} != *9999 ]]; then
-		[[ -f VERSION ]] || echo "${PV}" > VERSION
-	fi
-	eautoreconf
-
-	# only sane way to deal with various version-related scripts, env variables etc.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-shared
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc -r "${S}/docs"
-}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index e8cd84b594b3..eb7b70c6228f 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -2,11 +2,9 @@ AUX libsodium-1.0.10-cpuflags.patch 1262 BLAKE2B 64c222e8b67fa85968151238bdd397d
 DIST libsodium-1.0.11.tar.gz 1846782 BLAKE2B aadab6c89d11740dca72d7686d06cfeca6c504fca9e78108778817da4071d9e7bb6115df42e9509cd872ae7a5489ef15c099cabaf564f28e90b7f74a63bae140 SHA512 4b1293c4d0e52264beecdd05833857bc4d77d1c2a97eea0138fe04df383b9a2dfcad4a79ccd9aed8f6c0047ba67c49292b0d2ccf987ab0b5046b46b1586ccbd7
 DIST libsodium-1.0.15.tar.gz 1866057 BLAKE2B 220e327f7803c6cf0b1260b313a225d7cc7a965b36920c744379c5939643e588687032478e3d7a79b4614c5fa57b0dd2afd216b2e23ca69ad16ea67764a840ca SHA512 299a208f8342793d13498e95b23f1749f5b5b13ec276db3ec401130615e837ef475b6a1283b6e87a5f8227d23e70e38ca721073dadd5dc88fe4aff342aa64adc
 DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d74bb9f850364bf0670547a12842009c0ca32d36d06053906fb649497406b1d7988e167772d5f1138d23798d8775f7 SHA512 eab917d599c9c1fe971a6ecf915b9a6476ccec2d46cf23cbfbf06dd3833089b422f192de4d55f17b93362f1251ba8d5ddeb95ced1a422a3a2631b4b82553907f
-DIST libsodium-1.0.17.tar.gz 1911910 BLAKE2B 488079599f8448a75ac60b955bddc2a284bc09307ef6c3d1e12fef6316d3ddc354b0b60756487311ea8b50920009394e749ba0f6f159542716e0e864fc80646c SHA512 7cc9e4f11e656008ce9dff735acea95acbcb91ae4936de4d26f7798093766a77c373e9bd4a7b45b60ef8a11de6c55bc8dcac13bebf8c23c671d0536430501da1
 DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 SHA512 17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef
 EBUILD libsodium-1.0.11-r1.ebuild 1039 BLAKE2B d5abb8deb7cbe76beec8cc9b5a5b2300d1a6d62117b33525bc1087e1f09a499a4aa0e7e279dc5dd003a3e2f18dae20104262da5822ed6d62ea63bdb197f792de SHA512 93eddc42552a4921d4de77603e8b26fbc29627b44edb889d85fbe9948ece1f0864053a8b09f5f6457eacd6e6bd1da078a91d5c67266395e1e1f5edf20b1dcacb
 EBUILD libsodium-1.0.15-r1.ebuild 1147 BLAKE2B 041f58dcef86c866941a670c23313e2e4fb9804e024beae6950c468b4e55632f3eeba8e73a2b9bbdcc52bebc0000ac36e3d692e72d4b4e32d6935dcae0319e7c SHA512 bc140c2446e4f1aa45d5f4429223996397a9999c374ed6cbb43c7eb211b89531018b4e363ba0d9404be1e6aeace799c783c22b67565fbe70ca1e6153e31a1635
 EBUILD libsodium-1.0.16-r2.ebuild 1303 BLAKE2B efb5e7314adc904c0d5ac99ebc7804e4125a7ed18f8d1d2945a6f020932030cc642919729f1d491ae251daf0ca901076d9fad1cb1624dacd9ba5a0a81c3092a4 SHA512 06c4bb4de35de4ad3ce64da1a6dc8b13e3d57eeb7bd1f281e7ad383bd0351f3e0246fdf22783a88f3961024a8b0dcd817abe2348b65f3fe6ebd444aa4bb95fd4
-EBUILD libsodium-1.0.17.ebuild 1306 BLAKE2B da03b755da6c2afa42c04c629d2f5f446f6b53bc1e5ad037e14451297eced8491ecb0c3741317f1784b5167aa34b6a024cd157f35b2aff0705d38b00cf7ba515 SHA512 13922c24a0abd9b75bb7716bef8f82ad46005a72c81350a90dc510f85005a34b30ea9f23df1a01caa9b4d6bb4f2a9f79de376bd875594fce00cf34e5d30a8333
 EBUILD libsodium-1.0.18.ebuild 1314 BLAKE2B 923670f66bee00609fe26356adc982103013d80cde9d4fa78dd14214aff05a13bef7cc1537b8e0164aa467b7d51d614bb012fa412faf035dea98593af7424087 SHA512 17c116372b69ddc2e52ad125b2a1c5da26df4cee12977855203dc7af7f2d59062a9950ca382848ffbd235bc9f63d2d10708442422e11db80618ab037d6526618
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.17.ebuild b/dev-libs/libsodium/libsodium-1.0.17.ebuild
deleted file mode 100644
index ca8df8c8f25f..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.17.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable asm)
-		$(use_enable minimal)
-		$(use_enable !urandom blocking-random)
-		$(use_enable static-libs static)
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-		$(use_enable cpu_flags_x86_aes aesni)
-	)
-
-	# --disable-pie is needed on x86, see bug #512734
-	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
-		myeconfargs+=( --disable-pie )
-		# --disable-ssp is needed on musl x86
-		if use elibc_musl; then
-			myeconfargs+=( --disable-ssp )
-		fi
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myeconfargs[@]}
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 020e53fc73aa..00ad8720e6af 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -2,4 +2,4 @@ DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe7
 DIST libtasn1-4.14.tar.gz 1771184 BLAKE2B fab592db4c62d1ed1201637fdbfbf7b753ff90994245b28bad4fbbb6f28616f0abc65fb5cf4fe9b9cd6cc7c4ffb442686b275a97dcfdbdb6a08b0d8e781576f5 SHA512 efdcf3729e9e057cafbfdc9929f08531de03cf3b64e7db62cb53c26bf34c8db4d73786fd853620ab1a10dbafe55e119ad17bfeb40e191071945c7b4db9c9e223
 EBUILD libtasn1-4.13.ebuild 1169 BLAKE2B 5c73d0e3b295b55119251f08cdecfc9d9594bbd6fc9eec6ddd11c6743704075caccf507ba22071c3d1f41b18b30232591a2c5afb71f7625daf43e975e3d3682b SHA512 66e9032f34ed0d179c4eda17bf53d1ec153d943a33c71767ee55a6894917fbb9715d2fc4d797a2abbe2e8e72d5dc215ea9db4612ec6909d240b176a2f83c990b
 EBUILD libtasn1-4.14.ebuild 1192 BLAKE2B 467335199718a62c712a767a6fa1d40446cd4b95ade3ab5ccbcd9b09a8ed80b9a95514ef0e09491e25fd01866b4182ae2577009db7996c383c04461328a4f187 SHA512 2093ea48c8052f0d1e7d8b75109d4c801ed5ed2282a49b4fe4a9441fc4ba5711df97f049d2f38987fc590d9393a68d7acbd14901fd8b43b6b682fef25f34d8bc
-MISC metadata.xml 347 BLAKE2B d1cb59aca28df43f3b322b98daf2cefd4c91d45120bd47c5cb883dde59ae0ac9b8fcb092e0bd4b51e1f09aff48b97a6e1880568ae6796025a989b67902b01a7c SHA512 2f70d06c9e91e2d9305cce180c302b6b04b4831fd93c1897fd2027a1bf5855700c5531ba3f9c3fe93748df1db923d6ad4ea78bbe3cfd2458c0006457ed43a450
+MISC metadata.xml 428 BLAKE2B 85413f31c74675764c652ce8bec334384a0696c3eefdb517cde5f73c6385e9f52bad2087613b9fc4f37074fbcbdd6953dd25f87ba6095d13cf08a1aadde1488c SHA512 172d1c137ea4190da305ca987dfecf1db73e4e222cae61e8f7830a539a87ed3e919af93f0415563a9be2f65dd7b8787c22e8494e134c42e701ce1559a66cf5a3
diff --git a/dev-libs/libtasn1/metadata.xml b/dev-libs/libtasn1/metadata.xml
index c7fc0ea791dc..6b44d2e7957e 100644
--- a/dev-libs/libtasn1/metadata.xml
+++ b/dev-libs/libtasn1/metadata.xml
@@ -10,4 +10,7 @@
 			Enable usage of <pkg>dev-util/valgrind</pkg> in debug
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:libtasn1</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index ed614460214a..51b859d5634a 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -3,10 +3,12 @@ DIST libuv-1.29.1.tar.gz 1224127 BLAKE2B f116b0e0df9c2b65bafb8ebe0259ac1e1702232
 DIST libuv-1.30.0.tar.gz 1228356 BLAKE2B 1e70ff162f5b6200e1a88c069360cbbc246d8bd5428c918ff80fadd139b3416301116c1015953ff7be583523a5c977b1da003958e6dd66cf2f43ef5adfc798c3 SHA512 3ba158cea5027fe7c30314da08a620a718cb30ca38997e46ad00912eefac9d2d94f9dd256c204771686a546d7445da2db1be2a0abed7ba14f122332767ee5ee8
 DIST libuv-1.30.1.tar.gz 1228593 BLAKE2B db45d283b7aec00ee5b617a6d3578112aeae6f006da5b09c9d0eb07ce9ceee59d6acc0ae9e476602f664c67d24685c4e1ac0e1524f38475da1f00e89c8376bd8 SHA512 bf6d99e4807da3e90c1852b901953fb5ddb9354942a433d8ddfef9a0766abfe3783216936c546ea1b9f2872d0d031dd184519bb5c7f58f6baeae4446f0f5e3fd
 DIST libuv-1.31.0.tar.gz 1238566 BLAKE2B d6a9b92dc8a6f28dd89f65e6d1b7ff4921c7d591c13965e27304d3ca38f25d0436a1ab690a09238c511bb787bcecbaf2cc34a214a388515eef039fc5742ec7ee SHA512 bb27ab86f2f6e9c2b22e768216097db2b69e468967b48bf1a15d17c36b445355ee4bd356f59bbd1bcf7d7c0d3f68b2c6660f999a2cc0660033eb5e3775499409
+DIST libuv-1.32.0.tar.gz 1242643 BLAKE2B 39520790200c70a417103416a6c2a389aad7b67878872c3733cf0dbca5ace012e45da088b0695e8dcbf55859635b6d67672581bc13c444d078ffa536bd3d0c39 SHA512 3e043a56fd09fdaf3c89f81b3dff70a385ba8a59ec065447c95199a0e45da323b8545fb13b50139c557541357450103a88297fdc921832de661f3e2700173b96
 EBUILD libuv-1.28.0.ebuild 1220 BLAKE2B f2a288593c2b6dfec730f5eee44f92ca7547256397130f5237f331aadd2e6b2e9d4f9a48ab499885a3844f27363b357a09e607a027a7d4844c0c546801a15f4e SHA512 74b859a4bc98970f1eca1b6ad29f974bfeddc8815455842220d317fb2ba0173baa179987fe096ca58154b6fc84fbf95d071f89df8b50aa5ead1f2e0649808658
 EBUILD libuv-1.29.1.ebuild 1237 BLAKE2B 05df78f6a04e72033411d2c2e4523ca314c1d11aadbdc599fcd83f84fc3758044a56d1f02709cace36675ce56f61c6df4d6d26a806c5e358b2c56cf4fca891ee SHA512 8426a40e2dce0793b9cc6defa6dde8525d0702fa46b3eeaeb05fc6a8d5fbc3527d76126920660e41b0d9382480dec8dfd7b40165fd2d46cf082f2898e180751c
 EBUILD libuv-1.30.0.ebuild 1237 BLAKE2B 05df78f6a04e72033411d2c2e4523ca314c1d11aadbdc599fcd83f84fc3758044a56d1f02709cace36675ce56f61c6df4d6d26a806c5e358b2c56cf4fca891ee SHA512 8426a40e2dce0793b9cc6defa6dde8525d0702fa46b3eeaeb05fc6a8d5fbc3527d76126920660e41b0d9382480dec8dfd7b40165fd2d46cf082f2898e180751c
 EBUILD libuv-1.30.1.ebuild 1244 BLAKE2B 72493abf57cae2fda6ed7e23c7dd8c06300bb80812cbd795a957697e4c07787e6f8c4ce9766af69ce0cf987e0dd8a1d58d5f5d3b8445c0d3eba76796241fc45c SHA512 91549516a2b1c2c54aa37786e46d5039caa8549448a921cf172d47b9c94aa386f4193c88cc430caa8841fcde09583a399c4428d2bd49cec09e77bbfe67f50b63
 EBUILD libuv-1.31.0.ebuild 1244 BLAKE2B 72493abf57cae2fda6ed7e23c7dd8c06300bb80812cbd795a957697e4c07787e6f8c4ce9766af69ce0cf987e0dd8a1d58d5f5d3b8445c0d3eba76796241fc45c SHA512 91549516a2b1c2c54aa37786e46d5039caa8549448a921cf172d47b9c94aa386f4193c88cc430caa8841fcde09583a399c4428d2bd49cec09e77bbfe67f50b63
+EBUILD libuv-1.32.0.ebuild 1244 BLAKE2B 72493abf57cae2fda6ed7e23c7dd8c06300bb80812cbd795a957697e4c07787e6f8c4ce9766af69ce0cf987e0dd8a1d58d5f5d3b8445c0d3eba76796241fc45c SHA512 91549516a2b1c2c54aa37786e46d5039caa8549448a921cf172d47b9c94aa386f4193c88cc430caa8841fcde09583a399c4428d2bd49cec09e77bbfe67f50b63
 EBUILD libuv-9999.ebuild 997 BLAKE2B 1d82e7c3acd3715c580dda78f0aa6db97f217cdcd1dd58ac04963e43dd077cd62c798e2d676a098c69471bed2b4d035a63da335abe427762097de1bfe947e624 SHA512 d1ad9a68ce54465945cb795d28312eae4615e839889f8a7dadfa6ab54e580925c15781d00fadc99edc8d3dc5b54d18351df17b1de096fe97ab06bdae21fd9870
 MISC metadata.xml 1337 BLAKE2B d054e429ce7e3a6b94910693123645ab6dbfefcb8921b37b57ae156aeb5a25a4b100b45fe6714c498a355015dc3cc37c98852a14be651bd3f55259b8ab78e2dd SHA512 dba39812f31549539955d26ab8e281b4a1a372b8b41f29e68f0ae63bc10d18df5eef106936b31a13344cc11705192bafd4b32a0aca1f16e7927244ad049278ca
diff --git a/dev-libs/libuv/libuv-1.32.0.ebuild b/dev-libs/libuv/libuv-1.32.0.ebuild
new file mode 100644
index 000000000000..046df21f2944
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.32.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
new file mode 100644
index 000000000000..541259a7373c
--- /dev/null
+++ b/dev-libs/libvoikko/Manifest
@@ -0,0 +1,3 @@
+DIST libvoikko-4.2.tar.gz 653769 BLAKE2B 6c0e665d7b5eca394b49dbebf38a0815b1fe1ea328efa305e9d1574b551c633be6b2326b5b402bbc454557a559a821a28c668a1845b21a71c378d0e97103ca53 SHA512 483d3c259a52ae772d52f708789c3df39a4857188c7b9035ce5db8b16bfa4ef144e2ffd557dd6a0655e4c9a6984529784e4098bc949a1bc8a0a50529fee49656
+EBUILD libvoikko-4.2.ebuild 887 BLAKE2B 1ef2412c5a3142334811ed071b2c155d2bf1aa97d3c056739bc411854ff9bf3fc47a808f2be0f2257acda0846db90ae73cc00f9dcfb30290bcc176ce0122f206 SHA512 b64ba2188d30d79700b29bf57546cd54bd9d7c05cdbbb0025cad438a88bd398c74f0883eeae3d30806365698363c9e3ad93ef5b03c78968f0c283bb5ab9b9b92
+MISC metadata.xml 419 BLAKE2B dbdf2112c9dec7639da8529d60e49c4da9cc413ca6a64d9175428495e73e7daca3d2a31306984d12f3d264fecc9d0258c7849f8533da3880ca287469c749a5fc SHA512 62374b7251abadedc04b5581551429300ba783b1ad02f237d8a73c3bbe60b1c8495e0de5540418c02d79ff14f58b4b7820be9f6f6dd8c529003a7fc6a7584b5b
diff --git a/dev-libs/libvoikko/libvoikko-4.2.ebuild b/dev-libs/libvoikko/libvoikko-4.2.ebuild
new file mode 100644
index 000000000000..7bdff963650d
--- /dev/null
+++ b/dev-libs/libvoikko/libvoikko-4.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5..7}} )
+
+inherit python-r1
+
+DESCRIPTION="Spell checking, hyphenation and morphological analysis tool for Finnish language"
+HOMEPAGE="https://voikko.puimula.org/"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+expvfst +hfst"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+DEPEND="${PYTHON_DEPS}
+	hfst? ( >=dev-util/hfstospell-0.5.0 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myconf=(
+		--prefix=/usr
+		--with-dictionary-path=/usr/share/voikko
+		$(use_enable expvfst)
+	)
+
+	if ! use hfst ; then
+		myconf+=( --disable-hfst )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	python_setup
+	default
+
+	python_foreach_impl python_domodule python/libvoikko.py
+}
diff --git a/dev-libs/libvoikko/metadata.xml b/dev-libs/libvoikko/metadata.xml
new file mode 100644
index 000000000000..b61e52b54ad3
--- /dev/null
+++ b/dev-libs/libvoikko/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <use>
+    <flag name='expvfst'>Enable experimental features of VFST morphology backend</flag>
+    <flag name='hfst'>Enable HFST morphology backend</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 08aba8b8ad8a..a4f3da634811 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -3,4 +3,4 @@ AUX libxslt-1.1.28-disable-static-modules.patch 1109 BLAKE2B fc4c8c1dc932ff9bdce
 DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948
 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
 EBUILD libxslt-1.1.33-r1.ebuild 3467 BLAKE2B d8663a0bf1b2ac475552d0319c05a702ad079c52f29da813ffe3b5815a1a93620731a415db5178e455452fcaa211eb9bfb6b70bee642a306a372a36bfae51b6b SHA512 48e01883b6660fe9e636b4fb128923e9a0d11b910aa922a72fec1b97a3126fb6dbf1986ef07d1a7e883e0202331312cf7b3e3d547693042f90f7205388510844
-MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
+MISC metadata.xml 347 BLAKE2B d45671e9d4d34c0f4583b4f3e83a8d780327d3d15286c9bb007a7061a4dbf2259ac860cd038adc6c0637265fa0c31430a1ebdec12f8dc133822b7f6067e9479f SHA512 f1679d429313fbd932a45bbd07178f82100e5e79c871327b3b510829137476a06a252351d1e58384db1e0c0d97ffecf1f4e37ef771e9e5f92219ee86d67b596b
diff --git a/dev-libs/libxslt/metadata.xml b/dev-libs/libxslt/metadata.xml
index 4cbddcaa19ad..4073f76c700d 100644
--- a/dev-libs/libxslt/metadata.xml
+++ b/dev-libs/libxslt/metadata.xml
@@ -5,4 +5,7 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:xmlsoft:libxslt</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 833615f7bfee..53b445eddd95 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -5,4 +5,4 @@ DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb5
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
 EBUILD libzip-1.5.1.ebuild 1901 BLAKE2B f668410b13077d0cc6e36e2b539070fb1172424623082053c71fd0ffc1533545c3aa5abe50030e6b62c0cd7690332eac3198807a94e41eeb9af709ca79166578 SHA512 00692e68879b5c76936f632f32c5ccf2759f8022bf13802bad8c6c3931a2d984ae5b976115f2b11f65fd0bf732b02083dea6c91dc7c69483d16e8fab3879dc3d
 EBUILD libzip-1.5.2-r1.ebuild 2287 BLAKE2B cd489ff9474e34b75a1df7ec33757bdaa4d7fb9af8fcf05478457cae249c7a50488274b88504145548d78dcbba787f49b1dd399be85a29bf6d6fbd6df1eea8fd SHA512 7e5b7aea06ecd54984bf54f79ebefc5e03d210580395f1acad093c87fcfc859a746a4757e1f21b2553902cf1945498b60d6cadbc549f48faba796a79ab14ffb2
-MISC metadata.xml 440 BLAKE2B a69b3d641d9262e897f015c91fc0a4aa7a7cecc73889d24b479101674f2de16825844c9ad6c10e42968a22279bdfef71b839f50289aab5457efb0164ae5fd1c3 SHA512 737e1fb7de749b2e38f5642dff624daf6521183fa974f9cc2831580aaa1b8532fdf8725ca3166bde8ef8faa492b8a2298f542fb8bd15d89b1ab983885756282d
+MISC metadata.xml 516 BLAKE2B 8bb4e6c42e27ee5e4547e7323d4464f77f37ca80f06a3830d86edb01228d2bafe670866d56c0ff421ac6a7e14c4085f1d8ef6818ee4edb20a2b996763f0809d2 SHA512 8330247191cf7628e208e0b001492948c3deaee4b65cd9327e708dd3a5b35022476bb52f631c6503eac875fa89c666fda7b973f95a8be2767638207fd7c5f049
diff --git a/dev-libs/libzip/metadata.xml b/dev-libs/libzip/metadata.xml
index 87a5b99d4f34..7f6898ece72e 100644
--- a/dev-libs/libzip/metadata.xml
+++ b/dev-libs/libzip/metadata.xml
@@ -9,6 +9,9 @@
 	<email>kde@gentoo.org</email>
 	<name>Gentoo KDE Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:nih:libzip</remote-id>
+</upstream>
 <use>
 	<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag>
 </use>
diff --git a/dev-libs/lockdev/Manifest b/dev-libs/lockdev/Manifest
index ec2acb4b6eb6..0cde4d8d1623 100644
--- a/dev-libs/lockdev/Manifest
+++ b/dev-libs/lockdev/Manifest
@@ -2,6 +2,5 @@ AUX lockdev-1.0.3-add-autotools.patch 1344 BLAKE2B 7248172afeeb5b78ca5626d20604e
 AUX lockdev-1.0.3-fix-perl.patch 307 BLAKE2B aa1d9fb4131a0dcedbac0034e450ef47cac62d4e45c56865c2e7c8c8d896143afae2e767eac3fc878fc8281656db603cb9bbe5a7ae3dfe62a164b8023493cca0 SHA512 f8647472a451ce641d687a9c61f2e650456a68a6fd9fbb57a3871a1480871de639815aef924bd6f1cf85d1c13203b605c0461077f362d2523881269040a8114a
 DIST lockdev_1.0.3-1.2.diff.gz 7642 BLAKE2B ee0da062e802d1112c49bf3dc4cdd1f3567eb11fd4173fe0170b079c2752231ee93e39201674d8e71a5970f4d7e6443406d159af63687bb37c8c72203132c4f9 SHA512 22fce119a8075a5b99a4ef83b31f62da64725067863949d4833b4d66f9e8e2d34920eee11c5acdcc14b1a643a21c56c39ec2adf31ae7fa489795dd5534eb7b6c
 DIST lockdev_1.0.3.orig.tar.gz 29150 BLAKE2B 812acf8b39507e7b00e8fd49e6828be2b6ba21811c3dca49f94543756d428f7fea9d8005e43574653180f71aa634b0f92a2c42380235c2584c6958ca38d499fb SHA512 4066985059add674ef8a9195e611db8ead89ca6191c04b7f29243b12a3448c82a3d0ea852bf99e26e1c71f163891acd198867650a5c4843f787e1944a8bc7f2b
-EBUILD lockdev-1.0.3.1.2-r2.ebuild 1889 BLAKE2B 38faa340fafed78795e2157b66178c3f423b7e00aa5f0d78783ceef03978ef4526993216bf2960e0da587d90ce81bb2cdf6518c3230947baaf24818cc59b6c24 SHA512 76e30de7368016f264b5f6f92a5b60c1f287f58fc7b52447e169b6457158cc8b7bef01cc50efdcd6eab82e0ed84dac2a34c4412ed15736499dea6a1c0c527a46
 EBUILD lockdev-1.0.3.1.2-r3.ebuild 2099 BLAKE2B 283cc4876b1a68e51a2b743109c2403966193d9a03c2054b59d93ae9d18dce3d745b296887154f14e7f34f5e14292fb765230bb675966f1c51bca7415a577b27 SHA512 168e95f181d6e24db2bd8817ab53ad4f06591217308c0d45f4e1851b490dbd5a1fc50dab85042512c3c72f4e196e12ace4d2d173b8a1ddc00c5080ba996be329
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild
deleted file mode 100644
index adea574b396b..000000000000
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL="no"
-inherit toolchain-funcs base perl-module eutils versionator autotools
-
-MAJOR=$(get_major_version)
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-DEB_PV=$(replace_version_separator 3 '-')
-DEB_P=${PN}_${DEB_PV}
-
-DESCRIPTION="Library for locking devices"
-HOMEPAGE="http://packages.debian.org/source/sid/lockdev"
-SRC_URI="
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}.diff.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86"
-IUSE="perl"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${MY_P}-add-autotools.patch"
-	"${FILESDIR}/${MY_P}-fix-perl.patch"
-)
-
-S=${WORKDIR}/${PN}-${MY_PV}
-PERL_S=${S}/LockDev
-
-pkg_setup() {
-	use perl && perl_set_version
-}
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# Note: we do *not* want to be in ${S} for this, as that breaks the patch
-	epatch "${WORKDIR}/${DEB_P}.diff"
-
-	cd "${S}"
-	base_src_prepare
-
-	eautoreconf
-}
-
-src_configure() {
-	econf
-
-	if use perl; then
-		cd "${PERL_S}"
-		perl-module_src_configure
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use perl; then
-		cd "${PERL_S}"
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	if use perl; then
-		cd "${PERL_S}"
-		SRC_TEST="do"
-		export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${S}/.libs"
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog* debian/NEWS README.debug
-	newdoc debian/changelog changelog.debian
-
-	if use perl; then
-		cd "${PERL_S}"
-		mytargets="pure_install"
-		docinto perl
-		perl-module_src_install
-	fi
-
-	# Remove *.la files
-	find "${D}" -name "*.la" -exec rm {} + || die "removal of *.la files failed"
-}
-
-pkg_preinst() {
-	use perl && perl_set_version
-}
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 38debfea8381..d6b9c86c2367 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,3 +1,3 @@
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
 EBUILD lzo-2.10.ebuild 1043 BLAKE2B ae5730afb17e721c57dcfeb635a824c8a6afb4ad48b7026bfea8b4cde0330b3e568e105d88b7584606d4bba5e72f597f624a7b39c84eb98639b712a85cc38c92 SHA512 9bbc011168b42521e4a9c9849b63dfcf94e62594d52755c1ddd0b3c54263320e642081592021846ad7e42416ceb20a474021cd56510898f9c9514794fc374717
-MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
+MISC metadata.xml 331 BLAKE2B 26723a66d81589b011d73477fb7166710855286818c34d5ea2ba3bce10e0902c7498915b559bc8aec13c676a43255efc70b1d578367cd3a53deb31702ef13727 SHA512 b58af857c0305f2e7266fb0a33439f4908c46b5e30e968785936b5fde495dc1e9852264ad862ab1f909ad8eb5c086b7efe96315771140f3677a81b2136f0f21b
diff --git a/dev-libs/lzo/metadata.xml b/dev-libs/lzo/metadata.xml
index 0319eec4c8be..3300f7ef6f9d 100644
--- a/dev-libs/lzo/metadata.xml
+++ b/dev-libs/lzo/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:lzo_project:lzo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 0bca2d44c077..4a1ec1a77783 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -3,4 +3,4 @@ DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff7
 DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b043687d88c776ce9c58374538b111d282e0eea5424059260b0876c5cf01f97470c850e082c167b05a57e6c591a SHA512 f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784
 EBUILD nettle-3.4.1.ebuild 1787 BLAKE2B 80b456defbf4e4c28bf9b0ed97b310d9993218964af3febb91649d25b69fa71fae0f2109b1b952e1a8c90f09311ef1f966d9d77f8af2f113630c64ef6821ec9d SHA512 9545879b7b41f3b4fb74a14cfa7b0c6c032bcf8228daf2d0e5265eec5ee32ad93a757d5dc54f7c5f7e76ba595328cf97eae0dc085e060a259f5bc00b74378c24
 EBUILD nettle-3.5.1.ebuild 1694 BLAKE2B 93fab2dcd60d5821297c3d577eaedf545ebd22c85d354a0b18eb13c93cca5c01d0103e959c096552a6b04a75a88658a9a6324ae6295223ce0e2a2826e4a38614 SHA512 93a3c4eaa29e1cce5916596df0cc62cf79b8f107527d21e6f12c2687b64a8187040658210ed72d240067b5a1ad72ee2ea71bc381b2cbe7e73d2999695f5b3c55
-MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
+MISC metadata.xml 330 BLAKE2B 5133c1f98f3dadfef214d46f49e17ea1de8164d9dbe1d334fb2f8009bd40e302db7c1286a3a1cc184fd5240724a63410764addc3a2a4eb65964fcd22f2a7e082 SHA512 e872c0c186725e35f84b691049f8689d5bfcc24da81a2e29719509933f3a1019427b84da86c1dea634b6c05890663c712dd2d66b4513d72642c3037ec38e338d
diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml
index 040cba5f7c5b..213251be9d00 100644
--- a/dev-libs/nettle/metadata.xml
+++ b/dev-libs/nettle/metadata.xml
@@ -5,4 +5,7 @@
 		<email>crypto@gentoo.org</email>
 		<name>Crypto</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:nettle_project:nettle</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index b0441f4752d8..cd3f643c573c 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -10,5 +10,5 @@ DIST nspr-4.21.tar.gz 1140741 BLAKE2B 9d6d079ac50c97ed7fff957e23506a24ab0d723cad
 DIST nspr-4.22.tar.gz 1078701 BLAKE2B 8b37031ffebf79320c91ce674d7c3a0cfbef25bfb006cb9aaff44f090110b35ea2768f83dae4a793723f8e2f3aecabc1a4b8042cd1b0ab0aade30781e43f9d62 SHA512 d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b
 EBUILD nspr-4.20.ebuild 3792 BLAKE2B 2f6c9e7d9cbe04da44e9e34e45c416d77d610d045fe3cce5e2c60c7655be78853bba9428a91a0dad388f6fc1e26876b26e0bab2d6495616c4941b8585aacba38 SHA512 5f2f0b397fb9dfd274b73e9026c4e5d6ccdae99f32c98a9fbb4497f87609d7e9afaaaf08cd0dd9dc8b21f8b63f91043988f7e2171cf26703447467314b4d6c4f
 EBUILD nspr-4.21.ebuild 3897 BLAKE2B dbc3e8d02f14a0c22e2969ce9cd0cf644c2ec290f247b9581dfcfff954e1d544c05e84968a6b8ee1690c778b975ad57395cbd1cdc2313ddc048ae100c00e715a SHA512 04c3a557fe7be670d98790c499f2a7e20606a1cfa8be64247669b40057244135e32e8da5a8bf6243b9fe7164b706cadd442d3d61b7e06676bc0b820d90b9f3a1
-EBUILD nspr-4.22.ebuild 3892 BLAKE2B 5633707738207a3a7b2dfcbb8798f2ad134f95f8a39e6f8619685e33b1acd5bcc3fa4784cceaf8225f7d5973caab467d79a4378c7399c8ec64bb08e6932d729c SHA512 0021005fde55f4c02782ad4f0ee5528e7df231e84e040503a1055fa42d4c09fb1db396108ae283a0096f4ddd34b24c16b4419c44fd9ed19d7a4878425a2337f4
-MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
+EBUILD nspr-4.22.ebuild 3890 BLAKE2B b728ab9595e38f2f314d9924906b0db4f8310a9f6ca600c251d5e6f6bc6cc3c8295235a279dc317c0dd5f66a59b708fb4ec9d393374ca90da9534ab5481b8b25 SHA512 6af9e856583ae709ff7cfaac08827d862834e9391e82fe493aa1a82e8864195076043c580192ad67e55be8fd093566679102b740468504e560afc3959314e6d7
+MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml
index d9b367ed3b93..cf9988e49a36 100644
--- a/dev-libs/nspr/metadata.xml
+++ b/dev-libs/nspr/metadata.xml
@@ -5,4 +5,7 @@
 	<email>mozilla@gentoo.org</email>
 	<name>Gentoo Mozilla Team</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:mozilla:netscape_portable_runtime</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-libs/nspr/nspr-4.22.ebuild b/dev-libs/nspr/nspr-4.22.ebuild
index bc218969f496..702de741da4d 100644
--- a/dev-libs/nspr/nspr-4.22.ebuild
+++ b/dev-libs/nspr/nspr-4.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 094bc78d59a7..93b29d042b0c 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -10,5 +10,5 @@ DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a941944
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.40.1-r1.ebuild 9501 BLAKE2B f743d2d9ec752b5c7bba215bef12c744ae91a92b547745c7d146f457e8ae3d805231643cd1579f7b0000e853305c94a2f26930f6b7009e0f79813cfb1962682a SHA512 b67cb7e84ac85aa5c74be19aca7186b1e082a3c0f736bf93ece7f8cbb310a40993bdc6d2d5aef64311de6e42ab6029c36acc4d8377500732b3a8358314f9a75c
 EBUILD nss-3.44.1.ebuild 9488 BLAKE2B 1e9068af29f3d798a4b7a47931e77ffa04e1e3b37c7cdac7c9a4d11a91ae2eeeee2c8f5d688952204c7a2235a020e05e97e5b2c266f85d09ee97a8c0998e911d SHA512 7df96c4826322101639975574cbc2c621cecd97e7b40641fff918c8283efd85b670c84feb02e3ccc7e47af6131f9841b19668afefb9219f975fd54acbda88088
-EBUILD nss-3.46.ebuild 9483 BLAKE2B 8a78fa10ea19489b4406e35ae63e8c66cae9c911b2275186c11b203cdefc36113b8fef9dbf4644e2600caf52309e7da6dfd9d8b65f9d5c101cfcde58408ffc20 SHA512 9c557ab24761ba2482ca3857989df10bd1a97d9c7181b79f1efb0279a037d221d129e4bef956abc57973928d81abb22c8c83473faa7606a7e95f7b5261793acc
+EBUILD nss-3.46.ebuild 9481 BLAKE2B 05c58b2fbc6525c4085db4fd3621bb91b7c74139511595a11964003247e7fea8d282c9d04668126ceb0a0a7bf97551ce2cb84a66ff8dcf25929e286e54210dc9 SHA512 8edf58eccffa289d9bc4177c0f7a2ac9454bda120d6af38c67e82958b23ed8ba2074aed8a9f6c1f0d74e4348bd9d6a7dcd21e4a18362ec9870c9a754023110f8
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.46.ebuild b/dev-libs/nss/nss-3.46.ebuild
index d9753ccde6c0..86bc756f0b90 100644
--- a/dev-libs/nss/nss-3.46.ebuild
+++ b/dev-libs/nss/nss-3.46.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 3da123099be1..5da5598bbaf6 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,7 +1,3 @@
-DIST onig-6.9.1.tar.gz 870525 BLAKE2B 8427b92670545e66deba35dfde0cb0ce346629a188c4adaa3025d0acaa81d2ffd86111be17419ea67b2d5f3fb4387aab0d8d20d70fb2f518ccc0ca165b66207d SHA512 5454c161d2d45f2c992513a695ff586ffa99e44a27d7ac5498370e200adb664bb02f2d8cd7d73e61d467f626d1a9b41d9e6e3051e1ea1a021624f94f7d52975f
-DIST onig-6.9.2.tar.gz 901931 BLAKE2B 93326408c7c9cd9c5053f14edd0e5fbf348a4da135146cfbff7659518686a83301b8d4111dbd65b834e201334871d9fa8202a8ed3cc4f793d444591e96071c74 SHA512 c10134e42a3c0b0eeae2027ffb7a3e1bcc9228dee286f6b6e997f8a73d717217fa74de0e19c40975d2e78044c8c4f029eb622f90c8eb4fdc4667eb4804e97001
 DIST onig-6.9.3.tar.gz 902349 BLAKE2B 4b20290a2d72b638b13a2e2edc89e072a8d17f89f6a273b58d0e408d01726ace948dd390bb2f4c478b87d01bed9fa344a4933060736a40981219301529957aaa SHA512 6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861
-EBUILD oniguruma-6.9.1.ebuild 967 BLAKE2B d33b2347afacdf230928fb427f582970b105eb5cbd893079172f9e9f9fa17f6e4ae31c03df4e967626ee573413f2668e3429b522285e00dcd1f72c3151664be0 SHA512 b0b2ca4be822fa8cd223291371e019ab023538c0dabf1300eb662e4d252a6ff05648200c1621e748965a80df80db46ec0e93d94e9d6925385c33c550ca9fa657
-EBUILD oniguruma-6.9.2.ebuild 987 BLAKE2B e328f16352bdbe51260a4b1aef78c0631f0f71aef036677ea73153f9e49709bc965a6943d04ca4702bc72b04dc819834f7a0381a37778d299acb17b667bab0d7 SHA512 11dbf5f9f1fc2cecf1d0c2500dbac1f3632330c6b8350b44dd33196aad6453e064718e6673e03c2bb011d18953bf24813cd32c1c54b88554269b37b4c4c16bef
 EBUILD oniguruma-6.9.3.ebuild 987 BLAKE2B e328f16352bdbe51260a4b1aef78c0631f0f71aef036677ea73153f9e49709bc965a6943d04ca4702bc72b04dc819834f7a0381a37778d299acb17b667bab0d7 SHA512 11dbf5f9f1fc2cecf1d0c2500dbac1f3632330c6b8350b44dd33196aad6453e064718e6673e03c2bb011d18953bf24813cd32c1c54b88554269b37b4c4c16bef
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.1.ebuild
deleted file mode 100644
index 83ded610f130..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.9.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2003-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/oniguruma/oniguruma-6.9.2.ebuild b/dev-libs/oniguruma/oniguruma-6.9.2.ebuild
deleted file mode 100644
index a8f178b9c387..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.9.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2003-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable crnl-as-line-terminator) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 6a7d4232ccc1..4e34601767aa 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -15,7 +15,10 @@ DIST openssl-1.0.2s.tar.gz 5349149 BLAKE2B 46c72dcceb5b473b129be0a895f3d6c25a24e
 DIST openssl-1.0.2s_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2s_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
 DIST openssl-1.0.2s_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
+DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
+DIST openssl-1.0.2t.tar.gz 5355422 BLAKE2B dcbc883151ff6c5b60f5849d8789c2e76a384cb3d5eb5f08a6109776d0edf134580dc33fa8b946ae2344542560f04ecef17f218406952dd8d31e4200c4882022 SHA512 0b88868933f42fab87e8b22449435a1091cc6e75f986aad6c173e01ad123161fcae8c226759073701bc65c9f2f0b6ce6a63a61203008ed873cfb6e484f32bc71
 EBUILD openssl-compat-0.9.8z_p8-r1.ebuild 4969 BLAKE2B 8258165c7a8deecf2cf15da2be35d3bea56c7d6df869d9188fb0ec73e684257704d0aee189d520d54f5396c5e34498476db0966178cd43ad5b6cb76c19a6384f SHA512 463d439e67494224e40638fbbd4b44760371e10d0fcaddf6b6419f0baac04046f3bf4ce0013616c8b42a8896f5395488e6faa008acdbe1669f8308b24c20fdcb
 EBUILD openssl-compat-1.0.2r.ebuild 8037 BLAKE2B 1f652836c93e4cd7a8b0211a26a1e0b22c73a30a64a5248cc9a251afd83af8cf6e54b7f0a6a53a9beb184c7638fd834eaa565361ee710461321fc733359e630f SHA512 263f9a96aff760c96061702478651cca50b91f331d29cec718aa0bcea9f993b6fb60e01efa521a3513da5157e2364022fea747e451166ada000b1fc43e06c1d8
 EBUILD openssl-compat-1.0.2s.ebuild 8342 BLAKE2B 601201d0b2d0f2091032235e8ee6a82495b21ad1b53cb8e4e89c7919d5402c780ebaa3d48a9e3f3aa69dc283abbdad2440a3278a06ddc1e2bfde0f0c7119e117 SHA512 c9b722ce8c1c4eaa4a1299e91608b4e984a811389b7c1c2fe1883fda8b9817bcf96cfcbd83e0df7f4da45850959d26aec7c6a380db17dd3db28aa2fb283b1f13
+EBUILD openssl-compat-1.0.2t.ebuild 7686 BLAKE2B f95b9472999c5fc6a5b87f7244486c34e58e12013c62cde61bcefd9edaa6004c3f7d69f16ce420c0d64eccbe1252792f84894fc9176391e503496dcb81b971ab SHA512 b82fe66341fcab1cbdb73102932169d6874bce62f0f8b00bf97aedb136b6a2660e645c34950f1e9e3ceb088e1b49787bcfd75af987b8a0933a32a03af9ba14b3
 MISC metadata.xml 967 BLAKE2B ed2fb20c832fbd18b7834f35e21072d419e8da5d88c165b7113a3835af1408f10e8c649dd2ccdffac35b6ed297320c18c0ae76b7a124fd3db6ab1a316f11c31c SHA512 12392dd6d10877fd78b8f54d6c51a5b5d50db3690fff0084112389a1ff3d28a0a37ec09262e4e817337eb04133877de8aa06f341bf9c96e73cb36c31e77f9e0f
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2t.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2t.ebuild
new file mode 100644
index 000000000000..717d2d311a8e
--- /dev/null
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2t.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
+
+MY_P=openssl-${PV/_/-}
+
+# This patch set is based on the following files from Fedora 25,
+# see https://src.fedoraproject.org/rpms/openssl/blob/25/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.0.2t-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/openssl/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/openssl/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
+
+LICENSE="openssl"
+SLOT="1.0.0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	!=dev-libs/openssl-1.0.2*:0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+
+RESTRICT="test"
+
+# Do not install any docs
+DOCS=()
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/crypto/ec/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake build_libs
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	dolib.so lib{crypto,ssl}.so.${SLOT}
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index e813bc72a4c0..3f348282d680 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -3,6 +3,7 @@ AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2
 AUX openssl-1.0.2p-hobble-ecc.patch 10875 BLAKE2B fc8240a074f8cc354c5ae584b76b3fc895170e026767d2d99d8bd5e5028614c861dd2b3c7b955c223883062f9a057ee302ae0deecfbbed00ddc53ae8a4d50919 SHA512 29f64bacac4f61071db6caf9d92131633d2dff56d899171888cc4c8432790930ff0912cea90ad03ca59b13ca0357f812d2f0a3f42567e2bd72c260f49b2b59aa
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
 AUX openssl-1.1.0k-fix-test_fuzz.patch 485 BLAKE2B 4dc2ef2b2c1935c8143c939ed6b7168fb070edced8ae47732f1ae9fdabe19887f846d75c15cea33680a54058c9a99f981a3c6a35fc84c3a6c360b4d2b920bc04 SHA512 68590479f096f3da920a5d293f27babd541ce1946944d5540f78d8341b59eeda92fe24743f7351b565e06421d7a2da77e331ebe1e5168023f6602aaa7376a038
+AUX openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch 1235 BLAKE2B 26997a474013c379a7d019d69203a5199ee17df07b28c86d06cebad3093ee62af9e4e568f3bc44ff4a5e8b555a5634d666446b35ce850c9c8668d920ef32bba6 SHA512 8ddfc077d3035b766175810b2554310935c8d1875044bf95abf8590ab5eeeb68357545566e7e8a50f95d9e62be68c72fdb58fef28497b154d44f08169645a08a
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2r.tar.gz 5348369 BLAKE2B 9f9c2d2fe6eaf9acacab29b394a318f30c38e831a5f9c193b2da660f9d04acbf407d8b752274783765416c0f5ba557c24ee293ad7fb7d727771db289e6acc901 SHA512 6eb2211f3ad56d7573ac26f388338592c37e5faaf5e2d44c0fa9062c12186e56a324f135d1c956a89b55fcce047e6428bec2756658d103e7275e08b46f741235
 DIST openssl-1.0.2r_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
@@ -12,12 +13,21 @@ DIST openssl-1.0.2s.tar.gz 5349149 BLAKE2B 46c72dcceb5b473b129be0a895f3d6c25a24e
 DIST openssl-1.0.2s_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2s_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
 DIST openssl-1.0.2s_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
+DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
+DIST openssl-1.0.2t.tar.gz 5355422 BLAKE2B dcbc883151ff6c5b60f5849d8789c2e76a384cb3d5eb5f08a6109776d0edf134580dc33fa8b946ae2344542560f04ecef17f218406952dd8d31e4200c4882022 SHA512 0b88868933f42fab87e8b22449435a1091cc6e75f986aad6c173e01ad123161fcae8c226759073701bc65c9f2f0b6ce6a63a61203008ed873cfb6e484f32bc71
 DIST openssl-1.1.0k-bindist-1.0.tar.xz 11716 BLAKE2B c491ba0899c44dbcc63f85b255548c439c965a20a04ac2a6324a4122c4691b7c95ec18e62be6d708a7ea62ea197d32e5091987cb5043969878f89e5bc26243d4 SHA512 1d5bc9d7b24cf55d32d996e2421d43a1218b605720293f00d07814afb481387856f0dc000ad3c3e4cba2361055668cfe79a945be44ab85a249555f37e683a909
 DIST openssl-1.1.0k.tar.gz 5287321 BLAKE2B fce40a399f5a08d5fe183dfcaab11b211d982885fb9888b25fa41bdd9919ecd203fca6f573363cfb42c9a0776ae69ea50b0f144227a3f28ca0dbadf878d396bc SHA512 65f41a240a97d79504c0e1391fde8ac8692f0993437cdc35e4bc964ecc36e5ef75a62499c4c6cb4ce63f892135e06dba2d3594c8869d935554296fa3c6ccd822
+DIST openssl-1.1.0l-bindist-1.0.tar.xz 13168 BLAKE2B 1fbd1f7bdba08f14e21485175232283c2309687021a526b4a132b676d7f9429577f8f14e180fb4f59ef24bc9c06873a6936e64559a901803a3f1d21453177b50 SHA512 f664a6876a2a9c7467bbc6a436593eb21cc6be51e08408657f34b67fa69cd6bece3cc65f60220d7e41f36b359b5299adf49a59ede7f8f738d6a31e29d2a49714
+DIST openssl-1.1.0l.tar.gz 5294857 BLAKE2B 0e4f30f9e8a22414325bd780dc4e875e962487fbe72967f0392ace959955429192541881a98d097d7bb75ed7238b1817b0c3c2c4da04421512bd538f2b07cdd7 SHA512 81b74149f40ea7d9f7e235820a4f977844653ad1e2b302e65e712c12193f47542fe7e3385fd1e25e3dd074e4e6d04199836cbc492656f5a7692edab5e234f4ad
 DIST openssl-1.1.1c-bindist-1.0.tar.xz 11964 BLAKE2B 8c5190846d13984589a150089d329bb3ecc613788b9462c6f6a1833a040e21cb9bf940140449f09fd797c0e396b0aea073237be374bd16097795b8974c3e7ce5 SHA512 249c6d8c455130b98e3be635f12f323e0cc349f1770648bad591e5de15483917185a473c162ed871a2fa05b47056931e6f12e5fdd9cecee7e6d1c246b862923b
 DIST openssl-1.1.1c.tar.gz 8864262 BLAKE2B bd157b244bedcefb8e646a743732945119b267236789ac69c38856570318aca09299bdaaea3f20294863b633e6fd4dfe124820597185b3b7461cfdf094daadb0 SHA512 8e2c5cc11c120efbb7d7850980cb6eaa782d29b4996b3f3378d37613c1679f852d7cc08a90d62e78fcec3439f06bdbee70064579a8c2adaffd91532a97f646ff
+DIST openssl-1.1.1d-bindist-1.0.tar.xz 13180 BLAKE2B 680bd7400d3dd3930067ee7efa9718b74b30afa9be2397ad80f88031920806b6603b6469beede02b6e7a742abf5f82ebdd7c9b8e69c1ffe223e4860dc9581128 SHA512 9e4296326852010d5cebc204d1a34a34198d8d65460bc91a2bd37c80be892a5ae519513e4b0109e6b51b6faab0e171ef6cdae868868c158711558d147083c06f
+DIST openssl-1.1.1d.tar.gz 8845861 BLAKE2B d3155f07b487ebd8dd4fe25396c874f9af18b5cfd7e622298d29c4f2c8ce14ad4534609d321314a4bcd0d44414e1306190340daaacd3c8fca061c04498446244 SHA512 2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7
 EBUILD openssl-1.0.2r.ebuild 10261 BLAKE2B d69c02146d892718a81ea97c6d946cdbef7fbefdfdbccc1590b961d1514d0c21e5b3f9d52a07465d0848cba20b9d5773092680e95dafb2233232b607582f9834 SHA512 8e5c8ecf64b9684047106fc07d9529f64f34782129975e1dff7777104dd18de66800a75f2cc30dea3d2079e2387843fa742fc470319f53c1bf6574798ddd8630
 EBUILD openssl-1.0.2s-r1.ebuild 10613 BLAKE2B f31ebad1aaef7aa81317c681315456874501e00f6f39f6c20e319a4365f4ec34d1c183a70d904dbe106aeb5f4503444cd63ead7cb73974c8fc5571ddba4fe0a3 SHA512 b53254e4b78fbcd48ab4d7cf3b43c5997e31a7487078e8534a18fc03af168f958793e5abd55db3b6a2ffc7baa397b461b588d2299f2a1192deaa5c0aafdeb6ac
+EBUILD openssl-1.0.2t.ebuild 9971 BLAKE2B 83d8f679cc26fba72329f33d3bf013c971a98cab355d2b1b3abe77f12294c734bd5a65ef25dced9122a3b70490d6a98ec168713946806f07241ebfe4a28e45ac SHA512 6bf6a508c87ede4ec0a326c2ef7de43e785c224284411e06603942a37dc0cfa3e4cff74237f550322f319a20c5b2f4e439bc2d8dd81087b4a691eb3971ac090e
 EBUILD openssl-1.1.0k-r1.ebuild 9463 BLAKE2B d04ca8cad9e3a763c606b88b66309a11c3f3d1b27af1870dadb258521f110e5d7e6b5482554ee3a00c5a92343542b411ebb084de338d751bd04ccd3afc69a9b4 SHA512 4be3b7b467ca52a35de64d7ec53bb414f67fa30953001a66503336ca32635e8d9d7682a1f15d60e627903bad8d5603c29398b418e263b638c58ff1ec0da42bfd
+EBUILD openssl-1.1.0l.ebuild 9601 BLAKE2B 37990d15c063ffbf5922bd3a4a195e5dd359bc8ccffe940376a80b3d2e5af694030e7bdf841e574f2d24f62f11d6427dfb2b926cb0f45f8387e51d4606907d45 SHA512 0eab2bde4858c9f74c4ae799ed2cd7bebd4e47edb6cff52e5b9487703287fa424e99f973d48b0a01d67b80fedfa7d03ddeb5be702877fc87da2b91bc18d53122
 EBUILD openssl-1.1.1c-r1.ebuild 9297 BLAKE2B 114347e74c4224d73956c4d9e333776da681690779a9e542422a9c15ac8bf624469ad337b3cbbde159b35474631de95a423f2ccdf20d3a2370d086b89fa24b10 SHA512 eb7bfe2b301769fc1e3118bf449c85f8af455c1e0252c3b574b426b4986ee1631581bbbd915c13f75ce9f1e1704f6ced048a0485dae69ba1aafb31f3aa455b65
+EBUILD openssl-1.1.1d.ebuild 9351 BLAKE2B cb70c810bc409ec11f2a1e92e3361b4f98c1976be3cfaee7a6d7c152d86f7505d5dceca7df3e93901d85926426aeefcc11d900f9f392d2da4aae0ae47b6863b6 SHA512 80bb6b67ebd60dd0fef87dd1d6f72ffae3371f7f7acb941069748ee2fadeee26a6702fd092a1a873019e7959e524217af89bdc1753bc4ae6590f41e2f84129f8
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch b/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch
new file mode 100644
index 000000000000..35a435df28bf
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch
@@ -0,0 +1,30 @@
+From bcf6a94c4bc912ad313ea21abdf7e83bbae450e5 Mon Sep 17 00:00:00 2001
+From: Nicola Tuveri <nic.tuv@gmail.com>
+Date: Thu, 12 Sep 2019 01:57:47 +0300
+Subject: [PATCH] Fix no-ec2m in ec_curve.c (1.1.0)
+
+I made a mistake in d4a5dac9f9242c580fb9d0a4389440eccd3494a7 and
+inverted the GF2m and GFp calls in ec_point_get_affine_coordinates, this
+fixes it.
+---
+ crypto/ec/ec_curve.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
+index 2d28d7f70bb..6a58b3a23e0 100644
+--- a/crypto/ec/ec_curve.c
++++ b/crypto/ec/ec_curve.c
+@@ -3200,11 +3200,11 @@ int ec_point_get_affine_coordinates(const EC_GROUP *group,
+ 
+ #ifndef OPENSSL_NO_EC2M
+     if (field_nid == NID_X9_62_characteristic_two_field) {
+-        return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx);
++        return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx);
+     } else
+ #endif /* !def(OPENSSL_NO_EC2M) */
+     if (field_nid == NID_X9_62_prime_field) {
+-        return EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx);
++        return EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx);
+     } else {
+         /* this should never happen */
+         return 0;
diff --git a/dev-libs/openssl/openssl-1.0.2t.ebuild b/dev-libs/openssl/openssl-1.0.2t.ebuild
new file mode 100644
index 000000000000..90f695879aa4
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.2t.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 25,
+# see https://src.fedoraproject.org/rpms/openssl/blob/25/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.0.2t-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/crypto/ec/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+		# $(use_ssl !bindist srp) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist srp) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		enable-tlsext \
+		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 V=1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake INSTALL_PREFIX="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
+	einstalldocs
+
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.0l.ebuild b/dev-libs/openssl/openssl-1.1.0l.ebuild
new file mode 100644
index 000000000000..09b9314d05cd
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.0l.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 28,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f28/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.0-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.0l-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+	"${FILESDIR}"/${PN}-1.1.0k-fix-test_fuzz.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+
+		use bindist || eapply "${FILESDIR}"/${PN}-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch
+	fi
+
+	eapply_user #332661
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# show the actual commands in the log
+	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared || die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/openssl/openssl-1.1.1d.ebuild b/dev-libs/openssl/openssl-1.1.1d.ebuild
new file mode 100644
index 000000000000..dfb4be45e239
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1d.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.1d-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+src_prepare() {
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 4a07c468d955..c559a0742143 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,4 +1,4 @@
 AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
 DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
 EBUILD pkcs11-helper-1.25.1.ebuild 1065 BLAKE2B 473c17885fe3d618fa8ffcc514d12af4bb21a7e38e7a0667be24f334d18b360d1d5f9e3bd36ac78ead70cb05e36acc618e56fba711e830ca1d574f5e7f0f39b8 SHA512 fac27eee74cc0a196297e167d7024e3cebca0d9da4b72bd82268df0ca62246546f4a42e75b39fc59e660f0b6d21254125ae2a5ecc165e207fd50dedc2a39b737
-MISC metadata.xml 442 BLAKE2B 83c40281896d78612f6e624c6335ade3b04be710debd1a8a40da1c569c84a66f6b61eceb07bc4f31d659d2ccc2d5c6fb6fa5ed3a22e5839656e210147a8ddc2e SHA512 ec42c4dd8aaba2001a76530f2cbe2869791f2d88c8ecaa323eb418ed6156751bb5cb143ecc1ba3901afcff42ba78ea099c42a3a2b3b8ae258bbaf9c8990116dc
+MISC metadata.xml 507 BLAKE2B 0931fc75f319958ede51838e6e22cc9eb99871b3bf3e1bebe2d635d6e1ce585f4fa723afd0b3a21c33e9545543e7d7d6b8b6f9e27e929b01d2c77b59ce2e41f6 SHA512 440b311a012774466333018e7000dc220fa8a0bba83bf7f8c54f2acd5d50939c827a5fc8105542da9c0a6087599387f3fefbb1458b31382127e597823c698428
diff --git a/dev-libs/pkcs11-helper/metadata.xml b/dev-libs/pkcs11-helper/metadata.xml
index 4a627dd9cc2d..5ee8a8c1f2a5 100644
--- a/dev-libs/pkcs11-helper/metadata.xml
+++ b/dev-libs/pkcs11-helper/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="nss">Enable NSS crypto engine</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:opensc-project:opensc</remote-id>
 		<remote-id type="sourceforge">opensc</remote-id>
 		<remote-id type="github">OpenSC/pkcs11-helper</remote-id>
 	</upstream>
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index d968b6c2f18c..4d632177fb57 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -19,4 +19,4 @@ EBUILD protobuf-3.7.1.ebuild 2943 BLAKE2B 896edce997fcecd5c16e03906333fce045a365
 EBUILD protobuf-3.8.0.ebuild 2886 BLAKE2B aed1935e60a5acaeaeca5c4ab77add62f5c9126f1eee7c381b8264cfa6c44c8fd9e85c4b130294f7d64158beddc049800dda753ef199557ffa6bc0b77a611278 SHA512 5eccdd3553e80e7dbbed882c7ff76c0580c6a52a13b2e39540781ef71c03959e3375e2d164705d9a1dccb9ddfdca19f515affff49ebdd46a322e41d5d64188c3
 EBUILD protobuf-3.9.1.ebuild 2896 BLAKE2B c893d4fd10dc19eb708804bb6c65ff9c349ead7e318e87a44aa6e6554ca8989227de888b5ff733d788ab2a425d1c6342f67ef549705559efddee8deb2fc2c69e SHA512 27e0441ce650a4981808dd5fd25b88ae33371e012be0e522635907bfce65e049d2095a14dcfed8c261d5c2ec3d3a34e0bb214bd133cefa5e5c28aa8c3be61332
 EBUILD protobuf-9999.ebuild 2720 BLAKE2B 2f45592f132b7758201e6c3125290ce4aef7728997cc64a325585679a81a92ae9eb5037a67c78eb762ab2490e7ddd4e174024b869d01b8629a31838fa0a52541 SHA512 0353bf1028af6eeae9689b7a08aa6e5726638c6a7e9472cf2fe4153c3c346222ec14e5a9c2627c1eff94a6e00c52a9c39c642ea05da082f53b87dd59787b2ffa
-MISC metadata.xml 426 BLAKE2B e4705957b7b549ca44bd4099f7ae592cc313604e00dba91d97887992e097e68beadbcb9cadca1a0f1c7da2a60d2fe844a79570db28d0606140d9204e73c739de SHA512 f7784ccfe1935b7946f0e4b25b1c0db457989f196b5551ab14e2b043549220260b29b014b6d330fd3ceb900490a2b87cb43a178dc45601e80ada30c6a0468fb1
+MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index ac91ac3eab9c..6858f31af628 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -5,10 +5,16 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 	<slots>
 		<subslots>Soname version number</subslots>
 	</slots>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:google:protobuf</remote-id>
 		<remote-id type="github">protocolbuffers/protobuf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 0d25490b2bdd..d19f8c1205e4 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -5,6 +5,6 @@ DIST spdlog-1.3.0.tar.gz 202637 BLAKE2B 97027a3672b826e294dbdc202afa913a42ddae5a
 DIST spdlog-1.3.1.tar.gz 202634 BLAKE2B 2465a8d1a38af1527ae66d92f5dd91ad504d01e44ac47702e315f7448e19f01743627357132f0561e48807315df9b102f337f95cab5a7aae3ec0ae7ceff940b9 SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd
 EBUILD spdlog-1.2.1.ebuild 775 BLAKE2B fce5764a6d61b2748a5463fa319f03832af4deb3fdf505023483a6a48adddd1dcdcc03b9c8b3b73532927dcae68a1a592c5fd349cfd6befd54e7281fadd4e883 SHA512 394dd8bd0ba20cae5d3c37b59135eef5d784b9fcbe3eebf652319df34b4ee499d91478d934e326aafb9a221ef0aa3b260d5d0b4d0935ebf88e7562f713e9b00f
 EBUILD spdlog-1.3.0.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c
-EBUILD spdlog-1.3.1.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c
+EBUILD spdlog-1.3.1.ebuild 799 BLAKE2B e9d1508a8c1c434e8d4fd4e372989c2b52bdf90ff7220fa35dd2d63d027f2fd7661c50bcb83a10558db3a30b1d0a2f98f524eb42177df143ef07f0ac13fb09e8 SHA512 d3a21825ee17b057048f8e756be28608e74b624d964238b0a9dce8abbf01b9268121d0f7b4a2913aa55c32a866849f1620cbd5ad99f38d832f719ea7df71a8b6
 EBUILD spdlog-9999.ebuild 798 BLAKE2B 5122612fce41d8c3bc09395ba99692900790ae51daf3a7f01ef30b0f228120c170395b2c9488286bb05a279e0a3f66d12deb98ce456b9e4d4b45947d44b09784 SHA512 9693c2549a926893acb2ac9dee57f18dcb0ba36cd7fa134195ecbdb7e711106c6db661a5fadfcb882e348d2620defd53d643c6d9816657361195604842adc005
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.3.1.ebuild b/dev-libs/spdlog/spdlog-1.3.1.ebuild
index 497e7da9b419..430086637b62 100644
--- a/dev-libs/spdlog/spdlog-1.3.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.3.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/spdlog"
 else
 	SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 0b3325b72c8a..9a5300f5960a 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -3,4 +3,4 @@ AUX tntnet.initd 669 BLAKE2B fbe3bd3fef3cc7519b26b1e15f1eb353c6d7afedcb59cc1a594
 DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
 EBUILD tntnet-2.2.1-r1.ebuild 1889 BLAKE2B 5205f1c8c547cad508c6c8528dd23001e57f90a25988f73fa892042c80c0a694cc81c442e8ed003afc988bf6d31c2c23e24586ee6b47b61c3b84e27c206c4667 SHA512 c74171d0347eeaa84b64c988c06ac40cbe56c0b5df2e55ab946ca10e1639ed96d1e2ea279d2229a8f3c29cbf3cb4823ef961ce3ec62f3681d72a57c19e4e8272
 EBUILD tntnet-2.2.1.ebuild 1817 BLAKE2B 07c9432256c041dc21fcfb6691f4fe4f07b0f694317119517c446f1169baa77f4eef14a7b4fcde8eef1300feb3b8d24748b099713af273a34f5b9af8ba1b82bc SHA512 f67099b4cac43aefd68a0d4f819bc9f9d4cbe825d03356e2587e2f0832d0423f60df9e8817f71fec61fd2339af3eaac70d83a8bbe6a1e36c3c27a4a3abcd4998
-MISC metadata.xml 555 BLAKE2B 89b58ae15701bd0e48eec8e3adcd99228f4a202b60b9904d04fa1b461c70f06876f36f2ad48b9f5596ca164f9eda7ca2617380503c427698c6a2ab1edc822c44 SHA512 060415a8e9aa8550ba30ef7f987ef5862e03fc9abd905eaec60715401279ed92d467b116cdce70626a3bfb3ca58d0d999611da23b09726a78ad47d553f97d4e4
+MISC metadata.xml 239 BLAKE2B f2ef9bcdc2a3034a37a49206e8f14b7cd40fbd0305562d1c642c37a55587e9d23bd32eebf28985ebbbb7553f57100fd09cbc107f5f66cb5300da6c2cd2b56edb SHA512 e6905ccc2f98e4c858d49f5e54b4de2762488fc33b9be4edf3d2419f4f1b3ca0db6ba64086198c731cd9e71df816a05ae579c2612d2751bcff808e3c4d3644f1
diff --git a/dev-libs/tntnet/metadata.xml b/dev-libs/tntnet/metadata.xml
index 7884d9df8a09..77d1be7cc249 100644
--- a/dev-libs/tntnet/metadata.xml
+++ b/dev-libs/tntnet/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">                                                                                         
-		<email>hd_brummy@gentoo.org</email>                                                                        
-		<name>Joerg Bornkessel</name>                                                                      
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="server">Enable tntnet server daemon</flag>
 	</use>
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 470006c9dce9..cf51d3186ba4 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -3,4 +3,4 @@ DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bb
 EBUILD utfcpp-2.3.4.ebuild 537 BLAKE2B cceb94f796696ab61bc98cf7ee4f601a0b2a2c528aed81d89ab3cae6f626868c1f33703e6e19785f35c9bf080716580764dd6f6b68a1a6ae7ace9264e1ed9c5d SHA512 5ab92460e7cc22c0d19c78a4632d12eaff02b9c2e0f985ab86dceefb3d73235012a7c037907d42ee956532d160a9775021d2c5c7cc5ffdb9aac2c834c395a4b0
 EBUILD utfcpp-3.1.ebuild 953 BLAKE2B 6a720484675821e5d573f61dc3ccaf8137cf81bc6e0f289a8f9b8db43cc5e2120c2e6c091ff3c3a31d254289a809592c6d16ee0c12bed69009e7acca81a9ad96 SHA512 e64e0dc995ce290ea855966f39f76814314e029ef6297a02a47a2033820b9b5ea2e1e0afb3da78a06550ce190e6cba11cfb416a83d6a0cb1691f1b737176d500
 EBUILD utfcpp-9999.ebuild 916 BLAKE2B 8a7a1e05ae84fbb8d875e0b7fb0558cfc0c9835090b0253343648d6d9c1833724f99de9b64702d1976a89f93bfdb38f36cf7c41979e73cae9a39bdf66338f5d0 SHA512 e7d512b80328c68fd6037d08796ea88ffabaf903d18e33ebed26253f03c5cdd02c050450a38980e23d83356c3bb30f90ecdba1c8125fb86f877c846c4bb33b01
-MISC metadata.xml 352 BLAKE2B 4ffd4d4fed2363f01b91b53dd2e869b6c49aa0bbddc249e7525b064df74e51528c193a5a987880ca2a3d20a13eba774498d220181d4f55ae262c8ac0e2867083 SHA512 bcd0d5ab729af171d91a6147ff7437f1627638a7d1f4e0c6501aaf6269d9912bca3ee8666dadd1d7037f06850468a40952ba97d572bcf846c38ac7b9273e6cad
+MISC metadata.xml 494 BLAKE2B 9e52a09505cc2bdae2fd434169a21ca63d48d62dd917bf2fcf15a54378b1894191cacc0c676705c731cbc05720723604b18c1bc982da036168d6b9bc184d1b71 SHA512 af81373c64b07a3650d3a613d0b260a55740ce140546db9f7b839c5b5b7f7b02abd85307e033a980da8a1182fcbc5182c0415a3bb8a89d3fdfaaee8eeb648612
diff --git a/dev-libs/utfcpp/metadata.xml b/dev-libs/utfcpp/metadata.xml
index 433cf52c3011..d25cf40411bd 100644
--- a/dev-libs/utfcpp/metadata.xml
+++ b/dev-libs/utfcpp/metadata.xml
@@ -5,6 +5,11 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">nemtrif/utfcpp</remote-id>
 	</upstream>
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 05d1b9689711..e74a78cde73e 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,9 +1,9 @@
 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
 DIST vala-0.44.7.tar.xz 3355928 BLAKE2B 172e9fee6edec63324b9babc125d2bdb53c2025b2cb86339b54a4c8017ccdf78a848076fdd6a8f5200c15c48864542d711896160f78790d36a29d30980177d34 SHA512 5a645e1b1929644ec6b53d06895afcf62d41d6fd63f82c3be3aa4e28847173071621ec857cb973df38d36e60eb960954c2fb48fb4189e1afcbb25a2376ff0d77
-DIST vala-0.45.91.tar.xz 3358640 BLAKE2B e51e1e30042cce60f58f9c63698222d40e719f2cd9258d264bdffc2226cd0c126dc0c256d557a2bc600cd2c0cd9f1f55987f9e96ac666d9d57fdd7b1501afb1d SHA512 7bddbd0d711b50154be6e6d3ebe0576c3ead0f533a0b177c3eb181555eb3d096353157cc490b49c9453686e765739283e30d3881652a9bfb82baeed9be4817b6
+DIST vala-0.46.0.tar.xz 3362148 BLAKE2B d0263aeaf19477e1f511004456f8ac575a7de406179fbf152d2e8c31cebc70570fa4072102007aa57f5a019a340401a2b0610c027c987bc10bafcd9dfdad7fff SHA512 d7d31926936251054b66c3e53df264bafd0ee56c4c2168bc77eea3308d80a0b5b250eb4cd3df31a4cbef8b1954a47ce70655629910e071bf5b46ada47aface2d
 EBUILD vala-common-0.40.14.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
 EBUILD vala-common-0.42.7.ebuild 2518 BLAKE2B 79889f31651bf8044e066f1275ca2c7b931a10f7a1dbe9985d945ad5141b388b13bb9e27dd2bcc508ab83f63ba63efca7d529ed1eb505c1397a4e00465b58a54 SHA512 0c264a16df1c0bfead6d1edd4967ba7d0ffeff3f4f506b6bc210b0d2db807d8986c286560baa83335412388a00fdb7841718c3e9cadb42e51427e1dcfc9940d4
 EBUILD vala-common-0.44.7.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
-EBUILD vala-common-0.45.91.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+EBUILD vala-common-0.46.0.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
+MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/metadata.xml b/dev-libs/vala-common/metadata.xml
index 39980802b1da..243d9d0d89c3 100644
--- a/dev-libs/vala-common/metadata.xml
+++ b/dev-libs/vala-common/metadata.xml
@@ -5,4 +5,7 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnome:vala</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-libs/vala-common/vala-common-0.45.91.ebuild b/dev-libs/vala-common/vala-common-0.46.0.ebuild
index 5d6856bd6561..5d6856bd6561 100644
--- a/dev-libs/vala-common/vala-common-0.45.91.ebuild
+++ b/dev-libs/vala-common/vala-common-0.46.0.ebuild
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
new file mode 100644
index 000000000000..5e0fad397904
--- /dev/null
+++ b/dev-libs/voikko-fi/Manifest
@@ -0,0 +1,3 @@
+DIST voikko-fi-2.3.tar.gz 694602 BLAKE2B 454afaa76be00645b8640f84c2c91ed0b31be5b46c98d31bba0f4967dce27919eee6a6c452941b3878b498c7f913a413a3d143d658bc38da2a07b32d876ac317 SHA512 b3478cbb6aecebcc25e1c4bce0881a657d664c11190a22c1c2c4ca7e7c62b4c4fd5d396718fbadc8c5ab3c9db5d4349d6cd81440a1394cf4c2f77c52ae608018
+EBUILD voikko-fi-2.3.ebuild 695 BLAKE2B 6d1f636c6195ff077904553e0af107310dc4c7c9a81d62c6783c08530d3e6fd3c346b041866f7e0f70144f0fb7b112aa72c48c1b0c4710b591f1fb162da790e1 SHA512 e10ff8100d3de6fc3efbefdbae5382f196cff741da5fa54130c31993d4a077864f11765a5939ad7f184d0a7370089de720203fa117f3430e0680dfed52206278
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/voikko-fi/metadata.xml b/dev-libs/voikko-fi/metadata.xml
new file mode 100644
index 000000000000..6b0a0fb3a729
--- /dev/null
+++ b/dev-libs/voikko-fi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
new file mode 100644
index 000000000000..e267dbf7a4c5
--- /dev/null
+++ b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5..7} )
+
+inherit python-r1
+
+DESCRIPTION="Finnish dictionary for libvoikko based spell checkers (vvfst format)"
+HOMEPAGE="https://voikko.puimula.org/"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/foma
+	$(python_gen_any_dep '
+		>=dev-libs/libvoikko-4.0[${PYTHON_USEDEP}]
+	')"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake vvfst
+}
+
+src_install() {
+	emake DESTDIR="${D}/usr/share/voikko/" vvfst-install
+	einstalldocs
+}
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 1f358a0d5a3d..590fce80d856 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,11 +1,7 @@
 AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
-AUX xerces-c-3.1.4-fix-build-system.patch 2080 BLAKE2B 02e67cf0c737c30405b967619aa8deee0c1f1c8b9635265226b111ca729b23bcc1bb1d094ba3342269051cb9a819b281b0985d2c1785bfa524f3844b29d65636 SHA512 38ec4237425e63aaf00e4b969ad0c478bb788b803272f7406f38ea250e5ed1ba4e78f061959fbe180956058d1d7f3b56d31451450872809999b2c6be29add4dc
 AUX xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596
-DIST xerces-c-3.1.4.tar.gz 6992545 BLAKE2B 463e721843632b13f4b5c845f14cf9ab4f093085558858b435ae5a3122951ab590f9e56f43add1aeaf7dc244814710be804ab0331a1d1e8073919ad9d3b61068 SHA512 8afd775bac0345a2714b77a1ae2cfb8ae67f0239ec7370de7d89612dec64d2e1df48612c875fe239ab6f2eb31914c2d3914617e6b34a1bae0bbb14e4dbc787b5
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
-EBUILD xerces-c-3.1.4-r1.ebuild 2824 BLAKE2B 07765e9c4ab0af4f1eac7b3630faee0b5c4eedf4d48e3934e69ef24554ec2fcb5bd354404e1ad4c99c5260519002c2bba6d994303a9eec80938a30c7141140c6 SHA512 0bc0fd5c0b5bf2346700ba8435fe3fd48f08494166494d1ff5c36a0f348f563ba972100a7095583ff5f4569262d515a15ea6fa5e83468572179215d1f99aa5b7
 EBUILD xerces-c-3.2.2-r1.ebuild 2956 BLAKE2B 00df5adb4b7200a4bf69549d7f317116d962e5a4631d02c257b12d44b035c05a026aec628eb9ef538a135173889fab37dcc0382f7fddef36c0692f8dc90f8110 SHA512 911ba0ef96cc8f5ecc6ef4e72cf3c8e7829bc2f2c97d14ad1b9323b382d3c0588e694041bd8d7e36d3064bc6b415af896e80f8f1543ff344ef338aca54a185cf
-EBUILD xerces-c-3.2.2.ebuild 2759 BLAKE2B 6bb440b553a8e3766b5aabd52cbd4da8ead25c04d4c0ed77d9131dac911eb1e3156bab6be73cc20a951224c65d87e4320d0bce0327ca634ab90a1a5de2169ff8 SHA512 0784c58a373d2ae567de3a6b6582199c893f89ef5bb584a90876ada3cce88d0fc4d761b2a516ee47d815d9be23c73eb455a9189fa41bff1ffe6f425ece83b805
 EBUILD xerces-c-9999.ebuild 2868 BLAKE2B bd1be084d8090c1538260577ab8e89ec8aaf9abbf83c5c8fdaa046e2e44daf0acc996deafc832ad2635043cce5642a5b350223a58a7bb34e0bd4321a1e7893a1 SHA512 d1261c22979dffe67756acfac50fe395d98b56836f246e40acce0aeba1d0b79a8c5fc5d7cb54eff355f848d40aebd9fa36b3829ab00928193739a7823e7672d4
 MISC metadata.xml 768 BLAKE2B fabc57ee82dc82444461b1ec25ebda2af68a8eb00c6f44cc24de70daf96fd245acafc04d1bb75ffbb780e1b0877d7862a119264b81402df2e9c2f20ff252a166 SHA512 e447b67df2d7e7c3fb7cddc1dfeaf7c4da734ba71b1b0138abf63f8d0c5c42d0f2dd8cf6a281d4a88da32f4c073d81fab91f3fbca92d50d6bc9855a64814784f
diff --git a/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch b/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch
deleted file mode 100644
index 6b991d24b56f..000000000000
--- a/dev-libs/xerces-c/files/xerces-c-3.1.4-fix-build-system.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-* Fix build system when USE="-threads"
-* Add DESTDIR in order to prevent sandbox failure
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -124,6 +124,7 @@
- AC_CXX_HAVE_LSTRING
- 
- ACX_PTHREAD
-+AM_CONDITIONAL([THREADS], [test "x${acx_pthread_ok}" = "xyes"])
- 
- # Checks for library functions.
- #AC_FUNC_ERROR_AT_LINE
---- a/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
-+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
-@@ -5,7 +5,7 @@
- prefix = @prefix@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
--mkdir_p = @mkdir_p@
-+mkdir_p = @MKDIR_P@
- 
- include $(top_srcdir)/version.incl
- 
-@@ -48,11 +48,11 @@
- # for installing the library
- # for installing the library
- install: $(RESTARGET)
--	$(mkdir_p) $(prefix)/msg
--	$(INSTALL_PROGRAM) $(RESTARGET) $(prefix)/msg
-+	$(mkdir_p) $(DESTDIR)/$(prefix)/share/xerces-c/msg
-+	$(INSTALL_PROGRAM) $(RESTARGET) $(DESTDIR)/$(prefix)/share/xerces-c/msg
- 
- uninstall: 
--	-rm -f $(prefix)/msg/$(RESFILES)
-+	-rm -f $(DESTDIR)/$(prefix)/share/xerces-c/msg/$(RESFILES)
- 
- 
- # Needed to support "make dist"
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -21,7 +21,7 @@
- 
- check_PROGRAMS =                                ${testprogs}
- 
--LDADD =	                                        ${top_builddir}/src/libxerces-c.la
-+LDADD =	                                        $(top_builddir)/src/libxerces-c.la $(PTHREAD_LIBS)
- # the  -I${top_builddir}/src is needed to pick the xercesc/util/Xerces_autoconf_config.hpp 
- # header file when doing out-of-tree builds
- AM_CPPFLAGS =                                   -I${top_builddir}/src -I${top_srcdir}/src
-@@ -86,8 +86,10 @@
- #                                               src/ParserTest/ParserTest_Parser.cpp \
- #                                               src/ParserTest/ParserTest_Parser.hpp
- 
-+if THREADS
- testprogs +=                                    ThreadTest
- ThreadTest_SOURCES =                            src/ThreadTest/ThreadTest.cpp
-+endif
- 
- # Fails to compile under gcc 4 (ambiguous calls to NullPointerException)
- # dcargill says this is obsolete and we can delete it.
diff --git a/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild
deleted file mode 100644
index 7ccfabeb38f0..000000000000
--- a/dev-libs/xerces-c/xerces-c-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools prefix
-
-DESCRIPTION="A validating XML parser written in a portable subset of C++"
-HOMEPAGE="https://xerces.apache.org/xerces-c/"
-SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
-
-RDEPEND="icu? ( dev-libs/icu:0= )
-	curl? ( net-misc/curl )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-lang/perl )"
-
-DOCS=( CREDITS KEYS NOTICE README version.incl )
-PATCHES=( "${FILESDIR}/${PN}-3.1.4-fix-build-system.patch" )
-
-pkg_setup() {
-	export ICUROOT="/usr"
-
-	if use iconv && use icu; then
-		ewarn "This package can use iconv or icu for loading messages"
-		ewarn "and transcoding, but not both. ICU takes precedence."
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local msgloader
-	if use icu; then
-		msgloader="icu"
-	elif use iconv; then
-		msgloader="iconv"
-	else
-		msgloader="inmemory"
-	fi
-
-	local transcoder
-	if use icu; then
-		transcoder="icu"
-	elif use elibc_Darwin; then
-		transcoder="macosunicodeconverter"
-	elif use elibc_FreeBSD; then
-		transcoder="iconv"
-	else
-		transcoder="gnuiconv"
-	fi
-	# for interix maybe: transcoder="windows"
-
-	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
-	# But the docs aren't clear about it, so we would need some testing...
-	local netaccessor
-	if use curl; then
-		netaccessor="curl"
-	elif use elibc_Darwin; then
-		netaccessor="cfurl"
-	else
-		netaccessor="socket"
-	fi
-
-	econf \
-		--disable-pretty-make \
-		--enable-msgloader-${msgloader} \
-		--enable-transcoder-${transcoder} \
-		--enable-netaccessor-${netaccessor} \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable threads) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd doc || die
-		doxygen || die "making docs failed"
-		HTML_DOCS=( doc/html/. )
-	fi
-}
-
-src_install () {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		# clean out object files, executables, Makefiles
-		# and the like before installing examples
-		find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \
-			-o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die
-		docinto examples
-		dodoc -r samples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# To make sure an appropriate NLS msg file is around when using
-	# the iconv msgloader ICU has the messages compiled in.
-	if use iconv && ! use icu; then
-		doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")"
-	fi
-}
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2.ebuild
deleted file mode 100644
index a7d0dd1ec9bb..000000000000
--- a/dev-libs/xerces-c/xerces-c-3.2.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils prefix
-
-DESCRIPTION="A validating XML parser written in a portable subset of C++"
-HOMEPAGE="https://xerces.apache.org/xerces-c/"
-SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
-
-RDEPEND="icu? ( dev-libs/icu:0= )
-	curl? ( net-misc/curl )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( dev-lang/perl )"
-
-DOCS=( CREDITS KEYS NOTICE README )
-PATCHES=(
-	"${FILESDIR}/${P}-fix-XERCESC-2161.patch"
-)
-
-pkg_setup() {
-	export ICUROOT="${EPREFIX}/usr"
-
-	if use iconv && use icu; then
-		ewarn "This package can use iconv or icu for loading messages"
-		ewarn "and transcoding, but not both. ICU takes precedence."
-	fi
-}
-
-src_configure() {
-	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
-	# But the docs aren't clear about it, so we would need some testing...
-	local netaccessor
-	if use curl; then
-		netaccessor="curl"
-	elif use elibc_Darwin; then
-		netaccessor="cfurl"
-	else
-		netaccessor="socket"
-	fi
-
-	local msgloader
-	if use icu; then
-		msgloader="icu"
-	elif use iconv; then
-		msgloader="iconv"
-	else
-		msgloader="inmemory"
-	fi
-
-	local transcoder
-	if use icu; then
-		transcoder="icu"
-	elif use elibc_Darwin; then
-		transcoder="macosunicodeconverter"
-	elif use elibc_FreeBSD; then
-		transcoder="iconv"
-	else
-		transcoder="gnuiconv"
-	fi
-	# for interix maybe: transcoder="windows"
-
-	local mycmakeargs=(
-		-Dnetwork-accessor="${netaccessor}"
-		-Dmessage-loader="${msgloader}"
-		-Dtranscoder="${transcoder}"
-		-Dthreads:BOOL="$(usex threads)"
-		-Dsse2:BOOL="$(usex cpu_flags_x86_sse2)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
-}
-
-src_install () {
-	cmake-utils_src_install
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		# clean out object files, executables, Makefiles
-		# and the like before installing examples
-		find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \
-			-o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die
-		docinto examples
-		dodoc -r samples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# To make sure an appropriate NLS msg file is around when using
-	# the iconv msgloader ICU has the messages compiled in.
-	if use iconv && ! use icu; then
-		doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")"
-	fi
-}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index e1d68c040627..85143b0f0815 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 21226e3a024d..85dbf81d39ed 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,5 +1,4 @@
 AUX proxy-fix.patch 1026 BLAKE2B 6dde53833c9b35e059a4c1e7052cb494b4e1ceb2dc496a2d090e80fc2a1bfd1a30d014bb4c9f04425665cc00faa29fd434077a13e54cb73af0699363602e3aab SHA512 8b1b440936eceea4352876b24099bd9250c28c78a104f3722a65690a756f831f025257d940f1d9189e8ac023ab4b226b16c901214de59306bac96353a5adfe12
 DIST luasocket-3.0_rc1.tar.gz 328598 BLAKE2B 9cc382d909cfa018edec237ac901220cccb0cf0e3a775b9cd8083487ace42a94dfd280f9423097f677f37ee9f85afcfff844250cd49c0f813b7c50c3adc532c5 SHA512 f6efce259aaacaa11472911471f8a13b118fe009b8953a82c6aa18b9ec829cd1293180904e56935cb130d36d267e3f27c91db2d78e03f7488f3e100571ed0540
-EBUILD luasocket-3.0_rc1-r3.ebuild 1107 BLAKE2B d7a6263f58f3db82491a132ce44e033c9db857eaedbafe3b015be1bff86073c58b932c072d2cf3c213e6a5bd003b0267cfa7ab6ef2e73c22aa402b379a20b73a SHA512 f85177c0f36e3dec2c7c2a92d0d31034877214bf4cb848901b04868321e5fed64b6b2b123dce3815be0f726975a3a074647f2fafd9dff893212bdc2a76a8f631
 EBUILD luasocket-3.0_rc1-r4.ebuild 1170 BLAKE2B 3ae83f64857c2556470d6bde7e873efe05dd872034cd6cdd2243a70b41aeff62d7f10a4d463bbf0e3743a09432cc0148c2040e9d64ea587710e2fd2e6b8d6b4c SHA512 b9c6ff67e1f1f26839bf1ecbfbcf2c472d7e8dbf9ef3d4491528bb6a75c4251f87c279f98017e0ebc6e268b3ce2d7e54eb782053713997fa08d55749d9bd842a
 MISC metadata.xml 257 BLAKE2B e834a8237ad7c56f7e94a41c634fd0bb34b3c6e21b04ecafb2394839ee3bec0b0d5ee3cdcb43f358894156aacbdc6566092e6f1a4034573b117cba3368214b97 SHA512 a14f4fdf4826065cc3c5bba386e790d97d31a4e5eb042d269bdc56c9d6122bd2d3322971a6ce7431e860538af861e675a57afd9fa100e63d6c35d36c68aacf7e
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r3.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r3.ebuild
deleted file mode 100644
index b2b42fd1b64b..000000000000
--- a/dev-lua/luasocket/luasocket-3.0_rc1-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib multilib-minimal flag-o-matic
-
-DESCRIPTION="Networking support library for the Lua language"
-HOMEPAGE="http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"
-SRC_URI="https://github.com/diegonehab/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="debug"
-
-RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S=${WORKDIR}/${PN}-${PV/_/-}
-
-RESTRICT="test"
-
-src_prepare() {
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		CC="$(tc-getCC) ${CFLAGS}" \
-		LD="$(tc-getCC) ${LDFLAGS}"\
-		$(usex debug DEBUG="DEBUG" "")
-}
-
-multilib_src_install() {
-	local luav=$($(tc-getPKG_CONFIG) --variable V lua)
-	emake \
-		DESTDIR="${D}" \
-		LUAPREFIX_linux=/usr \
-		LUAV=${luav} \
-		CDIR_linux=$(get_libdir)/lua/${luav} \
-		install-unix
-}
-
-multilib_src_install_all() {
-	dodoc NEW README
-	dohtml -r doc/.
-}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 2422ef7e44f3..d0476c927dc1 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 4ae08e8e09e7..db5ed9064878 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,10 +1,8 @@
-DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 EBUILD llvm-ocaml-10.0.0.9999.ebuild 3427 BLAKE2B 564a2cb3536eeea489412f3070a201a0af07041083f35ec1c9778cc93692f1f6a77744decbd7e52c9c0919772cf73dbe2add337de4eb27460a1ad2831e30c3bf SHA512 7973ab1016b9cead0784f4ce04e3394caa94b2a017e64f8af68b910acd29affd467835591557ee3fc22c218e0e0b5168d61b861f6978d234b372043f0469288b
-EBUILD llvm-ocaml-5.0.2.ebuild 2957 BLAKE2B 66d6e022870116b4be40bc20706694a479577bd29b3e429d492333e7a7a3590fa1ba02397d1e76e5aba06b7b5813c69520c46e53c775d79c0b311ccc9e4d5edd SHA512 0019b664dff97399015abf4ab56c4bd7152185f9e894bff674adf095ff5ef87ba1c86f81cc8c424a229a9e84769c0a622b97c346e478cf8442defc4a60aee36b
 EBUILD llvm-ocaml-6.0.1.ebuild 3121 BLAKE2B dca92122927a7fd4c8e3213f85393e134f194ddf51f436ac2dacef59585d340fd27e6ac77bb3b9306bee3560f998805abe06a695664d6f50920c250dce413147 SHA512 e328f56e4eb855be1528a4e5fafb4ef7ddaf23592369650fdb275b3a59a7fd318c9384cf93d0d4da46403ae9ceac409a1668db76f21a9662783e6666eabc89b8
 EBUILD llvm-ocaml-7.1.0.ebuild 3121 BLAKE2B dca92122927a7fd4c8e3213f85393e134f194ddf51f436ac2dacef59585d340fd27e6ac77bb3b9306bee3560f998805abe06a695664d6f50920c250dce413147 SHA512 e328f56e4eb855be1528a4e5fafb4ef7ddaf23592369650fdb275b3a59a7fd318c9384cf93d0d4da46403ae9ceac409a1668db76f21a9662783e6666eabc89b8
 EBUILD llvm-ocaml-8.0.0.ebuild 3133 BLAKE2B f39bdfe95cddd3d162b607a72b05d5fbeccd71dc573a5d95525619dfe89352cac9d47537f7edb1a74013ebd0397ab57d8da6bf605a4685e1e49a537881c65eb8 SHA512 403d99d7d8aac24b5c0db11a9402af8c99b6b7cf9e2caec0c900a632b904558c64c86364883c460c68cb2d814fa2b13bd983b8c56f906c957a57e0d83b44677f
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.2.ebuild
deleted file mode 100644
index d21c45f2aac3..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm python-any-r1
-
-MY_P=llvm-${PV/_/}.src
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
-	!sys-devel/llvm[ocaml(-)]"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-ml/findlib
-	test? ( dev-ml/ounit )
-	!!<dev-python/configparser-3.3.0.2
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DWITH_POLLY=OFF
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild b/dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild
index 8537a33f1edb..2fe26106901f 100644
--- a/dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild
+++ b/dev-perl/Alien-Build/Alien-Build-1.790.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Build external dependencies for use in CPAN"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="test zip"
 
 # No, pkgconfig is not suspect, it actually uses it at runtime, and this module
diff --git a/dev-perl/Alien-Build/Manifest b/dev-perl/Alien-Build/Manifest
index dd63cd8d6869..0b883732ac9a 100644
--- a/dev-perl/Alien-Build/Manifest
+++ b/dev-perl/Alien-Build/Manifest
@@ -1,3 +1,3 @@
 DIST Alien-Build-1.79.tar.gz 266020 BLAKE2B 265a42ea001b2adad24c3f8164bf795da9923f02e95440ae1bc52aa60a1dd06e48d888b4af5deb3f9b9911e9092117f51bc09c420d690cabc454b21505746030 SHA512 8b270ec1b914aead651c81d2c513496e31bfa6086c0e5731e6ada17079ede868d65a7c70e29a0762f65ba8c120fd605662122de7f9d715b726be4a503b552808
-EBUILD Alien-Build-1.790.0.ebuild 1014 BLAKE2B 88c5e3e9340d8519d1a79da3b9d167ca22f5ff5726607adf7392472a05d4caff951c8cf888572bffe2347bcaaf98fbf4ea15f10c9e6995c331129d1b40337f68 SHA512 a318d24ae4093a5040cde25b65f5c46c33a7f23d8716e182005226878c32d0a05d919f15f25a2d118a8fcadaa957f0fb1e210e3b42183cdf06910af33bcbcb07
+EBUILD Alien-Build-1.790.0.ebuild 1021 BLAKE2B 28abbb80fde8c29f749192988213948a8f6e4b8104c68bb04a99fb8cf0e1dec84a42173c4f4655f1df67536f09e42c5a03b0e19d59e48083cef5bcb459e9b923 SHA512 89a9712bbf34995ac8ec51b4f5d1fa77056490edceeea38f9f410801ae23af3ba58e8ee1c43c4bd5dd04166f803d00d6b02a7927514324b1797fc43f983e5b1c
 MISC metadata.xml 5500 BLAKE2B 22e2bf88f892631852e0880c783cdce925f2ad820a9cc58e84c1a5378d12367ba7760358977f5f717d5cb413cc368133e6cdb46f178c7fa19eaa1740763744b4 SHA512 067d83118afcae2b51e8f9b1d942a4f7aa635cff9298980f99c28fd09eb60d7e552f0f16730ccb599975afcd47a1c34704f85956e1ed4b7fdb260d34122be77e
diff --git a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.90.0.ebuild b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.90.0.ebuild
index 3e4d75499849..39ee35f9b04c 100644
--- a/dev-perl/Alien-Libxml2/Alien-Libxml2-0.90.0.ebuild
+++ b/dev-perl/Alien-Libxml2/Alien-Libxml2-0.90.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Install the C libxml2 library on your system"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Alien-Libxml2/Manifest b/dev-perl/Alien-Libxml2/Manifest
index cf48200f6bb4..81c671185284 100644
--- a/dev-perl/Alien-Libxml2/Manifest
+++ b/dev-perl/Alien-Libxml2/Manifest
@@ -1,3 +1,3 @@
 DIST Alien-Libxml2-0.09.tar.gz 18222 BLAKE2B cbea923d5e736dc274f751f190979839462237d0f3ab6b81c6de8d3331498a624294448f71ec8d200aa07af0a40871e737de67c1c956a1742238bad3a3097fa0 SHA512 30cc1ca4e4b7be1b6e14b4f1a1f0d06b1435da55dc2f2bd1d3e9ed5cc0a2034f8acf8ab4b3548f2a5bda3aaaa56bcf4d63129aeb9e72b7c2e160d0fb2dbedb02
-EBUILD Alien-Libxml2-0.90.0.ebuild 562 BLAKE2B 18ede393f4da9f28384fb1d045d34bcd4d79e937c02554d434908469db20f1b725e7c07d528ef6eaad8e6495d8f217f624a528c025d8d144e06ce2aba7aa50bc SHA512 82c2c9ca8e0e8bbc8d646972ae35718ba16805fcd76366da5a15155e9cebb76a5f45ab598283a06042092ec26bd8c790744752fc231fa92c95ed032cda7750a5
+EBUILD Alien-Libxml2-0.90.0.ebuild 569 BLAKE2B 1457a2de43da19de8e1dbebe7d9bbb9cb92b2aa0782a0193ea977263e854bd71e84a56470e565cae6b61e40f584c114438323e1629eed17bd235381396cb470b SHA512 44b9c0a4c51eabe27b4d74944792fab2532c54ee6d5acfcf0387a5d639b59e84523d176ab71284ba33d0b673f45bbdbe6403024c464d880d5460c972d328e20f
 MISC metadata.xml 398 BLAKE2B 573fb504b4eec6a5e7768737ea93806ae4bc6208333e12d20cce0d26ce0388744d8a85f5ccf74665d37698688bbaf3d7c7a02475b54985e07f21f384f895ddd2 SHA512 92051468292aa25af81ada3e1482231921087d51be86df605c843a32de4ecbe42606da3abfca48f86d19111c2b4d486d65e867be8f3dded6b1e8bc764991c787
diff --git a/dev-perl/Devel-Hide/Devel-Hide-0.0.900.ebuild b/dev-perl/Devel-Hide/Devel-Hide-0.0.900.ebuild
index 32c2b32cd8fd..9efa3b5c2497 100644
--- a/dev-perl/Devel-Hide/Devel-Hide-0.0.900.ebuild
+++ b/dev-perl/Devel-Hide/Devel-Hide-0.0.900.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Forces the unavailability of specified Perl modules (for testing)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv ~s390 ~sh x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv ~s390 ~sh ~sparc x86"
 IUSE="test"
 
 DEPEND="test? ( virtual/perl-Test-Simple )"
diff --git a/dev-perl/Devel-Hide/Manifest b/dev-perl/Devel-Hide/Manifest
index d4b027548fc9..3752e1ee3e45 100644
--- a/dev-perl/Devel-Hide/Manifest
+++ b/dev-perl/Devel-Hide/Manifest
@@ -1,3 +1,3 @@
 DIST Devel-Hide-0.0009.tar.gz 6972 BLAKE2B bdca209a8480c9cbca8206ececcda24a2e7f02b41bdc4aa6a998320ca49fb00374f8d23fc105aeee379b50b7f98e2f92ec45d3c752c299377786c19ddd2b2788 SHA512 c1cceb186de73f22132b2b9a16f75389b33b675aaa50c5095615f6f7c22fd0bad9edaf1d66d1cfbec6d536c93583b17a512bcae73310ac6a854e0c98c2ff6a9c
-EBUILD Devel-Hide-0.0.900.ebuild 502 BLAKE2B f48d8b63f41873e8251d179632718260062bf7238ee493554205e21c18304c5756c81ec0a16e6069f78c13dbafb6055afa60144a3fc794f0eb588ce12021a66d SHA512 068b8557656c71878558f8fdd245fa71279cb4c6e41f40633d44eba4d6cb92ac7b650d0a3ed67078f6fac9ca0a4bde49f94b9239a8077687d1bfe92926fb79e0
+EBUILD Devel-Hide-0.0.900.ebuild 509 BLAKE2B e4a85042948bafbce39e9d82fdbe4b9cc744248a112e003613dcbd2cefa02dfa4ec778f0100483490c7788f05bf909c159a3fed1bfe51fadeaea18a6256ec77f SHA512 56d1c27dc3ce9de9e2abdffd3891ae130b7292e152fca0cc5edee22f27065513cd445b345a0502fc172e6946e3784f3366321e2cc5172783f3c25a36dd965709
 MISC metadata.xml 380 BLAKE2B 53eb46b6e93d496af735d02389e7f4ce6473e2e853845a3d72d89f5ee9c1baa53014cb47877a7a6cb0e8bb299d00fb229631619fad7875d4447a6611fbaaa550 SHA512 b5a6fc648c60c53705e595cb43719b72611ca5c50dc3f9f1dbd37c6a739c2b0727996b7546cca91e88bf9801ebffffaba6de7fd21a69918d46972d6d5502038b
diff --git a/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r4.ebuild b/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r4.ebuild
index cc2bf6282af6..0c42074e8133 100644
--- a/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r4.ebuild
+++ b/dev-perl/Devel-SmallProf/Devel-SmallProf-2.20.0-r4.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Per-line Perl profiler"
 
 SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 sparc ~x86"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-perl/Devel-SmallProf/Manifest b/dev-perl/Devel-SmallProf/Manifest
index 80bc701caa12..ba63a5b328b0 100644
--- a/dev-perl/Devel-SmallProf/Manifest
+++ b/dev-perl/Devel-SmallProf/Manifest
@@ -3,5 +3,5 @@ AUX Devel-SmallProf-2.20.0-perl526.patch 1992 BLAKE2B f0766b6f32410d17bdeba10d20
 AUX Devel-SmallProf-2.20.0-perl528.patch 1308 BLAKE2B 944973ed509d0752eb92bc02bc36a67e81659da9fdb403a0a9d551781a500af9e029c28a8007ad6a3803351703066116d33bf9f6d9323af93a4b1550810919d9 SHA512 2ab4fa1f17a50b9c59126b7e6cda0e498f78f5c94c6b5e3fedf112d0a25a18659a5a602bed879b101474a1a61dee4353a55b8b59d710f9558bafbde0c1fc3294
 DIST Devel-SmallProf-2.02.tar.gz 9367 BLAKE2B a9c058469d5fe80fdce61d080e3f4c90a443ed2cc8decee4ed28047b49d52de5f89abc52bb77085297d310183a59b299aa23ce911747cee26a9a149e41ac324c SHA512 f97ccacf3668feaccb5eda8e451c0c00a434df4051f9f2cb1c2f85cb9285e98c9f1198789467c21cabaddb667ba09b4fb56073075e9307881c7a71a820607743
 EBUILD Devel-SmallProf-2.20.0-r3.ebuild 419 BLAKE2B 332218655dd3169b0ae0bc74826dcdc8bba3a37162a0b059d35f87bf669e0added3b33f12a861f5de199885fc30bb6d851b89715f56c29b05c0fbe233131d49d SHA512 6496121f14cfa329d5a224dc12593a30560242a3b8097c4370a2f27f7b8df462186cc6dee8bd10d61761b123958f8042694740cef14f82c765a2e3a60663700a
-EBUILD Devel-SmallProf-2.20.0-r4.ebuild 451 BLAKE2B 77886003e7519aa33b6884b8ab02ba6b1e69bad996b5b3ffc34f043bd1be393288783fd22447549a12f7bb13b0475829ee2faf37429d3fbe9683933caaa24b77 SHA512 6a369c1753f5a03c5c38c1d0a892cb85de62a35721dc1e76dd50e4c95404dca70b71d71dd50e698bffc8c68f49838343a6fc2adb712cfdc0656b1011fcb1ba42
+EBUILD Devel-SmallProf-2.20.0-r4.ebuild 450 BLAKE2B 39ffa4df6391364a2d3a342c452d3fa72330bee5b1239c7a0450f1560f257a1ffdb23ceaa58220a44d8b2193d60ff9dc1fb319f2ace6ecfca2c5186abeeca319 SHA512 5de6222c2bdbe82876fdf5d8d34bbc6db366e9f0eb4c89714b841e8494b4bcf2a1f94b97d95cb6240105eff5e96d894381c30e0d1457b8446c089aa5679b8273
 MISC metadata.xml 451 BLAKE2B dc54dcce9a8a34acc65d7f5ddda92ca6317bcf12271792b9705a607ffcd5534019fd5720496e8886ade3c45b8f24b8a9a3a5784b93e6bb3e47929b3a7c8591fb SHA512 0b8fcc223fb2027ca143df6c813cc31de5ac5a59c62ccb7cc8dff4d081f86e129a2c1efcbdb747711170cdb6625a12700852b0d12c22ab36879b5805404d0fbe
diff --git a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild
index 79ab05a86631..385d18de5170 100644
--- a/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild
+++ b/dev-perl/FFI-CheckLib/FFI-CheckLib-0.250.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Check that a library is available for FFI"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/FFI-CheckLib/Manifest b/dev-perl/FFI-CheckLib/Manifest
index b3e6939ff293..8d9a032e9f91 100644
--- a/dev-perl/FFI-CheckLib/Manifest
+++ b/dev-perl/FFI-CheckLib/Manifest
@@ -1,3 +1,3 @@
 DIST FFI-CheckLib-0.25.tar.gz 28512 BLAKE2B eb9a843d230dc048fddd547c1fdd1a3b748be8ba3a3bd2d84930264ed11427bf7966843c4b394534b4429fe1c3d1632f180add05a92a587b472686459c608ba7 SHA512 f6fd790bd6b5e64972f2692abdd81dcd617a4b9ca377bdced655939e1b6005d2d84dc49df67d4945ff5ae0e7ff955aeccc019bc522fc959f1831c0586f40d313
-EBUILD FFI-CheckLib-0.250.0.ebuild 524 BLAKE2B 2cea98a639c0b803782c03308b304da6b24d5b4eeffe0ed4d8cfd43aa8eb956df2a15acff29bc743a59e3da90e46889bd1c3ee5b35e96706d032274262a20459 SHA512 5f85b8b1b8fdd3de16bebcf9f6ba6c80985b23743d0381e0a41770f6b83b8cf075027cf19ab7e23bc793b1a35643cead39d99ec2f2ab64498b501528df123c97
+EBUILD FFI-CheckLib-0.250.0.ebuild 531 BLAKE2B 3085582ce8493f3d893e3a7810220e1b1c5514817bbf6d0d0ec88c9eb60ac770721501c2f5a81d79e68bc7ac34e086c8a59413ca0a58b9803bc9e6416db2c92e SHA512 d63dadff04f77fb1ad6554f818d6924ac990ccad9801bd92e09a8da6abdce4f85831ce935112dfe1702fd18b46a5d37d9075d50430e50c7b31dff145af70fb24
 MISC metadata.xml 396 BLAKE2B 3a8692f73d6f2cf8012bfc60fa107ebf582b75409735eb8cfc8ed9a5088fa26aba51230353616a2b4ef26d8a80205b3204f7624782ec543752be173350ad6698 SHA512 d1131f6d33aa0053a0b7fb7a6d3beedf924b19a55034c724e5146faaad810ba2381f74a8f14b3ddf670482a54f39c2c8b17a2a13fee6767a734a28c30eb35c1a
diff --git a/dev-perl/File-chdir/File-chdir-0.101.100.ebuild b/dev-perl/File-chdir/File-chdir-0.101.100.ebuild
index 940f4985c5d9..ee0805c62592 100644
--- a/dev-perl/File-chdir/File-chdir-0.101.100.ebuild
+++ b/dev-perl/File-chdir/File-chdir-0.101.100.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="An alternative to File::Spec and CWD"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-chdir/Manifest b/dev-perl/File-chdir/Manifest
index 05095ef2993d..c35fc3de4768 100644
--- a/dev-perl/File-chdir/Manifest
+++ b/dev-perl/File-chdir/Manifest
@@ -1,3 +1,3 @@
 DIST File-chdir-0.1011.tar.gz 25127 BLAKE2B 19c07b54bb55bb3ed7f870cb1bfb558f7b8cb9a34295f3e885d1fc6a56e8ba9232480224bed0c32f99fa4efe27f2b72808ecd8e7ff0c4853625024e9727392a2 SHA512 249181e43faec925406b1fc86fc256afb27c588a4325122defd955f0f5c15c9d484f515841e6ebb3a643ce5e2a188338c88eee0df76a458aea4216c26bb7d6b7
-EBUILD File-chdir-0.101.100.ebuild 574 BLAKE2B 4a76132689f2c76ee11854befba3865b82167c7fe1e5a0cb931bcb89841543e811c9272fc9b216e349fb99e53915fa66469e0a456cd3b8fff340ebaa4ecdf87e SHA512 6a2373f5231ce0db7544b8ba09f2e5bc9fd4722a149ab44233fbf7098ef25e999b73def42618f223559b6243fc6769ad4cb2c096db0035c6114a878eca8f14cb
+EBUILD File-chdir-0.101.100.ebuild 581 BLAKE2B 520298416e75e1bded39d56a83559aebcd543d6c1fe01156cea3c549aed19f8c423c5660465b749c81b3c1ec6893b9658710218bb1bcb8752c2319de06b65b10 SHA512 034cb9ba1365096a80ff3f152e52e44848c82031a06a442d56d104d62e5b694cb09653e3acbfd1e42929bb8eb2b8e969d3ab80278f1b59ad1f7d4aae760b3103
 MISC metadata.xml 523 BLAKE2B 920de718e7c2a761a155f2bb37121050a9021d7b4cf487bf0413dcfa583498ebb14f42854c3c01943f9ae19a555fcb6e279b44aadf233fd5fb59792244287896 SHA512 68464b827e1e3b76ed524e0d2cf4d6f822873ae58b0939490f60209fb7eef200dd8c4d6dbaa3b402639a32ccc06bad7962ae6dafeed8a3ce8cb5145810157371
diff --git a/dev-perl/JSON/Manifest b/dev-perl/JSON/Manifest
index 48d1419915da..b6a446b2874d 100644
--- a/dev-perl/JSON/Manifest
+++ b/dev-perl/JSON/Manifest
@@ -2,4 +2,4 @@ DIST JSON-2.90.tar.gz 85333 BLAKE2B bcba4f04c1981ce15aeef5e862c567625425802ec25d
 DIST JSON-2.94.tar.gz 82629 BLAKE2B 284e8fc19732ad680c9f953211f916222e29a032f2d70075d81df2372769874d409aea5a77c4f25fd00f2ff47784e34f421603adbdd0001834ce2e579c4de4b1 SHA512 0a20562441d525ee37fff467111f7d65124525e06b4f825079948752da2a983757e719025dd2ab896115b34ba146b4c495f738e4f005542dce0b058440c73a46
 EBUILD JSON-2.900.0.ebuild 523 BLAKE2B d258221d63c1260f98456deb1a2cc9832436dd578ec5c2caffcf65f1597689d31f1098815ce6201657556509f432bdf89f4eed5d2c05f3f0575c13ac22b678d6 SHA512 7a2ac585c9bab95b0d4d8747cfbf80e95a1734be309cd3df1d0b1331e060c269a996fd2a54a44f370a85f931d84baf1b469f655ed08f2a96c4d7110c3e6bdde4
 EBUILD JSON-2.940.0.ebuild 714 BLAKE2B d42e3411d30f5b0b17e36df66e6002bffaeb3371ebecf9204cd8260d4ff7232a560530deb846519b2e2f10d63ec51ea61b7bc63227979b6f82b3b717b885e304 SHA512 b9a641a658c125f80d7b166bc95d8c57149c98a68d63aacb57c23d4a50f52300fbfddc4ddc2c3999424515d877ea06c350e1fb698fd9731f756ce50c2be6aef4
-MISC metadata.xml 740 BLAKE2B acb47648a40ada4067586febbeb3eca5497fe1f4f14fc16fd5e2adaa69c307853244ef061097a13ce60967a0f7bdb83267f45302f911accaed2d5abb6f81cb8e SHA512 39d70cef0132f7d359c8b473ba38bd0b7497e01b8c77edab5ecaab542a1300173a29252118e4ab4ffc16aab340e13b16a4c50c95a4e0aede2a5fc93420d33216
+MISC metadata.xml 621 BLAKE2B cba481f81863d66d050e7f9d469febaed9da96f4592522e43540f184d51571b9adc99afb78f77bc2e2023f528b857104cdd8f7511dc50714a81000e7260b5e1c SHA512 a2f4b28ecdadc7b8c168b88c3678b60377720bce8e77111d22ef4366523f2c6f88d1e018853e643403122392cf03a03feac3a2d65710c7fc73fef57da8a25d4b
diff --git a/dev-perl/JSON/metadata.xml b/dev-perl/JSON/metadata.xml
index 2470ffa70296..b93c6f1dc7b4 100644
--- a/dev-perl/JSON/metadata.xml
+++ b/dev-perl/JSON/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hd_brummy@gentoo.org</email>
-    <name>Joerg Bornkessel</name>
-  </maintainer>
   <maintainer type="project">
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
diff --git a/dev-perl/Linux-Inotify2/Manifest b/dev-perl/Linux-Inotify2/Manifest
index afdb6d03da53..2a58a0537cbc 100644
--- a/dev-perl/Linux-Inotify2/Manifest
+++ b/dev-perl/Linux-Inotify2/Manifest
@@ -1,3 +1,3 @@
 DIST Linux-Inotify2-1.22.tar.gz 8533 BLAKE2B 38486ccc33c4788a957c8d6a4851565510c0a7747b8ac887e49c9b6b2dc93e965b8fe1da66ca0ad23acc7f98a1e838c09e5bc21ed2eb71a28f060eda8a18c57e SHA512 ff98f0ee1cc5722b6242b9073a8754da1e433193416c04749be433fe93ff5269339fd25af8cbb42af192fe09bd1f1b6cbb96ae13c5cdb71024946ecbd92929c1
 EBUILD Linux-Inotify2-1.220.0-r1.ebuild 353 BLAKE2B afc7cbac45fdbf031d781c52f8f8d290bee3662652d835241882a857def5110473ba1e58345a0db29725f10286c944ffe7115f390991bc88a193b8a4c3eba9d9 SHA512 b7a759234128df196e4fa798f47008f635d6a8b2c870ce60f091c60c195e3211aaf6546f6129ff1bee795c74d21bf17e4d88beb0e6e874661aac20ff5f060733
-MISC metadata.xml 657 BLAKE2B f55dc987b86ed2125ea9f5878b2b642188eb1baadfa29377ff9159f0960674b86bbd6f207314c15202b891dc6dbae61149052c0031f069f73ab5273b88d26924 SHA512 06590d8230ddb8a4246816a5da29d18452ff507ce224ece4b552a7b64244228eba5d78efed541af386035fd3d881ff9dfa7ed9d4a3a0f519d32be9a42f1dd882
+MISC metadata.xml 538 BLAKE2B 511d460e5822a4c0bf00fa8403d130b3b2d622daa5bc1c1a1dbc4416097476a93bf7f8f54c157577bd72c57305a4c47c3ae9a075ac0f90cd204f70d8ba76e6e1 SHA512 542f2ab390e10a7b6d49db0883f59a5dd6ee7acfdec59edb7b9649d1de914fe8641c8e0b9d3acf3b441ddc9f6e648928fc71cfd52b4b12c0d23a4c61cab5b584
diff --git a/dev-perl/Linux-Inotify2/metadata.xml b/dev-perl/Linux-Inotify2/metadata.xml
index f7c37d647627..20e849ff44ce 100644
--- a/dev-perl/Linux-Inotify2/metadata.xml
+++ b/dev-perl/Linux-Inotify2/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hd_brummy@gentoo.org</email>
-    <name>Joerg Bornkessel</name>
-  </maintainer>
   <maintainer type="project">
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 9afa3771d349..d9bd522c3cf9 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Shell/Manifest b/dev-perl/Shell/Manifest
index 6e4f657a1df3..3b52268de7be 100644
--- a/dev-perl/Shell/Manifest
+++ b/dev-perl/Shell/Manifest
@@ -1,3 +1,3 @@
 DIST Shell-0.73.tar.gz 6186 BLAKE2B 83672b2b52b2a1cf76ad4b7f5a953f12a54f8c5d3611cbce490dc1ccb25176b7aa4a0a014074ffe28ef21e04d63c43f260dc183a75f40797ceef1b471e6372ee SHA512 0845425a30bf7a569e36445cd4f9cf2a5f5d18bd727e2c1eae2ac9b943fb4e6d111ece8dc1d40fea6b993bc1a73490b06aa539f38b4f8e473778e40d2af7fbd8
 EBUILD Shell-0.730.0.ebuild 468 BLAKE2B 6d01124290684c00ad62c1199430b577afbecb9a64e68e58461a6d601e94323e9e872bda2aad8f7aa96e2a4f0f1cc0f81c1e9ee6d37821d48d3824005a478c6c SHA512 57d53d17011e57ad5eaba196eeb942ea718a104cf60bd8bfd06f96e74fcf08034e8396f6024a74458da3de76a03409f4063a34fcd6d255935840f19ec5d2a5cc
-MISC metadata.xml 500 BLAKE2B d37d8572465a23827c721c4972d3248655df3875d4d3e7356a4ba7aeb28bc7e87bddf60c5a80812b77d1adad0592a07e9492bb3fe38b77f4ce75c6b1d2adde7a SHA512 f53f2a2df42b5cf5d42d4ac60b21e8bba4d6466ddde4bf8e9ac6b01415dc94aec0d68832e0e19158f67606eadce53fb275dc79db8d9d8583bbf47acf3f6a5bad
+MISC metadata.xml 381 BLAKE2B 848532e0e41ef6b8ca5b2ef9c620517b9ff5421a251528659216c26503b285dc705bc4a66df6b2afe01ac23dab1635a0ed096ced651b90bebd624ac201e08ec3 SHA512 1b8669464fd190586102ed0c1389b6beb776a73346ed42d550f372f5dbee57d5319f1c9b0b082dba7d7b97fcea444c5eef94cbf3ae1701f64ae1cb82ff70d651
diff --git a/dev-perl/Shell/metadata.xml b/dev-perl/Shell/metadata.xml
index bbfe43396a8c..0b070555e1eb 100644
--- a/dev-perl/Shell/metadata.xml
+++ b/dev-perl/Shell/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hd_brummy@gentoo.org</email>
-    <name>Joerg Bornkessel</name>
-  </maintainer>
   <maintainer type="project">
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
diff --git a/dev-perl/XML-LibXML/Manifest b/dev-perl/XML-LibXML/Manifest
index bd4fa197b938..1dfd9427d071 100644
--- a/dev-perl/XML-LibXML/Manifest
+++ b/dev-perl/XML-LibXML/Manifest
@@ -6,5 +6,5 @@ DIST XML-LibXML-2.0201.tar.gz 462237 BLAKE2B 17313daca3e87b12f0d3161f628dbd5ee3f
 EBUILD XML-LibXML-2.12.800-r1.ebuild 1592 BLAKE2B 94b53bb78105fc4e224a670d386e611e1cdebabebda615130f780d0acf7784daf77cbe3245cdbd5711265b2b6fd38a3845189f46e423f7576242d664ca22bc7a SHA512 de027e64c5cb54a3e919e3573163d814d2080333ae210d14f432a7c9c000fd4ab106ddc6726268c6f756014b770d7f200cfb26071035665a51aa277bcc21b61b
 EBUILD XML-LibXML-2.12.900.ebuild 1646 BLAKE2B 37d8aad35f90c1e7fd92bc5612a15c53bc7e696f8fbf57509d104b60511260c5a9d63bebc32acf3558625d1905577efdb94b8fd27de4951cb0c11a0e0882f50a SHA512 b50a28746a28d6e9deb4df2ba3b5f2d66e880bca93b9e3a3777560488eac674756a531ae338d9b911b69dc4609d09e8e8a9900544d6ff894578c7322491148c6
 EBUILD XML-LibXML-2.13.200.ebuild 1670 BLAKE2B a554e592166405062b4b6d20b4aa828b87fff547a9d68aac6c05fc23e91c0c30b8e4c93bb673723ae327474f7fd681b942b97079be1d6de7dce54f8374928173 SHA512 d95fd4a02d559857dcb6ba46122c70a32cf5ae5fdd228ce867b4725c9575a853e1aee6d02570e84a1a21568f8cb8995542ea90685d9cec2227add4208c01b0bb
-EBUILD XML-LibXML-2.20.100.ebuild 1712 BLAKE2B 4235e12adde342d204a7222e2e6ad71bc36ae3c837c4aaadd2ae9a5d556adc5c146f20d0c0dbe065354bbb9acc6f87f5058986fab1033d01c806d863ee6673aa SHA512 5634d403c0db8b709cef47445fade9c4b9e34a1714b26974e02b161287aa7f1583390ac8319146527645298ee91aa14249469d91a2837e3a4dedbfee02437f77
+EBUILD XML-LibXML-2.20.100.ebuild 1719 BLAKE2B af622327a17f092e7eaa9333f2e7d32d4870c90ac86d930a116991bc4dde9a4230f92513296ccaf402d020cf8797d1c1ef5a261001b2ce1be24bb1282c13dc06 SHA512 9e448016d13c92eedb85bbdb378bcb48ddd20381668688121f27b723f2f6cb2009294b1548886811ca785a36ce3e1b002f05d92e92f2e6ff80afc900f84113f1
 MISC metadata.xml 2782 BLAKE2B dd55f05f6dbaff2e8dad45ddc451309ef16896f9e4a8c60e89c8c6b8fc854654cd69363870cb4f6feabfef5c095656fab06e6ba48a9a9c31058d462e15870534 SHA512 6353b4890d24a2ab018caa0994913a4dd6b7dd753e089f9fb0570762f75517bc8ae4e8ed3a8990ae2c75957aec0791561f00a991f1e3976c225781317fdd82dc
diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
index 765b5365c1c7..4d1d4faf7f1d 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.20.100.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl binding for libxml2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 57584b0416a8..142dc7f15ac3 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index df2e40cd87d5..e7c69dccac45 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,7 +1,3 @@
-DIST PyGithub-1.39.tar.gz 2662602 BLAKE2B 5e3e4ca2483e7ade968f170e7615258b4bcca0f1c6741146c38b3c7405fb1fb66351fa5686863892a6751bc4cb6ea39b6cf4ec0d8e6cc878b302c87512c9d159 SHA512 5fa6e5a1b8e7cbe2be13e7f866ce8586f6ba37bfc8f3bfb5a52497a9edc267c14512e4572f56e898c61b8c84dfc8aa8f325c5eb2563e68450b8a3b2acf8308d4
-DIST PyGithub-1.43.7.gh.tar.gz 2832588 BLAKE2B df1bf783d8644493151b7192325cd2feded48dd95853e0f2ccef9e0560c39877de3e38e95a339291e585612c795d2180900dc5db5fecb0f844a97a6d0a5bf04c SHA512 15d7c7ca6a505a259fe59c96db667a278179df7acfe794116f118bb18966c573cbdcd9276fe50b321fd759988810250a0268c2e8e330c1ef5a8bdcc3a50b6391
 DIST PyGithub-1.43.8.gh.tar.gz 2842219 BLAKE2B 7711885beb4cb855ea5a5755abe881f7ae7825feb76cb0ab30aa9ba4a2530440d2816439c43da23a42f134286fa0806875d075920776960f04cdd21131bcf700 SHA512 dc58166ebb27f855ed4f32448029abe7e53b8050d8d99029d460f2dd94180ca8bcef68a75469293abd021f70cc3c67c32061e6439db1b3f1dc77af464c658bb6
-EBUILD PyGithub-1.39.ebuild 593 BLAKE2B 71cd2cf560adbe76214148f890b031e020148b5a60e5b27fc9d3708ad4a5d6351b08e4a8eb4f470456c9092040bfd46f4e46cb9db5b68dc9b4c6af0ff7d1d5ad SHA512 830e8648301bb259e4238c257b1f25a5acf6c171191556bf97573afd3bbdf65b201e4b3a28f389e643a575f66588e31db94ff96dbf76c9734113c38d98719198
-EBUILD PyGithub-1.43.7.ebuild 1201 BLAKE2B e142dace911dac44389a8407628c295465de3c86926be5f0d49df62c4e602a8346a5714afa6b52028d9d024ea57b3d5fcc1c1b3198a33a34558cbc2060b17399 SHA512 c061c186fee870038de0654d7e671c96d6be95d0cd7662b477d434a6ff73f74c47f002f88d3621f149487de59985e449d79bada852e3676c07a77764d9e27ce0
-EBUILD PyGithub-1.43.8.ebuild 1203 BLAKE2B 62a884f49d8c891180d28b53a08d8c1d119aa73e88040e10318623977f0d82c04b953ac2f5b96dd8c8f48278a834d1fc6f4957ddd831cb08d19de6075c350453 SHA512 c9ca4633a83e0246bbc5d43fd4db216f8c2c4321bbe490a8120f52bf4ad95daf343d5abf7eae8fdd9b7dadc7e7b76db3242474126e341c116a1bd83bdf0106bc
+EBUILD PyGithub-1.43.8.ebuild 1201 BLAKE2B e142dace911dac44389a8407628c295465de3c86926be5f0d49df62c4e602a8346a5714afa6b52028d9d024ea57b3d5fcc1c1b3198a33a34558cbc2060b17399 SHA512 c061c186fee870038de0654d7e671c96d6be95d0cd7662b477d434a6ff73f74c47f002f88d3621f149487de59985e449d79bada852e3676c07a77764d9e27ce0
 MISC metadata.xml 446 BLAKE2B e5a5f28e076db18ae39b757db4c480cc7d77314361c050df12276a8770c117140670067c4d1785d7a21fadd1d3435f7245a85f2bb251c57539315bcd97faadb8 SHA512 e29338330c42ccefee0ebeef682c8877a37c01c10ab9976988f846fb8c6d0a02114d0447a682499ff306810d2c12535a3cb031c9728eea016907382cca8ee1b1
diff --git a/dev-python/PyGithub/PyGithub-1.39.ebuild b/dev-python/PyGithub/PyGithub-1.39.ebuild
deleted file mode 100644
index 4fde60b63b8f..000000000000
--- a/dev-python/PyGithub/PyGithub-1.39.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/PyGithub/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/pyjwt[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/PyGithub/PyGithub-1.43.7.ebuild b/dev-python/PyGithub/PyGithub-1.43.7.ebuild
deleted file mode 100644
index 4c63d604bf8d..000000000000
--- a/dev-python/PyGithub/PyGithub-1.43.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/PyGithub/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/httpretty[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# tests requiring network access
-	sed -i -e 's:testDecodeJson:_&:' tests/Issue142.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# silly!
-	cp -r tests "${BUILD_DIR}" || die
-	if python_is_python3; then
-		2to3 --no-diffs -n -w "${BUILD_DIR}"/tests || die
-	fi
-
-	cd "${BUILD_DIR}" || die
-	"${EPYTHON}" -m unittest -v tests.AllTests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/PyGithub/PyGithub-1.43.8.ebuild b/dev-python/PyGithub/PyGithub-1.43.8.ebuild
index 5585ba44ef02..4c63d604bf8d 100644
--- a/dev-python/PyGithub/PyGithub-1.43.8.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.43.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/PySensors/Manifest b/dev-python/PySensors/Manifest
index bf150f4371f9..d66ae4a8a994 100644
--- a/dev-python/PySensors/Manifest
+++ b/dev-python/PySensors/Manifest
@@ -1,3 +1,3 @@
 DIST PySensors-0.0.3.tar.gz 5109 BLAKE2B 8d537c121540c8e28d0f8cfc45152abea0e312c48a460e877935c7d8639710c8046a96f598c724082870ad7c0d528621bce85d8616485336c2b4f8ac2ebe7579 SHA512 b9ae61ee9049e1edd3fdee7b122c0f9aa19677aee401c910fcaec5a6bc95a0628d6b7eb2b59f1d14196bee22395819f4980d328d60dd69b0a413f7d08041f159
-EBUILD PySensors-0.0.3.ebuild 466 BLAKE2B 93fcc373ce498586202e816d779cc00ca6b4797cb58bffbbe002be04becb5780d1080238b08d4e71fc85352d874d73647fe62187083ba946ba86116280892522 SHA512 558f736002458df62dff7bb21b889f12aed2e406ca13adf09c2fe8839f8e4f9f8ac9ddce8eef4c3656deb6e6c79d39245b1a8f5c728750c77d3df84b7dd17ce2
+EBUILD PySensors-0.0.3.ebuild 466 BLAKE2B 1bd8a0daddba4359d9bc0647096bd1fffea3491026bfdf923b1812eb03495051ce554be122321d03d88246682f71e5b83b9546a17dabcca30609734786e4f269 SHA512 e12c55c5821652c12501d3d8c8a4ddb43fb9103cb3ad1cc72fef37706f70aa78aea863b12e4cf4019d15e89ba5fa77d991e2e43cd228bc2c0d1548055d411693
 MISC metadata.xml 437 BLAKE2B 42315c93aedaf44d9ecfda30cabe8751e9fb8ca2621dbfcb434fda1581a5d6ba415a025c37fbfe1b03de8121bd4248aaeb6159e6850d08c692d6b729953dfb81 SHA512 63f7823890f90ae6049539ba3b15ddd3beade8e75ade4b06835ca7f04d64f1744e752eb2e7bd2b66e9cde29a4a1e79467a0046bc01ea34e50c1753b4a2ee811f
diff --git a/dev-python/PySensors/PySensors-0.0.3.ebuild b/dev-python/PySensors/PySensors-0.0.3.ebuild
index a2de3813d903..4e6a9118e291 100644
--- a/dev-python/PySensors/PySensors-0.0.3.ebuild
+++ b/dev-python/PySensors/PySensors-0.0.3.ebuild
@@ -17,4 +17,4 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=sys-apps/lm_sensors-3"
+RDEPEND=">=sys-apps/lm-sensors-3"
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index dbf3f8d173ba..9d469be24a49 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,5 +1,3 @@
-DIST aiohttp-cors-0.5.3.tar.gz 40266 BLAKE2B 701886b291a1b89f88a704ae04e3264cf2afc51f63f03ddd4464d40ba7bd3a1c6b5fe3f095b634e8c6c36c5a967e9a6b9b88335ff23988fc8bcd726c037fbd1c SHA512 0813ea48de714c85e361dfdaeef1a69526f7446dcc4ce637139cd333dedea58c635f85cfad1c3ccfb0df6e573f0351f282fdbd9726211d5915ed2ba120206b09
 DIST aiohttp-cors-0.6.0.tar.gz 42507 BLAKE2B 7b63916b983d3dc208058c8b04445a30762eebc4999135ae802d1ceeeccc476a335eae66126bb3fd16f938af3649e8b9096433c2df09e82bf4e5d4ba8e38c42c SHA512 75453ebbc074d5f25cc8efc46ffdb76fc90b0a96a9e6fce0eee5a5f28dba31cb50301289cac3b36c70ccdbc10c8f4ba9e362d8e9f350ba7f9dfacd06e6f5e699
-EBUILD aiohttp-cors-0.5.3.ebuild 1080 BLAKE2B 36c45242f77e9c051141bbe48af76a678779b27591a65fd1089d127600733f5827d29178c496a16d1ac2f374f9d06d5c6b5c282e4f3da0079d2530a80adfbedf SHA512 19c36aaae5c7980761189a43ff1689fb47a0992402b33161d51955fb391a7753eed80b20fbdac20f062be3d15bf683b2f48f952334c99e5a810f41d037fd8114
 EBUILD aiohttp-cors-0.6.0.ebuild 1112 BLAKE2B 009f09b9520da6d5b72e968be95e1463d1ef4e90137a3f4ead73d402f0c712b29729fc66ff410e63e5ac25d9fddf94817922d73eba0aaefc910d5edc42503057 SHA512 9c60033bcfaca86e7329acbd6ca9cc2fddae953ee3570b29865b733102e53067df1f252ccbd4a634d2ffbba6a22d530b422ea33a045891c03a0b587101ceec12
 MISC metadata.xml 253 BLAKE2B 0311910d10e4b501d39c01678bb1e58bed2e6e3252e6c3195d3284cf2e9652081b10a83f045689a56c69a4d318b209bfdac0a63ff6dab2a8fbb0160ac9c7e2e2 SHA512 bf75301ff2098e846a7d6dc9166d1c8b6e77b4f92327e5c5aad0edcde6274e6aa224d89c2c5ed7efc6fb7fcc7258a2a01a24591a43688679c4109f8cc89fd9b1
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild
deleted file mode 100644
index 25e033410ba1..000000000000
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.5.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server"
-HOMEPAGE="https://github.com/aio-libs/aiohttp-cors"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp-cors"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-pylint[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# for some reason, it is installed by 'setup.py test' on py!=3.4
-	# TODO: investigate
-	sed -i -e '/typing/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index d1610b11b508..89fb631983fa 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -3,5 +3,5 @@ DIST aiorpcX-0.17.0.tar.gz 26346 BLAKE2B 0e60b66dec1ebcabca62e95688761b022a0f2a1
 DIST aiorpcX-0.18.3.tar.gz 27464 BLAKE2B 38a59a6352a4c9bc561f75ecdfb0adc87fe82ad8e05622e67903d6e6e3c225647e75cb7a516005840d008f193288a5dea09042e2091a576be108b735fbbe1446 SHA512 982258fb35c1a4b09def64e2729ac5bab528185963ca0f73571d4a36be2aebadd69e607161462b9c5e07ff3b09fa071949432405a32832d438e07103fa1a8636
 EBUILD aiorpcX-0.10.2.ebuild 528 BLAKE2B 41a71518c80d25053a5d708e4ce79c0dce74bcb63b00d8c9dca73a1e454ebebfa2bec7c2e18bdc18dee4e053679f387a64f41f6f99e962ff49a95c7850f37b80 SHA512 5cb8e7d18f6a0c921c3c8dd973a63e58dc3db8e5fe2dd01fe9a7f3b89639f4b4e6095fd9fee2fa4dd1fb77e5835b399a79e005653cca4b2bec57da6dee8a5f38
 EBUILD aiorpcX-0.17.0.ebuild 532 BLAKE2B 4b539e8afb3ce8ffdb6ff8002be4407e7d84c46b98935deb40d1bbda211156904c4b4fb3388d4fd56760a9c8c0f55a3e6ecf5ae51c01166a7a3325ab6170182a SHA512 6b88f8ab3c5121dfc418888961b97ec1e62443e26959d22fc5cc03389093bf80ae7f21df6e16bc4da2722fbf43bc00d095d4b7a10593c0ad76ff05c52dfcb23d
-EBUILD aiorpcX-0.18.3.ebuild 534 BLAKE2B 8457596a749ef56f1f4493a4c7b5b1aecf4c3845a436c7402bea96edcbd552cafdf41f20b7b05791fdab044d4fa0b688d3967d2152a92538388051b61462de7d SHA512 1531ee211cad70bd2b89cf5f34f3dcea69242e082c8a375a963bad8812ff5501d2e941315a8febf8aaa2594ab4ea1b3c88f56072a1f83260e9980e9c5104f208
+EBUILD aiorpcX-0.18.3.ebuild 532 BLAKE2B 4b539e8afb3ce8ffdb6ff8002be4407e7d84c46b98935deb40d1bbda211156904c4b4fb3388d4fd56760a9c8c0f55a3e6ecf5ae51c01166a7a3325ab6170182a SHA512 6b88f8ab3c5121dfc418888961b97ec1e62443e26959d22fc5cc03389093bf80ae7f21df6e16bc4da2722fbf43bc00d095d4b7a10593c0ad76ff05c52dfcb23d
 MISC metadata.xml 380 BLAKE2B c1355cf2d901123fa14fadb4f4bf084d385dfd870baa0a2189c68d05cd3bed57ae4f1caaa668211b74b6e2491e3263b99ba8b99446c0e4f5336ea06577dc540f SHA512 b025f50be4d5ba7e95f7ae7b91099498b76b75c7faa28df52f0bb64dbe55b494107f011d42bc4cd6f5c9e5786b2dc1eb8ffc8561334326dff9c99f7877576364
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.3.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.3.ebuild
index b87a61bb4dd1..90d93d456765 100644
--- a/dev-python/aiorpcX/aiorpcX-0.18.3.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.18.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 8b148917fc32..737fecf4507d 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -4,4 +4,4 @@ DIST Automat-0.7.0.tar.gz 61461 BLAKE2B dd09ce090c7333ee17b701bde2c78e01dacf40ce
 EBUILD automat-0.5.0.ebuild 1218 BLAKE2B 403ff7532bd738941a3d2db4daca9a7f256ebe9d095a0d914a4d9e4f802caa5bb36a41085bd651ef19176430a130132d5a7d0c4f72cbba9239e364765064001d SHA512 50194fa033d7641619a51efa9c8d12710586f3758f329eff03d4ab7679cc7923f227355f7bc89dfe098ad5518bb10cb6d5a5ad9f35f53d406874c7bbbc254bf3
 EBUILD automat-0.6.0.ebuild 1236 BLAKE2B a11595ef80ce5d9fa55e50c13e89a445b2008beb1f668e9373ebeeb4e41e203df567969ac9742dff311ead31241a4818fc1479bc4044289758d6a8b3cfb746cf SHA512 54b9abbd4446f2658b0b04ebad07fa1dd858f9aa5bd91898d9e7f3937174f9992b229b1e9e8b71e4c564e768cbab244040cc16a2002719291f1edddea51cf644
 EBUILD automat-0.7.0.ebuild 1469 BLAKE2B 82affd4de3b40180307ab0d9cef0546e2957916a51a5b8721c0fb900fbcd933e577752bab7313da14562f34cb2dcf142981e3bcdbd1ba5d19a6e7ed64fcebf45 SHA512 212ca6819b4a876856c8c22ca7cf0ddf08b959b12ce416aa1934ef0f22555d6a85793b81ced3819b0471d4b31760dfc1aa718719e3263505482e8af7c1dda2b4
-MISC metadata.xml 622 BLAKE2B 10fa7f62095186a07a588b374c55dc084a483ff8848caff3322822964d57175a729e82948f984f4348a1cd0e5d7bc08c1d548ef674fb93aa08bd55343c53ba63 SHA512 f9feb6bd4b545a707d0539d42d20a0371eeb8a9e0984e922b3a0416a0dda97b6783c21cf1ec63868c200535d9a46e80b820424a1d7199074419780b3e7328333
+MISC metadata.xml 572 BLAKE2B 26d7ccc6325a7ff3f051d90ffd36a50485575cd78a2bb35e2f471b2ae5c0f2a579269633db2fa98be1682b5a53271acfd97f079d8c040e30188dd07ef886d509 SHA512 6514fa4351ceffc03f98fbafff044548b350b69d78b0926e598e230fbf6ba52e8a2e0346e89b14d8c4fee914d0a846e457bebe62354ea10186dcd24c1daef590
diff --git a/dev-python/automat/metadata.xml b/dev-python/automat/metadata.xml
index 62df0260abe8..e10e1d5c83de 100644
--- a/dev-python/automat/metadata.xml
+++ b/dev-python/automat/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>glyph@twistedmatrix.com</email>
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 17dc612b3a45..837bcc843c1c 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -3,4 +3,4 @@ DIST blockdiag-1.5.3.tar.gz 2704391 BLAKE2B 4d66263d63c73607a9f1e180172be49d25ff
 DIST blockdiag-1.5.4.tar.gz 2693073 BLAKE2B 8a825742b4144667153af00d5e334325f8a3b49823355787dbd577729da8b0fc221ead14ab899ef8aef1800bbc2cdc47f060330bf0a2f2f1bcd055d172d8adbb SHA512 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
 EBUILD blockdiag-1.5.3-r1.ebuild 1613 BLAKE2B 356ba9c7c742561fa180b4eb5e7a9ac43179f5a2f0893574128396a59ad35c95cd4ff551c3db4afcb371871efbdfb2af788a64f1420badebbe46c28346ace657 SHA512 38c898c6cec91f13924a34c1d9fecafb58565b49b465632da172be332a71c6420c67eacbfe699b992675a9ac45eec1fccc27ce5964560318085b9d0b971a9548
 EBUILD blockdiag-1.5.4.ebuild 1828 BLAKE2B f0074666a517f90264dc140ebba439eb93fa056cc136f91c00fa92133f61ce0b78f81f025197285e91056f9a46f917f3624cb7d4a6d346d2494334303acf8b79 SHA512 30081f9558183db8fdeb8f73c68653a26c3339b88951e56b52f42f0ec40f063747041cd08f082ab18e9e5cf867a4ab2af705137b82f52088df3e93dc0c5e9724
-MISC metadata.xml 830 BLAKE2B e53725abf1471f25def5ee17b11893b8395a23d105d1582fd25c39cdbc3334460b6a9737d134c9830cd2af0900c834ba112b15f772ac5bcb0fe2f0740a4557f7 SHA512 0b02e5328a040a199253e3a0aea67552d564989bbbb8c0323c5ccbacc56e44546562ef5a4ba10964eeb10ecc631b4e1c8c902fd3450f6d77290b3d7af354b2c1
+MISC metadata.xml 752 BLAKE2B 25048231ba8066a856109d0c6e785430481522dbc610d00f4fc08e77c09912325beaff486e79b0b557a81db0ad8f89de256b775cbee12e1add2e4196b0f43b97 SHA512 8f6aacd0a990cffb868162f374ff541a3d24cff90ef4e2cf7bac5a0b0062a8c82577e5ff71fbfd8b09dbc4f21d200c37d239c100755605e4d66635b56b8a754a
diff --git a/dev-python/blockdiag/metadata.xml b/dev-python/blockdiag/metadata.xml
index 1ff75e3ba4da..15110b7787e2 100644
--- a/dev-python/blockdiag/metadata.xml
+++ b/dev-python/blockdiag/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/cbor/Manifest b/dev-python/cbor/Manifest
index c9e06874e221..b1c1113645d7 100644
--- a/dev-python/cbor/Manifest
+++ b/dev-python/cbor/Manifest
@@ -1,3 +1,3 @@
 DIST cbor-1.0.0.tar.gz 20096 BLAKE2B 0e15bc4984155c1046836c94f3025f8dd451aaad438c78de25a739738e6de8d3ff3e737dbaeaace3d837be08e9702a3b7d18d840c0bc5459cd3919159eabd728 SHA512 996b61c7d16cbe8bd7b056d09286a17f3a6a29cb97ef9e5ca1d1bfe8c53393ae3d2b7565c937a283cb78f377af14c070bd663aabbce995dc7e5b9d2f69a6ba73
 EBUILD cbor-1.0.0.ebuild 498 BLAKE2B 49f9d0dbdd9702e492bd5e31bb2bfe07e90afb97012edf11d33b6e000ef6d395a0e6f6fe742356e42cc5e83a845451ab78242560b176d405248838337dab259a SHA512 878b43c12bfd69b70d086e08cc9d56fae83ee53afcb85341ef7c66ed065cff73e5f03fff4270b4c7908d838b7959ab77fe13b61e71fe1341af9d29d31fa841dc
-MISC metadata.xml 1074 BLAKE2B 7621eefc67c6d29dff5ae32e9237e65d3dcbe4601250cdb524d380c7bff4216b03586ab600c39592f736205f1c9dadc73efcf55ec97e5ff65f126fa2a1893515 SHA512 6ad1e74d0f932664eaa1f635adf78ed6429308e354e195f6bebef74385ab414ffbb1c94739dce3473ad62751241ee3bafc8eb74bce63f431b4e774250e2c7bc8
+MISC metadata.xml 996 BLAKE2B 086a81c0714c78e89681623baec48d9b2ef864a107a1ef87a2bbccc1de657f96e6250f03e028f724e59b6bd70fe9970255d4bd2c13faf20b696a9fd330fbf36d SHA512 eadcb582ff299f943fedef2af5932750a9530f3de9c0962d1a288eb667eec5933ce5b96b5fa9212a3b4020f70b5686ead34e2591f24aec64f1b21c2ff7a69e6b
diff --git a/dev-python/cbor/metadata.xml b/dev-python/cbor/metadata.xml
index a7a1e422560f..aeed72dfed59 100644
--- a/dev-python/cbor/metadata.xml
+++ b/dev-python/cbor/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 3b7f2bfd956b..85bce29e6bbb 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,12 +1,8 @@
 AUX certifi-2018.4.16-use-system-cacerts.patch 314 BLAKE2B 30c9d53dba96f0062df843c98e507a477888a5d8d4de32fded32c9c6729c3e71690a1a1463372d991fbeb5135298a8fe308ab2ea10521e4a5408591eb1a336a6 SHA512 ff533ca05a736e35c1c567e0da6e79124bc7e070fa1db03fdcda6989df885a16568e4d0dffe07658480b1141dd1fc4c374230c46ce7d7b20e0ada82600ae9141
-DIST certifi-2018.10.15.tar.gz 145887 BLAKE2B 695b4236d67022f12639850fdcd169570330f9dd59aee165a39143d5dc5867b8685859bc48c8af07d41b7124970748ceb97cf1f7557563865e6b3293f668393b SHA512 3324ae6c4b99dda6f48aa9f0918fe045a19b19b26fcfdcca4be93ec967b9e4112d863c982686837b327f1663e308250d56ea337caeeeeb96579e08b20fca92df
-DIST certifi-2018.11.29.tar.gz 153772 BLAKE2B fb146409560beb85731b136541012f3f114a8e35c1b0ae9a9bac31d10642dc4ff3cad6a7e722e14e1d5092f9d4e3d7f5c4acb231edd2602d3452a6c9cebd323c SHA512 6a6bf1ff98caefcdbf78a8c83e11e155368bacdd806f0ae0c6afa8f513667df6598e594b3584de61acdca3d6049f4a776937f2aa8672b602bd6db7b737f6074e
 DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78ad1467214f9f981feb4fae279c1f4b5f0bc3f7a643c2229b17d19e32c1ea894dc16d73b036a0b32f17faa9ac55615c SHA512 96369b318df9592ed4ff48d79ae695f89d27d85e8f5de72548fccb19ac15b83a33fb8bc096a3092d7a7f5b201af08805576888418c7927cf48b892df56464682
-DIST certifi-2018.8.24.tar.gz 146866 BLAKE2B 92a609bffd777a624d18e612e2fa504b1cd4f0764f979d22bf6785158fb928d30984fba16b839f6b4066395dadcca485e6215c6f0b6b550d891673a79ea77c08 SHA512 bb0af24570dd4806bc80cd438cae42db82f820de815a6148b184f58c19cd91a03f9275815559817a84220dcbd7c87a4a7d12e35cf4a95a1dbad286a1dfecf907
 DIST certifi-2019.6.16.tar.gz 156721 BLAKE2B 3990a9c122dbaf554f4482ad97192efa66f1cf54e83bd4ee67248bbea8797dc4da38ab537230a8263a491a2a2115528138965480ef4da6d6cba9ac2af5bff830 SHA512 4641626bc5073cd0b3a520855ddef1007dcb42933baa7a3469856f936e725581042bcbd5b67e984ba9748e7faa62b9125cba7dc160dcc5db2eafe46461a29f5e
-EBUILD certifi-2018.10.15.ebuild 1417 BLAKE2B b93161fce15a55cb9131c6c90b56981f7b82524deb0831ebbf00b2f05088db53894fca47b5fb3a11fe0099632ad447a8092fb67f2a74428ca8f8cab56c74aa5b SHA512 c82821bd3a079b417d5fcac7eadb0fac0b739468587109cdbbbbd2861cd39d002a0d80bd6deec8f1e1af1c2d977b5370e33eee93a30392f4353633734c934d96
-EBUILD certifi-2018.11.29.ebuild 1424 BLAKE2B 1e61f55b832357bfa38af6093dddce06dec6b1d39386300df8cc1578d865a9a85ff70cf59f862d93e5104a6748c083050d3629aeaeca9d43068f641a76a70989 SHA512 9d57eff51970edc246351178de3f4bedbbc0f1d936c3ef42895ec26735dfbdc41de342dea6da066ab82fbe149dcb7a47415725d016e1d15068163d8804f4c1b9
+DIST certifi-2019.9.11.tar.gz 154855 BLAKE2B 1a2e39b44e2285bcf2dfc0104873fc2c5004c54b346a27beebffa28894c22ba77b7ba0b17131e686846be14c2200ea0fba89f8b465f4c61139122d88d6d1ebf6 SHA512 aab5734bf65cbad12772bb120153b0325a5c3226339e0a03fdf4c3413303feb930b6d53d1d9dab93bd4f3cf00d2bfbe86419c4c462570340f1a4aa143a31373c
 EBUILD certifi-2018.4.16.ebuild 1416 BLAKE2B 48ac08224435ba34e10f7af84c882de4cd50bd7e24b0ca66ee83db9f2e8a955e2163ef1ef8d8dd90b9413a4447cf1c2d15cba9956c5d6e7a7e3d1a3d577e7dca SHA512 8c2ec3d4d0471359c79e47296eb66f7d0a40e06b79b582f276721bbeeb5dac35ab07c24fef472b54e435850350962d1d2e1c8dfd32711ef36311e6f51cc8bdcc
-EBUILD certifi-2018.8.24.ebuild 1429 BLAKE2B 462a10d705e5878059893d1ff0551790c00a70d67895451c91642d6bd1ce30d7708e3af5aa51b89418b969ed7e26377ba7369560da33af20f2c2c4da6f8e1fe8 SHA512 ea4b536af66ecd7a39fce8428cc78cacf1b55a183f822c7e83752e6baa5d0c78d52913255970fa8fb960dd501d967352b2dd372492daed35495eb558570182ae
-EBUILD certifi-2019.6.16.ebuild 1415 BLAKE2B e37e59485fc7509f9264a8bf51f41e6aa62c7392cb65f99b4b89c19fa4bc15b9d31ea2c4147c3492c2ea42f4fb7038620caad30dff68287964b99ca0f1d6472c SHA512 708beb10511cbbb20b5097abd4bc7827045f62e0007bc1295ce368e83866a01c0259ef646231fec9dbf1304fa399d4526795fc5702dd3f5f4063ec18acf72cb5
+EBUILD certifi-2019.6.16.ebuild 1410 BLAKE2B e3c21451c48553d9480abc4451e17edcad976810a47f291f8bf655a7d01e491bf96b0e434df0683204cb33a5c5d0b84aa394ec3d825b68a16a98d55f355f6c82 SHA512 d2316ba066d70812d94d979a8feb53e8975231d41edf9e6f0c956ef739d8993b3757b4b37799c73aed64da855e1aaf3d658889f7cce884cc65f0aca21d2da906
+EBUILD certifi-2019.9.11.ebuild 1422 BLAKE2B 4e09d24aaa4621b3d0d9f4f54728d753486d94d7c91dd63062574c16ea7d7b239948eac59edc6bbf3ea5ab9eaa8f21dc1cf270320d26322c2a5bbcd844eee675 SHA512 d3e2b72c3dd378edc5b3e5f99daa00bc1880de0f4a47845201a2d2ca9d119fc10088ba56d82c13ca5126da939cedf0d113d4980bdd476b00127826d1acd3fece
 MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd
diff --git a/dev-python/certifi/certifi-2018.10.15.ebuild b/dev-python/certifi/certifi-2018.10.15.ebuild
deleted file mode 100644
index 8638a44f3fee..000000000000
--- a/dev-python/certifi/certifi-2018.10.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
-
-inherit distutils-r1 prefix readme.gentoo-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-misc/ca-certificates"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Do not drop this patch -- this will affect system's security
-PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	eprefixify certifi/core.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="
-		In Gentoo, we don't use certifi's bundled CA certificates.
-		Instead we remove bundled cacert.pem and patch certifi
-		to return system's CA certificates.
-	"
-	readme.gentoo_create_doc
-
-	# Precaution -- nothing should use bundled CA certificates
-	find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
-}
diff --git a/dev-python/certifi/certifi-2018.11.29.ebuild b/dev-python/certifi/certifi-2018.11.29.ebuild
deleted file mode 100644
index 616a1c70cbfa..000000000000
--- a/dev-python/certifi/certifi-2018.11.29.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
-
-inherit distutils-r1 prefix readme.gentoo-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-misc/ca-certificates"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Do not drop this patch -- this will affect system's security
-PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	eprefixify certifi/core.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="
-		In Gentoo, we don't use certifi's bundled CA certificates.
-		Instead we remove bundled cacert.pem and patch certifi
-		to return system's CA certificates.
-	"
-	readme.gentoo_create_doc
-
-	# Precaution -- nothing should use bundled CA certificates
-	find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
-}
diff --git a/dev-python/certifi/certifi-2018.8.24.ebuild b/dev-python/certifi/certifi-2018.8.24.ebuild
deleted file mode 100644
index d8e1f0a40140..000000000000
--- a/dev-python/certifi/certifi-2018.8.24.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 )
-
-inherit distutils-r1 prefix readme.gentoo-r1 versionator
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-misc/ca-certificates"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Do not drop this patch -- this will affect system's security
-PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	eprefixify certifi/core.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="
-		In Gentoo, we don't use certifi's bundled CA certificates.
-		Instead we remove bundled cacert.pem and patch certifi
-		to return system's CA certificates.
-	"
-	readme.gentoo_create_doc
-
-	# Precaution -- nothing should use bundled CA certificates
-	find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
-}
diff --git a/dev-python/certifi/certifi-2019.6.16.ebuild b/dev-python/certifi/certifi-2019.6.16.ebuild
index 50b26cdf12c1..afbbe02b3d32 100644
--- a/dev-python/certifi/certifi-2019.6.16.ebuild
+++ b/dev-python/certifi/certifi-2019.6.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-misc/ca-certificates"
diff --git a/dev-python/certifi/certifi-2019.9.11.ebuild b/dev-python/certifi/certifi-2019.9.11.ebuild
new file mode 100644
index 000000000000..7c27b91e6562
--- /dev/null
+++ b/dev-python/certifi/certifi-2019.9.11.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
+
+inherit distutils-r1 prefix readme.gentoo-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-misc/ca-certificates"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Do not drop this patch -- this will affect system's security
+PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	eprefixify certifi/core.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local DOC_CONTENTS="
+		In Gentoo, we don't use certifi's bundled CA certificates.
+		Instead we remove bundled cacert.pem and patch certifi
+		to return system's CA certificates.
+	"
+	readme.gentoo_create_doc
+
+	# Precaution -- nothing should use bundled CA certificates
+	find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 6bf8aecad5b7..c0a1279b87c6 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,10 +1,8 @@
-DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.0.src.tar.xz 12868468 BLAKE2B 3cb96c95c4d9713feb7011e4f1ca24be3e7f6c9b458f6cd9e6905f99737312ca44cb701ed5871e47dd583145e5898d53a65c4cda6456af3d4ca31b670ed84409 SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
 EBUILD clang-python-10.0.0.9999.ebuild 1059 BLAKE2B 38dedf48dafdcafbef15e24255df373c5ab288465a0bedc711ab0de1fe2a72d5377ea16c68af4519f2f763de32e4017251f55e9bed069c82be6d26eabd470948 SHA512 b86477f547cb290f61a5e7e975aec95583e30d43f78b2618d909bab333aa5e574ce5ea8e3197098d3e299387f1d6bbf8814da67a74da6e3dcb369bb77f1433f1
-EBUILD clang-python-5.0.2.ebuild 1072 BLAKE2B 19d846f9e6dc2c1671c816f70ef0a1b766cde0ac96040032cd16d0dcdcc9996849725442981e2f6034872ab043dc8f952126852366b1be34a056dc1335aa5a26 SHA512 31dc85d0fe65832a62aa7097661b8db78e9689a627225f9634755a30bfaec9827fc8822365d2c7e29188224a6c4e3347ceec2e3b925e40931872e8b697cd6231
 EBUILD clang-python-6.0.1.ebuild 1090 BLAKE2B c98cb3a9f8426a3ccf544884459a6e551ae22d51ae45843aa63daa10cf0da9bf4d22f9a1ec635e0dbd045d3d93a9349e79d8dea840bb846285ff07619215278f SHA512 0b274c8efda44e4d1a3f9de7cd5b8fac5bb0a60ea5b1878fe8c07df098abdfa9b8a2700debaad7f425951c4b5c4c336fc8661acd8bdac6da4ac97e152e6c13fd
 EBUILD clang-python-7.1.0.ebuild 1099 BLAKE2B 28f23947826044651ab666dffe31466f1c7f8000eec9f5f3fdaaaa6c5380400d144587c305aea974da935938e1c4921e434442cf5d57a8d611bc93b0f7e7c791 SHA512 3a05a76fe779227853c3ffaeb453b2980bc290b238527d89b1a1b3f5be07610b082369d7e42b3e09b26e8408c9db08b55236743dd3f36dfa26398a6bba6c2953
 EBUILD clang-python-8.0.0.ebuild 1099 BLAKE2B 28f23947826044651ab666dffe31466f1c7f8000eec9f5f3fdaaaa6c5380400d144587c305aea974da935938e1c4921e434442cf5d57a8d611bc93b0f7e7c791 SHA512 3a05a76fe779227853c3ffaeb453b2980bc290b238527d89b1a1b3f5be07610b082369d7e42b3e09b26e8408c9db08b55236743dd3f36dfa26398a6bba6c2953
diff --git a/dev-python/clang-python/clang-python-5.0.2.ebuild b/dev-python/clang-python/clang-python-5.0.2.ebuild
deleted file mode 100644
index c7b8804e71fb..000000000000
--- a/dev-python/clang-python/clang-python-5.0.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit python-r1
-
-MY_P=cfe-${PV/_/}.src
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}/bindings/python
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 1f707c4c399d..0cb12c405cdf 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,5 +1,7 @@
 DIST cloudpickle-0.3.1.tar.gz 18927 BLAKE2B fab03106f91d475c83c25d0259fcf4e70baa96422bad84e7393967ea480ebe36412b32792a4e334f6a495c795139accaed739a3e3f3d7058352dac2f0f55974d SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d
 DIST cloudpickle-1.2.1.tar.gz 42138 BLAKE2B 37579a1dbe6c38697236273f67221d2cc497c1bb92a268e39339a9c55a348645cd6e0872ef720e19d0e891359ad6e0af3b6cba8416c431c79979c68c53f9aa7d SHA512 5ec7ddceff7c43e46011370ba00f693dc669a1b3e1cfc42b42483850879d6246073ed20d4ca92698984b4935f5b69e5ae0dd96dad82de3f296e38ce7b644a6d2
+DIST cloudpickle-1.2.2.tar.gz 43576 BLAKE2B 9b99d106196ff88bde8c8add2eca7dd0c6118c89b3d68892b17b11ad73435b83387490e4c5c52306b4355033595f9783e3a313a6bd58f9eebf4517ff77d486b1 SHA512 44f41433bdb12e6495c14b7a470ee671fde3fcddf1a57d8f6d1203925a63944a1458af3ae7fc0353602f9900bd92581699b1f7ab199668f0425447ed8337bfb8
 EBUILD cloudpickle-0.3.1.ebuild 649 BLAKE2B b03f481cec5af1f73be2d7e6a64a524e6de9c11fbc80779c7b7bf4f77b1edc0e98a44906a8c3fea6f43ea8986ca38407a73b83c5a4b700f6ee82ef34353dbd20 SHA512 a0acb2a991270b87824512daf57c6f29b77b9c009e393951968d426d4e1bb63288c67baaf302096fa5e222f0e7ad0044ba4c0cf8d94e04586d40f2e1eeab9da0
 EBUILD cloudpickle-1.2.1.ebuild 749 BLAKE2B 6bb06894ea14b8949443688268f7c20334a6ced9715589b8463629d9965318cac3d9ac417c3e693450ce4f4d3889f14ed07366f82bf957c0401d3d3bbd678a8b SHA512 45f8b44bb3e387a1d7d5dec5530f70a690c00a3ffb2059434031ea7b5ca153bf33e475fa08cb99a6eea22450e250f458d4846ccf63a6874b4bd8333f372ed91b
+EBUILD cloudpickle-1.2.2.ebuild 749 BLAKE2B 6bb06894ea14b8949443688268f7c20334a6ced9715589b8463629d9965318cac3d9ac417c3e693450ce4f4d3889f14ed07366f82bf957c0401d3d3bbd678a8b SHA512 45f8b44bb3e387a1d7d5dec5530f70a690c00a3ffb2059434031ea7b5ca153bf33e475fa08cb99a6eea22450e250f458d4846ccf63a6874b4bd8333f372ed91b
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild b/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
new file mode 100644
index 000000000000..74f40c775fc0
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-1.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="https://pypi.org/project/cloudpickle/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# -s unbreaks some tests
+	# https://github.com/cloudpipe/cloudpickle/issues/252
+	pytest -svv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/confuse/Manifest b/dev-python/confuse/Manifest
new file mode 100644
index 000000000000..6520d4e4287e
--- /dev/null
+++ b/dev-python/confuse/Manifest
@@ -0,0 +1,3 @@
+DIST confuse-1.0.0.tar.gz 34790 BLAKE2B efa23f59e6d450160af279042ed3d77b3b26bd1fe2fffd90b0ce1c87821b5540048b45644bfff1a8420007cf2a705d388965daa20034bb8f846085dd92b49186 SHA512 f436a400b9b84db1a20409c70d64fdde44903ffba6c3618917fd297e04ecf3dda806e315972f7cf1f786c93639b10b0652a622a579a2cfa47703386a43433c8d
+EBUILD confuse-1.0.0.ebuild 953 BLAKE2B 0addd6eabce174929e85f013587383db1149143c90a1a1de420e772f7efcec4d249fc27ac0b2958264728574c3829658345313616730338fa5c2b44f6037a4ed SHA512 491a8e32b47c39fa0fda44ce6eac43c45f156a2f6d7c86146e3ddabb4918e667655c3a0e137facaee04ba3332a43dd245553afea9762e5201be9665449230b5e
+MISC metadata.xml 718 BLAKE2B a6560be26b0df5dcc2eba17f94fc39f9c046eb77dfdad707c1c31e193f80b5d759a7bc952e02e1b366d3808ec693af515f49145ab07999b33dfc4246df409b6d SHA512 a1ae6c33763436de811d9f72b654586d5f08f6ed6130756455cdd9c200f0f800494242224ca8bd80bb99a6308a730940fdeea170e5c6816a8edcbf14d7d171fc
diff --git a/dev-python/confuse/confuse-1.0.0.ebuild b/dev-python/confuse/confuse-1.0.0.ebuild
new file mode 100644
index 000000000000..716e4d492632
--- /dev/null
+++ b/dev-python/confuse/confuse-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Confuse is a configuration library for Python that uses YAML"
+HOMEPAGE="https://github.com/beetbox/confuse"
+SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		rm -r docs/_build/html/_sources || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests -v || die "Tests failed"
+	if use doc; then
+		sphinx-build -W -q -b html docs __doctest || die "Doc tests failed"
+	fi
+}
diff --git a/dev-python/confuse/metadata.xml b/dev-python/confuse/metadata.xml
new file mode 100644
index 000000000000..b32d7cb6cb71
--- /dev/null
+++ b/dev-python/confuse/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bernardo@standard.ai</email>
+		<name>Bernardo Meurer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Confuse is a configuration library for Python that uses YAML. It takes
+		care of defaults, overrides, type checking, command-line integration,
+		human-readable errors, and standard OS-specific locations.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">beetbox/confuse</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index b5d62b73c72b..358b86fe69d3 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -2,4 +2,4 @@ DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a25
 DIST constantly-15.1.0.tar.gz 21465 BLAKE2B fc3781e521f3a9988567c437e456e2f8215b8d61115e076d4f9fc52926125540f59bad457413105422d31184506bf7fd3fa38711dae8a8057b38941f2c5584bb SHA512 ccc6f41b0bd552d2bb5346cc9d64cd7b91a59dd30e0cf66b01e82f7e0e079c01c34bc6c66b69c5fee9d2eed35ae5455258d309e66278d708d5f576ddf2e00ac3
 EBUILD constantly-15.1.0-r1.ebuild 715 BLAKE2B 2f64c92672e10400d698de36dcdfca147268bdac865b03fc9893cbbc45b59e6677187f0254a214499c2bb3ae4bf6eb7b7724b9c647beda133b3d8e84daf22478 SHA512 2a1c4720ffc1ac0eb9fc17be6f42687765098ef9d0e69e77eb889546108df3cd2e93560666d484f49fc4b75be8cbf7f3abff33495dd0fc18190f1622afbbaef7
 EBUILD constantly-15.1.0.ebuild 564 BLAKE2B e35159a5947f5e20a90fccd5a8f7e157e2fb89e45d874daa1587b7a19cc12bef3eaf5a72fb805c2029378c527becf1e65c0980c3459859c4c8c320c61d794af8 SHA512 05b76c2db156f6283c43bec8143bf4e0be4b8696a071d9a8339307ed7df6c860eebc51fc4d6d338895406fbfab396b10231e0bed39df7525c882ebb90c049e50
-MISC metadata.xml 714 BLAKE2B 696bd5218dd217515c0b9d6ac7afc0da90ac2ed404120221de9b35a84621533cf1aa8d55878c722f55a59c2a36a4216a092c88efa0936e94dc980a1ed577c990 SHA512 850ed41a1f806475ac8a877f78d4c4df161a81ea47fe08df8e0fd9161f6823ca401519b8c007f06f5db182924e906ffc9ca912b72b4f2f9e66a5ad80d8f67f66
+MISC metadata.xml 664 BLAKE2B c08531b4ad0b05cd57b529174a364c5761e99f333515728204112e81552e40e4bd016e80e7e848a532203314b1a2ff525a0f984e7bc0c2147d4e6eb7446d98ab SHA512 5570cfa8d4c71931cc24c1dc8dfdd3610447cee11097f92c7794a3850a946755991a3f3ad043e3d6a4b05f87bb85d4a819799623fad6e1b10021fb37afcf3c22
diff --git a/dev-python/constantly/metadata.xml b/dev-python/constantly/metadata.xml
index 7e91503dc8e6..41dc97f59633 100644
--- a/dev-python/constantly/metadata.xml
+++ b/dev-python/constantly/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>twisted-python@twistedmatrix.com</email>
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index e4402611a159..0d700d08de35 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,5 +1,3 @@
-DIST doit-0.23.0.tar.gz 316588 BLAKE2B c7c2edc3e38e60bf4cdf6bd7eae4f65606da3168e3def4710ef0a2e07fe9c9c70b5555bfc1b2858f3536ba2ff3a9b8624353d1bf8b1ed8901f76a2cd5f32ae9b SHA512 f2298d76d9ce3e7ed5f356bfdeeef8d5d99ebae74571666a3d2b3843fc63f5a8f76cd6cdedcfe8fc81bc653ecf04951c11f50abd16e9aa8fc7539e3c224b0e4c
 DIST doit-0.29.0.tar.gz 222341 BLAKE2B 8489568fe9236af04f87debfb4889840aa162d17d20f82ac0a9a22d1034b4c58976cd6829486a15b941ac1f50e7137c052fe332657c2b3f529fe2345bbcba2fc SHA512 a686457df31b414d0c3797789e0ae1ae5cdfa3674025236419cb59b254f342cd2db07911ef18b2cb576d8d817b44035b9372265b34b786b2779fb7074b394de1
-EBUILD doit-0.23.0-r1.ebuild 1931 BLAKE2B f7456f62b23d8fffc448e60688820b291e4d367477bde64f61725062bedb2909e2e9d6af37b0349f3c0324a320684540c2d6ffc0018b1a09501d9113c5535627 SHA512 1bc004b86aa9a74cbba791d918b6893bd7685d0136754fd1c63038dcdcb0c53133110f9d6d6828ce8172b5cf405af6015a099d539d91ece404aa4d3388fcec30
 EBUILD doit-0.29.0.ebuild 1959 BLAKE2B 38d1131df9b051da0037918dff7e17ab5ed41b4c30e6b12becebb359efcdaee93079780f8fc4688515da9290d87bff49f4c971108b68dedf167f3f9f2a3d2e50 SHA512 ef7a2ee93fc106c8d1f58fcefc2d34ed2f5c577d124e32c31cf32aed2d406332fef4ec680c90d7a96966a77d3b2a1e3dd9918e3d329f7ac32eb9f4ee7c24472d
 MISC metadata.xml 295 BLAKE2B 3613e0bcfa3a5b2d21fa4eeaf8eb44475f01a98462879581f558f1c7c9cf9ea9a8b39bcfbf0ded02f964d7d4060726c1bc4dc622ea19cf75b35afd1e1560a408 SHA512 67b65f9a4adc57efe3c9846e3088737b28b74d80025bf2647aac3becf7cf542f0dee0f32e4a5d05299c768a8eb65729373fbe4af2c72ab073df1f43040b0c393
diff --git a/dev-python/doit/doit-0.23.0-r1.ebuild b/dev-python/doit/doit-0.23.0-r1.ebuild
deleted file mode 100644
index d3f06af7c264..000000000000
--- a/dev-python/doit/doit-0.23.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-inherit eutils distutils-r1
-
-DESCRIPTION="Automation tool"
-HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.org/project/doit/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-
-RDEPEND="dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
-# Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-DOCS=( AUTHORS CHANGES README TODO.txt dev_requirements.txt )
-
-python_prepare_all() {
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-	# Tests of this file fail due to setting of a tmp dir which can be fixed.
-	# This known spurious cause does not warrant halting a testsuite
-	rm -f tests/test_cmd_strace.py || die
-
-	# These 2 tests succeed on running the suite a second time, so they are NOT broken
-	# A gentoo test phase is run only once, so these unbroken tests can be safely skipped.
-	sed -e s':testInit:_&:' -e s':testLoop:_&:' \
-		-i tests/test_filewatch.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Testsuite is designed to be run by py.test, called by runtests.py
-	# https://bitbucket.org/schettino72/doit/issue/78/tests-that-fail-under-pypy
-	if [[ "${EPYTHON}" == pypy-c2.0 ]]; then
-		sed -e 's:test_corrupted_file:_&:' \
-			-e 's:test_corrupted_file_unrecognized_excep_pdep:_&:' \
-			-i tests/test_dependency.py || die
-	elif [[ "${EPYTHON}" == python2.6 ]]; then
-		rm -f tests/test___main__.py || die
-		sed -e 's:test_invalid_param_stdout:_&:' \
-			-i tests/test_action.py || die
-		sed -e 's:test_run_wait:_&:' \
-			-i tests/test_cmd_auto.py || die
-	fi
-	"${PYTHON}" runtests.py
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	dodoc -r doc
-	docompress -x /usr/share/doc/${PF}/doc
-}
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 4f4fa4af9d36..d89d09a2a6fc 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -2,4 +2,4 @@ DIST hpack-2.3.0.tar.gz 41610 BLAKE2B 65fe4f07f64dddff5b24b3a84f7e49de32e358fa59
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
 EBUILD hpack-2.3.0-r1.ebuild 1037 BLAKE2B c2991cd6490a465965d1cb00d858a4808089b6e03d5ad7abca3bdde4ab74c9fa39750f67b52d792fd23ebce737b992b6ecb168f3cae75d7415982bfe9a44b1f1 SHA512 710a920578d1f33c504c310719fb5efc63a5f78bf35055878af4b70d4be29917c5e53332b263c31542e8f1d6f720ddc002642fb96b03d996977883f4d16a32fb
 EBUILD hpack-3.0.0.ebuild 1077 BLAKE2B 93b34fb83caf3eae5a5ee3a7a9204e08af39215b95afdb8cfd66c7ae907eccb3bed76604fa2ea68f006c3820d3255714f3b7568ff4f91ac36b0f7bf8e4813d61 SHA512 14daaa97b60aa03f2017dee2361d5d8bd3372468e359606aec989cf25451870ba732b521964a917bfc8a5caab1cbabfc5ec0c747cd64a6bbedc9b2523852f859
-MISC metadata.xml 755 BLAKE2B 07d55adb82a465399ac181c0bc57d6e884acc171eaf00ae4b32b1c7df02082a80e1904cca1755f755fdf3d7dee3028dfba951d7799485f43657c0141bc12c002 SHA512 0941a33f24de0db1f466447ba36585cd3d5dfa70eade8d076089cbe2309a7ac5498b77a712dc237f335a27c954b7b57be7c951c5a3c052b648499dbb545375be
+MISC metadata.xml 677 BLAKE2B 1440fcf100740188ffc8ae85da9bc014004feb2aa04d5f5db73546e62a01ffbe0975b9b588e6d579c45a2b1c803958999dbdd1cad8c1cbee597a3202556b7d4b SHA512 b7d64d3fa13e9e2f7a794aab733b511ec37809294b0c353d9cff55950dca47e57da8b5b5b80ffb0763f509a498816f94586c11dfdb569ecc6fa604f75c7a6132
diff --git a/dev-python/hpack/metadata.xml b/dev-python/hpack/metadata.xml
index d745e07486b5..83d597b0e26f 100644
--- a/dev-python/hpack/metadata.xml
+++ b/dev-python/hpack/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index da659a2939f2..8ec582a43e6e 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,5 +1,5 @@
 DIST httpretty-0.8.14.tar.gz 43574 BLAKE2B 4015bb234c2fe3017a43fff6e3b51a7f015d9d133756d4326750da1ea06ce1910d91d7b47625a08ec85856d156a0d8b3b18706e582578e3d186994b8e4f55c69 SHA512 5adab6450e8360cc21bab4136f64cd11757b9f292c7e27980fe2561f3e705baf4f0211b9e6ff4ec9ba96a788a6c5b5b1d26657972b67423c9c25491927b0884b
 DIST httpretty-0.9.6.tar.gz 7147633 BLAKE2B e1d02ddfce5ca987c6ef1a17723544f86a8573c2a6a26ec197072021e52015efce5064af21bfbe1ec03f3ac11c21717a80f114b5be2526b113e3bc0a608702f4 SHA512 bc1c64d34370209c732bc12dd9935600b647507ab2c8f18c85f348e9b5e853618ba39e10e5a073b35036e6cbe3db2cb7a342a721d0e4affa81fe178fd0b75d92
 EBUILD httpretty-0.8.14.ebuild 2233 BLAKE2B c062192a4fade698220d43fa678da19a743b48388bbddaeef2135a569fab4ed3db616e1a07f5d8d47f98cbfa282edf4a3934a0ffb18d8c4f118433e2a4c5341b SHA512 1b8a00ad1717b5facee7c5aefe67e5c45eddc7c7e3000ae39f417e9d9639701ef5211533fa41aae76d5fa9d6d2a7a4b500147e0708b534f2770ddb749f0cbd33
-EBUILD httpretty-0.9.6.ebuild 1042 BLAKE2B f6eebcccf82e891e70c9046464613cb327a82c16d5e314cea61a465225ad2dbb77f2e68d82fcaf922ec16a448969633a302c0dd4dd7f62200671565294ea1388 SHA512 490715c6a170393eadbab6d9462263e2bece7b4004d9e2b1096ae686582bfa7387d24f123d6c1d28b70cee27a676dabe12140f1a4942926c223e3dc4b676adf5
+EBUILD httpretty-0.9.6.ebuild 1040 BLAKE2B 1638bbb6c7eced3db0624a8c51c51df94acc7df7da14bc10ca288adff37ba08b9bc0d739ba473fbf6cc768bf673c1462ebce8f40720bafca5ca1b559760a3d35 SHA512 aecca182284976cd9a8382aaf1e8953380f9bba6d8684ee50b6b5451943cd4bc8d13d7db531f2756b9431d7071ee13ae497abf7ed1a187276bfb8b26ae064c50
 MISC metadata.xml 590 BLAKE2B 60285c5aaf3d213457a6a12c9db5c19cf174b02435277f43d2f7a1eb0bf93d95c915f9aaa63692bb8274a1ebcac8ce1f9e71746668f20914c98bc98fcaf9a44b SHA512 0e7a2237bda277a4e295ca8c5c9e5280f0620821b03901eba1d8c73735868b5397256679ae64b530638c0805b68822493ca955bde37eccc67cd101ad5ecf3674
diff --git a/dev-python/httpretty/httpretty-0.9.6.ebuild b/dev-python/httpretty/httpretty-0.9.6.ebuild
index f65d19098d48..8235b58144e8 100644
--- a/dev-python/httpretty/httpretty-0.9.6.ebuild
+++ b/dev-python/httpretty/httpretty-0.9.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index b94e71205f63..5ee426e0f13f 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -2,4 +2,4 @@ DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0a
 DIST hyper-h2-3.0.1.tar.gz 2198911 BLAKE2B 453ce1bf8e6216e2852f49c5a22ec5cfa487a744a818e82929dd0c4f03280953c1f742890d74f771080987e2f70d9430e4d66481501357f0d4c5ec490fc5fbf7 SHA512 5d98b4fb654c20f6b9e6918bb71b88a42a3027bae795f31c32c2b5cc4428774457c44a194f9c819f99b9cfd01753a6e6d8edb6c162020ff463602452d8e9057c
 EBUILD hyper-h2-2.5.1.ebuild 964 BLAKE2B 57d1688669cd75c8ee2180c25933d2d0268942513aa84c409daeabe1297f311f94111e2fc1a15d8e92ec03216f67b20df48fb869d01219d3685568f55ef58a26 SHA512 86feeabc22c851bd93af9c4208a08b582df60e865d24d10867ffdda2602b80c9ac66eaa0de3bbc8f8320f3f4d8a86aba5fde0f2b8032ca647b18b50fd6fd6d11
 EBUILD hyper-h2-3.0.1.ebuild 1117 BLAKE2B 7002974fdbdf60edafe99826b2873e905a1bff0dd3e79fe3ca2d67642d38079c5bc912130e785bb8c6bacce5f6efc05b37e82cdc1e99dc0222c79a28ab12992b SHA512 61486557bf4dd604c7187da7103ee2b195998f5ce0d61081832dd33fec90386ecbaa3f2893ac2c6f52e545e000e6562ada34d18205db3a7be64d9346a441c6a7
-MISC metadata.xml 747 BLAKE2B ca9107ee5025360a343d9ec92424ac6be517d1e45ffb2dab10f0c37c82ee30db30a0fa9eaf7bbd0066f0e772e47a09bb11e954afe3904bfad2f672961bb608f0 SHA512 5efdebf70cf061471f14af5941c609b31c75208bc4f632b05bf017e493d4a8091a3fba335c95efacb0a1271aaae6a54589032dfa393d2844053cb859fd6b0d38
+MISC metadata.xml 669 BLAKE2B fb8b8c6d1e8ae5cd8a0e6473c84a3d0e161f17ca671b24cdad86029af14936aab6cfaa9c119536980a69d96ce82fd296e407d8bc0d7eb2c5f1cebf37dd7a8f99 SHA512 ecf3d13974ec803b298d9be9898e5dd70c9bb2d9eb5f89ed37fd46e05f313ff3f8a4c6f01453dd92d7b5f74271516a2cb8d152cb9c1b2f26848b909525a038a2
diff --git a/dev-python/hyper-h2/metadata.xml b/dev-python/hyper-h2/metadata.xml
index 47481181a952..658230635a93 100644
--- a/dev-python/hyper-h2/metadata.xml
+++ b/dev-python/hyper-h2/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index d1216885ba5e..14643d99c538 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -2,4 +2,4 @@ DIST hyperframe-4.0.1.tar.gz 16110 BLAKE2B 44e99247a818c1f7b7b31b5170b72aed08511
 DIST hyperframe-5.1.0.tar.gz 17851 BLAKE2B f9c938b74699029bd39e2b1541f18111fea5ac760d9047fd09341e199948da13795d786f5a0eb8e85d698f90d07ffd02776fb82638ec1f1eb564059401291253 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b
 EBUILD hyperframe-4.0.1.ebuild 493 BLAKE2B f487d6df62a188e5940c43eb31f3bea742bc0fa7bfa5eff909844d6bf09775f10a229687b34c2d0593c575e5b86b2e8314769a126813a5a9ca10513a8204a84e SHA512 40afb635ed0e71f490fad22aa79aac908bf11065c87d3052bae365a48e832f484ca736a17e07b3eeca10b4c299af606077904f88f91f9c8fb0fb14f7310bffa5
 EBUILD hyperframe-5.1.0.ebuild 668 BLAKE2B 96a6c2db849f3e83531e33d88e53207b69fe762257c89a14353661a3649d4c3b882c7ceefb9e62d8550cf0e00bb0303e0357564fc5d17d7a2aab137a42a5ee2a SHA512 8cb73fb698cbe498f087649da8d1e92d213440d342ea74d81a5193e81f4a844ce3138d0be6ae306ea0916e08d7e656201ec8b8327e5ea21ea7808b88570100ab
-MISC metadata.xml 702 BLAKE2B 36daaf246eae4068fb2729e91e95865e831d1449f78f2c37061adff7530225c1dc7c68e245170acabc91178fc679116d5639d4779587f05a599566507b5da5a9 SHA512 4539720057ccf3c78a94dffea4f59f628a68e9f1d0dfd6ab987dd991f2b1b5e6d1b7b46c04fe1faf2249cdb481309b8a176c1947fc99801130a4c94f6a9a0032
+MISC metadata.xml 624 BLAKE2B 8c5eb7949a6b19a3341658ac90103bfa5829ebfac29aea3c5b1bb7861a0abe6d562ef304b3182d31402a45ad142f772c2887e5969f93ab4c8301abbe0d65cd44 SHA512 11667c2401c1c98563d96e63e08f9a013330c29688219dcf502afd751cb2259c688c55cae250f5ccb676c00dcd8bdc59988ec9bc9f8f92a25a985a784031e562
diff --git a/dev-python/hyperframe/metadata.xml b/dev-python/hyperframe/metadata.xml
index 1787975c8ad8..3cd8a5d5e644 100644
--- a/dev-python/hyperframe/metadata.xml
+++ b/dev-python/hyperframe/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index 5d424bb09207..1a6edb178d52 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -4,4 +4,4 @@ DIST hyperlink-18.0.0.tar.gz 97625 BLAKE2B d189445c7375657614c38db9045d96789b78a
 EBUILD hyperlink-17.1.1.ebuild 751 BLAKE2B 75d916e3f219e4f22bf22beb036f66819f14cb701805975a278d718ab2e0616623c03fe649a52bbea7ef802a368d462008dd4cc262b0dcaa0d09e5589a4c4f96 SHA512 3a41f60aff8489ab2f8eccaaf60eeb059b0413b316882004a9d2a1629753ec6a0b8051b6dc21c54d84ab27d61d601ffa89ad7232ce1e0d599dbaa19796dec308
 EBUILD hyperlink-17.3.1.ebuild 775 BLAKE2B 024f3053f640d72207be5e49378f34999a33b9895100825593a336f5b232d73bfaf968dead1bd3d17462301766fbcae11d0a04ae79c14e5ad48716ee5b2c0348 SHA512 b9d28c8433845c743795138e4c4ee057dd473d2992d92d99d08ee568e230b109d6360904521b7d2ce849bacf39d93e7bd04086fa193656c3828d22b57e484d2e
 EBUILD hyperlink-18.0.0.ebuild 738 BLAKE2B 8dfdff6f28f3fa0a337ac245a126960e74ec52ffc1e141dc32a9bb34af0f5841091b4ad20f269c2aec717e9b3c090299e46efcb8bb7450755c96c8250caaa67a SHA512 8864982ca704b2b3557ba9c96c4dd47cfde792051775b8601c66d0c8591cbb0fbcd59084a6bfbe12d43bf5354b23f56e1bc35cc6bf7f14c3e2ed699ad050e6c0
-MISC metadata.xml 751 BLAKE2B b9e49354e3472ca16622fd269867df7f0c5f372afa5f93c36c2646f35e0fe1e1fcd6b25c66ef73e13e442019be449ea72b26fda807e3d220fa254c4d7a691f21 SHA512 7cd14daa771935591e7a130d9dbcd20630074d49ffd738d964b631798a0466392e0b669cc009f3c769614d704925699f2bc3239bd5e78ba0c2cd629dccd72591
+MISC metadata.xml 673 BLAKE2B 054899b405550c1b1e891ad235cf2dd553275aa2d791c874073c83510123d4c995656d9777b022211369b705b3c068fa48abf2b6f3f63e5a78bd0a77fa367248 SHA512 4ddbf3e9d95f7699b5099d8c296aa3a777d9685e93e7f84734773c49d2a9174055cbed229cc0a1ddd2e10e3f414a6c93dd08eb3bfbc0717a4bf828ccf350060d
diff --git a/dev-python/hyperlink/metadata.xml b/dev-python/hyperlink/metadata.xml
index 381196fdc740..6db633f711cf 100644
--- a/dev-python/hyperlink/metadata.xml
+++ b/dev-python/hyperlink/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 026f1f97fd6d..7abceaa9fcb5 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,5 @@
-DIST importlib_metadata-0.19.tar.gz 23338 BLAKE2B 10c43bee5324804b359f951e5d375559e3a58663b11f0bda1b39ce82dcdd0ba735083793a954e2ac18b5fd607d9ea5628a86f9c345c83d718a7e46738774e0ee SHA512 2d0126e7430804b2295ec159778082806957cb86b5c7408c38064cc7c7e62229d382778284a5a231925ab336a7cc6da8e705f6bd7ae6da66f11acd1229bda17b
-DIST importlib_metadata-0.20.tar.gz 23712 BLAKE2B 0af0b4fad171f24aad0b387af98b9f5c0bfec14e7f358e45afb70650dd1daf3b8abde8012ebe2e4f5751792d542d2567dda856696de8cdf96f27b50560c55645 SHA512 663d6af2f2d83c4744809b4b58ebe4152962ee40ecf17070a532614c7238a88374aa70fcefb6b7ce26d2d351b00c0859ce590f734bdd2ef76ad58b041307a95b
-EBUILD importlib_metadata-0.19.ebuild 1421 BLAKE2B 1a847f367c90077958c6229ecfbd0c69e62f820f01c5a7e59e926e334f257b34dd8831edd506f30edaa6112094cc4ec33de50559a9dab6731cc14280ae699699 SHA512 fce535f98e691c07caf170679d86ec45fe6991b8b1a385af3ce23581c720354a8adb8009c37070de4e2186c9eeb323bc5faa64628d455908c5d6826b1e684f72
-EBUILD importlib_metadata-0.20.ebuild 1421 BLAKE2B 1a847f367c90077958c6229ecfbd0c69e62f820f01c5a7e59e926e334f257b34dd8831edd506f30edaa6112094cc4ec33de50559a9dab6731cc14280ae699699 SHA512 fce535f98e691c07caf170679d86ec45fe6991b8b1a385af3ce23581c720354a8adb8009c37070de4e2186c9eeb323bc5faa64628d455908c5d6826b1e684f72
+DIST importlib_metadata-0.21.tar.gz 24693 BLAKE2B bf57095bbb5eea1d09c5af90ce33946431bdad08bdfc32a8eabb29fc21ddc0f8b450631bba3eb7f2fe3635dfa0130d4bb7449cc2975b7e4740b945972560d5fc SHA512 f20e05c7806a08417020573b0e1d6c57009325c7e21dba46d18c93e24d8c696d66d4628b83093815f443d7f0797ca5a946f1e5476037007c04378c24cca0a2be
+DIST importlib_metadata-0.22.tar.gz 24951 BLAKE2B 63ffee037f1c6ebf47d6c99fa7ff7974b629869b272709bfdf700d34c6f507031b79b5d691c95a69204ec3df28765af00eaa07c1d96b590e983202be0fc5f0ef SHA512 73178fda41a8ac71f45e8c6220f43b757b53c47bd9fb8295a2a510537436bbc2c7b1451608ca6fc0bda687d3e38a6132950bc9bdc8d0fc3e234f510f2026c7f0
+EBUILD importlib_metadata-0.21.ebuild 1462 BLAKE2B 180a5fc95ed072ee448aeaf80bc7c1027ea3554cef260e5479fa36147c8afce88fdf645c75f95e645596102f2622a0fe313b234919bc30efa3b80105cd67f1f1 SHA512 7ce52ab68e526fccde5516a77786c3129e848b9e17976aa10942fde22eaeabae276b96a8721e014b73ad8344ee78920e10bad2266764def397e6ee4b29c9993f
+EBUILD importlib_metadata-0.22.ebuild 1462 BLAKE2B 180a5fc95ed072ee448aeaf80bc7c1027ea3554cef260e5479fa36147c8afce88fdf645c75f95e645596102f2622a0fe313b234919bc30efa3b80105cd67f1f1 SHA512 7ce52ab68e526fccde5516a77786c3129e848b9e17976aa10942fde22eaeabae276b96a8721e014b73ad8344ee78920e10bad2266764def397e6ee4b29c9993f
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild
deleted file mode 100644
index 8c74d5303223..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-0.19.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy pypy3 python2_7 python3_5 python3_6)
-	)
-	doc? (
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" ${PN}/docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build ${PN}/docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.20.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.20.ebuild
deleted file mode 100644
index 8c74d5303223..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-0.20.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
-	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy pypy3 python2_7 python3_5 python3_6)
-	)
-	doc? (
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-"
-python_prepare_all() {
-	sed -i "/'sphinx.ext.intersphinx'/d" ${PN}/docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build ${PN}/docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.21.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.21.ebuild
new file mode 100644
index 000000000000..665f1f6de4f5
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-0.21.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://importlib-metadata.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy pypy3 python2_7 python3_5 python3_6)
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" ${PN}/docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build ${PN}/docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/importlib_metadata/importlib_metadata-0.22.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.22.ebuild
new file mode 100644
index 000000000000..665f1f6de4f5
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-0.22.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://importlib-metadata.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2)
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy pypy3 python2_7 python3_5 python3_6)
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" ${PN}/docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build ${PN}/docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index 2fd61e5eee2a..70f18faa4ee6 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -2,4 +2,4 @@ DIST incremental-16.10.1.tar.gz 16066 BLAKE2B 86bd85f9ea1ffe92a572b1744588f34f21
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
 EBUILD incremental-16.10.1.ebuild 601 BLAKE2B e4ac8f04289e31f2c5d49baa67ceb1fb916ce02de98f00a99e7eb837683ed30a1070b013ab820745ea51f1baeaffc5ee6ca9691bbe60c87aac5d48e88daa68c3 SHA512 6732f772a2cfcb1887d8301d71372c0f3d659434d9a2d6b5a7f404bfbdc9bc90b39fe067afcdc9e5b3958fb40784af1063bd8abb361998015b84c49a2915853c
 EBUILD incremental-17.5.0.ebuild 653 BLAKE2B 60e257fa5732e4cb562bf0a38dfd744fb78867f58579bd4030460ad02fdc6d9f7fbc6c6ea74140ef80249c757595225e5a977cd62ea765004c5c15057c025dc7 SHA512 6fd3944a48aa7c99b4f956ad580343cdf31eeedb4cc5466a79a56d82533419cd64e34a97d6a96146011d38b5c297a707ccdc5f1aaeee02bfdbbed134cfe1bac2
-MISC metadata.xml 554 BLAKE2B ab26ba9e5a69a853b0c0a167dfad54de819a17ad44a47a9987e8cb632bf1551151a208500f37c96543d7f577e99d6d47b4157c97b71d7ae60e88cc086a1ef1ba SHA512 a3bd82ee309e301f175da663ecda74af803631324b0d1097082ad04e6bd9e2537208fea8ebf753f38341429b1d2bfffc887ced6b707655ec862541ff93e83c6b
+MISC metadata.xml 476 BLAKE2B 0735d3636617ba9b856e46daba71508248af3f6f8f4edaf0b09fbbf14a08704876ff40d2ccd0df5f8804120f63a4869bfb9411c3f8ed2206179ebbacd21375cc SHA512 1ff0b8bca8dcb14df175291256c1c429e18799429e395230be47dde473c1541ba2e1a229513fc079ea4465e92dd82d974a65e055540b9b4cc423160ad8c1343d
diff --git a/dev-python/incremental/metadata.xml b/dev-python/incremental/metadata.xml
index 5546d3a81b46..090da7e79e74 100644
--- a/dev-python/incremental/metadata.xml
+++ b/dev-python/incremental/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/jsonref/Manifest b/dev-python/jsonref/Manifest
index 1969300f4059..4f73ece6c678 100644
--- a/dev-python/jsonref/Manifest
+++ b/dev-python/jsonref/Manifest
@@ -1,3 +1,3 @@
 DIST jsonref-0.1.tar.gz 12296 BLAKE2B cab2b4778b8a0184989ed6ff520ed6f12a68e9109a92aa0fd5521b69ea14cd5b6301ce61bf98f0d0d4d44fb016f7d6bd99fc804975bddf1c350bc4b46d62f77f SHA512 9900601feab0c20c902a6d5575fd411898af126a650d0c9ff955f50f5bd1f5da8e5a071ca86cac31ce3c5fb35a516f849cbb70098cac2cfdc910ba33a1f7411b
 EBUILD jsonref-0.1.ebuild 539 BLAKE2B 86b6d8dc03a430a3095df932ec7ce3f7b187f4a21b84241eb1079b14fa74bf3b2c4d9d54570263fae9166b7c78ec0828d63be27ff8dde90c2289920951ee2613 SHA512 d7be5e1a2b8deb60626993bfc6c275c329e2cf0d64976629afaeec99b0003b1a225eb1a4ce1931c66e9c557723ae2da580535f49dc062735a4e55268609d1592
-MISC metadata.xml 878 BLAKE2B c04a91d47666d23682158b2dda26768bc852cd294243245dd356f394a202aa9419e9e2ccd5de13dc3d829f1753a01d82e255accd12136648d2f835ff9a0a506c SHA512 75f11417223f746923e659163d821248e74f08d2764e72315920740f60d1744c11a17f4c5441b71adf97e4baebeafdc5888376680d25367fa3a3065b4442d263
+MISC metadata.xml 772 BLAKE2B 48b8cc40f83a1ba2d3a4d7e6eed3fed74188b8a9ac8592009084eb692bc2902896692f125d986ef6418c4b1cf68abcbde0648cb3b0ec7a6609d40387105c0ff5 SHA512 59433a3ba6fbf178eb55dd21ff25e503235065d312a930818a85776079d0cda7d0a06264f83452302fa7897ead09c6414e53e7554547b6dc58d026a93dbe8d29
diff --git a/dev-python/jsonref/metadata.xml b/dev-python/jsonref/metadata.xml
index 5dfa62e1fb03..4e64b54715d2 100644
--- a/dev-python/jsonref/metadata.xml
+++ b/dev-python/jsonref/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/larch/Manifest b/dev-python/larch/Manifest
index 1b85533ce81b..68e203b1d15d 100644
--- a/dev-python/larch/Manifest
+++ b/dev-python/larch/Manifest
@@ -1,6 +1,4 @@
 AUX larch-1.20151025-coverage-4.0a6-compatibility.patch 744 BLAKE2B ae3af11a33d20d29fe9871f9a1bbd3ab257b60a417eb8c0304d38fbbde819d8c9f563117d4176316c6af7ac3dbbdc20f0ebffb75849d966c2e94acffd29f755f SHA512 e23e6a8ff656a85fa6511cb888611d172052ab7f9ae3b80b769f5f0fec473a5915e9e821279bbe5b7c24a901a8b43e115617766be87f0f7737d5ea6ab29d6fcc
 DIST larch-1.20151025.tar.gz 91990 BLAKE2B d5097fb3cd10063186dd7460b236be4564d2fef05926dad2958d200f05b44f1325fecce30d77c623cb21ae91a65af76824ebad1987a65467575ed194f3d35d5f SHA512 a0f0dd71e1558147f37e5d5f1cfd3e9b38fd925351067200376fa3644472a1c1e585d8f2f72a3d506eaea01d3dc834423d858d66d5c5fa1a746c6f4210380c33
-DIST python-larch_1.20131130.orig.tar.gz 86509 BLAKE2B f964bf4af316e010cc40513e3a767ee7d0f058ec78bfa417931ae0087e0b8d0e0c577bd99b5edfedce560fc3d21747a81e75dc1ed3527f9b054d3e8e55df7f38 SHA512 e661fa29043a5254eb3615f0eb54f6afbaf59020607bb72f621083e9f6acfbe92b1c978ce2be73336d8984a4a64ce6d0153556f0af0ca63ad53aff40f785d052
-EBUILD larch-1.20131130.ebuild 672 BLAKE2B 644cb3305da2ecc221e1c44f7260ca12f6a31a512a5fc1767dbbc78ca898631f73703212cf4c17d727b97908d4a64ff627b5264e23b7fee3ea91a965760658e1 SHA512 d6d981825d55c09994e5b819d68385534a7b36ace65ac38257d214331dba107a44a1245251018a4e0d1ec9e597db1b90c24fc9bf7dfd8247d79f9f05f456b790
 EBUILD larch-1.20151025.ebuild 762 BLAKE2B f05ceed5774ce43bf42e1d0490420e29d1e75f1bd3c790335c6453c7efd2c83555731b41a12510ae3363b8a021b8dde0fd43937184b2d23537e7098b0abfb58c SHA512 3a318f298125f241282f8b8b0831a1412f38d940330de1937d8f0287e6f9f672b49fd755b4cadccf0a016b8a933b344b361f93bd63581345a1b30a8960f7d37b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/larch/larch-1.20131130.ebuild b/dev-python/larch/larch-1.20131130.ebuild
deleted file mode 100644
index 1d7f8536f013..000000000000
--- a/dev-python/larch/larch-1.20131130.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Copy-on-write B-tree data structure"
-HOMEPAGE="http://liw.fi/larch/"
-SRC_URI="http://code.liw.fi/debian/pool/main/p/python-${PN}/python-${PN}_${PV}.orig.tar.gz"
-#RESTRICT="test"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-python/coverage-test-runner dev-util/cmdtest )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/cliapp
-	dev-python/tracing
-	dev-python/ttystatus"
-
-src_test() {
-	addwrite /proc/self/comm
-	distutils-r1_src_test
-}
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index fdd18fbe3948..753deb563495 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,3 +1,3 @@
-DIST libtmux-0.8.1.tar.gz 37696 BLAKE2B 48f780ed2c1243c752d35d58f1a7eee4d59297047abcfb0c02c8c9206ad2f8c7df9c2968935e30457dd14be8a9110b9cb1e3b7daf4d5df43e3533e400cd8b21c SHA512 c45e8c761fb9a6b827feff96d4bb263fb0419509a1bd450ac4038d7ad0b96b3047f0d6f3c7bbaa16686918ecfe3c8d189b99982574e4056abf5a491b20e0e7f1
-EBUILD libtmux-0.8.1.ebuild 660 BLAKE2B b5fec4fc30236a2283fc82016c32ac2f6659140c85c639f91792e84047f149dc906455a6ebfe907a1f94e04ab5fbe642e755bacfb8fa43a4280d6e51da7a993e SHA512 9131806a41b82b547b10ff5b1ef90a7130c8771828355d3c7b63365b4b1a0d7a9d199aa9c89cd2abe88dcc6c9c2d727f3c64281ea86f7065f08671875c220b5b
+DIST libtmux-0.8.2.tar.gz 37725 BLAKE2B 909a34b1a77bb221e6fd0ca6ef9075cc9ddd4f327cecf579d8aaff768668c9a71cff07a6567cdc0aed368482188936626dfc3f35a0b6723cd962294e2fc9d5ec SHA512 02156579c91e44e312ebf162b5314381645177cba244294b3251044be35c84b996263508cdedfd25ea2c182a87a3ff457154b9ed06e919e7149583b119a5e227
+EBUILD libtmux-0.8.2.ebuild 660 BLAKE2B 7d3b1f9b1f0ff61ce04880cb16bbe6b281d2e74403587bae4346a0d7219221c8168289d75cc3235adff5a807edd0273cdc954786f555690f86b029ad658c0fcb SHA512 665e56e7ab13b3817ac24da4dbe02f680f4739c16a4d58d2b06892055754dfc0866798fff3c42e76a9d861719040b451aed6e4ecf694242a6bb38e5c6d27a157
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/libtmux/libtmux-0.8.1.ebuild b/dev-python/libtmux/libtmux-0.8.1.ebuild
deleted file mode 100644
index 2c538082e6c2..000000000000
--- a/dev-python/libtmux/libtmux-0.8.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${BDEPEND}
-	test? (
-		>=dev-python/pytest-4.3.1[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)"
-RDEPEND="app-misc/tmux"
-
-# tests aren't included in the dist tarball
-RESTRICT="test"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/libtmux/libtmux-0.8.2.ebuild b/dev-python/libtmux/libtmux-0.8.2.ebuild
new file mode 100644
index 000000000000..96e575bd8742
--- /dev/null
+++ b/dev-python/libtmux/libtmux-0.8.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="python api for tmux"
+HOMEPAGE="https://libtmux.git-pull.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${BDEPEND}
+	test? (
+		>=dev-python/pytest-4.5.0[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
+RDEPEND="app-misc/tmux"
+
+# tests aren't included in the dist tarball
+RESTRICT="test"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 1caa1ebe195f..edbffdad79a3 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,13 +1,11 @@
-DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 EBUILD lit-10.0.0.9999.ebuild 995 BLAKE2B 8c6c5d8db23190085ff16b91eab188f94cf9938a45b8cdb7d8a0f488f4431ba07c823fe270383978ab3b850bf9bb68544ec8e5429b5bfd3e05c8da59191b2b71 SHA512 eedb9b2e32c313db08637c95f3086cc76d7d5505ae9b29bd3aefc630cddda51a0152c58a4d9d61aa5b3cf8667fbcf647c7bdfe77c02371abfca245d3a99b21f9
-EBUILD lit-5.0.2.ebuild 899 BLAKE2B 688966a355571c6ee01e56dc980df5ef49f966ccde9edd85143d7d306ccea6e2217dd4870ae3210fbf4c615ce8f57950a3aa34d44b98bcacd4a18d617bce79d8 SHA512 f5f36aef2a795c4b7d5c241810bf4e441b5271c3edaaaffe2a3250fed2f08bc1bc4907cab20303747d1c970d74fed16b55fd48e919b741f3cddf6fb1b27e12d3
 EBUILD lit-6.0.1.ebuild 1009 BLAKE2B 6e468d6a7274031b8e81eaa7c0827ae991e8e11f7daeb20d86fbaa56d26b2462a58e58f3afc75369bcd04c229d3c7644c06f97c08e0eb0fb5b04441bf190ea3a SHA512 63870e81d534e9995d2476934962055c6193522dfff741d2a99155ac83d15ff7e7ea81bb89af14e8d3b09e9dea9f6f593f520f062e4af80738bc1afb3183f58c
 EBUILD lit-7.1.0.ebuild 1011 BLAKE2B 947aa38ed1ef868f32392a347c0c959b7e5a1091d59c995b69bf5539c58fe34e2994b0593846fe6fdb61b3d97ebed298e47bd0e71fa1b47cad3822401a56f485 SHA512 464a34437c15520924e783375a9aa9ce581871850a6fb756599d30b65ccc93e8f93114b184c3e155acd7e11382d6f748b8e866fc6400d863c7a9c99b0a818af0
 EBUILD lit-8.0.0.ebuild 1015 BLAKE2B 70ebba5849fe2d5d464d2fb2ddf1a903e992dbab59ced42048c16276bcbc71af3e1c72f8d726bd80d5469080b5c00e0e38aac03f1704c23303092848721e424a SHA512 5af4e2d207b7bb5bafb4ecd21577569f77bb2127bd980dd0d31aed256253a9019de316ae4a9c33ddcd4d1135c67ce5052393d4f827554f0fbb65e9e22f0eefbd
-EBUILD lit-8.0.1.ebuild 1048 BLAKE2B 53f32cdbbace06c015e103c64f3f9a7c91ce32a83718c3090e7429172c654c75d4ddccbeccb912ee28c2a6c2366cd874cb34c4dd73de8503d10dd958df0242c8 SHA512 38dca2c0c4c93d4f6847adf5cfdc67473ab902dc027449c2c065b4dec2704e292815e91d51a4fd538e8cabfee99467d1b34a97752510187c5e5bf9d5ffaeb1be
+EBUILD lit-8.0.1.ebuild 1044 BLAKE2B aa7734d9e89bca963d18ddb8c92b5bcbcc9b9432ab76d1040e946b8614567dd5907ea9673080827f91124469b717725348b198d6f490ecf58e948d6f160e0387 SHA512 95939f8b156a0c6ef0fb566bbc596782301b64269c98f015fcbefd4a6bc018836e56c7834087b5fdec0aa0a10fcec894819be20510c6a9c0fa12e2df78b292df
 EBUILD lit-9.0.0.9999.ebuild 1020 BLAKE2B 15f2957d15b60232f4d60c31481b4129fba74aa3d1dd5e16b9f57c6f1adcc54f4f3bee552adc429667a54b6b728b0d802b18010192e5cccc27912d8419e754c0 SHA512 e2eb892b05030c33f35f975fbe63b143f173c3c415b67a80d8d3a11f93779375cc0380f13026f4c2edd74dd7fe671ab47bd8df4f5d65aad3de6086e3033eeaae
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-5.0.2.ebuild b/dev-python/lit/lit-5.0.2.ebuild
deleted file mode 100644
index 3eebf5e676bc..000000000000
--- a/dev-python/lit/lit-5.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-MY_P=llvm-${PV/_/}.src
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd"
-IUSE="test"
-
-S=${WORKDIR}/${MY_P}/utils/lit
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
-}
-
-python_test() {
-	./lit.py -sv tests || die
-}
diff --git a/dev-python/lit/lit-8.0.1.ebuild b/dev-python/lit/lit-8.0.1.ebuild
index a5c86ceac3bc..b91574900a5d 100644
--- a/dev-python/lit/lit-8.0.1.ebuild
+++ b/dev-python/lit/lit-8.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 5199fd7b4163..476d74949528 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,11 +1,9 @@
 AUX llvmlite-0.15.0-use-system-six.patch 1274 BLAKE2B 366bc8425139e8b56d4bae78e21088b49d1bab059c2a246497f45ea377aefd3df1bdfe3dbc9692eb5d00538466aee689118b907d01a45f211ea26ed6c7215992 SHA512 5db6b819e0a9e0d6b7963272ef7fd9c9fee778cb4c2d577325de6602e7a283a98752e870b83df4978d063c84b73045e2f65bc9aeb482dd487255efe24792db69
 AUX llvmlite-0.28.0-llvm710.patch 2095 BLAKE2B 78b009a935b9014da648fae3a077cba7db8f3469d2c49509bb8d5f97f139bcf5d91b9c727ee74a114e191bcf79ea2d848953fac45a07d19e1bcdcff83107e819 SHA512 d09485b7e93bc9cf3bcf89dbe734934ff4fbc634142408ed54544d0c3a0b7fe3700dd227bdad2d3fa4585898c60da2e46c097877b9620838678bc40d3bf0034a
-DIST llvmlite-0.22.0.gh.tar.gz 156077 BLAKE2B 1b95a0636807fcf38955b32bd5c7c19784df2cc6708f23624c047f0e9caf4eb2fc26c7a1cb778d7cc7e42b8aeaee1ed43c92bcdaf7eb2e798c25f692b96b786a SHA512 633ec4d294dc246ebff5c7931e9bea86efa28323242411f3f54bc34c99085ebaef477b5bfd8224080790a12b188308ff9662c284b360e1a2939f4fe9b84a9458
 DIST llvmlite-0.26.0.gh.tar.gz 175536 BLAKE2B 6736e94c13974bb79bcda08ef58dd6d1e67d07a0173b5f2ab1b2fcf9a6e72b2a0b8737da5598023fa0c6db85cfd84f2d429f6077e1342a15b500376addd03c69 SHA512 e6bf76b209f44624fe21551971d422bbee6a6dcdfbd2c42607904be32db1b94cfcb185e70198fced5deadd938208d66d94eed4cea31726ae7f4779d58b57eb48
 DIST llvmlite-0.28.0.gh.tar.gz 191141 BLAKE2B 23c86c28311a4e8c7f9c209a7ed7816ad5002c26f9fda7a47cf2b54c4578db28ed0781b54a716726db8a7c1abce79a79a99c3f5bf4be2a61d547eb74d06cb507 SHA512 c00c767c80a507975a055088ca4328766c992e7267219dea54376daf5eb11397532b243352976d3569185149007650d5e94839b61aa55502e1991f72b1ba492a
 DIST llvmlite-0.29.0.gh.tar.gz 196507 BLAKE2B d4870ca042d446857b7409c0c50c370458747ee744c24611e88da4bc8780c26125b2e8db3db7fe9d4f553f9aae5769b62effe1ac94cfaf234bab54d43c8086e9 SHA512 8735b46b1a3053b89306bf6e05c8c6c375d15371d33635f1d27e5533d7a78a85f773e04b7ed8d39ebab40a892c374839e1324665d81459cb797f760d6d2c81d1
-EBUILD llvmlite-0.22.0.ebuild 1353 BLAKE2B df1cbe7e93bead771f9abc130fc053caf9eb249fb4da0340df9a1e3dc0b5cfb429634ef6c0eaeb68e72ceaf5f981c2ec62697480d3173f47c5c94f82c725b15e SHA512 7bba6a546721e5cb4a023a3332439d789977134cc7698c40cffc455925ca294e20085d2e605d8e2466c69b2c2b718785dd531cf802c17f21eefb5f20594cff80
 EBUILD llvmlite-0.26.0.ebuild 1501 BLAKE2B 93d3c40675120ca291a8d4fa90d84f484982a110f06707e1f93ec281d7dc2769a34427db467f976d82b9740ddd469b3550488fb00f210db570242cf74a12a033 SHA512 6ddc17275c10c8690e8bcd686dffbb86a6f60dd45e9ac73fe70d574ce1226e3292d9886fbaf9b96b916af9cd7437522a071a7506692285ba9c48017a3090a2f8
 EBUILD llvmlite-0.28.0.ebuild 1541 BLAKE2B 2d6575051c5c5fab37a40a4a9164ad2b739d1f18164836f4b68d7e4a2dc03a4fa1999b41afc1d3beb39d20e71356d76d68dee157690082cc3c74e63c6bb089cb SHA512 2337eac3c683cb2c7deba8a24556c5f5830b54e156ba589b8896aba3a2676841bc79e7c143a8e998ea53e8a0b871bfd40154a2586d1c15ccce1d6bcade47410b
-EBUILD llvmlite-0.29.0.ebuild 1499 BLAKE2B 32a92d4cd70f01ba504ab6c5449e9462974d57663cbe5eef712e9109aa7e3a0161256755ca33c3dfe6cf93c0b9df7b60551b175f5ab4a5de389b59189e50e19d SHA512 95479a9f360dc199cee279a1e2cc8dff7558cabc04edb179b535e8cd388cc9d1bb777c1aa07ba7d6b02a0288854e486aae09be9fe1215ae2a7c1344e02ab5697
+EBUILD llvmlite-0.29.0.ebuild 1501 BLAKE2B e3b5532d93788136b0bdef0acac37d3ceb3f4483d8946acb6ec0544c4c76895a5e9843030aaa97961d0f5c23f2d7452b58aea89236faa33c41b3e32f53f71ec7 SHA512 0b71401cea512814cc217b9758eb659e619aabd8499ed8239b3a443a8f323b5be98aff953a9ef335ea476fb367a2b1e14ff416fe7d345f3c4b3328c6a426b6a2
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.22.0.ebuild b/dev-python/llvmlite/llvmlite-0.22.0.ebuild
deleted file mode 100644
index 7a2336c7b604..000000000000
--- a/dev-python/llvmlite/llvmlite-0.22.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 llvm
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
-# upstream slacks in making pypi releases
-SRC_URI="https://github.com/numba/llvmlite/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-LLVM_MAX_SLOT=5
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-libs/zlib:0=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-)
-
-python_prepare_all() {
-	# disable -flto, we do not force it against user's wishes
-	# add -fPIC, needed to link against shared libraries
-	# plus use those vars to force our CXXFLAGS/LDFLAGS in...
-	export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
-	export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/llvmlite/llvmlite-0.29.0.ebuild b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
index f8d70ec09ca5..0828af730f2d 100644
--- a/dev-python/llvmlite/llvmlite-0.29.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.29.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 LLVM_MAX_SLOT=8
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 44885d83d7a2..b39e05e61531 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -9,4 +9,4 @@ EBUILD m2r-0.1.12.ebuild 1218 BLAKE2B 557c674f096982aa69f048e5d85936737cb7856363
 EBUILD m2r-0.1.14.ebuild 1298 BLAKE2B 9c729388bb13f154935f096040e5dc3f81c5886144b31e167cf6b8421f2c5023c95cec1ec82f6fd984706100b23e015aef5f9b13e9fa422b5bb440ddb42fcc7e SHA512 5013eb2fcfc96e9b947bf5cc52488cb9598c23830fafd801c0531f51b11f1165bc74f9929eafb24000cdce8fb35f3172e54bb766b011b97e20f93945f72f59bb
 EBUILD m2r-0.1.5.ebuild 1271 BLAKE2B 21912af5451c48c9d6611e3f35c111a0f865c406695aece7fd8cfa6acfa280a5b333b37e645fd7a3f44f789c076cc8915f9bfe1483f3799017d66b608faa4b7a SHA512 1f9409bed0fddab84d52b68fd219ba5edbe867c5783df9c872ece636a5b3b7137eb87dc6cc1a5afc6f452041fc384a30fa2c114c93c1210cb0b8ebff821cfacf
 EBUILD m2r-0.1.6.ebuild 1271 BLAKE2B 21912af5451c48c9d6611e3f35c111a0f865c406695aece7fd8cfa6acfa280a5b333b37e645fd7a3f44f789c076cc8915f9bfe1483f3799017d66b608faa4b7a SHA512 1f9409bed0fddab84d52b68fd219ba5edbe867c5783df9c872ece636a5b3b7137eb87dc6cc1a5afc6f452041fc384a30fa2c114c93c1210cb0b8ebff821cfacf
-MISC metadata.xml 554 BLAKE2B d275cbf42dd1621fd0dce4fdb85cf0832e3160cf7468e729d39f33afae099b354ccb21e6de312888ddb6d2e97a487a02cd9d97dee033eee960d0ffbeda70c704 SHA512 ff9d0efa78e4931a4f0ed8097cfdb1d32fb1a99f825199fae42838ee534c045c30c440e9f8bdc41639adfa99efb672a587d11f84f1bc7215f8e59655e1dcaa49
+MISC metadata.xml 504 BLAKE2B 9e21e9256baae870dce5b60ba0f2c9feb5857c79f6ff81dbf10aafcb81d7886c18114155f2f825a6bdb7ab5b51f5e9f733ae4e8c799bbbb8c424c662cec85959 SHA512 551e5a6e90f257d5171995d6cb7ed7122e3820a787cb4acf177a9b0acc22810e71d432b8cd53667793c2e01e39edcb43540841e541737097231fe36b51eca7fd
diff --git a/dev-python/m2r/metadata.xml b/dev-python/m2r/metadata.xml
index 1bba8e67fdf2..10ff509a87e0 100644
--- a/dev-python/m2r/metadata.xml
+++ b/dev-python/m2r/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>miyako.dev@gmail.com</email>
diff --git a/dev-python/mediafile/Manifest b/dev-python/mediafile/Manifest
new file mode 100644
index 000000000000..b913791baade
--- /dev/null
+++ b/dev-python/mediafile/Manifest
@@ -0,0 +1,3 @@
+DIST mediafile-0.2.0.tar.gz 509689 BLAKE2B f79da210a74d55c4709b6fbf08a0675f445001ec49d042fc4a1101def07068bebccb155e770c5cbe8d051d7f101a213e9fcefbcb9590a650de99cfde837a965c SHA512 0fa79f77e0ac9a021b569e78f0edbe8cc63308ad8c89526d8e15dee455a284cb90d29b51aa476287e306717315c3cff290634fc6e4ac0b1726163dd922ee3b0d
+EBUILD mediafile-0.2.0.ebuild 983 BLAKE2B b5ce325c08dc481be49c2c6be29dcdccaa45c0f76d4451b54dbe0ab947e8610795160054e6ff01a14ade89335076e338fffcfa7a7ddc035a8a247cfa63bb7328 SHA512 80b8568065a40236b155346c9e53a9eb574cc9fbdb8a3e984a146e03afef1ee794929ef76f2ad729fd0409926615e013949f7611f37b8260ce3c2c00bf5ee137
+MISC metadata.xml 751 BLAKE2B bea4069bfed083e2dcb984ec3feae35e0f0acf8402f51dd794a53b677e62ed258dea3f299fa508ebdc2b8fd9890b1c95ad6388f52b884ca5c207874f911ee311 SHA512 aa1afae32b7aa50149aa1f11f5a753f8881ad4f083589908f3f48566c1fa1c3de7cde9e90cf385d27c06a41792c2751c3a0dcec5cb13a839b8cab1c748fb9143
diff --git a/dev-python/mediafile/mediafile-0.2.0.ebuild b/dev-python/mediafile/mediafile-0.2.0.ebuild
new file mode 100644
index 000000000000..3d5e8e1fd598
--- /dev/null
+++ b/dev-python/mediafile/mediafile-0.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Read and write audio files' tags in Python"
+HOMEPAGE="https://github.com/beetbox/mediafile"
+SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.33.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		rm -r docs/_build/html/_sources || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests -v || die "Tests failed"
+	if use doc; then
+		sphinx-build -W -q -b html docs __doctest || die "Doc tests failed"
+	fi
+}
diff --git a/dev-python/mediafile/metadata.xml b/dev-python/mediafile/metadata.xml
new file mode 100644
index 000000000000..d8b2350d9c4f
--- /dev/null
+++ b/dev-python/mediafile/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bernardo@standard.ai</email>
+		<name>Bernardo Meurer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		MediaFile is a simple interface to the metadata tags for many audio
+		file formats. It wraps Mutagen, a high-quality library for low-level
+		tag manipulation, with a high-level, format-independent interface for
+		a common set of tags.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">beetbox/mediafile</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 1c34d6eb69ea..55c1ae2e1674 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,7 +1,5 @@
 DIST mkdocs-0.15.3.tar.gz 1805972 BLAKE2B e6619fa0bd14fefe96de5abeb9243369b1419e7018705ac6a6d58fcb40c01aff380c3b4ca514af0a25da90092f39776abe42d19a67f7e86780c5c4111884b230 SHA512 e5b72eb56dcc2fe2be154155af15845a7d0fc06d6176f1c6b2bb54e8673d207146bdd92b37a709d72c1d59fcc76a793e6fed5d7fb6d9008f28d43baa17e446f8
-DIST mkdocs-0.17.4.tar.gz 1830194 BLAKE2B be3877459ae4a5a88b40b2ab4beb2174c67d11a266a48cbcd37432c53df49f11aae3f923485f483744128483c7009f5f46a875924bd8409ec846f5d3387e1a68 SHA512 b9e2415cfaa317c4ec48dc2f54be55d2a630349cfc150f26d807015616853e2ea8937b247713a1a732626bedc807b542dbcd8e23d6ea70edb1e971abd20dd74b
 DIST mkdocs-1.0.1.tar.gz 1589767 BLAKE2B 54f7a33c166fa44b9471069db45436e1381d451470fea4ed11de1cabc0cead3508bffbaf2303d33904ef0bee8f81cfbdacb0fd095ee53d6fa7c09f33274c03af SHA512 9f6b1ff5922fb58783d70f3912bb0170f927ba0160f5e48f71db2d267030208bd50997f14f4626fbfce891ddce7f97747ba05100ea96cdc24609341d382f039a
 EBUILD mkdocs-0.15.3.ebuild 1057 BLAKE2B 3640da1fbe83a6fec22d39d3ef73753ae235d55c1d4615c5776d21023f85b200e22df70aad8a08eac397ffae9558424d28c78cef7fab3e01885454c340d54123 SHA512 eb04fbce2ec836f647ede8470cfced79d46ac157b092f77ecdd6a5b0da85f92b3248f002130f8cfba8a0a0711ea4c6b2a910b781da5dd6af0560310c58030df3
-EBUILD mkdocs-0.17.4.ebuild 1317 BLAKE2B 3f9fa445600b882c511710a0855516aeb0e9917e37c41693b66206368a45ad2c2106c3abfa48160861ef5165cec4f1bf536108839cff8d0a414ec413da922b0e SHA512 811b02f47cf10a07b6be892bb1ee09c1895dfe453d559985af5d3a3e7773394aa0dbc66083441d0507d6e99d6b727018f1422d0db09f6f50a4349462bbca4149
 EBUILD mkdocs-1.0.1.ebuild 1317 BLAKE2B 3f9fa445600b882c511710a0855516aeb0e9917e37c41693b66206368a45ad2c2106c3abfa48160861ef5165cec4f1bf536108839cff8d0a414ec413da922b0e SHA512 811b02f47cf10a07b6be892bb1ee09c1895dfe453d559985af5d3a3e7773394aa0dbc66083441d0507d6e99d6b727018f1422d0db09f6f50a4349462bbca4149
 MISC metadata.xml 248 BLAKE2B ca12914d7dc6c1711fe96cccf5fe6a62c7854264634cd4bf62450125107655cbd64ab6e214fbef1065948a6adec5e83b3c0ba272f307a3c5b393dbb671f2d8cf SHA512 4b39eb7ca7e3e9fb49cdcefb0f721af61ec5e2e701becda0e3746b964be7105117fbde1601415985a7bcf23b3f42a0a44a55556a48c80c4c8d09ab1c7d848b9d
diff --git a/dev-python/mkdocs/mkdocs-0.17.4.ebuild b/dev-python/mkdocs/mkdocs-0.17.4.ebuild
deleted file mode 100644
index 3594952dd97f..000000000000
--- a/dev-python/mkdocs/mkdocs-0.17.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Project documentation with Markdown."
-HOMEPAGE="https://www.mkdocs.org"
-SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/click-3.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/livereload-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.5[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-bootstrap-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-bootswatch-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	default
-
-	# mkdocs works fine with torando 5 on Python 2.7 and 3.4+:
-	# See https://github.com/mkdocs/mkdocs/pull/1427#issuecomment-371818250
-	sed -i 's#tornado>=4.1,<5.0#tornado>=4.1#' "${S}"/setup.py || die "Failed to fix tornado version"
-}
-
-python_test() {
-	nosetests mkdocs/tests || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index a30ea588ad33..a36af353f57e 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,7 +1,5 @@
-DIST monotonic-1.3.tar.gz 7211 BLAKE2B ee05b43f8734099c3d7472ff98bc815cb33cd45d33cd780f33703429773cb3f7cccbf97c3e476247b749616f16ee4493cf300ea137b6da89068c912e4689f72c SHA512 870b9530235715eda099cc332c94935ebb80f52a30523dca90639b9f8b3391dd706a9a8f3aac402ebd8c008672e84cd09b5397e954160751e71940b3a9120bd9
 DIST monotonic-1.4.tar.gz 7463 BLAKE2B c9123bb5ed5ece16014c9467c7e25dfaee8d0f30096a73f5d001b0bfc965c0c1f2b501ae39f5b490edd61f179c4e688ce4b794bdb6a842ba350d499eccd8335f SHA512 f9fa079cc325592b0bff799fabe7f9e87922cfe351776ed08be7a0060d27f81ae2c23aa7a1fac2ac2203ec26547e05fe3a918e68e6a474768b431ce860522eca
 DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de213f580a39706e7cd57b1045e8f1625be213c90fba48b69c40461d0c90255e6a9f20e565ea9a857780e2143 SHA512 05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970
-EBUILD monotonic-1.3.ebuild 480 BLAKE2B 093b94d38cb66fa42e2a1a28a17fb86c26bc5b2dc519d1846754a86572f7d1fb941d1c5a3ea7ad0d474c84c578ead64804ccf67a83de96b58b5dbe78c2534fe6 SHA512 aacdc803fc46fc605b43ec372ec2dfa3a058efb9b7784b95cf6fd9962929ea43ddbd9f59ac6483ccf0220c034b68c4ecb16dacd959f158daae8dd43e5355d117
 EBUILD monotonic-1.4.ebuild 485 BLAKE2B 8aa2c97ac58e7484215e33dbc38b9b3a8b65ca3843f9247416406ed8fa93f48319551be417c2ad395dbbbdf759d80b9080216c49af5d574e6f120225a53ae5d3 SHA512 e91f6bccfe1e044b077830daeec55df1389827a0ab32c387bd0b85a3811a725d33cb2814f08be055ed4aebfb77d9a7b4d0d2dac8df4375397502a36145d887d7
 EBUILD monotonic-1.5.ebuild 489 BLAKE2B fd2db7e3196fc79790bccdd3f701bd9ca6636eacbc2286dbde4736064935a3121f5310d343930f56bcd78d00836f0925c3f3fced41ab045d5098d881c66f4157 SHA512 4b5a8ccbf48afdb8ca5c821ec278984d82599caaaf3ad1baeaea99c90beb2fc350d375602d09d63a49e3a7d1790f63f848884aaac22e240ce75735489769a21b
 MISC metadata.xml 291 BLAKE2B dca62d0d7e7adf50cf0060332562bc3a6fc361a7f3b3b8ae25c142d93992a26c2b9ccfb0be5fffcd18e359989d4d6f603f46c93b23c2dbfe6283198fbaa7676a SHA512 f67a64d81a33f4356c9011fa9ef6ebe195ca28c6c8b9567f07e0756c7a2f9009e5cbbf5b68e495f9f840e5d75f34fc82e440626c80b024df0797e15d610dc9d8
diff --git a/dev-python/monotonic/monotonic-1.3.ebuild b/dev-python/monotonic/monotonic-1.3.ebuild
deleted file mode 100644
index 6d0bea266bd6..000000000000
--- a/dev-python/monotonic/monotonic-1.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
-HOMEPAGE="https://github.com/atdt/monotonic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
new file mode 100644
index 000000000000..e20f1cf94998
--- /dev/null
+++ b/dev-python/opt-einsum/Manifest
@@ -0,0 +1,3 @@
+DIST opt_einsum-3.0.1.tar.gz 66204 BLAKE2B a8d2d1246e890d24ea73d129ed1ee99e8fbbca30771c96a48858acb5af5eac93bc73b9e8f1c5f1ece6e0872277de1f01fd1d0f7d27e044fa5f9de09060792565 SHA512 d6c2b95d17f523680e3f849ad2b0a4c36e7102e0540fddee365446bfddad4a26be2aed19060570ac0d1db42ccde8e15f0e7e4c066b9117024a58f8cc8978508a
+EBUILD opt-einsum-3.0.1.ebuild 481 BLAKE2B f3b8fc74dbf5bde0a3e71f4f35d606c3afde0f72ab9f3dbcef67ebac5fa201e45eedd2f7e2982202607cd99c44fb98178595b337ed1673c4cc04b702ff2b86e8 SHA512 583061c7cebc03afeadf02afc6743edb1df97d688bb01b2d2e9eb6d84fa0bf110d8d8e74b8ebb0c47ac207cb1f184e6815dad154d2269c682f803580b54643be
+MISC metadata.xml 373 BLAKE2B e60b5def188efafe8cbea965732384164a8dd735c37d065cfb9b8c3edc652dcd5b23641e11655fe535206823317e8aa9c0c2f2a624e654d511595e36ef8fc5af SHA512 5471c7592bfb2e9ab1f3c47fdb1ab2211debda6e928f2491f17a171d14c95d5faacf03eb105c94d35ab6f5e889f24cc327f5111e8ac8c11527dcca1e04d61290
diff --git a/dev-python/opt-einsum/metadata.xml b/dev-python/opt-einsum/metadata.xml
new file mode 100644
index 000000000000..2222f4b7932e
--- /dev/null
+++ b/dev-python/opt-einsum/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Optimizing einsum functions in NumPy, Tensorflow, Dask, and more with contraction order optimization.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild b/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
new file mode 100644
index 000000000000..ac865d7fc8cd
--- /dev/null
+++ b/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
+HOMEPAGE="https://pypi.org/project/opt-einsum/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}/${P/-/_}"
+
+BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index c354764a939c..39343367668c 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -3,5 +3,4 @@ DIST polib-1.0.7.tar.gz 156282 BLAKE2B 4d4a9f9901fe7b7b7aa5fc54b9391e051b8d02d17
 DIST polib-1.1.0.tar.gz 158484 BLAKE2B 41766f00e3928eacf3c98406b6acce224f0d0cb44d79326c834db900ed8b91181911ab7e26845a737057dd07c067a784d0b06278952708c17888db42d8c1e303 SHA512 74681585b4d7252e107acd7d73f49f7e91c90adcd180722d39d35c40ec158434798af0124a16788cf564c73b84f52a040aefeb58355a1a3cd85848c3f6a5e67f
 EBUILD polib-1.0.7.ebuild 842 BLAKE2B 90516dc6a38bafe56cb80a778f8e352cead7af9039c65951ab2d0c4a1d909a08444ce1ac64c23e8e409a15f2e04aba4e26542512498ad30fa15e874c3a05febf SHA512 4d21d499a37b41ae378432b2954a238ef73cd163fe71472534521bc1b303dc0bf3269da2cb9b151f929a1f9dd7e563df5d8fb6bb0a210a6c75350ec58f80bba0
 EBUILD polib-1.1.0-r1.ebuild 859 BLAKE2B f78d819212e1643f5588bb3c0326061046ca448286fd03cd5bd1e119dd67434c51285eecda3715f78bed961df220949880440ea500fdd40ad17674012c1b4e29 SHA512 57ccd7e5ff75462ad47d2849f6c8b355508ba9742b0ba84aa96789f5dafa2830af386671b5ee3f6015b9ff5cd3b457b68b870e28d9bafbb3925ee04eb350c19a
-EBUILD polib-1.1.0.ebuild 857 BLAKE2B c47a55c248b5989065f58790204368a894249c9fc9db31053e49740a4108e9fb067f20e54ce9a8b02192968ca952021c83c5b3dbc7df2b1dd184302ed06884cb SHA512 4e80bb72788255b426b62b684289b75e9c09e3215913bf0ce188b65f3beaa7d27c002f2a9dfb4b0f2049a50c394cccebe42086d3872189c3ec95a9beced485df
 MISC metadata.xml 294 BLAKE2B 096af7abe45b2be00baf31d9a8eb7f9606c817c48e08fb457961b48c533b6c35c5acdba95420d7a193c5a216f3d46aa512ea54e0a2ff45f9173e76720689b99f SHA512 f5fe76b50e225e8e3f3e4d745c7e49b0056eac52b46c0a51cd552ffffbf915b5035d5edc2428c15e6497a054bd475eff39ea19a5c3e79eb2f087ee8ee0565099
diff --git a/dev-python/polib/polib-1.1.0.ebuild b/dev-python/polib/polib-1.1.0.ebuild
deleted file mode 100644
index 3e17fa1fa098..000000000000
--- a/dev-python/polib/polib-1.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library to manipulate gettext files (.po and .mo files)"
-HOMEPAGE="https://bitbucket.org/izi/polib/wiki/Home"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.7-BE-test.patch
-)
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" tests/tests.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG README.rst )
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index ce0a309f351b..0f2c5dd0d90c 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,3 +1,3 @@
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
 EBUILD priority-1.3.0.ebuild 809 BLAKE2B 3cb3143ae607009a9060d74d485bc9bc482bb7eceddf2a94046aa755958079f52a6055f6d93dcec5695b333a56f7bf2bccf265353da6e5bcaaa70b9a0901fb67 SHA512 6be5cdca8ec48d8157b553fb40f6bf61aa0103891ffd13f75cea2c13dbb04c38bb3308936ebcc175e104439cb3c199b3b2adfbf3c4e47a064e717ec66201dcda
-MISC metadata.xml 917 BLAKE2B c92ee27c2cdaadab26b9d68451c0b7ee055e26ba9457e5fa8dcbf2f9b4add141d07e85344d7de536db6a4a40da92d79c67862da2bb381f0bf1b384f90565f2a8 SHA512 e5daf360e9d2c4efeae4084d9a72ac975acc09f95d0064f4d2c3759ba00a080ea5a2f689f74ce666633fae26d1afa095f29b209912fcae0ba38d9fc1231b74e0
+MISC metadata.xml 839 BLAKE2B 2a922ade07ccabbde2eaaeaac310e1c89206f7a6194ea14cd83f53182270edfd2cca4b1d13072d8a4c81c96563ba3b81251626eb777ced188bc9a22a37dcbffb SHA512 fbd62fe6b97e29566a18a29d155b8b08124d5c1561a21ad7aef7daac1a68b75b48b82d3edc612a27888da0d24ecde73b808cb90dfb7fe78ee97adc5fb507b003
diff --git a/dev-python/priority/metadata.xml b/dev-python/priority/metadata.xml
index a610eaa8f96b..fa530078d06c 100644
--- a/dev-python/priority/metadata.xml
+++ b/dev-python/priority/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index 8d6ed26490f3..82c9b0d75af5 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -4,4 +4,4 @@ DIST py-ubjson-0.9.0.tar.gz 43338 BLAKE2B 8bcf61d1329931a2bfb7399cc27e72b14f9641
 EBUILD py-ubjson-0.10.0.ebuild 433 BLAKE2B 8400c323d203cc5a59cdd7b2de731ae2619cf75087b1d1cd1795f76a2d8095ee88d2f0534265b47d7213c01d133c5e5da82198d16f0a2b4dd6dcc4261d55311d SHA512 fcde8d7440caadd017485c7528b16d9ff5f32b221b2b378553e86494c193a034f0fda54a477f462526b110cdef1f101fffc5f9e79942d0c44dd930a2faa148b8
 EBUILD py-ubjson-0.11.0.ebuild 534 BLAKE2B d8596f01ee83423118c8a05fc2006f0f77d801dec5de9734f640af4f3dc5a3ce1d5c2d1ca5c31da36086f9ca5b39742d4145f6959a9c0e22b3100f46a367e471 SHA512 c24fb2489235e4691bc8080bf0696a94e54320a5e3b63c01f6ccdd878c9954314f48bb5e99d3e7eeffdcee40eddf67dd71645c26cf2fe9a2e802af442072cd17
 EBUILD py-ubjson-0.9.0.ebuild 461 BLAKE2B 207179e60d31b7c6801bc379a85d017ec20c526163086241bcd8ea4bbbb71b423db2bc675bfb8801333db7bc0e38c28befd3861a7c202e618167e5cf7b9fa653 SHA512 e584775f50d56fcf17fa7a9535e74ddede873fa8594085c5a6a7a5d6c81413b3681fb6a5c8b5868fb161484356bd16ffb79ac6206fe57b2c06f6b1b0bd099e94
-MISC metadata.xml 712 BLAKE2B 69ca065a27809d3112fccb2a0e812fac18a216d88afca7ec654df0a181701be32365863a41f1339a42260d551a3c8aac678451ff7d9ab6c58d8b4eebb76ab33d SHA512 18ee84822f59b8a2b8172c4703d0ed93522a9997013ee0d533acfb4e23343ac2df70f719d8b161dd40604e5875d4c74f1243880ad0725726b445cfb84398a767
+MISC metadata.xml 634 BLAKE2B f799cc627077029b5b5b1009539b5d55a15e581348a3f8a6a93f2661c2e40b15772920d0937d56e620625bfe61902135c228efd18ea93d4538d8cc2f0ee73375 SHA512 900769da6ff1965cd50824ca97dd27baaa5d816f0fdd99851b4063c8dfdf3d469b6a17d4372bc6d16d34245609e76a5e2223b5bf61cb467f8cfabdf775b6da7f
diff --git a/dev-python/py-ubjson/metadata.xml b/dev-python/py-ubjson/metadata.xml
index 4bc57c82bffd..8aedbe24b522 100644
--- a/dev-python/py-ubjson/metadata.xml
+++ b/dev-python/py-ubjson/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
index 7af488018739..366a07eae22b 100644
--- a/dev-python/pyGPG/Manifest
+++ b/dev-python/pyGPG/Manifest
@@ -1,4 +1,4 @@
 DIST pyGPG-0.2.tar.gz 15439 BLAKE2B 92c82b8b23c279461a872f118c636fa9cdae3f44910fc34a357983b0b4afea2a7b13c6400499a0fdbb4365357ade64294642178ca07a79ab3b7df89e60146e73 SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67
 EBUILD pyGPG-0.2.ebuild 1127 BLAKE2B 1080ebfd37d6e65e9af7295ac52da9c960d32b761212ca4a005f6222f6b7a30a3b58d78006c72079e0c30df0c4ae24974eaf91cf545f75960725bbbfda6c5d1b SHA512 358a7f8141d1994796229c73aca965d6f98b9509a5b42b0b2330cc258dbafcc8e525a107d77e24afa8d9e9befbdfffcb788cdba41bce0d7d63a3e8240ade9009
 EBUILD pyGPG-9999.ebuild 1137 BLAKE2B 413a02bd7ab8aa9eea83c6b8ae075f7e148d33f95e58485d71fa7db3151bae5f53f842aa2ea60a03ffbce1ed58bf4adeba7317f2220f28533364a14e98c4aa77 SHA512 228b7e18adf0e7d3f10b5432713cd1ee4d329046b141baaa7831fd58ecce010021d71a2d386a265ca5d151bdddf3c451f3678ea8684735b089252fd9d2efe916
-MISC metadata.xml 672 BLAKE2B 27b2cf23f9d5b57b3b125bbfe3bf7e3ee581cb2d438e60295d94bdccc1d7c6549c412df0771b0d20d053f8efaaa1659ef9cc3e948a9afe2c70137047d63772c4 SHA512 3e10843a2625c38e9481e3d7d70318312efdda48c3ebf2c97af5f1319e03840765116856de363da5a7088e0fa25f03c513ec11bbe8eae55d932470e9f3bee420
+MISC metadata.xml 566 BLAKE2B 85f26a61bb3bbdc790bbd1f67133d51d522f492f16ee59dca909eb1c33668cd330faa69cd75603e65b41fc3a0ceb760e0a9aace292de9c7fad248273d0c407ee SHA512 03125338286f45302cc2b60257f4650a8bbcb43e8b7d433b6f012e646a2a2ef7f84b994057a93c3fbdeddd94b838a428d1409d965e0d190c937e4e2463ad34fb
diff --git a/dev-python/pyGPG/metadata.xml b/dev-python/pyGPG/metadata.xml
index ceedf0fea6c0..7d6ad86b45f2 100644
--- a/dev-python/pyGPG/metadata.xml
+++ b/dev-python/pyGPG/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index ae16994e2068..32cd45016e92 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -3,4 +3,4 @@ DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff
 EBUILD pydecomp-0.2.ebuild 966 BLAKE2B bfb379eda0c4f577c179941839050ed9ae43def2751e0b328f9782d7865a9f0627cb0a4bc493bdfdbec3d3a124a03b70cb14e4c87644285576239e44608b796d SHA512 8926925330f334a3bdf2d065873056d386248ed65b3b506108e155f5d2d70bb663755a74ae8c11d994e609aefb4fdeb04920fbb0db07a3d0b83d2ac39875af3f
 EBUILD pydecomp-0.3.ebuild 968 BLAKE2B 3dc46ee34d431e64142cde3952b212ab29a7c39fb8fa0cb0d27490895f5755f53980ce9f6acfee9c96bd182285774ffb77c4325f940233ffd1a4986c830c7650 SHA512 dfa80b5db2c5c57162a75afea54541538c2400db309f024e1f92962baf137146940178956db025fe5f071b9b500bbb340c9186daa1684cf2c16441b6d2fc1424
 EBUILD pydecomp-9999.ebuild 1238 BLAKE2B 664a80cd6a9edf9d0aee97b50f98d567251efe4fbc6086a623fa69bf5d8d79d4977ad7f45c72d5257355242eff31413307df7df30baf0069d992f127317b71e1 SHA512 67a6441e12e77b1cf9ba274ac787699b54c25527a31907d2989ebdc0ec781153c03a3ec09d125bbbf12a650645fc236bb43e852ab94de60d7c9b81ff51082426
-MISC metadata.xml 796 BLAKE2B e83d6be3e1700f9be8b80c72d0d30868757a53d225df068d58991f945d7089a0769efe1fc7984f1a8a218e54d4a25b81c4a9ce7d2fbe28f2d65f9419b49a0d64 SHA512 ec96d316559404d556dee6f64807d44a4b201028000d4ba527743b2f6f18fbd3354e4dd5cf811512edf9bfc7cd1ea176bdb7c6ce1e04efc154b0f8f564c675c7
+MISC metadata.xml 690 BLAKE2B 4fea9b06a19ceb9616513e452d1016972ade5c78bdfddb2b94c5d6c4b9884d8c2a379a9874ac5a4dcb7d1e9373a030fdfd1fea8c91a6e21ecd723d04e85a247d SHA512 ec9167bab90e021522941252d9f523ce6040adcaa337b4bdd31495867ac64cdb8ff919fd0928e9ad8e2c12cac45555b805cc7d9afab059e1a20b014fd8c25707
diff --git a/dev-python/pydecomp/metadata.xml b/dev-python/pydecomp/metadata.xml
index 89e66023cb0f..65bbd6cecca3 100644
--- a/dev-python/pydecomp/metadata.xml
+++ b/dev-python/pydecomp/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
diff --git a/dev-python/pyjade/Manifest b/dev-python/pyjade/Manifest
index f032df1fee33..0fb94b1684fc 100644
--- a/dev-python/pyjade/Manifest
+++ b/dev-python/pyjade/Manifest
@@ -1,3 +1,3 @@
 DIST pyjade-4.0.0.tar.gz 29251 BLAKE2B 0a2ffb949022e9bb9bb12d9a1fa7680650a14634158429b2256320b2a75acc06e6c2ee0cbcd7ffba1263f6bfbbd40b097d7bb99f7e3a8fef95951c413f6e515f SHA512 0a384b843d2eb5884f2690ed5bb9b9b253474568ff1e9faca356a5c50749bb53fb759a099c7719bef495dc7af0073f143afad1c0d6d68f0f61d63624506f12b6
 EBUILD pyjade-4.0.0.ebuild 838 BLAKE2B a8c054dcab6f4908fc9a6dcc805c524f4e2a076bd6ad2fe0467aeb10e6be0ae741c20f0bdeafa179c8014c47c2b7aed6818141f23121a3adb6c7aca093af605b SHA512 e9b94d0a3fae021e4cc67c1d213d5ba05f588a377c7e3dca172ae82c1da58f6e80fd9351c64728d7d8dacb47c969a6cb5c122cbc06c1fc3fcd7555a3fe4157c5
-MISC metadata.xml 662 BLAKE2B 2a441b64153a350ab727c6825165080bfdb19becc1e1851d0ef9915c2ceb43b440a2f7213d27bac2b5729729800902ac5365ebb9348fea03773764752cb5d6e7 SHA512 c57b543e0a806b3c352bdd6998238e51abc390b2b9bff468860e0e512a5ffed8317e14ea5a223f26acf09c1263e072093ef0c1a24c49cb7dcbaee5ada346c5f0
+MISC metadata.xml 584 BLAKE2B 22bf5698fe68eb9258403988d1ffc4f1fd6532bbd598ec0c2252198af5ff39e6eb458bf26e5fb62fc12ed6877456268b26918f2fa195f63a6b01e999063fba45 SHA512 6a70d07be11b26ed7a5eb217df8dd8085df84b82fdc48c35889db2080b5923be1108feae6c44ec1dc99e87f0244870b20469b866f359e8b74d682c884394c620
diff --git a/dev-python/pyjade/metadata.xml b/dev-python/pyjade/metadata.xml
index 221dfc297a5b..3fba23025053 100644
--- a/dev-python/pyjade/metadata.xml
+++ b/dev-python/pyjade/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>me@syrusakbary.com</email>
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index dfac2c8338bf..bbd75bd5b16b 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,9 +1,5 @@
-DIST pynacl-1.1.2.tar.gz 3149804 BLAKE2B 2ddf6728bfc5a8d5984ecf3fe054a7f36acf15b64d9ba42df93bb21940b9646997d59500825cdf04deeba9afbf4d227a016ad631211d18cba2ab1a38bdd89541 SHA512 ce9c720699fc3b808bb569ad9916f5f5ea97fbc49643117b014374ffaf77ce7972a530e9c4cfaca14dcffc8d676b5bce2facf6da99bf2fda4e319b772075e52e
-DIST pynacl-1.2.0.tar.gz 3301645 BLAKE2B 7309409d7913bf1dee690a6fba5dd490de7a5cd41119e68115452a8c51317005d10eebfa7017f0a182f07bd20ef36f7b395c9461e3e7929cb1102b24afcb937b SHA512 ffc3b91766aad9d0d21c88c198ebb7520d204e58ffbcac815a382af7eaf9b489f85ae6c2fc4cfe4dd5e04576062bfe248bdcc08fb42bf184a73e41f4352c7bd1
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 DIST pynacl-1.3.0.tar.gz 3405949 BLAKE2B e6a6444eed2cbf134ee6060ef382981f6bfb8396fbae30dc1e16f7702a559b7ea56889d9889adfea09ac6644732fafb98e07da99e3a41392303b6a45f0b494b1 SHA512 815c31a2069cbee1091d7e0ebf0b5572875c4a537311af561b5bce0b9d8051028e367a516b46481453d9780e60e9e7e2a4640d320164059c3974b0319d1cf96d
-EBUILD pynacl-1.1.2.ebuild 860 BLAKE2B 9e00b4a7a68828c4729194110f2124d11a1b29e78158dc14d4787a5ecc555cb1ca731e41918b1dc2ffca31db9585277f327850ea378412b0d026fff179fc90a6 SHA512 454e4595cf84bda0a3d0da5a121d4fc468b5a065d40d89b1f7d5c38b7ca1f8454089625091aad753eb8943bb3487a97bac49ff6548dac7d8b25e341d4dd84d41
-EBUILD pynacl-1.2.0.ebuild 856 BLAKE2B 56c28a21c37d39eabc4fc27189c65a0938b00f43f5b4a18a3e73ce7b698196026f315bc30978fd9c4150ab9da3771b20d777753a576473260578515f5be9b160 SHA512 c11694426a8cf630346c546085b969fe903fee4421d688f3a8732e8545d2866c57b4533db3c050bdadfd3f7b8441a33662a554b691816ee1c0f40400453c3ad4
 EBUILD pynacl-1.2.1.ebuild 1008 BLAKE2B bb1697dacf09d2af72cf317860f947b6389b230dc317726a1fa8c815c367163b4f4bc076f4cfb6082a67cbe9463ddc702d4c1b40b0d7f48885e9c7c7fcd27ea3 SHA512 6a1d91d187e207ea6ad1f3bcd951873ad166e800844ad179044eb6d23597421b1f4766d9eb860c20aa634f42ad288b5b63a6f47422a03e657a757f35f8361f77
 EBUILD pynacl-1.3.0.ebuild 1042 BLAKE2B 780d32f4198884886c260c76ce469406037ebde9864ff501b302a03093429fa14af93db3c38a563df66f94bf9fcaff48f87e7526704fbdcba9d8bdd67368e5c9 SHA512 2445255676649fe25321bb44f1aa3e5bdb9012a89ec5d896ed34ff7933e9a85de527c4bc0d088da242aa12c7ac5ffec7ba0f084027130a461c377acc872ef196
-MISC metadata.xml 831 BLAKE2B 39b921264053f9a7f18d9313daf7f3ef6e560eae777917098d8df976e3b9aede850f5073c190a9668440a487f7ac8fe2b6c1535271bb028596da0f3657ee0292 SHA512 8ae9c64a9477e03a593f40e4b5e3fe42adf2e80ab071b63be273c4cb548fef79f5e80ffcdb88786a6703dd28b8254ddd53428854419b669ca71322f7be775e27
+MISC metadata.xml 753 BLAKE2B a735a91bb099911df938224e8f89baa564a86855655a5fbd2d9027bc108001052c7793a6675dd2d301c083bde38d4eb03015628d733055d1938e2dee12f8e784 SHA512 f9c8f52b3c9069f3500c5e7023636f9866c90b5c904e7d66443b620f523474e3f695f66e666de679b3b8b4c362cfbc5c9268727c68d3d1ca462b1ef93b0ec6e4
diff --git a/dev-python/pynacl/metadata.xml b/dev-python/pynacl/metadata.xml
index a565e3a11ad9..705ee93f8eda 100644
--- a/dev-python/pynacl/metadata.xml
+++ b/dev-python/pynacl/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
 		<email>klausman@gentoo.org</email>
 	</maintainer>
 	<maintainer type="project">
diff --git a/dev-python/pynacl/pynacl-1.1.2.ebuild b/dev-python/pynacl/pynacl-1.1.2.ebuild
deleted file mode 100644
index 9affd925688d..000000000000
--- a/dev-python/pynacl/pynacl-1.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6})
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
-HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/"
-SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
-	dev-libs/libsodium:0/18
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-	# For not using the bundled libsodium
-	export SODIUM_INSTALL=system
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pynacl/pynacl-1.2.0.ebuild b/dev-python/pynacl/pynacl-1.2.0.ebuild
deleted file mode 100644
index 95e57102b313..000000000000
--- a/dev-python/pynacl/pynacl-1.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6})
-
-inherit distutils-r1
-
-DESCRIPTION="Python binding to the Networking and Cryptography (NaCl) library"
-HOMEPAGE="https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/"
-SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.4.1[${PYTHON_USEDEP}]
-	dev-libs/libsodium:0/23
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-	# For not using the bundled libsodium
-	export SODIUM_INSTALL=system
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index 5437caaf7387..d29175720575 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,3 +1,3 @@
 DIST pypng-0.0.18.tar.gz 377942 BLAKE2B e27540cabc4b872af5779a128b3213745ff173fd4c0c94ef7b7e9868b84a58beaca40e0ec6c5886a6a6f8652118bd792a0b61275920e1991cafb1568af8a5312 SHA512 3e44b0c86c3ff042c7e4bf03e82281c6807c4eae432c45b9bf4bf9fc844e24031a17245410e9060e6912ef77a30b9ea956422a3d9aac4331e7e81323da632e47
 EBUILD pypng-0.0.18.ebuild 448 BLAKE2B 2bc92aaee92de07e3a91902820d695a9eb68f8ded7b6bd447f2c57b9c4080e971850af8b540c6b12dde7bfb1adde9380088557a848d9c6d11d9b8fcdee4445bb SHA512 95476613460fb3d9b50f276e48b334a932d092a50376d731542959617d4a4bd2606e47cabdd2e5c8a152f2fe43f4d71893fca2321a7347ed6e74e48481f63d45
-MISC metadata.xml 640 BLAKE2B ac4ad29886e66226f2947fb26a8778d0b2cc8641a7e9b5d250eca4fc3757f7cd92745ecc095fe7b456c2c3846f75e17cd729f6247690e38e760fabe56a3df38f SHA512 04ff397dd9d70ec906ed9181c7345f297cbfb7a00739519d150f2bdfdcfe5f1a6406d16cecd09dee95bed5e06d8443eb62b04e63496a265bd02c2acd91d04e94
+MISC metadata.xml 562 BLAKE2B 08122fff5bdc9330b443f957f695e2141417f8e484721bd8a478f164cfec45f3b67bbc54b18073b24495798d21d00f658d94708afc07f5f7cc1a47811bb3442e SHA512 4c8e61b10ebdfc5385f762fa6465fe26a559c6c2e220c6714ac316cd2458717a789d79483b2efc9383a719c8bd8c277b4f38abec245af95eb8b8dc0c7e0038d7
diff --git a/dev-python/pypng/metadata.xml b/dev-python/pypng/metadata.xml
index 87f8766a65f1..e6c6dfdb64c8 100644
--- a/dev-python/pypng/metadata.xml
+++ b/dev-python/pypng/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pyqrcode/Manifest b/dev-python/pyqrcode/Manifest
index 6e92d0568514..4497d39d8c5e 100644
--- a/dev-python/pyqrcode/Manifest
+++ b/dev-python/pyqrcode/Manifest
@@ -1,3 +1,3 @@
 DIST pyqrcode-1.2.1.tar.gz 36989 BLAKE2B 88d5274a503abd78d0b8cab462d12be0af925a5eee2a6ad2b47a276559710eac40643a8aec99f26a9579f94e9084182894163e7e71f0abd486c5c2913e510080 SHA512 784262cb15c10f3581b0caeac6bba046686b35b8c0709ee78684b805b6cba49f4250a004dc5f7d393cc25929cbf815c6c3a94e284a77d20ff7224a8dde3a036a
 EBUILD pyqrcode-1.2.1.ebuild 694 BLAKE2B 9feda9dff7b441612a0f1cb99093b7e4afec193b1c35a2410a353dcc1c344821abddcc853e5a703292f4f7f4073928e8f39a5145386e0360ff2239081dd9a444 SHA512 8e6531b2a0e0d2e28e482c376c7a39c0243e8743a46617d702d8e23f862f6ae33dac237dcc025c1af33c1f18600f6d8a813654c629180c97814a5e0781c49ab4
-MISC metadata.xml 763 BLAKE2B 8145476a3c29c4c43388021c2100a87c233f5b67f28ce84de8ea1fada589b82be9e0ebf62b92a623ae74ba7d1993e9141bf8fb88b0100d65cca32ad3c2a5184e SHA512 de826d98aa1166e3a5746fbc363b14b9700b81f36cf5cd4e4446b3db79143650cc11e50c1af92e6a6231d85b0812cb109b66e8cf06eec560557cf949b7566f1d
+MISC metadata.xml 685 BLAKE2B da3a57e855942a58edb70ca2c55794f3e15684e5903f4348c5128e665ad6e76c1261053e05227d400f31c86292736dabcc581428feb20cfdfae4723ee01cfe18 SHA512 b037af38847498f60da288ba8776a9eb85662cfb72f5f0ecdcf677ee36474b989cf4dccd3f7ea034c8be92f90fa055f2db6ecfe4015d011bbd8a3304fee0aff2
diff --git a/dev-python/pyqrcode/metadata.xml b/dev-python/pyqrcode/metadata.xml
index 222798784af2..5eca12e0f741 100644
--- a/dev-python/pyqrcode/metadata.xml
+++ b/dev-python/pyqrcode/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index 09fe2e47c2fb..e37bc7bfe287 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -2,4 +2,4 @@ DIST pytest-fixture-config-1.2.11.tar.gz 6525 BLAKE2B cae41f542fedfcc8587dd5a4cc
 DIST pytest-fixture-config-1.2.2.tar.gz 4995 BLAKE2B fee7acb10140320b2ae14968fd99bb11f6c23f54cc86fc74a52855b58071c8deaefb1343c4d92726f7fad5e873c25c426f04d8ced3ecece3d953dee4c7693b7c SHA512 c2d2346c50c8a73e37ce217e240eabdecf872700c9f4b020f1ca7532a06e6a5dc6b140356d96b1bf8c83f1cf737d95775abaa206c3dcf7e02555b26aa995f12d
 EBUILD pytest-fixture-config-1.2.11.ebuild 749 BLAKE2B a9fd14c001f2bb48d2f76179b3cb614a5305b3d350b2270dcc0729ba4c5a104b9f6f662febe821ca54625953f7e7993acfe56e521f1fdfa65548a3530a60b885 SHA512 48c6093fe3c3a86b6c26ecae1faa507f5400c416ddfe96e1cb08fdd86db81fceb47a9cc4ae32bbfc3985a4833f0fa69e8fe2a781f1a5bdb362a3464a04e11196
 EBUILD pytest-fixture-config-1.2.2.ebuild 697 BLAKE2B cfe3eb731085132323b3671e3aef57dbb724c3ace9056bcb92435df0f13c11669a400c8097c89aa4cce517bf56f821bad946fe091d2fd4e45826938bf159ea80 SHA512 f5c421ace08aaff861e27a17311567e6cd8935cd763de887fea546d96c10b7e9290d0fc7ee7b08836b05dbe3edd84eb7e071aa9f064e5cd965616ca474d0a67c
-MISC metadata.xml 628 BLAKE2B 925ae819fcb1ec9d45dd67640954152313f84eab26d5ee055d8589e29062ee275f61f828dec879fded534bd3db0c89580fbe6e16b5ebca4c2f5547bbbeaf365f SHA512 a11640b82dcc479a13ab8eed44d7a543e8594c6f829ef64855d02a750ce605181e6503d5d8dc2d95c8740fb70f86e0c95467d9df81b7bd2702e3658572035af6
+MISC metadata.xml 578 BLAKE2B 5beabb8f2090baf84278de31a3db0f16af516fdc5f2952b57214a2fc6c7f3322c539d904d42edb5b121567b1d116f7c15bba75146207dd952c38498a4328effb SHA512 6e01fbba94b5c93f444b4d6b30f1e06c2b60367d59f5a86167e1e652c9d2a750a087f202798802260312dd1b6d217596072135df9ec37513fb66ae76eec44c17
diff --git a/dev-python/pytest-fixture-config/metadata.xml b/dev-python/pytest-fixture-config/metadata.xml
index bd0708f058d9..eee36b417e39 100644
--- a/dev-python/pytest-fixture-config/metadata.xml
+++ b/dev-python/pytest-fixture-config/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>eeaston@gmail.com</email>
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index b5bcae7c6626..06fe241de7f1 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -4,4 +4,4 @@ DIST pytest-shutil-1.2.8.tar.gz 17051 BLAKE2B 9006ccd51bce6e5035ed93a330e460666b
 EBUILD pytest-shutil-1.2.11.ebuild 1031 BLAKE2B 9cac9c066228915df008680202fcb8f0d2f9def532717a9a503d6f11810350240558ee30b80d2a27f791202d0686893aca1a43a10b1011c6e9fc4b7c6a832024 SHA512 110e61b71487a078b36125532615e46ad5d077d2dfec4dd4a1f0412fd64c2ff8ecfe5275cd047ee38fab70a741079dbc544e32978e165e7f7ac03bccd242d13b
 EBUILD pytest-shutil-1.2.4.ebuild 862 BLAKE2B 42754a521e048ba86dd93d4f8eb9d7508daf1f2564e428e3cc20ef7bbd93f6325ddaa40da13e40e59e20e2de25c32d9acfcd2fe2ce32eccc5a52fa3afdf807b9 SHA512 1d2833e55783d5460e0abd4917665d2bed950e259a36c58ac99eef975ae940f21e2c962400e426fc609fb09fe8a7cf06d7208878c98c173fc7e2139a34169016
 EBUILD pytest-shutil-1.2.8.ebuild 862 BLAKE2B 42754a521e048ba86dd93d4f8eb9d7508daf1f2564e428e3cc20ef7bbd93f6325ddaa40da13e40e59e20e2de25c32d9acfcd2fe2ce32eccc5a52fa3afdf807b9 SHA512 1d2833e55783d5460e0abd4917665d2bed950e259a36c58ac99eef975ae940f21e2c962400e426fc609fb09fe8a7cf06d7208878c98c173fc7e2139a34169016
-MISC metadata.xml 682 BLAKE2B 97ec2b3653d0946043034e72566860dc77fd2f063ea2242dabcbca2ae6f1c3b4052c2f0c24b9f981fde07c00b35da0f1ed7322964dfd3b9f4f7d3645de9a6ac1 SHA512 34b80ff399184f3335a694bd0ed0d073450a498b355749271b0d8e9c92673134d908c822be6684773a175bc3650dfa894bcaa73e47da70e92d503f602d515d19
+MISC metadata.xml 632 BLAKE2B 120a7ca9aa183bf3d832638c09a1e83573af0a2b6313e1bbfc612d4dc82124574bef607ce2e3801bd6ee25196708e65902245838a5230d6e530fa7dd57c15664 SHA512 104cc71900f15c4983e3f3683b7dcc02670026908817064ca4611706bca03504e1e321e62d64bb47fe32d949792b1ed1bd586b3a03431433200e05c554eef770
diff --git a/dev-python/pytest-shutil/metadata.xml b/dev-python/pytest-shutil/metadata.xml
index 0af7825a9e22..3c2b6c6516d0 100644
--- a/dev-python/pytest-shutil/metadata.xml
+++ b/dev-python/pytest-shutil/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>eeaston@gmail.com</email>
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index 05e94d4bc031..94026c041d82 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1209fb9557fcfad586e1226b70d49ed8093aab602149335d23d497b0674e606d00d289fc291dd721aa7470f12ec221b5f61 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41
 EBUILD pytest-virtualenv-1.2.11.ebuild 883 BLAKE2B 265e674a95c1802ead419a90ed99a15544f8970d75eacdc739676dadeac85df178aa2fd37f03f49308ebeafc3a481ded94c18db31f1f6c7d9a4cde74e604da25 SHA512 b0e31785058a35ad8abf573f63b15ce6b4fc6a249c9e9a36db3956449e88dfab98bd894200182e5ca91b241f15e2355af8475d2aa5df7d12e63d398d467241af
-MISC metadata.xml 656 BLAKE2B f7895bc4cad2dd72b92dd5661a4e92abdd4f71e379fe23b9ef168a0cc3776a58c2027b137d07e1f2847408e107b7727f4ccf888d2b2dab8faebb0b7a503f6c18 SHA512 ce02a53faa9fea4fd118e39f0dd8d28f9fcffc39aaa269e4b353a78b2833365718691d257fa4018e94b69829d19d58a21052a8e66a5312f6b29761aa8b8b9570
+MISC metadata.xml 606 BLAKE2B d6e2018080e6c9a166106a28ce2eb806b647fb0f5755b9dfacba36475968c3cb5131fb553e76c910b2e480b036ce22e246d78dde1c811ed6e65811e36f635057 SHA512 e390b6d7cacf40a1942892b5541c217fe33709ac80d49def174bf5763719a4990147a7fc31d331df79953359055d5b4e38903735d66bfdad403bd13838fc5f39
diff --git a/dev-python/pytest-virtualenv/metadata.xml b/dev-python/pytest-virtualenv/metadata.xml
index 3f1b4c3a6338..3f1556f52660 100644
--- a/dev-python/pytest-virtualenv/metadata.xml
+++ b/dev-python/pytest-virtualenv/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>eeaston@gmail.com</email>
diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest
index 128cebe55b49..692042b35ee9 100644
--- a/dev-python/python-gammu/Manifest
+++ b/dev-python/python-gammu/Manifest
@@ -1,5 +1,3 @@
 DIST python-gammu-2.11.tar.gz 135567 BLAKE2B 133172cfd0715ff6b5bd47b93e5d93d52af3e608459ba1158bf008da9b5f24f6d155c04334dea7ff2cacdea678f00d986838a139290d5f8ac874bb9702fcd5e6 SHA512 cdf3a54fc538fecdbe3dae63f0534094ce94a289998f9b670a0b3e12a3c571eb46ee86eae67a7a8d2428698850046d5c75569753bf77551cd395d315e6f9b70d
-DIST python-gammu-2.5.tar.gz 133090 BLAKE2B aced85e9f7a4d861a8f11ff0ebb97a7f3062e5f3ad3a60614f6f5f16a30b5f5cfbe70958e630dd55d02d0f190648f2976cf60ef3259c21fbc882acc865a4ce8d SHA512 e61bb340546cf3f98c20ff5d4ef25ca05676b4dea91e02aeee2856f091ac12fbf07a597637f9562432e298bf9678ff4445d24d8cdf96274b735aa9754b364e58
 EBUILD python-gammu-2.11.ebuild 757 BLAKE2B 74cdb492687349fbbdd0026b2430bc634eacb4a7c03e4f0f6898570943fd8911885a635dfadc8729a296cca8b0dcb5471e3a467b1958c91e5d4b981dcd333ec9 SHA512 c1a2144377bd9430e44870c6074d0d615510d49528f0785cc1f662be7208133303e9ecde5d3cff7dbee26097fd859eadd269a23fb304b1f9d6352450a9b0198c
-EBUILD python-gammu-2.5.ebuild 707 BLAKE2B 63e4b50c50bc060d9b84402452cead77d5cf957af71741fbbd66295999859d2f0273b33da992b1f05e82057801a7e5beb501d33e3932b3f58cce583933c80d50 SHA512 847aafcd80301d086b4e23144fda8c488c9a2c2fbae64e2934f67158ff52ff0d52119994b73f887d6d36d0f27d939999b31062d575347fc5f9f0fd153e104e27
 MISC metadata.xml 375 BLAKE2B 2ce9558b6704f95ab2897b077cfea90e039faa0ae01e8c96bdccfc8cf960d532f17e464eda20c0a4790db35b2e33fbbdecf6eab96efed8773200c0cc045237a3 SHA512 ed96e59e555b77c67b72e065eee123a0cc111e53332660da5abeeefd046514ff40441810d6f496fd7992b130498fe1c5b0a4bcf2ffee72c2cb817c118f6d4c20
diff --git a/dev-python/python-gammu/python-gammu-2.5.ebuild b/dev-python/python-gammu/python-gammu-2.5.ebuild
deleted file mode 100644
index c07b85cc861f..000000000000
--- a/dev-python/python-gammu/python-gammu-2.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Gammu"
-HOMEPAGE="https://wammu.eu/python-gammu/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-
-RDEPEND=">=app-mobilephone/gammu-1.34.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		$(python_gen_impl_dep sqlite)
-		app-mobilephone/gammu[dbi]
-	)"
-
-DOCS=( AUTHORS NEWS.rst README.rst )
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytrie/Manifest b/dev-python/pytrie/Manifest
index c25f3f1843da..4c68478b5cdb 100644
--- a/dev-python/pytrie/Manifest
+++ b/dev-python/pytrie/Manifest
@@ -2,4 +2,4 @@ DIST pytrie-0.3.1.tar.gz 94678 BLAKE2B 12631652ea33d2f1575f86bc8c42982543f8fa146
 DIST pytrie-0.3.tar.gz 228709 BLAKE2B 84c415722a724ac668624b3da29bfe29998c2ec8662ad21ab0035bb2a694e94759e9d09de980842887972b5c1690d699e43de41bf9f62e84ef3fbee86477d0a2 SHA512 f1dc6f810e51385fa4dcf2cbec76cf7fe5c184208f8d6dccf6212d43260591580126095e68d28ab6c8b01a631e6e16b275fa088643ae81568493ca231dcc6161
 EBUILD pytrie-0.3.1.ebuild 622 BLAKE2B 8d6d4e1641c91167fbdfa7ad29c25cb67b99a9fc1d643a4eedcb1866eafd1424d586db7ee554751a5942d9c28907075b1762ad375f28f43aba8fd8f28afb1129 SHA512 9bb5173a125a36057eb5f412099915f287f4fc552a6e7f87aae16a8e28f49929871db341420eef12f10dd60344fe932d788fa6f7c3a4deb59d953e06cf8b3cf6
 EBUILD pytrie-0.3.ebuild 595 BLAKE2B 862638b14fd5cd871b5f241bb3ccec1e57afee8f8fef6b8c04e372245c02fa78ffe8fa3233d9a64288a32b1ae4de569bd06c06638b0adde7374594b95c96f75c SHA512 c45e370bdadbdc262d7d2390baac51dd3860804f67b52eafce89dba3c07d0791e3cfa1aad4dec211421b42218440ebb7ed658cfe13e21b14b84fd35a11b50b34
-MISC metadata.xml 964 BLAKE2B 9fbaa7700117c0416ae610f5f4d15078276cd6beb5fa6064b7a2649b5e1410b3ea957db671a6fbf7b3c387df22493df21246a5dc0ca563fb7f74c4a62d05a822 SHA512 cb64560edf2a771b3bfb856db54b4a6e41831a8ef51e6f2d9e045dc4e01db3a79a670d5c39a3ecedec4ed3c3f57473ca1ba5057b1e45a0d76f22275b888000f7
+MISC metadata.xml 886 BLAKE2B 240f560df7f7c6c99a7898f22b6a7445c1b590cb57bdbbb1353d2447cef377f7a7e562ca5d206592514fdcfb7315a207acd73e77c3b9fc1306df86176aa45feb SHA512 0fe09489e422888f9f98615a3981b679f76ea3c9ad07c523926a28bb45a305420f0f7485176863e7db560266b963b742bca05defc5c5b29fdda195915483b60c
diff --git a/dev-python/pytrie/metadata.xml b/dev-python/pytrie/metadata.xml
index 27d43dcd3bda..e3f58daa7825 100644
--- a/dev-python/pytrie/metadata.xml
+++ b/dev-python/pytrie/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/ramlfications/Manifest b/dev-python/ramlfications/Manifest
index a53f90a38a20..300911267537 100644
--- a/dev-python/ramlfications/Manifest
+++ b/dev-python/ramlfications/Manifest
@@ -1,3 +1,3 @@
 DIST ramlfications-0.1.9_p20160718.tar.gz 1104645 BLAKE2B a33cb4529db10b92280c9ed6bc04e2d4c2d534cc4748ce219984f7fc4c7bc432ad51adc901ea021b64a3776402b159d38cbd34e2c2bca4b863f012026e2b3a0e SHA512 a21330cddb2d390744d7c13ee62edd701f74a83c16f87b897460e2353e265f4171e90e8b51bb0c17762a1f3494ddf8aeaa22c36f0aa093f936b9a51e2d75d1f5
 EBUILD ramlfications-0.1.9_p20160718.ebuild 1179 BLAKE2B eca566ecdf10e38517081478b0f1a95598aadf28b1c6f4c25897e8142f1e9bb0a95a3678573f4772dda14fe361ea6314796e67d8af65e574476e90e7f2a79596 SHA512 9847b78c30d7814fc2a5bd58a63428e583016d3455497cb7a6d45e304e4a513011d496830149af068347142ae7af80a061644a33a3f1e08474903df72510d24b
-MISC metadata.xml 798 BLAKE2B 74d1f471f4bc5b36905ed117c764da7a2fa7beff44ecce1f1cf858f64f887ff415d3b298471b05788115f8820e0f987003cc5e197765d8955182dd2ffc4a4a8b SHA512 1702741194e43d4cd938185c638d8eed7bb13180b9914cdb285ae295bee68e3a089caea26d7f3705ce07d2ff1db55353436f5702b0f7a2cfc204c92290c9ab66
+MISC metadata.xml 692 BLAKE2B 08237e74ca499f2e424c9650e1d0cd553e802cb50bec23bce46a4a8351266fef545b62eedfab60277cc9621093f378f350466561b5ead509649534b088de14e4 SHA512 71b7a6b4e4ac31680ee35e60cc514a2378ea94d48476369aba0ab172e44084237c7a4a54ad7a18d063cc5e297fb89d05ea9d15b5db0140f4672332a4ef74315c
diff --git a/dev-python/ramlfications/metadata.xml b/dev-python/ramlfications/metadata.xml
index 959e9171d0b7..c9b67088ebef 100644
--- a/dev-python/ramlfications/metadata.xml
+++ b/dev-python/ramlfications/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/sdnotify/Manifest b/dev-python/sdnotify/Manifest
index 3260089d689c..47dda059c77e 100644
--- a/dev-python/sdnotify/Manifest
+++ b/dev-python/sdnotify/Manifest
@@ -2,4 +2,4 @@ DIST sdnotify-0.3.1.tar.gz 2513 BLAKE2B cbce1d3c2bae3b3a02102cfea9ac104e7c2839b7
 DIST sdnotify-0.3.2.tar.gz 2459 BLAKE2B 1d1846e37889c36cfa7242d14e4040ebb9b73d3e53f5a3423447ae1a4912373e4249faa7803ac212e3c7d64371d1fe9e1be2d56f8604791cead2cbe22e422053 SHA512 f7e7d38c8d7f56ebad8b0343361a0bf6177208b94916430343a0a392015622d7bb62aa391e17956e5aa9a0d7189c79268cb86c46bb52b36488df5aebca5cfbd3
 EBUILD sdnotify-0.3.1.ebuild 525 BLAKE2B ea191361136f0425495192d4ad6f7a58345f7d4a65fc2d9762541e0d02e13889162e5375cf765f18bce4431ff3f07d3a2c0103f4ad6fcb7656cc53c263a6a302 SHA512 696a2bec9d82f030fb2977ac5bc5f8b62cb822a3be68dd5d521cbf44fd76ac78d875abf0ca8e29a17fc6394b3313c0be9e795897aade9d67a0d57f4a7a62dae5
 EBUILD sdnotify-0.3.2.ebuild 530 BLAKE2B fbf928b6bacfb44c00524ae1b0970a7eb65884d5737840fc28d8a5ff8b4d5c49872435400a004b5bb3b4901b468798835611a312caca7254d6ee11ce15bec77e SHA512 8fe18da0ec205647ac447df1020bed7e1effe52565b13fd76fedccce305138ab3d33dcdacdb9d7dc5b373095389ded2c8e113cbc16003ad4d0fd1615c510c00c
-MISC metadata.xml 850 BLAKE2B 0673df4f05a46bc8b09c95d748c8d895635f2787ab7b6158d6ed8aa3abd0aae4d493198f0ba1a89088624bb74b66eb37e4638ca0e1121d4d3fc57ac3257fb466 SHA512 208120e5365d7553aa685ecfc1168fc58b215367c89d9a186b6183091bf736b05cc145cf121257e9c7b9571ab517eaf1a7bf7573bddb7d7a8a5c030f903288a5
+MISC metadata.xml 800 BLAKE2B 3841a502690a98b0fd6ab419349f359dd167899f5c7b8f53e610a7677d060fba149338196a1108ef66bdf62fc42acaea6aee03169e6020d2eea1db83b54b6cff SHA512 2ad4766fb8ef7abcd0a5444aab298d97f66fd84d5dc6e24e6e597f075fc82273d7991e5186b08a2f1ff0040675a8066b3046f1761c4a8200a4894f66990c8a3e
diff --git a/dev-python/sdnotify/metadata.xml b/dev-python/sdnotify/metadata.xml
index 13dc4abe565e..8627e65a80ee 100644
--- a/dev-python/sdnotify/metadata.xml
+++ b/dev-python/sdnotify/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>bbethke@gmail.com</email>
diff --git a/dev-python/setuptools_trial/Manifest b/dev-python/setuptools_trial/Manifest
index ee38a4be22a0..d380f1d9bcda 100644
--- a/dev-python/setuptools_trial/Manifest
+++ b/dev-python/setuptools_trial/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_trial-0.6.0.tar.gz 6227 BLAKE2B 2df7276197a5630b8140dce17528b75045ea86e15495146aceafc4428f6ab6493fbe8e2edfded30ae644523455df02f3cb85e8bf8879bd4fafc9a332d9f6bc40 SHA512 9104b98627f57ed53c90d22042346875c5324d7b30e1ec9ba1718b5c59a786915a8fe0a53789a5dbd9318a12b27122661234f5be403365261db6a8728ce39827
 EBUILD setuptools_trial-0.6.0.ebuild 670 BLAKE2B b3cb72394d40a6fad1e14626fd223e04187bca32043470fe5e481687f21ea7600e945ca207a7debf769975edfdfc9068432f56b1e19e7df3bdfa6f5aefbc33db SHA512 a550b6ea6f15f7a4380775de789aae518455fa0ebe0606f2ea7daab7a6f3cb1cce445be0d6b76786f317a41228805d3ac9f58bdcc2eb4a26e6e8e35851cb5efe
-MISC metadata.xml 816 BLAKE2B 14fd0fe1d40a882dfd51301c409e00409e75b758adb9e7ae3bcefeed9ff283ab3e4e5f5c6a8acf2131da42ee2e5920a6c472d3bb481b02f0aa308110cd74072a SHA512 7a8598ca93cc1f1556c38f882fb29302def77fa88dd2646a4f68a36e442e2e9cf3734e800db956bfb6a9d5c25d94f29808d292e38c708f1b936498c4f2768cf1
+MISC metadata.xml 766 BLAKE2B 18d950cdcab937287b9b7c719b629cb361aa63619cc32356d08f0a22a278edafb0215872cb1f88652e4da8dc7fd5a736e28e84e9bf5059b8c4fc8723adc60a7b SHA512 2b7461cf40ca95d42649a7aee7ab1ab262c7ea8cd23f16dff3b6adb2f3450be2f559b273a1c96c151ff654d0c593e5bcc357cfb1506bbba1236d84997a3dd704
diff --git a/dev-python/setuptools_trial/metadata.xml b/dev-python/setuptools_trial/metadata.xml
index 420e7bb4b033..2d9727db0f66 100644
--- a/dev-python/setuptools_trial/metadata.xml
+++ b/dev-python/setuptools_trial/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>vladimir@rutsky.org</email>
diff --git a/dev-python/shutilwhich/Manifest b/dev-python/shutilwhich/Manifest
index 076f92dc1ec3..b1a4db4004ef 100644
--- a/dev-python/shutilwhich/Manifest
+++ b/dev-python/shutilwhich/Manifest
@@ -1,3 +1,3 @@
 DIST shutilwhich-1.1.0.tar.gz 2300 BLAKE2B 0b510fe364991bcb1b2a627368e0aba23550a60dd0c8f892dbf25b5f23696f49ceedec487d91cc6a5acaffe28c29f635bacc633cc3c3377799fa8c75bd8bcd4d SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21
 EBUILD shutilwhich-1.1.0.ebuild 517 BLAKE2B 8f559d0044422b7ebfcacefd51a2abed640b815b34c85bfaecd19f74794d38a13eebffe81c525ac15feec2f65f97c7043f88866f2c0eb13422cbd8de94e0fa96 SHA512 a2123cf69adf89a95714d1015cd49682dd1d2d44cf43afea4df405e5bcaca051f56c56aa3a8bc0aad6b1bb87be4adda38ec3bb2c3c43500121c3d223b30a0504
-MISC metadata.xml 711 BLAKE2B cf4caeca6cba1b6211e4910618287135ca84240d348595c91389578a2e2f887c1f88ebabcbf3960d0d6472169cd1b65455d1d8a4b58fcfa530662f75f29ffef4 SHA512 69223961a781434b4877e7648f9f2897c1dcb110a559e64dfcdfb6c26a696f8aeee4be1fa211e07baa01f1c9bf57f3ef44d43502a6635841e14e45ae524169e9
+MISC metadata.xml 661 BLAKE2B 939bf0c624afa004f9db51b5dcbed8b9425dc18ab380ff1a17dea7970541a27583a69c137b90ce19396a5b83da7aa6668f9258f6c388b5a4205bdae2d4057a38 SHA512 962875eb4e6647865b9f16c66b5e40c3ff84406e1be3429010ae1914eef102ec8f7353f31f9e8697511830224112ee23796adc69cbed17fe1341892c58fd3a3e
diff --git a/dev-python/shutilwhich/metadata.xml b/dev-python/shutilwhich/metadata.xml
index cdb140420308..1534d32f0959 100644
--- a/dev-python/shutilwhich/metadata.xml
+++ b/dev-python/shutilwhich/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>git@marcbrinkmann.de</email>
diff --git a/dev-python/spark-parser/Manifest b/dev-python/spark-parser/Manifest
index 47e33e070986..777b213da439 100644
--- a/dev-python/spark-parser/Manifest
+++ b/dev-python/spark-parser/Manifest
@@ -6,4 +6,4 @@ EBUILD spark-parser-1.5.1-r1.ebuild 689 BLAKE2B d6ce09ba2b511856c14d460b165ae66e
 EBUILD spark-parser-1.6.0.ebuild 693 BLAKE2B a81aa8bc11159ce6d6240c168865322406ceebc6115a50d2f0660d97e8670cb6fb24f86cb71c6b866e035f45e1e2161e25f9ac7e565bb192f94854b29f2b284d SHA512 0229bd98a8c9f31d04c6914a200f813b0e339ba5d7cc3776dfd79b19eabb574b9fa1a9d54bc1f48a055c8b392165caaa7691b7755d98a5b9a1fb06afded50486
 EBUILD spark-parser-1.6.1.ebuild 693 BLAKE2B a81aa8bc11159ce6d6240c168865322406ceebc6115a50d2f0660d97e8670cb6fb24f86cb71c6b866e035f45e1e2161e25f9ac7e565bb192f94854b29f2b284d SHA512 0229bd98a8c9f31d04c6914a200f813b0e339ba5d7cc3776dfd79b19eabb574b9fa1a9d54bc1f48a055c8b392165caaa7691b7755d98a5b9a1fb06afded50486
 EBUILD spark-parser-1.8.5.ebuild 693 BLAKE2B a81aa8bc11159ce6d6240c168865322406ceebc6115a50d2f0660d97e8670cb6fb24f86cb71c6b866e035f45e1e2161e25f9ac7e565bb192f94854b29f2b284d SHA512 0229bd98a8c9f31d04c6914a200f813b0e339ba5d7cc3776dfd79b19eabb574b9fa1a9d54bc1f48a055c8b392165caaa7691b7755d98a5b9a1fb06afded50486
-MISC metadata.xml 870 BLAKE2B 1becf11a52bbac800786549b0bf5427d89741c18fe1230a8e77c121a5dfabcaf211e98f2568cf99607779d64a1ea2da0024028e5b041e044ff147b4da0f72b22 SHA512 0fd0254bb458b1e6936109c144cd55ce800b4362e8c8f4a5b2f731abe47feb21784ad768d2577d8c748432a321f190b33f71c7f89f5bc260f3c8470c074123f5
+MISC metadata.xml 792 BLAKE2B f23bb836d480fa5f0d6723343c86bf2f6d3f535a977013d023aee828e88dd88cac3df0cf5effb9f33aef01a5ac484638f1bab7074a9a3926e7e4f7a3ca2c7909 SHA512 ba7cbf1cf29885a44864347b4469511e0a97f8144a297ce17c88c518a473200277f7ba2a88ce9ff7fd79c48000f5620ad723c0f41adc6b5f9dbe47dc60c7c517
diff --git a/dev-python/spark-parser/metadata.xml b/dev-python/spark-parser/metadata.xml
index 77e7a39e3756..475100cb61fd 100644
--- a/dev-python/spark-parser/metadata.xml
+++ b/dev-python/spark-parser/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/sphinx-jinja/Manifest b/dev-python/sphinx-jinja/Manifest
index 05c066f0cc12..81cebf84128d 100644
--- a/dev-python/sphinx-jinja/Manifest
+++ b/dev-python/sphinx-jinja/Manifest
@@ -2,4 +2,4 @@ DIST sphinx-jinja-0.2.1.tar.gz 6676 BLAKE2B e009731381dff9aebbfd9ddddc3ce128a6dd
 DIST sphinx-jinja-0.3.0.tar.gz 7035 BLAKE2B a43c2ab6c1f0178987ccf9f69acbf0b50974573b83d0503e7888a56bf024e519ad69e3ac6ec9b8d27d7e01e9482008b6579c6892ce114124c0ef12ef456c887c SHA512 b39211a0013db020112c865335811317699e7ade734bfd9bb24f51934df4652f0560b81f5e253fc663fbd8a269fd962ef2bfd6dc96eab12a397a538e758cddfd
 EBUILD sphinx-jinja-0.2.1.ebuild 841 BLAKE2B 9aedc729ce6633c78290b29c0f9afac078c934bc8ebccec0fdb4ce07287d6e705c7e5ba8bba1e37662d2db0f0aee4df31c068291a541b372a0280b4c3cdadf75 SHA512 fa6072e04dc409a69af0f9dce4cddb8f700a4dae81d32f382b497c13588c5f0023618520a96a5ce5e30807649e888ba4693e357a323257cbcd37f3c055e5a552
 EBUILD sphinx-jinja-0.3.0.ebuild 841 BLAKE2B 9aedc729ce6633c78290b29c0f9afac078c934bc8ebccec0fdb4ce07287d6e705c7e5ba8bba1e37662d2db0f0aee4df31c068291a541b372a0280b4c3cdadf75 SHA512 fa6072e04dc409a69af0f9dce4cddb8f700a4dae81d32f382b497c13588c5f0023618520a96a5ce5e30807649e888ba4693e357a323257cbcd37f3c055e5a552
-MISC metadata.xml 575 BLAKE2B dc5634c194e0b35aebe4fe686fbb1fbd2ceb6e2aa3bf0b3cf476a3f67fe04c2ebba4711a51e248ba234dff8d4f94a583d36966ff21be0b17d3eba21d32b48ee0 SHA512 f9a56f712f16ee55b60e005a92f893a8a97de67a52d615537e10cee4ce9435388200ae832edf080ef1c78731974b42d415f597b04ab934d785d60bbbd93fd865
+MISC metadata.xml 525 BLAKE2B 2a1e29ccf9ea29d66f54bbe9c0ca6382a80088e5631a2cb3634e02344a783a7045ffb4ab30e9363587cecf6213e1a4064490df3bbbdf3e410da23498267161d2 SHA512 2f42d584f3c61ed3b024073d1ab105b9486bc68962a44b6642cfc249c20ebd38dd6d9ac246891ea09cf88df8872bdfe611b709b484a9b753de37b0fe0055777b
diff --git a/dev-python/sphinx-jinja/metadata.xml b/dev-python/sphinx-jinja/metadata.xml
index 5d26a6d415b1..c7de31b06bad 100644
--- a/dev-python/sphinx-jinja/metadata.xml
+++ b/dev-python/sphinx-jinja/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>tardyp@gmail.com</email>
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index e82da70ad367..d188b41bda80 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,4 +1,4 @@
 DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
 EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 585 BLAKE2B c18c9d16780aa5d3e9dd4930ab4f084262ef2c05a58c74d634d02f75328f8220938f66f3adca7c650e510bb076ff3981a6ae01f760a0289058026b556003bfd6 SHA512 7115070555c9f1f7c908c953e19e71f80f2efb4869b76fb1266186f68404e65d862cc51024e867aca44ebaa409b4e2392e2c71909c26d051a67d98994b047d90
 EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 572 BLAKE2B fbe0cf930c9b3433d0fcead03df3d17547dde6eb91aa87082d31a6ab6f8da5f919092943bf7b5ae916c2fd51578040e591cbee89237fc051032c21ea7bfc1898 SHA512 34c8d8af951f77ea7f0791861fa67ca5f4699545a4921470badee5f16d5ce8e5351c3b01bc496d9f97fdbf2981b0819c7998744f5c400f7830b53bdc9920a238
-MISC metadata.xml 593 BLAKE2B d8e69d801973c15666c838797ca8b5bd746623b2bb2915db38e4b7461757abd2ad6dfdd95078348775c0494dfd19dc5937337b3cc9966bbce88a3711f014c3e7 SHA512 21771b0ca9695c748fe0fdfddaff603a296c671af1d1e7b097fdab104eaa33ea61bc4ff887f27f94cf0a76ff9a52ddbe7055167b5f651f954e78f318a7f9d9df
+MISC metadata.xml 515 BLAKE2B c980e1ccb62fea64efb6bf54ed6c07acbb8241b2b65d0ba6043fb32908c12654f61e173898a452e6c56b9010744db626d1dac82bad68a09cff64866817015c90 SHA512 d22018d48a247400a976347285d69a3030b75505bcab3ee4e66a4eac419b2171f26dd483c0653e4725a60671ae165d5de4d9d3e2c058cfadfe277a26d4dd714a
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml b/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
index cf7f607c40d9..abd8fe7faa28 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
+++ b/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index cbd7b3cfeaaf..d68db1dea094 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -2,4 +2,4 @@ DIST sphinxcontrib-blockdiag-1.5.5.tar.gz 12066 BLAKE2B 4913aa53b365a05db2962c81
 EBUILD sphinxcontrib-blockdiag-1.5.5-r1.ebuild 923 BLAKE2B 29b6a166090519a8a6d7aa3f381661161429db8e5f912f0a92dcb669ad92b23c550097755ae57bf7024e23fd4b58f3dac496e9f973bb742fe75d083249afd816 SHA512 f5d13643c66e24c6095badf6eecc4072bfdbd41928b2042b901042818229ba21236fd4bb0de71ab6161a5031f861d008b839d1eea2c2b592892a47c52189d875
 EBUILD sphinxcontrib-blockdiag-1.5.5-r2.ebuild 1332 BLAKE2B 1729c17b7f5be02cd93fe1c0ae8465e6c1f3467b880ee35abdbe0ba44a90d2a3bd68013cd514a4963a9fb67d8a30ca4271972e26c4a73f68dcda3855be017861 SHA512 8e5c0bba10fb943b1ce19e27563167d49b1b1b64152f89b8a9838fda452d57abd2eec66436e10d1d4514940a3b8f817ec5f51d13a902b9d63cad710ad0e60e58
 EBUILD sphinxcontrib-blockdiag-1.5.5.ebuild 674 BLAKE2B 58d9d30ab0ac583c6414fb8a650bdc1bdd37ea55a942fba667cc0bdcd2618d842518c694636ef5d1a09990b36375c1e6ffcc68c68dea88f6d5e6e33ce50a31d7 SHA512 ac98f936ae0824a53ac52a3cbe87b10a67d44c938eef071ff2bcf3e8c9996d32b858acb4777adc39a0d730261dc35278479479fbffbf41176552373312235fb2
-MISC metadata.xml 494 BLAKE2B 07d540997f553498944f9ddc98afa804bf1dd6e4cce5447aa8d7990ebbc375813cb7d9d284915d7bbc181b12cc905923a1b858b663743eb408bca485e40ba22b SHA512 f83022805ed92e559cc35f663da9eed77d33fbe0d25bba287b77fa53235c14534493c493d107af0ad9573d6cd7fbfafe74017fe0b96e65afcdd45c5e3761fdde
+MISC metadata.xml 416 BLAKE2B 4383283e64d8db0b5576f1defc62412b5c4f4003e5ac75a2755e79d3e2a53f6d7aff82741d6225d2c96f0e2d87df650d47110a31cc91362dee641a86c54b18da SHA512 10fc4ff78fce4beadf8f8b64cfcaf4b71f84c3f74d80bd7299055ef7c2a759bf8d8eaef841e464d72d3272d999fe20ebfbcd382f2025932eef474387e92be6e0
diff --git a/dev-python/sphinxcontrib-blockdiag/metadata.xml b/dev-python/sphinxcontrib-blockdiag/metadata.xml
index 718fa6583747..df1f7a5b0aba 100644
--- a/dev-python/sphinxcontrib-blockdiag/metadata.xml
+++ b/dev-python/sphinxcontrib-blockdiag/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
diff --git a/dev-python/sphinxcontrib-pretty-searchresults/Manifest b/dev-python/sphinxcontrib-pretty-searchresults/Manifest
new file mode 100644
index 000000000000..4de45a38d242
--- /dev/null
+++ b/dev-python/sphinxcontrib-pretty-searchresults/Manifest
@@ -0,0 +1,3 @@
+DIST sphinxcontrib-pretty-searchresults-0.3.5.tar.gz 9996 BLAKE2B 64324f306aec1d6eac9c791acc0f3f4a0a434f734abcf9bb0d34151137e20407d59e95ea3a3a981e425ded6b6fd82bd36627323a3ed493a47b92979ac5fe2f77 SHA512 30c9a0af183ffada3300c03495afb9f52fbba5522dd386c5a05a28fa1e6dd0fb66725499db7a537534496843e6707c7dcceea45511ee3953d02c3e2275e68630
+EBUILD sphinxcontrib-pretty-searchresults-0.3.5.ebuild 986 BLAKE2B a70684ea22f50d86f8e87d5f36c9f0d11ddd90dcde12d24e4bee314a98e0fbd7c55287f6e23d2121b0ee7a416bcf2fd060bcaf81168d953f8f406458246e8d22 SHA512 84388516bab12ec6b7b188e4d3dcad2072ee1aaf1c7d3c23f0234322fea409d5d9ceda278d7424515d4e6622bf06ea0d0a6f6148d8c2751e0d550d8c9ef427e7
+MISC metadata.xml 936 BLAKE2B 34793935ef5b64e806d2cf26f638a87520098d220ce0b1546f44694be606bb426a1f2d6e558ee116f6647f09e87288a1cf2342dfe1631872536289f4f2dbd354 SHA512 92fdac98a9755a66cf8b5e13567861202b6940903fbc0a83f563888bd87b753d16f7b540abcc67fbeeed087905de992b92998e884102a016041f0d7fc30465c2
diff --git a/dev-python/sphinxcontrib-pretty-searchresults/metadata.xml b/dev-python/sphinxcontrib-pretty-searchresults/metadata.xml
new file mode 100644
index 000000000000..479261280af7
--- /dev/null
+++ b/dev-python/sphinxcontrib-pretty-searchresults/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bernardo@standard.ai</email>
+		<name>Bernardo Meurer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Sphinx: pretty search results is an extension for the Sphinx
+		documentation tool.
+
+		To display search results, Sphinx is fetching the
+		source files of search hits and rendering excerpts in raw markup
+		(Example). This extension removes the markup from these source files
+		(during build time), so the search results look decent.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">sphinxprettysearchresults</remote-id>
+		<remote-id type="github">sphinx-contrib/sphinx-pretty-searchresults</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild b/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild
new file mode 100644
index 000000000000..93849564786c
--- /dev/null
+++ b/dev-python/sphinxcontrib-pretty-searchresults/sphinxcontrib-pretty-searchresults-0.3.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+MY_PN="${PN/sphinxcontrib/sphinx}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Decently styled search results for sphinx-doc projects"
+HOMEPAGE="https://github.com/sphinx-contrib/sphinx-pretty-searchresults"
+SRC_URI="https://github.com/sphinx-contrib/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	cd tests || die
+	"${EPYTHON}" run.py || die
+}
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index b5d7c30e965e..622cad926635 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -7,4 +7,4 @@ EBUILD ssl-fetch-0.2.ebuild 1121 BLAKE2B 84ff7d6a0e25576ad2554d443eb03073a77d25e
 EBUILD ssl-fetch-0.3.ebuild 1175 BLAKE2B acd460a33a2e5d35ceb45cb7ed0c8997c27463b0785d4fed948bdff9c943b3b5ebadefc53440cc27950fa7b3c1282a2872cf3fe1dbf5ef1e74a45811bf467058 SHA512 80960d72992004b49dddc5fae88032658bc4199d0ab3324a408f4e964f90a32632647e2e89a7506fb753ffb5305c95bd0a44749f1d81d513571f44ad92ada0ab
 EBUILD ssl-fetch-0.4.ebuild 1212 BLAKE2B d8840a3f8cf46f8a6e781f6458761f2e3e9a3d1a71576e291daa4d38e23fa5f5dd9ac39b2007a9a08f51eb7f34c6b6c173703b74e11fa8fdc2cdd40d61206f9d SHA512 a6596764b746deffd047e79c3c48d11c7f7874a57232ae7ca5d8d0813ee1d35a1e460bf2296f93ba495cf1885c5e7b663799e4727bd93ba43802556a40209f5a
 EBUILD ssl-fetch-9999.ebuild 1083 BLAKE2B 5e606414488255e0a569fff17ed248b6c00fa18d3a0274fab0d0bea0c61960f1cfd6c715c2d56c3d6d854f9d037fdffb97f1a5d2005da6e68847f8a1428de80f SHA512 53ced939d12b731679a3120a147e7a7ef5c4f1e31e8893fcc80ad2f521373f25f93939a46e0b85e0b540d877d0337fa77fce75633d72f1dec580da3882ec2ec5
-MISC metadata.xml 585 BLAKE2B 660e38c7d1e6eb94fd0d517ccb3cdf563f0bf62e2b427368932a76fee743def08d377db47f8f3c7269a9f8bc89a72d4bbd7ed1280453e505a5365a4e1e541fce SHA512 e654050b05973990c8ff763039fd131a2f08916f81caf09d36cb5baa8fc91c4b15522319e22ffc689ce52a0d0c8fb63af5bacd894d9904e993242b3a8d653ae5
+MISC metadata.xml 473 BLAKE2B 5b8b4e2ce1dd31802946dbe506e7423f0b134d1a1cad24c33b7f005c20a8adeb4a89319c3b47f4637c150ab96ab4b4f44eb7d049faa0cf5a79f8b45e11b1b269 SHA512 832ff018c61d870c30ea89ccf300b4ede17e5a2b03b079a14d1b53a2ee95224e48e9f0091e07f8a79703190fceb77646458c3d760c53de08d29339143724c447
diff --git a/dev-python/ssl-fetch/metadata.xml b/dev-python/ssl-fetch/metadata.xml
index c664dd3ad2e6..ee51e5c59abe 100644
--- a/dev-python/ssl-fetch/metadata.xml
+++ b/dev-python/ssl-fetch/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>dolsen@gentoo.org</email>
-    <name>Brian Dolbec</name>
-  </maintainer>
-  <maintainer type="person">
     <email>dastergon@gentoo.org</email>
     <name>Pavlos Ratis</name>
   </maintainer>
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 55bb786d9e5c..97494a5b61f5 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -3,5 +3,5 @@ DIST sure-1.2.5-r1.tar.gz 52128 BLAKE2B 8370bccba9e9345030dbacd91758dc1be8d122a9
 DIST sure-1.4.11.tar.gz 45933 BLAKE2B b2146ee56237f4575cab5122279023066a1b9ba20493ced7d729b1afa456f71a38071b721c39594c3ef2fcc912ba934e85e5cb5da576c3b2d20fa7d4926b56b7 SHA512 ed067385bf9cf317a5d55f6c5fc6ee54ee3d592825be398e47c37d31fc9c010cb9316d4e2bcf1d72d53d7e53fd470792d64348aa2bfa5dc43510daaff97742da
 EBUILD sure-1.2.24.ebuild 899 BLAKE2B b6ec26f55e0b5eae6287b2a9dc9f52147aa55aa60956a2e7fc87913856acf9c7e7514d68e0dc8caa9af10513905445c954349b5b97135804ca908bd817a5be59 SHA512 20c15fa0111a24af9c23a9fa4d4c235d816d110f4b5c5fe48b724033281dc375d0bf419a329bbb52e4c263b671c78064acfa961ff79e4cc9663fca5559ef35cd
 EBUILD sure-1.2.5-r1.ebuild 865 BLAKE2B 7d697928ca942b3db71a54ebce989b465aadc1abd542affdc285e51736d909e31999a9481c5eccf612634255947005fddf556527bd907e51500a4db478155b74 SHA512 bedf200d5c5b5e306387aec2d95e30220de722e0dcac89493b8eb560feec3d92157175e316fa1645fcf25af2c1dff586d4f69fa2d726e8b7c32e9ae27083c2f1
-EBUILD sure-1.4.11.ebuild 739 BLAKE2B 4b5660f738aa9a3d3282333f1c883af1766ae2bcaeadc0f45616092db60db1d298556a72067e6e0e6cbbfdaace9cc59bb24c88b5160b232c39892a48478a27ad SHA512 97d9624d3e702d0c6c56b89cf406fd814e2df50ba0f03a8c5a00deb60b564049eed1e9b9660a2895202db156c4e423f3dc2dd461712152bcd873b9d29f2bcee6
+EBUILD sure-1.4.11.ebuild 736 BLAKE2B 398e918a3124951cac02b9df131953193c35f93c05b401476a662204ee1b9898e5dd2b4dd1646b069b85f7ca1600b1a51e672337ccf1772dcc6b51285c9ba276 SHA512 74460d614e11c1bff26591e02610d0543aa635f16b54d706bf96f1e3f757731d30bf7d8c4e24e8e4780ca0fc8b260b97acb2ef7ae400d2a84b7468843bdbf81c
 MISC metadata.xml 580 BLAKE2B fd57ae5f0db3af8fa1a3752dbc6c5c0d2f614b19b3a791e416fae0e4500f0a3ec8f88a45b46b37745f92d7538f54846379b8ccb8d3cf6afb0cbd613b0eb4bf40 SHA512 ac9536e4de1fd74d326af98154065afb9a42e6b29b5ea2bfb22987be15da16236aa2dda813257be53158edb426c021e4e6a0f954299c64fe55be08f5b0f3b8c4
diff --git a/dev-python/sure/sure-1.4.11.ebuild b/dev-python/sure/sure-1.4.11.ebuild
index 550d962c8cb9..ba7f78aadd82 100644
--- a/dev-python/sure/sure-1.4.11.ebuild
+++ b/dev-python/sure/sure-1.4.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index 86032ff09c39..2139a1d6cc40 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -6,4 +6,4 @@ EBUILD treq-0.2.1.ebuild 1035 BLAKE2B d7500eb9eceed48f7371482920a71246eab25bbf78
 EBUILD treq-16.12.0.ebuild 1227 BLAKE2B 09bc21da5d1621b544d8bbb011d52a7ae8667a4cc6f9418814a532e102b24174b99edfde6878a4ab70612b05a881a6716e4d1848510c24269ea6d69481fe3b80 SHA512 160d07a1f2ac977907081667c7f248866cc1013776df3a8133b40df7ea7989524daac24e4573a8789fefaf9ac1cea33e001a184ce978e7fb9f745ede190ff313
 EBUILD treq-17.3.1.ebuild 1530 BLAKE2B 4855721f694e126158dd4ef784a5800b393c08ce81a2a759d57ddb8f6b2be94437a558b834a849ac8545d4dda5756b41dadf093df590e12e33afdbe4c44434f1 SHA512 1b80227ed035e6da681fc4115ade6d1654a799e99a6ff2e63ab2af1a28adb89f5f7e4f5fdcd506bddb6defb006acbc734e365e813fdd3c382b2e5418f3fd9169
 EBUILD treq-17.8.0.ebuild 1648 BLAKE2B 9a858c462b850a8233a41ce279bc0f03742beb7c88ecb49cf225fcf96881a99fa6ecad1a66019cbe29cc42115e048979642cfe62a01b0fbc4b2695c8dd79bb7e SHA512 0c0390438677091614e756d78f58e6837432dc923cf3a13e3d8bf8d4f0ce0ea4047f53669282d584002db5e41d5c38c3e8eb8e8bd2dd045a6b1c5731686df7a9
-MISC metadata.xml 651 BLAKE2B 4f61decc98382728f07f30be0ed88039223933a85bf5b838c40c9c47cc1828fd7ae742901b149f5bac870ca89e2485e126ccb195934f35848b0be19c3f5e0894 SHA512 ef37d01969116cb7c54e92840aba9ea8b1e70d49fc0ea512853ad3db2324289c331123f7a1b3026bf32daa2c8cad7c84e80eca189d3c2721329740017b6bba38
+MISC metadata.xml 601 BLAKE2B 1abd105a142f5eba9c335cc1ed8fb97aacd796ad9e42e8c8c04438a9b6830ef3e9675b3bfddb6677f6e9b51c61038954ab1ac29cfdb81f8c05259d95bbdc7ba7 SHA512 e4092ac535738c5c82e5dab29a0a3faa017853011013bc4f35b9d9425c2c92c1f092fdcf7236644ac955b5b9509fafd1adfaf04fb64439bef2b3d155f3b770c8
diff --git a/dev-python/treq/metadata.xml b/dev-python/treq/metadata.xml
index 7f773543abab..aa757fcc3d30 100644
--- a/dev-python/treq/metadata.xml
+++ b/dev-python/treq/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>hawkowl@twistedmatrix.com</email>
diff --git a/dev-python/tvdb_api/Manifest b/dev-python/tvdb_api/Manifest
index fb3f524e1f1f..045665e7f047 100644
--- a/dev-python/tvdb_api/Manifest
+++ b/dev-python/tvdb_api/Manifest
@@ -1,5 +1,7 @@
 DIST tvdb_api-1.10_pre20150406.tar.gz 33758 BLAKE2B 929b9e1326b5665eab29b9361fb25a107c91cb34b8226f071f5ed07490f1f2a305644a00ba5fcfda68e1357f50b7ed52cd842c806d8da3fb00e5094db55a09f8 SHA512 a62680a8e18fa5cb246c0916232aecd06dd5f7381e589690f8fedf5b85a9eac01331a858880f888c14ece53c888ab8d18e7dd65a6665639f5f6f6d335138469d
 DIST tvdb_api-1.9.tar.gz 32429 BLAKE2B 41ffff7c76131db3ff37e35dec8356aec85ca1180927ea468e4f3ae0980df4fce317b0366dd39dd7a219d5078c3a77f0caa94ab359b71f6750ea8d1067bc1112 SHA512 6ce13f47275eb3f37897da1b9bfb2d101184e3797abeec965c170d9b007661c3e0745396bc93bf365d6a1552fb461a2fd7b33777b4a67e58281c8ac3efb788df
+DIST tvdb_api-2.0.tar.gz 32751 BLAKE2B 6228ea0d8e9e679b7a70d6357917537cf8a6e362010ff6d1a212d51919689c656f8dc5cf67c694ddf7b4e2fd5b2fc0674393036c5ac38d8254878559921fe39c SHA512 74b1e036c2c71bff9f3d04bbf670da4069f68152545b09882aeddb5d1ebc873956ed00e8e28f2bd77a72ff97ae5fda23f1cfedd91f87187c31917ee31df17f3b
 EBUILD tvdb_api-1.10_pre20150406-r1.ebuild 526 BLAKE2B 3c59ab522ccaae4a53b201c71a710b7dcb9713ce3c1385f5fc8eb2c6ceb55b23800dd6fc7171190fd89755a030158c6e2e1ef73ddf08b24f837511424936151c SHA512 4b7023b07f2e6f0aba42d5c1bb107c3d837e4ded9e196f80005e53bc03dde8d1bb5e57197a358b8a4313203f1986218e3b2ef69244ac46cf16fc5bfd491c82aa
 EBUILD tvdb_api-1.9.ebuild 446 BLAKE2B 0c0ccf22ed8d50565585005ec136ad1c7c1338388dafba9f0504453a300190c03cb0192eddc3b74918e1cc23050626d714384f61e57df4d6ebb68c02d44b757c SHA512 3c5fa40f31e2b05652f363fe684ec9267d52c65113ee3f77e7e7963a543f1f1e68e986c5734b0b5f9d4d28ff3a86657ebe89431b93f864f78912e3d2b555b14c
+EBUILD tvdb_api-2.0.ebuild 481 BLAKE2B 95e4aac6dca51070e8048d60069943dd0ffab784a942c511c95fe46249014f44830a0cff53272e294548c228c7053d6a342b9da4112dcea55bfc4c9fb345bc46 SHA512 fedfdbf6e002d7bdcae328ca725dce5633997cfa9c716a46d085f245bf70c3acb9fcb1f06a1c20682c52c532af285bd5158f0f0d32dfcfec6612a2b9f5800947
 MISC metadata.xml 333 BLAKE2B 37ef6dce06fb7536eb18133f5dbe87b03a4cfcc54669dc7795dbfa9009920c020dc0fbca7d3ff82460e2e05bf3896fcaef8784078a4ab56899e9b7caff9dcb7d SHA512 5cdb8638da8db277b9228fd2ac53bb0fa4dd181da86b9aa3d9180e55c2d13ae494ab78af1168271158ce10469204028197bffac2e9b11afb48e0c71a15d583f4
diff --git a/dev-python/tvdb_api/tvdb_api-2.0.ebuild b/dev-python/tvdb_api/tvdb_api-2.0.ebuild
new file mode 100644
index 000000000000..df8357e712a9
--- /dev/null
+++ b/dev-python/tvdb_api/tvdb_api-2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Python interface to thetvdb.com API"
+HOMEPAGE="https://github.com/dbr/tvdb_api"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/requests-cache[${PYTHON_USEDEP}]"
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 9b5f2ae88056..01e7abe3797f 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -19,4 +19,4 @@ EBUILD twisted-17.1.0-r2.ebuild 5749 BLAKE2B 1614cfa819f32b04cbb9fae2fc259a64f00
 EBUILD twisted-17.9.0.ebuild 6038 BLAKE2B a53ba87f2da96ea47d8eb881133f2cc45050d530188068456985e23d75db7f25f22896f664c23a28821c64ac2b3059a54db6b7d171e4f068d0542683378d73ff SHA512 67b0f2db8226962fe50ace32cfdbd577c059d2deeb271a10e2c5716ad6b70adcf022f2ada7ae36abccef3c535dea77d2349de3b558d7a08e942416656e3cfe61
 EBUILD twisted-18.4.0.ebuild 5906 BLAKE2B 7d42db9c36190293a920fcc14fc9292692019aab8edc16e21219cd8f40d0dc194a7684dc26f1c6801ea496f6f550e189852aad71b7082e2a2e3450b5fe79bc57 SHA512 b4d5a722e9fb16d5ae88b985c24eabfbcca44ac1e5cf2ca2c9ea9a414a1d58aa7a81c2e10a12d00d3af6663c97ab476ae08913fc5351696c322273c49eac1086
 EBUILD twisted-18.7.0.ebuild 5994 BLAKE2B e94ba7c7e065bfb1a4c3688e131b0dbe37a94f81e8146eb35cd09846ad179f01ae0edda956befe9e0cadc1f41a4313f9d1f20074817cd4b411c169c1006b26c3 SHA512 85c1bf70ab48e1383e1d9096047e43b00f5bc620a96abc8b0e466214a4889525d800f2d12073eaccf01e2e3bb60926990c91dbccd1a15f4d0a9978016f930c21
-MISC metadata.xml 1429 BLAKE2B f6bf7279da38a837c80fff9f9319d5c2d3893fb4a5a17d731b170153d1c4e10479b58a6576d84fa59ae653794aa017862a4fcb11bf1bc6ca85c374e3b9dc7cd5 SHA512 1ddcc6bb727f97eacb712badf834ceca15a4544e340090622774bc0e781f2ce1a20a96f8b5018535998e9865204697a25ab84eff87c480246fe14e39ef9411ed
+MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/metadata.xml b/dev-python/twisted/metadata.xml
index a18c193cb3da..055660d70ca2 100644
--- a/dev-python/twisted/metadata.xml
+++ b/dev-python/twisted/metadata.xml
@@ -5,9 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>twisted-python@twistedmatrix.com</email>
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index 873e8f7d5566..3b72c08c5042 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -5,4 +5,4 @@ DIST txaio-2.7.1.tar.gz 43591 BLAKE2B 4efdcfb8ce3e8860af1efe56ae4c23efc9887a8f3a
 DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
 EBUILD txaio-2.7.1.ebuild 1810 BLAKE2B 09527c0ca4e9379f8a2f8719121d9365d08d39146d6515723d896fcf13e84c58328427555f64c973485a1df497b042de1d27e14c49f2a24027547be468f364b9 SHA512 074f40c0ff1522b67766e8bdc727e21039351cb41e08368f468f342fab8a791d812e8b1808cd0bfbfc608fabdeccc0753d84844d259751f50c15af8ad5c2f79c
 EBUILD txaio-2.9.0.ebuild 1440 BLAKE2B ad2bdb7813f58f8af9a52d248e2cdf3238299e4e6e210f6c7e2e554841f7de875c088326629787c8ed1fc6c49f77dfe25a21d5a44252abb459e2b7946e9fb1cd SHA512 4b869d7ee69b57fb122a62d3ed314359c4a66cd09edf3e4e821501f6b1efffac11020f5e2f52c3bd2f5932480f05b970dacb846fa023fc536cafad7e499b64c9
-MISC metadata.xml 565 BLAKE2B 6ac243a37d1d168acb5af08993ea9ebe89003b5d1de5cc123f00f8bb09df9d106164c6b6fef4ab4923ec85b756efc175ad6ec5235bd0985f3af214003b27a33a SHA512 65e8db68004013282e5db56040eb37ec7d1016c5057accc2a1f512b72d66e0de1967cc6ec2ced38cadcd700e21a2c1b2c0206004eb72c26f2bd4b134eda9f77f
+MISC metadata.xml 487 BLAKE2B e04a40627282564f381f0070344ba6e2a08e572121e150b5775239dacf22212fb273253dae6ad19ba2cea7f15e84c7f92c6d0671353b2d159b9e7f40d3415914 SHA512 d7eb59861e36e29555d46c3a65814428e64473abff01b6d5489b7f4419f535c991a443345058a8f618574019d5581d3df94fc0339c3a53d4c3147f5e11ca3a11
diff --git a/dev-python/txaio/metadata.xml b/dev-python/txaio/metadata.xml
index 6cc067014bb5..7a2706920d55 100644
--- a/dev-python/txaio/metadata.xml
+++ b/dev-python/txaio/metadata.xml
@@ -5,9 +5,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>autobahnws@googlegroups.com</email>
diff --git a/dev-python/txgithub/Manifest b/dev-python/txgithub/Manifest
index 35e1c84a5e77..c11f7033dd3e 100644
--- a/dev-python/txgithub/Manifest
+++ b/dev-python/txgithub/Manifest
@@ -1,3 +1,3 @@
 DIST txgithub-15.0.0.tar.gz 9871 BLAKE2B a5105132274cb878a0723cabebc17b4b6694d86e02325f6f29285b8bf939eb94ffa713283732634fbc0ea002490b05e7686adc6f98016e0c52300953b25d7f9d SHA512 40449089c7c82e901f738935e915a2a6e250600f46ceea7011ef48357851513dccd0fe0f45539cff6de8a45acfe3e34082156e2b70e54dec695633be01d03510
 EBUILD txgithub-15.0.0-r1.ebuild 807 BLAKE2B fce258500235447c009405180ef4ec88c5d7ca5e199f3c78846822ba96b7a7c941167fa3b0e551743187f96bd6bf0d57a6bd6c5ddd5f91eca67a6a601d6f542a SHA512 25753f47e7080ee64dba419104f01c94db71c040ba5dff6d08604dd239d8f7c6c856a53a81f3b4a60b6955efbcc0f9b2e15efe2d4f27284da77ccc241b023e89
-MISC metadata.xml 659 BLAKE2B 447b9af2aa3589d40840b85408aa24e1b5a8e2c3564267afda0f17f1239c66d624320277c7c4b1152d48569844fea63347c4cd4b122d2dcd47485a2cbacc76f4 SHA512 bd0b08918e56dca05f4c58e5b6734e1743ac147533565c1adcaaeb5047b7f2c896b7d37463251ebd596d9dd969c2337935365adf1e57bce20d1992ec312f5874
+MISC metadata.xml 581 BLAKE2B 83b9dc351444c0d4507ec265bf1cd98e84078aa14d4eae96874ed66893959a9a7959e1f20ba9f30da1f1ec91022786ff4e3f64c323809bf76be53513923f8675 SHA512 b6b326af1ed6eeb7a87fb3ef5865649045a1c69c353a836388b4fa4822d9a28f4bf8406f70667d1e4aa65f17898ff06e07374591e3772a12d46a5867be8f4e94
diff --git a/dev-python/txgithub/metadata.xml b/dev-python/txgithub/metadata.xml
index 48752fb9aa37..1d02a5eabbe8 100644
--- a/dev-python/txgithub/metadata.xml
+++ b/dev-python/txgithub/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/txrequests/Manifest b/dev-python/txrequests/Manifest
index f3b158e59b52..2adc68d0f54c 100644
--- a/dev-python/txrequests/Manifest
+++ b/dev-python/txrequests/Manifest
@@ -1,3 +1,3 @@
 DIST txrequests-0.9.5.tar.gz 5265 BLAKE2B e5e3cf66abc394ae5c457b0d5144fdd1d09af5fce651f888bd44f0e48d6d1386fdfd2ca1d350ba1abc856102d051270867a2da96b781fbacf53de01f80158f3d SHA512 e9f527eb2fed0038d7e68b5bd74d0a0e58a1d7cc3e181068423dce871ff10b2d5f1ae92e44248e75b4ad8d44b32366ee9eb6cf8fdd114a562baa6b35fab6eb7b
 EBUILD txrequests-0.9.5-r1.ebuild 547 BLAKE2B 1d415126bcdf8d1d9199bb1b1afdb40fd749fbfd8c2403eb88a3817cc072f63a474bbb3ff097c4261c4ecbbaece6fa20d90c6805cdf073b19698e73f823ad9db SHA512 7b389e3f985f1c712849ce2cc4f28d8785a66f996ca03a1ad19bd36c581d3f726a5e5545bfe58cc648faf8c2830d20078ccf2f82303509d381af2dedc944d977
-MISC metadata.xml 789 BLAKE2B f394820475fe0671024de5c5594c19c9b76f06ed8a4aa10a69a6b305532fae0ad225810d74fc26212a9ddd55e81fe96ed10a24b5d748947f9a4e12dc930267e0 SHA512 240a7ec8459a87b38e18d696c8733100370c679412c9ed3484c315ac1d5dc76faaa8d5dc7f03572b3b78a8bb97659d5d46573351052ca6b13bb9128f8b49e078
+MISC metadata.xml 711 BLAKE2B 9f4ed9f02c903a57b4eed3d7f97d13b85d7e76f8027fcf7aedb389b319703d88ca98faa6c1c8625a42fa40f9adacfe6583e53c953603345b5c0075409de440d3 SHA512 154b6d2fbd2aad94d890a6e86509cfe5d12a2a68e2ea7a10bdf63469193400c398a0b3b1f65fd7ca122375cbfc491555a7e2f705df2345d93331e3549c032fed
diff --git a/dev-python/txrequests/metadata.xml b/dev-python/txrequests/metadata.xml
index cbbb9b17206d..84fee3958895 100644
--- a/dev-python/txrequests/metadata.xml
+++ b/dev-python/txrequests/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/txtorcon/Manifest b/dev-python/txtorcon/Manifest
index 1f3f64f99f82..a2ea958946ea 100644
--- a/dev-python/txtorcon/Manifest
+++ b/dev-python/txtorcon/Manifest
@@ -4,4 +4,4 @@ AUX txtorcon-0.19.3-Removeunconditionalexamples.patch 964 BLAKE2B cde8fdc85b3809
 AUX txtorcon-0.19.3-setup.py-Dontinstallthetests.patch 680 BLAKE2B b26bd4e41d8f3b8b9e795e77475c93bb8f8a1ce138c1fbf83af9d3ece46f031e94e90db35e0aa057594004e80d4413c4853d7b3cd7c41b784ac5a40f6a843d8f SHA512 95894caa6c9e6f3f3a2744a1388397b0ff7298bd508579411ce2cb93ea6f990e6068806ef8d4a9fe959b235ed68402925c731beb9ff9b638a8d6ef2c10709eb8
 DIST txtorcon-0.19.3.tar.gz 265716 BLAKE2B c0778c918689906c1066f714f4c6621f176cc413b0ebbe628201727cb7ae24c8f1b5a8a5a030b5cb48b2cea96e29f2f7bb5a54744e36324a938841b11f44474b SHA512 748e23c25c0b287467e0fa7db6ad69a8af7010957a846141b9360b71af0d279153ff401b85d135e7e66171e81117ebc56406e64e660aeda7dde8cd430d0a7254
 EBUILD txtorcon-0.19.3-r1.ebuild 1934 BLAKE2B 714ebd0e85a3727d29fb7f7ec8d09fc961ce0294fe15fb8d606c9e9a15f997ba2481edf625c8c2c079a45426eaeef1d50dd50038c3bf80755c041705c1d364ee SHA512 59172af336ce2b5ece53520818381fc778ea4a2a9380c73257c4816643626f517b43e369d154d514fb559ae15044f9d40e8068545eca871f0252f282461e3814
-MISC metadata.xml 582 BLAKE2B 639a0ba4ae0800bb132268203f31d2b5e4ac5b60e8fe6e3a195a83ce27b1bdbdf15deb567e555ba1f8f80135949424273720333893452afbb44efad24b5c0849 SHA512 daf770953774400a5d78293eac0ed1dd9cb61bc4b208ba1f7e48085bbeff90605faccf44df83c7ee5822cffb1158479e85131a5d1cd513acfad812a8c4b9bf50
+MISC metadata.xml 532 BLAKE2B 757c7b063ce80fd9a6c8534be25740c4dcb59a89b217491cb83bcee0be8ed9fe03543e2cd74da076f366a01174d0b93839642bd37808b41e2c9a9b72fe494b2f SHA512 34e60662826b41e73c51a35105adeb3a80a634ce620cd42c3354b3faf7651a1e979f66f140cf7b8f45b130170735242d4c4d7a34d018ec9cd9d717b3b6cc06e7
diff --git a/dev-python/txtorcon/metadata.xml b/dev-python/txtorcon/metadata.xml
index 4767722d6e91..cab355145219 100644
--- a/dev-python/txtorcon/metadata.xml
+++ b/dev-python/txtorcon/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>meejah@meejah.ca</email>
diff --git a/dev-python/u-msgpack/Manifest b/dev-python/u-msgpack/Manifest
index 09f4e52aba92..8c452041f94a 100644
--- a/dev-python/u-msgpack/Manifest
+++ b/dev-python/u-msgpack/Manifest
@@ -1,4 +1,4 @@
 AUX u-msgpack-2.4.1-little-endian.patch 2129 BLAKE2B d7bd75e409753dedc3e1e7ce984fd2401cb8dff71af6b3da90950b00ea7f2af35f8d3b87af0fa333b61f916bd904934ee5ca09a124bf17a4099f334afe76203a SHA512 978c6eede0b89238134b31b596f9e0fd87d31431fd95d9f44578bb782b17fe8c39fea20bd494581a633219f8137c23156d5bbc454040c137552c7a72901525b5
 DIST u-msgpack-2.4.1.tar.gz 12026 BLAKE2B d8f9c5558daba3afda53c4c1b8e10edd6baa08a58c82796171ae0752c10c638b76abc608349e2ba090e83b2df66611a5c0c03febd38c2a13c45fb617b6bcf74f SHA512 4c3edb72455e8eb8fa7a4ed9b6ef4461755b782391f2c362d52d0fafda3e790fb40d0d239d05ba99beb3ad4cfd9e200175e2a1917cd64ee1e5d8cc3c4e8b3f25
 EBUILD u-msgpack-2.4.1.ebuild 850 BLAKE2B 729c8284d7db7627d060b8d01a76ba00301b36d50c2cfb11b3080ef9c4b7c388cee7bfc062916816109f5e696d6fa56115506cd5779a35d9b56d1c321a74dd2c SHA512 003482b450fe6e393dbf5a11a26287f0753e101c9f64684cbbc44ccf764fb4efe37270bbe8e60645a817276b1e220a02d96533996a3733c91e2a8bc1090bb166
-MISC metadata.xml 985 BLAKE2B 6c8134062eec629a9e15fe23321a10d4248f00fd92cf14d43d35395b29970c7668661500dff63f3f004925d2b00d0dc8fe91487d3a056a77b7b2f1f3a33d5d91 SHA512 642fd0a2bed62a5218a3f2765f51f7e221ab57850d03a03f018ffbe1469705e34884b82c51958bc83c4fb722f00b818fcfd85df0366eee2c0550a58d0fbe91a8
+MISC metadata.xml 907 BLAKE2B a60035eedce681b6a0c19ce0d701082b64f83ebc121501b170fcfb0f179fa60348903d215435fbefcebf65a1beae39ff00e1757d6b6cf04bda82bfbe0583b81f SHA512 6c4ca8d0bb44563efecbcce894a6697758aa203814124bc45c1743d91cf0ebbf34f6ae868fa1a76f5a16691a37bf8b31fd36070044b3ccce56187abbcbc2ce51
diff --git a/dev-python/u-msgpack/metadata.xml b/dev-python/u-msgpack/metadata.xml
index 7115811532f0..cbdd4d8dc261 100644
--- a/dev-python/u-msgpack/metadata.xml
+++ b/dev-python/u-msgpack/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/uncompyle6/Manifest b/dev-python/uncompyle6/Manifest
index 909ad20ea2cc..8b28fb040050 100644
--- a/dev-python/uncompyle6/Manifest
+++ b/dev-python/uncompyle6/Manifest
@@ -1,3 +1,3 @@
 DIST uncompyle6-2.10.1.tar.gz 831835 BLAKE2B dbde4d8414804d55871d846ad42f9a4859913ee057dcea5f6f19e8104e39d3274e13c86538f3364e6829d2ca9ecd16929143e266a828558e870d0f78d3cdff1b SHA512 5be7c33749f3a2a02494aceebeeb2cb79bf71c39784dbe4e96cf9a5c6f02af89874bc25ba911308f01414e4ae4d9ac445864505c629d41a2c6f8b2eae2197b2b
 EBUILD uncompyle6-2.10.1.ebuild 1007 BLAKE2B 2cde7183ea089b091cfb7426b180137ae169608f1d9ffa38497709fda871497317712b6f7ebf3235c779b64b35fd2582ce472b07250fbb1df5b35a220966a413 SHA512 82a3b2928b25e0ad835e505f81bd33f5eafa3c1568c733e11e6a762620004afe209fc83eec146ccb4ed82f53a7145cab518a46cff54cb9a03d53b6083e67143b
-MISC metadata.xml 552 BLAKE2B d617784c64b4907602ad6a9f9f807ae48b98ff6eb15303263f3b6fa2755dce271995dc9f1521849358ef269c4a7eced1227342fd5ef79061d25c1a100e040103 SHA512 1f50ef6b1d9d287a4f2355cc66ef799d3c6c9475c1d931842482a0121d00301266ccf6c9635ed5063a2c2b8e00c770cfd5263645d0a898457c00bfae606f62b5
+MISC metadata.xml 474 BLAKE2B a7dd20c02fba9d0f93c153a0a99533d723070da34a59e914a9552560b061358a6ef9c44c8226797b7777d3d4357e7f9a2845d8d239bf7e5c52a3988c296e0c95 SHA512 3d3068d7aee678259cd7927a1fc64ec2d8e09f116ae71b225d81e99018d857d4b117057f88b43174e8a9312db1cace10751bae9f861818bd64671404d4c78f54
diff --git a/dev-python/uncompyle6/metadata.xml b/dev-python/uncompyle6/metadata.xml
index 31972835e1f7..bdb695e40e84 100644
--- a/dev-python/uncompyle6/metadata.xml
+++ b/dev-python/uncompyle6/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/xdis/Manifest b/dev-python/xdis/Manifest
index 0efaef2f3158..4d11fce4c0dc 100644
--- a/dev-python/xdis/Manifest
+++ b/dev-python/xdis/Manifest
@@ -3,4 +3,4 @@ DIST xdis-3.3.1.tar.gz 154152 BLAKE2B e0997fb8bbc66cc3f019ee6855cbf9ae9f594698c9
 DIST xdis-3.6.0.tar.gz 144766 BLAKE2B e9a33443d42ff71194180f0bb20423783107d4b1e3d6c364b824011d916041500048345cac4853d1ebb6363edf8df542b0363650bba42e187986f50c9696051f SHA512 8b45ccd6976204004f27ee5b1a9da9b29ec0e28f4b462d862be5a1238d3ebd4a5d6f3df5607f3e2f037d80b2d3ae77ec4246ab1aa0671466c1e07e3a65453f3b
 EBUILD xdis-3.3.1.ebuild 1122 BLAKE2B 4b3422ab813aac75ffb875a4e6893598e8a8523866b37272e2ec4e1268d5da5fb4420f2c6f965bff42a42598c379a324744f69c20a6c32322b7d7eebbae4757a SHA512 c9fd7e75e4707322bfaf266d5db684d45878708c2dfedad7a9eddbc9bdbaae2f86694620226377e8ddde594002af22c3eea174c55ccebecf61c5015eadbbd502
 EBUILD xdis-3.6.0.ebuild 1186 BLAKE2B e761d7d46d9de006da790e0f66ae6461cf3fc5b07eff2b483ed741dc82d617a0974e3854d163fd7a0dbd65940c0295b8671d536acc268bc43fcc2bdbd91738bc SHA512 70736c8501f4f7cc0f49f66f2f210b18d2169a50075bf30046981b3e9ac26089a25258fbbf9872d340b2f21de40fc8e914a317aabd97da04116aa6f1f5699a79
-MISC metadata.xml 875 BLAKE2B 0fc940946f6021ace510f7115fe3563fedce1868ebee2694503499405297b0f0f11692ef1d34177272fbeba88c970ae1487739a89ad47676ee86eef79c336657 SHA512 0602fea61376c4abe296129e13e0f67051d6b298d5741cefa9ad1bdb98cda21d49422b4229aeb23265109e3ab57ff78dfcb7035b298c7259f47d3a21a0d0e36b
+MISC metadata.xml 797 BLAKE2B b9b241f31c0a58195f0697c593da5e0cd68bbc753359fa2dca7b9d4171a9e5a3d6ac0dc6fab00ac585f282512d7c1b441b76f60b21a04dc7fad49a4f9490b405 SHA512 79ab1e93e4dd6c417a86f33dab9839a9f7bffbe94c1f1bb463f60b24daf7463f122e3f255a640cc73834bd33aa003176fe839e0498069033601c0b7e5d1c1cdd
diff --git a/dev-python/xdis/metadata.xml b/dev-python/xdis/metadata.xml
index 6c8d1a307c06..02f9b35795a8 100644
--- a/dev-python/xdis/metadata.xml
+++ b/dev-python/xdis/metadata.xml
@@ -1,9 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 7ec0db96a322..7f9a9a23e357 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index c3017abcda3f..d457809db389 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
+DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 EBUILD assistant-5.12.3.ebuild 1205 BLAKE2B dd1a5d11b0013c8ba346773c86ab070d40df799e6aed7172e6a10a2cec777f4e3bb79fbcc3b2ee20ce6420c78a556f9203eb700114ffd6742476ece9c2b3d115 SHA512 7314e6ba565a1e7de39baf16f9e0e09ad999a6d83dc5a7c9bb9c06958f01d8de138b730b6c6f040c5de370f3e35311c399750834ef1bacf013b0109f5ab87d4b
 EBUILD assistant-5.12.4.ebuild 1200 BLAKE2B 85f6b78d456477b63a81a19fec3739022f84577e416a3d0a38754cef69307c2b5a52ec42e877ff04dcb60f5db0e010d4406df1c63ac641a9976f638a30fcb739 SHA512 a53017fbfa50f5c0e3e02b7a6b396ec8ab56f8d2f28a0bcebdb00167150003dfe781492ebda5600715d8d8dc9877089119ace7cb8e7bc69b411861cc520e89f8
+EBUILD assistant-5.12.5.ebuild 1200 BLAKE2B 85f6b78d456477b63a81a19fec3739022f84577e416a3d0a38754cef69307c2b5a52ec42e877ff04dcb60f5db0e010d4406df1c63ac641a9976f638a30fcb739 SHA512 a53017fbfa50f5c0e3e02b7a6b396ec8ab56f8d2f28a0bcebdb00167150003dfe781492ebda5600715d8d8dc9877089119ace7cb8e7bc69b411861cc520e89f8
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.12.5.ebuild b/dev-qt/assistant/assistant-5.12.5.ebuild
new file mode 100644
index 000000000000..ad1fb3981efb
--- /dev/null
+++ b/dev-qt/assistant/assistant-5.12.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit desktop qt5-build xdg-utils
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qthelp-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtsql-${PV}[sqlite]
+	~dev-qt/qtwidgets-${PV}
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/assistant
+)
+
+src_prepare() {
+	qt_use_disable_mod webkit webkitwidgets \
+		src/assistant/assistant/assistant.pro
+
+	qt5-build_src_prepare
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 32 src/assistant/assistant/images/assistant.png
+	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
+	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	xdg_icon_cache_update
+}
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 0335261d3953..a9dec5503640 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
+DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 EBUILD designer-5.12.3.ebuild 1262 BLAKE2B 18f71ca91aeb55675310f7c259f47153494f854bea7910ddcc2387983b67298bd7a4b543c63247890efd93275a092a4a486e1f8e3cb64901ef41f11e8126d2f9 SHA512 7d921544acfbee98d27e547d3b07e3fdfa73eff831dae40dd1d07e8a082c3426d797835ad3a9483545c0117e194198b2f26125941d80fd43f1c9f511bf616968
 EBUILD designer-5.12.4.ebuild 1259 BLAKE2B fe1bd59fcbedbadc0910ef08e60d89194cf99a8cf1ab4c4bf96ad45380f4fb9ce7abcead640bc679da6c8bfe52bcfe914d49f0d312a9e521291720a01d8a02a4 SHA512 7493bb4a80f056f9251e8ff773287635b2844c45ff54031fd803096738910bebef8a7bc81da971c0cc2e5fb1a9c5bb6051b8a280ae18a1864296c6194d0edf10
+EBUILD designer-5.12.5.ebuild 1259 BLAKE2B fe1bd59fcbedbadc0910ef08e60d89194cf99a8cf1ab4c4bf96ad45380f4fb9ce7abcead640bc679da6c8bfe52bcfe914d49f0d312a9e521291720a01d8a02a4 SHA512 7493bb4a80f056f9251e8ff773287635b2844c45ff54031fd803096738910bebef8a7bc81da971c0cc2e5fb1a9c5bb6051b8a280ae18a1864296c6194d0edf10
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.12.5.ebuild b/dev-qt/designer/designer-5.12.5.ebuild
new file mode 100644
index 000000000000..dd3e48ec9a90
--- /dev/null
+++ b/dev-qt/designer/designer-5.12.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit desktop qt5-build xdg-utils
+
+DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE="declarative webkit"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
+	declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/designer
+)
+
+src_prepare() {
+	qt_use_disable_mod declarative quickwidgets \
+		src/designer/src/plugins/plugins.pro
+
+	qt_use_disable_mod webkit webkitwidgets \
+		src/designer/src/plugins/plugins.pro
+
+	qt5-build_src_prepare
+}
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 128 src/designer/src/designer/images/designer.png
+	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	xdg_icon_cache_update
+}
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index f6ad020d818f..3f9aeae6efac 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
+DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 EBUILD linguist-tools-5.12.3.ebuild 691 BLAKE2B bc5fd509ed66790c58902f4e5706d859ef2f29fccd22fdb8694d0ec4b6f447d2503d5962d24e722a90e29b567a5cbb1f97ebac4add7ed8af123d5cee25dd7a64 SHA512 50a9689ab01f1f88dd205a53002a38fa6238974542f9e2e09ec84e6cd7b6aa3074f36b821e212c8597bd4690a253de4511174d170f4ca412704f75bbf7b67124
 EBUILD linguist-tools-5.12.4.ebuild 697 BLAKE2B b26c76f49989dcc416d8c3998ff292a7c23abde4dfbbca4658618a09f3422d0f63a93e991c93c264cd75e9d5d39b7515704770c71dcf04c3161fbbbbb13578fa SHA512 919846ed603a1aa21333d87a6434cfc750afc66331571d7ffad24a7c4cd3aed498d3cdccf834e731515da94e8de068b7f97804a76b550b10f80a999e90404923
+EBUILD linguist-tools-5.12.5.ebuild 697 BLAKE2B b26c76f49989dcc416d8c3998ff292a7c23abde4dfbbca4658618a09f3422d0f63a93e991c93c264cd75e9d5d39b7515704770c71dcf04c3161fbbbbb13578fa SHA512 919846ed603a1aa21333d87a6434cfc750afc66331571d7ffad24a7c4cd3aed498d3cdccf834e731515da94e8de068b7f97804a76b550b10f80a999e90404923
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.12.5.ebuild b/dev-qt/linguist-tools/linguist-tools-5.12.5.ebuild
new file mode 100644
index 000000000000..9f4191f4c007
--- /dev/null
+++ b/dev-qt/linguist-tools/linguist-tools-5.12.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tools for working with Qt translation data files"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtxml-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/linguist
+)
+
+src_prepare() {
+	sed -i -e '/SUBDIRS += linguist/d' \
+		src/linguist/linguist.pro || die
+
+	qt_use_disable_mod qml qmldevtools-private \
+		src/linguist/lupdate/lupdate.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index b6ac49044a16..3eae70ec7c9e 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
+DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 EBUILD linguist-5.12.3.ebuild 992 BLAKE2B 125e0834ed962b84dcfabf5f9adc5aa6413b94df83c493c0bd8b1423e8794fd7b9420d52f2d47617b5b7096e9957c237fcdd96387e877d0e0f2e6a73df463506 SHA512 8148c1ed4246acbbfa043cd0dc84368ce8e4d4a2ced344517d6c52194468d24205e9a9439df0337af6aba611b5054511307ddfcb925503ceea5a8baab3c28a34
 EBUILD linguist-5.12.4.ebuild 987 BLAKE2B ec5cdce6e8ab903c10b29193f3738fad1e4b1bc227b3604da5d9e9364976f15575634f646b7c2cfe590b72ab94a66402422c12095457485b4dbd3c5a170e448a SHA512 25611d9e50a2f2105f54cc1be26a945a794507dcac2b4ba449070b3b5d7127ec446bf6f8245ff3d924c97d413bda278a52c0d0e9fb2b7168bb3d6a5e4fb86589
+EBUILD linguist-5.12.5.ebuild 987 BLAKE2B ec5cdce6e8ab903c10b29193f3738fad1e4b1bc227b3604da5d9e9364976f15575634f646b7c2cfe590b72ab94a66402422c12095457485b4dbd3c5a170e448a SHA512 25611d9e50a2f2105f54cc1be26a945a794507dcac2b4ba449070b3b5d7127ec446bf6f8245ff3d924c97d413bda278a52c0d0e9fb2b7168bb3d6a5e4fb86589
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-5.12.5.ebuild b/dev-qt/linguist/linguist-5.12.5.ebuild
new file mode 100644
index 000000000000..b09b8354b377
--- /dev/null
+++ b/dev-qt/linguist/linguist-5.12.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit desktop qt5-build xdg-utils
+
+DESCRIPTION="Graphical tool for translating Qt applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/designer-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/linguist/linguist
+)
+
+src_install() {
+	qt5-build_src_install
+
+	local size
+	for size in 16 32 48 64 128; do
+		newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
+	done
+	make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	xdg_icon_cache_update
+}
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 06799d1bff64..1e8c4936574d 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
+DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 EBUILD pixeltool-5.12.3.ebuild 434 BLAKE2B 6a7df414b539c912325d89d1ca8786749fce7becc167d86907781d45c53cf4abe1ca507c3916014fcd537ebfae6f97f53a93a12968abd9ef406892489b4f368e SHA512 55b2506cbb8dbb2a2300535a1ee7ac17a42c48dca773cd3b6817e5dadaa1e3ad0a59bd643b80bd83e5a0a37e2411e17305c03e8b0fabca08c745a5a6faad353a
 EBUILD pixeltool-5.12.4.ebuild 438 BLAKE2B 25b3d3fa593e8ceb261b1391face4f45e570d5eeab6a1da93043e6ebabc4d89118f0d99d49efd280b3200bd337ea24a6751264ed5773151cd85768172dbc2f65 SHA512 e982ac566770e0a849d45290b4a8a3f20b0f9e6f5e51eae3f8ba3242f0db7514d40db90d37e25287f65ccd04f1d8608fa441e50a5fe183598ac3632b4aa18700
+EBUILD pixeltool-5.12.5.ebuild 438 BLAKE2B 25b3d3fa593e8ceb261b1391face4f45e570d5eeab6a1da93043e6ebabc4d89118f0d99d49efd280b3200bd337ea24a6751264ed5773151cd85768172dbc2f65 SHA512 e982ac566770e0a849d45290b4a8a3f20b0f9e6f5e51eae3f8ba3242f0db7514d40db90d37e25287f65ccd04f1d8608fa441e50a5fe183598ac3632b4aa18700
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/pixeltool-5.12.5.ebuild b/dev-qt/pixeltool/pixeltool-5.12.5.ebuild
new file mode 100644
index 000000000000..d6c1525a4c8e
--- /dev/null
+++ b/dev-qt/pixeltool/pixeltool-5.12.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt screen magnifier"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/pixeltool
+)
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 4d1e1fd66c4d..ad43faafcd52 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
+DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 EBUILD qdbus-5.12.3.ebuild 471 BLAKE2B 58d309d335bb17fe51a697b8e5908f43844edd34699cdca6d56bceb53dbcb83aa4f8eaf60b27520baf3af1cd30eeb26b921ad1e972c246bc3d2ad284199e1e95 SHA512 864e804bb59c00726f9352fdfb6fb34853956ec0453e504505c5e7bc03f06ce08d54893089b5b3ac620cb61d735f2116a1aab19cdceaa047b8656dbfc1a188c2
 EBUILD qdbus-5.12.4.ebuild 476 BLAKE2B ae38e83aa16d06203e274d4ffe276a3f076ae9505f80b7b986ce6a6cd29e56b7290f2535b36daeff302e26f330884f3441c14efb0f64f609735b7d11c6e36117 SHA512 3240b1bf388d0b4040e24955fd37289947ee5c678a15185d1f496280f067f07b1a251743cef70d77e28687a2bd109b55130cfb6d728de2a5217e6108cf788b7d
+EBUILD qdbus-5.12.5.ebuild 476 BLAKE2B ae38e83aa16d06203e274d4ffe276a3f076ae9505f80b7b986ce6a6cd29e56b7290f2535b36daeff302e26f330884f3441c14efb0f64f609735b7d11c6e36117 SHA512 3240b1bf388d0b4040e24955fd37289947ee5c678a15185d1f496280f067f07b1a251743cef70d77e28687a2bd109b55130cfb6d728de2a5217e6108cf788b7d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.12.5.ebuild b/dev-qt/qdbus/qdbus-5.12.5.ebuild
new file mode 100644
index 000000000000..4e1b43628c58
--- /dev/null
+++ b/dev-qt/qdbus/qdbus-5.12.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Interface to Qt applications communicating over D-Bus"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	~dev-qt/qtxml-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdbus/qdbus
+)
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index a05a39fe0f1d..9441140f9180 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
+DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 EBUILD qdbusviewer-5.12.3.ebuild 980 BLAKE2B 93a6f47ee9776d3e267bea561e30fb7fd3186d6d36af77344e858a59c522297c76954e45478c8b2ac21baa6ff3e4031bd72a66fca8133f7a75371fb50d18c6c4 SHA512 a64287b869575b3e37d02ebb8d67bc9a72a3ab72ef06adc7c40549cbfcf212d1daf82f996cd84abacd34f84f90c1e7c04de660db18c500a3cd6daa521c1ba033
 EBUILD qdbusviewer-5.12.4.ebuild 975 BLAKE2B 7303a9d989db5c1464e072699e0c12e290d4ead4a6885c31777b50b9c494616ac16545f65ba2f657af61ebdd70fc9432bb3d01dde9398d31b74f3d9035dad5d4 SHA512 2d563d33d71791682413ef9009f85205e408a6e25dff04254a1685e3bd599317a67a7ea434c28259723d4f6e47b1d5b9f1a2fb046ac10c389a50f5ce636a2057
+EBUILD qdbusviewer-5.12.5.ebuild 975 BLAKE2B 7303a9d989db5c1464e072699e0c12e290d4ead4a6885c31777b50b9c494616ac16545f65ba2f657af61ebdd70fc9432bb3d01dde9398d31b74f3d9035dad5d4 SHA512 2d563d33d71791682413ef9009f85205e408a6e25dff04254a1685e3bd599317a67a7ea434c28259723d4f6e47b1d5b9f1a2fb046ac10c389a50f5ce636a2057
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.12.5.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.12.5.ebuild
new file mode 100644
index 000000000000..7fa795f0a0a9
--- /dev/null
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.12.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit desktop qt5-build xdg-utils
+
+DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	~dev-qt/qtxml-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdbus/qdbusviewer
+)
+
+src_install() {
+	qt5-build_src_install
+
+	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
+	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
+	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
+}
+
+pkg_postinst() {
+	qt5-build_pkg_postinst
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	qt5-build_pkg_postrm
+	xdg_icon_cache_update
+}
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 7cf693bcff39..59eaa7fc4eed 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
+DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 EBUILD qdoc-5.12.3.ebuild 798 BLAKE2B 4150d9cfb7427b9b719266fe4f23a5aa708cde4faed2c9c2da9c1a0edc8c11d0dc48466f232408a03932b2fcef504a1fb78ef01da4596da700e3b7e67caa3c3e SHA512 fdf381372a5774152ddf568f7786f8e4925ecdbef909ab29d542d98ddf5b890c21bf45c0741c545decbaa5be58207001a7ff0be5c31ffc39babd6070e73ba4f9
 EBUILD qdoc-5.12.4.ebuild 801 BLAKE2B a2e216d3080520837f20dcb263de0566c8f06bcc83400c3cc330a96d8cb9f24d480cf2ceed14f942fbe619ef26144387d7a2f9c338e677446d987c0046b0c762 SHA512 608211262627716f746432a073379374df9cd918071f28be7bb3591aaf273596db9c53ce8f60047ca67817ec341f834182fcdda1aed4011c0258104d338635b0
+EBUILD qdoc-5.12.5.ebuild 801 BLAKE2B a2e216d3080520837f20dcb263de0566c8f06bcc83400c3cc330a96d8cb9f24d480cf2ceed14f942fbe619ef26144387d7a2f9c338e677446d987c0046b0c762 SHA512 608211262627716f746432a073379374df9cd918071f28be7bb3591aaf273596db9c53ce8f60047ca67817ec341f834182fcdda1aed4011c0258104d338635b0
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.12.5.ebuild b/dev-qt/qdoc/qdoc-5.12.5.ebuild
new file mode 100644
index 000000000000..b7f1696614f9
--- /dev/null
+++ b/dev-qt/qdoc/qdoc-5.12.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt documentation generator"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	sys-devel/clang:=
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qdoc
+)
+
+src_prepare() {
+	qt_use_disable_mod qml qmldevtools-private \
+		src/qdoc/qdoc.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	# src/qdoc requires files that are only generated when qmake is
+	# run in the root directory. bug 676948; same fix as bug 633776
+	mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
+	qt5_qmake "${QT5_BUILD_DIR}"
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index e9ae48df891b..47bee23c75b4 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -60,6 +60,61 @@ DIST 5.12.4-0-201906140200qtwidgets-documentation.7z 33151839 BLAKE2B 4897d74422
 DIST 5.12.4-0-201906140200qtx11extras-documentation.7z 37019 BLAKE2B 3c8163e4e7dbcdfe5e23c7c086ea47ec55e43ad6abd2d7220d33e6d05536ba6c889acc41c8acb6acef70ff90ea526b45bc12a043c916558e42c939d1397435dd SHA512 4601b86fd7eab0a73524a132cf885e6a27df616fb0d87ef37ac5e58858e2f6596f04ebb4ad08e213908d8e6e26a017ec7159560d53808dfecd3e2f2160baadec
 DIST 5.12.4-0-201906140200qtxml-documentation.7z 581086 BLAKE2B eb4bb19c19a434ce67370d50d41a74d215daee899484511b75f0020cc5983a50b787302494c3a7cf3bd4b1b8a4602b7497cfcd327f1fd5c6d9a26724e464a586 SHA512 2678d0a6a3cfb0292335940bb761c14ad64f3f244823f766f331bd7a0cec677a60e90827bebd347b9882b09ec816b6a9a25ac778a0cef51bf4d9b0e6b5d5aff8
 DIST 5.12.4-0-201906140200qtxmlpatterns-documentation.7z 1247517 BLAKE2B 1b18a079fbeb40155fd8d4b5d926ddf1dbbcc79dc36392b32a9127eb425796c559e293a0b4bf6773dea3e0866954e15b2fa9e70fdcb853422c3b58108060ca3e SHA512 00cc421a0737c91a7006adef1135c7d707d7cb720e5d1870035aa00411c1dea6d960a17898ff9c64414a4bd824d709fcaed3e9b49d6cfbf613ba8d8856f92625
+DIST 5.12.5-0-201908230013qdoc-documentation.7z 547195 BLAKE2B 02d43752c15ef11f6c404b3315206011625798d1a30ce1784d94c349468de249ab0c1a59b3056aa73be8ef8cb8c5e3c2864215cce13e3ab0db877030b26f76cf SHA512 71aa5749a37c83388eb912ec4ccc1cff225bf7f5805461dbe1862107d4c8f847e2486259ab21ddf3954573fd749c50bb911e486b6070ce0a547fc4174272ea49
+DIST 5.12.5-0-201908230013qmake-documentation.7z 336280 BLAKE2B 9e29ee3c42c7d7f19679e34f9ef3fd7bca83303a2968cbb1caa17ca21fd0905b726c55d90a0dac9c235d48dda1dcd1f78dbe2d5b4289124a42669a8a0e80c7fa SHA512 c48d5271e5d7f1ca96e43d111dca52af064a992434b420fa74337d67bacb5a2a9b6b41d7082e1b21c38bc0f821e874b1d5db4a7adfd4f97f1ea11a29723589e6
+DIST 5.12.5-0-201908230013qt3d-documentation.7z 39601379 BLAKE2B 5269e50a5535820f0dda3ae25b3791d1564f9f62ee36fbe6f35f3abf43219bcc7492b53e9a8052f18dcc9a66a743fc555f4fa389654ded20aea9892e453d2141 SHA512 b9784a2230799ed44c2863451d508404bd6cf328735888706cbed271989c3c7202368ddefdfdd66a193098a9eb191715849498786ae90f49eeb6d7f1e5784e9d
+DIST 5.12.5-0-201908230013qtassistant-documentation.7z 667308 BLAKE2B f2c62335f8764bd109b738d7d7becdb2dfbc35d73a19620170aeb823497fbaf6358aec6c786266db72d8b22a3633a3cc11fd18ad10ebb02f46d915f79a1d5e96 SHA512 88e38318fa0751f92beed34bc895bfb515cd33db550b90a2a7c8d6c738ee086a86ee2ccbb05ae861c2848e9bb91cb3fcd729c1d170e2fc09d772f94907f02bfe
+DIST 5.12.5-0-201908230013qtbluetooth-documentation.7z 2793256 BLAKE2B 3985b2810935268eae61099ccdba126da0535f9d802817f42cb071b86acd2cc787ae988063265efe83dbf1c53fd2127f172af93dcb4d5bfeaadea0d95bf15229 SHA512 b98777c62ae51abcc75e1577ab3bfd1495168d9a7a81371a53054e8c7a67e2eaebe03400a96677063fecc24ded4e64ddc4ca71a59e5d70fee22b3bdb22424433
+DIST 5.12.5-0-201908230013qtcharts-documentation.7z 9253051 BLAKE2B fc5e045a4fb8bab4f8f75bfffde087bf47b4a7af27cd45142886a36236e7ac0dab8262da35d19f98c750125793762b0c2cb46f7c666e264aff34e20781a9c6a7 SHA512 ba79a59e9ebfc7fc502b83fcc3a45635186a120af2cdc9953f5736aa6480f8b701411ad921fac5405a721ee769ed01432ec9dbaed169dfb1db7adc7d5ddbfdd1
+DIST 5.12.5-0-201908230013qtconcurrent-documentation.7z 159515 BLAKE2B bfaa898d425e60d33b2db40c207978698ab1f665027fc55df3de85aa3a7adedfdc384f4dd13878d5569efb55c054478a6f8ca28d9aef63da1c4c5feff83cf0f4 SHA512 28ced59e14bcf865200f032959c334885f22a400051acbfc2effee441b9a6e34800b525ce6eefbf9983a85006d6f647fe1db9ebe6bd4f3211c2608f1f160a913
+DIST 5.12.5-0-201908230013qtcore-documentation.7z 6711373 BLAKE2B a179caae9710f2b98cfca8407fe3f61a56bc16971698428c280cf93c0e7481af825012fcb95f8525be1446219dfa6fe89e5eed60e9261d63622e40deaea4d725 SHA512 f0a0f0e7541c3d826db894da4f4eb5b82c581fe632e3c4bf145eb59377a3fca2c73286ea0a63e03ade0cd114f34522dba78a4bda7f2873ea486f2613ac47264f
+DIST 5.12.5-0-201908230013qtdatavisualization-documentation.7z 8389405 BLAKE2B b0df3a260c64716fde3837c6a22bd694704c122810f0826a9f5aafbbe3f5801bd72961c8f7eb1e22707017ba024ae8fbb04c88a03371b412a2e0538d4b0e7473 SHA512 56c03dda1f64fcb1b54d583f068e5c95c99f9cbffdc9ebef36b93e3396bf0a48f0660d608223dcaab52d0cde67e51f948876d225a9da1738492e43e702899fae
+DIST 5.12.5-0-201908230013qtdbus-documentation.7z 487970 BLAKE2B e98a68ec477034137b0862f3cd954ac9623d66b0e0ea41a92f1ac7f5fa1ff5444d4d132059c01af3b1b27e9b91b11cde4f7fa07e79404a713bf881116e864ee9 SHA512 feccc1b830bfb11a65eb2a1c8b1871e1b24502d7186a8242c92d0a334f7b3ad874ec946c48e50bdf439b4b94b3b3e29ca65dea38ca813770bb1737d159f98b04
+DIST 5.12.5-0-201908230013qtdesigner-documentation.7z 4338853 BLAKE2B 340a6bc699a6d8ea360c49112d25883cbeb62b4f4bce517e603e9b6b82d0d4ac2e0546e21afaf13f22472dc02520d925851c4f50a6585fb8b3e06c69a5197150 SHA512 a8ccdab64a8cc8ce5c3754c6c10a781adc0e1e5ec26bae2b3e98126fc504d3f36e62238667f70ed3083cb2ad589b37e8f4715ffa57aff14c13f4696080eb7380
+DIST 5.12.5-0-201908230013qtdoc-documentation.7z 10111493 BLAKE2B d4e109a693ffad92bc6ec773623ea58a2d0762425e0cf275ac5ea9a631540b4736563406dcd55ef91719018188f678047d1d305bcdf1da0e9bebf325d8711b3a SHA512 aea001ae1f8c73d8801487969c81dababd8fce4dcfb12a908a1bc802837533932d2250820dabc0d600a5e9828c941c82df3ec1a1543fa71223b379b16e402a44
+DIST 5.12.5-0-201908230013qtgamepad-documentation.7z 784767 BLAKE2B 15b8fa21411f8fb397a6dc5ee8bc510814f34222ba675af54e289321352571b257e26ae00a4ded14eb3eff89a2856e609fb549c88e30a427119a7ac05d8c3ece SHA512 698e33e46555b20dee07a80d40c13c0c3a448bfff0b9cbd6c3049a7bb30468f70179581dd49a2a75022ee2fbeaa20f7eb7f5be443ea3ec9c30fc493bd9c8c3e5
+DIST 5.12.5-0-201908230013qtgraphicaleffects-documentation.7z 15993520 BLAKE2B 32c74fcec896bbd3777cd4aa19864a582c9671cf6a973cd3113364606dee011a54373b9e5c30d9cdbf5378dfea371243ba3a2a8fdeb530165dcde33393550eef SHA512 76fe2252a669c25f259d745a86042dcd837169b7983a3b2563304f83cdb7717ef39cde97f794bcde4f83034f7f70cab1b017f84604801e55c19b669abe716fe1
+DIST 5.12.5-0-201908230013qtgui-documentation.7z 9041842 BLAKE2B 013caf831ffaba7ee43989fc339e6fa5c32ad9046edc93de8084fd62805fca37a2843fc5256384358a52c9ea34edbcf9a783d6f3fa108145388a6e83422c8585 SHA512 33eb159f104a9e1551012a47d3c5951ce697eb563bf217cea4eaf91c360207a3d6a7fff4b89868a3131a2ad5bb41af19bc544e31d71e73696c929f8ffb5ff703
+DIST 5.12.5-0-201908230013qthelp-documentation.7z 217038 BLAKE2B 227a494c409febafca4656aa3d3ba5b204e6af37d77735c85a30fb200d04474cadccd302698819123150027ee27acebe828d0240a0d3d01e735973fad2f530b9 SHA512 23f02e2595c3c74e5f62609dc650854dc46fbc586cbcaed7c03fae2ed77fcb3dfbf35ad6af120f97c204f678f79e7c2a8bfb55b02aea9e0bb04c4d0e3f112b13
+DIST 5.12.5-0-201908230013qtimageformats-documentation.7z 29244 BLAKE2B d9be6cca89df942c5a51784ce688b71274595c369de01a013df6d34e48ac2adc5a508a924f32fbe0325e164e8348e8fb355af52bf253320e6b698add468e4f3c SHA512 c57081b98469f8cb460a66a95ebd81e952c3a22614afe96a02c33b29a402205ffefc7eba137a748e2e29e38580b247da65bbc457e0262854fe5143c250c4486b
+DIST 5.12.5-0-201908230013qtlinguist-documentation.7z 1003656 BLAKE2B e020be703f7aa3ddea3db6b4f4f749246b7f778926ee565b7d9b9648528ef6ebfdca58429e801c3cced5982e76e76f9d944cacc65d55fbe62a861c2b5abfe446 SHA512 964b114cb79b0ab1bb1c6c816c1109b6bf829152fe5523f3e4961d0b28ca409f98509fc6871db514158f13e6bfc1bf26e0f38fde9881e3a029729e9a8038942d
+DIST 5.12.5-0-201908230013qtlocation-documentation.7z 3211879 BLAKE2B 7bc78b4f8e838d29bc6895157b74f53bbac38e447f19a4a93b49253e6ff69f922e6f6b8ba9a9080cb4c4a8c1e9ddfd8913aa0d5eeb2ee3a2a12a024d477ce18f SHA512 ee6590be5f1d9de1a7414b985e6b72e11adf89985398a64b5b48ee4dee0b5b898bb1a24495d30bf2243c52ab6c5385b15f947ad9e9b6e0c8aba0d44c85d22e22
+DIST 5.12.5-0-201908230013qtmultimedia-documentation.7z 4274543 BLAKE2B 400ed709e35977d8a7cb00ef3f03386fee1fae0d3f3453a131dd31b1689420fa328637a88a36aee54e1fef960597bafc41435b9bc82e67d0460ee33663cf77c2 SHA512 e5c5cd2f8d46a466b41560b2fdee86fd1e44a94d51caded54517c2ab5c48c5535b9ffac9ed04629795075cd4a5f23d51b4fab78dbf273b005fcb5f4c9cedb547
+DIST 5.12.5-0-201908230013qtnetwork-documentation.7z 1988708 BLAKE2B c1f4194a27b78ed2c6598d00277e9e56800cf821a7fa3073de064749e60f56e55220ee71a5b33d017e600a4033a685b7d6f672b07f47c3784f6f2af432fcdb67 SHA512 eaa24c23d42aff83a42de25ceaf31188ab63f53da1886a0ad2f94d3ea4977412d7524c25847be90ebe252baa18e780a6cbab01a3a090d8c3691e2be643a7fb39
+DIST 5.12.5-0-201908230013qtnetworkauth-documentation.7z 299813 BLAKE2B 81d184f47f699842057ef527caf0f67f8cfa743eb3d237fa88bd900a2811fbdf10ab315be3da4ab8d5531102479172ce8cb9226d1748dd1040ca6f711a46e8fa SHA512 c220d4f8aa7f07655c9870508ee0f07d10662fa542d40f60f7c5e3e2c29b4208cadb951e018adc65542f1e097481d98c2095eedad78d422f858cf87a8c609fdf
+DIST 5.12.5-0-201908230013qtopengl-documentation.7z 1034570 BLAKE2B 70923a298b2332b5f2228bd221e2d8629035552fcdc292e81a2857a7c18bdb36b1f1cc918a25304d4aa20c6df3fcac4a7fa2fd42317b173adb00d359a9e0411f SHA512 099dfc3329f801e65f55a68976ed5bd6ead0de6ff3d0c9c513dfc151fd7787fad66ed7f963003fb382bd00e5747ccc56c6a82ccf38b447b27cd8f2f9364f94be
+DIST 5.12.5-0-201908230013qtplatformheaders-documentation.7z 77914 BLAKE2B 72c359862707c97ca16a06da1de6e9f27f2ac076398f7c19f69a95db5e275b099282aef45c3f7308039ef8a6f3d77a242d68e9a9b64e8aa364bd3a188271a072 SHA512 84f83b1a14b1a77f9a4718c1c385894eed7b6dfaaeb9b6d777e4d92f9c06e187359a9271c3b80ea6b66bc83f53fde101649b1fc40ece43ab38d97c20a7a3cb35
+DIST 5.12.5-0-201908230013qtpositioning-documentation.7z 2366894 BLAKE2B 428fa9551216efa6b0e11a453ddcccf9510758323f66f19a78d38602285ab457fce2b6a29a82490d624b8a868da9d42735a57ef70fe699bd1a915fec75886fc1 SHA512 429be1a13d5b3f708902eebc4f2cf2a6bc6ed16d00e1dc3cd82fde446bcd14da64b246af8b35012be1df5367aef2873aa3ed52b1fdec65bc293779162c060819
+DIST 5.12.5-0-201908230013qtprintsupport-documentation.7z 389824 BLAKE2B 68ab5348044887a2a267bf41edabee62759f2a6fb61d47f235198ade4768ca4694031a433d9330055ff32be1f5ab89d7f38424024a870c1bc622a29f18c41331 SHA512 704c594d7f6d2908a0347fe7f72dbe25e77d7934cfd8ceae63815200ffad40a3023084f5b15954f854db19d07b954d39336717f5bf08174f7535434bbf55e94c
+DIST 5.12.5-0-201908230013qtqml-documentation.7z 2111272 BLAKE2B 36d45b7387d8bc79209eb093fe984f69cb0df74b2d200e5197d636ae9306b73ffa9732edc0300cd47e2f5e57529b565f260ae5c112cea20e9b3672c3b0798cad SHA512 78cc99f0475065e5762b9373614870ecbbf96e93590064f605393b8b3d1bdad2bc6f2c1ecc5e09ecb6535a228112b634c8dc5b9006f1fa59beab9ad5efdb047c
+DIST 5.12.5-0-201908230013qtqmltest-documentation.7z 30411 BLAKE2B 341ba7b2e6d10c1965f8c32ca1eda977fc07bb9bb3f2719d14cc8334e1b013bbf4146d864e6d96e6855423e2fd9aaf647250645fea06acef8d91b56b4326ac82 SHA512 64c903aaeaa67902160f74667aa234467eb3dab26d38132684bfe192ad938bdb6fca07eb7346fa36cef5a6b899b61ef64555bb7b0bb115ec9d8b0ae250c58b0a
+DIST 5.12.5-0-201908230013qtquick-documentation.7z 21057963 BLAKE2B 2f793bf8197acd455f8e61f3aaa29d31896591b287283aedcfb9eccb1058697876f3678c193b374cb23d103f6cf5d2bf46c6e41d489371d0aac81619fa957005 SHA512 95ad46ff383cb801bbac930f111838777c59670ba4ede970e234cb6cdc2c6bb3194a90d94eebcc7adf78b442b1c989f960c1af8eef06828191e1e6699d75e652
+DIST 5.12.5-0-201908230013qtquickcontrols-documentation.7z 14923532 BLAKE2B 78d7e0e1f6c9bf810e659040217eab6edf00a1d89cbad52771c3ad98fda66e64e904a112d3b9ff3417a3fa672a64d5121b53147a1343b580af4fe85955779adc SHA512 63e91f55f55a811608496a66623c830494d80bee18b6f806a7ac4a279bdcce750c32f5df81871031ac97ed4082fee60de303333dd63db9480dccdd8d8d61746c
+DIST 5.12.5-0-201908230013qtquickcontrols1-documentation.7z 2230379 BLAKE2B 72dd6ae12bff6c1a894d68a80a8103adea733857f7f8c1ffca26e857f38bbc5ccb4ba973ca5de087cd5dba9e76833f8e5e2d92cffd60befe935add3bc3d0f2bd SHA512 41fbcbf46b0f679110b2bc8b76ae013753a2d81536b54c8902fe940676662277c9c43ddd5f6c58ef6a5c5a33f5f793bc9003200985304b4111666768a4925200
+DIST 5.12.5-0-201908230013qtquickdialogs-documentation.7z 219646 BLAKE2B 31f9482e9e5708fd3581191bb8cd1658b67295e7eae0d4caa5b202d441046783a215cad746cc4d03a88aa5c367f131ef83a5cc150fd1e81e47a6f86ddd66c7a7 SHA512 b78a040763efec53af0c1bace5b5f9d7509560fd2ea4897545e11d51d544cd14cba75aa9630dd1cf054fd91dfe401e65acccdaca5b09ff5904841ffc3d9fe42e
+DIST 5.12.5-0-201908230013qtquickextras-documentation.7z 5719959 BLAKE2B 8d437a5f5eaeddb28f8ea047f12ce20a6722d12b2647025638b11e5de5ffe8cfdfccb12cbb35a0a0c3660e3933049af3ed77180153d55fe98c1e6999813bf1e4 SHA512 27187aad45765f79bc1d3651f7f449e7590ba3d4deacab73b1504e2a2bb59a34d0eb9471f5bc5c5a52f8f95ffa9efb7e4747c8a6917003fba7154222ae8cbd9f
+DIST 5.12.5-0-201908230013qtscript-documentation.7z 724070 BLAKE2B 7a521bd97155c4fe9287ff4e84652ca1d90e6d790f8c002852bcc68786b85aba2a1cdf527a7c0962e75a0ca2a6f136a6ba72b6de14a7fc49684ad7802239c881 SHA512 6f9714f76de0703c8cfcfc99f6dcd46def44ae4e930f092519ce766ebd2fb20494204903c2aec40399440b69cb96c4142e3b278e95ecffe4850ff568c1c0069d
+DIST 5.12.5-0-201908230013qtscripttools-documentation.7z 90337 BLAKE2B 5b811b1f2579ae9e610317f05f051db5c62d44213c886cd559d9e03c87f8097d7875fdc8411bd8bdf1b7496c800e2e521d6a4f80035c88611b18a92101c3eb5a SHA512 ae6e3d202310b122d9a2e404fc3b528614de1aaffb98fd75b199297ddfc12c9eb07b711c9e1ac5c6fe76c505df56b8f69fb683f3361217002080e90baa128d3e
+DIST 5.12.5-0-201908230013qtscxml-documentation.7z 817105 BLAKE2B df65ba8067e15bf2d37fd5f5a5014d8246242d9b67499416558112b533224513808fbde3cdfc3b0b16dbe922bfd23f0b68a354b11bfcb2c786ef1703c931da2e SHA512 791223017eaae21bdccacbc523aef3eba8928fc3168523a535484c4cc29f094520ddf849fa8429c5c3d02534b398393699757189261c6d0660e2ab380787b3f7
+DIST 5.12.5-0-201908230013qtsensors-documentation.7z 3732269 BLAKE2B 47be853821c2cfcc74181a4dc03ebd70c4bd3272b987bbcf6e9bbe998a6f676f5c8e04ae04283fd0ad0c88d648e4d89df760aaaaf7526bba20c2a28d38846662 SHA512 92d66207a12e61c4d837b98b4417bca74a62bde53c4de271626d3594295c71673a996d0c03246053d6564ecaa482114f2a2ec4bc6143eb811a1224c00577178b
+DIST 5.12.5-0-201908230013qtserialbus-documentation.7z 608947 BLAKE2B a8df0b8624ca17662fb2d7d1770709975e213aefc316ebd64629c96989e3ab9d8ea53d1f97b68f16a205b8943a7def1c8182186e7e4b5df0ace904b37df61a0c SHA512 0892c560dc9d9750aae29abf1dd3243c48639aabf440adbaa7f93aa757850919f7a4e796d7ec4f974d49b9adf76ea9f767caa99d8eb28405c5bfc2ba3070794e
+DIST 5.12.5-0-201908230013qtserialport-documentation.7z 507482 BLAKE2B fe2460f068657f07ff9c93a69f43d4a1fb93bb93008fd900c1b1ae9352073e50f504eb2acd0776d9453ccf0fd9b20913d78459415e531a81a911c7063ce16f2b SHA512 166d75695cbaf3127cf815af237e1bb4708a1bfb07f83b0f8ce725d6df401350146390eb8f81bda0ab1fe4960416963cdb71087a578a0025c0fb7a27a9b5ee8f
+DIST 5.12.5-0-201908230013qtspeech-documentation.7z 157871 BLAKE2B b9312809675231827392052e66885a9677699f599c605f93460444ff1c1ac9116fcb46a7866f54a777d4ea7cc8c1a6c1e4d13e0879d812a0398b8db39401707a SHA512 536dd538918402217a0688ab5c01628db83ef524db3765cb2a19cdfecd2c9e2349acc4cf3942c46fc4fd78b5d2cf621407fe437cd7efddc38957751b58f50e8c
+DIST 5.12.5-0-201908230013qtsql-documentation.7z 1285031 BLAKE2B 605723a399f0850885855154d371f5942278687770bbabdb108b906f5ecf747da781495c46d5a104df0c820dc3d6938ab1631b073666d0c93b16ee9c6e5016fa SHA512 b3413d56903d670acbcf3cad5f97279103ac0b1554871820683a957664a480d351fb80511cb92851e6b6f903f6ca4890bfc594630f872c5e227542969e07e4b4
+DIST 5.12.5-0-201908230013qtsvg-documentation.7z 346165 BLAKE2B dc7ffa2be0589c57e08cc8711b5d2dbd67b23520ea15892e06441c3697d2a984b10441b231ae08eb2c4c0e82496652e144636c15dcd1169e5e076ce27bbef9e7 SHA512 dd2c1be393293022694fcb07cff63c5558d0a7e0136467ead430db8118751068c09bedf11eec1ee4d7a128bac1693ef2a0d0cc952752418555611b201679ecbf
+DIST 5.12.5-0-201908230013qttestlib-documentation.7z 210421 BLAKE2B e3f76382f18789d6c9a71213b378e1f64c6a109b04ba762cf1e240fdd343f6e353eb009be8e7671771b4d445ce9f286f215ca35aba76dc71cd3a0992566ed742 SHA512 e9290549e61598c9018889fea6607c19cf68565bceef3d354cec036048eb401a12d58b3fb050d7546230d386d329b9df257ce714cd7c7cc94dc3ecd6b67a2d21
+DIST 5.12.5-0-201908230013qtuitools-documentation.7z 188235 BLAKE2B 026d441b0d798e93924ce2a87cc68cc1cb87edd3771ed4424404c4f9a62f14b82651106088afb5ff6189fa6e74fc65b4aba69a2145d9830550a6e12cf3f7c4b1 SHA512 c935bb18881845f262eee46690e37785724fa14a4d198497a53e1eb88e3106b68df5eafcc269a48ebf8923782851b366fb07f9a026c06f907ce6f453f785b217
+DIST 5.12.5-0-201908230013qtvirtualkeyboard-documentation.7z 2090631 BLAKE2B 7e4d9a9ef7354d3204e309d149fc8ede35975f3f36b111be58af856a04a34405dd9de64c797e0d8d0b9ddcde18c2c76fbd7fbbef89725b4690d110308a99afa1 SHA512 5e32630b371fc6157d8413f46af2341c7e14bb6cc4aa2d2be09d813db5e3a8761812826dcf948e03a782dab16145ad07ee37ec7925734185e82104fac06c5c4d
+DIST 5.12.5-0-201908230013qtwaylandcompositor-documentation.7z 763954 BLAKE2B 01018b69dfb298bc22580567b4365f0264828de1db53b56119f539fc9aa8880f8729a4f4270be8a26ec917aa1590b1d507e24f12a9535dcb44fd682672b055dd SHA512 8274cc6647ea3200b9528d43498f86d20eab9a6dce6da2740a2753b9c9d089f24fa1fc7dedc0d597a8a2a7bfbf8396057520edf9e7a02646b2aac6b408686377
+DIST 5.12.5-0-201908230013qtwebchannel-documentation.7z 217538 BLAKE2B 2e2fc9b8f9358d66e25e6cf909ecd2de15f7428c6ca168cad5a3cbcd2e18cbd06204153e7d39665510315a7905fda58ebecd930dc68a4601dc5eaeca831b4094 SHA512 362edd6b05cb9b14d8ac509a24b63fbbe13417f441a7f7a183f30e009be45373388b3ca18056200934f20515463ec82b93af2164915f77d0128c8b726c77d0f7
+DIST 5.12.5-0-201908230013qtwebengine-documentation.7z 3927031 BLAKE2B 4c7146d9b90a903d901d7bfb4b0a8482c42e91ae256723cabbf2da0773a3bd5fd61e23836ce329905e5243940bc7deac386ba79aafbde5cdb96b3088b17dfcb8 SHA512 ce6f6729ae480ce9603d36ba39f2eba04261672d20b36c0e1836f34e4be79d1876c7a76b979fc34351c0b48d3b86a1785d8afe791f0f33dd2ac453ac84c30065
+DIST 5.12.5-0-201908230013qtwebsockets-documentation.7z 391265 BLAKE2B badc5c074fc1b8609997be4261797db754112f53a8807b9967e54e95de842b17d7bee64ecb5a427c284b51dfe760d72b52ae1b93ac0a27ecd9c5633c370b9bb3 SHA512 1a5c281327586a0939a17834278a50a3e5e4ecba11cca29df43451e0416c8119a783fad73bf3362548d23f161bd27f018caa4e323106677863573b9a0549349f
+DIST 5.12.5-0-201908230013qtwebview-documentation.7z 142962 BLAKE2B 26078e249582e5d286bcdab566ae64ed34b9bedecf810dcf1882a465917335d2fbbe5015904d9799c82292659716e0538ba2acfda58836a16d888a7461761587 SHA512 78a794483c9327d59f2f587b0512491906314dcaf8bbdeff8e5cbe28abf985cb395f349c2fc010d3c035a40fcda718bf90512027d0459f41e2bd5819cc54e5c9
+DIST 5.12.5-0-201908230013qtwidgets-documentation.7z 33155162 BLAKE2B 7c5e533604bcd9597c36615d87d5a8defa857a6aecaca897e1f5344440d624358eca83690f19258b837f49caeda7d61eecd9f0bc61c2b629e83cc45fea1d67f5 SHA512 15a2afe344e8c596d457854adebc2c3d95b26adbf7a7b37bacc7000b9cd1f14f6cca8b55e25a935afb613ff4ed7e68d556455cba6c808151eaabe481e151e10f
+DIST 5.12.5-0-201908230013qtx11extras-documentation.7z 37082 BLAKE2B 5bfc3949a1f0a92e2a329dd77af25ed20086b8a97396c46ed636fba6fa7ac9f93f9afa65745074ddf4a7d334b7daa2f16fe9d1ca6c5d92dd14dc23009b14ce03 SHA512 7323ea28b39f594dd54c458ad7a3d67f09e46514f62ed3685f4d2b692c3d81288bff3ace285a4756fcd74dcec89c126efbf79201a9e9afa982e6ff974043a47d
+DIST 5.12.5-0-201908230013qtxml-documentation.7z 580913 BLAKE2B 7d6fc9fea4e468d01d0478f76801e0a22b1fabcdc5f998ee8f160935df2b4ebfdddbda088d026c1cfbb58b593ab07aa7adc8ddae48364d5735ea834584433d23 SHA512 634761769db0b4541472b53b18e42fb0f1d7e0269faadd9ac6a8c4bd18b72e7049c32ac716649a534dd54f83212f24b231d5fb33bab19bcf93823d9ff86b8f94
+DIST 5.12.5-0-201908230013qtxmlpatterns-documentation.7z 1247367 BLAKE2B df5a5507505cceedf9a23001ae89b81e6797e791af7b307960cd316dc9b44b3a9b6e74d656b6d86aa8b49f5c33d4783c5f58ea7838b69eef032919d7761e306c SHA512 622e17dfcea909b5ecc321007ec74fbd3857393d9adb41223d016343748f07df984ab0334bd9272450f7182ddc2e6c1779d3d5a133918a549c288ca18696a1d4
 EBUILD qt-docs-5.12.3_p201904161302.ebuild 1920 BLAKE2B e3d18e77be8b64d63044951a1c16a47140184979255d21db82aeb617e6a333995606ac64cc9067148bb0f7a37871f5c2843b1958886020db41640ae20df2800c SHA512 613164184d59a19a83dd55195ded80be0d33cc265e3950064680107fd3214f9e185f5fee7626864c913188b1cd9cfb40bdbd35be46893753f3b5bfb130328069
 EBUILD qt-docs-5.12.4_p201906140200.ebuild 2623 BLAKE2B 19053b1dd801f0eafc0e732e2c63b751708d82c4c04690206f535e047207a9c08f2bf70d2c99bdd1b5567493db2e69c304a93c58b9f6123b88a84260d0904087 SHA512 9c74e7873479a39172ba1ff9789818730d5e57ea165c074674d6045fa311ef6a50ea9675888c0d136ccde5c58808ae4c0ac9bbd057ab2510c250fd343413cd3b
+EBUILD qt-docs-5.12.5_p201908230013.ebuild 2623 BLAKE2B 19053b1dd801f0eafc0e732e2c63b751708d82c4c04690206f535e047207a9c08f2bf70d2c99bdd1b5567493db2e69c304a93c58b9f6123b88a84260d0904087 SHA512 9c74e7873479a39172ba1ff9789818730d5e57ea165c074674d6045fa311ef6a50ea9675888c0d136ccde5c58808ae4c0ac9bbd057ab2510c250fd343413cd3b
 MISC metadata.xml 3896 BLAKE2B 9ddb79d566a10dffbccfc8fca4f970c1a49b1d2c3f6885474d1919e1647a403877c565b186da92a5823ec49c0e4af92a4478643c608574f2e3b5675334bef2aa SHA512 6418b810cf78d5acee499340352b30589d483c8be74a9412cf9c7a43534b7c5d37fa9e2d5a49e2be079d40e0120e738fac21132ccc04f64aca12895bc3865c80
diff --git a/dev-qt/qt-docs/qt-docs-5.12.5_p201908230013.ebuild b/dev-qt/qt-docs/qt-docs-5.12.5_p201908230013.ebuild
new file mode 100644
index 000000000000..e2850d500dcf
--- /dev/null
+++ b/dev-qt/qt-docs/qt-docs-5.12.5_p201908230013.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PV_FULL=${PV/_p/-0-}
+PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
+BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
+
+declare -A QT5_DOCS=(
+	[3d]="qt3d"
+	[assistant]="qtassistant"
+	[bluetooth]="qtbluetooth"
+	[concurrent]="qtconcurrent"
+	[core]="qtcore qmake qtdoc"
+	[dbus]="qtdbus"
+	[declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras"
+	[designer]="qtdesigner qtuitools"
+	[gamepad]="qtgamepad"
+	[graphicaleffects]="qtgraphicaleffects"
+	[gui]="qtgui qtplatformheaders"
+	[help]="qthelp"
+	[imageformats]="qtimageformats"
+	[linguist]="qtlinguist"
+	[location]="qtlocation"
+	[multimedia]="qtmultimedia"
+	[network]="qtnetwork"
+	[opengl]="qtopengl"
+	[positioning]="qtpositioning"
+	[printsupport]="qtprintsupport"
+	[qdoc]="qdoc"
+	[quickcontrols2]="qtquickcontrols"
+	[quickcontrols]="qtquickcontrols1"
+	[scxml]="qtscxml"
+	[sensors]="qtsensors"
+	[serialbus]="qtserialbus"
+	[serialport]="qtserialport"
+	[speech]="qtspeech"
+	[sql]="qtsql"
+	[svg]="qtsvg"
+	[test]="qttestlib"
+	[wayland]="qtwaylandcompositor"
+	[webchannel]="qtwebchannel"
+	[websockets]="qtwebsockets"
+	[webview]="qtwebview"
+	[widgets]="qtwidgets"
+	[x11extras]="qtx11extras"
+	[xml]="qtxml"
+	[xmlpatterns]="qtxmlpatterns"
+)
+
+DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
+HOMEPAGE="https://doc.qt.io/"
+
+LICENSE="FDL-1.3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="charts datavis +html networkauth +qch script virtualkeyboard webengine"
+REQUIRED_USE="|| ( html qch )"
+
+SRC_URI="
+	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
+	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
+	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
+	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
+		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
+	virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
+	webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
+"
+
+for DOCUSE in ${!QT5_DOCS[@]}; do
+	IUSE+=" +${DOCUSE}"
+	for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do
+		SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )"
+	done
+done
+unset DOCTAR DOCUSE
+
+BDEPEND="app-arch/p7zip"
+
+S=${WORKDIR}/Docs/Qt-${PV%_p*}
+
+src_install() {
+	# must be the same as QT5_DOCDIR
+	insinto /usr/share/qt5-doc
+	use html && doins -r */
+	use qch && doins *.qch
+}
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index b72fb9edd998..2ac65b9d0a9f 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,5 +1,7 @@
 DIST qt3d-everywhere-src-5.12.3.tar.xz 84941692 BLAKE2B 245e62dad28fb6c5e75cbefb5153fb139c8b4114fdfebd6987f82b5b2b627614d1b444bcefa002d09dcdbbb6801cace6a9ae56eac99e26d15794ff04e75ea675 SHA512 679c2dbc60fc53c1c5469369f25244bd844c2e6e723a1b451f7cbb50bfa018e6fb715214e5a5df6fb32d7c7936bb6c99d85e299fe2b76344bcf774c93ed0acd0
 DIST qt3d-everywhere-src-5.12.4.tar.xz 84960856 BLAKE2B 3e0f32facd7b500dace5d0240ec1f5fea8b2049910073e9d5e9f29169571252ae3ba7bcb006abc20fa1d097d9e99eb7bad2facab6870a2bd0824b66b9be58b5e SHA512 aa93d3661d092dc020e7903242964b7daba1e42882deb0d5fd45abff3c11e971f49a497ae5a1b7420fd497e6986daca4da0a217c94821ef8432cc3d8c617d291
+DIST qt3d-everywhere-src-5.12.5.tar.xz 82075068 BLAKE2B b842d9f8bef8b70a5a9ace52d38b3aea78dacb75c589019c224204309b9eb0bf1899cd0e26c84f662a470120c7430f33de70dd7ee683e7b8122244dc9231db0d SHA512 8cc23417b4a41bf9d19052e05c7e3be8773be062f1f5998a7784573ef9c35a04da50ce67a65b3709065bb3cf243aac8ede4bea60f0420a5400cbe6c9c7bdf05b
 EBUILD qt3d-5.12.3.ebuild 648 BLAKE2B c6b94cd7763f36c312d0ffb0326f29bc573b27e3d3b317a2a8e40312997d468021a8aff2896ad899f90e65bf53e452f589fdc079d5c1ddd58c942bf1b51c5946 SHA512 4441cbf42f339dd220a8d689f7f43d02607616298206ab59aa18f815c6c7d0c66f877cd52d7d5bcb14af57d7f0a4280e83da35bea1f2aff86411d60ccee4d07c
 EBUILD qt3d-5.12.4.ebuild 651 BLAKE2B d6accf47ba28375383e8258968aec526214874ac7220c9e49fb07df94b666febeade3e576db315134f1d27c8d1a0cf0df1efadb7a9cd36cf2f23d43e97c84105 SHA512 3e0d6b2f852bc2310e12879e5f384843fa2832c5d30f6440f718c82d58cbb9d23b2b965105a4151422db28ac44cd623cffe85861a51a2663bd4553791be4f89b
-MISC metadata.xml 622 BLAKE2B 0b8c25838c12efaeba3d6db640fe658b6c1bc12f4a6bacc06c88e405c16498eb0f7db196efb1b09b46476c0c9c4cfccc64666dd43f31366dd28b7ecaa8018757 SHA512 3edf4c4db2c08652dbc1b62aa216f62b887190e2e0bbfd0cde7410911ddf1e0ea8cc9a27e91db07a78dd6078fd4b1ad23b27f0dba37607771d3b6c2497552607
+EBUILD qt3d-5.12.5.ebuild 756 BLAKE2B f9e26acfa2559a9a6f0b186eb539d706e2a0b24514bcbccd2186a9dd60bc5f9fcd6d841f32357ba8d33815d7408d61ebdf930c089f08325b34ca2fa43bd2c213 SHA512 07c7a7f5ff2197f006feb5326345ce514b115e9bb636085c626394405c4e3015dd323f3ef48eae089b06a0661c5f5ee5c8cc3a7f04c2c561e55a52c8e65976d4
+MISC metadata.xml 720 BLAKE2B ff7d76a8f9264dd841e0bfe40ebc03939a06f36cfbfcbfc168b4eed326153a4f3dbca993efe540eea5b41cc2b08f66aae13eb0fd68769f099bdffad755d0c886 SHA512 985f76261b21779bb3048f172b7aefc4590230511b855226fa4a1d61312c9f87ee4691a2e9212fc55032688836f8a97097d9452eb4552c775edfb74ea8b1a747
diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
index 987a6dc29cad..bdb6f1b07cc1 100644
--- a/dev-qt/qt3d/metadata.xml
+++ b/dev-qt/qt3d/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
+		<flag name="gamepad">Add support for gamepad hardware via
+			<pkg>dev-qt/qtgamepad</pkg></flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
 	</use>
diff --git a/dev-qt/qt3d/qt3d-5.12.5.ebuild b/dev-qt/qt3d/qt3d-5.12.5.ebuild
new file mode 100644
index 000000000000..431e26853e58
--- /dev/null
+++ b/dev-qt/qt3d/qt3d-5.12.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="3D rendering module for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+# TODO: tools
+IUSE="gamepad gles2 qml"
+
+DEPEND="
+	~dev-qt/qtconcurrent-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	>=media-libs/assimp-4.0.0
+	gamepad? ( ~dev-qt/qtgamepad-${PV} )
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm -r src/3rdparty/assimp/{code,contrib,include} || die
+
+	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 847cbf5964ea..f26934058daf 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,5 +1,7 @@
 DIST qtconnectivity-everywhere-src-5.12.3.tar.xz 2750144 BLAKE2B 1c287d15713fc2155cb5b07517fdedf566a686601681efde84b096f8e052dc36a872a8c9d263d54ac38dee0c69b8966f877fd698144b5ef897ff290a50ee0aa5 SHA512 4da406d88c3cf216d53c524d3896f50b19dae124baec904233dbb67163a30a955dee29148b5f5b71c35cb28638912423bb1cf4d38c62aeefa7353bd29e97a269
 DIST qtconnectivity-everywhere-src-5.12.4.tar.xz 2751984 BLAKE2B cdd7bd33c63ed38b68852f1656cb8baf7028d845b4d42c4a16fe20e655c8665f99202f194686661aec237415c7cd474e5b0e81624a25295e3c74ac150f8b41c4 SHA512 e1076c5883f29cb394d9929a52c3bfce97952cef11b1f82d1fcca59440354d1a29ab19d628f6359ca02f3318fb526b3ca78d691af6dc0f4c06741b2306c8e571
+DIST qtconnectivity-everywhere-src-5.12.5.tar.xz 2752252 BLAKE2B 0e2da5249206bb7064b65d1c7ed0a9c2be6e44908102e9b421c0c03a3cbb5eb895b538b0b32f6b48ac9ade548ada83103d4ec9b654f397d57d27d3909d282dc5 SHA512 96cdb27aa0e439094e3f1de0c7a680973c3ce2c65bbbff38affe25a3708c9e4e3c1c6a403d698303f77a5f261b44ac657e01a769b62a1565e0a8c64c8ac80bd5
 EBUILD qtbluetooth-5.12.3.ebuild 634 BLAKE2B e41988e55e399b7b52687ff0820a48424ab9486521e581ba26ab9cf53d0413ab67dd5ab4020a4a40932d9ded99e61c1a6062b29811c302079c522759f84db721 SHA512 933d984dc16a6f0a1b47f78d935da6be477ea71d57d836779ce31f123558fc6d854df3c4990245918c5f8b35db0968c37bcf68c9236342a78f3eeb019634e521
 EBUILD qtbluetooth-5.12.4.ebuild 638 BLAKE2B 51221cb9850e3ee69fc8415aeebd0c0dde4c8008af1fd1357bd12ee7e6039fab3de625018c1c5ffddba2f4278b31d6d53961cd3bc7a4b2b80f5910623180d551 SHA512 0c1dab9c3373787f80d19674523e0371ee19f21847a2665d267431cffc5985fc39a0ed4fa3450f88ceb37fcb92d1992c22f712670ffced5c9d329cee220ba39b
+EBUILD qtbluetooth-5.12.5.ebuild 638 BLAKE2B 51221cb9850e3ee69fc8415aeebd0c0dde4c8008af1fd1357bd12ee7e6039fab3de625018c1c5ffddba2f4278b31d6d53961cd3bc7a4b2b80f5910623180d551 SHA512 0c1dab9c3373787f80d19674523e0371ee19f21847a2665d267431cffc5985fc39a0ed4fa3450f88ceb37fcb92d1992c22f712670ffced5c9d329cee220ba39b
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.12.5.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.12.5.ebuild
new file mode 100644
index 000000000000..6f8451cd6b64
--- /dev/null
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.12.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtconnectivity"
+inherit qt5-build
+
+DESCRIPTION="Bluetooth support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtconcurrent-${PV}
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	>=net-wireless/bluez-5:=
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+DEPEND="${RDEPEND}
+	~dev-qt/qtnetwork-${PV}
+"
+
+src_prepare() {
+	sed -i -e 's/nfc//' src/src.pro || die
+
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 000b053ed4a2..60a06df44605 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,5 +1,7 @@
 DIST qtcharts-everywhere-src-5.12.3.tar.xz 4242512 BLAKE2B 5e2d2c5cb263aebefee409087176db55b31405dabf7e83d075c78482a7fe956394f8f2e3e6ff2f6a321dba2f7b867d35e95b0b2f1ec8ec832905f52952696ff0 SHA512 f5940589c7a2dc5fcd3484397613f13ab41311c8ffb70a3484e64dc5bad24e18c94c9ebbe6716c1ec7c81b7863113ebfdb593f2d194608b2e3fb0b0b5c9c9102
 DIST qtcharts-everywhere-src-5.12.4.tar.xz 4242592 BLAKE2B 827252bdc35739146b67e34cf732f8ebea6a23321a7332ec0e4f63518fc26f31335f8d7329895bd6647405350028f594bfbdc021c6e510cbf37bf31886fc8267 SHA512 d9c46f59d15377098427647cbd3c3fc2d7ff33fb9940581360db3be5e895b50bee0fe23a41c0af6b157e905b04b1bc13666c1736b047a405b21aab3a2bdbe60b
+DIST qtcharts-everywhere-src-5.12.5.tar.xz 4243464 BLAKE2B ad1087bfa59aa69942a4ac5346b1484ad2d1e44a03ade42a7e8717f25b8a70fae46d3f0342a78a10f62d75b15f8a388ceb9b4594f733ef4b1346f142d352b43d SHA512 a3ba8c6a606430cd87f85661116dbb2692e0bb472f0a73310aca1950f4437563d04ee950437a48a399b1a4881dd264cd1e6fdd4f30b6c3110704ec48d1467da1
 EBUILD qtcharts-5.12.3.ebuild 518 BLAKE2B 5c2ffc4f487b4ddb73200235e57e874311f60073594bce017e51b9ea03a67e4362e0a9adfc47d7dd96e1dd38661b6b063d800aeaa21832d28fd8297551124c48 SHA512 4b58d1f2dbc347b8297342dcd8c9092d969c78ab23273acc8ae801c54f0ee62569bbf139e321a14ef138d7510b1611c96a99bae04a02e147238e13c5ce9f41ee
 EBUILD qtcharts-5.12.4.ebuild 518 BLAKE2B 8462a3cd9a1c975a6a88a88b4a1b1e5c332b74a2a77e128398db0bc72116ca4a32725882c925c56fac84ec24d31b1f64439ad1393e01fcf747fa603fe4c94475 SHA512 bd7c9285f16a481f9c4c14e20cdac392a36e37a92629f98f556fa2b3fa1918b8b8096b9c16838d7ad7aa35ceb77db925d2a6a2b45378345631889822f18b2fcd
+EBUILD qtcharts-5.12.5.ebuild 518 BLAKE2B 8462a3cd9a1c975a6a88a88b4a1b1e5c332b74a2a77e128398db0bc72116ca4a32725882c925c56fac84ec24d31b1f64439ad1393e01fcf747fa603fe4c94475 SHA512 bd7c9285f16a481f9c4c14e20cdac392a36e37a92629f98f556fa2b3fa1918b8b8096b9c16838d7ad7aa35ceb77db925d2a6a2b45378345631889822f18b2fcd
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/qtcharts-5.12.5.ebuild b/dev-qt/qtcharts/qtcharts-5.12.5.ebuild
new file mode 100644
index 000000000000..44f40be187e9
--- /dev/null
+++ b/dev-qt/qtcharts/qtcharts-5.12.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Chart component library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 476b914179c1..a55a344db9d4 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
+DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 EBUILD qtconcurrent-5.12.3.ebuild 449 BLAKE2B b81766de8ed37d7e6acd62eacdd4931b16e7f2e2e6dc76b0a08f2b23f7090de3094f5cedd02872e2302e8179ba558dff5d7be68904e9470f08ae2bd5098439d3 SHA512 61222e1d6d6e8df41d9fa94bb9a9887204eee02b23dcb42cbda7a000f2530cfbe898b3940da2141eff0efb1b5a799e90acf2cc5f92a04435b16e9304245707db
 EBUILD qtconcurrent-5.12.4.ebuild 455 BLAKE2B c29e6cd775283a2bb0501888a935ca31560448b104926cd3c3b7ed7ba0ecb6b6602a522ff46d32465a27b105b062a6a64b88282e34ca082412eeca42015c273f SHA512 582ec9ba93fd2621f6f29ac0186bab67b08a7c9655174472aefb99294bdfee5a109a7681b7a0aad23d9af701875d2bbf8bfc798c16e8df7f0e8f43de39c7c670
+EBUILD qtconcurrent-5.12.5.ebuild 455 BLAKE2B c29e6cd775283a2bb0501888a935ca31560448b104926cd3c3b7ed7ba0ecb6b6602a522ff46d32465a27b105b062a6a64b88282e34ca082412eeca42015c273f SHA512 582ec9ba93fd2621f6f29ac0186bab67b08a7c9655174472aefb99294bdfee5a109a7681b7a0aad23d9af701875d2bbf8bfc798c16e8df7f0e8f43de39c7c670
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.12.5.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.12.5.ebuild
new file mode 100644
index 000000000000..eaf03f74aedc
--- /dev/null
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.12.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/concurrent
+)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index b1961d28781c..3d546bfda3ec 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
+DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 EBUILD qtcore-5.12.3.ebuild 1672 BLAKE2B 97f8079a6198598e0a2d1be193c2105281d0bdc83cf212154d6b7a62ad4588d7582881daed3fcd61d6e24d7874f4360b42ad9206955bd9e0813c5d45fa12d0fd SHA512 e2bd79c061b373fe597d1917578ad8c1ac027f1e3f250594f0f00bb71ffbd45a4140674986335052fa16221eb5bd35c26b0e01a19132429d406bbbf0957552ca
 EBUILD qtcore-5.12.4.ebuild 1678 BLAKE2B f361ceced7125b1ba3a05558ea4db51b3219d49c4f0e9f6d15e9a0554e6d0bf8a6ae874a5548b308fa95744b2d1cebdfe798f2794e535d1e947d1e2da52e7575 SHA512 f8926d326809adbcd0a57537acfef9f98f09b99a2fe81095964b9b450dd0e15888119cc4bd1904816936e185c3640b6505541b15eef07367b3afe10fcd6b6683
+EBUILD qtcore-5.12.5.ebuild 1676 BLAKE2B bff87674a17b33eab32e2876c29a785d0efd9c02f7fb9e3a5f448c87f2669afce8abfc7b4128ded5f3e37c6f15f2a738af2495c37fe7ed2614f791c700bb455d SHA512 6513bd70f76e2b2689210a218fa186c3d8c340601cdf53e000402e5f24cff7cfbb8877b235a8825fce06c6599a7c14246672b89bf7c46e0a64e29292d6b1cc23
 MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666
diff --git a/dev-qt/qtcore/qtcore-5.12.5.ebuild b/dev-qt/qtcore/qtcore-5.12.5.ebuild
new file mode 100644
index 000000000000..d881786fbafe
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.12.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib:=
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	!<dev-qt/qtcore-4.8.7-r4:4
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/tools/qfloat16-tables
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	!:network
+	!:sql
+	!:testlib
+	!:xml
+)
+
+src_prepare() {
+	# don't add -O3 to CXXFLAGS, bug 549140
+	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
+
+	# fix missing qt_version_tag symbol w/ LTO, bug 674382
+	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		-no-feature-statx	# bug 672856
+		$(qt_use icu)
+		$(qt_use !icu iconv)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	local flags=(
+		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
+		OPENGL OPENSSL SSL WIDGETS
+	)
+
+	for flag in ${flags[@]}; do
+		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+			#if defined(QT_NO_${flag}) && defined(QT_${flag})
+			# undef QT_NO_${flag}
+			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+			# define QT_NO_${flag}
+			#endif
+		_EOF_
+	done
+}
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 5db1b395b0db..824ea2a01d27 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,5 +1,7 @@
 DIST qtdatavis3d-everywhere-src-5.12.3.tar.xz 5200668 BLAKE2B bbcc3b21c9f604c16c862c7e7fe1b3a3d7f0d1f4b8a0da4b67e56d6912e377d1496f7a399a94cb697f117ae23123b3d6370b47c4cb7223ff8af1b584838c588a SHA512 cb295deb9aa33132294d7d7f4daaa53dd9ab4815e2d3a2c916d88e1882e018a49d8d66db9088f69375d8da759a3f3566f251802aaba82d74cad2eb45d9bbbcff
 DIST qtdatavis3d-everywhere-src-5.12.4.tar.xz 5201284 BLAKE2B 17944f903ecd80c10602706c8ca92400122386bcaac879791f00781653c4108ac107ea1de9131ecbefc19d9245617c212c93320cfaa4d4b74c4df04e71905f1b SHA512 e5041e4b666fa4e7ce8b12fd522be3ace144b43bf68fa2d45add67dfc6afc6e5788c5fac5eed81e9fa631cf6d372ce0aed8287fa139488406612322e5fd7e550
+DIST qtdatavis3d-everywhere-src-5.12.5.tar.xz 5200204 BLAKE2B dda8eacb7955b39c00abd10577a800186cdf0de3fde97f2780357b4cc13c4e97dbc056f1f2616de03d18f7a487886e0edc6aecaf81c18e9ff8e006b7a5287f39 SHA512 7911d911678827ca4a704b824b8841c8e8508484fb83265d4d05e64787ac1184387b9ed0870090b3233c736f5e484adc7776ba12a1173da0fceeaac46845c6f4
 EBUILD qtdatavis3d-5.12.3.ebuild 626 BLAKE2B a7ed6f5552a6373fabaabd1c4bb24ed6be1845627e1e34bb3090928f3eb8ef1147fa4a4f3257fa7b0face55e7e0b3f7058679a8e17383d1fc252b42d9b0c5530 SHA512 1ba4b818b07c2981c0d82a294a663d32307ece49ad9365dea1b7cfeae694cee61f7cf8d76b5e4096fb55ab577482294760d3c7e8b8fc7a8ebf1d804a41c66ce0
 EBUILD qtdatavis3d-5.12.4.ebuild 629 BLAKE2B aa80dfd215baad3f40af3f2d7139c7d175058df907b44846e8ac680fa5d3500bb696d1bd28d732b0fa52c5d86a135941d789d95f6b172667f8109e9b58aa69a2 SHA512 01d61dfd09c1ca71cd02bfc57270ce140659e0506b4d3b1eb01d58d28c4eaaf766c27ee2210978748ab0e8b47202e505aa70374da16bfc73f5a4006e33ae6ec5
+EBUILD qtdatavis3d-5.12.5.ebuild 629 BLAKE2B aa80dfd215baad3f40af3f2d7139c7d175058df907b44846e8ac680fa5d3500bb696d1bd28d732b0fa52c5d86a135941d789d95f6b172667f8109e9b58aa69a2 SHA512 01d61dfd09c1ca71cd02bfc57270ce140659e0506b4d3b1eb01d58d28c4eaaf766c27ee2210978748ab0e8b47202e505aa70374da16bfc73f5a4006e33ae6ec5
 MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.12.5.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.12.5.ebuild
new file mode 100644
index 000000000000..c68634fc6eda
--- /dev/null
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.12.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="3D data visualization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+IUSE="gles2 qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# eliminate bogus dependency on qtwidgets
+	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
+
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 258532701168..c9eddec0b7b0 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
+DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 EBUILD qtdbus-5.12.3.ebuild 693 BLAKE2B d78c311004ddfb655f9e0ca1b3f1ad4486bd90a9c827663b0ad04f409fb4ca8565d748cbc637f664c0ee63e64ba16aae3599e8d1dfd593f74305cc8d9a96be21 SHA512 fc9a465f0928d9ce70fe33ae9d5d9790dd0973463f2b7a5e7a43cacb242c262447d4a6e14824d7a71756e85e046aa772cbda22a074a914c33200bed0a09e8ccc
 EBUILD qtdbus-5.12.4.ebuild 699 BLAKE2B db2862d853c3356eaffcc61da04ca6808604265f6aff82a6525ac0cad9bc029b1595c11cd10acc998fc959fb3edeb0052355c61ed0099d30ef6a0e974a6b7be4 SHA512 04fe86112de4fe527f8194a739cdb07bbae38b5cf0053f0aab13d382dc8c003526d62e62dc29f62c0adb2cd4419621b747547536658e96e3be517110a99130ce
+EBUILD qtdbus-5.12.5.ebuild 699 BLAKE2B db2862d853c3356eaffcc61da04ca6808604265f6aff82a6525ac0cad9bc029b1595c11cd10acc998fc959fb3edeb0052355c61ed0099d30ef6a0e974a6b7be4 SHA512 04fe86112de4fe527f8194a739cdb07bbae38b5cf0053f0aab13d382dc8c003526d62e62dc29f62c0adb2cd4419621b747547536658e96e3be517110a99130ce
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.12.5.ebuild b/dev-qt/qtdbus/qtdbus-5.12.5.ebuild
new file mode 100644
index 000000000000..6a6570fb4862
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-5.12.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	>=sys-apps/dbus-1.4.20
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/dbus
+	src/tools/qdbusxml2cpp
+	src/tools/qdbuscpp2xml
+)
+
+QT5_GENTOO_CONFIG=(
+	:dbus
+	:dbus-linked:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:dbus
+	:dbus-linked
+)
+
+src_configure() {
+	local myconf=(
+		-dbus-linked
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 200bdf543a66..21573b0f8f67 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,6 +1,8 @@
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 DIST qtdeclarative-everywhere-src-5.12.3.tar.xz 20513544 BLAKE2B b6c622cb4728d54d0cf382a5a50af4652755ebd1f8e7ebc8bf07a5f3e3355931703ffa443be11dcf36a132b2f3eacb5fce150088209d173f2ca84bc387096026 SHA512 0caddcfee36cbf52bacd3a400d304511255715e2b5a58c1621ca8120610427c57511785457a9e7fa55975b86e7924a3cffddeb7e2e8e6622af85b7ebac35dd20
 DIST qtdeclarative-everywhere-src-5.12.4.tar.xz 20502292 BLAKE2B 7945a7f62a5bf792f6706e0ea6544e705d1c796a597ef94020bf3f142a6e8f100a2eab3e7e6fd63514af23c5a0c3ef3cd9bad1c7271811752b864f394eba2c60 SHA512 953b0dac76b73a7a21b393ab88718da12d77dfc688dc07c55c96ea1658bc14acd9097bef60df4a95d2923d3fb1e02b46499c032aa53844d4fd344b0037514671
+DIST qtdeclarative-everywhere-src-5.12.5.tar.xz 20512492 BLAKE2B 3e8175217bb9e654db8c57cee55080ea630452fe8c225db5350da00b5fb6c9cb6269b075939eab411cd750a1a431a423522c1bb536b2a1f708bd497d90817301 SHA512 026c5024c06e44b6e91099d1ee912f38017f314ae0125227010d25d733447c692299cc7c47edc1a4bf39366a9c9c9fe77d3a249905f2ae982d0725317d824b9b
 EBUILD qtdeclarative-5.12.3.ebuild 1198 BLAKE2B 08f658d7ca13170351f33faf6e03c1d2f0d00becd4403ed32d60ac416f5336b2369436899376cbf98af7597bb3bb57842f7fcc0f1488d310b0772c9a3204be5b SHA512 424bff0d7a489f3770a90ce4eb3f3fb4ed2709e3fc5c9630c084afc77b87827dfb276285602cadc0753cd2cf5407aa2395079bbfd7dbf1009e4347f19c547ea7
 EBUILD qtdeclarative-5.12.4.ebuild 1172 BLAKE2B 1c25385cdcbef514ba3e20904072da215a746b768bccc4383c8b9083fea46c2e0edccd663ef8360e9d9aa875dc9e963e3e2cc3f32b422d1849c670240035644d SHA512 a6b5a5cdb9162402be290c28b0de701e2da3f27db67a7c09fb316ca28540522f8fe8df6cf0e227211da503016a4ffe0833b8107ef4df8d6aaa14a4eff661b7c6
+EBUILD qtdeclarative-5.12.5.ebuild 1172 BLAKE2B 1c25385cdcbef514ba3e20904072da215a746b768bccc4383c8b9083fea46c2e0edccd663ef8360e9d9aa875dc9e963e3e2cc3f32b422d1849c670240035644d SHA512 a6b5a5cdb9162402be290c28b0de701e2da3f27db67a7c09fb316ca28540522f8fe8df6cf0e227211da503016a4ffe0833b8107ef4df8d6aaa14a4eff661b7c6
 MISC metadata.xml 718 BLAKE2B 8726e8349c867c54347bb2fae219fb858a2f31058d7fa83fb7aa5691b3dbff327a9b2ef4cdbfdfc087fe30847d037f55ed92a2797ad961764676c10d348148a5 SHA512 827be20878184958800c2b31b4fcff95e67bfff208d4669c4b0b1f190bbc8ebeb46795e62c06f46dd8ef54c072e82fe9f1b32bef14072e81c8f1dc7428e386c3
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12.5.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12.5.ebuild
new file mode 100644
index 000000000000..c208c86f7c04
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.12.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="The QML and Quick modules for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+fi
+
+IUSE="gles2 +jit localstorage +widgets"
+
+BDEPEND="${PYTHON_DEPS}"
+# qtgui[gles2=] is needed because of bug 504322
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qttest-${PV}
+	localstorage? ( ~dev-qt/qtsql-${PV} )
+	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] )
+"
+RDEPEND="${DEPEND}
+	!<dev-qt/qtquickcontrols-5.7:5
+"
+
+src_prepare() {
+	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
+
+	qt_use_disable_mod localstorage sql \
+		src/imports/imports.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/qmltest/qmltest.pro \
+		tests/auto/auto.pro \
+		tools/tools.pro \
+		tools/qmlscene/qmlscene.pro \
+		tools/qml/qml.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		-qml-debug
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 28b06f13df30..6e0c9e105bc5 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
+DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 EBUILD qtdiag-5.12.3.ebuild 720 BLAKE2B 9a255762573e0576e1c940d2249d06e56880435884aa247ae8a97db44ebd76c65859652462d38dd36d28d7d59d9f5e8e5165f7b2bf133139b089e94c852b62b0 SHA512 f43c0d3243d195089cb59a6f13f67ec2bb7cd420fdb8c21f24bbcf44109fec049be3a6288c530671882989e0749fd18e1d554703ff1b4252e18d8e67cdc72f16
 EBUILD qtdiag-5.12.4.ebuild 720 BLAKE2B d52c46274a74a4b2a694cbd147ee9d1089ab2ea2dd824b4aab49e1eed7a58f3abd35b2cb67e83ba88ce2a3873b89fa79a80149c22289ed59d2561b61f2f66b27 SHA512 82f9a9986bc3de934d515c1c5ceafea4749450f05ffbcb2dc60fbdb29c5391cbbbc496b51ed4db58b37f5e37fe64ef68cb0a8780bb9c6ae52db1aa89c92673b6
+EBUILD qtdiag-5.12.5.ebuild 720 BLAKE2B d52c46274a74a4b2a694cbd147ee9d1089ab2ea2dd824b4aab49e1eed7a58f3abd35b2cb67e83ba88ce2a3873b89fa79a80149c22289ed59d2561b61f2f66b27 SHA512 82f9a9986bc3de934d515c1c5ceafea4749450f05ffbcb2dc60fbdb29c5391cbbbc496b51ed4db58b37f5e37fe64ef68cb0a8780bb9c6ae52db1aa89c92673b6
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.12.5.ebuild b/dev-qt/qtdiag/qtdiag-5.12.5.ebuild
new file mode 100644
index 000000000000..11ddd15e1ab9
--- /dev/null
+++ b/dev-qt/qtdiag/qtdiag-5.12.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="+network +widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtdiag
+)
+
+src_prepare() {
+	qt_use_disable_mod network network \
+		src/qtdiag/qtdiag.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/qtdiag/qtdiag.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
new file mode 100644
index 000000000000..aa17f83a5bca
--- /dev/null
+++ b/dev-qt/qtgamepad/Manifest
@@ -0,0 +1,3 @@
+DIST qtgamepad-everywhere-src-5.12.5.tar.xz 385864 BLAKE2B 65e6536beecab590685f4678066d5ecb3eae0f82bd4fc000a327a4e9ab90c13311b644fff7329cd96291da726e215f107c49b634d00f13941780c9dccfa5f9a2 SHA512 bc4148bb75de53dd0885fc25ce7d679d7a5426a23ce9c93482fd11e8d6003cebe4c958fc07f17817a43f1d4449756deff24c0350fd33e100aeb2c302c650ae33
+EBUILD qtgamepad-5.12.5.ebuild 685 BLAKE2B 7f3ad26aeb7bbf8a682ad294c6d9501a129924d678c07cdfc385a8d1c5eb16396f2c2ea6d7a90adcb7cfa26e34dab00356349f8470be13d6af4e371cc7fe9217 SHA512 ad9a41e2b30aca0ce1d3d778497551e5c74455d1c60a9044a6232e35a9b192e94b7dbb44a462a214ba5e7d62e3ddc7a7e2d4d722d12878262f5498f52ef932b7
+MISC metadata.xml 612 BLAKE2B 9f8eb8c418b79633ebe1df1ba6423de74232787ae4eadea6fb217657fc2dd3ece81e73294ba21f2c0c57596a43e918a812670a5dda271dd7f2721ea0600445b5 SHA512 8593354f9a345ddaedcf0f962877ee7b40db413123226804ef5ea3664c98cc14d7d7f60d63911166e06e3e4fe5b907b1e2ae7a3dc4df527a975f92051b504f8c
diff --git a/dev-qt/qtgamepad/metadata.xml b/dev-qt/qtgamepad/metadata.xml
new file mode 100644
index 000000000000..2b9a633c286b
--- /dev/null
+++ b/dev-qt/qtgamepad/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="evdev">Enable support for input devices via evdev</flag>
+		<flag name="qml">Build QML bindings</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>https://doc.qt.io/</doc>
+	</upstream>
+	<slots>
+		<subslots>
+			Must only be used by packages that are known to use private parts of the Qt API.
+		</subslots>
+	</slots>
+</pkgmetadata>
diff --git a/dev-qt/qtgamepad/qtgamepad-5.12.5.ebuild b/dev-qt/qtgamepad/qtgamepad-5.12.5.ebuild
new file mode 100644
index 000000000000..cf981234f3df
--- /dev/null
+++ b/dev-qt/qtgamepad/qtgamepad-5.12.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Qt module to support gamepad hardware"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE="evdev qml sdl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[evdev?]
+	evdev? ( virtual/libudev:= )
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+	sdl? ( media-libs/libsdl )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt_use_disable_config evdev evdev \
+		src/plugins/gamepads/gamepads.pro
+
+	qt_use_disable_config sdl sdl2 \
+		src/plugins/gamepads/gamepads.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index f4d820874bea..8aef857a5817 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,7 @@
 DIST qtgraphicaleffects-everywhere-src-5.12.3.tar.xz 14270884 BLAKE2B 2eae4d2ff7125e57685cbd7aa723e763462a9f5d466ea3b8890d4657ce960233868aa0ecddac37d2dba31a1845c5cab1a33f26ad31d8057067b079454cc7ae49 SHA512 3c5e6d7dc51a92d48cce8424ab1fe60ee75b71ebe2e6bb22e719a35bdaf2210b03f90ac066569f5c086ed67ed1463510625307328299310fad7c587e9fd8b385
 DIST qtgraphicaleffects-everywhere-src-5.12.4.tar.xz 14271080 BLAKE2B 3083fe8fc3a78f1bd5138000a033b2709cd4f7eac04db109bb61f589cd8aa6102f841fcd4396db4c7633df1202d1f2aafca4853bd15eb1a6a8117fa3650fce32 SHA512 fe78cb01cfbe00226709a7faa2e754abb8e41bd677d15611221fbb9e53bf876e60d244eb6660b6b03403d31be2d9155a763ad34e4c4d2d1490fa6810f54bad0c
+DIST qtgraphicaleffects-everywhere-src-5.12.5.tar.xz 14271472 BLAKE2B 1ab3aa490cdbeee4ebbdcf9161c3de8c746a358a8354041783735fe63fa1befc2c7fc2f237969a57efa26d76d6d584153c9e5d3477e8ab9dc7fdbbb9b1783038 SHA512 489a308af5f56ff2b023375ddf705f8a1b15c0e1fb1ec3bc6e5f66a80b5863d63aa0e57a3aef025ab965694add8d71424123bca120ce8d8b8448e7218f7fc640
 EBUILD qtgraphicaleffects-5.12.3.ebuild 443 BLAKE2B da269fa39cb24ce031bf12792e79f838a606120d746d1a78c5b65b70b1636c9a46f657454a33e3e6573c688ca98b143330e819e97a6fb81e3c759179c6a0f6b9 SHA512 b10414c6a672cba5df5e64e59d040b1f8c62ef631d084e23f846fb74f2d48a68fe2751a85604cfaa361bdd7d1d9861b21492ffa5e75921880a80af07c9a3755e
 EBUILD qtgraphicaleffects-5.12.4.ebuild 448 BLAKE2B 2d39aa7437e79ee39a0a1e6de3e4559f9332323233d0a7870b23400d2b83b8108833be6c51f40b26b256e2812742458c2fd13b999926db8019021bbf20482ffd SHA512 c9f1708a70fcf67a5c8140564b6d99be0c8eeed99aa2ff0503cb34735f8f8ce0c155e1f9c8f5d9f8caf2222aa712e4bf596fa803d37a4e1f0a7295e916de8293
+EBUILD qtgraphicaleffects-5.12.5.ebuild 448 BLAKE2B 2d39aa7437e79ee39a0a1e6de3e4559f9332323233d0a7870b23400d2b83b8108833be6c51f40b26b256e2812742458c2fd13b999926db8019021bbf20482ffd SHA512 c9f1708a70fcf67a5c8140564b6d99be0c8eeed99aa2ff0503cb34735f8f8ce0c155e1f9c8f5d9f8caf2222aa712e4bf596fa803d37a4e1f0a7295e916de8293
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.5.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.5.ebuild
new file mode 100644
index 000000000000..23d9db6e5c32
--- /dev/null
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 5a0ed7a03936..ce6f735dbd41 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -2,6 +2,8 @@ AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae0692
 AUX qtgui-5.12.4-fix-highdpi-crash.patch 1401 BLAKE2B 7782acee3e85669d4bc5c7deef63a55a26feb8d60622e3e3ae25d27cc6fce2c929aca04163a081008c6c3b26669093967ed60360b96748188afcde87c865a4a3 SHA512 f6d748b2af399b097f6a29d686517f24a70d4f89115ed8e8bb416e5b51d4a956350437eed5e4360f7a17f1d6b32b2e1c2d6b638d3f526c18a969c4178a9085b8
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
+DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 EBUILD qtgui-5.12.3-r1.ebuild 3719 BLAKE2B 6d8b24192afbda0c9f4955ef6127fa1b334cdfde00a8e78c9eeffc52496d0a8801642c21bc8dd730ed67373c32f738d4f804e6cc3a5901b38360eb39d15caf27 SHA512 5ad5f7b427fb989f0f3bbed475932808d7b598b53d9e16bd25bbb57ec75127c6ccc42295e26446be29516a881bd42989936c665ef48af2ff2c984d617aeb4a16
 EBUILD qtgui-5.12.4.ebuild 3866 BLAKE2B ad2901c3c6d701c11fce868f9a82e9f986b26fac54bd89a7b4727f0195ae2e881b5f2daa79f3fc433864d6de2daed9fed18aa58acbe9686b4ea523234bb801a1 SHA512 03c883fe4d9f8941b8274d08898ee9d0711719025d16550ed4b00a21e85000ec7edf14e805ad62fbb869a2b942ace5d0932af990128218390ae53954ebd40774
+EBUILD qtgui-5.12.5.ebuild 3743 BLAKE2B 43109ed3af4ff30d830b447767b874ad05843d42c46ef89088bc5e6bca68f3a20a9447466bb6be85bbc54dc4d94974ac80033bceb31d02fdfda41187009173aa SHA512 175a1921e8594f4c05aecb33ef99d72f1cf23e2678fb380222af04674d2eaedbb8338325d472748fe01337bad9fa3be6c643b182b90255d8b373eb4eccf6525a
 MISC metadata.xml 1322 BLAKE2B b6161b568e3a4c34a8fce62a8cce9e1bd7cabbc0d2d2baa0e5e41295974b877d59adff4983b731bb359040f3662999a7915a1527bedeca9de09eb702541d1ae7 SHA512 dcfcdc8f5622e5d6b8488f07b6de62aae829b564ecdb9fb8b9f273bc2593c312f5265849bb3d2175d0ab468977ac2afb8099519cfb66224d8e5df0efec01ae4a
diff --git a/dev-qt/qtgui/qtgui-5.12.5.ebuild b/dev-qt/qtgui/qtgui-5.12.5.ebuild
new file mode 100644
index 000000000000..aa6a1274d224
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.12.5.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+# TODO: linuxfb
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+	jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
+REQUIRED_USE="
+	|| ( eglfs xcb )
+	accessibility? ( dbus xcb )
+	eglfs? ( egl )
+	ibus? ( dbus )
+	libinput? ( udev )
+	xcb? ( gles2? ( egl ) )
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}
+	dev-util/gtk-update-icon-cache
+	media-libs/fontconfig
+	>=media-libs/freetype-2.6.1:2
+	>=media-libs/harfbuzz-1.6.0:=
+	sys-libs/zlib:=
+	virtual/opengl
+	dbus? ( ~dev-qt/qtdbus-${PV} )
+	egl? ( media-libs/mesa[egl] )
+	eglfs? (
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+	)
+	evdev? ( sys-libs/mtdev )
+	gles2? ( media-libs/mesa[gles2] )
+	jpeg? ( virtual/jpeg:0 )
+	libinput? (
+		dev-libs/libinput:=
+		>=x11-libs/libxkbcommon-0.5.0
+	)
+	png? ( media-libs/libpng:0= )
+	tslib? ( x11-libs/tslib )
+	tuio? ( ~dev-qt/qtnetwork-${PV} )
+	udev? ( virtual/libudev:= )
+	vnc? ( ~dev-qt/qtnetwork-${PV} )
+	xcb? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libxcb-1.12:=[xkb]
+		>=x11-libs/libxkbcommon-0.5.0[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${RDEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+	wayland? ( ~dev-qt/qtwayland-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/qvkgen
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl:egl:
+	eglfs:eglfs:
+	eglfs:eglfs_egldevice:
+	eglfs:eglfs_gbm:
+	evdev:evdev:
+	evdev:mtdev:
+	:fontconfig:
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2::OPENGL_ES
+	gles2:opengles2:OPENGL_ES_2
+	!:no-gui:
+	:system-harfbuzz:
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib:tslib:
+	udev:libudev:
+	xcb:xcb:
+	xcb:xcb-glx:
+	xcb:xcb-plugin:
+	xcb:xcb-render:
+	xcb:xcb-sm:
+	xcb:xcb-xlib:
+	xcb:xcb-xinput:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+src_prepare() {
+	# don't add -O3 to CXXFLAGS, bug 549140
+	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
+
+	# egl_x11 is activated when both egl and xcb are enabled
+	use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+
+	qt_use_disable_config dbus dbus \
+		src/platformsupport/themes/genericunix/genericunix.pri
+
+	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+		src/plugins/platforms/platforms.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(usex dbus -dbus-linked '')
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(usex eglfs '-gbm -kms' '')
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		$(usex gif '' -no-gif)
+		-gui
+		-system-harfbuzz
+		$(qt_use jpeg libjpeg system)
+		$(qt_use libinput)
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use tslib)
+		$(qt_use udev libudev)
+		$(qt_use xcb xcb system)
+		$(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
+	)
+	if use libinput || use xcb; then
+		myconf+=( -xkbcommon )
+	fi
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index db7b28261256..1fd03d2ab597 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
+DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 EBUILD qthelp-5.12.3.ebuild 620 BLAKE2B 86be69740dacdebd82fad0d89bd051c13a431bfa5c4937e2bce8b0283bb5fb482c46bfd4c8df9afd4a89df22a5ece1738504f19a8b0ea53c4221bf4a60718e15 SHA512 91f9e9b8fcee0bcf60a2460823d482f472722df7eb61fcb5485118ec96bc59640698bf71d3b483c6a5c97a95721aa45acb8b1813d323e30522db7372003eab98
 EBUILD qthelp-5.12.4.ebuild 626 BLAKE2B 8648f869ec8dbcd3f39889b31173ac3cc8f7500cd46d858476a562839b99c14e0c7f2f2e66e21ba970ec2f20f14586855c9796e3b88eaf6f64db7c311d3661c9 SHA512 a4ee3d97f13295457bcfdf43ff95a586c8172f291b3edab61509afdb8315bac770780d94a32370b67e05d0786310cdc7b7d29e9d123e7256b6364d3d0f9ccbba
+EBUILD qthelp-5.12.5.ebuild 626 BLAKE2B 8648f869ec8dbcd3f39889b31173ac3cc8f7500cd46d858476a562839b99c14e0c7f2f2e66e21ba970ec2f20f14586855c9796e3b88eaf6f64db7c311d3661c9 SHA512 a4ee3d97f13295457bcfdf43ff95a586c8172f291b3edab61509afdb8315bac770780d94a32370b67e05d0786310cdc7b7d29e9d123e7256b6364d3d0f9ccbba
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.12.5.ebuild b/dev-qt/qthelp/qthelp-5.12.5.ebuild
new file mode 100644
index 000000000000..e3a0a1991175
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-5.12.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for integrating online documentation into applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtsql-${PV}[sqlite]
+	~dev-qt/qtwidgets-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/assistant/help
+	src/assistant/qcollectiongenerator
+	src/assistant/qhelpgenerator
+)
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 49dfd429fbda..f40d60bd3839 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,7 @@
 DIST qtimageformats-everywhere-src-5.12.3.tar.xz 1793076 BLAKE2B 59dced7576a50441c704c8debf4a86bb4db7cfb752922020d2932ee2295805b27ece866f3f86e3f89b308e28cfb720fb9c6fa782f29f45e1c3b14fd733096c87 SHA512 59cc9df597e6ac31b10ff7440b0793af13ee84a1b363db631a7aeea7413e650a99a42e8c3f4633926ec93d4ac4c2532674ea27df325ba98132bea83c81d6e6cc
 DIST qtimageformats-everywhere-src-5.12.4.tar.xz 1793912 BLAKE2B b74d328bc8ae7a56294734d8f52f2d7a845f9026d246672927298971a01d0f5942b5ff84121a19acbd7359f8768d3248895a16290da7b26eca5a66b8201dc824 SHA512 e9adab3b7e1f5a0679e1924eb08718f2c6c53073f83018c9243886f7e1b084940bb9a642f46d76fae21552c4a76c655482536ae873cd4cfead4876a3561ebe8f
+DIST qtimageformats-everywhere-src-5.12.5.tar.xz 1795824 BLAKE2B 3b5d3a4be8933d1af7d0fb6feb1cd37318cbc69840cc82de50fb81f63156251f768347bf5ae31b6f255dc9e02a53d64ab98aef8a27749331071482d729ac811d SHA512 9fa76b7eec083596c45f68642b49dc88c2759a28cb9359935c3a64604082acea9adecee49bb0828cc587b86d469aec7169f8f72f83a15194c4fc10f0ca25fae0
 EBUILD qtimageformats-5.12.3.ebuild 535 BLAKE2B 6127b3746d0b8dfa12f3fd7fd5fb5fc65984a539b9110449462829131cd5f63f3d2428c7d754126564b0a92743a895cfc9aecff39cb741adf7e46ef9781ce689 SHA512 2f3807091be97592ff6a3228389fbe9877d9791a76990d1ed637af1f0caf62ed2b12a4c71cfb277b90f25ae4193573d9a51994fd61b5dcb9a1249a93243865c6
 EBUILD qtimageformats-5.12.4-r1.ebuild 674 BLAKE2B 5771237aefd18c9302d6c89494ae211a28c389f06b6b2c22796395350b9cbe8de3fab260a4db4c55b1918e855a4afb1a647d5da4c2c9aaecf54733a9ca8dd4d3 SHA512 f0dbc5327a9df26d90d7151a974ae18e3d709964fad26bf73576d9e0779575633b30081332a9b55bace930f5c68ea217237c9ca7aebf7acf9d7f7d2efdc74d43
+EBUILD qtimageformats-5.12.5.ebuild 674 BLAKE2B 5771237aefd18c9302d6c89494ae211a28c389f06b6b2c22796395350b9cbe8de3fab260a4db4c55b1918e855a4afb1a647d5da4c2c9aaecf54733a9ca8dd4d3 SHA512 f0dbc5327a9df26d90d7151a974ae18e3d709964fad26bf73576d9e0779575633b30081332a9b55bace930f5c68ea217237c9ca7aebf7acf9d7f7d2efdc74d43
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.5.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.5.ebuild
new file mode 100644
index 000000000000..a7eace7d6d78
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.12.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Additional format plugins for the Qt image I/O system"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="mng"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	media-libs/libwebp:=
+	media-libs/tiff:0
+	mng? ( media-libs/libmng:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	sed -e 's/qtConfig(jasper)/false:/' \
+		-i src/plugins/imageformats/imageformats.pro || die
+	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index f9f1bf565900..70bdaa2eaba2 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,5 +1,7 @@
 DIST qtlocation-everywhere-src-5.12.3.tar.xz 5905856 BLAKE2B b52b9eaea77b4b429db90768d97c7f4d1319c7a860e864acb5afc5c35c0b2c7425afe64909751b2063bad747fe3aa6d899b39532a72065d4cd87935219a196f1 SHA512 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082
 DIST qtlocation-everywhere-src-5.12.4.tar.xz 5909156 BLAKE2B 9afb944d4ca6b5566852309cd4d7709862a377b26d7293141e308f85b28641bef17e0a40ac094b8e94fa1ab2c4709415177bcaf104a7deebeac1f43845240224 SHA512 b03380feb2e6767dabb0a75f9234c52a9adc580d53b692c356b04293195f6cdd49d9c7e8eb91404b5a7e4c7507498078dd8f41de014330d35f0e99e034b8cf3a
+DIST qtlocation-everywhere-src-5.12.5.tar.xz 5905880 BLAKE2B 67cbe02ad42cfde9bdff9285bc7b8e4d4edb8d4c295cb5e1ca9bbeb077d017762d93d1bf31da67b29506f634bd6f9f909aaf9ecbdc20c480e59bafb3ff539380 SHA512 fe82194e4e6bc2a2e6e3c55e3360afdfd56a6495a8d87bfbdceb29255430954d4c1adc62f1f82e63b23778f0bf03b0a50d6f5d2a963bd786f2cf2fbed7450ccc
 EBUILD qtlocation-5.12.3.ebuild 946 BLAKE2B ea775efcc0c87f91b3b7f012d46073a2a68a3afb7e07ebe8ca55a8bd581f10d8e828d156aafb47b64c8cf014be16d6b9d37738d47e5b6720680f0270fca47469 SHA512 147bf6f4a777e62f0ea7b10b9133b9cad45a00883a64c96dec22623e60b173f1f70aa5e6c0d286e7fd848c656483c63546aaf3126c8072a8425afcd9a5c46b0c
 EBUILD qtlocation-5.12.4.ebuild 950 BLAKE2B 072d9d7965f7497383ca82ca5efad6f6764133738ca2c822cb525295f4e214bc89abdc008adbb47bbf6112ab5ae6e7f101ddeba4517016c53945457812240b01 SHA512 6905bbc0d9df3211ef1ab4d48f9dc96ad3740b49ab69ff338140bc061192d8d0283940a13d4952343d8b161a5a9345d01a9fe503c4857484635753e863e34927
+EBUILD qtlocation-5.12.5.ebuild 950 BLAKE2B 072d9d7965f7497383ca82ca5efad6f6764133738ca2c822cb525295f4e214bc89abdc008adbb47bbf6112ab5ae6e7f101ddeba4517016c53945457812240b01 SHA512 6905bbc0d9df3211ef1ab4d48f9dc96ad3740b49ab69ff338140bc061192d8d0283940a13d4952343d8b161a5a9345d01a9fe503c4857484635753e863e34927
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.12.5.ebuild b/dev-qt/qtlocation/qtlocation-5.12.5.ebuild
new file mode 100644
index 000000000000..e1e230b43e26
--- /dev/null
+++ b/dev-qt/qtlocation/qtlocation-5.12.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtpositioning-${PV}[qml]
+	~dev-qt/qtsql-${PV}
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	~dev-qt/qtconcurrent-${PV}
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	src/3rdparty/mapbox-gl-native
+	src/location
+	src/imports/location
+	src/plugins/geoservices
+)
+
+src_configure() {
+	# src/plugins/geoservices requires files that are only generated when
+	# qmake is run in the root directory. Bug 633776.
+	mkdir -p "${QT5_BUILD_DIR}" || die
+	qt5_qmake "${QT_BUILD_DIR}"
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index fdab59ad38c2..0d9e3f65a585 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,6 +1,8 @@
 AUX qtmultimedia-5.12.4-fix-no-opengl.patch 1229 BLAKE2B ea648a12662060bdf1aeb5ebe62f748f15904b9cae5d985f0a93f8b56aa9671b30c0672d772620d60aae1cd3ae3f21cc5d2fa82348210716b3746b34e824de78 SHA512 226d2a95541c8c38886783a61fc997ead7a8fd6007e1ed6321a16e42eb12b54e4139e2aa1b776ae4323c153bfb73118d6a71ee3790158bcfded6eddc9a8b1cd7
 DIST qtmultimedia-everywhere-src-5.12.3.tar.xz 3742244 BLAKE2B 65cc184c2625c998ec0f12d5d2f72401693521c9b5e1f27db342279724789e88e0bd6c6cb741ccf28939e8edbb657dde391ceb24ab0cb97c786c114e7e95743d SHA512 4f10e40aaf73dda2d70502e6a1441149c2b4389e9c7de72245c850d926c3ecb57ca6b09c63d208eff4b9ec63b7f9845eb2740cd0df4e4b7eee8f51746a6d3963
 DIST qtmultimedia-everywhere-src-5.12.4.tar.xz 3743264 BLAKE2B c468c674e441ca6b400bf2149b4c56851697df5d644486f7ec902a175ecc2260fb0e7e3c366aaf7d542a2b263731c622702bf9b2f04a5257a5e1d8e985c9507c SHA512 28eaaf4a704649616cd77ae5560ddd6298c82e525f59fa4d5a0178826fe2d6c9b77dcb067f2b5b56e88da7d6043a3f8e34b5c810d12751c74fdc65e5440586fa
+DIST qtmultimedia-everywhere-src-5.12.5.tar.xz 3744764 BLAKE2B 47e7c09ddc4961ea2c479835732cc31139a4ecb577571a9b804a946909292439ef6bd85d5f8afdae0caacf3491391a8b45b2bfdd113dd18902fa097a0dc36253 SHA512 a59983d887c8de462399fd53beb640c1b865c17f8b1a83635c2e1d27903861dd588eb64935d7c02d733c51c9a21174065e70a5fc1aa78600e5540c489b7695a3
 EBUILD qtmultimedia-5.12.3.ebuild 1454 BLAKE2B dea245e0689b8e1d48049a181522652cb5dd916a6c23a21cf28a2a2d74bef6ca02cf1c9974b4d111757431e9eff6785b0087c3ab07fcdc005cda382a5032982b SHA512 174f824fc6cc4c04d6425fb3f7d6e166f9942997216cc2eaa117c368a338e01798dc43bc1da1bf0a4a9f715c2831e0c8fe14a635d10659e5cc1e1ebe0917a47c
 EBUILD qtmultimedia-5.12.4.ebuild 1512 BLAKE2B 409cf16b96054d55d583b3530b386a1600387dddb75f6743edcc11c23dece1510be08b1d3556005938a7692501ea7bb6491abdbe52bfd52f2fd4b86643cf54ae SHA512 e9d79b6dcfb391fc4b6e0544e30f7cc0247fb518c106d48a1090608bf85dff4ef95292834e6c21438bcf4a32c168324dbe1646618273023d0861c8f0d27c92d7
+EBUILD qtmultimedia-5.12.5.ebuild 1460 BLAKE2B fc5f39dca1f09829323aa44aee2e02ab6f4a8be10280aeabccbefe839e8c323303fd734153f5d5be5c5015b4ebdb0a7027a96b5229270faf5605b7602104f088 SHA512 17a298c7187013841571f5156a7fa60decb790dccecfa215ff407ec4bbcc29471944b100bb16dc8e3b1d9fdfca6a07e87615cbfb6c3f0a055beb5320e095dd2c
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.5.ebuild
new file mode 100644
index 000000000000..e56a20198e2e
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtnetwork-${PV}
+	alsa? ( media-libs/alsa-lib )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	qml? (
+		~dev-qt/qtdeclarative-${PV}
+		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
+		openal? ( media-libs/openal )
+	)
+	widgets? (
+		~dev-qt/qtopengl-${PV}
+		~dev-qt/qtwidgets-${PV}[gles2=]
+	)
+"
+DEPEND="${RDEPEND}
+	gstreamer? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+		src/multimedia/multimedia.pro || die
+
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
+
+	qt_use_disable_mod qml quick \
+		src/src.pro \
+		src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/gsttools/gsttools.pro \
+		src/plugins/gstreamer/common.pri
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index e9be111669e8..f8417693f8ad 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
+DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 EBUILD qtnetwork-5.12.3.ebuild 1317 BLAKE2B 9796cadc8e6c157bb96e1a10129514b21fbe3bd1092ffeadcb56f0dd0afcfe47ab144130729b5bb25da1c128cf1f12da37cb4a81ad48b51558e98254981af604 SHA512 b3e5db3db035d9decab387d576040aa1683fe4b118466ccf51e56efe4e7868897b99d406157a2f01029d0717f986f1611711c910914ce550a74f9ddee97a68bf
 EBUILD qtnetwork-5.12.4.ebuild 1323 BLAKE2B 31a4648a0c00dc30e36269340d56329cbca6b8650d69799e5794fd32350fe8c3c4b8aa9414ae585a427ba40d10348ec4087c704c3e2c68faf7733a298b84b748 SHA512 19d8ac15525f0c2387b7141a8eb1dc64add7c00ee8202966aa40008f67e490d52e7db53dea54cecc28d4efa517216282789a5098ed9bcda9b070dbec03c99be8
+EBUILD qtnetwork-5.12.5.ebuild 1323 BLAKE2B 31a4648a0c00dc30e36269340d56329cbca6b8650d69799e5794fd32350fe8c3c4b8aa9414ae585a427ba40d10348ec4087c704c3e2c68faf7733a298b84b748 SHA512 19d8ac15525f0c2387b7141a8eb1dc64add7c00ee8202966aa40008f67e490d52e7db53dea54cecc28d4efa517216282789a5098ed9bcda9b070dbec03c99be8
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.5.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.5.ebuild
new file mode 100644
index 000000000000..a8f3a81d4048
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Network abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="bindist connman libproxy networkmanager sctp +ssl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	sys-libs/zlib:=
+	connman? ( ~dev-qt/qtdbus-${PV} )
+	libproxy? ( net-libs/libproxy )
+	networkmanager? ( ~dev-qt/qtdbus-${PV} )
+	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
+	ssl? ( dev-libs/openssl:0=[bindist=] )
+"
+RDEPEND="${DEPEND}
+	connman? ( net-misc/connman )
+	networkmanager? ( net-misc/networkmanager )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/network
+	src/plugins/bearer/generic
+)
+
+QT5_GENTOO_CONFIG=(
+	libproxy:libproxy:
+	ssl::SSL
+	ssl::OPENSSL
+	ssl:openssl-linked:LINKED_OPENSSL
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:network
+)
+
+pkg_setup() {
+	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
+	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
+}
+
+src_configure() {
+	local myconf=(
+		$(usex connman -dbus-linked '')
+		$(qt_use libproxy)
+		$(usex networkmanager -dbus-linked '')
+		$(qt_use sctp)
+		$(usex ssl -openssl-linked '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index a9f3c28e971b..2fec1b7c3486 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,5 +1,7 @@
 DIST qtnetworkauth-everywhere-src-5.12.3.tar.xz 139092 BLAKE2B ee8c09ce890010b0ff6424ea74210749fdd0b4ba42fafd0e372ed2719830ce073085f1d5a8d5fbfbb98901f84cd81b105483f310ff6ff056f16430eef6ea1a5c SHA512 07bf159360fe126c23387c6ed5b955218771ac37848ddb83542733c786b415f9aa5c22fd4a965fff591869d2d819bba420b69718e487df3cce382f411f493142
 DIST qtnetworkauth-everywhere-src-5.12.4.tar.xz 139112 BLAKE2B 971fb0f0902545a0ef9e8ebc8033cdd28980c1ac53e8e34bf9a43930156fbf6fc0054771350ac7c5b22e8cca1bf612ad6d300c2805d77cc8fdda1ccd6873520e SHA512 0f36530393abe5315154bf95d0cae1330a8af1af8af5a525d20336d4227f11aa9133b7e3258f651be6f212593ad7e0d2d5d15536fab3c07392a94f2954afe7c8
+DIST qtnetworkauth-everywhere-src-5.12.5.tar.xz 139116 BLAKE2B 38adab02544dff25d52ebb64a2adae090f265a5c23cfeb48e5288beb2153f4cd9973601aee23faaf074d91fdea1924f201864d6ce2773989d5e2844c79096135 SHA512 d7849518614a7bdb2ddbcf92b773f5e7c26f1af4ba07f0304b4634ed69bf3c17798509d28af2c49aba0cfad35a1cad5bda27acdbde3aa8d86038efeb9f5001e0
 EBUILD qtnetworkauth-5.12.3.ebuild 377 BLAKE2B 23de606295519cf1ced4553bc46bed542f839fac0a2e902e4f5205d1572b57a87fa3b6ab5dc60e45636c99078b71e506036f7a8d082d14ccab12209419bf2461 SHA512 f31ddc705a7f5aab7923fe21b162768029e70f9e00da4645651341363a0a6648006006b866fa6d0096e919145cf8f6e2aca3444a71dcdfcc653af304d60e9c0f
 EBUILD qtnetworkauth-5.12.4.ebuild 380 BLAKE2B bdfc475dd17fea260a676ca437930d0d8de8ed8723397e737af3206310fb463a87fab938edcb420ea2aa4492926344ab9e2333947f5e66c91ae7eb9e1cfd9f45 SHA512 c56e083d3026fe9023eb519d58fc8585052457beb39e7814d7083c65e0810bdedf45cda0be96f8bacc21c82b74345cc77f3643671a002fc2c136c396670d1141
+EBUILD qtnetworkauth-5.12.5.ebuild 380 BLAKE2B bdfc475dd17fea260a676ca437930d0d8de8ed8723397e737af3206310fb463a87fab938edcb420ea2aa4492926344ab9e2333947f5e66c91ae7eb9e1cfd9f45 SHA512 c56e083d3026fe9023eb519d58fc8585052457beb39e7814d7083c65e0810bdedf45cda0be96f8bacc21c82b74345cc77f3643671a002fc2c136c396670d1141
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.12.5.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.12.5.ebuild
new file mode 100644
index 000000000000..7fbd2442415a
--- /dev/null
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.12.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Network authorization library for the Qt5 framework"
+LICENSE="GPL-3"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 4ef8e2a49ec9..608d1d0739d5 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
+DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 EBUILD qtopengl-5.12.3.ebuild 646 BLAKE2B 3750da85e8941c0f2f9ac6a830bcbb0ca3bc2a2c03a68fed6884643df2ccf8fd6546d2a2fb72334f7286fe142aa0d5aec7fec49701df3b42a0a8ac132aab5685 SHA512 fdf3157264f4e2bc957e0f9e943ba11e9ba91ce3127b3297c8d9467693a1300dc15052806dd56230d92395ab848e1e75f0356ce7e0b32c8a213774450ef20be1
 EBUILD qtopengl-5.12.4.ebuild 652 BLAKE2B fed7a7d9adf1b1e403aef1548a0028cfc4fb48dc882f8d4c457ab4413ae76385f36e5efcf2196d32b4fdb674e692b68862be3cef8ea75fbc3521cfac79a7d27f SHA512 3b6420f0f6c50171e495f32b4e536efb0faae9f9ff7cfe4745c6f2717e226380f211be516914f4e7fffc6b7326f1f7f58f013cdfc239f46f527bb0feff8abf4c
+EBUILD qtopengl-5.12.5.ebuild 652 BLAKE2B fed7a7d9adf1b1e403aef1548a0028cfc4fb48dc882f8d4c457ab4413ae76385f36e5efcf2196d32b4fdb674e692b68862be3cef8ea75fbc3521cfac79a7d27f SHA512 3b6420f0f6c50171e495f32b4e536efb0faae9f9ff7cfe4745c6f2717e226380f211be516914f4e7fffc6b7326f1f7f58f013cdfc239f46f527bb0feff8abf4c
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtopengl/qtopengl-5.12.5.ebuild b/dev-qt/qtopengl/qtopengl-5.12.5.ebuild
new file mode 100644
index 000000000000..15897af68b46
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-5.12.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="gles2"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
+	virtual/opengl
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/opengl
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2 es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 27e5dbb46aa1..a9fe0b98f697 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
+DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 EBUILD qtpaths-5.12.3.ebuild 408 BLAKE2B 83d924ac90fd51f6124a633513e40b8685a9b3156b326865ab57151c8444c6ca7f79f10c1bbe72bf8df1cbd61c8943833eaee95a229626ea3052788c8d2ebb28 SHA512 8c7520a5d9059d65c42ef921058468014f1c09421ad55077cb1f11836f17507700df4446d8b60d32681e52d13217bac7448f4e4317a64a3863ea2e98164d4684
 EBUILD qtpaths-5.12.4.ebuild 413 BLAKE2B b3b89675934b038848faf2ba068983545e15fd79a03ceb736349eb32d198dfa53768110388e8ad53795fb0135df1b0bfb735c86e34a3959f46e777f59ac1f55c SHA512 1eb5c6dd161357426fd137a98ec3f743028fd08d2c7edaa860501bb9198b401c402f41467c638902096330f09f85cf3e6cff7c713e72f0c0b78169f4dd7220bd
+EBUILD qtpaths-5.12.5.ebuild 413 BLAKE2B b3b89675934b038848faf2ba068983545e15fd79a03ceb736349eb32d198dfa53768110388e8ad53795fb0135df1b0bfb735c86e34a3959f46e777f59ac1f55c SHA512 1eb5c6dd161357426fd137a98ec3f743028fd08d2c7edaa860501bb9198b401c402f41467c638902096330f09f85cf3e6cff7c713e72f0c0b78169f4dd7220bd
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.12.5.ebuild b/dev-qt/qtpaths/qtpaths-5.12.5.ebuild
new file mode 100644
index 000000000000..ec3e1e7d8678
--- /dev/null
+++ b/dev-qt/qtpaths/qtpaths-5.12.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Command line client to QStandardPaths"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtpaths
+)
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 4e4c5ccd00e8..081f813cb8dd 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,5 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.12.4.tar.xz 9810980 BLAKE2B 214a3910232b7b60047e8c750b2850e2ab2de134246adffd69b4c2320b2faa2744b27f86b9837b75f32c09321021f9aa03301320abff3c37803601a64799c973 SHA512 072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466
+DIST qttools-everywhere-src-5.12.5.tar.xz 9759888 BLAKE2B a9d8477a8f27de405c390d0901754020bed457dfaf7419cb070c5bf4eee30f3bb0b39bd29d3c32f8f78e82ffa8bc10e58cea3eae389792227cd6f21f783624c2 SHA512 e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c
 EBUILD qtplugininfo-5.12.3.ebuild 370 BLAKE2B 51ece56c3c965d0b7c02ec1f5fa19491c7707ebb1ebec6dea92a5beae314cf0ff04810df93ce49e2ac5235624f731a8230ccef9e9521464b541ccee46a0b4693 SHA512 ce07e4fb6f23f7d29c9e83e1fc3bfa69700b594f17016c60a9d9d58b1e1284a2656479af75390e17df9e3fbadc5c72e49d9504ba022f9717cf39ef2fd66de2d6
 EBUILD qtplugininfo-5.12.4.ebuild 370 BLAKE2B 984c8355e1b2018943165c18fa3391534cdf44eb845a3c4d09297ff30bbf98fb0d0dd0155f3c7009d37d3fee080ed8967b27e62b4fcfb9e106b8769cd26ae04a SHA512 b29f10aa2764304b1502d46fd2433958800cdbb35409fc33ebc5df85331ced99b54b85ea25ce3f1bc266788b5474dd37040410550b76c010932a15f95a64ecef
+EBUILD qtplugininfo-5.12.5.ebuild 370 BLAKE2B 984c8355e1b2018943165c18fa3391534cdf44eb845a3c4d09297ff30bbf98fb0d0dd0155f3c7009d37d3fee080ed8967b27e62b4fcfb9e106b8769cd26ae04a SHA512 b29f10aa2764304b1502d46fd2433958800cdbb35409fc33ebc5df85331ced99b54b85ea25ce3f1bc266788b5474dd37040410550b76c010932a15f95a64ecef
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.12.5.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.12.5.ebuild
new file mode 100644
index 000000000000..85a22f1729a1
--- /dev/null
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.12.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qttools"
+inherit qt5-build
+
+DESCRIPTION="Qt5 plugin metadata dumper"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/qtplugininfo
+)
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index c1bb5fc59213..6b992b4e5792 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,5 +1,7 @@
 DIST qtlocation-everywhere-src-5.12.3.tar.xz 5905856 BLAKE2B b52b9eaea77b4b429db90768d97c7f4d1319c7a860e864acb5afc5c35c0b2c7425afe64909751b2063bad747fe3aa6d899b39532a72065d4cd87935219a196f1 SHA512 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082
 DIST qtlocation-everywhere-src-5.12.4.tar.xz 5909156 BLAKE2B 9afb944d4ca6b5566852309cd4d7709862a377b26d7293141e308f85b28641bef17e0a40ac094b8e94fa1ab2c4709415177bcaf104a7deebeac1f43845240224 SHA512 b03380feb2e6767dabb0a75f9234c52a9adc580d53b692c356b04293195f6cdd49d9c7e8eb91404b5a7e4c7507498078dd8f41de014330d35f0e99e034b8cf3a
+DIST qtlocation-everywhere-src-5.12.5.tar.xz 5905880 BLAKE2B 67cbe02ad42cfde9bdff9285bc7b8e4d4edb8d4c295cb5e1ca9bbeb077d017762d93d1bf31da67b29506f634bd6f9f909aaf9ecbdc20c480e59bafb3ff539380 SHA512 fe82194e4e6bc2a2e6e3c55e3360afdfd56a6495a8d87bfbdceb29255430954d4c1adc62f1f82e63b23778f0bf03b0a50d6f5d2a963bd786f2cf2fbed7450ccc
 EBUILD qtpositioning-5.12.3.ebuild 847 BLAKE2B 0499f2fa8e8991e9a78a23e079bd575dd9eaf68df4209d95c0699ce5cd4f465eee13e013c1328fe476e136486dbd4593ac424faaa42828f672792445fc3a5150 SHA512 dddb5bc21e376bb8865c5300595fb8a04c2f28ddcbf5a64bb7e603867142f5e9b340cf49fa51cd995feaa1850c75d19eaadaa768017437d9b303a5eda7ff527a
 EBUILD qtpositioning-5.12.4.ebuild 853 BLAKE2B a810a14a049a39f620baf81de6d4b0022094a1802d85f7a6016b6859494779714d3627df9a96dc5222edca920044550dcb715f87ed592fd207ebf6bf48afa1f4 SHA512 b603997540dec4ef6f6c4c94a5ccb54e6744024482b40d76c2455fc7bbe9f59cbaadd042a5bdb803ffa5a74a7396041fd2ce1d4676ba7513ef55efd91f8e9c6b
+EBUILD qtpositioning-5.12.5.ebuild 853 BLAKE2B a810a14a049a39f620baf81de6d4b0022094a1802d85f7a6016b6859494779714d3627df9a96dc5222edca920044550dcb715f87ed592fd207ebf6bf48afa1f4 SHA512 b603997540dec4ef6f6c4c94a5ccb54e6744024482b40d76c2455fc7bbe9f59cbaadd042a5bdb803ffa5a74a7396041fd2ce1d4676ba7513ef55efd91f8e9c6b
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.12.5.ebuild b/dev-qt/qtpositioning/qtpositioning-5.12.5.ebuild
new file mode 100644
index 000000000000..cc8b4e331240
--- /dev/null
+++ b/dev-qt/qtpositioning/qtpositioning-5.12.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtlocation"
+inherit qt5-build
+
+DESCRIPTION="Physical position determination library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="geoclue +qml"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	geoclue? ( ~dev-qt/qtdbus-${PV} )
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+DEPEND="${RDEPEND}"
+PDEPEND="
+	geoclue? ( app-misc/geoclue:2.0 )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/3rdparty/clipper
+	src/3rdparty/poly2tri
+	src/3rdparty/clip2tri
+	src/positioning
+	src/plugins/position/positionpoll
+)
+
+pkg_setup() {
+	use geoclue && QT5_TARGET_SUBDIRS+=( src/plugins/position/geoclue2 )
+	use qml && QT5_TARGET_SUBDIRS+=(
+		src/positioningquick
+		src/imports/positioning
+	)
+}
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 7b3a0eefc2ef..4f495718795b 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
+DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 EBUILD qtprintsupport-5.12.3.ebuild 771 BLAKE2B 96ab94cf1482d01d33f8235fcec01a2bb80f13d659a0f3f4d144e9df9613867a5e2422ad9ed0ab8eb421ff6cb302d438a66c8caeb127079b4aafaedf93ba557c SHA512 099479a5c34d2e43996fb3027843a6f11b93500ac7f9b1e0b721f840e121238719feda3f4457151a7d946f8b677c2ddbdcc5dd24de0dc5bfaf0061304d55d8f7
 EBUILD qtprintsupport-5.12.4.ebuild 777 BLAKE2B f550746fba21114b1436ebad092e894f973f5763bf9b1baf777b11093c19ee733c2ef54441554422e4fb4a8bbed9930b54b0fe83d73aef2fb188975f6b8a8fc4 SHA512 aa590ad8a77b74938e247f00c45c34315895ebebeacec7a36e6f16b159fc99bf92359e7faf889c5ade30849c2ef1dc7ca760025b9409a6fe7f7d4043e6807dcb
+EBUILD qtprintsupport-5.12.5.ebuild 777 BLAKE2B f550746fba21114b1436ebad092e894f973f5763bf9b1baf777b11093c19ee733c2ef54441554422e4fb4a8bbed9930b54b0fe83d73aef2fb188975f6b8a8fc4 SHA512 aa590ad8a77b74938e247f00c45c34315895ebebeacec7a36e6f16b159fc99bf92359e7faf889c5ade30849c2ef1dc7ca760025b9409a6fe7f7d4043e6807dcb
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.12.5.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.12.5.ebuild
new file mode 100644
index 000000000000..0fb87884db76
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.12.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Printing support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="cups gles2"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
+	cups? ( >=net-print/cups-1.4 )
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/printsupport
+	src/plugins/printsupport
+)
+
+QT5_GENTOO_CONFIG=(
+	cups
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use cups)
+		-opengl $(usex gles2 es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index a287c55443c7..b1974bd49350 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,7 @@
 DIST qtquickcontrols-everywhere-src-5.12.3.tar.xz 6057512 BLAKE2B ebe1f4a431cd58891c8550ac1e50992d290c18df54b6710912397f6856ada50f8807cb52d0fbe43f376d187ba6c3f53a0b826babe10fded480d4088bf842f566 SHA512 23410fb82088591a8bed7e8e4127d13929a03adc0dfd18f7e2f906acdac21f7dcbb15cb2257272b893d937bbb54860992667c11aa0c6157d4a3b871616c4641c
 DIST qtquickcontrols-everywhere-src-5.12.4.tar.xz 6057224 BLAKE2B 7dc7183247727500333749385109b7f5edbb160795641818ebe902b26286a4a22cb5170f529488e26d447b543a4ff89bc72ce41d71ccecb27e61cb5099dfbd81 SHA512 315f711d856a4f2882c4e60435bd5fc77623b4ba3bd10fea8e8d052e0a183556c4b5342236b18fade0bbae3a45df8b1426a26a87b1d7b071bb3e5846585775f6
+DIST qtquickcontrols-everywhere-src-5.12.5.tar.xz 6056164 BLAKE2B 92fb8c605f6d9633ddf758b9d323b06f52024b024f572d2906e2f6507b05badacbf117da7c1e3b6a320629bad8efcf9bc97440466e8817006af8ab5f5a68daa9 SHA512 4539a6ce1ee20f71f6bf48271bc3fe1125bd21899cf36142d1c3d41a68ba56211f27d6e4403c69e86bd4698c7c7c79bc60f2a78ef1b19c5eab5b8690d1a01037
 EBUILD qtquickcontrols-5.12.3.ebuild 737 BLAKE2B d90a9a684c31c1dee51840296ad8a0cac24871161f6229bb6febf6e9b69962bbe1f813c7049a9d560252e60e2b69760de479577ea259b38adf9d9a2933c2fcbb SHA512 32644b3f513bbccb45715ee30967f6e30cef2b05048f2a7c579e0aefbc5fccdf56bdbce3e4582f53bbb4776b9a6c8e1820b6fc847e17a4d167c72bd86d5ba0bf
 EBUILD qtquickcontrols-5.12.4.ebuild 742 BLAKE2B 6211a061d637e7836fe45dcef4fb9dd75e9823731761a9be088aa03d93c80c58305f28fab87e39e5f8f243408d195b677dd9b5aacc6b9910dce455e463de5a1f SHA512 c87036301bb8b282c91a5ca5aa47e7079d6252b99aa944481e6414f2d2acad0c50d6d0927bc9321c8e770bc384c734486b7cb4b4e6bba044c80a6b91b09e8600
+EBUILD qtquickcontrols-5.12.5.ebuild 742 BLAKE2B 6211a061d637e7836fe45dcef4fb9dd75e9823731761a9be088aa03d93c80c58305f28fab87e39e5f8f243408d195b677dd9b5aacc6b9910dce455e463de5a1f SHA512 c87036301bb8b282c91a5ca5aa47e7079d6252b99aa944481e6414f2d2acad0c50d6d0927bc9321c8e770bc384c734486b7cb4b4e6bba044c80a6b91b09e8600
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.5.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.5.ebuild
new file mode 100644
index 000000000000..25f8d80d48a9
--- /dev/null
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="+widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/controls/Private/private.pri \
+		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
+		tests/auto/controls/controls.pro \
+		tests/auto/testplugin/testplugin.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 1e8b7e7bac69..17b790a2d3bd 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,5 +1,7 @@
 DIST qtquickcontrols2-everywhere-src-5.12.3.tar.xz 9297300 BLAKE2B 53ec7eb16cdbc77d60316dfebd47f0372ce90bc9781dcdb1f0b9360774379138cf3483b52ebae9598bebf7460b300b388663fe35292264007d1f240ccf2bbff6 SHA512 afc1ae9a5a046845b085d5cf0019b79d99914a2d285676bd4d8966f1302513078c8279b71134281c03b2c1209295bca438b9e255774574520498b0b5385bad27
 DIST qtquickcontrols2-everywhere-src-5.12.4.tar.xz 9299120 BLAKE2B 021df7d65898aa0df45095005ef3f37150e36da64b0a52bbe69cf177a8f31e3e6ae2b65b81bec5f2ac3d01b92cef4d3b0d6904d9e26474d3fd9cc557f4f9bf47 SHA512 41e44ee733ef3ac5021543407b472750c7b8d61bdeb6960d043477f0c5604699cafb5cca4f755a26ce3cfef1f948e85bb85623ecd21e70c876bd5a8c1f5547bf
+DIST qtquickcontrols2-everywhere-src-5.12.5.tar.xz 9299520 BLAKE2B 66be3a4c67fc0821ea6cbbac9986fad2baa67dff6533217462646146f22bad35fe5c291ad7dc5e38fcfc23fda581a135f21eb587e5ad2ec6b71805a64e3071d8 SHA512 afbd742783d83eabf182031e218c2f611709cd66f2b4886317bd356ffff2afabe820e1f552f478a0c3f74daf6fd1f5256900448f5445b84792d6a71b42ccd20a
 EBUILD qtquickcontrols2-5.12.3.ebuild 599 BLAKE2B d409423c1de739879c4233f4ed50260674a7ee0304c141135ed131a771604860204fd5fdacb9391632f4df55ca6d01b46e9204790fd7dd815002d6fa5b4630f2 SHA512 039590f16bd2e2e29e529b5e2d2d298186364cc3a5ec4101451828d50e427630daebd39fc8f08b2d549f237979684c4d4645bd63d06e93efa830b3a68b86cf9c
 EBUILD qtquickcontrols2-5.12.4.ebuild 602 BLAKE2B d0045dba604a5e0dec74eb9d2445c38c7063236ded1671c0c0edeea83d56a12c48f41f4602d3556edd834350ef3490a3b33bda3db4193f79e50f5717553c98be SHA512 9e168a1e361e62310fa3032b41526a9679abb444343bb3e425de79e2e683c774238424141b7b4a9dd407f89e3c9df8840a62056f67bc40048e9b509b35c154bd
+EBUILD qtquickcontrols2-5.12.5.ebuild 602 BLAKE2B d0045dba604a5e0dec74eb9d2445c38c7063236ded1671c0c0edeea83d56a12c48f41f4602d3556edd834350ef3490a3b33bda3db4193f79e50f5717553c98be SHA512 9e168a1e361e62310fa3032b41526a9679abb444343bb3e425de79e2e683c774238424141b7b4a9dd407f89e3c9df8840a62056f67bc40048e9b509b35c154bd
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.5.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.5.ebuild
new file mode 100644
index 000000000000..4babc06b58ec
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}
+	~dev-qt/qtgraphicaleffects-${PV}
+"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/imports/platform/platform.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index bb790dbf3fcd..c08c7b694004 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,5 +1,7 @@
 DIST qtscript-everywhere-src-5.12.3.tar.xz 2674896 BLAKE2B 9f655989505c288d22c9d961e79227cee84ce4d91f6a61b7038e3b993da6f610c3703ad24b2146931c7d46b1765b60f73af8adea6d55823d0b973a99b61adac8 SHA512 4c4498acb39536bdc03643fb1717c7a47c82b1734cf67d17d40bc216084f01e837648d261f7f69e317387f9c6efa9aaa6b0df8f5532f55615252c95b1089ca1a
 DIST qtscript-everywhere-src-5.12.4.tar.xz 2675028 BLAKE2B 7cae53222aa776992c54635b9590b2eea7504905d033266b7f6bc18bea4a8bc74e0714f37ba3e0fba022c2b22d4e93982cb370311e25d9fdd7a1ac5f43110e80 SHA512 6d3b802c7cdfb270318b9210df4ad9dbd2d29f485d9194051dbf278a48c25cc5c6311adeaf56b4fe2a7746dbc10234544e75e61a2e9c86f653aed0a92e07e717
+DIST qtscript-everywhere-src-5.12.5.tar.xz 2675432 BLAKE2B 76c681e5d1e9311cd11a9701cab5486c80f61dd552030a0e0c4e0df5025f84d5d7e140bddee5dfb0de7f0ad1564b784f4267342e6fa355bd09feaa47b7541449 SHA512 a422e47873ddf4c84adf00f51b721465acedfac535b0daeede63eac0d41c6f4f07d5a5f86513c86e981f3a0024020be03730670befab2a20cd4d6564c98d6c90
 EBUILD qtscript-5.12.3.ebuild 685 BLAKE2B 6789af60ac1e20ad3221579bb3c0cb99a1316f8aa3609172e05f45987ceb12b8a078d2dbed5c6ea82f27a402adbb373544a26932ed2763b498da36e2c5a9a9ac SHA512 a1e5a4aa98dfb2d23900a50a6f7aa6e1024776b4811bf62536b16f8f63879aa1dc248dc7ed50622c5547a3cc78c12ae313737795f7fe8095b9860f3bc5beefe4
 EBUILD qtscript-5.12.4.ebuild 690 BLAKE2B 25c7c1faf3546a9eb5a082f3f75f6ab5bf402bb7e3d3acf886b7275e38aee947e3c3b70edf6072844b1b47c9f63b32ad545dac8014f4729bec2cb6d8fe690bc1 SHA512 8a441ae547dfe189615db68e85e0e7a9798d6315fadd17153af826d656f77e3f1726352d0273b9342b0d894cac28a7be6b3eee0c949b9628c6002ba2f4216668
+EBUILD qtscript-5.12.5.ebuild 690 BLAKE2B 25c7c1faf3546a9eb5a082f3f75f6ab5bf402bb7e3d3acf886b7275e38aee947e3c3b70edf6072844b1b47c9f63b32ad545dac8014f4729bec2cb6d8fe690bc1 SHA512 8a441ae547dfe189615db68e85e0e7a9798d6315fadd17153af826d656f77e3f1726352d0273b9342b0d894cac28a7be6b3eee0c949b9628c6002ba2f4216668
 MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/qtscript-5.12.5.ebuild b/dev-qt/qtscript/qtscript-5.12.5.ebuild
new file mode 100644
index 000000000000..c5092df8b111
--- /dev/null
+++ b/dev-qt/qtscript/qtscript-5.12.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="+jit scripttools"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	scripttools? (
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtwidgets-${PV}
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod scripttools widgets \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index dd2240ad7ecd..63c99791582d 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,5 +1,7 @@
 DIST qtscxml-everywhere-src-5.12.3.tar.xz 434176 BLAKE2B 8059a28cbd642089408077064bdb0df3d7018872c711283e11a1ca194b7c89d370bf54cbded67feba635c0190f52aaa96f75e6f63362b6af0c62f06246b439c4 SHA512 d515506d90ace5eedfe8bf3439dad0853dbbdbd36dfb509dfa13e3358838353de66d5f6245afe4eeebd19dd3f0ab0ce5e4c3e6fe5d40e5ab46763c453a562a49
 DIST qtscxml-everywhere-src-5.12.4.tar.xz 434312 BLAKE2B 0aafb4e34c7a15686c024fa0a24a472961cc9cc10afeb41723b241996dc24afa3234063cace84bc7d1e75e1ec2092a4f92f20669fe3634580c1d1a2d98da0139 SHA512 45bf18c1bece80120b2a8f81357afda86584ad5455a49b0db0658b4dd7f0a4ef53c7cc7ef8fff26842f476661b162752db7e8a48ed3566342ad0c1537d4ac8f9
+DIST qtscxml-everywhere-src-5.12.5.tar.xz 434260 BLAKE2B d518785715a01e70bcf40dcc37207211fb458a979d2d12dc2c52e1add31fd8de24127be04bde938a3e1bc2b6550afa864d946b5eba96b4b2a6f812d2f6a3c61d SHA512 23d340994af3e217ae58698dd0cd38f30d67d74a042d58cabbd0f38a6c13a8d64d6238cd6dee246ce0f99d5206bc210749941b88e5f745d3b92207eab06730b1
 EBUILD qtscxml-5.12.3.ebuild 375 BLAKE2B ab69ac92e5d96b97c453ced1b4b33bdd6f2ab23789a6d0d82a953c20540657a9512c50eed0b2efb0833709b6f09ffc98e0de03f7e8b4246492d20fc94f8c677c SHA512 f9f95312c4d6080c597236e82d65a4a3d825c70008f744f9d620eba2c9885599f54fae62fe0c15ccf427e83287a8cf0c7966408aede41956b6e8ff62b8a4a0c3
 EBUILD qtscxml-5.12.4.ebuild 378 BLAKE2B 22bc7e8239ec6fbb2e9c3bc391e8db9e9250142cf3f42d0b6d20b0243b69cd39a3d2baa2dae35c1fd8e56e0b99c652dd43df8fdb6516125a87448e3f4ae5b6de SHA512 9d726977d4826f78667710152b214199d70750212004dd2b29ad37756bb18314b4d44cd41686e28f477eff64864ed3d10e969104c4aa6688a21bb73b17685e58
+EBUILD qtscxml-5.12.5.ebuild 378 BLAKE2B 22bc7e8239ec6fbb2e9c3bc391e8db9e9250142cf3f42d0b6d20b0243b69cd39a3d2baa2dae35c1fd8e56e0b99c652dd43df8fdb6516125a87448e3f4ae5b6de SHA512 9d726977d4826f78667710152b214199d70750212004dd2b29ad37756bb18314b4d44cd41686e28f477eff64864ed3d10e969104c4aa6688a21bb73b17685e58
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.12.5.ebuild b/dev-qt/qtscxml/qtscxml-5.12.5.ebuild
new file mode 100644
index 000000000000..5fe2d2ce1fea
--- /dev/null
+++ b/dev-qt/qtscxml/qtscxml-5.12.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 1f2f0c86392b..525a15c94304 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,7 @@
 DIST qtsensors-everywhere-src-5.12.3.tar.xz 2037212 BLAKE2B 1f75ceea8fdf8e020e73f2cd8377ca13128bf9aafc71146ad96e7cb1f69df83af2889b5a5684fdfd0abb18553332cdda2f9d8753233ed743d0a136a625941909 SHA512 cf0c8c58bbb84debd6b464bd9b91af7e79a301031613b8a2d0715fa276573dafea0a1c8e472fa2a2d4debd9b26f86a5e6efa9a8d57f7ab9102b1314d609579e5
 DIST qtsensors-everywhere-src-5.12.4.tar.xz 2035464 BLAKE2B 2a64bd6c830087ce750286eb47a6dabb34786c6ecf6a20bc1c86d3d59252b610d47666afb387b2a6d4958341d2639104a89f9fed1e2d50885b1b438fef8f458b SHA512 39bc6b2a435dd54d574f6c19ccc15698f8ade3f2b64170baa3e0d0bd24f64bc16a9088620a6be41a61ed170bd84d4795bf2819b40a188c5c2255a54d0e466035
+DIST qtsensors-everywhere-src-5.12.5.tar.xz 2035484 BLAKE2B 037deb6b0d4420a7cf9d52fbae1d7957fb989a385c557eb6427868ec7940b85fb2898c2eb7fdaa96df43b5f4652659c578bf50d3e6073ac3c790ca7f651c05f8 SHA512 81ac74e4c0a3d1942393c9267bbcc50af0e04a6f163d566010d6053dc4c69a67395c3f4b7564a50ec84ac88a715edd002920be4e145e6bd23d082a021dee1e5a
 EBUILD qtsensors-5.12.3.ebuild 536 BLAKE2B 76d308647882ddd3ba5f69b79ac559bd69c887b9641a57b6a6959d6971fdcf1e8c6c64148489b9dc98c9d42590a0f60326425f6a6c7f5dfd08d19904c919222e SHA512 26bd4619b0e208303bfa3838ff78e6080dcf2764e5bf7012310ad818eb04e530145874031fb483090cbc5ebc8920dcbf1fc31d989c8b6f76f830b4b33131b050
 EBUILD qtsensors-5.12.4.ebuild 541 BLAKE2B f5704f92e9c70f9100784600f28b691127e0cfae036da0dca780da6e1f79b6f4954130a04b547b6444b1cdf0fd2670938020c891f421c842bd90688fbf8947d7 SHA512 78d591f7e2f8e0c36d2a2f8a1a4cd892ee9c6456564347d861f64c630870e1ac293e6ecce7efa02481563458afc597c2977ff0a40169175fc1a589e57c6b325c
+EBUILD qtsensors-5.12.5.ebuild 541 BLAKE2B f5704f92e9c70f9100784600f28b691127e0cfae036da0dca780da6e1f79b6f4954130a04b547b6444b1cdf0fd2670938020c891f421c842bd90688fbf8947d7 SHA512 78d591f7e2f8e0c36d2a2f8a1a4cd892ee9c6456564347d861f64c630870e1ac293e6ecce7efa02481563458afc597c2977ff0a40169175fc1a589e57c6b325c
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.12.5.ebuild b/dev-qt/qtsensors/qtsensors-5.12.5.ebuild
new file mode 100644
index 000000000000..2cf55ab96656
--- /dev/null
+++ b/dev-qt/qtsensors/qtsensors-5.12.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Hardware sensor access library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+# TODO: simulator
+IUSE="qml"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdbus-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick \
+		src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index 7ca626e5c84e..13337c643907 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,6 +1,8 @@
 AUX qtserialbus-5.12.4-canbus-missing-header-w-linux-headers.patch 1081 BLAKE2B 7c4ee33df12a74e947cfe682724faa096524e83e3b1d050ddc7c03c27bf21c9a5a72a44b4590e96346f04335464658cd122918ec0410edce15df5933ad4ef36f SHA512 50c36d47b388391a4805d8e055ec4294903af3b833fba348f77bf99f62bec52d3123155af6c83af174e14cb476cccea81240703fd6cb1ab052f211a43ca31c1d
 DIST qtserialbus-everywhere-src-5.12.3.tar.xz 328664 BLAKE2B cea2ebacf8a2ffc6e2f1c1ab54327a50199407ded0338d6bbfd0a3d8672106253bcfc307fd38d2e81acecd87ae69f093f516a52e0e4a864130c8491f596cdba2 SHA512 5f9d477780bfcba1edb4a11592ea6f3a2a1b2e42fbbce898e167b1975b14e93b3840789230e320869cbdb16e33eb76b45310cd27089f2f854a20ac3b7e18d763
 DIST qtserialbus-everywhere-src-5.12.4.tar.xz 328808 BLAKE2B 4a3ada386c256c4bbc9d584a6232568adfc705d69d3a9ed505a006b2c494333a75e0ad08210ca45f131cee8060afa380317574fcbed1c052825d168a4e650ae7 SHA512 7d302552780a08444ea676abf9d0503a10b12e976d9ea1c95b8359d16b190f5d75e409cd3c82e4bf711b9906dd1b183169e5746bf6dce65868332bdbbaa33394
+DIST qtserialbus-everywhere-src-5.12.5.tar.xz 329052 BLAKE2B 9136be5ca768d610c38aad83301f080ed3617f368c3431828e7d9340ebe26fac7332e1a65db0e02701c18a555f784f3e2b4308850bacda415cfffd90263a831e SHA512 bf013a1e052cb0011c05f5dd52757f4944c86f4bd61f57244ffa299cd443166a80d27493a0ec8e22dcff817e89081502f091736bd37a27616de933e51184b0f4
 EBUILD qtserialbus-5.12.3.ebuild 414 BLAKE2B 23c7ea63be8c4772057ce1dc65ffa7d8182e18aa7a3ff30714cb93ecda441628ea5e7875e941f7e87c907bcc1225334d2cf1ef47a2c4abf4ae8490717e80f3be SHA512 959c1ea2bcc708c31f05526afe89944c8c965df2a77a5e6ca79b464f11e9823efa7121cb8b43ae2e63c9a6fa068417e23cd71d0b5340cd689a7cd5990e140016
 EBUILD qtserialbus-5.12.4.ebuild 506 BLAKE2B 54eba7d020f01a30629dc607fa879a655c79386d58fca258995c5323afb8b5a4cf45c6352f42cf1e4ffed0b526d5c18ccc9ce0629c92879e4a9405de4929981b SHA512 8aa47356ecd7965fd5eb336bf7aee7903114e6cbed247d74aaee143f9e7e4bb96b5a1ae86968c77a96fc022f1a5497795d952fe5708ab9467defa80b266bd524
+EBUILD qtserialbus-5.12.5.ebuild 414 BLAKE2B ea1f322beb701cf9f49b3172c3e6e7ae5431db17b634554d85e82bb3ea3c39b5d0158d203e328694a98208237761894395344a9025bf36da9e40f4fb55f7bbe4 SHA512 6a11e2731daf1907b3c79502a8d578163fe44b0911bd3c419a5fe343c2c72008a361012dca0a934fb0803aa6a28a547e5b9f89b11d8900884879f8e2e3d11485
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/qtserialbus-5.12.5.ebuild b/dev-qt/qtserialbus/qtserialbus-5.12.5.ebuild
new file mode 100644
index 000000000000..4a031a9a92a1
--- /dev/null
+++ b/dev-qt/qtserialbus/qtserialbus-5.12.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtserialport-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index 8f1b2c8dbca5..23eb89e796de 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,5 +1,7 @@
 DIST qtserialport-everywhere-src-5.12.3.tar.xz 302740 BLAKE2B 105999b369422c4e819c85bdcb2899eff2af9c8486ea485bf89f6b1fbe0d78c8760b52e06942145f7a0ad54c0a25ee504d9b3833536af3cfd88a2efeebda5b31 SHA512 42551b74abe1fcaa1972fb1134215987d7c1d0fe73874a4c6ad5b9aadad71a2066a1846c297569bb1562f94e54a406e8074d444deca510a566e27cd386b47ecf
 DIST qtserialport-everywhere-src-5.12.4.tar.xz 302892 BLAKE2B cc04f0bbdb201e9b202f74eb3c40e60b87234937dcdd7593fd4558344c60d7987daf44809026ea25b314d3f3097e03d4c24bad0c91482619c408b9b9588b5474 SHA512 c51fa5eca92a16c41678eef37c3e33c6ea7f61ad881dd309548b83bafa3fedf191afc324437863dcf1a35dafc512363e7588f65136c07ad8f0d51c6854da178f
+DIST qtserialport-everywhere-src-5.12.5.tar.xz 302940 BLAKE2B fdfad2cc1b9dbcef179689b938ce734a28972f9a6ac9235c8d9068cb3d2fb32ae12269d54deb7fd7b7eec0af78ae1ea8098aaa678fd48dd102243c6fa40f51be SHA512 f3a5fb8c9a9513c16f52bd22b4fd4c6400819863237762f459d9f612ef2457447733cc8ed2bd645f182ab9eab6ddb5bcdbca2fbd67745def1a5fad1392087f4e
 EBUILD qtserialport-5.12.3.ebuild 545 BLAKE2B 5abeb3ab2d4f8182d8f929b11fee36b776df20ef0e3969397b28634caf5e8ddef0e2c325500d311601cdc0237957ab9b0fde1dc4fee4453c55cc2ce729f42bb6 SHA512 c6995d29faa31da6087718d68088ec4f1ab610bec0aef8c320728b53c386ade0bac2ee60269af350b024108034262c69dbf3bf3c980b311eff57ace75296036a
 EBUILD qtserialport-5.12.4.ebuild 551 BLAKE2B b2ab388e92267e96c580b051a90fa5077036d6a697ce6812a28e44369c4f51ea0a6f7b9976e847968f24b1bf4a22af6e693606d61069924395f076d2cf7ca6e3 SHA512 c64dae119e7e0a702f62491be652242d2c62b42bb72dce49a54424d7fe803ead96a18d48096847e383f75d6c8eac510e350dfbf6977622766a8eebd8c42c751b
+EBUILD qtserialport-5.12.5.ebuild 551 BLAKE2B b2ab388e92267e96c580b051a90fa5077036d6a697ce6812a28e44369c4f51ea0a6f7b9976e847968f24b1bf4a22af6e693606d61069924395f076d2cf7ca6e3 SHA512 c64dae119e7e0a702f62491be652242d2c62b42bb72dce49a54424d7fe803ead96a18d48096847e383f75d6c8eac510e350dfbf6977622766a8eebd8c42c751b
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.12.5.ebuild b/dev-qt/qtserialport/qtserialport-5.12.5.ebuild
new file mode 100644
index 000000000000..78e261c288e6
--- /dev/null
+++ b/dev-qt/qtserialport/qtserialport-5.12.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Serial port abstraction library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	virtual/libudev:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# make sure we link against libudev
+	sed -i -e 's/:qtConfig(libudev)//' \
+		src/serialport/serialport-lib.pri || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 8a88911d66a3..960213daf9ac 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,5 +1,7 @@
 DIST qtspeech-everywhere-src-5.12.3.tar.xz 99828 BLAKE2B a48006c84240091c09af185a6cb6b8df732f94452b92d734d4fb7383966d1be04dc0582c366014f7b75deb2d07c54b275adea3bfbb8d307d2dd1056e4d08c94e SHA512 9623a83cdfbed07dffcd8f0808c2a514c97fda72b68827d917f1a8ee3072286ef8bce06b114db94d7a0c3fc79425c2540fa5cadc6551367fd4431e5396395932
 DIST qtspeech-everywhere-src-5.12.4.tar.xz 99832 BLAKE2B bb05657bd78d6540d118abbd80e3f60f92c5c1f0a288434db4cff81c4bc8b219af0c00fc13446da5069795492a53b18676ead46b97c0513f88b88aff70c53bf7 SHA512 85f77f32d2a3fc28262fa0af2dc1ff13c572835bff8fef3a79b4af0efdee0fc325754e1803d98ce25042fd717de28f3ecb3cc916de729cbb267c14be136007a9
+DIST qtspeech-everywhere-src-5.12.5.tar.xz 99840 BLAKE2B b60a19bff4aad801d513ad7eff45ebfabedda18952e48137683ed15ab6f9330a8e41f195af9a6f6f06fb839f8a0338d26e6d7ae1bbf0aa92d6c00613c41b3095 SHA512 2a1a2c86ee3b5501623bb0c2c8e5b6f96b353707fe0eb804629187899eca5952c665ef037c4257f635edf34ddea03bc686f472a4a346d9f8e2adc7479f640482
 EBUILD qtspeech-5.12.3.ebuild 433 BLAKE2B 9a12396f350c87c414e274ad1ee1fe21dc23c5003939c8f6894af04ba67075919f5c53fb0d3738f52573d930e91b750a52bdb90c8cab8fcf1698194466871108 SHA512 fedf5f8b6efb57752983a99c6c788ec0c9dc094bf98635b8f7bd71f0f2c9792d0ab02a1e38fa48aedd7327785d13daaf12ea1ffae072ff8f2a7a0028e9016aaf
 EBUILD qtspeech-5.12.4.ebuild 436 BLAKE2B be06cb67dbffeaf86db8e65ee6575d909c6dfbfae5882442582fc1ce3d179b54ce0f1995689ad4e94da6a79cbcf3c2f4bbda93e590dd5920f477651fb679851d SHA512 b4b9468e762a633c034eb06aa481dfaddd58865e422caa99dd1e458ca50f3b5c20bd42e876e1864f3d872a7ec934e32ebf4cbc69ead0ba98524cb6b9fbf5c03b
+EBUILD qtspeech-5.12.5.ebuild 436 BLAKE2B be06cb67dbffeaf86db8e65ee6575d909c6dfbfae5882442582fc1ce3d179b54ce0f1995689ad4e94da6a79cbcf3c2f4bbda93e590dd5920f477651fb679851d SHA512 b4b9468e762a633c034eb06aa481dfaddd58865e422caa99dd1e458ca50f3b5c20bd42e876e1864f3d872a7ec934e32ebf4cbc69ead0ba98524cb6b9fbf5c03b
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.12.5.ebuild b/dev-qt/qtspeech/qtspeech-5.12.5.ebuild
new file mode 100644
index 000000000000..17f8c70c3c51
--- /dev/null
+++ b/dev-qt/qtspeech/qtspeech-5.12.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Text-to-speech library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+# TODO: flite plugin - needs 2.0.0 (not yet in tree)
+IUSE=""
+
+RDEPEND="
+	>=app-accessibility/speech-dispatcher-0.8.7
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 44b9caf52adc..1b44a75383e1 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,6 +1,8 @@
 AUX qtsql-5.12.4-mysql_free_results_when_qsqlquery_finished_is_called.patch 1436 BLAKE2B 24fa12fb72f862f8f8cba401bf773b91c74dd9b0af7a7801ee3b2298ff5176981833ffbf47b4d565bd0cfd71bff9735689ce4c5dd67ea6349458af78e37dcf3c SHA512 ea8fc7333dfd966d8b850b46f83906daa508d51294e8cba19553520f0583864c86f5319627c31cb633d2dc3ef22ad1873801b780da28ee786ae3bb91a10e478e
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
+DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 EBUILD qtsql-5.12.3.ebuild 1248 BLAKE2B 5e882a4eef1c1642aed15d9c56cf2947a81ecc23434d9553d193efde1c9bf0b6f0bc88879a844d889003bbd6d0a4051fe50318feb398d2a12a01072206bc2296 SHA512 57fb3698b7a451206507f7d43358c3e2e3a1ca92a07b7000781be7bdbdecef395a0088b979a3599ef56ed95df3b55c484644fd1772d4b500e7fc4144d2937b8b
 EBUILD qtsql-5.12.4-r1.ebuild 1375 BLAKE2B b9d86e57a064211b7a4ed9a66490c10c1bcd2f89c9fb42e52c9221a345de372db00059cbc13691f5dc6661b8194032353011e5b9fb08f424e753407c9de4aa08 SHA512 fbbd9791fafa46ffa51e981b6e1c61f4a25c319e9dfdb07fcf97851049fccb792dd629fd944f939ac475e1c10fa18cccd99dcb54f094bbfacea4526b0ea818a6
+EBUILD qtsql-5.12.5.ebuild 1254 BLAKE2B 614f00cb5d8d9c8a9a42340e6c01f3ee684527f5a5b3336fa5666adad630a51bc39889820592f0f104c00304d3bef75e23ac536760a369226636b95c94e97283 SHA512 342c4dff5f1f6ed4a2b5824213427c5f4a2c310bd1a16a933d2cd1ab1eca9a5d03d442a5569b19915a3cb32f733a645adf0f946b6fb306e1a5be7654e5aa1615
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/qtsql-5.12.5.ebuild b/dev-qt/qtsql/qtsql-5.12.5.ebuild
new file mode 100644
index 000000000000..ba9ab526b7ec
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-5.12.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="SQL abstraction library for the Qt5 framework"
+SLOT=5/$(ver_cut 1-3) # bug 639140
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="freetds mysql oci8 odbc postgres +sqlite"
+
+REQUIRED_USE="
+	|| ( freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	freetds? ( dev-db/freetds )
+	mysql? ( dev-db/mysql-connector-c:= )
+	oci8? ( dev-db/oracle-instantclient:=[sdk] )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/sql
+	src/plugins/sqldrivers
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:sql
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin)
+		$(qt_use oci8     sql-oci    plugin)
+		$(qt_use odbc     sql-odbc   plugin)
+		$(qt_use postgres sql-psql   plugin)
+		$(qt_use sqlite   sql-sqlite plugin)
+		$(usex sqlite -system-sqlite '')
+	)
+
+	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 287f0bf71c08..5e3466226573 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,7 @@
 DIST qtsvg-everywhere-src-5.12.3.tar.xz 1859680 BLAKE2B 9ee0a2dbde09ef19fc72285f5ec9b865fd65c23bbecc4fcc8969a5f84bbe31818a086e066f32873e0cfd82aaab4a077660eabd2cbcc7494e84949c64b4a99740 SHA512 23517dbdc30d7128fcbeb12a301eeeb300424bb17bc0d156d5e9298c092d3d3afd2cba45768f2512e58977ee2408450f50c385e03a47ccaf3ff6bc7e4fddf61a
 DIST qtsvg-everywhere-src-5.12.4.tar.xz 1859476 BLAKE2B 60de8594c157b914bba80adfd54292c850975939413a2ccfda19f3bafaf26862bd49225006f04c1e426f7928bfbc91cb4398a46eadc6883d97b3194a20ebb884 SHA512 40d7dc82e0acde52e1258e1b1753cc93609c31cf69057c52dc2dd30dc59f2d7d434e20fa4f7f27db3fa300fd3c8f23a8fb03cc26b27cc1c02cc3bf6d97383503
+DIST qtsvg-everywhere-src-5.12.5.tar.xz 1860340 BLAKE2B 51162f36eb7a645d5670f4d425596fa4fe96d5149833074ab1147ccb0b6ad603cf00a45b116f09beb1c692c071248c5a425aa3f4948e0dc4af4ba131537b795d SHA512 3d7f89d106b36c8a0fd04c6e6f0ccde0c50ced7192980ea7d9330ba73d9307559e60ed2b10c28481a419d19aaae6609bde9e1dd74ccedf340dacf0194a60429d
 EBUILD qtsvg-5.12.3.ebuild 463 BLAKE2B d3b267cedeeef6751f2ca66df09b1ae2aa2c4321ef1773e634524d3d67a242deeb8a259a710c1b92c7e1f9c5e5f1627550da1cb69e383c972ba261284e3df9f1 SHA512 3b4d704449a10fa387c6c8432d474e74f4d7813888dc7dc330bc354bb7102b04ae42b21a73bc1361712a3500bd890b16307a6072de9c4940dc6512d093c5c08f
 EBUILD qtsvg-5.12.4.ebuild 469 BLAKE2B dba8d19a87f8aa293ad671321fd6fb2b74078e92fcfb75579d846773bdd93cbe0e294db53e608963d3d68a2049a8a5c388674cc7aa3c98e8e867cabf024bf224 SHA512 39252942569a42341bff72d33b069acf32f676c05d67c1050f34c4c4bb335df262fbcb42359a4131accb52a65c3b6106576cb1a1dfb8c1edc32ffd368ecc125c
+EBUILD qtsvg-5.12.5.ebuild 469 BLAKE2B dba8d19a87f8aa293ad671321fd6fb2b74078e92fcfb75579d846773bdd93cbe0e294db53e608963d3d68a2049a8a5c388674cc7aa3c98e8e867cabf024bf224 SHA512 39252942569a42341bff72d33b069acf32f676c05d67c1050f34c4c4bb335df262fbcb42359a4131accb52a65c3b6106576cb1a1dfb8c1edc32ffd368ecc125c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/qtsvg-5.12.5.ebuild b/dev-qt/qtsvg/qtsvg-5.12.5.ebuild
new file mode 100644
index 000000000000..943bcaab907f
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.12.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="SVG rendering library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwidgets-${PV}
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtxml-${PV} )
+"
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 26485a7b40af..b17037a27702 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
+DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 EBUILD qttest-5.12.3.ebuild 547 BLAKE2B c7129416b16ba043b8d4a474ff1fa552bd9855ccb4d4f1e2e29cade16afd909d648772d1c2974a047a5fa6bcd76ab2255d278c01362e4987f576d6cfa595afb4 SHA512 f3105c5fac5e028434206a7045b611b0fb0b808db1a9b4c2a4e1d1f60e5eaa2efc650964d0dd44d6b3c1cddf36258e23c04dabd6cd428b07889eec00c51182b8
 EBUILD qttest-5.12.4.ebuild 553 BLAKE2B 06fd4170d4d44fd894b6825dcc29cb4cad275d6a8fa9ac36be6fb032093efc442653bb9478a02c593f499c843d08875ddf0491241f8c0cfef2427a56f5f9b325 SHA512 af250b0f8f4805989bfbe6a2432c7a186304570681dc772717a30ebe36953e90d7c8a8e73dc3fa5841d44974f822dac5ff3f472d903b4a42060853816cbd75f8
+EBUILD qttest-5.12.5.ebuild 553 BLAKE2B 06fd4170d4d44fd894b6825dcc29cb4cad275d6a8fa9ac36be6fb032093efc442653bb9478a02c593f499c843d08875ddf0491241f8c0cfef2427a56f5f9b325 SHA512 af250b0f8f4805989bfbe6a2432c7a186304570681dc772717a30ebe36953e90d7c8a8e73dc3fa5841d44974f822dac5ff3f472d903b4a42060853816cbd75f8
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/qttest-5.12.5.ebuild b/dev-qt/qttest/qttest-5.12.5.ebuild
new file mode 100644
index 000000000000..3003c2e7e412
--- /dev/null
+++ b/dev-qt/qttest/qttest-5.12.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Unit testing library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? (
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtxml-${PV}
+	)
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/testlib
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:testlib
+)
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 649346c0b312..f195eac448ac 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,5 +1,7 @@
 DIST qttranslations-everywhere-src-5.12.3.tar.xz 1375832 BLAKE2B 5fbddd0a1aa58f367b4089dd6560e6251451e623c5e81078ae428a9420386bb6ad60402b6538d4a4004ec28f84df78896e73df81abfae64cd4ddec1c18fa1cf8 SHA512 76e31a3c6a6824666b2f49d7fa0ad6e604f4a8fcb408261cfeb7baa213fc2f54c1382f677c824f47e7a629776637c699fbe215eecfbce85c3ce621c3de9b01ad
 DIST qttranslations-everywhere-src-5.12.4.tar.xz 1383576 BLAKE2B 7c8ebb2e5fc350fc024cb228d0b696de5fa7ba412efcdb5f6279577d5462716a22baa8ae95795ca79f9525fc7507a08aa5a49cb549bcaeb3c885aee6061d967c SHA512 05046918e0e2d6377a462f034db1a4d7aeeedf952fef3db943a6e525c16d7ff3c93f2da78846e9662c85b515e46e464c81bd474e639d8c2deebe808e467e6d91
+DIST qttranslations-everywhere-src-5.12.5.tar.xz 1377740 BLAKE2B 7940ee5603001e9aa3ae946694f916a4c193c069b2ff6cf2241fdbe2bb6336f9589adfe31cc8ce95bdf44fcf0c9a99e16a567a873aca6683f3d2e6566d6812c4 SHA512 a2120add3b82fd84d44a064f08c5e781410c86dfd5eee39a01f44840063be5b4030c47989a2e6a413c4298d79b473f50968078a12793b9145d7ee8a722fd1698
 EBUILD qttranslations-5.12.3.ebuild 384 BLAKE2B 936f621a60118abf3b0af95845c5fed4746b051288d7f3bbfd694b676f115ff6f76908e2449142b216aae6569989a71b63d4e522f14c99735f6be80f97636cec SHA512 718ebdfbb4502713b7c4f13a25b5e056f12b2dbc52def64dc8787a2508861ffe137021c511a28d7e25a198db72ec4521ebc1fc23fb4cb7d57976787d73fca67a
 EBUILD qttranslations-5.12.4.ebuild 390 BLAKE2B 2a683b4a792e4330c9436781339600324c3e7b630fd0d45f38cc19ce7ad448e6e0c9f2b38f56573e74599293e37f4adfe332e23498a0cc9563f269dd20bfcb6b SHA512 23e51e6814a3b3aadce4f6697535f947f5e94044efd435a97f208aad0ee381822ddb8f449fe4857daf5b399395e1828ff589413d6eb44dc96961555c53aa7ae3
+EBUILD qttranslations-5.12.5.ebuild 390 BLAKE2B 2a683b4a792e4330c9436781339600324c3e7b630fd0d45f38cc19ce7ad448e6e0c9f2b38f56573e74599293e37f4adfe332e23498a0cc9563f269dd20bfcb6b SHA512 23e51e6814a3b3aadce4f6697535f947f5e94044efd435a97f208aad0ee381822ddb8f449fe4857daf5b399395e1828ff589413d6eb44dc96961555c53aa7ae3
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.12.5.ebuild b/dev-qt/qttranslations/qttranslations-5.12.5.ebuild
new file mode 100644
index 000000000000..43701fa14908
--- /dev/null
+++ b/dev-qt/qttranslations/qttranslations-5.12.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Translation files for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/linguist-tools-${PV}
+	~dev-qt/qtcore-${PV}
+"
+RDEPEND=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index ce1722ad5120..f73abeb594e9 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,7 @@
 DIST qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz 10916144 BLAKE2B 871db74b3540980d4392fa49d77d60c33f5cbd7840cd41797c168c324f9ba46214cf31154cafec9714c17b784c0ed543f5498146cd3c71228c320fd67792735e SHA512 1aa00fec7e333e4fd52891b82c239b532cf41657d9c3f44c6cc1c211a1412dbf5584823511e54f3feb33b3fed9c6e0171b55afde2df9f0a358e2e4885e1b2686
 DIST qtvirtualkeyboard-everywhere-src-5.12.4.tar.xz 10915036 BLAKE2B ebc8511c1987a5a517e5f38aa536a8ec948609b4d56e5f84dbfc92713edb976b15f27cee97199f3c26fe63f77446d1b6393016dc94ce79d3749c03a69466211b SHA512 04960c475a01f65901279fdab352742e4dc77753a306c7bd9996cf32be4a63524e7be034d60b398c6862c0099b02eedcef89f28fd09b1c7fa3075f89adba5a7a
+DIST qtvirtualkeyboard-everywhere-src-5.12.5.tar.xz 10911944 BLAKE2B 3a8b8b8370d182e95d88262679747452418c0c74b104daf42a7bcabc3c816ad97447acb1250ada84b72bf7cfe08fb55dad7037c1c91d99a3f9ed97a5176d4450 SHA512 e4581673451c40bf39b9793b0131bbad29e8a3f9db2d42adb23b48847bd674b6820717c051b76e506d4fd52e87c79b042533be85285a0cce9bcdc49cca964e66
 EBUILD qtvirtualkeyboard-5.12.3.ebuild 1211 BLAKE2B 00791d3195d83c4694b2db0a7fecadae34a458461a3a07bf69c9b1783afb7b661a8069892670ea5f307a62ef91234c0ab379b3b4c538211e0a10e55d41ccc91a SHA512 e3a2c47d0158790df8f2338e23367e98eca98f9fb04a2568b896568b4e7e3184fb91e0abd3a7cbdbd05220463fc05cf2bd832fc086e8800db9e1dcdc6e3923d1
 EBUILD qtvirtualkeyboard-5.12.4.ebuild 1214 BLAKE2B 33c3a8f0e9a3480538670c1c20fdc5de81acf3c9c41ad71d5a262bf728d44795493010725a743aad258e1a9706ee984a13575d1bbb8ec12fb96b6738932e3a70 SHA512 b632fca360db011d58979d14daff04b2a76f58efea4d30af965e7819951efdc5515cc5bf57063bc49b1d8bb8587e11e2b5f408a942875e6112759b47a1b75159
+EBUILD qtvirtualkeyboard-5.12.5.ebuild 1214 BLAKE2B 33c3a8f0e9a3480538670c1c20fdc5de81acf3c9c41ad71d5a262bf728d44795493010725a743aad258e1a9706ee984a13575d1bbb8ec12fb96b6738932e3a70 SHA512 b632fca360db011d58979d14daff04b2a76f58efea4d30af965e7819951efdc5515cc5bf57063bc49b1d8bb8587e11e2b5f408a942875e6112759b47a1b75159
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.5.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.5.ebuild
new file mode 100644
index 000000000000..0fa27800a02f
--- /dev/null
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+fi
+
+# TODO: unbudle libraries for more layouts
+IUSE="handwriting +spell +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtsvg-${PV}
+	spell? ( app-text/hunspell:= )
+	xcb? ( x11-libs/libxcb:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myqmakeargs=(
+		$(usex handwriting CONFIG+=lipi-toolkit '')
+		$(usex spell '' CONFIG+=disable-hunspell)
+		$(usex xcb '' CONFIG+=disable-desktop)
+		CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
+			lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
+			lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
+			lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
+			lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
+			lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
+			lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
+			lang-uk_UA lang-vi_VN"
+	)
+
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 3cf0a9c4f4bf..b2bce77eea50 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -4,6 +4,8 @@ AUX qtwayland-5.12.4-client-reset-frame-callback-timer-when-window-hiding.patch
 AUX qtwayland-5.12.4-fix-stuttering-when-gui-thread-busy.patch 5579 BLAKE2B 70113b9f5e9d8bbd0920f1222cd741d906c86f007a6cf3a1c26dcace2f3d277988969fc3e9375271b9b0be340e19e085e5a7210ae92354f185464a82f0b72433 SHA512 4aecb65f51c3c30a3acb92ff3284fe33f1cb73f53130eef1dfe530f152776e873fb4833b950868ad4c7366d2cf22c5fb8d4f7b551925f1cd114f5ad9b44cf19c
 DIST qtwayland-everywhere-src-5.12.3.tar.xz 432304 BLAKE2B eb2ba520c651467c8ed5f0d870a69c9b07047cb4c05a0c889b36abeab30149861b83ca693efb0bb93dce4f5da5913afc3c8b61933ef0e8307d22b64fce530d87 SHA512 e66f9f41c15cf84165e559a1ff09e20ec21bb3f909b57fab08b0e3f8f9eeacf75d49541b499b1a6514a34d1ba5dd426ec1ce77719910588afa12cb3a7980dc90
 DIST qtwayland-everywhere-src-5.12.4.tar.xz 434076 BLAKE2B f034080ec3ad8281c10edcdaa56bf2bcac2ea0002bb2b4780fce40cc28bcf30db713c736916f3382aa7ad0418f5ac424064d675c7001968378487d9cb40c619f SHA512 f3fd6644d7fa21ef042ecda807f6ede7853944de8908f8d390f0ebec258406ff4a4f3bfbb382b57a7a4684e19906b79b43c920f55c5fda75bacfc9a96fafa301
+DIST qtwayland-everywhere-src-5.12.5.tar.xz 448064 BLAKE2B e9ec631d1ec0f19cc5ef9f3c9e9e12d327da8ad896e40bb172b98191947ff20ba33b0fc747a9009d4d9147dd1cdea2d5376a12f25362bfa499eca6d0c838f2d2 SHA512 19e19b3d6226839856f8e8792665eda1f09f0bbf95a38077bdf2831205ee09254c8df6a521ba3f5a228bcd98c4d1929a2bd9e9aa2f6f14c218d4d7458d1a866c
 EBUILD qtwayland-5.12.3.ebuild 1137 BLAKE2B 91803151e658e54b23668c5ae4d387a2510d26ae42fb204cd6b5e3fc9649293ea90da44cb4243c0df686d42ba29f5b4875b9c2fc193e87a3e53f9bb1d5373996 SHA512 83d2ae87f67d4937bfbe1d24ac621afe0134c307479660e35aa4a4195b8879b6e891432c7e4a93e8822ea7b44c7a024c6cf38504526dba3ed9d4bcaa33b2ac48
 EBUILD qtwayland-5.12.4-r1.ebuild 1446 BLAKE2B 1b10ce32f1b410c1864d06f0e7fb91d16d65882d7a0241442e6e9610a09cf28660439603062de5a221554970f14f60e8b995e205f8c53d0627041b828221ae05 SHA512 e0e8797eda3ddac09fe0b42560291a72f2c782ccbd720daa9c0e3eaaaace78521d664758b32b1a804319f5b4cb61ad07b786bf211fcf9ff7151e85242afbda74
+EBUILD qtwayland-5.12.5.ebuild 1142 BLAKE2B c8c396f29cddee68c7612898769452304f3887c2c8d6037a321156fcf145c9d179eb5fc15bcb0012454a2235cfded99f0fb00ede1b8436ce699c692924b280af SHA512 26335eab9d60c8612d79d4462f3512e9b98607b756be06130fbd9d6c0b3eddb46372bc50fe410f5354d205ca33b73a5b12b1a186f8d1b03960adf1a1a3f02c1e
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/qtwayland-5.12.5.ebuild b/dev-qt/qtwayland/qtwayland-5.12.5.ebuild
new file mode 100644
index 000000000000..ac4fdc112362
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.12.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="+libinput xcomposite"
+
+DEPEND="
+	>=dev-libs/wayland-1.6.0
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}[egl,libinput=]
+	media-libs/mesa[egl]
+	>=x11-libs/libxkbcommon-0.2.0
+	xcomposite? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_config libinput xkbcommon-evdev \
+		src/client/client.pro \
+		src/compositor/wayland_wrapper/wayland_wrapper.pri \
+		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
+		src/plugins/shellintegration/wl-shell/wl-shell.pro \
+		src/plugins/shellintegration/xdg-shell/xdg-shell.pro \
+		src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro \
+		src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \
+		tests/auto/compositor/compositor/compositor.pro
+
+	use xcomposite || rm -r config.tests/xcomposite || die
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index f836e31ded10..888c5af7d514 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,5 +1,7 @@
 DIST qtwebchannel-everywhere-src-5.12.3.tar.xz 182808 BLAKE2B 03b1e906e4697844e27a9f4fa7c74bb9df228d31c85071299645ff5441577f749b7019097ac9021f3dda02ca290aba74d3494adfb9b04d8614c82586abbf399f SHA512 2dda4351f5f3a5895a955d0ee77e55f758233672005a068d3e840a01d379727f99287fc6c8fb96516f23a5a8c4ebcb61098690fd3351e79be608e28657534006
 DIST qtwebchannel-everywhere-src-5.12.4.tar.xz 183056 BLAKE2B cace515cd75f68d707ac7b8b1932cc224f0924b07f3745d38ab4a2ffe90e3a617b91d0404dd3c43901fc4551a5e872642aed09aa299f45f4449e02993f8c001d SHA512 956c57c019623a2ccc4b4a7fc8ca2404a04862b7a3fdb8d1317dfd0d24d00f73db4698df22a9758667256646129163ea1b3a588435aa01f28e72e35300637458
+DIST qtwebchannel-everywhere-src-5.12.5.tar.xz 182944 BLAKE2B ec2433b839407dc6f46b479f2737881fbaccc52965c655986dc9745979d681476b5fc717e3a4a8bbd2c27edcbb1ec0e9239d6bb06fc3ce8b7585811c0e2bbb21 SHA512 8ea543f29e8f686961b033c1246714b1535d0be730026bef4b4ee172ce602c706d8a16b8391510a302df7be6545007a2f42311eb1aea4da326c3addde16ca2b2
 EBUILD qtwebchannel-5.12.3.ebuild 564 BLAKE2B e0e73501655d9cc42261f677c010d28ecae174b3cffe037b23750f4cea225dd9f537f9853f9938f496934effba0ddb3f28aef285c9156a66293c5de05e3afcc7 SHA512 d563ad6a91f3b685b557585dbeb46dec7021a75de14d12c09b14f7c5ebc68a96d42539172ce267e71a9411e46441d3e07b5b22f327e267f25c6f40b9e196b01f
 EBUILD qtwebchannel-5.12.4.ebuild 569 BLAKE2B aa915425f8611b2fa0b9521f7309638f3dc3073b86ac7f71ac2b021179aa402ba9a14e7b78142ce765801ab01770ed381ae8024654eb96c6c42598f73423b884 SHA512 f34f54aa592030c8bb54f4c912c2fb28e689650ed73e836b65e6b566a0c3ee04fd5b87b6df6609e06a74a94fb63dc970bde561ed0fce0c9dbd07d96cfca33e18
+EBUILD qtwebchannel-5.12.5.ebuild 569 BLAKE2B aa915425f8611b2fa0b9521f7309638f3dc3073b86ac7f71ac2b021179aa402ba9a14e7b78142ce765801ab01770ed381ae8024654eb96c6c42598f73423b884 SHA512 f34f54aa592030c8bb54f4c912c2fb28e689650ed73e836b65e6b566a0c3ee04fd5b87b6df6609e06a74a94fb63dc970bde561ed0fce0c9dbd07d96cfca33e18
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.12.5.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.12.5.ebuild
new file mode 100644
index 000000000000..24910e034fdb
--- /dev/null
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.12.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick src/src.pro
+	qt_use_disable_mod qml qml src/webchannel/webchannel.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 8c6be1d95d6d..968ef0f4076d 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -6,6 +6,8 @@ AUX qtwebengine-5.12.4-fix-should_override_user_agent_in_new_tabs.patch 1429 BLA
 AUX qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch 858 BLAKE2B 4e29db8a650c5babc64b6c17dd0669a4fbdf1a200e2a7dc7938acba665ceaa051eceb07e80159cf23ed7df455a520a5966a47a61b59fe5b449e37af7597a16ca SHA512 f6835ddf259455ed5383be5c16a9313e64121810398df74d8658ba2da5866cf6ffa079d57b2e055d79b9c7eef15e504c19c107f4b09764354de94fb6b5d0bebb
 DIST qtwebengine-everywhere-src-5.12.3.tar.xz 249275648 BLAKE2B 7d2404084a510c62b638dd09736130eeb40e494f9594339afc7df6628878aafed778a2785f6848702d51b3a4ef1dc8b333d5e5eeeeb8f930b4da839eb70bc175 SHA512 5b500ec6653aa6ed70e7826fe394f95c7932eaea5b1b48f6342a6f18294f75e4f954959fa2f42de0685097679389245d2bc80454e8eea202fa18a326d6d5a9a5
 DIST qtwebengine-everywhere-src-5.12.4.tar.xz 249328292 BLAKE2B e76d4f0c7081bd4ccbfb8a7eba6e0ef8280b4558bf545eb76bcf87ca03c79912e9e095f7bbdb30693f6ffc2dee61db7a4308cc072d92d78773082b3df238d0b2 SHA512 312c584222ed5e7183af2be8a4f42b84c7fed18c3d4b080bc32bed1bd5c7dc88c9752deaf7afc1b4d9fcd02c8c8a013d32d5be2e7635fec2c085cdbe81998de8
+DIST qtwebengine-everywhere-src-5.12.5.tar.xz 249295448 BLAKE2B 3bbb9ea44ed58127a251b0dc5bd2681b9efbe4709b0c493940c85cedcbf668fe58ae2440c4afbb1e579cd69e504aa7efedd44519823ffed40444d8b3382362e8 SHA512 b485d37dca14f1cf4adf01bd8b1ae52c1d4916d7acf6ed210bc9feaece8efc2aa6cee8a3ef9174b50b767e373379c6a18d14db4426ac53a8c27d2d7b222826df
 EBUILD qtwebengine-5.12.3.ebuild 3542 BLAKE2B a230a593aa0a95c94696d4a6590b1794d5c4d9f44793738d88e430225e199e48fc86692866c521cec4e304544a5eac5730ca5dbd734358d690a908d9bfe4fcf4 SHA512 ce2e2d11960cdfc6ad1997c9e749e503f17d9b7b07b2b0c793664f17fa53b36c2ed23d416e939eeae39a3e4f834c58d24512d7936af8081b4d3e127127cc455d
 EBUILD qtwebengine-5.12.4.ebuild 3603 BLAKE2B 1c974b639f15c66438e3733c922e6dfc397b7ec7f171a6e6cc5e5a3cb4d58666737c8d020c54069c864101e908db5a1b56f0dd3077b0a5d6f838442e24294219 SHA512 331b5ffcdb6317925f0f1d6a930efe655e7a19e01aa1a3570d913c53a523d2f2209b826835a6e459da2918a66430cd821a58d23e981319dabcf42ea77ec0e852
+EBUILD qtwebengine-5.12.5.ebuild 3419 BLAKE2B 70dbc7ed63f73737a15b22dc5ad71cf4aa5194b136454c24947a66ef7eb928cc54946377c23e24e883de28de648ef8f5536d96e01d825ecd0cb98a76d4307e38 SHA512 f499ffb7616247c6d959c6fa6853cb67aa451a860e86e39c9c989a476fc0c4b87f25e4c10b2c34e6597bba9b407597b570f3a70b1e9aef09333c2ec4b03b76f1
 MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
new file mode 100644
index 000000000000..b4df6e1f7ec7
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+inherit multiprocessing pax-utils python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
+	+system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
+
+RDEPEND="
+	app-arch/snappy:=
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtpositioning-${PV}
+	~dev-qt/qtprintsupport-${PV}
+	~dev-qt/qtwebchannel-${PV}[qml]
+	dev-libs/expat
+	dev-libs/libevent:=
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	dev-libs/re2:=
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/harfbuzz:=
+	media-libs/lcms:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libvpx-1.5:=[svc]
+	media-libs/libwebp:=
+	media-libs/mesa[egl,X(+)]
+	media-libs/opus
+	sys-apps/dbus
+	sys-apps/pciutils
+	sys-libs/zlib[minizip]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	alsa? ( media-libs/alsa-lib )
+	designer? ( ~dev-qt/designer-${PV} )
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( media-video/ffmpeg:0= )
+	system-icu? ( >=dev-libs/icu-60.2:= )
+	widgets? (
+		~dev-qt/qtdeclarative-${PV}[widgets]
+		~dev-qt/qtwidgets-${PV}
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	dev-util/gperf
+	dev-util/ninja
+	dev-util/re2c
+	sys-devel/bison
+	pax_kernel? ( sys-apps/elfix )
+"
+
+PATCHES+=(
+	"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
+	# QTBUG-76963, not yet upstream:
+	"${FILESDIR}/${PN}-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch"
+)
+
+src_prepare() {
+	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
+
+	if ! use jumbo-build; then
+		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
+			src/core/config/common.pri || die
+	fi
+
+	# bug 620444 - ensure local headers are used
+	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+
+	qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
+	qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
+
+	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
+	qt_use_disable_mod widgets widgets src/src.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	export NINJA_PATH=/usr/bin/ninja
+	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+	local myqmakeargs=(
+		--
+		-opus
+		-printing-and-pdf
+		-webp
+		$(usex alsa '-alsa' '')
+		$(usex bindist '' '-proprietary-codecs')
+		$(usex pulseaudio '-pulseaudio' '')
+		$(usex system-ffmpeg '-ffmpeg' '')
+		$(usex system-icu '-webengine-icu' '')
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	# bug 601472
+	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
+		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+	fi
+
+	pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess
+}
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index a526c418525c..ebb26f7ad526 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -2,6 +2,8 @@ AUX qtwebkit-5.212.0_pre20180120-cmake-fix-pkgconfig_deps-spelling.patch 4466 BL
 AUX qtwebkit-5.212.0_pre20180120-fix-pkgconfig.patch 1164 BLAKE2B d0d12652387ed24a21548746687fb4689d3d9198e66ba5bb3fa6ec3aeb83db610f5f9e9910ec6c5f240ac6a0f2af855afa4413f971585588fe0d9bd6b718203c SHA512 52f34491d15cc8ca381347427cb440788f8ac6d7d8e52bab067fe997e321bd9e693c9d48669b6bbc23f060c9475d25563496e368b7a94198aff25a21a1491e3e
 AUX qtwebkit-5.212.0_pre20180120-functional.patch 723 BLAKE2B dec67933a798f485e59ea87fbcc2f9475f426427cbc80dff39808b48bcf4dd74f802b648db11f2611e85364e978f55eab029e09c7c88d9524a961bb6627682c1 SHA512 7f54f26a18f91ba7dd71e1c82c22533b13707d045c0d693c4102bd95c9a77ba74678c90394ea65816e9fa80845d46735d7c8b178e1b5ad34e6214e9a5ae8947f
 AUX qtwebkit-5.212.0_pre20180120-js-build-error.patch 2124 BLAKE2B 2c09bff3d9bcc950b7305c7aa943d5af8d47572b2b38063fe4de0e8d48768e9fd337e09fdcc314bd9ceda3e51f8bd6731beb4660a95104c0f1d8e6063d01c294 SHA512 01e090b390dcb78a998203806baa0677d39aa680107ee523e4fe1c26d9fa8750836a715a107eb00487e1ef100cdbfcb8ee9d2d9bb47f5f336dd153b591fb26d3
+DIST qtwebkit-5.212.0-alpha3.tar.xz 12457896 BLAKE2B 1b6ce78706a9696f0eb1fbe287d0d095d0089daf645a9ca60f9f31b9057669180b14d67a3bdfb387fc09dbbeee658c0e895a95edc46b2020f06f2b58188ba65d SHA512 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f
 DIST qtwebkit-5.212.0_pre20180120.tar.gz 18830192 BLAKE2B a74329c424f5546cbbfda8f398da8547a78661c66e26e8168ba2fc35140070cbd0e826aeadc6b4f1b30ef3f8dc5259a017fb4cb73990b1f03ed541afcab50ec0 SHA512 582b0c5cb10756d88206a9b935a868026f2c2294c6476c0668ad416880b921735efbad32635671daa89792ba9a6d4ff397534df150fe641d984d5784ce0bf047
 EBUILD qtwebkit-5.212.0_pre20180120.ebuild 3978 BLAKE2B f07d92bb3373319701138006ebd3408e25b728d58c1755134966be06b9b70c94dc0e7fc4baec54241db37f37261d9cb7e8e494798ada848bb2dd655bbb67c89d SHA512 3825142883d045a5fedd02848000d212173e6552bfb4b330041e6e1d9930d6fedeb4f0d8c15f41eb00375cb74f5e177c0ce56f37a722c9a5c5c43612bacb5d12
+EBUILD qtwebkit-5.212.0_pre20190629.ebuild 3723 BLAKE2B 51e8f64a16ebdce32ed0ec8dd2e6bea15afa8716cd6e9c5ded08174dd4b8b3f25925a582581d30c6b6017574ac70f3d211c1da65f55130b66e9d2065e1a6f280 SHA512 15468c603a52cdf8b51aa33ad29398a1899b18a232f3c2605d7c5198792ae3ff63eb1373d1b8b1e8e905215702360325e04ebd76adf0cc0ef75930b8363e4d46
 MISC metadata.xml 1225 BLAKE2B 29d533721955dea3cd9f1d23494438d3abc079d713cf77d707920a765e3eba4e2160d0f80b05ec2ba8cbcf7999aad51201bbf002e8b59161bb2d0d85cd945e50 SHA512 b382f115f4705a577e210760d499fde421d0091818914674f0c2eb7fc4967d19d5dbf752be19f43f0edb27493ebec58b89e07a65ffa505842a089d06353aa122
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
new file mode 100644
index 000000000000..ce0302f95ae5
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby24 ruby25 ruby26"
+MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous snapshot
+inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs
+
+DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
+HOMEPAGE="https://www.qt.io/"
+SRC_URI="https://github.com/annulen/webkit/releases/download/${MY_P}/${MY_P}.tar.xz"
+
+LICENSE="BSD LGPL-2+"
+SLOT="5/5.212"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X"
+
+REQUIRED_USE="
+	nsplugin? ( X )
+	qml? ( opengl )
+	?? ( gstreamer multimedia )
+"
+
+# Dependencies found at Source/cmake/OptionsQt.cmake
+QT_MIN_VER="5.9.1:5"
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	dev-lang/perl
+	dev-util/gperf
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-db/sqlite:3
+	dev-libs/icu:=
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtcore-${QT_MIN_VER}
+	>=dev-qt/qtgui-${QT_MIN_VER}
+	>=dev-qt/qtnetwork-${QT_MIN_VER}
+	>=dev-qt/qtwidgets-${QT_MIN_VER}=
+	media-libs/libpng:0=
+	virtual/jpeg:0
+	geolocation? ( >=dev-qt/qtpositioning-${QT_MIN_VER} )
+	gstreamer? (
+		dev-libs/glib:2
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	hyphen? ( dev-libs/hyphen )
+	multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
+	opengl? (
+		>=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
+		>=dev-qt/qtopengl-${QT_MIN_VER}[gles2=]
+	)
+	orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
+	printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
+	qml? (
+		>=dev-qt/qtdeclarative-${QT_MIN_VER}
+		>=dev-qt/qtwebchannel-${QT_MIN_VER}[qml]
+	)
+	webp? ( media-libs/libwebp:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+	)
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="16G" # bug 417307
+
+_check_reqs() {
+	if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then
+		einfo "Checking for sufficient disk space to build ${PN} with debugging flags"
+		check-reqs_$1
+	fi
+}
+
+pkg_pretend() {
+	_check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	_check_reqs pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix, bug #395875
+	tc-export CC
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local mycmakeargs=(
+		-DPORT=Qt
+		-DENABLE_API_TESTS=OFF
+		-DENABLE_TOOLS=OFF
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		-DUSE_GSTREAMER=$(usex gstreamer)
+		-DUSE_LIBHYPHEN=$(usex hyphen)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_QT_MULTIMEDIA=$(usex multimedia)
+		-DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_PRINT_SUPPORT=$(usex printsupport)
+		-DENABLE_DEVICE_ORIENTATION=$(usex orientation)
+		-DENABLE_WEBKIT2=$(usex qml)
+		$(cmake-utils_use_find_package webp WebP)
+		-DENABLE_X11_TARGET=$(usex X)
+	)
+
+	if has_version "virtual/rubygems[ruby_targets_ruby26]"; then
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) )
+	elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) )
+	else
+		mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# bug 572056
+	if [[ ! -f ${ED}$(qt5_get_libdir)/libQt5WebKit.so ]]; then
+		eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
+		die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
+	fi
+}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 3cd1e6033a32..628cb9d75db2 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,7 @@
 DIST qtwebsockets-everywhere-src-5.12.3.tar.xz 235312 BLAKE2B aabe93119aedf18987b4c2211e1cd312a785592ddd0ac371b23e6d5649849bfe231aa24c2de91c20655df7f3a92a614371846060f5b70e09a14f4f7607242fd8 SHA512 212a98d987b4fd16216ac9a1c98e061be6a5bd2e2c4ec8be80424d6f23afeace790fe666abe8a11e2116dc20f17a41ad0c817fceacdfa5f766b93068ac614817
 DIST qtwebsockets-everywhere-src-5.12.4.tar.xz 235300 BLAKE2B 4dd5c7dc3d13dfa63dc1e75eb828751a3f9f77fa1fa2d41ab3b725b622a5ded789f4ae66b36b3203713d36d8a5a28f033e10034e468957a823651af79d56b12a SHA512 b5abd39664f07afe08805876980bc3850a83a032462a7b73e9d5c5458a2f195df85ec903e8a16bf93bde6089ec90ab9b930ea6b1ebb0d99d0955ad36de0613dd
+DIST qtwebsockets-everywhere-src-5.12.5.tar.xz 235468 BLAKE2B ad2418ea447490ab3ad7accc2850b448558c978389925e4c26cd3280ea20e543478fdd3af3db982cbd668a4074ce1b01a488d89313e9b9ff3ceface0fdafdc0f SHA512 970ad232ad1258630404d5e7347721505a780497e1775f88591098f11bca48cbf62c4f02491b133d31e4304eb9e16f923292c5b778e22d530d7a5a4e95d422ba
 EBUILD qtwebsockets-5.12.3.ebuild 538 BLAKE2B f75736bad52bd3169726e57d7213c3fe5ee759d49dc3b248fbe0a91ef28795058b18235ae851d391aa3b6491fcbcc1273501f9beea20f9543307cae549264836 SHA512 24780fbf2896565fbb196a44b010b41f78e5d017064ce0257bf38479899361f6dc75252db770a6f2b2dd4d534f20dfc2f142c4494bcc227afce29ae3e1a167cd
 EBUILD qtwebsockets-5.12.4.ebuild 543 BLAKE2B 29c1368206ce4e435cc915e99c3c43420a1a0b5601edd9f78277177e0c7b075116beb81965167e011c03ed86da5e07760e6eaffcccd81a70a3e87094cf4c60b8 SHA512 2e9486c7f237deeeb57f0c8e9e4da335ee81182ecd193b021fc751574915793402ab5c153074051f09f26cbb8396f9dc900ab42dc2486b8b63817cc4378faf96
+EBUILD qtwebsockets-5.12.5.ebuild 543 BLAKE2B 29c1368206ce4e435cc915e99c3c43420a1a0b5601edd9f78277177e0c7b075116beb81965167e011c03ed86da5e07760e6eaffcccd81a70a3e87094cf4c60b8 SHA512 2e9486c7f237deeeb57f0c8e9e4da335ee81182ecd193b021fc751574915793402ab5c153074051f09f26cbb8396f9dc900ab42dc2486b8b63817cc4378faf96
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.12.5.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.12.5.ebuild
new file mode 100644
index 000000000000..097f97a9d7a4
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.12.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="qml +ssl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}[ssl=]
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml quick src/src.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index a7aea852b023..83286d5eed0d 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,5 +1,7 @@
 DIST qtwebview-everywhere-src-5.12.3.tar.xz 131136 BLAKE2B 09ff2437cd66bd0c5896fd2e0d7910d9e3ad14bb710bc6c8d4f9bd9e37b12401e0d82a0fbd74a9b48425419d9120b53cbe93f3eaf2b942e261d91cca0638c8cf SHA512 426227b9b4cb61c0e88958dbaab21e842a25989098a0e94a06fe3efc8a2b9d4a5d3216296c8228da977ef52cd5844b66048bcb84019da4f06de1b1009dfdffa5
 DIST qtwebview-everywhere-src-5.12.4.tar.xz 131184 BLAKE2B 52e994285364fb42e9eba2a277275b148952f6a9f6ef57194e560863af896b29b36088ca8153a7a278886e733efe9ccf4c3940edd56d91474577f585a157fc68 SHA512 c7d5b5225a7edcf642249eb68f0db52ec56cd071f1e17e1f846a210f48229e71c649d99323dc70e9d3bcdca925b0ae1d9c56282d6b31398478ef024b22835fc7
+DIST qtwebview-everywhere-src-5.12.5.tar.xz 131160 BLAKE2B 2860c751b0dd66bae966ab7286d5cd906430d4a860dea47c7b624eb631722bc06a2bb8e8093c0317476edf1242dec84bb322837090d0f35061dce0ad637d9755 SHA512 310beedf88cefc05458e99838e7cb71971aa24ba6c460ff3da804c2ab7f56167ca1067ddca71ee29ced32ea974fe405261f24c8bbcac0c7b69063d7c4e38a4de
 EBUILD qtwebview-5.12.3.ebuild 431 BLAKE2B 23cb22cfbae77c0f9879c18865c41fba7c3ece54d55b31759f20d632ad05752db5d0eea568101645174b444b950194511a0ac9d406f882f7aa97ce1379e0b2a1 SHA512 95ece92015e3187e5a1875a837b1dc469e9aef0bcfe282d5d0552b2cb84081bf0d2e803a2042823062981e0bf52f424d0b594a07777d2f37e5a711abd38f04d5
 EBUILD qtwebview-5.12.4.ebuild 431 BLAKE2B cae67f0fad7771998ba4441882972fcdd60a877be512ce57bbde6e9b1ff8916d8fca9de76b020a37c7e5225cd5e2c7f79449215f5b8ed5d5519a7f680385682f SHA512 5ddc7f780474b3cc239c0dacdb92d7cea140c6e7114f0e0b9dc36813b221394df943042654c1b74e2da5f150991272554c45643140e31ce6309fdf7691f8ab8d
+EBUILD qtwebview-5.12.5.ebuild 431 BLAKE2B cae67f0fad7771998ba4441882972fcdd60a877be512ce57bbde6e9b1ff8916d8fca9de76b020a37c7e5225cd5e2c7f79449215f5b8ed5d5519a7f680385682f SHA512 5ddc7f780474b3cc239c0dacdb92d7cea140c6e7114f0e0b9dc36813b221394df943042654c1b74e2da5f150991272554c45643140e31ce6309fdf7691f8ab8d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwebview/qtwebview-5.12.5.ebuild b/dev-qt/qtwebview/qtwebview-5.12.5.ebuild
new file mode 100644
index 000000000000..fa902e48fdd5
--- /dev/null
+++ b/dev-qt/qtwebview/qtwebview-5.12.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64"
+fi
+
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtwebengine-${PV}
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 94200430dedc..54d12963e1e6 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -3,6 +3,8 @@ AUX qtwidgets-5.12.4-revert-reset-winId.patch 1657 BLAKE2B 72a1cb720871ab907e22e
 AUX qtwidgets-5.12.4-synth-enterleaveEvent-for-accepted-QTabletEvent.patch 2015 BLAKE2B 6aefa4fd585a7b4bdde335d48a90270c611c1762703ccac330641d761004dbed0df01cd683778c7b02175f0ac00de67709cff8474af958e486ca40f92ecdb15b SHA512 18c2e6c0b55f53f08d3ab3d1a65a83d264a203a8f9948a41a763e1306e462d70f0bac2156f4503f61c31ee38369dfec81e25685d2289db82bee78fda010a351e
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
+DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 EBUILD qtwidgets-5.12.3.ebuild 1042 BLAKE2B 2d926509df7f1d79e5fc9ca45ab0f0eb7d3a019b975771c3e2c95b13801f82ae4c43eaf528080b724d87abaf16d637590c4529fcd5a9fd58976f3e79668e13b3 SHA512 2883a409b5012eb8ca7a51c49be0523332753de7c5d8d13151dd21977ae509802d09aa28685115631437b5771c20d87a6067e92901d65924f0cc0915791b2e2a
 EBUILD qtwidgets-5.12.4-r2.ebuild 1325 BLAKE2B 12764ac5c577a6740308a2d574d8de00e746a0768e70d19b4263f65b689450864cfacf961a4b8f3a4e9e3cbe49b9188a197b399b12eded2e642464618d834603 SHA512 9ff7feeb1a245a9162da6a6242baf7074fc4535d673d4c76ea9fccbb195be06fc3404fb936960aee5bebef651b5373b56f5265a0caba2bb3589ffc0b4a1527d4
+EBUILD qtwidgets-5.12.5.ebuild 1048 BLAKE2B 8ed85958b331fae7430ac60666ccf444e9653caeebe8d71795169b350ca6babd39b7015191d9eb6371c144fa324dbd2d30bc8e6c00c5706279ec7a1f731cc68f SHA512 91f9dcfe7869fedcc353b949522bd85ababa7ab7f000f0c41ec7354257276ab1d80b517d9a69572ebfa29f259c64c00bae14097a4dece57de5a19caf0882ce26
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.12.5.ebuild b/dev-qt/qtwidgets/qtwidgets-5.12.5.ebuild
new file mode 100644
index 000000000000..85ceaa9c401e
--- /dev/null
+++ b/dev-qt/qtwidgets/qtwidgets-5.12.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+# keep IUSE defaults in sync with qtgui
+IUSE="gles2 gtk +png +xcb"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=,png=,xcb?]
+	gtk? (
+		~dev-qt/qtgui-${PV}[dbus]
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/pango
+	)
+"
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/uic
+	src/widgets
+	src/plugins/platformthemes
+)
+
+QT5_GENTOO_CONFIG=(
+	gtk:gtk3:
+	::widgets
+	!:no-widgets:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:widgets
+)
+
+src_configure() {
+	local myconf=(
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use gtk)
+		-gui
+		$(qt_use png libpng system)
+		-widgets
+		$(qt_use xcb xcb system)
+		$(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index fdb4b9b3ee0a..387c3bdc19c6 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,7 @@
 DIST qtx11extras-everywhere-src-5.12.3.tar.xz 115908 BLAKE2B 9ec7d370630f6c43869f648222ff46368cb57984ae732320974258da5b3905faa372e8fb97c25df8c88ce155c75be601bda28c988cf5b639bf6404213a1dbc54 SHA512 21dda778aaccab44d8c4950fc6cc9fc6748f1f38721d8f775c61754ace81d17a03847cc6fbe98a9d23ea592fd5f6942eedff102d4841daa5847125986c474854
 DIST qtx11extras-everywhere-src-5.12.4.tar.xz 115948 BLAKE2B 275d1db45081c8397844778e1dfea4902ae532c25abb61aeb2c746e5eab8850705d8afe36ab54f1184ca6209ea47e495fab9be9c24d9d042045fff14f234acae SHA512 a6d30a20a94d3c79470dabaecb7f262128d7517911f59baf0cf9e8fad18bcfb318a606ddbe291683a4c2f195e638ee114f67b6fb796031e67193324c6df1511d
+DIST qtx11extras-everywhere-src-5.12.5.tar.xz 115960 BLAKE2B e075f0cdaf6e5b5c57899e8f4440891b1be4e49246a3b7098c235239d1763109aab4e99931488c7585dcf8197b5357905f6f17fe5a8e15b46bec250e2b2aca79 SHA512 1e83c2d350f423053fe07c41a8b889391100df93dd50f700e98116c36b3dbad9637a618765daf97b82b7ffcd0687fc52c9590d9ce48c2a9204f1edc6d2cae248
 EBUILD qtx11extras-5.12.3.ebuild 443 BLAKE2B 4fbbfe5de5bf098fa3cba104d8c65b05cc986a9ad7c38c64213739505ec2efeed769c262d8415aecd4fc8c468896d2b7a00690a1985a5dbd3750b9e66c295747 SHA512 b1bc19e7678be32552e2ce596810b1d5eff2d2ef822a7c362d2ee2d5c9f5c6713bcf7df830b66b14d4a04cb6d01c5570fbfbd5ca7edd3faf82ad87745c2ed08a
 EBUILD qtx11extras-5.12.4.ebuild 449 BLAKE2B bfb4db0cf8299bf8ce2f2e55766febd776a9e6d418b2dfbffc0b432401130de2aa8d844bbaff2d041b7498ee6eee7469b38b87741df53e04f1dc43fce41d7b82 SHA512 506bee2d31f2272d6e8d7b054c284c45e3fc7065b89d52209fb944a41bc48f9bcd6419ec8cbd22a9fc960c9781e9612bf9e34afdf92af89e182e655771597f64
+EBUILD qtx11extras-5.12.5.ebuild 449 BLAKE2B bfb4db0cf8299bf8ce2f2e55766febd776a9e6d418b2dfbffc0b432401130de2aa8d844bbaff2d041b7498ee6eee7469b38b87741df53e04f1dc43fce41d7b82 SHA512 506bee2d31f2272d6e8d7b054c284c45e3fc7065b89d52209fb944a41bc48f9bcd6419ec8cbd22a9fc960c9781e9612bf9e34afdf92af89e182e655771597f64
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.12.5.ebuild b/dev-qt/qtx11extras/qtx11extras-5.12.5.ebuild
new file mode 100644
index 000000000000..7754c982795a
--- /dev/null
+++ b/dev-qt/qtx11extras/qtx11extras-5.12.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[xcb]
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtwidgets-${PV} )
+"
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 10e756495dea..bf475c864c8a 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,5 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.4.tar.xz 48431020 BLAKE2B 7eeb3f6698984343ec14d03b8ad66ab23d81cd7a25c590316f7300c868ab869a9c96b125d56bba149ee116dff44bf47c751cce06f2cdd2d3121e5448708c5f6b SHA512 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946
+DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 EBUILD qtxml-5.12.3.ebuild 502 BLAKE2B 5836080f54fb38cb9b72d79f32e111b2607d03fafa2a1c16ed3b030eaf5eaaf0f22f9e6885a4d989dfdc2620b1ce214fff54fa2ae2fe9ee4cf2750ffcaaa385c SHA512 7e76a801b79141eef9e64b1a008f58eebfb7c42b25ca659353f8110d4bf2d01a9c42b41fc4c954bddc2389a63922052a6f562ce90a99331b6b3ee53053f1cf67
 EBUILD qtxml-5.12.4.ebuild 508 BLAKE2B 7dafecf41a3a42c0d7f52e63950f3c19007658c536d53f466c65490cdbf3ec1cc2417c779320d60676118c0bed2e13102637acb9bc2b7f70a31d4cc987ee9743 SHA512 91a88fbee9bf85d70cac6558e6580ede4a01de70c0b31d71d04923e536cb0c2375e6bfca6afe8799d2ffd805045d8cd2bc201e0c0d77d569a37f3f1269ad686d
+EBUILD qtxml-5.12.5.ebuild 508 BLAKE2B 7dafecf41a3a42c0d7f52e63950f3c19007658c536d53f466c65490cdbf3ec1cc2417c779320d60676118c0bed2e13102637acb9bc2b7f70a31d4cc987ee9743 SHA512 91a88fbee9bf85d70cac6558e6580ede4a01de70c0b31d71d04923e536cb0c2375e6bfca6afe8799d2ffd805045d8cd2bc201e0c0d77d569a37f3f1269ad686d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.12.5.ebuild b/dev-qt/qtxml/qtxml-5.12.5.ebuild
new file mode 100644
index 000000000000..a7668e1ef6ca
--- /dev/null
+++ b/dev-qt/qtxml/qtxml-5.12.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE=""
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/xml
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:xml
+)
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index d3a50cb30c90..f39e43d9b60c 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,5 +1,7 @@
 DIST qtxmlpatterns-everywhere-src-5.12.3.tar.xz 1389612 BLAKE2B ec5be0189d6e235dbeeff0660756365c6e900f7b56a1e18506e4c4190bcb4dd4f5242144ae53a5f4dc6334369234d0c8f4a05ce1b324a4002adf4da32cf3474f SHA512 4e421f0c78ca74f726f758bd95b33915297922f3b5a4fff84dde2600969f54f3914828fdb7903c7171e192f81966680b6c6bb4750de0be72728124470e7c798d
 DIST qtxmlpatterns-everywhere-src-5.12.4.tar.xz 1389616 BLAKE2B 388817e0131422d884fba7b24f9b1a279eedd907fc485754f387a4a496b8483a59fef6055994eb1b90038934ce4c87403975d72052a5136c0a424fd54de87a9b SHA512 769fb26b1b72bbe3a1fc0c13dee6f12c4bc5280824954194e676331082af91aacecd2c295aa2e566365f4679f19732b1caa3da18825e3560b402b86568b3ac4e
+DIST qtxmlpatterns-everywhere-src-5.12.5.tar.xz 1390052 BLAKE2B dfc8d1a596c2d93c45675b9a6e373294ae0ab52a36f2533e9be03719d7cf78c9c3597243ab01f5ff533cad5953a4a50ef30c109037f4905d9471ff8af97c151d SHA512 30b25e152970bfe51fcdeffa43d11dd51496e5ea6a5da644b13fa0ce4835302ebec651c1ecdcf9590c6689598cea9bd63748aab4ee0ec69f9155dc310a7c04c3
 EBUILD qtxmlpatterns-5.12.3.ebuild 632 BLAKE2B f02eef07ec5b098d6becd380c1ba807e950a810b6b108e303534477fcddc27eebc3dd5925b56c078eced6f193c8c08124b979b77b844ed5f1d4339d39fec8de2 SHA512 4cb32603af7ef8392f65a054ae29b4ff42622205cb6ba648fa7993f84823995f232792daaa2848929a4af0ab094ca2075f16111b9caddfe8a51c066825cc1257
 EBUILD qtxmlpatterns-5.12.4.ebuild 638 BLAKE2B 86be52ff99bfffeae6f02bfd3260b5a499be940684d11922742f7ecf5751f757c6de7b388ad89763681e6d40299bb57a8172c2e13bf1af12326bc06710f51bc9 SHA512 dad7a07bf4302f6e68722cfbc16a3be94d571b75bd0139b291af4de7c5b918f15e42f2a0b7681f93bd828863c8e0f82b3a39cd984fe3fdece6b7ddc12cf1cc7c
+EBUILD qtxmlpatterns-5.12.5.ebuild 638 BLAKE2B 86be52ff99bfffeae6f02bfd3260b5a499be940684d11922742f7ecf5751f757c6de7b388ad89763681e6d40299bb57a8172c2e13bf1af12326bc06710f51bc9 SHA512 dad7a07bf4302f6e68722cfbc16a3be94d571b75bd0139b291af4de7c5b918f15e42f2a0b7681f93bd828863c8e0f82b3a39cd984fe3fdece6b7ddc12cf1cc7c
 MISC metadata.xml 589 BLAKE2B bbca816148efdf3a04c05ea1c653a4e9a6e7c9c8109283719d53a06188e495df1addfceca8acc374ed03b89391fe14c70eb6e84b4f5343fb7345e841d50d8ee0 SHA512 dfd095f116f9223cea460984b650cf9d6f506f1bc5e43ae38429528d1218863d785fb47e05a3c9eb4891838d58baa967de3ac31d59e38c4de90a5655c8344d4b
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.5.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.5.ebuild
new file mode 100644
index 000000000000..3075ba68674a
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+IUSE="qml"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod qml qml \
+		src/src.pro \
+		src/imports/imports.pro
+
+	qt_use_disable_mod qml quick tests/auto/auto.pro
+
+	qt5-build_src_prepare
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index bdb1e2fad57e..d2a1ef803a7b 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index eacfc1955a88..5ade52cd361b 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -3,5 +3,5 @@ DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497
 DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 EBUILD actioncable-5.1.7.ebuild 990 BLAKE2B 87a5637568d66600ed414e4ae27b69e4babbf3a4020398e92fe34c85dc10b5cf34a32c7167ea72c8f9f1b7542031d001564637eca10328e1afa1940cb99b502d SHA512 2c83d7ba10c88a10e086d04867f770593576268c5ec82d2a1bedf11ae6a319fe4defac52a1416e5a4dca9f8faac8565415bf45348d85c9a9d57e5eb6e7d04a52
 EBUILD actioncable-5.2.3.ebuild 950 BLAKE2B b844d7a524d987ce006f27b00525958f4e30c44ff49e66fa2a877422a6e35ea20f39bad6150244df31e44c43a2648c7d5f3847025b7d731c24dad80357e4dce3 SHA512 f17521f92f705b9c93e6697a2364894b3bbd67e9ad4987c7406b0558d5a625ab8c5c30bfd2b4df044e06484e215e4a76c447858b3ef714d8d600a717492ada62
-EBUILD actioncable-6.0.0.ebuild 911 BLAKE2B 93fd23504c4a60cd3d90f3d8dd2611e5fa40817f56d0455d1054fb3f2710f56710460c208832fe69f176f39a6cc7fd10b2c25acb629af0a773c163e6af076504 SHA512 5a8e547e7428471ae2496636a7c011bdfca85b6835800468fe36d7ac12402e8da8930658072f0861f728a14854eed27022a4d513044deea73dacd4660afb0199
+EBUILD actioncable-6.0.0.ebuild 916 BLAKE2B 94c2c62fa121c4492d974fc3d552b6d5cf9daeaaa227453b0c365e972830195c62bc16afb754cf61f2ce815207208bd2401b76d3cbd64b457bbf85cf4bd16485 SHA512 bade0cac992db199d5c5f2017b1f8ea20f7e9de52847db2685287451700546a3fc98a79b1e65328f84c040e6d3248cafc0b3c0f8614d443eea4bbd519f32329c
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actioncable/actioncable-6.0.0.ebuild b/dev-ruby/actioncable/actioncable-6.0.0.ebuild
index 636672deef02..39588cd47e19 100644
--- a/dev-ruby/actioncable/actioncable-6.0.0.ebuild
+++ b/dev-ruby/actioncable/actioncable-6.0.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index e70e1945d7cd..71d2d736b9a8 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,3 +1,3 @@
 DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
-EBUILD actionmailbox-6.0.0.ebuild 1625 BLAKE2B d59f8b89ae8227dbeeec0e2eb4362d57e546c7afbcefb55e6780e485614e06a71d10dd9a95273c4737c4bcfd2536c520b4142206b8e5866475918d9b9d3e0626 SHA512 1b94761dabba727c52a2db94c2edf8e06feece7092f8deb6279ab31b0d317647d7cf9bbf96bd2f4f8e6f4305e787c7aa5aa973f053c86f434420dd6191511079
+EBUILD actionmailbox-6.0.0.ebuild 1630 BLAKE2B 167e7d127ba1b97a4d41661b07be4bba29f4fdbdcb4c4f836bcdc08682e233d4afa96731f367b84dd992a66781f86db5774a82b761c1c900ae2e00a80753ac5f SHA512 d81c186cf1cef606c1703d47920e10aef9b8bb6e5c234a19f3b62e87275cf418442b626222579e3c8808487daa72dee4855e48a8fedf6bf4d11a3bd96045311e
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.0.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.0.ebuild
index f219dd402534..b319575cf9e7 100644
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.0.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-6.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 7b3d9ed8af81..d89124b699bc 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -5,5 +5,5 @@ DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d4
 EBUILD actionmailer-4.2.11.1.ebuild 1668 BLAKE2B be5e490a600cd21d3e4938e65f6932a0b9728b0fd1ee95dc6a7a78124d880e2400b34761d0ac6b66e1058e61545a35f0a4f9b1ee0d66afb27ef643cd4c2b61fb SHA512 c602745eaab8bd280a4a1afc418ca2ff095dfbc14b2309831e99c2486171cd0e6bad446bfd44b43bc57ec2331f1e6b2beea9ab14581fabdf3412f0d5b44098da
 EBUILD actionmailer-5.1.7.ebuild 1369 BLAKE2B 519dbe4c1e91dda2497d31d2dad560d8d07a80b39c573d39c08b066ce6446d6baae2f99c81a5bc9815d80aff8b3e25673647bca3eda5c764b0c042adb027c4e4 SHA512 0a7d2b938d8e50210670b0e862f42b274a65dd0601596416555e842c61639c28e8bdb0a672d5c691e632f5f23e5fb2845bbbfd874cf6b3a423325d026185da2c
 EBUILD actionmailer-5.2.3.ebuild 1298 BLAKE2B 38d3fa328e458b3fe692403e834fbf491ef802fae597b1df84a439a9ec369ae81db2aa8b45b5b25d7e399422c1d038c9511679fc16cfba2350831616d1c486e8 SHA512 beb5906e5b928e38d626e60fe635ab1b53bbb710c152ed550d922a4e4070ee64026c97115e79d1e80359d74c8ae9bb5479897f453112e2256231e3975e5e39e2
-EBUILD actionmailer-6.0.0.ebuild 1239 BLAKE2B 6742e800e21a3361c90bb273860433a98b0d33a37a53ef0ef1aa235372d3a580d79600c09410bf9060632dfeb60cd278ca8f38192b6b6a8a01d866fc7d4be247 SHA512 1b0d71f8387ee022f71e26633a4e121baeed9140f97b9e4f361eb3b719d2a577d5c95b1b8e0c2bbef3d3bd1fac0951eb1938c231dd09b11a004322883eb0a939
+EBUILD actionmailer-6.0.0.ebuild 1244 BLAKE2B d9767f4636b1ac6611d9e3126f1f5bab8f48677b11e97f68bd6d973c5ca20996a73d4491b3395da1edf7736a0a01a2209f7b146072b340862c34cc49b906f22e SHA512 573076b12119cddee5b40f9d5663ee7f2c48e4c6eaaefcb7a9b46908b98bd32d8d51b1ee1075d2631b95bc3635b564a9888453493ac4fcff0f5013394d4043c5
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.0.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.0.ebuild
index bdccb6635d01..0d08ac6d6701 100644
--- a/dev-ruby/actionmailer/actionmailer-6.0.0.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 7cc71c7efde6..6a1bd80bcd4f 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -5,5 +5,5 @@ DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d4
 EBUILD actionpack-4.2.11.1.ebuild 1858 BLAKE2B 92cfe0735197abfb283c49b28887d421166ea56dbded2d6ce84089cd85d10c2d58ff5c53e4576094c6bfe6eda08d495cbb64e8ed5c589a675de1b9406a3d8451 SHA512 35c6071ac1d25db006886699e59bdaeaa64ec31cc70ff5cdaf41fd046d8fe87ff63ef1bb84acfba974420f3844a58fc243568ab8a2fdc201fa2add9d4dbb3981
 EBUILD actionpack-5.1.7.ebuild 1717 BLAKE2B f702eaf4b01db58bf0cce994f4c06110ef5ce41c612c7f6af33b7fb4e20097d21cf902a3b076b0837acb8dcd311536be4bb0be8a47ef93ab7cdf83085f7ba5d7 SHA512 3d81e4ebdab892c38f9405765ab59f7ecb6b2cbf8d482887f515e138cb50d193857afe475cc66dbe52f55e2d6006a75d5074e2877df8089dc03afacc6124e4b3
 EBUILD actionpack-5.2.3.ebuild 1577 BLAKE2B 488030d095bb40efcba8f2e7a83e10cc7528d17dc70ac26481016b5aaab7b4c86ffa231fc4e2572f41d7e2960488bd3b3578fbd24ae103460d0a3e954f3e57b9 SHA512 bf3a83d1c6db91e5335f74b61234d5139f880415688abea40963d39184496860b23466cf674954aa3fcae5fb6b68525bf26858d5db0fb1078fca40405428006c
-EBUILD actionpack-6.0.0.ebuild 1519 BLAKE2B 58340edb4cdac7130025bfccee7755851849e459245d047c23d6947313605870e3b202e717a701d872796f8aadf4dd0bf3fe5a872f07c184ec391de7c3fe12a7 SHA512 0c01d1235cdf5bc56333deb7c5152a00efdd89508789213127ab55f7a20c15ad848f3a45187da4ec2137f462c16bb92e0df8dea796175cea696fc6451346f2c4
+EBUILD actionpack-6.0.0.ebuild 1524 BLAKE2B 623875ed3b16bc9f59051c770925ca6de9045e6881f3fa46fef882f399d476f682a8302349273857634d652355262e184fd19ed804efae8aa8ea77efd6c40908 SHA512 5c9ee9c2de8f7facfbcbfd42c32f393ffbf622c0439b579f0c5c4c7f07efc4297a86ca3c3953fda8d19e0f3d87324a8d2c5939e1191aedea2e31f8b1d3184e77
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-6.0.0.ebuild b/dev-ruby/actionpack/actionpack-6.0.0.ebuild
index 3a42d564dd50..b1cc5f966ebc 100644
--- a/dev-ruby/actionpack/actionpack-6.0.0.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 6c86d5382e79..79c4a62f6a15 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,3 +1,3 @@
 DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
-EBUILD actiontext-6.0.0.ebuild 1607 BLAKE2B 6294815964645e24077c781df8873014ba7c37fb2c371ba448a7c1d76df7a867810d2fafeeb4a9caf05bcbd98ca645fa180cfa003612c24799e87f0975ffe7f7 SHA512 2dc4f793ba1ae7f2386cff0aabe63487f87808973e25450363c08d1c241d60e07e79ca991d13a75f41c20e41cadf1acd0f60b424284646522e342a53ad3be9ef
+EBUILD actiontext-6.0.0.ebuild 1612 BLAKE2B da5e3efc4467a12d857c661737205adf0129c75c274492e7e10aa3e0a654be5c33b63d78e9154a200e2ab3e966f3f4391a338c37446443a343bf391ee3adbdb1 SHA512 02f906033420e1cce9abb220d4f63c6bb30155f5388fc6239cae36e69a8ca82182cb9dc8e43dbfd75b52846cb158e8c72cd27625d03357faa4487ab245a99924
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actiontext/actiontext-6.0.0.ebuild b/dev-ruby/actiontext/actiontext-6.0.0.ebuild
index a70a3765a19b..880d78e98aae 100644
--- a/dev-ruby/actiontext/actiontext-6.0.0.ebuild
+++ b/dev-ruby/actiontext/actiontext-6.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 8232b7c590ab..9e4d0f385a1a 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -5,5 +5,5 @@ DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d4
 EBUILD actionview-4.2.11.1.ebuild 1585 BLAKE2B c001b8c56264e3d1969bf8c07c54ae6580cde982b38147c4c15eb1320e4ccd4228f1b554dc80c1f04150d6e14dedd25687e9d3707881532eba44286e9cbfec61 SHA512 c7de03ec6a2865e763be290f1f76cbcee866a20d49f3aaf44ff4f040ac0e5a878ce94083eca8d5817b30908997c25e82b4ccd84569ac770affc30e8f7169c5d8
 EBUILD actionview-5.1.7.ebuild 1877 BLAKE2B 2a1be3acaa314ed7ae85062f0c425b9c1402e8fca365341f76087bbf0a76bcc56102eacd84f8924326f428b99c83d92498a1ed99a2789e8e02162d25216bda61 SHA512 36af5a0630c889fffd2767740075c1d07ab51fc36c169a5fb8dce5e6a9dc3101856b007cfe52448e080cacc814fc938e940ee927b4cd1021db688932af4f40ef
 EBUILD actionview-5.2.3.ebuild 1733 BLAKE2B e63d86214aed2a50ed7e759c615f5ff8e8a89fe070e09227fafbc39af565c537f1f4010d1cccbff57c79dfac89b9bb2128cd6779d17c1b10e17b450a498e5bac SHA512 b91c7cf9893601564fc9ad9ca1f23048a8ec36631ed57a02c1d8850decd583135dea306ad4e8158dc669475f037ff850ad3e454d3fb16b91d4ef78556058738a
-EBUILD actionview-6.0.0.ebuild 1706 BLAKE2B c8873d1c0e2a62bddbdbea9d15097f36965bfd0139aa4edfe21d6e74bcd602b503e7cc1c0838f1f60b6761d93701c38a06a4919712e4e23cb7db12045aeb7e59 SHA512 e5ac7b9f70838431364485e05799296951a2338632a1b572cf34d3043c2b1c79344706f5a333e0d31094f8126acbab2a48faff47edce34e799a4def47db55015
+EBUILD actionview-6.0.0.ebuild 1711 BLAKE2B cd102273fb3c86bb6fc85bb4eccb8acb85f0fdf0b7a0ac0b2fb3641036fd8bdb1041ed168f22c48053dd783917d4c46cfaa96fb121155c7580337da070a1c0a9 SHA512 8b11a8dea118148d74a0dfb99564986199169fe762571143835cae3fc86ba4b118d07f1b3290867ef204e00a172600e57b7def8eb28491acc0dbe47f10be347a
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-6.0.0.ebuild b/dev-ruby/actionview/actionview-6.0.0.ebuild
index 8f84d5478fc9..e44caffb5f59 100644
--- a/dev-ruby/actionview/actionview-6.0.0.ebuild
+++ b/dev-ruby/actionview/actionview-6.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index b384a3dc1973..fbb4a7a88721 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -5,5 +5,5 @@ DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d4
 EBUILD activejob-4.2.11.1.ebuild 1070 BLAKE2B bdd6e12043c4ee89a5efe8477e44d0d40d15a6f8f14952d9059fc2380f8c4a4e94365057673e16b2f08ee15df2a5b401215b1bd3f1ec6ca6a4584698d6933cda SHA512 6e9cc9d8e3097bbd6e0fbf3fd57a5b40d7abcf43482e1df2a9c104acab407b4818508580953f713aea500dca6a2a192b64935a2c4d506a1f229a756468af2196
 EBUILD activejob-5.1.7.ebuild 1092 BLAKE2B c15aa9687bb0058e15d7841c2a8eda4c51161641163e074126ef724386d93b694d7110a183912efe8809f6dd74fb4ad1deb599ff6031771e4a019a2971e06845 SHA512 cbe36a5bafabae30dcf372190dca67639e50b795ba07589b85aabcaa844a8279dfb36d16ad07da110db56ff74eb4e1ec5c70b491377425483df3b4406fd30141
 EBUILD activejob-5.2.3.ebuild 1095 BLAKE2B c20b0752adf82a1f80058c695b1d5795a94a04fbbf91ce5eb15ff6c76a3a5b5457d7862bc9658af15012f7b21d89f84a67bd55d44b446cb5673f4dbfaf4d412a SHA512 bc80304fff0a768b70f3eced836dedc9da6e0c272165f77093e941be9eaffecbf0c2af189bc519641ad45bff6acf465e743b2526db13d90ae5292a0e8c42b645
-EBUILD activejob-6.0.0.ebuild 1107 BLAKE2B 65b60b951f5b5b3f93330e2d964bcf3c4840d34eba104a4308cf8032ffbaa8ced34aa3948dc4ccb48cfbc0f6700b52bed4cf2a9a931a362269a038796b9be8b5 SHA512 f2400924826a78bbe3f653db8e63f8de03a6e0fed67b8bf9f1b61844257f07adf51dd7a6c2c2115034ee6a6e74422e0f01125c04629456dd0fa56b5a3194ca79
+EBUILD activejob-6.0.0.ebuild 1112 BLAKE2B 37f52237494242cf13c52d3de2b776ba3f3452a145b74bb44259eec696a263a9d570a22dd13d6562406ba0195ee0aa3b187ffa75e919b6728e616097f08cbedc SHA512 468eec687a477b5d9f9b514318a6d7ff193d0c95c26acbb56da5c9183bb248267e8e1c86f2133da41abfc3b1dcb3b565d114fcce26e86bd77360daa5ac943f27
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-6.0.0.ebuild b/dev-ruby/activejob/activejob-6.0.0.ebuild
index ed669a6589dc..cfe821af9cf3 100644
--- a/dev-ruby/activejob/activejob-6.0.0.ebuild
+++ b/dev-ruby/activejob/activejob-6.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 795899f90d52..f6fa5319b14b 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -5,5 +5,5 @@ DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d4
 EBUILD activemodel-4.2.11.1.ebuild 1636 BLAKE2B 670d133746729c900586c4238698548c8aedcc90f670c3d80d20d1841d4123d71f010189ef21673e3575b5d2c1b181eac6c7439571a29aa0d7e881b583ecf3e9 SHA512 2dc483fc464c85303f605d7acfe07775f1fb6242a2e5e7f8f9e659f781a80431f70c8c79dceb15af5c1b6f39fc003a52ebc4cedcc9e1aa4bf6af0ef7526550a9
 EBUILD activemodel-5.1.7.ebuild 1125 BLAKE2B 1f92fd1e19eda6dc3ba38734baad6d9388241825a8e898da6829a4d8e2c01f54d308c68299a5e6f9ed74eab0742cbfd4a6eb08519890bd5930aec4cffaf88aac SHA512 c40da93b518c332a26ede7ebc71bec1104fda3746be11f4b994561a1d6dda3632cf212449bd7952aa2233e44cca1b3d284c5f9221aee71a3775abf0e9f4613ff
 EBUILD activemodel-5.2.3.ebuild 1040 BLAKE2B f57fa78d010743e04236bc091070ac556dfd161813c6747589e0042e2562ec4b8fbf3b88bcfab7c8c29fd25404357c03f19b7ac4090694db48a4f6c248209cca SHA512 64b2f7f9df07a28bd4a6ac1a82f0f092daddcc7f7278c9b39bb282b13948c2a9943b2efd70dc546ec70a746f1c465dfed688d80d58b0f6abc2c7d7b914f973db
-EBUILD activemodel-6.0.0.ebuild 928 BLAKE2B fa8cf014218ea86e34545f888a1e7b0026d77b6523641a6949b8675cd9c58b60ae8b7adbd623201130a8dbbbf45dff27673c8a6d5d5f94438f56bed5a6bcf82a SHA512 50af9238b04dd09416ef593d711498b54356b933affa6d17fed716ceeee33a5ca8ba5573112c51555ec6bb673d247232663f045b72277f7cde0a0666a6f1981d
+EBUILD activemodel-6.0.0.ebuild 933 BLAKE2B 44d5a395f27a71bd79b624f4cdaf4c33f0789b6749dd395010ec3b915e554f73fa072ec8bbc9f45ed1486874a5a57c225dbc7521c9221653fca0422a845dd6c0 SHA512 b9db49c14c3aaef7e18424d68a8c315f6d60d2b7e18af7c2d084b2847a6bc0e41ae5f0fe40946404b4027dd076eabb7ec118b26c5f37c19ec28a23acfcf9a773
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-6.0.0.ebuild b/dev-ruby/activemodel/activemodel-6.0.0.ebuild
index 3c147647fc66..67ce0d6246cf 100644
--- a/dev-ruby/activemodel/activemodel-6.0.0.ebuild
+++ b/dev-ruby/activemodel/activemodel-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index b970f3df882c..56c21b66e06a 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -5,5 +5,5 @@ DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d4
 EBUILD activerecord-4.2.11.1.ebuild 2449 BLAKE2B a26059816f637e8138298795592fcaf8d839509fa62248ac010f065e7211bd63bad58183364dcf7aa9e2f7f1614c4a85fcde33f96f57ab314515c175e437256e SHA512 726fba126d24ab9f3a90c7c76cc3c6b032285bd3898e9b987f5621557e0a316eadff74cda94b553216f96ab1a858b874d120a5cd22ec5c279667a6d1bd9f08e7
 EBUILD activerecord-5.1.7.ebuild 2602 BLAKE2B 545f8aac2391b194d3642f80a0d7ba71a31dfda1cf0e46d4867e40f9420cb03697e915b54ba28a7e0cf8ebe2323632588b1de3730c02449dad7b09e10dd110b6 SHA512 dc51bf26da43cf2a2716723574215dc808ab4ce54c063f47619b452b21f9b3e8491895820b17921c0b4cf18bd8f84de734c0f6ee7b33850f958da69d4db04293
 EBUILD activerecord-5.2.3.ebuild 2798 BLAKE2B 71356359949bfbbf8035d6f12f2a4b7d112ca6a7284c09aef49468ce612a2ba0b3c000c864584443d6a019aacd63078f88246a6341e719111438e5e0ca9252cb SHA512 faef79a976c17c093dbc2aec38e801b15a33c412e28e773a932af18f7239f5023c69f690fe2f7b613dd58e3cac404266c4cd21c591d384fad3aaf9c490ce3f37
-EBUILD activerecord-6.0.0.ebuild 2903 BLAKE2B 6a1c6c5afa40335cbee8c972efe6c92d412db29e010e4eeae1fb958373e037c42777cb289a7e4790a8c9c5ad0acaa20fee36d5d256c24d001c0858fe7dc06b83 SHA512 b0c51c89539c1016c48748a61ad92150a897f305a58c98829a06b925d6f26945b1a807315d4073c6be98c10b0b1370f98f936f48768973b687738e6a345be4dc
+EBUILD activerecord-6.0.0.ebuild 2908 BLAKE2B 1a366e7438487823dd5c18910dbaadbdd0d13d3f2b667ce233d9f680d72aa43cbd6bcf7e305a669f4628fcd9ac5cb9544f175a7de20d19fc54e6dc0ce38ecffb SHA512 ffab114bd6f28554621246efc248f2bb14bf4fb01ac0ad9302146f941569b3dade728871fa25312b79615a00f5977e40cb10b1fdb4d7d337696406bd139675cd
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-6.0.0.ebuild b/dev-ruby/activerecord/activerecord-6.0.0.ebuild
index 541ae5e776da..40f5d86d7047 100644
--- a/dev-ruby/activerecord/activerecord-6.0.0.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.0.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index d95ce95de1a6..0dbc1759a6ce 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,5 +1,5 @@
 DIST rails-5.2.3.tgz 8802794 BLAKE2B 786f94bcd9528ffc664c39caef0e7d2d3c15da95497044504082999a435c2a877d73d40b68b5237dc07ae6cf9b8f6f99f12ae68527c5f4005b1a648038e507c0 SHA512 6a41f7564679263b4a16a245d13271b12e97a55cdd77b5ebe63bd86c3a80e4f447b4c0567a4a40ed8e97a2307522f6dad368b1beeb362136bdf1856f6dffeb60
 DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d46a736ccb747614d6c1fd56d4aaba2f2f32d48d81772cfd4db671d94a67cd3ffa395f29bf2de1f148fa57ed SHA512 3a2259fe2b3ffd0ddc9128e1aa58af57006b8410120a3629926b95fbe60b8658edab77929e26d9323c61a1855a4379e73f1ddbe875324b068a9e8bdde6ca55e6
 EBUILD activestorage-5.2.3.ebuild 1870 BLAKE2B 19983c022409435f1e58bfe47f184fc7aa77bc70b3a0148fd26f44078251472e6e579ea2ce5be138c86279ec1043a5905eb1667bf5a6d6e7b4513c90cd9ed30c SHA512 020adf4b757648f9e72e5f6e8e65cf9149c03f91b58a3bad13b7d48b03c8fd7596a037869fee5577e4b86f4bb3ce0d806333092906c8529009bea21a12b9f198
-EBUILD activestorage-6.0.0.ebuild 1892 BLAKE2B e35d06bc44240d5a01a8eab782089d23711f97b5ea4554ef6661c29505a4acb827bd2770192037df6838e0f3852a96a35fde39fd6896bb25d98e2e58586ca43d SHA512 6584bc948f73be8c1c1391a87de62ffe203ade9e3ed0651977293da34b74ea0d395cb597b780b0eb371312f7995dabf0e0844819c4d8df65e7a45d3e15e5fbf6
+EBUILD activestorage-6.0.0.ebuild 1897 BLAKE2B 3c70a844c96ca6189f82f7f722c0f805521bfa5d75e86f56e94ae447c417589580f2c0988e3ee4939ede648046f8bc2765f1c74213849d9ab8a369f2f012584f SHA512 2dcda5933908089ba1a8a787e725f6d4a19a47eb9efb15a7585b1c2d19618ae33f6b38feaae33c5c7df75850b80ea147efaa2ccc7a393424578a6fd81302f555
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activestorage/activestorage-6.0.0.ebuild b/dev-ruby/activestorage/activestorage-6.0.0.ebuild
index 219f9b6c76f5..9310bf04d0d3 100644
--- a/dev-ruby/activestorage/activestorage-6.0.0.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.0.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 284317a1e26c..8a040a5b6ca1 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -5,5 +5,5 @@ DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d4
 EBUILD activesupport-4.2.11.1.ebuild 2386 BLAKE2B ae9c03406916c3f16fcd077ef49eea1f10123428af93f1b5e6739a28b1ca741e98b4572fc5643c27b7a8b3efc24bb038f2452df5ea90dc829477affc78a7b0d6 SHA512 b753886b2478c5b54a1800b47096f63ec68489dddb1ca68d72b15f192d6c8a4e345235a76395e6f5c2c3bdd662ea07ba723ac0a025103820afd308a5c9cd18e6
 EBUILD activesupport-5.1.7.ebuild 2317 BLAKE2B b3721cab2f6b57748cfd0cde85564754c360538435201bed5edea0f7fd0cea4c2c7552b0095b3b3d977552dea0a26577c9b10f3097d320382cbdc1e315613832 SHA512 26e052a3ffc4564539f83ce35c73ddb179d314475a1457d4ee1cd3f8b9bfd5aef980452d23ac7375d7f82e138c3624bbc70218d2a2d773b6d9569b6e6ace2b61
 EBUILD activesupport-5.2.3.ebuild 2456 BLAKE2B 19da92a852c754b6b0ecf3bf5ac1f4e895087090c0542cae70287b115ed4c3d511f47cc3d688160fcaa419b1313cfc804a25f4efe6dddfee101ed05f5635bb07 SHA512 a7514744a6becd11541e24cb82bd59f56ebb769d3c0ac342105ce211684f7c8ab77add7bf6f1ba460015fdd1fbc4e386bba4a7a84cafa5972fa98bb7398bfaf0
-EBUILD activesupport-6.0.0.ebuild 2305 BLAKE2B faffc01dc2638af38a58cbf62aee412261585e5d7fc1dfdfe2d4623562a0ebbbead9ce045c33887332366702ff873e205c0cc25429e0ef92b5f22c6148105473 SHA512 cef2a30201d64fb6c2abf163e18da6db2246708281ce3bf17ac32dbc5e61e8e29301109dfe1d29463db8ebd3b70440f8674765c253389189f6c9a644db91197a
+EBUILD activesupport-6.0.0.ebuild 2310 BLAKE2B bae21fa84853ad68538faac35f70e5fba0935b93b6859195b42e51a569082c9550632df302ea0010d3a44ac4f69b03ee983cf70c5e96a22a8bf4b56e2e6e50cd SHA512 0de8cd973586503a22ea3a2c1b25da33c7f2df17cd14ca220e035d5cf65c0cd71998edcab9214f822f33b5b6d9c29c3b31b46ab60531e20b256edf4cee13320d
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-6.0.0.ebuild b/dev-ruby/activesupport/activesupport-6.0.0.ebuild
index 096dcd80f053..73ef46a6fc46 100644
--- a/dev-ruby/activesupport/activesupport-6.0.0.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/ed25519/Manifest b/dev-ruby/ed25519/Manifest
index 4f779211ec60..bbca059f9deb 100644
--- a/dev-ruby/ed25519/Manifest
+++ b/dev-ruby/ed25519/Manifest
@@ -1,3 +1,3 @@
 DIST ed25519-1.2.4.tar.gz 136685 BLAKE2B d0fd78f16df2b09f5835fca4b0963cee930e17ece2c4eea2cbf4544ed1a5e30c7dc63525b285f4e1e150e5e70d1e8207ca07ce985c27441a903c69875fd92dee SHA512 cf2de7781848d804f3a279baef26f887846d7d846d225293c74dc3f4e301d18518c9edc8b721f9637fff8f087703e91d2376119f2d8185ef19be5862f99801b3
-EBUILD ed25519-1.2.4.ebuild 819 BLAKE2B 93bac55f25c819006200f2a78efd73134ceee4e83833a3baf3c9c8a5e98145878349dda1e90c1a30f25ebe37fe2a1b5d6e947b8f541e9acb69e04e3781700a36 SHA512 20bbfac591dd2e193bc0bf21989205a06c750b68d59e98b11e180b0c6cb063490a93d26a7ccc4a4c7e825a1ea6caeecd4561611451309de1826a17e5aaec9735
+EBUILD ed25519-1.2.4.ebuild 815 BLAKE2B e650184ca910e09cbcb7c3ee7cb5efec07b523b2bd9f44d7e10536a6a4068a8fcfed2fa44f96ad7e8f11fd765708c86f04adeed0917b57b09861e130676286f7 SHA512 17c9ec31814d43efaf73880e5979e41d3ff85b9ce60a2372eb93386442be5617ea869bc82967c54d7f39a6bbce82fdd830c2ac72b302d5a49ebb4479389a4521
 MISC metadata.xml 343 BLAKE2B cda5dfa27c8ad6f26c92ebb6ff29d1d861211716018a37c1b4e5736191b9c9b1805b4f9cb05817345af609f0df7b458e3d223b9a2d79e213098ca08bd7457f5e SHA512 68f441e5fba00bf886e2035f32e1f16522340d762b0872f39783d8d8659044c69e63d6b36f401adf2519c5e160c88aa39fb5bed58ea64dfcd607b2e72d8a6918
diff --git a/dev-ruby/ed25519/ed25519-1.2.4.ebuild b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
index 0fff8931b08e..eab124b782ae 100644
--- a/dev-ruby/ed25519/ed25519-1.2.4.ebuild
+++ b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/crypto-rb/ed25519/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/image_processing/Manifest b/dev-ruby/image_processing/Manifest
index 1958c94a4fb3..bddd98fa30df 100644
--- a/dev-ruby/image_processing/Manifest
+++ b/dev-ruby/image_processing/Manifest
@@ -1,3 +1,3 @@
 DIST image_processing-1.9.3.tar.gz 984561 BLAKE2B 71c729c36e7048ceee3bd452d0429b24303f6898658337211cda4c697823e275f84c8b5ccbce857caa8f63a80e620f11822d3c0024f05343c3d72f9c8aedbdb9 SHA512 117e45146b646632bb2990f1651a494887ec8b75d8dcfcbea241b75d4691329597b7c8979fd13d4e51bacd5065b51594d6de9357e63c8b9b959b78fe075d0a76
-EBUILD image_processing-1.9.3.ebuild 1156 BLAKE2B 37ab6919275d173fc292b69f27389a0e32bf16f664beff7a5414f89e42a14f4a61ff52e82ce77c112f18739f2fdd3b4a95a84a0d6fcb1db32b8ef1e4639a0989 SHA512 5fdb2831672f858c0a2ce65a5f15c1b0f75b947e8ccd1486a95d7356aa9f23f2ef738967e59936059adcde7be58b45e997cc86b6b33e3d1a43a81dff19408b74
+EBUILD image_processing-1.9.3.ebuild 1161 BLAKE2B 28a3bd0503dd07364cb647fbc2a412fbd9dced08ab33d5951160370a70f9125ddcd8bbdae4344a5f8bba817a61dbfa74fa6cb6f79f86adc2feb61c78f22c0cce SHA512 58a751735ac9cd30fd99a13f13201003e927dc9e98b1cb0df1aadfa36838cbb719dee4441dfdc8fdc5c4939ad1b29f0f1ccdf17f306bcebfab074aeb3a22225f
 MISC metadata.xml 348 BLAKE2B e9ff7002a69662a1f143cd31bf22379fa85f2548c0b1ca4b3e57e833d1f0090323b1e239f4ae53477effa8641a8435049a2835b2f054e90a06bfecd1c72ac536 SHA512 1fb1b17616eb7f7f083461e60823fecdbefeadfe1c3728a7e1ff381a453998164de3a0d64daf3714f079cbb456fba78acd9e09bafc73d2b562b75c5cf2064e96
diff --git a/dev-ruby/image_processing/image_processing-1.9.3.ebuild b/dev-ruby/image_processing/image_processing-1.9.3.ebuild
index 00324c0fa69c..ab9b9c9b4bdc 100644
--- a/dev-ruby/image_processing/image_processing-1.9.3.ebuild
+++ b/dev-ruby/image_processing/image_processing-1.9.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/janko/image_processing/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index a8e8e8440da0..0fa4e4e331c1 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1,9 +1,7 @@
-DIST maxitest-2.8.0.tar.gz 60742 BLAKE2B 313e7efeca866961f3ee4c43279557bf628bd5d6d75e119fc9723b16a4dc7d38784a34078a9c6c6c5893f4bd28723757658122794deeca70f1abf54187819acf SHA512 cf05087052bb9162d20cca5180808edc00606d0125d461968c033cc4ee44a193d45a337fa2d61f34e8c2097d71bad5eba16da6cf10166ee8afaacda29654ab89
-DIST maxitest-3.0.1.tar.gz 60926 BLAKE2B 9ef03af6e55e7565acfa89d64e04aab40ef11445f0266ee85e68daa7224000922b8107c72cf77e75c4ba630ec19207cab3f5b0ce08f42270756deabfa5124b28 SHA512 c71e8af37387a8dd8f73aa01cde1c5baf772a7fe6125df5962ffb1aaf07515ebcd6d0f8530f306cc60927a289f21e4c75e0fece674230d8cdab82f5bfecfb899
 DIST maxitest-3.1.0.tar.gz 60956 BLAKE2B 5819137a548dfe1ae1c641ea3ddb4fbdf522e08b35eddbeb5dd4f3cfe2f320d16779d48166be820215e3dedecbe1f77d2db475403d476e53d5019631a0972d09 SHA512 37fdba5658cd640de311efaaa50ca32b9415c0819b9adc919d6471ae9317f9a60eb5004afa29d67386b6b9524bda06791054b1d34e31ccbe160a56c315f44b76
 DIST maxitest-3.2.0.tar.gz 61272 BLAKE2B e67404333329cd32604a7bc064a7aaaa876b41dd47d0488c7ced107bcec16b127a8e29bd6129d2897efd49d446011d3c70a8b9c5f1c0d4e91f677f4a0bfa24f2 SHA512 9cf787067bed8db16148eca20494ca718a2bc6b034fb5d9c824022af4a8dbfd69cf4b605fddcd3a9ca09d18a699753738a50921befdf6134ec6c41ccc5170f91
-EBUILD maxitest-2.8.0.ebuild 1320 BLAKE2B dfc9156672e8da6105f8b0ffe97c99b144b785e7638e3d31c80a58c8f9e8d158c55e160b6bba4933145f0402334d533fb60ec249726d47e7c8afdb82693d25a5 SHA512 326bd8314fd511ed80684b55996cadcd745344163169a1f5a025682b538679b9f31e4f3b5bf6f6bea4c04427285c6292f03518c28f5b1112659b5be7fe2a7618
-EBUILD maxitest-3.0.1.ebuild 1314 BLAKE2B df8c3bc52a80394b51af34f412e419e715b2d40fb13a43f660c125eb78553a675948abe6928c96b7db7488508be3e22240038fe2cff42e28a741ff80e1153f56 SHA512 cfc7e19b333dcf409c7166ad7dc72364e16c7fa5e61d806010712342aea824805a4cbd0bd72d21bff50137ac9c63fd2b8cf9e9d54becaa0a8d6070a8f0f32d11
+DIST maxitest-3.3.0.tar.gz 61303 BLAKE2B a44cf342f4b221d4f9d93313c81b73cd0bbc95e727b4f6fcd532fb23278a3d2a120ea46d4b811ce930f8583563b068e0d9ddca8f552bfdacb506e78966f8e17a SHA512 0c6dc8418b98166da3bd8c530669bab1e1fa3d2af9444b448327913fa637bf8b6a0c9d059c3854501c6633daa48efa980c1742e11468f354019d2f3ce2ea44db
 EBUILD maxitest-3.1.0.ebuild 1317 BLAKE2B 31f2c30ac027d4b8a2966b40af4a061aca7185cde8d3a47ef45c67d608d580ace8c436cbd31930719bb9691756b1b61774542f037e38099d35f2769a4ee3b228 SHA512 a90f668aa6699358133c128548a8a1dccd8d738f88d4ed1c3a64bbfe0dce07b977fb4ed907565061d64f62997eb81975ff62b41c08aebbe1342502ad1358b8a2
-EBUILD maxitest-3.2.0.ebuild 1299 BLAKE2B 8c7ca90a316d9d20138e2b3a1cf7fe494fda958694789c54cef641316e1ac4910599f46bb5a298f4c19efc5dd35b71801e80688840a256e8886e7dee6128497e SHA512 a23b6265a4710bc768fcbbd942afe234abd3a10198b2d07663024a72330fb8ed006c2388b7e01e5612261bc418367571f2c80ccb3bab59c1d40d5781c79add62
+EBUILD maxitest-3.2.0.ebuild 1298 BLAKE2B 512e4121a9237d0f68c4f824fad26447c6d839c011040b6106cbecdee2f1241a3977d02aa61ad8a9bfd65364dcf1823a23e551a0a63ddfb93e35fc3a328e662d SHA512 5c2969bac7c1530ab1b7ea030f0e14e8314dcc71be333e6279d2e315f2a4801e655546185b516f705f06a1949807f2ad9018b99bd045f972a69388b046e59c14
+EBUILD maxitest-3.3.0.ebuild 1268 BLAKE2B 40d09a07fe1aaf0774ebea90abe306b2e683bb4ee6af7a568a904caef0696617b087f0a12ed742850b8638821129e7a5c1ef8dccb4f021288b30e344a7a01ac9 SHA512 ea822abd3bcbd12611ebbb43be5359ca7754deb9b5285d4baecd143c23eb89bd16bb88e7d9728f1c09fec307813f8d1c76883fd7a2773a4e6482c211fed28854
 MISC metadata.xml 332 BLAKE2B cdef4488ce14b1d8addc2b3f23fa74aa64022d4ed2dfea7a84c85122e357806dd3a466ec2f4fb0fd486373055a78ae579c0f68c90a22b8940499e1ae29c29ded SHA512 ad86da72b8bc8895b0e09bc9e435eefec9ca1738e8b34aceaa959b2431b35c2732c704bd68a02d02c3c88912c20395f8601e2d42ec26f5d15c064893c0ceff0e
diff --git a/dev-ruby/maxitest/maxitest-2.8.0.ebuild b/dev-ruby/maxitest/maxitest-2.8.0.ebuild
deleted file mode 100644
index 5cae59d39770..000000000000
--- a/dev-ruby/maxitest/maxitest-2.8.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="Minitest + all the features you always wanted"
-HOMEPAGE="https://github.com/grosser/maxitest"
-SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/minitest-5.12:5"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	# Remove developer-only gems from the gemspec and avoid git issues
-	sed -i -e '/\(bump\|wwtd\)/ s:^:#:' \
-		-e 's/git ls-files/find/' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/byebug/ s:^:#:' Gemfile || die
-
-}
-
-each_ruby_prepare() {
-	# Use the correct target
-	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
-		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
-		spec/maxitest_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RSPEC_VERSION=3 ruby-ng_rspec spec
-}
diff --git a/dev-ruby/maxitest/maxitest-3.0.1.ebuild b/dev-ruby/maxitest/maxitest-3.0.1.ebuild
deleted file mode 100644
index e82293c8bdc0..000000000000
--- a/dev-ruby/maxitest/maxitest-3.0.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="Minitest + all the features you always wanted"
-HOMEPAGE="https://github.com/grosser/maxitest"
-SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/minitest-5.12:5"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	# Remove developer-only gems from the gemspec and avoid git issues
-	sed -i -e '/\(bump\|wwtd\)/ s:^:#:' \
-		-e 's/git ls-files/find/' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/byebug/ s:^:#:' Gemfile || die
-
-}
-
-each_ruby_prepare() {
-	# Use the correct target
-	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
-		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
-		spec/maxitest_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RSPEC_VERSION=3 ruby-ng_rspec spec
-}
diff --git a/dev-ruby/maxitest/maxitest-3.2.0.ebuild b/dev-ruby/maxitest/maxitest-3.2.0.ebuild
index bef598a11796..4b2d8b77ff9f 100644
--- a/dev-ruby/maxitest/maxitest-3.2.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-3.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "<dev-ruby/minitest-5.12:5"
diff --git a/dev-ruby/maxitest/maxitest-3.3.0.ebuild b/dev-ruby/maxitest/maxitest-3.3.0.ebuild
new file mode 100644
index 000000000000..55dcc6eb545a
--- /dev/null
+++ b/dev-ruby/maxitest/maxitest-3.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Minitest + all the features you always wanted"
+HOMEPAGE="https://github.com/grosser/maxitest"
+SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/minitest-5.12:5"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Remove developer-only gems from the gemspec and avoid git issues
+	sed -i -e '/\(bump\|wwtd\)/ s:^:#:' \
+		-e 's/git ls-files/find/' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/byebug/ s:^:#:' Gemfile || die
+
+}
+
+each_ruby_prepare() {
+	# Use the correct target
+	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
+		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
+		spec/maxitest_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RSPEC_VERSION=3 ruby-ng_rspec spec
+}
diff --git a/dev-ruby/minitest-power_assert/Manifest b/dev-ruby/minitest-power_assert/Manifest
index 84a8e4873fdc..402de7813603 100644
--- a/dev-ruby/minitest-power_assert/Manifest
+++ b/dev-ruby/minitest-power_assert/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-power_assert-0.3.0.gem 8192 BLAKE2B 063bb33a29abc72ebc5a0efeed83b0ffe02864f41d25adc59d7e923469f3b690f5cbbca462107036d5678236c17c697215dd51ad1f0823ece428dd52e0b18e80 SHA512 570c54960682b33f27cc6046177142ea76a8910d9b977788e96594c1b746b642e13a4e4f824722d15f7dbe61e3c08784ea6266ab03031e54343940ee4c75e560
-EBUILD minitest-power_assert-0.3.0.ebuild 753 BLAKE2B 2f91b672e109bded84cc40898eef66a1a73cc746a7b59ce4c013779b9c763b07f38f2d6dcde0e80384f83a46679f8f44a370ec0c7e7cd910218b9effb14500d4 SHA512 f683553054cb28c323d3ec74260a765daf4ee95e8da7961fff4835b3d6d039688860bafa99f56d4e74bd4f79933b964d165abd8a2ea9d2dab9392713193cd4fc
+EBUILD minitest-power_assert-0.3.0.ebuild 758 BLAKE2B 336ab940886e2c65de0be6a1fd09fd763922476c44c735df675f2a783b82c22828f28fbdb2c4eec205d5adab961c7a265169755a5d148985f4747ed3490b61d8 SHA512 fdd8a3bbc3d60e76290bd72e754aeba47f2b3f5103c5743830ea26a2e138f2a16fc472d59e86f60c6d4b41c3959222376c6589f8d0c1d439ccf48f4e07953397
 MISC metadata.xml 352 BLAKE2B 602e40e72ddfc6763f110238ecd49ae67cf566e86a996e64514e4d0302e88e287faabf52cc27bbdd50dbc92b996d06b66e8eacca2f75e318c8fb98ebd08d28ba SHA512 bee51a932b3efd1dc3a3df1d6572f83ad7011b0947f9bdbbd42b5e5ec222bd642c27f235fe3646a903597e678f0894d6c8bfe1aefce1a3e3e9e42ecb53b5ab36
diff --git a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.0.ebuild b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.0.ebuild
index 1aeada724073..4ecada28e5ad 100644
--- a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.0.ebuild
+++ b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/hsbt/minitest-power_assert"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 86ae5993b7a4..639cef626145 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,9 +1,5 @@
 DIST net-ssh-git-4.2.0.tgz 197417 BLAKE2B 5714185d9b83d3010e6b9baa07ac541e9227379cbfecc3a506d870d8d9fa528f59b605df4ff02ae6bfc16893bfb22734395096a77fcbe19fb939ecc1a343a9b5 SHA512 0a3609590d797a8cb4732e8cf743606a4919f57475b6eb2447a3db0c28f1bd405804fdc47a4062e503acdd4b785a1de9794a6db433cabb884105166eff6a8c5b
-DIST net-ssh-git-5.0.2.tgz 206757 BLAKE2B ac9a317dc238f7e3e794e4d8fcccc063d5d34dbe2e50a142e701957ad5c754985523624e97ca0b7d5773d2fefc3f10f3d61b2976997abd29511cd3934ea0e0bd SHA512 6e96d4b3cb2f4f14aa046af72b70a5e3b218153db40dc64996ad0061ea89cc9ac0dc0510a4231734c7385c03436d4116dfe4c9ac4b313c9fc5b029fc8a6c04d6
-DIST net-ssh-git-5.1.0.tgz 208940 BLAKE2B f4661bb8d0071717d342521126c0b8a834ab7775b67ad21b3d381205fc74aa1bb39f0cb406f0b90815be13c430eb5f69af2a86fe10214ec8db7829425e9c0399 SHA512 49f8f749f5e711af8002c8eb281505eb249362d58f870aabe55e8043bb8d1e94b1428246bd488508b58ec2fe089aeaf46ef758625af0573201e2ae830846525d
 DIST net-ssh-git-5.2.0.tgz 209986 BLAKE2B 6a1bc97da733420607c6ebe69a01f42d58998297a12394a29c9b4f5af425781d6b1b3535cecef21a0918eefc2e032f519fce9c5691c0a735c7810452f468d780 SHA512 cf2fa9817b124f0f35115abef51a4865073b3126b94d66cd307994bba06745513aaab1c1bcf64907a7b3bbce793b272b3f521cfa93f9339ca78ec8cef09cbeeb
 EBUILD net-ssh-4.2.0.ebuild 1111 BLAKE2B 46f70eafbe7498c6ffcd621e3d7a4f0543bb91d0d52ece3a9ca55ec2888428d8ee728993ff326c205fa2dc0a0514cf8a7ca3c444b8b13f07f3ec40527af97de5 SHA512 0c076ea6e44ee5697428c7d2cec3780f1c7f522008abf0267cac9be1aa0868faca8aace807fb811e5917511f083dcb0b757a3996a9070bd1d72c9fa77e4a7e07
-EBUILD net-ssh-5.0.2.ebuild 1029 BLAKE2B a7ea50d44f796f95ff8d1c093d3731d413a51dc87971f3ff347b563971a10af023db84d6a4d869cafe8968b7cb2288176e378431cfaca1945e17d4626d5c8933 SHA512 00c875a3d6ced5dcbeee64bf7e2674f9399eba003e2bd532ad43cab1285c40029e6eb0a6f5b3eda795aacd38d720203d52f7bb5c8fa7d6d3902aa38392fd626b
-EBUILD net-ssh-5.1.0.ebuild 1036 BLAKE2B 258e3d925b151160207e7fbd75bdd66e7304674389581786095d2075cad8da45a4916ab4264b89b9b10691c6c3be854af62194c00d40bb041902797358f427ac SHA512 70c154e7c4762aef31d74a1c240eef11f5ced2f362c537efaca3e65548f930aca9821369cd8d99659284bb4fdbade94513cc8e719c385f8806c297b9e13fcda6
-EBUILD net-ssh-5.2.0.ebuild 1036 BLAKE2B 258e3d925b151160207e7fbd75bdd66e7304674389581786095d2075cad8da45a4916ab4264b89b9b10691c6c3be854af62194c00d40bb041902797358f427ac SHA512 70c154e7c4762aef31d74a1c240eef11f5ced2f362c537efaca3e65548f930aca9821369cd8d99659284bb4fdbade94513cc8e719c385f8806c297b9e13fcda6
+EBUILD net-ssh-5.2.0.ebuild 1032 BLAKE2B 45e33dd14c8363913f9c471874c559cc3a9482728bba1f0dacc5c5c3fcb029b9dbe7ea21e08e11799a7e08613e64e70a4e017544b7fed1b459f888aab180c0d9 SHA512 54b0768563030e9cd4a98b8c75c9be3b7f531182c610f7ef13bed46d8ff86252dd3569e11600898f029ec999dc01a84fcf09c62886a1ae7088479f97ef331371
 MISC metadata.xml 542 BLAKE2B 0afb600fb7668a66e39bfe556157fa6a91eaf67299ba7560a550d041fced876a66ffc83700983fa4f3249a35785e93a7d980ff0940365df1fac626f22189a863 SHA512 f350079143da9f4e43f9da43556d343c01b88782a3d4fe8bdc08a7c901308f352fc9cfd0f998bd4471bed923ccbee0fd1d6112cfe91fa7b71ce9f39a665bcd60
diff --git a/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild b/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
deleted file mode 100644
index 5709cd84bd9c..000000000000
--- a/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="ed25519 test"
-
-ruby_add_rdepend "virtual/ruby-ssl ed25519? ( dev-ruby/ed25519 dev-ruby/bcrypt_pbkdf )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}
diff --git a/dev-ruby/net-ssh/net-ssh-5.1.0.ebuild b/dev-ruby/net-ssh/net-ssh-5.1.0.ebuild
deleted file mode 100644
index f2c12b44739c..000000000000
--- a/dev-ruby/net-ssh/net-ssh-5.1.0.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
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="ed25519 test"
-
-ruby_add_rdepend "virtual/ruby-ssl ed25519? ( dev-ruby/ed25519 dev-ruby/bcrypt_pbkdf )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}
diff --git a/dev-ruby/net-ssh/net-ssh-5.2.0.ebuild b/dev-ruby/net-ssh/net-ssh-5.2.0.ebuild
index f2c12b44739c..35a8a5189f03 100644
--- a/dev-ruby/net-ssh/net-ssh-5.2.0.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-5.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="ed25519 test"
 
 ruby_add_rdepend "virtual/ruby-ssl ed25519? ( dev-ruby/ed25519 dev-ruby/bcrypt_pbkdf )"
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index d3fd93d967d0..8b60667aff3d 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,7 +1,9 @@
 DIST parser-2.5.3.0.gem 654336 BLAKE2B dff1b0e0b593a5603f1b0fd9c39f59b6126ad9575d8c077d5a7e2feb16e6f9ef72321a3c7d3a0c21e2f7c26446132c8c30120785390f2b450a0f42a1b2d11128 SHA512 3721b5064ebd9a7de4e50f299001f1640ecdb27b99d932f0a509b89c0b5bf2b337b0298466e6267c61d2b5fcf2e556e0d1a10f6c29dc6f64bd042667f9d79d5b
 DIST parser-2.6.3.0.gem 702976 BLAKE2B 139264c11a043d52479d76bba50b877d1c5d9a7644d0863a8733887d6bb52b82e05ac1df44669fde86d863f92f545de1782ad4214619528265396c27d4a82524 SHA512 46823097d05550cd0dabf58d442560588d0757c85d44678836abd4c048ce2e5c2124ff8a30be6fd636906fecfcd8cefc500990ed26b4361669a8644ea860e7a0
 DIST parser-2.6.4.0.gem 708608 BLAKE2B dd511be4a82b6659d4b21071b7e12660e19e42879783739be5643a1f39d5823059b862980d133fff79b72c95193edaeaa0f99f20584f48bc0289ac8d0859f418 SHA512 f4652dcacc00cb26030ceab39bef1a0cff4802824834d32628b4d33c715a5e833422fed61d26c6c498c465cd34f32e3bfefb17b08b2604749cc929910b96b1f9
+DIST parser-2.6.4.1.gem 708608 BLAKE2B ac921f4fba29adb8cfed93a5525f87ba877a271ccf308f839655dbde1e6ca77507da4c9baa8b9a5e2e207e7723561cb9c6a6ad9fc7fe282c032052e4532c1f66 SHA512 2d239872043ad3b9d156aa65d2225f374c5cc77a3920826926699dd8c86653c095881ee51473a401c44494636bf6252a875a7a3fcfee7258739f86b113e9900b
 EBUILD parser-2.5.3.0.ebuild 723 BLAKE2B 8789c34bf456237f0c19782f6d46b6605265e71a576e4f6524c49eb762a46fb0d499306f8cd4f9d6b3297587ffd16c6674e12d4e7145d5de218f08603b93213b SHA512 aa5d0c9e12db9f8c35b1cb34ac34d045cc0fe6a6f69f3cad530468d2dd63dc8fc4ae90c99bc8cf70232f565210c37bbbc6fe45965dea8bd44ead58e137c10bc9
 EBUILD parser-2.6.3.0.ebuild 723 BLAKE2B a34c8b4c8752e3d5606a4502980166e6c717d2108a2ad745baa9bbd52bc836d14d9bd7da380cb37334b31c4ace3b40e9485951a0ef2e62739a260749102fd7a6 SHA512 055b586fd66ec1ce0bf22f253bc27393c1d56158da5458dee3cffca47fd18204bcf314bc4a1e71efe5f3ff7a4da7e8bf0b3585bd68dfb3d3036aae6dd2cd56d3
 EBUILD parser-2.6.4.0.ebuild 723 BLAKE2B f97cf615515e70de2f4cf9201c13c655c79b2eead20c9348b1b9f1d8d728d13949abad560f31f42e2b1870125ff035e7fddeabb4aabd2162ccaa9b322f1e6c69 SHA512 0efc32d24c71d8cd898bb98dea0a0455b59f5178871b3e63d2a1ce335ea3b4c0deae2d79f5aa2e5a9265f3b1090d81c623b17d73126e97718f0a7db68c104466
+EBUILD parser-2.6.4.1.ebuild 723 BLAKE2B f97cf615515e70de2f4cf9201c13c655c79b2eead20c9348b1b9f1d8d728d13949abad560f31f42e2b1870125ff035e7fddeabb4aabd2162ccaa9b322f1e6c69 SHA512 0efc32d24c71d8cd898bb98dea0a0455b59f5178871b3e63d2a1ce335ea3b4c0deae2d79f5aa2e5a9265f3b1090d81c623b17d73126e97718f0a7db68c104466
 MISC metadata.xml 343 BLAKE2B 7da9e267560e7a67c7a8afd5c283389dea1d4db2cb0ca65e4fda61a576036bb8068005b5e31ba9cc8fe7b68b8f8af5f93bd104e6d63412842dd7d0030b83fbd5 SHA512 f8dccc996237113d4add61dcc46e1407ea6edf156b001994e31d920f688dfcf9efe8d3d991ef31dc0084b7695b57b5d51471c57e9e945308279dec7909c69517
diff --git a/dev-ruby/parser/parser-2.6.4.1.ebuild b/dev-ruby/parser/parser-2.6.4.1.ebuild
new file mode 100644
index 000000000000..1ec9261115c9
--- /dev/null
+++ b/dev-ruby/parser/parser-2.6.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/racc
+	dev-ruby/cliver )"
+ruby_add_rdepend "=dev-ruby/ast-2.4*"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index c7f7870885b1..24479af55c57 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -5,5 +5,5 @@ DIST rails-6.0.0.tgz 18543484 BLAKE2B 614e71481a3a5ece629f49d0ef623b5352e165b5d4
 EBUILD railties-4.2.11.1.ebuild 1707 BLAKE2B c4ee99a40cbeef43d8ab63134f581c01be1b8c6d27a10dc7368a6ef837c515309712e9e3d37fb153975360cba76e66ebf09dd056d486e9a5948c75c8fa862b7e SHA512 c8a68a17c8cc293bc7259751414f245ace596385c39a77da025ee85c17eb065bbc1528f8b173f132893f61f5c09f91f227452cb6f1343484d967e3d16a533e5e
 EBUILD railties-5.1.7.ebuild 1660 BLAKE2B bed1ab8e8b3b1c5156ae053b72f0c888cf85a0307d0f3a6800cf34acbbfa59cbedbb9d2d1f68e40f8449c8f87088d742b3bd5abb3404de11eaf56bb167b25ca5 SHA512 cda33f5aa0cb200582ec11fa671c303c92c065c57c5f0e202bb5d3446e76a8a254a3dfe7e27d516d68699fa87f27158e79e63b269d61a47168c185c28a19a3b2
 EBUILD railties-5.2.3.ebuild 1652 BLAKE2B de5e82b9c34953edaf43299181d8b1bd6aad486eb9421fe41cb0979c794dee9dd562c662af426797bea8540ae6042cdda3b3e5834408b97f53fce5b8c26e60d0 SHA512 856bf234affa5517e0db7bdbb92fb2b3f81ad50512f72d862797af429477145dbf4e8fd27cf70c50b2e0ae1e0f5b199f518221723ab4aa16ab91d752ff7afb3b
-EBUILD railties-6.0.0.ebuild 1590 BLAKE2B c4c74b7528730c87fe917ac4825303e5dd9b31b60fd15ffe0d0a52e99ee361ed85d1f91290a25e22385af231150cf55103f28f3474aa84c05d5ffbcb5e810853 SHA512 bac2dcc855401db4d3142bdb7411da87ea274b22cc9160726b19d9ecdec453015fa3226873308e2a00ece6a52f3aa20eca79818820770be166bf7121650d9005
+EBUILD railties-6.0.0.ebuild 1595 BLAKE2B e88e210916574f6ae7bb7db3e67051f47295bf598f062c7b900958053ea314809a6ce791c40c2618a1b7043c61b6c8a443ee562e8e07ed3fbeac72b0450fbfcf SHA512 754534c06f28f138d1cdff036f030601ea73501d3a1f2c2c91eb93a0e70b71c3d4d4bffd0a5cbb7204749ab171efb9832cda081d1def95f1dc0375f16f9e68a0
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-6.0.0.ebuild b/dev-ruby/railties/railties-6.0.0.ebuild
index 0917e9af46eb..7a9944444695 100644
--- a/dev-ruby/railties/railties-6.0.0.ebuild
+++ b/dev-ruby/railties/railties-6.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/rbnacl/Manifest b/dev-ruby/rbnacl/Manifest
index f25846b20b04..d77b4ff2759f 100644
--- a/dev-ruby/rbnacl/Manifest
+++ b/dev-ruby/rbnacl/Manifest
@@ -3,8 +3,10 @@ DIST rbnacl-4.0.2.gem 220160 BLAKE2B a4a3a7b0346bdc3d0e1930bf9b1c6c05182456837c5
 DIST rbnacl-5.0.0.gem 221184 BLAKE2B f64a754c478c57af901432e9cef335d9f01c1acadcd9d860dacca2ed5d59bdb71f3a431488357b57cbe7af61cf03b50b95ab5421a9ac59f63242a0ddd693e373 SHA512 d6c0c90587beae9f5086c442f4b7b9f430d527576307c5a5cdc5532b231245e5615434a001b3a4b47d1fb7d7148a167d77f12e7b4f5bd1c25c7ce5d361eb42f6
 DIST rbnacl-6.0.1.gem 225792 BLAKE2B dd2f3ab1996b51f905016df9a21d2c4dce69246727efa35444a9f88f3d071607d122aaa7e61e5283f491e3e8e9deb0897844fc4d8f8562c3b855b6489ff8ee71 SHA512 f30161cf38972c94f00200bdc0790b7b3b6c5a7b0b2663fab0a11b488477424e5b57280479cd28e2736eeaa1e524227e6aa688e814a1b4af274f1c82a5d553ab
 DIST rbnacl-7.0.0.gem 225792 BLAKE2B f489e0f8521ca01d49676ba4d06b28b449743dad309a0ff9ab30499b76ab132b1d176144d24bc0eada1bbc2cb13e83d332105a0010946cff0b02baf4d4b3c246 SHA512 49cb3587ce183349234be7ec7db83b797c1e6d09535e4e692d01a307e221baf7af6009ae8aed5fd36bbcd8f1847c49a0cf599160e89dc2f2cb3eefdbadc2bb09
+DIST rbnacl-7.1.0.gem 226304 BLAKE2B ebaca6708a1e57e131bb4b5dc973264eebc719df8603a9eb663f4e835c6370ac3d71a9ed27a1210aba9a93e98067e2065d317f0367f978b15db7f189a0c44552 SHA512 bde9cd8ed43732758e3315fa10c88c7754edb9de34691090664c961469928d7b39d26b712dd9b978e38dd90c82d2fed66e864f749e8842e934e1472f1d83dbd5
 EBUILD rbnacl-4.0.2-r1.ebuild 794 BLAKE2B 674c9c4ca5ced2f9216ba1aa14e4e6fbe08df35f6af28c91541e26ff5a14e9024afd7b936ad38dd2aa748b7866c8a8a167326f99f7525f3f944a8c771a2086fe SHA512 7eaba4f90b7b832720e2a7fb3ad226811ad678d6002c5db83ca4bdd15f121f25943e15651111695c447ad1fda70dff37d39a2056ffbb9347dd85b902f83ceaaf
 EBUILD rbnacl-5.0.0-r1.ebuild 798 BLAKE2B f6df83228b60bd0914b10ea9aac3102bfcdb36394a5f40c051ac51bc36776eb3bb788876560f1965fb7498513da735dcd2895909e6c2a0cda2f68ed3af214f20 SHA512 be8528b0feb3a34d6d75536dfdc99a002a493a3593b56c248d2e1623abb22ef8e5f4b43f3335e757b2db763b9aebfba18edbfab8d3a36da4cca539aab8b51ec8
 EBUILD rbnacl-6.0.1.ebuild 746 BLAKE2B 61729c7e6bc87b88ee3db31c86a36c4ba26137af7d830009ed5c2c8fe86576b5e8c8c44b87bf25d9078ae072125f2460dc458f61c10508a80139f112aefe76b8 SHA512 12c7e458496cd6d02aa8a9cb26754abe63905c0aa1c86140b1f8c0aea661e8fe79a6f9cfb82fd87aa6f1e980a1620530c0a3a44ef73711fa3889d8e38ab4c515
 EBUILD rbnacl-7.0.0.ebuild 739 BLAKE2B cacdc80445a2cf9aed181fe7ca04df972c778f62d79582c20a554a40c38aeb84585f6cfabfb40494c7aff0b45df244653a0130aa376889477d20fce9c4671dac SHA512 1b0777df6444d247ede6c156ad6971fcbcc4a2c2e8a145c80ba9a43285059b61c20653da5128a013698611f775f0a07fcfb51ab44e209465d7aa6a41b0b87827
+EBUILD rbnacl-7.1.0.ebuild 708 BLAKE2B cb1e45ae8ffd7ef22c477505ddb9b5af000eaa2cf73efb725986deef9fb5dc76cd089213a8b8554e7c0ba5beb961f5fed1a440d352282f2870591e640a690f8d SHA512 62eeff90eb37214173fcde4f4a1615f577662ac2fc171d0c440fdacdcdcfbae1c09e8dc70bcc0dc6ba6d22fa731c9ffd619ef36296fc22aa843f121f2fbb3047
 MISC metadata.xml 345 BLAKE2B 9b2e901225c95717838370d1de17dea5619d4485d7856050d55abd8bd05eeadbf012ce47b160d367e0027d2e42abfdf4eed15c598d0a8062713a00894495cd88 SHA512 e18502485ad21a5e5cb71be6f2980657a40b08618b50147f50daba44e1f87f009f796e1df046bef94c05bb9305e1bf9dd1a81df33c7fdacc8c2974dd18cd309e
diff --git a/dev-ruby/rbnacl/rbnacl-7.1.0.ebuild b/dev-ruby/rbnacl/rbnacl-7.1.0.ebuild
new file mode 100644
index 000000000000..e947ec005c6e
--- /dev/null
+++ b/dev-ruby/rbnacl/rbnacl-7.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a high-level toolkit for building cryptographic systems and protocols"
+HOMEPAGE="https://github.com/cryptosphere/rbnacl"
+
+LICENSE="MIT"
+SLOT="6"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND+=" dev-libs/libsodium"
+DEPEND+=" test? ( dev-libs/libsodium )"
+
+ruby_add_rdepend "dev-ruby/ffi"
+
+all_ruby_prepare() {
+	sed -i -e '/coveralls/I s:^:#:' \
+		-e '/bundler/ s:^:#:' \
+		-e 's:rbnacl/libsodium:rbnacl:' spec/spec_helper.rb
+}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 77ef54ea6e53..9ea57090be0f 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -3,9 +3,9 @@ DIST rdoc-5.1.0.tar.gz 702376 BLAKE2B 733d77a341ddad10f5b648b6bb492e0f79daa392e2
 DIST rdoc-6.1.1.tar.gz 701297 BLAKE2B cd1494303d5bf4f81804e40a43252a589a6fa141316a573c1e321bf2dbd71330fabd547e09f5c84937cc45b3f79e2936d90813c29fc11b4a514a9cb498b9c98d SHA512 01e32d6e7ffcb5c0e138068867e6d995210d0123cb87c2754994be1a5e0aede0e05114746e6bd788fd0b4299e9a005dcfc863ef07000f1f9fcbf6ed11e44947b
 DIST rdoc-6.1.2.tar.gz 667607 BLAKE2B 4857bcf5f72d93fe4e9ea89acfda9ae82afd61a7ff501d2eea529330d2b8a63d7cc775490648fcff5000ee60417123244518f56a31593af8efccae8f925b21d9 SHA512 a54e36adf9f98117f0b5ae4490a0ab1ce12d9b1de5b7c61ffa326b36ef13885bb8f18147f3548f95a285b15470faba14965bc87088fa3ce584928d8ee396689f
 DIST rdoc-6.2.0.tar.gz 668152 BLAKE2B 9c92b27c427d6229778aba54ce7f12fe883fd3e40151f518f3d023d4f6dd10d4f1f6d05c8d6bcdce80d1ac81ab25cd99ccbe9479a4fcd950b895e14d4fdc4b83 SHA512 15352889833436c0a243e4f79c4ae8113fa3b8c222950baf1fcd272773a7a17198c2cd91a50c92e225c282a37ec743a38d8e9ca4dffe0b66c39d56412fe56ca2
-EBUILD rdoc-5.1.0-r1.ebuild 2754 BLAKE2B 52eb9c120c3b1b60edd7c6949c39a7cc3e9d3f75e029a76bc234b58da3f9ece6fd0f5ab5742f125b430cd21ec7eb1abbdd0fa9ef8f06c95d8d3eb390a3953141 SHA512 8bfbd2d7db12445c1129c66301b37257d065e9d07fcc80bc1947367164a4b74cb32eb92a15ddeda60c324c8c12a9aff733d3466401e0a8189f7eb0f21a9b3fbc
+EBUILD rdoc-5.1.0-r1.ebuild 2753 BLAKE2B d0d9ece52604603fd19308557ffb1bbf17119ead010ae979a02fdf6c54acda8dc473d955f7682071249c73930396859399ad7b057cdc2d6b2a218715a8e1867f SHA512 367ee19475cbee4f29d0a747eeaa854220c94d0d5063745c304c13777b7c79dde0ad2c75802743687b7ceaf027252dffa731e0ba61a63f11594ecd41a1495927
 EBUILD rdoc-5.1.0.ebuild 2586 BLAKE2B 6e028069a3beace2f42f292c6fb5bf68cd7fbe1f71842897afae9cf5f971f7b15c10f8c4e6b0fe04aa825c879994edc5a815914ce2b8f196566dc1bdcf6e4709 SHA512 8a50a8f97be6775a3e3f304e7115d567c7f0829eb9fe5e47017286480a7fead26aef314d4173ff42f5380d17bfe21d313e89bedc884815d7774ec373c902cd13
 EBUILD rdoc-6.1.1.ebuild 2676 BLAKE2B d8557dd8dabccfa258ef10d7d4d448a3a2d41be45273abfb95cdb110835901cd658cd2c6e8f1359fbf65ec5a6a0209786c1623c915368a856c821152b9ac9eba SHA512 56925129ff307f3d777ed074b1a619a3cc70499cc28b78a7a95c1cfe4fc92e56dcc7c5844270fafc72f6bc2e20066181cd4e5d09098830a2a33f7ee9a4228c1c
-EBUILD rdoc-6.1.2.ebuild 2684 BLAKE2B e6622814059382dc34ee2b7fc1800cb397083aca39e0f89b62ab8348f7a45eb452f57c7b8d6bdad753c55ce4feb7896a24a0733ba3438054567010f0a21a81bc SHA512 92aaf5d1b59c642474794f61ce44b2ccabfab188d098aeb0e6db1dd809bc8321a5248432b9b3ab9fbfa3268d5c5d8af81b0c719cb171d27ca4395f50912867d2
+EBUILD rdoc-6.1.2.ebuild 2683 BLAKE2B 10684139b4cfad7ddfc0d9fd3ea76a67d2e67f0690df454ae8c9b9570eb973d60c0c24c77e0a80ae52c0cf8dc979060795dbebf0a1fe626bdb1fd1e25a9c8011 SHA512 b3ecec4603037ca50868f2bb9796e02afc6e73ef8a869dbfa61d39352c6388c7efc9d56bfda60b8a286b828a1cc34046782f8dc423029ca2b94470f27fe494fd
 EBUILD rdoc-6.2.0.ebuild 2707 BLAKE2B 3b8b14b2450dc35f3b9f7aa405e2a20d6a9dcdcbfaab10cc20e87190e4baecb1cc167ec8e236fe58923caec551bb4abca68a145bd65e34cf59c6c191b7806d00 SHA512 b87adee48ec8170189cb69410d189f615e8d7fefda546fdab0fcea59082b4b907ca06a9eb0de01c7b9d199c9c4b3474bbbd2e717f408108738999ce8499c59af
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild b/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
index 0f9a3297d061..2b6c8910826d 100644
--- a/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
+++ b/dev-ruby/rdoc/rdoc-5.1.0-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
 SRC_URI="https://github.com/rdoc/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby MIT"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/rdoc/rdoc-6.1.2.ebuild b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
index 0579834a3511..b00c4d06f013 100644
--- a/dev-ruby/rdoc/rdoc-6.1.2.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.1.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
 SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby MIT"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/rex-socket/Manifest b/dev-ruby/rex-socket/Manifest
index bbe994ce2d1a..46a610a0a0fd 100644
--- a/dev-ruby/rex-socket/Manifest
+++ b/dev-ruby/rex-socket/Manifest
@@ -1,9 +1,7 @@
-DIST rex-socket-0.1.15.gem 40960 BLAKE2B c452a0e8f95d3a5e2820d55e25d077aa594c9eba4982a953d4312bac4d5d32bdfec8dfc6b2a1f77ce9cbaaa60d7c3f0f5eb9da7407c131c89cf1eaffd4dca03c SHA512 edcc01e5c1235abc41a5579b56a04cdcb34710d24225fa9e925ecd91555429071eed281591df1a97cb8db035d63aae0c7a86aa93dc96289f42d1a56241b95fbb
-DIST rex-socket-0.1.16.gem 40960 BLAKE2B d4953d8a5ed3b58326e0bd4e916895b669dd6b62f76f3a719eeeaa237451562d7dbcf57ee90b2837f301e7a362d866d88c7cbf10bb480060ae6ece40478ab4be SHA512 6d78bf24c68d2416bdd2c9953a18095799fd4c6e5d79803accec3aa7159b00a0676553e91d38250f83f3e36846070cf2842e318a93b53e5a979ef8ad86b2f3ef
 DIST rex-socket-0.1.17.gem 40960 BLAKE2B af549e3c6bc6ab8f99a18eab8f8be5156211be468f4d55e234199d5b5985a8ac11817f245a6bafa421c0b8c908cfedf7e58503157c460fee76ec989ff628a8bd SHA512 2d7dc563d24ef99930ad6fc62ce69ced2a7d2cec881222edf889c6850b8ce48a49eb435acd1bd57637d07ab0434032e44084dc86d18a52c33c3f8df57928958e
 DIST rex-socket-0.1.18.gem 40960 BLAKE2B 0e38d508d11ff03c3e658935d2f569d40b5460a259b86f08250893a5a111da1580b2badc4ed45d9db8fa737d7ffb4639a312af683539b6eab2e8fab18fde5297 SHA512 74568a58434b784336bdb99ba7ca43ff84ced905f7d7d165eb9e2eed84076c49710f9d09dfaf3aa65fa672a7bbc177ff9e6c3e3af4d7001576f3c1430b714461
-EBUILD rex-socket-0.1.15.ebuild 469 BLAKE2B d7cce4d8f62c31881fc345a96a572ad53c6953bfaf0c2649a88784108bb377d7543ffd23763fc8455e75a5f1890d6120c550c55299c2269ba333dd5eeb134c02 SHA512 d5fdc53a71126ab623066b3b457c51a9a2bb2ad0ac81f1dcb0a24bc3e23ad99ebebab57bed681b9ef0135a15faf50dfb23fd742ab75dcd1d83f5f37a127deb9a
-EBUILD rex-socket-0.1.16.ebuild 469 BLAKE2B d7cce4d8f62c31881fc345a96a572ad53c6953bfaf0c2649a88784108bb377d7543ffd23763fc8455e75a5f1890d6120c550c55299c2269ba333dd5eeb134c02 SHA512 d5fdc53a71126ab623066b3b457c51a9a2bb2ad0ac81f1dcb0a24bc3e23ad99ebebab57bed681b9ef0135a15faf50dfb23fd742ab75dcd1d83f5f37a127deb9a
+DIST rex-socket-0.1.20.gem 41472 BLAKE2B e0a5a0dbf7ad663dc69dddb1de0d7e77b3c8cca374d73499616bb23c8d86fd23c65f7d548bfad2c8609b13e8ab89004f51d6e08865e26b1184176fb9c4228df6 SHA512 eae98bb6be13291ea31ff98fa55d86d67feb06d3796ad3bbdb9fe90503a296ceaf7f702e0ade64f7dd152be7de0eaf313a6ab9d982678d7d60d982b9d23fac51
 EBUILD rex-socket-0.1.17.ebuild 469 BLAKE2B d7cce4d8f62c31881fc345a96a572ad53c6953bfaf0c2649a88784108bb377d7543ffd23763fc8455e75a5f1890d6120c550c55299c2269ba333dd5eeb134c02 SHA512 d5fdc53a71126ab623066b3b457c51a9a2bb2ad0ac81f1dcb0a24bc3e23ad99ebebab57bed681b9ef0135a15faf50dfb23fd742ab75dcd1d83f5f37a127deb9a
 EBUILD rex-socket-0.1.18.ebuild 462 BLAKE2B 4185c2e36ef1292d4ed0c8e0f677ee11cc982b056b851593ff1eb34c6e4d77f0884a8a95c84cdf29126a75ca23eb9112d9a7b2fb697476eca8eb2d030481e75e SHA512 7302e487110a5558c491da591e762400d0af703a81cf6216dc48a979f34a09b1d09157c3ebfd5c2966b28faac538c46fade8e91f2f6725e775520f887265f85e
+EBUILD rex-socket-0.1.20.ebuild 437 BLAKE2B a617d957fc90d5e3952c335c66dc6814e3d43f92c6df61d25fce9093ede84320ff24831ada72362a5ddcf224117eb8943c1832981bb8fb83f8d72df1c639dd3a SHA512 d0206882fca0c1992c8d3694d49b6cda1ac3f9008e81c97e5bec7c10c8e4d350e9700a0befe44b863f73699bf410a16de51791359e145278c7607720d20caa7f
 MISC metadata.xml 389 BLAKE2B 544f3d8d83c609027ede420284a2872d974dff70a2da51590de644432807e6d4e5f0f466d6928ef4f519d5537f368e70149db370bf4051c85980cfc25d34b6a4 SHA512 d2b55e0366bd178ca9117f1768f939af7a8967b8f02244bed2839b69f4f5ef8a8d6f13b1d6014c8f2ef20dff7c9def63592c80c2b934b172103ace300b441a15
diff --git a/dev-ruby/rex-socket/rex-socket-0.1.15.ebuild b/dev-ruby/rex-socket/rex-socket-0.1.15.ebuild
deleted file mode 100644
index e5f80844af5d..000000000000
--- a/dev-ruby/rex-socket/rex-socket-0.1.15.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation (Rex) Socket Abstraction Library"
-HOMEPAGE="https://rubygems.org/gems/rex-socket"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rex-core"
diff --git a/dev-ruby/rex-socket/rex-socket-0.1.16.ebuild b/dev-ruby/rex-socket/rex-socket-0.1.16.ebuild
deleted file mode 100644
index e5f80844af5d..000000000000
--- a/dev-ruby/rex-socket/rex-socket-0.1.16.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation (Rex) Socket Abstraction Library"
-HOMEPAGE="https://rubygems.org/gems/rex-socket"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rex-core"
diff --git a/dev-ruby/rex-socket/rex-socket-0.1.20.ebuild b/dev-ruby/rex-socket/rex-socket-0.1.20.ebuild
new file mode 100644
index 000000000000..70cf8ff242f7
--- /dev/null
+++ b/dev-ruby/rex-socket/rex-socket-0.1.20.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Exploitation (Rex) Socket Abstraction Library"
+HOMEPAGE="https://rubygems.org/gems/rex-socket"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/rex-core"
diff --git a/dev-ruby/rex-text/Manifest b/dev-ruby/rex-text/Manifest
index 1e86c7f01d6c..9acdda4c8220 100644
--- a/dev-ruby/rex-text/Manifest
+++ b/dev-ruby/rex-text/Manifest
@@ -1,7 +1,9 @@
 DIST rex-text-0.2.20.gem 44544 BLAKE2B c446dfcbb54ed9cf57f019f2158fdfe37ae6815f3e02627564e0a0e472f56ab301a805e12f4aafb3f1e8e3052b35737add225c16979bb6dd4a7988b08062ff99 SHA512 0043abccc14dc70c750edf42f405368ac305158bcad98586f169b3edb808a5565101a302b32afd5d916a96a7cce4e2e27f2b0e1bcaf152367aac8bafdfbf1474
 DIST rex-text-0.2.21.gem 44544 BLAKE2B d905973b190b84f048ab26774651e394d8902b81377cab92298800b462e009b7ed8b8ac8f8c10f3726475bfe2a696a40655cbbd6efbf820974c503df37f07d10 SHA512 9504b78f77f4c00cc42e43313f48b058ecb5fb8c183225e580b8750810c26eaf22949793b46d90e5e36276d25a419153b38ea387fd28bc9414de62843e3efcba
 DIST rex-text-0.2.22.gem 44544 BLAKE2B c83976b7ccb2d33a94e61735f0234bcb29b1fffdd464bd2f10e40f45eb6e270979a26bcb0299de9af76edb44198803b26f601eaab18b3c5a9d8e5c3a07324ff9 SHA512 02a94c791fcc3c745d0728d767e82cfd20024db461c407f608ae8198f50c27d3b211baa791d7ca42fd6b5542453fedc8e57f2b421e88f1099d1247249e660efc
+DIST rex-text-0.2.23.gem 44544 BLAKE2B 4871d7869e11b5d450704ee0e19da1fb468cb6870569c41141b4a51a4ce267304ff0404d76d96b54b1a403d59f7efa724f60e16ef032c539a4cec56c0596345e SHA512 9dfa878a5da627ee10497a5f6ba9b8f7c63f649cfbd5b4a140b79ec9a98c65732e01f9938dfad2ff009296c42108b37d0df794bf40cb1741f3881de7d954d16f
 EBUILD rex-text-0.2.20.ebuild 499 BLAKE2B 6b33b438b6a2fc0697ffaacd68b65d0ad7e154a767b83446ceb8b04d8047db86c2d4bc4af037e72099894724805c2944a0becab778f5c9101f0c768bc92003a3 SHA512 285f14b9a7a681c659e09c44e29b9bf874c3ae86459cea5199470220ecda001553fd1d01660eabfc917c7c7f627d7ca929ccb84a976a25cac62bc525c7dc180b
 EBUILD rex-text-0.2.21.ebuild 503 BLAKE2B ac23160287da333f15a37358d9a0312cc6fe04c59c88be8c631ba1c9c46225f1833b10219fdb8027386602ad7b43161ea512ee8faf6e1a64266880c64df77b72 SHA512 0e17448ee6fded7a2985e87f05b72b91add3f455e86152e10996a67b00e45b02fd660aae2e4e66c50aa667b4d86e1dc3097c5ae71b04ede70fc1126d8314c6b9
 EBUILD rex-text-0.2.22.ebuild 496 BLAKE2B 33ccb9f935897d3f5350a544602f6136527205ccd18d30b2967b34563d0d196fd419b36a813d07104aef4a41d9eef76db7ccc0106bea774cc6f08e229bb2ed4e SHA512 748854960fcf9ae3f70a8f7e461ae1f1a5d9a853797bfe2d397533a7544152948904ebf87111866d48782cb54633769a3cdb2c6168c8f329a2674003dfb7ae11
+EBUILD rex-text-0.2.23.ebuild 465 BLAKE2B af54914b76f327fd6f052bb9cb136ded08d770063b94a0b02dd3332b61f7c438aa5a4404226e16386676a55340f619ec766ff3b8a47db7d3a3636cb8f1e708c9 SHA512 9ea6383b94ffd76e1b78da784e8d828f9a8e9beae885d8dcbcb47937c6843918f00ca5a28813d4f3b57c023a11d7872a808d01a6bb266a32d1b94b592c408ed1
 MISC metadata.xml 337 BLAKE2B 5309d74f65e9d31fb44761ea01a28cddc4a698ec2700bf2a18806871b42370d931405eaa6a2c8093d7405de11defe6aedaeeb72ea585d7cfefd970a323cb82e1 SHA512 24d194089e40848fc1ccce781e29de3bbf56c536a4f5fea036d2bd783483d2018b1105a4be88b8fcd57408651d3cac45ca649a111364dcdb834014bc6bda7bb8
diff --git a/dev-ruby/rex-text/rex-text-0.2.23.ebuild b/dev-ruby/rex-text/rex-text-0.2.23.ebuild
new file mode 100644
index 000000000000..26a1fd1912d7
--- /dev/null
+++ b/dev-ruby/rex-text/rex-text-0.2.23.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# Specs are not bundled in the gem and upstream source is not tagged
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rex library for text generation and manipulation"
+HOMEPAGE="https://github.com/rapid7/rex-text"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index ff8168f9cf4b..b053379a4980 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -7,5 +7,5 @@ EBUILD rouge-3.10.0.ebuild 908 BLAKE2B a3f66937961884c778a7f04f2d4f95176a5eb1174
 EBUILD rouge-3.6.0.ebuild 834 BLAKE2B 26ec04db0b005b7acd3b7c2ff685f33f0d51c4f414c38820a33745692faaf623cca80352891eb56a52ceb1878c983082d941fcac8533fb1ef26d9ac6328113ec SHA512 d6a84fc49e075e24f45c3739125dd0d03737844204ab94e59e4392f07db25d02e08f58d8ab1a2c5e0d66171318aaf59a2f07f2a03db6a14c1676c150cfd8fd66
 EBUILD rouge-3.7.0.ebuild 879 BLAKE2B c388823f3f9773ed2c3a0a2bf596ae94270abb071d783823264dbb8eeb136374f79f0689e16246826ecd31e4f03410d2b2951eb9766121d0c053615a3e422c1a SHA512 6943800ab239efa86373d1797654f16ce739c4225282565bc2156c6511a7433e4915446c6d777abd470f26021de943bd08b021b2e3f897285ff8639d8daad3a7
 EBUILD rouge-3.8.0.ebuild 917 BLAKE2B 7d5479ce54b4372c4d71cad96f2f012c9a013c5a5ada37d930a4b3299c69fe90c9ad78145da3103100a0b7806c69bdc3e2b6cf6c6d937734e0999bbaef67c2b4 SHA512 7880f210d33664bb78b41b3104b8ed2cb841e7bccb4e2531d21d6ba332f054ef8d37b80fcbaf0bcbda432980193646ed23d496687c357e1ef5be2a118d409b1b
-EBUILD rouge-3.9.0.ebuild 908 BLAKE2B a3f66937961884c778a7f04f2d4f95176a5eb1174eaaf3c54757b0bf107a7f0f60e9fb7973ce09914366900ad88aa8cc31aa0ff309963eeef3488cb6cce44f0c SHA512 cab4125cf3881500b377d4f47dee076fc47b2b60f429b87a094e7de4e566c23ea069a74ffb1bdffa4cb15fca98e3a45270fa752b6ded98e4d6140e4be336a719
+EBUILD rouge-3.9.0.ebuild 913 BLAKE2B fe2d37fc8735345fac19e60ce5b46ff6fcf94cf6ef22c25945200052d1c393aa1a12f31fd4ae97c8ed7a07a0b5f7bfdb445e19586a3da6ade989e63203f44e1c SHA512 b24e888ffd39d16b8286c36621ce07cf8830b4c6414ae18f823a43c3c145d0a24a954027161c266f881707125da0a674b43842854f9a8ed39b853f652dd9cc5d
 MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-3.9.0.ebuild b/dev-ruby/rouge/rouge-3.9.0.ebuild
index 645508576068..461a3735117a 100644
--- a/dev-ruby/rouge/rouge-3.9.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.9.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="2"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-ruby/ruby-clutter-gdk/Manifest b/dev-ruby/ruby-clutter-gdk/Manifest
index b252e715da25..ea2794368623 100644
--- a/dev-ruby/ruby-clutter-gdk/Manifest
+++ b/dev-ruby/ruby-clutter-gdk/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
 DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-clutter-gdk-3.3.2.ebuild 531 BLAKE2B d593a67d004ca527c6861db89999d8fbc765e95bfc1b1c02f9623245bb3c73c670445a9117eb280c46f247427c006fde022774b1aafb9c47451ec9757a341000 SHA512 5d26fab2a8aeadd63b4065b77412929e77f83759a4acf4822b600e64b8007373a1acea5bb7f68d97ca0498ea6e8d64eccc27ccd389c9e5312f9aab7cceb99015
 EBUILD ruby-clutter-gdk-3.3.6.ebuild 525 BLAKE2B af61c0c8d3871153c8412219d844c5c61b0dafc9ab143b6b817aebfdc482b614e374c69dd9f3c488dd351b5e60647265ec3b3d2c6f823cf04c5a7079f8c5c26c SHA512 6826afe5072a09f0a243d315d91f0080a84b51a5671543fa8486218646acc75017bcb624a37371cd7f6603c1f9ff5cdb7ddacbc6d3286ee48c3b696a0ad3c75d
+EBUILD ruby-clutter-gdk-3.3.7.ebuild 525 BLAKE2B af61c0c8d3871153c8412219d844c5c61b0dafc9ab143b6b817aebfdc482b614e374c69dd9f3c488dd351b5e60647265ec3b3d2c6f823cf04c5a7079f8c5c26c SHA512 6826afe5072a09f0a243d315d91f0080a84b51a5671543fa8486218646acc75017bcb624a37371cd7f6603c1f9ff5cdb7ddacbc6d3286ee48c3b696a0ad3c75d
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.7.ebuild b/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.7.ebuild
new file mode 100644
index 000000000000..0dcb0dfa89ea
--- /dev/null
+++ b/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.3.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby binding of GDK specific API of Clutter"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter-gdk
+
+RDEPEND+=" media-libs/clutter[gtk]"
+
+ruby_add_rdepend ">=dev-ruby/ruby-clutter-${PV}
+	>=dev-ruby/ruby-gdk3-${PV}"
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-clutter-gstreamer/Manifest b/dev-ruby/ruby-clutter-gstreamer/Manifest
index ad521a2b82fa..8090eeb1a012 100644
--- a/dev-ruby/ruby-clutter-gstreamer/Manifest
+++ b/dev-ruby/ruby-clutter-gstreamer/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
 DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-clutter-gstreamer-3.3.2.ebuild 1008 BLAKE2B 30cb45a06a3d2a59b38a6a8cd1dce565e5bded38eb4b5ad82c329ad5cfdd9bae766531d507fac8958601f9244afcd7ef71661bffc28c8f707432d518f88b8a3a SHA512 8be5a67eb339a02fb5dd1f4758286391f827242865f422a7e036aa0d22eaecf881f7e579b254c891eb5a696a1827a5166b5945fec5761eaeb5bc84a2310fbef0
 EBUILD ruby-clutter-gstreamer-3.3.6.ebuild 1002 BLAKE2B 6b348e5b5868081ce66fc61aaae963c758a17b3ec638a9d9a22d58af73bc469740d0c68c7803485086632f741784d99c3b3f3d3e231e728b21ae1c39e3d301cd SHA512 ac86136c4d0a6d0f0269d07cdbe4133f15e91564fd3462e2da95d000a79c223074577059f784996f1eb81edeb2ee79eabc11166c4db0861b34f06199d060a5b6
+EBUILD ruby-clutter-gstreamer-3.3.7.ebuild 1002 BLAKE2B 6b348e5b5868081ce66fc61aaae963c758a17b3ec638a9d9a22d58af73bc469740d0c68c7803485086632f741784d99c3b3f3d3e231e728b21ae1c39e3d301cd SHA512 ac86136c4d0a6d0f0269d07cdbe4133f15e91564fd3462e2da95d000a79c223074577059f784996f1eb81edeb2ee79eabc11166c4db0861b34f06199d060a5b6
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.7.ebuild b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.7.ebuild
new file mode 100644
index 000000000000..2dbf1ed25069
--- /dev/null
+++ b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.3.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter-gstreamer
+
+DEPEND+=" media-libs/clutter-gst"
+RDEPEND+=" media-libs/clutter-gst:*"
+
+ruby_add_rdepend ">=dev-ruby/ruby-clutter-${PV}
+	>=dev-ruby/ruby-gstreamer-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		../gobject-introspection/test/gobject-introspection-test-utils.rb \
+		../clutter/test/clutter-test-utils.rb \
+		test/clutter-gstreamer-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-clutter-gtk/Manifest b/dev-ruby/ruby-clutter-gtk/Manifest
index 99f5dfc1ee60..d2fb37aa22f4 100644
--- a/dev-ruby/ruby-clutter-gtk/Manifest
+++ b/dev-ruby/ruby-clutter-gtk/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
 DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-clutter-gtk-3.3.2.ebuild 1081 BLAKE2B 3ed182d8fa5f6d6365952a91faf49298ba7e3e511219e3800b169e1c6401bd54d42e7ede6b8dd4923d69e809ab967a19706e896f0419bdb8455b1c805fdddef8 SHA512 dee9e8aaeaf5d1edfd5c1e4db036f048c31168c1a8e2619e8ee7bc53e558c392d7534f09ff631d28252be48d3310ecde4bde2d659d1e48a2a7cf29b5b9b35012
 EBUILD ruby-clutter-gtk-3.3.6.ebuild 1075 BLAKE2B 5c0b5b33df1c163dfe6e06a7b9a5802c69c24c294a2b808a49f3909b826d3a23ceb8c174b87beb7202f0b97f0789756f1cfe9a945b7d737d25b20bc819e3951e SHA512 85e67d0fb6827f99347e7eee4fd6211bdea308f72699ec0ee50c2412ee43303b241d5792fbc7e838e5b591ee19a9be947ac327b2b9a5195ad7705d0256a9396b
+EBUILD ruby-clutter-gtk-3.3.7.ebuild 1075 BLAKE2B 5c0b5b33df1c163dfe6e06a7b9a5802c69c24c294a2b808a49f3909b826d3a23ceb8c174b87beb7202f0b97f0789756f1cfe9a945b7d737d25b20bc819e3951e SHA512 85e67d0fb6827f99347e7eee4fd6211bdea308f72699ec0ee50c2412ee43303b241d5792fbc7e838e5b591ee19a9be947ac327b2b9a5195ad7705d0256a9396b
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.7.ebuild b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.7.ebuild
new file mode 100644
index 000000000000..aa266f055b4b
--- /dev/null
+++ b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.3.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter-gtk
+
+DEPEND+=" media-libs/clutter-gtk[gtk]"
+RDEPEND+=" media-libs/clutter-gtk[gtk]"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-clutter-gdk-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-clutter-${PV}
+	>=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		../gobject-introspection/test/gobject-introspection-test-utils.rb \
+		../clutter/test/clutter-test-utils.rb \
+		test/clutter-gtk-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-clutter/Manifest b/dev-ruby/ruby-clutter/Manifest
index 5dea2311098a..22eaf3b74ef2 100644
--- a/dev-ruby/ruby-clutter/Manifest
+++ b/dev-ruby/ruby-clutter/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
 DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-clutter-3.3.2.ebuild 1212 BLAKE2B c996c36e81d46814ed5a34da846efc1ebb5b82fdddd6ca1b7d2af35f99dad330dc183d3bf994e759da2907d173b36ab21e74f61c78f087bc16a0b2d6f5fdcd3e SHA512 d3cfdb0bb93ec57c7f096df993fb7a8688ba40f16509ca7d6d1394a41b1ff6c1e0b2c4c4735f6f151851fe7845bb75f67aa7c058a07f4d119de46df112c2ffb9
 EBUILD ruby-clutter-3.3.6.ebuild 1206 BLAKE2B cc7f77bbf14ba2c0a7cfc084caecf4d2f2ebe69e3dbf263fb9fd1fa5d9152e32f1cc8ff2eaa8fb6acae9a7df29f3d0273dc84c40dedf76c514ddb1bd8c11a542 SHA512 e47f63468488e28186e9e44fa3210668adc143d13f044ceddee69184256750437e3f624ad77b67e3cde02b36490339b7d05724c831e18ad3c1ba1049ad924150
+EBUILD ruby-clutter-3.3.7.ebuild 1206 BLAKE2B cc7f77bbf14ba2c0a7cfc084caecf4d2f2ebe69e3dbf263fb9fd1fa5d9152e32f1cc8ff2eaa8fb6acae9a7df29f3d0273dc84c40dedf76c514ddb1bd8c11a542 SHA512 e47f63468488e28186e9e44fa3210668adc143d13f044ceddee69184256750437e3f624ad77b67e3cde02b36490339b7d05724c831e18ad3c1ba1049ad924150
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-clutter/ruby-clutter-3.3.7.ebuild b/dev-ruby/ruby-clutter/ruby-clutter-3.3.7.ebuild
new file mode 100644
index 000000000000..90000c969b9a
--- /dev/null
+++ b/dev-ruby/ruby-clutter/ruby-clutter-3.3.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter
+
+DEPEND+=" media-libs/clutter"
+RDEPEND+=" media-libs/clutter"
+
+ruby_add_bdepend ">=dev-ruby/ruby-atk-${PV}
+	>=dev-ruby/ruby-gdkpixbuf2-${PV}
+	>=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-gobject-introspection-${PV}
+	>=dev-ruby/ruby-pango-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-cairo-gobject-${PV}
+	>=dev-ruby/ruby-gobject-introspection-${PV}
+	>=dev-ruby/ruby-pango-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		../gobject-introspection/test/gobject-introspection-test-utils.rb \
+		../cairo-gobject/test/cairo-gobject-test-utils.rb \
+		test/clutter-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-gnome2/Manifest b/dev-ruby/ruby-gnome2/Manifest
index e5d45970ecef..f07ae0d5c3ca 100644
--- a/dev-ruby/ruby-gnome2/Manifest
+++ b/dev-ruby/ruby-gnome2/Manifest
@@ -1,3 +1,4 @@
 EBUILD ruby-gnome2-3.3.2.ebuild 1017 BLAKE2B cd0e8a1444124910a0a91fb06ddb68c31f15177c13f05b8c387cae90f691be1785361f4ef82e952bf36ff41cc62c42375b398859d133d7f9254dbe2f5b839d0d SHA512 8e7c88e37b24c7f8db9da7285c9d2c342ac0c1e64638e49786064a68d65cb4ec8a45b413c052edd48afad4fe24528ee2957141eeccf813b07ea9584ba9e83a10
 EBUILD ruby-gnome2-3.3.6.ebuild 1011 BLAKE2B 7628e3a09af9706f626f4b6e60e75180027f926ec30e0cb100f77b47b15178d349234e2070345487263ca341ed780c94a891737bf62ee5351f90b687e3effc9a SHA512 94607e8b51c6ebee5ff6fd9cd2065051bb84955a52ac0bac4150486857b6e403f433c2eee2e0bd95d9a354aecbb393d5d2ba4d9fb0ba8a184e4b17f0c6e87ee7
+EBUILD ruby-gnome2-3.3.7.ebuild 1011 BLAKE2B 7628e3a09af9706f626f4b6e60e75180027f926ec30e0cb100f77b47b15178d349234e2070345487263ca341ed780c94a891737bf62ee5351f90b687e3effc9a SHA512 94607e8b51c6ebee5ff6fd9cd2065051bb84955a52ac0bac4150486857b6e403f433c2eee2e0bd95d9a354aecbb393d5d2ba4d9fb0ba8a184e4b17f0c6e87ee7
 MISC metadata.xml 335 BLAKE2B 5707a3055ed527b5df006003c21be9700e45bcd9f59990b9b685a908fb7014f17bdbc99f79c8892c234a291c0c47585ddcff5c9401dc0d87dca03d1abab1778c SHA512 fa2c5a187e5c868de7f4b9b5398c248f325f1b3d0b2a490d782f2406fb9f587d0150ad4f91b7738d7d856ee8ffc18529f7a38590aa1774faaad3dd22a68b8af6
diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.7.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.7.ebuild
new file mode 100644
index 000000000000..e7a6d40efe5a
--- /dev/null
+++ b/dev-ruby/ruby-gnome2/ruby-gnome2-3.3.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng
+
+DESCRIPTION="Ruby Gnome2 bindings"
+HOMEPAGE="http://ruby-gnome2.sourceforge.jp/"
+SRC_URI=""
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/ruby-atk-${PV}
+	>=dev-ruby/ruby-clutter-${PV}
+	>=dev-ruby/ruby-clutter-gstreamer-${PV}
+	>=dev-ruby/ruby-clutter-gdk-${PV}
+	>=dev-ruby/ruby-clutter-gtk-${PV}
+	>=dev-ruby/ruby-gdkpixbuf2-${PV}
+	>=dev-ruby/ruby-gdk3-${PV}
+	>=dev-ruby/ruby-gio2-${PV}
+	>=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-gobject-introspection-${PV}
+	>=dev-ruby/ruby-gstreamer-${PV}
+	>=dev-ruby/ruby-gtk2-${PV}
+	>=dev-ruby/ruby-gtk3-${PV}
+	>=dev-ruby/ruby-gtksourceview-${PV}
+	>=dev-ruby/ruby-gtksourceview3-${PV}
+	>=dev-ruby/ruby-pango-${PV}
+	>=dev-ruby/ruby-poppler-${PV}
+	>=dev-ruby/ruby-rsvg-${PV}
+	>=dev-ruby/ruby-vte-${PV}
+	>=dev-ruby/ruby-vte3-${PV}
+	>=dev-ruby/ruby-webkit2-gtk-${PV}"
diff --git a/dev-ruby/ruby-gstreamer/Manifest b/dev-ruby/ruby-gstreamer/Manifest
index c7e27b0dd323..d3f901c27e9a 100644
--- a/dev-ruby/ruby-gstreamer/Manifest
+++ b/dev-ruby/ruby-gstreamer/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
 DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-gstreamer-3.3.2.ebuild 886 BLAKE2B a53c045d7edd7d64a98b1c5710fb8ec1f442256ab277a0537df2ff2f9deb1cb8abab6c9886858187eadc1f3edb341aca1e298a049692abdda68931aa6262bf6d SHA512 56a244610a3de81622d71896c83909b09f045df43faf940f8606f382c522bc673dc5379c5739f08686b2638b8bbed781974f7c585d0aa68abb05bf20e82ed155
 EBUILD ruby-gstreamer-3.3.6.ebuild 873 BLAKE2B 556cacc9348250bdf6a6d7beacc056a1875728e17c02cf0c707c7a557238f42bd07890ef1d5d7e91761e1cf970f3e3ef04f1e63056b9af09bf9b52c83da64e9f SHA512 4d1a1bb17f0417ed6d3cb19685f466d1f16e3c7f5782894da9501e8fe7e4a363ebb73c6e042babd06bec3e0b23170021c8db7fefb60c570104bddfe9fccd153a
+EBUILD ruby-gstreamer-3.3.7.ebuild 873 BLAKE2B 556cacc9348250bdf6a6d7beacc056a1875728e17c02cf0c707c7a557238f42bd07890ef1d5d7e91761e1cf970f3e3ef04f1e63056b9af09bf9b52c83da64e9f SHA512 4d1a1bb17f0417ed6d3cb19685f466d1f16e3c7f5782894da9501e8fe7e4a363ebb73c6e042babd06bec3e0b23170021c8db7fefb60c570104bddfe9fccd153a
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.7.ebuild b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.7.ebuild
new file mode 100644
index 000000000000..93583053003c
--- /dev/null
+++ b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.3.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby GStreamer bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0"
+DEPEND="${DEPEND}
+	dev-libs/gobject-introspection
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-glib2-${PV}
+	~dev-ruby/ruby-gobject-introspection-${PV}
+"
+
+all_ruby_prepare() {
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gtk2/Manifest b/dev-ruby/ruby-gtk2/Manifest
index b9085fb26b5c..9bf10d7d8161 100644
--- a/dev-ruby/ruby-gtk2/Manifest
+++ b/dev-ruby/ruby-gtk2/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
 DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-gtk2-3.3.2.ebuild 1018 BLAKE2B 04564e48ecdc2e1effe0709e127e9db77df3b238d68dadbf359c246ed286d4edf09e3a0f68f54462e575b8846ae1c53128a751a8febd83c83accfde1660daeac SHA512 a9121c567b3dcc027831da18a97f83f93c22cf4e5d8bf2aadd4f5eee917aefdccf30829a23b431966a3b997bc48b52be733c6990834b98aca120a9706db4537a
 EBUILD ruby-gtk2-3.3.6.ebuild 1005 BLAKE2B da1bc877607fce36ea597f5bf8d4739fe30be2945d9a780b832e9b13ac3e82aded631d37c5e78f4fb85fd87acaf8c754a02b41634e523912d315d8a649a454bf SHA512 ce95fc881be56582d461ca50e67a26674e1f1a7e2fd01f3faabc581ba720371997d27f932f668cb79818931018708dee7438c4823570e8ab96a5f7c38f79424b
+EBUILD ruby-gtk2-3.3.7.ebuild 1005 BLAKE2B da1bc877607fce36ea597f5bf8d4739fe30be2945d9a780b832e9b13ac3e82aded631d37c5e78f4fb85fd87acaf8c754a02b41634e523912d315d8a649a454bf SHA512 ce95fc881be56582d461ca50e67a26674e1f1a7e2fd01f3faabc581ba720371997d27f932f668cb79818931018708dee7438c4823570e8ab96a5f7c38f79424b
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.7.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.7.ebuild
new file mode 100644
index 000000000000..42e6773e7dff
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/ruby-gtk2-3.3.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk2 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:2
+	x11-themes/hicolor-icon-theme"
+RDEPEND+=" x11-libs/gtk+:2"
+
+ruby_add_rdepend "
+	>=dev-ruby/ruby-gdkpixbuf2-${PV}
+	>=dev-ruby/ruby-atk-${PV}
+	>=dev-ruby/ruby-pango-${PV}"
+
+all_ruby_prepare() {
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+
+	# Use standard icon
+	sed -i -e 's/"find"/"call-start"/' test/test_gtk_icon_theme.rb || die
+
+	# Fix search path for gtk-2.0 on Gentoo
+	sed -i -e "/include_paths =/ s:]$:,'/usr/include/gtk-2.0']:" ext/gtk2/extconf.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gtk3/Manifest b/dev-ruby/ruby-gtk3/Manifest
index 03e480675f4a..3ca2e72c5ed7 100644
--- a/dev-ruby/ruby-gtk3/Manifest
+++ b/dev-ruby/ruby-gtk3/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
 DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-gtk3-3.3.2.ebuild 1072 BLAKE2B 0396307ff637c97255164ab7aa03f0c446ea739db81a8c34ed9ffb5c02aa2a781c1ae9ad6ca7e62a14a91465bd495f9eece9f81277a64fb35c95f605f49ad004 SHA512 32ea33da483e5b80a260cb165d4c41d7d096a610fe64074fb51646d3a3a9d5906674f08e5c7d507be8d7b6e0c6b3c3b1c46481baf6043cbbf6debcd991429041
 EBUILD ruby-gtk3-3.3.6.ebuild 1059 BLAKE2B 6d71e9bf50f99dacacc4f694372eea8c15432bad890d8c1959878bc622ed7599861cafd276fc453a0522f9bde1b0e4ae40155a70596264ed8a5083bc6a1b5c0b SHA512 eadbf5049428480ffefb2bfbd57b01face82bd8f22078f26ecd67b425652a4fb57242bd6d8ad2240c7abf7311010b9dc909491073a5a8af35fd0ea35320e981c
+EBUILD ruby-gtk3-3.3.7.ebuild 1059 BLAKE2B 6d71e9bf50f99dacacc4f694372eea8c15432bad890d8c1959878bc622ed7599861cafd276fc453a0522f9bde1b0e4ae40155a70596264ed8a5083bc6a1b5c0b SHA512 eadbf5049428480ffefb2bfbd57b01face82bd8f22078f26ecd67b425652a4fb57242bd6d8ad2240c7abf7311010b9dc909491073a5a8af35fd0ea35320e981c
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.7.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.7.ebuild
new file mode 100644
index 000000000000..256dc2c7b9a1
--- /dev/null
+++ b/dev-ruby/ruby-gtk3/ruby-gtk3-3.3.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk3 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:3"
+RDEPEND+=" x11-libs/gtk+:3"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-pango-${PV}"
+
+ruby_add_rdepend "
+	>=dev-ruby/ruby-atk-${PV}
+	>=dev-ruby/ruby-gdk3-${PV}
+	>=dev-ruby/ruby-gdkpixbuf2-${PV}
+	>=dev-ruby/ruby-gio2-${PV}
+	>=dev-ruby/ruby-pango-${PV}
+"
+
+all_ruby_prepare() {
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/which make/,/^    end/ s:^:#:' test/run-test.rb || die
+
+	# Use standard icon
+	sed -i -e 's/"find"/"call-start"/' test/test-gtk-icon-theme.rb || die
+	sed -i -e 's/"search"/"system-search"/' test/test-gtk-icon-theme.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gtksourceview/Manifest b/dev-ruby/ruby-gtksourceview/Manifest
index c9b9df4a4cf9..cbe84040cbd3 100644
--- a/dev-ruby/ruby-gtksourceview/Manifest
+++ b/dev-ruby/ruby-gtksourceview/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
 DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-gtksourceview-3.3.2.ebuild 815 BLAKE2B 997eb6024d13581159e479b2db87e3aef20ea9a48c83160f05d27322bd5d924db51f5510e7b62659e97916d8b8112d01e50ccf13136dd246ceb16ecc6081c930 SHA512 e59292866149513b2d5ae7d9c6fa1e4aafb411c0f32add6202bd7ce8f22827e6065f77c4e537bcae1d083c2355941e6b2ffbba4626e108b8251db72829c88919
 EBUILD ruby-gtksourceview-3.3.6.ebuild 802 BLAKE2B daa89eda65fd5e5d67e49a67743fe8e4c01b5d3f57ab6b664cccb8c1dd9cd028ca90908881b022dc61e18cdb2d73d31ca40020db98fcbf681984f30e7873d030 SHA512 2320b07164ae55eb7b1d81dfeeeb410b6600c388123227f1539c8499ca60253fe2ed643905bf8a2e7478765d435aee1d0a06a2e84b5ff08a645f7582af597e38
+EBUILD ruby-gtksourceview-3.3.7.ebuild 802 BLAKE2B daa89eda65fd5e5d67e49a67743fe8e4c01b5d3f57ab6b664cccb8c1dd9cd028ca90908881b022dc61e18cdb2d73d31ca40020db98fcbf681984f30e7873d030 SHA512 2320b07164ae55eb7b1d81dfeeeb410b6600c388123227f1539c8499ca60253fe2ed643905bf8a2e7478765d435aee1d0a06a2e84b5ff08a645f7582af597e38
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.7.ebuild b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.7.ebuild
new file mode 100644
index 000000000000..c1d95dd86692
--- /dev/null
+++ b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.3.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_NAME="gtksourceview2"
+
+inherit virtualx ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/gtksourceview2
+
+DESCRIPTION="Ruby bindings for gtksourceview"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" x11-libs/gtksourceview:2.0"
+DEPEND+=" x11-libs/gtksourceview:2.0"
+
+ruby_add_rdepend ">=dev-ruby/ruby-gtk2-${PV}"
+
+all_ruby_prepare() {
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gtksourceview3/Manifest b/dev-ruby/ruby-gtksourceview3/Manifest
index e1b99d0bcd5a..53891c134a08 100644
--- a/dev-ruby/ruby-gtksourceview3/Manifest
+++ b/dev-ruby/ruby-gtksourceview3/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
 DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-gtksourceview3-3.3.2.ebuild 727 BLAKE2B 2daa72f2ec478c0924d1ce2094d3f6d881d047cc4924be941090d203a4fc4eef4b1c49243bdc5ca916539fd2ca6b4d0c4196f64f9baf141ad6b73a03deeaf7ad SHA512 3ad1e4ab4ce60f89f85d0ec2375552b118e4414b7c44fe71dca9464303a7609db076789953060a250ce0516fdeb8b0f37cf45e6ce42fa69a19f9d89307b479de
 EBUILD ruby-gtksourceview3-3.3.6.ebuild 721 BLAKE2B 8c81601408089f03b75d4469b21ca7b3af27541f6dbc396e709db42ce42479a9f59652eaf01e58f743072a7b7293097b77b69b819d149647c780d34edf816040 SHA512 a2011d64e90afb71d6cea87b33f090e179f9c9bae2de86a3df1d9fa94e083456e4641aee062af066cf7900fc37b92801d2616f4f967777e38972c2664e58882d
+EBUILD ruby-gtksourceview3-3.3.7.ebuild 721 BLAKE2B 8c81601408089f03b75d4469b21ca7b3af27541f6dbc396e709db42ce42479a9f59652eaf01e58f743072a7b7293097b77b69b819d149647c780d34edf816040 SHA512 a2011d64e90afb71d6cea87b33f090e179f9c9bae2de86a3df1d9fa94e083456e4641aee062af066cf7900fc37b92801d2616f4f967777e38972c2664e58882d
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.7.ebuild b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.7.ebuild
new file mode 100644
index 000000000000..4a285a492de9
--- /dev/null
+++ b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.3.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk3 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtksourceview:3.0"
+RDEPEND+=" x11-libs/gtksourceview:3.0"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-vte/Manifest b/dev-ruby/ruby-vte/Manifest
index 8351fa0398a0..a8b0d28e99c3 100644
--- a/dev-ruby/ruby-vte/Manifest
+++ b/dev-ruby/ruby-vte/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
 DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-vte-3.3.2.ebuild 531 BLAKE2B 47f1522ec5c9056969a16ee4807bbbd629a12101bb6237f8bbc3336b7a4a1a3853f1f4adf86e2f48e1f908cfecd9ba64b8d703de49f69793e7c27411dc6ff485 SHA512 d26c9667379595634cb0203d664007d8f4a116ba566ec060868631bc2d123fa24ae2cd09bcc4216d722f553a2307932ea55d6e6bd3a133e8e39bb28ccf2132ad
 EBUILD ruby-vte-3.3.6.ebuild 518 BLAKE2B 6d178feb4fcf51713df3a6bcaaf493dbb12110cdf0f6727e92c7b04eedd266e6dee2469956cf6aa2f88c97af12f9bd4b30b7b142e13cbdcc768aa130dd61056d SHA512 721336db9763a4b173590abf6e8e0f54dbbc45cdd102f959b88a6d1a7d4114ed8bb086f194ebe15232ea69f8a7aa19fd7f46154cee2d86ce7981c16994f8f814
+EBUILD ruby-vte-3.3.7.ebuild 518 BLAKE2B 6d178feb4fcf51713df3a6bcaaf493dbb12110cdf0f6727e92c7b04eedd266e6dee2469956cf6aa2f88c97af12f9bd4b30b7b142e13cbdcc768aa130dd61056d SHA512 721336db9763a4b173590abf6e8e0f54dbbc45cdd102f959b88a6d1a7d4114ed8bb086f194ebe15232ea69f8a7aa19fd7f46154cee2d86ce7981c16994f8f814
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-vte/ruby-vte-3.3.7.ebuild b/dev-ruby/ruby-vte/ruby-vte-3.3.7.ebuild
new file mode 100644
index 000000000000..d1099f2a49c3
--- /dev/null
+++ b/dev-ruby/ruby-vte/ruby-vte-3.3.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby vte bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" >=x11-libs/vte-0.12.1:0"
+DEPEND+=" >=x11-libs/vte-0.12.1:0"
+
+ruby_add_rdepend ">=dev-ruby/ruby-gtk2-${PV}"
+
+all_ruby_prepare() {
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+}
diff --git a/dev-ruby/ruby-vte3/Manifest b/dev-ruby/ruby-vte3/Manifest
index 872d51184229..3d9cfd183b18 100644
--- a/dev-ruby/ruby-vte3/Manifest
+++ b/dev-ruby/ruby-vte3/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
 DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-vte3-3.3.2.ebuild 730 BLAKE2B d4a4580f7e71449e0f9e0e8c1eced6811bc4e7b35d4c2dbc048387891819f75dc19b115fa768f7e980de5eae3caeba278c762532232273ca46b01ab887d26e42 SHA512 85c94216109cfa3a07639eb1ea811cfec737d8eda04ee743944e635041ab8204cf24da4f417c26c233f6fafb8fe8c4a3ef479cabaa6ba5710150cac29051d82f
 EBUILD ruby-vte3-3.3.6.ebuild 724 BLAKE2B 5e946d2c76b685374b40bec6f67e2f44e9acf7d07d84d2d8facf27d57822ec2817ea37ed404631e962a22a2e3a831a92fc04963814e2df4c926b8af884468999 SHA512 4a02a712d4c7552079e01e2095d1b913aa1ada12f99d1938c4221a599919d330adcb24f1abefa759ecf2eb8d6bc21f4cebab72a67986aa4bf2df8c7e06b9a979
+EBUILD ruby-vte3-3.3.7.ebuild 724 BLAKE2B 5e946d2c76b685374b40bec6f67e2f44e9acf7d07d84d2d8facf27d57822ec2817ea37ed404631e962a22a2e3a831a92fc04963814e2df4c926b8af884468999 SHA512 4a02a712d4c7552079e01e2095d1b913aa1ada12f99d1938c4221a599919d330adcb24f1abefa759ecf2eb8d6bc21f4cebab72a67986aa4bf2df8c7e06b9a979
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-3.3.7.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-3.3.7.ebuild
new file mode 100644
index 000000000000..f37e95963cdd
--- /dev/null
+++ b/dev-ruby/ruby-vte3/ruby-vte3-3.3.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby VTE bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/vte:2.91"
+RDEPEND+=" x11-libs/vte:2.91"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+
+	# Avoid tests that require a real pty.
+	rm -f test/test-pty.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-webkit2-gtk/Manifest b/dev-ruby/ruby-webkit2-gtk/Manifest
index a4b444b07e6c..e29ed4abffd3 100644
--- a/dev-ruby/ruby-webkit2-gtk/Manifest
+++ b/dev-ruby/ruby-webkit2-gtk/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
 DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-webkit2-gtk-3.3.2.ebuild 994 BLAKE2B 8b3df54bf34a5a6140c06ebd29ba018e8eb27ec4adbfaaa31bf1593a5281f27762fa3b86361e33c375edd1443b67c7a9813c877bf4dbebaee9efef6f6121ecfa SHA512 662f6428335822cf5dd61106eab0119594a996475fe7cfccb52d61ec559f9914410787130d6ee7b7bcae742a34a0b52434f6ea14b8c9c5d426731e42fae38cee
 EBUILD ruby-webkit2-gtk-3.3.6.ebuild 988 BLAKE2B e4695f137172f82760865791aa479d0aa666b5bd2bfe4dd2fc16597a189049ce13ebcf8b578a0596ec1d14634f52724d3fd4635748c66ea727c5b6379390ba83 SHA512 2f7abe6ba541f8b5c9db790855a5ff0cbca366387b472cbeee43c22098cda16f215127de8ce8dd6f4219ee087ca95ce6c5d48543820de1c86a38686a254dc056
+EBUILD ruby-webkit2-gtk-3.3.7.ebuild 988 BLAKE2B e4695f137172f82760865791aa479d0aa666b5bd2bfe4dd2fc16597a189049ce13ebcf8b578a0596ec1d14634f52724d3fd4635748c66ea727c5b6379390ba83 SHA512 2f7abe6ba541f8b5c9db790855a5ff0cbca366387b472cbeee43c22098cda16f215127de8ce8dd6f4219ee087ca95ce6c5d48543820de1c86a38686a254dc056
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.7.ebuild b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.7.ebuild
new file mode 100644
index 000000000000..ecbbba403394
--- /dev/null
+++ b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.3.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby WebKitGtk+ for Gtk 3.0 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" net-libs/webkit-gtk:4"
+RDEPEND+=" net-libs/webkit-gtk:4"
+
+RUBY_S="ruby-gnome2-all-${PV}/webkit2-gtk"
+
+ruby_add_rdepend ">=dev-ruby/ruby-gobject-introspection-${PV}
+	>=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		../gobject-introspection/test/gobject-introspection-test-utils.rb \
+		test/webkit2-gtk-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/"Makefile"/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	DCONF_PROFILE="${T}" virtx ${RUBY} test/run-test.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/temple/Manifest b/dev-ruby/temple/Manifest
index d872118a2590..9b154c1cbe0c 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -1,5 +1,7 @@
 DIST temple-0.8.0.gem 39424 BLAKE2B 48df1f38a2df12871b13a8592afecf93fdd7c13497491d86c52eb2e06d47768403a1c8e7ca6201d73f319a9f27d65ae08f15c6c177b1b6e5d73b37483f01a4ca SHA512 ad57c484de78f029797fbf4331fa9c24247d6cec2e3dea447d394a104eb9496c91af45f505b720da1c4242845d94b34b626ca586c625cd126f72d1e4296ab2a6
 DIST temple-0.8.1.gem 39424 BLAKE2B 45bd26e0b05d51c96002e38044e3444c262df0b00aee4417c06ec0489a240c31557268b5fd8dcd58a70525eed11a5ef768913c1d45ecf299020c8f75e7ef5d42 SHA512 fbbdcedcce11dab18e0644702456729fe4f0b54f072c5773660614362d6033cadde06480fcce27743e80c73d26827c9947498d7ddb19fa73ec3b3dd6dc61fc27
+DIST temple-0.8.2.gem 39424 BLAKE2B a56db910d1d4d52495806e907c74052c04e6b4843d040adc33a7f6dc28a25a02231c4c9bd41723c8e1abe6624d4d55375c2a429514a87fa4f7a7a8dcb6377796 SHA512 51923b3bf9d4c05255131be62f567ca21305ba023ea5395a08d6970236b2a2833b058f7b3906046b8a57a224b368de12a6d5e426effca39324670fb632f33b67
 EBUILD temple-0.8.0.ebuild 654 BLAKE2B b7ce0b036d9068d1b79582cd6c53b56eb5ae5e5efee95546a8d2dfae3755b0f222854045108e1e23136f3db05c5843fdb96d18e9b96684d3c2e170fed5e5afc9 SHA512 85669b5b970a9c98f3ba48cd7e236ec161ef8151ddd7d5c908b35b39e32bb248d3b8e43d52f4f544780d7ec7d7af22b643b967e61817522cb84aad6566ffd892
 EBUILD temple-0.8.1.ebuild 663 BLAKE2B d69236524b8358ff0dda148ad589a2ff8bd878b56553394a634df66f3fd2b877020ba4da289cfab330a472bae4b5063230d46a3cb533d2b3cbc8132bbb5ec38f SHA512 2d4ba428ad2649160d8b2af27d06b343864e04f15e3b1d68214b176434b5d69976564d304684af47f8adf9247ffb9fef82b6b973c538227415411fd8dd713789
+EBUILD temple-0.8.2.ebuild 631 BLAKE2B 4775bd45ed57ce05d017a468291c5deb97f6c84e43f673355ef685e9ffb2f8c2b630d069d5aa5c52122648b38192f803d3e568c8faf02780ba92c77fe3873166 SHA512 f72c5fa473494772dc500efddb5ea1269e4d09c1578e41d7cfe900fc1c4c8a3067a762ef86f068d7a4f1c35e59b486e09be94368b118e1407963c57488ec6731
 MISC metadata.xml 340 BLAKE2B a58482ba0cb0351241c6826bb2014b49b554b28625c9f202dff5dd2c877454bee5a2f11c90cf05ca735def15bc9c7b05edab1ab77fa4dd1f2bf0970c1cc49e1a SHA512 ce7b6d2b6cd7c1d004cea2ffba1a8f74fd53afa3886f9fe248e30a066822cbfb0cf0782f8de1404ac11f492e496bf0ce1b4537aae9804108fbccf4e7382e41fa
diff --git a/dev-ruby/temple/temple-0.8.2.ebuild b/dev-ruby/temple/temple-0.8.2.ebuild
new file mode 100644
index 000000000000..67120bc22174
--- /dev/null
+++ b/dev-ruby/temple/temple-0.8.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby"
+HOMEPAGE="https://github.com/judofyr/temple"
+
+LICENSE="MIT"
+SLOT="0.7"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bacon
+	dev-ruby/erubis
+	>=dev-ruby/tilt-2.0.1 )"
+
+each_ruby_test() {
+	${RUBY} -S bacon -Ilib -Itest --automatic --quiet || die
+}
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index 378336301445..697883ed3e31 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -5,5 +5,5 @@ DIST zeitwerk-2.1.9.tar.gz 92046 BLAKE2B e4b48c9de3ee575d6b82427211e129478c9839d
 EBUILD zeitwerk-1.4.3.ebuild 830 BLAKE2B 7b8d3fa7f20752b2e0caf92e9e63ed1f50ad4e759092d20da1e9d1f4cb8389fba1160b533e21d0b46773152224e2cf69e54488357918353c1fc4bfad6843ba74 SHA512 98529f550a67c791df72a0126a9aaf10d11f1ea427540b4551fa02ad0b4a4ff11c6de51fc25b3d95037cda90896528fcce2634960d931a22f48d0e0481be5004
 EBUILD zeitwerk-2.1.10.ebuild 806 BLAKE2B 11cf162e2234b20c953c36a01b8e45cd5bfb9f4ba159b7b691c1fd73c5a45c878de8da4f23f9c1275fa7c7eb78a5c5c8c0c693c43d97d1fce0be0139541abc92 SHA512 c48ef381cf422ac494cbb740fb9fc5dc4c38d431b87b59fcb4a3128c44eead8fae531e31ab5016d1bf7d8ae288268071f9a60a98a000f7c3ac97ad175afad00e
 EBUILD zeitwerk-2.1.8.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
-EBUILD zeitwerk-2.1.9.ebuild 837 BLAKE2B 7bf9be7188378641b5f9ffef97468f191fd9866f072fba72d9a41b2907c99543ec22a74feb4f838e1e88d74f220e250d33c01f64054f01d42c73bf0c4e288333 SHA512 7e7d2a4641806a5f28a4d2d76c0114abc41a3a12e8b2b0f34935aea53cff835e524e498c8d26145fcfc1b77f8f7bc90a116516a6a81ef3a02be44bf17807aadb
+EBUILD zeitwerk-2.1.9.ebuild 842 BLAKE2B 9c2c4982c124e2a6cccb7341ffaab93e8fa8c37de3a6d67151eb9435e79bf1d114840b9e56d444f33e8719d713f9a6e8f959acb6f3660d14f3ddf81723cb4535 SHA512 59fbbaea778fa6c21a0e4dd22f02cfbc98d8dad80cf00679997c6d91c230f1ac4634c4fd8d6ad1e8ddae46ed001ae71480228a02aa5adbc63946911d432f85b8
 MISC metadata.xml 640 BLAKE2B cdf101dca54d96dc5ce6713aecadb42050e945341cb19ff14088a258384259e5dc4d1668e2a8b161d787d21f79cd8a7c8cbdb47c10997e6ecc3b2ce7ec41497c SHA512 50b6eacea9ea202e3ff44b18046b5db26c5d4ed381664af46f9fecfdedcd69cb470fcc35010a747a21dbaebe1a8360b2f37d43aa22fbba31666704cdd9f39a48
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild
index 6ba2e45be88b..ba6fac43e342 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 16ba19afd552..cfbb77d8cbe9 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/gambit/Manifest b/dev-scheme/gambit/Manifest
index c0a04825243f..c8a8b418ce4e 100644
--- a/dev-scheme/gambit/Manifest
+++ b/dev-scheme/gambit/Manifest
@@ -3,5 +3,5 @@ DIST gambit-v4_8_8.tgz 13272335 BLAKE2B d15bf944c8da3050c1fee6854044d904712075f0
 DIST gambit-v4_9_3.tgz 13736448 BLAKE2B 664e90e3cc2419aa07264ac84abf0aacce43fd2339a72dc502745961a56097b6c161a89d12faa4b88a95841b8d45e37c199438d3fa8b9914db431406cc2d0e4b SHA512 0ee8eb5a2a0b63c0250f4d8d5bcf71d7c57b7444bf1a4c31c084fc9aef6f7932bf607a0a0b835987e7ada3a995cf732cc46593eb4b9dd79fc918358c57c4285f
 EBUILD gambit-4.8.8-r1.ebuild 1262 BLAKE2B eab93729c4a70ede0c25aee2cce40342718f39adec2c4a913775871f0fe08baa4a7a69c331d8c53e191251d8930e9e504c75b6cfdc6f60fb072a1793abe1c4df SHA512 ae4f5b4df3d72634074c882b76f73a7261a46a6978a5fe2387a91d94c3ca56ee1d99042b84e0adf78568938246a8ebb023f809a07eceeb0cda15facc844698b3
 EBUILD gambit-4.8.8-r2.ebuild 1329 BLAKE2B 82479a1bb78ee29382c3d4554c98e318148802f7844e5b2475b860358ea10d21aaa8ce30fa2db5fd137225924d5459157fa597b76afa477a3efe10aeea41531b SHA512 f5e876c31e855dd20e858e21bf02109bcb0144f0047015a0ac022a72381c3f8a34d0b1fa4064601fcfb271afaeb366ee642d7dd5f724322c749b84a2fc04affd
-EBUILD gambit-4.9.3.ebuild 1334 BLAKE2B f83378d8f8a2cc140c552dd82be46cafd88f48160615af8b0f23a81184c62f6933433364240f7bf87f2d8a440d7a5d00f6f7e270c2cd940e28de5b0939df6b8a SHA512 ace7731847b76b3b2147960bfcadf355549d3a8fde0cb8df54fb6918253f7842561361aaa0952adfe7f24a07fc0a304aa11d509dfdf82c5fc8cd9a65152df4ed
+EBUILD gambit-4.9.3.ebuild 1333 BLAKE2B b71d2e811e015ff1a22c5ee3bb003c7eaa60564ef19c1fb135607d6f2f55d2d7f13e36366155a6f9df9a04059602dd489461eea5293eede53e60647fa43d4b5a SHA512 74ccb5f787738f760de4bcdc1ad3e825b621130e59f1d31d5c3aec9861252431fd4b01ea998e111f2c9b87332ad5cee457d78eeddcc8b155c35c4a63195db317
 MISC metadata.xml 251 BLAKE2B 192529903b8f966db2ab52ecc2ca58c2f5d3a18686c070e272a275ab2cb877103675fdf3ed443d4294a78979f7d3afdf53d07d56ffa36247969d480bffb23e9a SHA512 4fda90c4191ba8ea396da2c4a434893d4b9df976a918e4fb5651acaf92c6efc9103b738681a3d29abe801a4ad09eecf5a4b0bd799dab5b5f1e42a34c3b27d918
diff --git a/dev-scheme/gambit/gambit-4.9.3.ebuild b/dev-scheme/gambit/gambit-4.9.3.ebuild
index 79a3ff8279b6..698275f61fc2 100644
--- a/dev-scheme/gambit/gambit-4.9.3.ebuild
+++ b/dev-scheme/gambit/gambit-4.9.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v${PV%.*}/sour
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index d7a740411e76..3c1f78b190e7 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -10,6 +10,6 @@ AUX gauche-rpath.patch 215 BLAKE2B 081374abd3272ae10b7614af92c8f16054c1eaa6fb636
 AUX gauche-xz-info.patch 1322 BLAKE2B f73447a306ec54ff372520c603adf2da46e1b71225a27d09af5c3ae8770431c5fef4d974cbf6e08fa1159807719c798680b18c7f624ec83b33d5ddf8688946f0 SHA512 22b6a37ea23bcba7e4ea4d09f26b069225cc36ef32dc0fbc865cfa4052765d0363811f693d6cc5cc8f3fdf355b93eec7c58934d18b2cb8079cadfd3b0cd4ffa4
 DIST Gauche-0.9.5.tgz 6458675 BLAKE2B ca7f1ad48841a2a6a98632980d8a4fe5065234de5c23835c24e633345ba77fd4d3610d073c00a8da00c1e794e22a74e493793d8fca4a7f3ed1a3161a29622f30 SHA512 6d853d734c7a56a86f0015b1bfef378803d6acc1e0405ed841eab5afc08d1edef736d85df10c86d75fd5fb6b2def684bb1f2095a019133b9f497192f5511197a
 DIST Gauche-0.9.6.tgz 6927530 BLAKE2B 9b32a0db4fc41e2b35331818850e7aa3c1ac5b1294c76caa053abe1ae2da20a0ac4424470ca94626108f996700d1b7e52f6f9e5c6f0a2326f7e6862880f48aa1 SHA512 1d8a7f56fd9ca183d6dce1dedadfaec7c7150c29540e5158f2a61977f7406d7d7a8ab753ef1912865a7d7e9a9e2fa845d86b2eb4c5e07a176f1c60276bc1908f
-EBUILD gauche-0.9.5.ebuild 1264 BLAKE2B 5431d4bca6b19bdaf5097abec31e4ac72799d79de9d694c26480ec0efb116038f4094459963d29612b1e0c85b5a7f20313000e8125fc4f4d8fe4df4dfef2363a SHA512 156a765380e68cbba229cb62423aceeefa040f9089e9059d3d2a02a6e5e2bf0c6abdada8372dca43493fa64148355922567afa00c9fbd6d68257a1eb17e0445f
-EBUILD gauche-0.9.6-r1.ebuild 1286 BLAKE2B 99cf17263f8f2d15920a614e1e971a0011b9bc0e20ca50acdfbf206af8ae5a075552ac9766bc7d5fa64a53095d79006d8a67d4f5b9d66e208f6bda8fe45c9211 SHA512 c64b9008790293453e8ef3df0576a78e095320a294f881097535a84961676a0f26aa19d9fa04cd781e342c77046a4d3d98c67d73aa845eb2ed26ccfbb2f2077f
+EBUILD gauche-0.9.5.ebuild 1286 BLAKE2B 960fb3e9285fccb8d8fee1ae8449f81b0cee12d65ab3c5ea6df4ae6ce8cb1ffaf5d0a482e2555bde44578a6194bbdc6cc116707f0fbe0ce8852fb0e18cff0586 SHA512 bf77dbcb3edf3678c9cec171a8158e6f06951c2a5c0446c0238423431707ca4dfcf20ee82d9f79a19a04121a7778e3487e55168dc8a326a9bb2d5890584927ec
+EBUILD gauche-0.9.6-r1.ebuild 1310 BLAKE2B 11156ccc173cd9d60466f8fa04d816df140f95a66410c5bf28a491dfab6e8bd6845af251d7d27aaa2c88666981f7926aa5e8e933f1ba4a1e38155f41d7eeda81 SHA512 4d260286193cfcbada479e8c7051f44f7ce5c7e9cb02367ed4af55100a0bc0322f4f2ca2a512cdff92fdc7d3d2e521f1027759e86d46e21c0f16e7daff746f33
 MISC metadata.xml 909 BLAKE2B faaf122e0b844cf34bb8b4417cc5e5728e37bcd14a4717d23e42770d6ce2c732724f46f48e01e32684f2f229ea560e2968c11e86473eba50c93dd1184d110cd5 SHA512 031f92387b4dec50e4b534d70c15e70b2a0f7e4ffa9e8a70a47ed9467bcbc4bc57b2210ff50b0e49c1ed73028d6eee4dfd28994cd8e23bdf041364f052e985de
diff --git a/dev-scheme/gauche/gauche-0.9.5.ebuild b/dev-scheme/gauche/gauche-0.9.5.ebuild
index 2ace0a45f69b..b78449844741 100644
--- a/dev-scheme/gauche/gauche-0.9.5.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools
+inherit autotools eapi7-ver
 
 MY_P="${P^g}"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://practical-scheme.net/gauche/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 libressl test"
 
diff --git a/dev-scheme/gauche/gauche-0.9.6-r1.ebuild b/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
index 17f4e9bbdc4e..384b30032a63 100644
--- a/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools
+inherit autotools eapi7-ver
 
 MY_P="${P^g}"
 
@@ -12,12 +12,12 @@ HOMEPAGE="http://practical-scheme.net/gauche/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 libressl mbedtls test"
 
 RDEPEND="sys-libs/gdbm
-	mbedtls? ( net-libs/mbedtls )"
+	mbedtls? ( net-libs/mbedtls:= )"
 DEPEND="${RDEPEND}
 	test? (
 		!libressl? ( dev-libs/openssl:0 )
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index d158091aee25..05adbc1af3ea 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest
index fc7dad8af978..690ca3c2cb28 100644
--- a/dev-tcltk/bwidget/Manifest
+++ b/dev-tcltk/bwidget/Manifest
@@ -1,6 +1,6 @@
 AUX bwidget-1.9.8-test.patch 499 BLAKE2B 186ea474d9efbebe4e710ab67a9fb675d3a9d3c892a5363d9f1a31aa00362833e11bf38a0cea353e40021e3717e39333d974d320024ac4b5c5686b6ed3c86c63 SHA512 cea568ef4c932b2b7dff5f8afd0d47e7c000c368d53cd23826f76e9f0446aa789df4391197662e8623d03381fd477928beb5f4bf687ddb48646cfdc9017cb064
 DIST bwidget-1.9.12.tar.gz 254905 BLAKE2B 02b206b9d19ec9580003a8549aa14d2bce230f8dc9834fcd2ba327bee2cf1f90c324f1804e175b89055d5f5f8727253132d186e9230efdc8b29e390e3cf2bf6b SHA512 0e01725ec65041a47a32625f2687e22bc42ccd581a26b3ca7be5a969b0b901c07fd5887a47ff846cc1111767a72cfc6e31f4aa99a1c9040a6f08705d97a5970f
 DIST bwidget-1.9.8.tar.gz 252668 BLAKE2B d7318b3ac932fd0ab9a5fb180e3ca739012e2e6583ba8e3366b6a63c85bfda26ea2f2534540442f9a2047cc27179877658bf492ccfac8106858d049f46f33034 SHA512 437958871809c8ce285cbf4521ff08720d106dca708183ff94234015da2b04ccb3a7b05df13d8e3f46466106c91418607c5983fc4ed8d9c4285ae0a0b1071262
-EBUILD bwidget-1.9.12.ebuild 811 BLAKE2B a55f9448eb9b6a464e7713b112fb2f01512f2c127d8fd083e1e034bda9578bb96b52dd9a9f9d99c12bd5b782fbda29e8b0dfaca7e3d1cd678c9ccfbffe2a22e1 SHA512 d6631f955484e655cf4cf2d70c1aec5a301c6eadb9949e7d542498a5665be0f73688089f1642371f4cc2c2580c160bdf527dbdec824880a7fe37aa0eaffb8099
+EBUILD bwidget-1.9.12.ebuild 807 BLAKE2B 1257ffadc2a01d2304013197bf876e88ba108e1f8b96ede7e192c48c17ac570d8186d0fb8fae465e92c981fce329553afa6f62f9bc5525fb11f3855be9b68e18 SHA512 7e54cc444e5571a9688cbbb644fd624171dd8c55f8e157f6b3ee209596eb7caff43b6406a4641f2ade036ef7817d7ba82c957ce0c418720b6432fdfcad7cee7b
 EBUILD bwidget-1.9.8.ebuild 806 BLAKE2B 5d0a6379d916f9cc1b9d1eef51c640b632d0e754934aebde09a4cfcb86c1748ef3c994db845826c456056dd770d2154f4b0e6864db55f5eb94d866a270c9d189 SHA512 385c1991d0b8e76dacf9aefbdd92ad3ffcbd3adffdf305db2ea006587ab21aa57f56642c04eae8ccab0590e247f7497dece02183315e5c1326d50780964aad2e
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/bwidget/bwidget-1.9.12.ebuild b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
index 1c6bbdf5fcbe..d75df0f4352a 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 DEPEND="dev-lang/tk:0"
diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest
index 345ea61f37ef..3e90dd46e295 100644
--- a/dev-tcltk/tcl3d/Manifest
+++ b/dev-tcltk/tcl3d/Manifest
@@ -1,7 +1,4 @@
 AUX tcl3d-0.5.0-include-tk-dir-and-permissive.patch 2544 BLAKE2B c982924cffd60db538428d225a23023bcedbd3a9bf5e1087815d3a8fbe49d4f2be3f4dd3aadee3274a85f11a9c2d0e442bd739a0da3a415c15ac32eb8a116abe SHA512 ff5bb6df033cfa1ce9d01305cf3346653cc9ff6c144e19609b8cacc659993f0df0a8e0db741e0733e7c3f44aff6ed7f02596e382bd2b813980a8fbbfbbb376e6
-DIST tcl3d-src-0.4.0.zip 1501305 BLAKE2B 61fe35df0bf5624ef5fbd7fa029b8ad7a23ed6304bd5da8b8bb035b94ad6311ad3868793b7ea5a464d990cfaee98af88ef6d398dddbdba4e89d894005e5ce9ed SHA512 a8a525693bc45e9fb9e2167e2121d300ff60534f2bced33bb068a1075cfd8e8281dd97bd7fb432b9d6a95cdb37fc3da03c82dd1ee20e368fb8ac249ea54c30a5
 DIST tcl3d-src-0.5.0.zip 3936271 BLAKE2B 97bd3815c05254162d8af4b2029dd2ac4218ed4bfb94e19a6454f41c12953b48f616444e466dda5359433f84a9284a2e20316b6c97b0e3a20deada47f583510c SHA512 24f799d5cc0ad9daf060b6b723d1197be678c0716b2099287e004221889c56da03f7368d6cd4c47dbbbbfe936b0bf65366cd452d3d9c2335cdfbae6ff3860a29
-EBUILD tcl3d-0.4.0-r1.ebuild 1333 BLAKE2B d07d4f56b7cea8ef7f5d03211be9a3a5bbd5e9a3e0d71b4dcff726a29ceb7fd85eaf372f820edd88987200adfbd285793bc6a47e343d39cb308c8186b2bf6e3d SHA512 541ab991db6ee8c54838abe091d6574cfa45afc7529d0a6bc2da58370369f0b11bc633ea8ef216a4910a35d4a43e9b6b2b2ebba93bde29e70b01975780a87646
-EBUILD tcl3d-0.4.0.ebuild 1332 BLAKE2B 2d958e54233102755773f21b394acf30c79c6489df5bed1bfea5ab657223eb667465a8fda07f5ec1d48a35a0528dd03822233786ba97086f7059e4f4e592d28f SHA512 7bcb8c5cadb7720734b3b8bf69417840f7af75d300b53c822609207efe1f82ab428c41872218dc0d2efbf20b2df701398c908c2da0d073695a0fbdaaf276bd93
-EBUILD tcl3d-0.5.0.ebuild 1878 BLAKE2B 785ced313466891f52fb0a06e17fee11abcafb98737da5d5b2efc3121c7ffa92e13ffb1c09794258c2a55ce9479d692faf9edec8d9b8361f2c1bd34adf8f8e1f SHA512 b39e5086385319f9c9f70a515229444ab8d1bd3f93f7d1f971cf1f87bf55a0edcbf3531d099f93d96c1c8381a3aae181c700a68dd9f845eac1be371918ea3aab
+EBUILD tcl3d-0.5.0.ebuild 1889 BLAKE2B 218d4bf66cdc3094d946562aa41bb583b140e14da70fc374d19a263d86704ae81f8a42d681bc4e04b765f0ff2fd45db1ba93279942f2c2907df6899d03c1c00a SHA512 1437b9d6b6bb4fc1ad165cb0ff3fda92f802629f53c450a59b379657dc8585a3a436b1e6fe74da51353ceb3c22796277e42dba72447b230b1293566d7e353c8e
 MISC metadata.xml 1311 BLAKE2B 72c200e646b9fddd4b20a266d7d66e967f918e467d413a063af6076cc0fb786b38bf0b61c9ce288f3215b0ec30485cbed4ad3ad35bad48f48c09936eff6f90da SHA512 291f517e0690cb71786359156418f3622ac8e5e86f8d8d33377b967d85bddd4c05fa49dccee56bc2ff719b2ebe45b497304fa5262ec193832b6c3c8f9ca09943
diff --git a/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild b/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild
deleted file mode 100644
index c424262b15bb..000000000000
--- a/dev-tcltk/tcl3d/tcl3d-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Tcl bindings to OpenGL and other 3D libraries"
-HOMEPAGE="http://www.tcl3d.org"
-SRC_URI="http://www.tcl3d.org/download/${P}.distrib/${PN}-src-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="
-	dev-games/ode
-	dev-lang/tk:0=
-	dev-lang/tcl:0=
-	media-libs/libsdl
-	media-libs/ftgl
-	virtual/opengl
-	x11-libs/libXmu
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.19"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	TCL_VERSION=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') )
-	einfo "Configuring for Tcl ${TCL_VERSION[0]}.${TCL_VERSION[1]}"
-	sed -i \
-		-e 's:^\(TCLMAJOR\) *=\(.*\)$:\1 = '${TCL_VERSION[0]}':' \
-		-e 's:^\(TCLMINOR\) *=\(.*\)$:\1 = '${TCL_VERSION[1]}':' \
-		config_Linux* || die
-
-	# fix libSDL link
-	sed -i \
-		-e 's:-lSDL-1\.2:-lSDL:g' \
-		tcl3dSDL/Makefile || die
-}
-
-src_compile() {
-	append-flags -mieee-fp -ffloat-store -fPIC
-	use debug || append-flags -DNDEBUG
-
-	emake \
-		INSTDIR="/usr" OPT="${CFLAGS}" CC="$(tc-getCC) -c" \
-		CXX="$(tc-getCXX) -c" LD="$(tc-getLD)" \
-		WRAP_FTGL=1 WRAP_SDL=1 WRAP_GL2PS=0 WRAP_ODE=1
-}
-
-src_install() {
-	emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr/$(get_libdir)" install
-}
diff --git a/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
deleted file mode 100644
index 349309c5a5ad..000000000000
--- a/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Tcl bindings to OpenGL and other 3D libraries"
-HOMEPAGE="http://www.tcl3d.org"
-SRC_URI="http://www.tcl3d.org/download/${P}.distrib/${PN}-src-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-RDEPEND="
-	dev-games/ode
-	dev-lang/tk:0=
-	dev-lang/tcl:0=
-	media-libs/libsdl
-	media-libs/ftgl
-	virtual/opengl
-	x11-libs/libXmu
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.19"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	TCL_VERSION=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') )
-	einfo "Configuring for Tcl ${TCL_VERSION[0]}.${TCL_VERSION[1]}"
-	sed -i \
-		-e 's:^\(TCLMAJOR\) *=\(.*\)$:\1 = '${TCL_VERSION[0]}':' \
-		-e 's:^\(TCLMINOR\) *=\(.*\)$:\1 = '${TCL_VERSION[1]}':' \
-		config_Linux* || die
-
-	# fix libSDL link
-	sed -i \
-		-e 's:-lSDL-1\.2:-lSDL:g' \
-		tcl3dSDL/Makefile || die
-}
-
-src_compile() {
-	append-flags -mieee-fp -ffloat-store -fPIC
-	use debug || append-flags -DNDEBUG
-
-	emake \
-		INSTDIR="/usr" OPT="${CFLAGS}" CC="$(tc-getCC) -c" \
-		CXX="$(tc-getCXX) -c" LD="$(tc-getLD)" \
-		WRAP_FTGL=1 WRAP_SDL=1 WRAP_GL2PS=0 WRAP_ODE=1
-}
-
-src_install() {
-	emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr$(get_libdir)" install
-}
diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
index 1b0775851245..15495ba8827c 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.tcl3d.org/download/${P}.distrib/${PN}-src-${PV}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug ode osg sdl truetype"
 
 RDEPEND="dev-lang/tcl:0=
@@ -25,7 +25,8 @@ RDEPEND="dev-lang/tcl:0=
 	truetype? ( media-libs/ftgl )
 	sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.38:0="
+	>=dev-lang/swig-1.3.38:0=
+	app-arch/unzip"
 
 S="${WORKDIR}/${PN}"
 PATCHES=( "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch" )
diff --git a/dev-tcltk/tkdnd/Manifest b/dev-tcltk/tkdnd/Manifest
index 9b67daa20252..e41fab1016de 100644
--- a/dev-tcltk/tkdnd/Manifest
+++ b/dev-tcltk/tkdnd/Manifest
@@ -1,7 +1,3 @@
-DIST tkdnd2.2.tar.gz 501708 BLAKE2B 388a488fa6a6f86041182d741e4bb45b3cf86c8feb39de15010dbd21cddb536800cad0df23b5c27afec83bd4550c759534986b24804aefd007f0de4f5ecbf3cf SHA512 96f3b7209d82801b69932531b987cfe2c3367fbaaffd2198afc84bf21643437db8a9958511e31ce2c36896538ff8f8c9237950d0f82b832f7133fb1e5768fd26
-DIST tkdnd2.6-src.tar.gz 180278 BLAKE2B 598bba80e239440eae5e3dade176a015a33f426a387fbd8dcf96fa7b8644665d05cc2e52a86be40e2c40922211b200c484bde7dc69da1b252922ed203740fc87 SHA512 2ce1be9b49c21bc67102575420311c1ec764493315791c8a76313cae6d22846b3049dd85cdc0b2f28592889432b85103b0fa207445f678dbe22f988eb1d6fc87
 DIST tkdnd2.8-src.tar.gz 185025 BLAKE2B 3f7c1b728d12c2ad7d7fea82dae1c3f29207b70fd382fb6aa7aa6602602b0a9b5c4604347b9b1aa1faff7c5952d9557046157cb6af4268b56483f7398d4b55e3 SHA512 0cca1783ed4e481565fa23cebc12382f223c8a02f24a2795af3818d56769d265b45e2ce74d2a4a3a8203718bad6426efe37a5382e8376dd6a0820ef81866050e
-EBUILD tkdnd-2.2.ebuild 903 BLAKE2B 21e057ee7ea04b4dca78168dca2b201aa6e9fc92cba4971940016d511ab6d05aa2edcdc07e0c4d751c8f972a3f094f106b7d644c0b8364b95ac8deafafb93768 SHA512 627a72f61f8a7d8e4192851155943bd001b66aed95b7f30f5e7c48d55d180f0fe3e7352d25d7c63fc9045f526872ad0684a473e66af8179e15a8549ff16db15a
-EBUILD tkdnd-2.6.ebuild 907 BLAKE2B 5fa1e858ad0d9b3dba3c1a5d9374b372c3035d69224432ed2e3a281a406296d2bd97cb862662743b1ec69a2b115ef4d3df0c59ab8322a395921193ea229f54e6 SHA512 d5fd89c87195c02ccdef39cd9a2fcacad964c1ae60e61536525ff7f7c407f7ac4c4111f52b56dbed9c95d8c2b2f861d4f87e818f3c08c16a49bc4e9f74aaecc9
-EBUILD tkdnd-2.8.ebuild 906 BLAKE2B 831a87175ab8616c76dd896d5c59f8c56971ab237bf26d6166daeb6c727c230bf86ef0c905867b80c90355fa5f783154d29d2fc4d558c81ca715327b305c5457 SHA512 508742bba2c8ab9fd4120421c34f801b7d0d4717022eb6be82571ec4108380e81e0781613323f5d3a67811306bb1c38d8278314e3791c85fdf8ae5d1d82fd251
+EBUILD tkdnd-2.8.ebuild 904 BLAKE2B fcb4a4b846196af1eb40f103c373dd1b2c198942962050535991168b44299b22d7a50f846c8630509a2e686fc93c8b8c9bf28709ded5134b590daf229c3d3d22 SHA512 d8b68152b19d6f0709a296097fe767a3c67de0c4433bfc35331146f764be59b41dec7644918cf92323759ad91bd77f0942a8892507d4d90f4a5e71ba14be955d
 MISC metadata.xml 328 BLAKE2B a8828cf089a520c1cfaa639bc5587d82ceb3681f97ad00a174ceb9331d12cc063ccb0687dd8e53510a1fb2d807153afdcf7a6be7fae1871621fb032c9c8d9e14 SHA512 3130aa488c2f677c91f3b2ba72a2a9e16446865a10f1629ae7e44b810189ceb24cb9cd14d834a71b76609cc9a2e043d8db7560e9446103368084385754cd5045
diff --git a/dev-tcltk/tkdnd/tkdnd-2.2.ebuild b/dev-tcltk/tkdnd/tkdnd-2.2.ebuild
deleted file mode 100644
index 3f608bac2cdf..000000000000
--- a/dev-tcltk/tkdnd/tkdnd-2.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils eutils
-
-MY_PN="TkDND"
-
-DESCRIPTION="Extension that adds native drag & drop capabilities to the tk toolkit"
-HOMEPAGE="http://www.ellogon.org/petasis/tcltk-projects/tkdnd/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${MY_PN}%20${PV}/${P/-/}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug threads X"
-
-RESTRICT="test"
-
-DEPEND="dev-lang/tk"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P/-/}
-
-src_prepare() {
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-fomit-frame-pointer::g' \
-		-e 's:-pipe::g' \
-		-i configure tclconfig/tcl.m4 || die
-}
-
-src_configure() {
-	local myeconfargs
-	use X && myeconfargs+=( --with-x )
-	use debug && myeconfargs+=( --with-symbols )
-	use threads && myeconfargs+=( --enable-threads )
-	autotools-utils_src_configure
-}
diff --git a/dev-tcltk/tkdnd/tkdnd-2.6.ebuild b/dev-tcltk/tkdnd/tkdnd-2.6.ebuild
deleted file mode 100644
index 77ed496b529b..000000000000
--- a/dev-tcltk/tkdnd/tkdnd-2.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils eutils
-
-MY_PN="TkDND"
-
-DESCRIPTION="Extension that adds native drag & drop capabilities to the tk toolkit"
-HOMEPAGE="http://www.ellogon.org/petasis/tcltk-projects/tkdnd/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${MY_PN}%20${PV}/${P/-/}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug threads X"
-
-DEPEND="dev-lang/tk"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P/-/}
-
-RESTRICT="test"
-
-src_prepare() {
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-fomit-frame-pointer::g' \
-		-e 's:-pipe::g' \
-		-i configure tclconfig/tcl.m4 || die
-}
-
-src_configure() {
-	local myeconfargs
-	use X && myeconfargs+=( --with-x )
-	use debug && myeconfargs+=( --with-symbols )
-	use threads && myeconfargs+=( --enable-threads )
-	autotools-utils_src_configure
-}
diff --git a/dev-tcltk/tkdnd/tkdnd-2.8.ebuild b/dev-tcltk/tkdnd/tkdnd-2.8.ebuild
index b7aecb63ebf7..e1855dc6cd88 100644
--- a/dev-tcltk/tkdnd/tkdnd-2.8.ebuild
+++ b/dev-tcltk/tkdnd/tkdnd-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${MY_PN}%20${PV}/${P/-/}-src.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug threads X"
 
 DEPEND="dev-lang/tk:="
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 98f8dd4ab22f..d9c772dd7c3d 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/catdvi/Manifest b/dev-tex/catdvi/Manifest
index d2d4aeedc61e..e1db490dd280 100644
--- a/dev-tex/catdvi/Manifest
+++ b/dev-tex/catdvi/Manifest
@@ -1,4 +1,4 @@
 AUX catdvi-0.14-kpathsea.patch 1592 BLAKE2B abc40f246f81dfb376e3753ebf8a3fd1a80ca2d9b96243f46c1e5a66b86790279101f15486bdca1e41a3dc27dde5dc0a39f99ac4a0657b2ed25545d974ff886c SHA512 8da09a34e41c3ce4fbcf3db0f01b66790714daff2280f1e878c0fa8c432b15285d6b6d888ec81bb399cbdad1f903688c567a97fd20be5a53716ab54f43bb4e3c
 DIST catdvi-0.14.tar.gz 160661 BLAKE2B 850be6284f286d6d7ef0b8d91316fd832e17cc1b18bee561c5d6fa9f9abe1e840ebdcfad208bf6c648cff5bbc57a1a5aad2b20a203777695f9c1c54672c7b608 SHA512 82ea6130ec702b49ed2d2f08b968ca4d5bee6b16c7973500ceae2d412b209f38a6e63a9e80dd8d2866f190340a7758aa23ee31bed76beb35065016fea109982d
-EBUILD catdvi-0.14-r1.ebuild 864 BLAKE2B cab487fbb6da512adf721783ab428bf547540c7193faaae6c5f74ee2f686f5b76852db5619e2803aabe8d270636b940c6bd269b179844417160eea5ca00e2a08 SHA512 3ff018fbeb8de97dc5cc521a105d64fd7508e650f61369c1aca26c3dfc3ab7b035dee2163b5aabff22782f395e6e3d44f609678a267d44f2161808460e78dd40
+EBUILD catdvi-0.14-r2.ebuild 873 BLAKE2B d9553363f082dbeb66f59254b9cd113356cceffe2071ed0a9d0e396964e1c54bff15a29b2500d845a4e3ee119defea5eea1e2ced340d445f1b5e5162283995e7 SHA512 2fc5e1348625a8ad38e2114e9d37d266d9125ae0118587b85323d692b224fad58758f4ff5aadfdff14078624043a7345d18cde851c62835cac18e17cfcd77538
 MISC metadata.xml 400 BLAKE2B e5b5476d8f32761d3cd280b2cd59c593af13982bf3d56e84dd0ee3b145a4b35880e165cc900a21b589885ea807841320fa945fab7dd1cde4cd5380aa779975a5 SHA512 145510fdced5783c731d1c1d2dee14f8f6186693dea1b83b7173ff2095f6c45214eb7cedc281c97af92f9db8f5ca1b41b2728a7cf082d828fd714d19755c9a54
diff --git a/dev-tex/catdvi/catdvi-0.14-r1.ebuild b/dev-tex/catdvi/catdvi-0.14-r1.ebuild
deleted file mode 100644
index 7783adcdb420..000000000000
--- a/dev-tex/catdvi/catdvi-0.14-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools toolchain-funcs flag-o-matic
-
-DESCRIPTION="DVI to plain text translator"
-HOMEPAGE="http://catdvi.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/tex-base
-	dev-libs/kpathsea"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-kpathsea.patch"
-	eautoconf
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-}
-
-src_compile() {
-	# Do not use plain emake here, because make tests
-	# may cache fonts and generate sandbox violations.
-	emake catdvi CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin catdvi
-	doman catdvi.1
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/dev-tex/catdvi/catdvi-0.14-r2.ebuild b/dev-tex/catdvi/catdvi-0.14-r2.ebuild
new file mode 100644
index 000000000000..1f4af1e9e185
--- /dev/null
+++ b/dev-tex/catdvi/catdvi-0.14-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs flag-o-matic
+
+DESCRIPTION="DVI to plain text translator"
+HOMEPAGE="http://catdvi.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="virtual/tex-base
+	dev-libs/kpathsea"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-kpathsea.patch
+	eapply_user
+	eautoconf
+	has_version '>=dev-libs/kpathsea-6.2.1' \
+		&& append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+}
+
+src_compile() {
+	# Do not use plain emake here, because make tests
+	# may cache fonts and generate sandbox violations.
+	emake catdvi CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin catdvi
+	doman catdvi.1
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/dev-tex/frakturx/Manifest b/dev-tex/frakturx/Manifest
index 16111544b9d3..28c06d6e265b 100644
--- a/dev-tex/frakturx/Manifest
+++ b/dev-tex/frakturx/Manifest
@@ -11,5 +11,5 @@ DIST frakturx-20070103-tkngsbg.zip 151162 BLAKE2B 188c141f40bdc4335ad033aa96c311
 DIST frakturx-20070103-twieynk.zip 507577 BLAKE2B e88bddcc9fddfc02a84f636f953ce5e731d4b4f3b0f0e11c6fabad04dcc1da009cc61d5bcc4f4425be5e81657c886900d0e0a43a67afab3c7eaadc88eaace9a8 SHA512 2227fc0381a170e6c80764afd922e263430e17b43113b3a64353a990a91206a725b6292643246bb535e26b12b3c2596c9b2a959a5de0d036e2da5b8fbf14f81d
 DIST frakturx-20070103-twieyvig.zip 662665 BLAKE2B a5f7aec6d9e57dbad76c86c672664961a2b23dba33fb0f0b1fe4ebd13cad6ec2c4a4ebec77eaffd4f09b696099c68ffcdf69ed97f8175224c75dcd1245ddf283 SHA512 bb22dced1558041f9ff5f33b27fa46693858daff54609b0fe2a8f5a568fc4da9809159315de7114f07f04e1d49463f08a9f5c68ef3de73f7655f0086126297e6
 DIST frakturx-20070103-tzentenar.zip 447987 BLAKE2B 70bc04992c7e0ffcfc5b46d210d5a999f5f7a6bebdfb1ece77825e945f3c960bdd5c370a64d1b92edec2eb2fc94431723ada6bf0adf55fe2d417db1b913d284d SHA512 c4cd8057dc26d1f768c69fd699b823cf39778dc94255e46fc1246b4afa75651d1fdf6efed6d36e85c49a59f0e02d60d11075731f16d815243210c65a7f4892dc
-EBUILD frakturx-20070103.ebuild 1469 BLAKE2B 4b3f5e15ce8fbd1a233c9e58a52715878c807baa3c8ce03e62a84b17e1920269c51819a3c3090dd0701190978be511a2410083e0de9171313d02ec2450b8907c SHA512 90d191ddd57ec903d2e948c7092b8513096dfa71ea1ae4fbda95cec4e3e0e5b51f14b7b1871fa8726abbfcd4eb0d2ecdc5e5404a6cb7fe939744dce8ea44aa1f
+EBUILD frakturx-20070103-r1.ebuild 1462 BLAKE2B 6a0564e53104b3476a402de70dddc6edba6fe845146a24af33de077e80ea317aae11e1bd5379d3068258cd6b28546f02ebccae44b3b9a3a40c68429f71e7dda3 SHA512 eb9278a25cd54e2bf306aba063e19149e6ba3d1e20c16d154545c086f54bdb2b2d21644647208ede69899491052ec04821ff84df70f6e1d1f53e9d478553656b
 MISC metadata.xml 919 BLAKE2B e41131128bcb6a552385ec0375c94f3e6f2139592b0b62139fd948ed3c9cf5c09ef275f67fe69ed15778f4fb271d8297f4116bdacf6540cb596a42aafda25a71 SHA512 a999c14f651929c12bdcca1f024b1d49ea466d1edfc44dafbf7da5be499d5feaf296ca8681f200b3b83051ca3af728703318980b7a07dda03241f84a0ea384d9
diff --git a/dev-tex/frakturx/frakturx-20070103-r1.ebuild b/dev-tex/frakturx/frakturx-20070103-r1.ebuild
new file mode 100644
index 000000000000..1337f54ac213
--- /dev/null
+++ b/dev-tex/frakturx/frakturx-20070103-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+DESCRIPTION="Collection of blackletter fonts for LaTeX"
+HOMEPAGE="http://www.gaehrken.de/fraktur/"
+SRC_URI="mirror://gentoo/${P}-base.zip
+	mirror://gentoo/${P}-tfrak.zip
+	mirror://gentoo/${P}-obibel.zip
+	mirror://gentoo/${P}-odedruck.zip
+	mirror://gentoo/${P}-odeschmk.zip
+	mirror://gentoo/${P}-oweissfr.zip
+	mirror://gentoo/${P}-oweissgo.zip
+	mirror://gentoo/${P}-talteswab.zip
+	mirror://gentoo/${P}-tbrtkpf.zip
+	mirror://gentoo/${P}-tkngsbg.zip
+	mirror://gentoo/${P}-twieynk.zip
+	mirror://gentoo/${P}-twieyvig.zip
+	mirror://gentoo/${P}-tzentenar.zip"
+
+LICENSE="LPPL-1.2 free-noncomm"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+TEXMF="/usr/share/texmf-site"
+
+src_prepare() {
+	default
+	# remove spurious files, so that doins -r is possible later
+	find . -type f -name '.*' | xargs rm -f || die
+}
+
+src_install() {
+	insinto ${TEXMF}/tex/latex
+	doins -r tex/latex/fraktur
+	insinto ${TEXMF}/fonts
+	doins -r fonts/{tfm,vf,type1,enc}
+	insinto ${TEXMF}/fonts/map/dvips/fraktur
+	doins fonts/map/dvips/*.map
+
+	local m
+	for m in fobi fodd fods fowf fowg ftas ftbk ftkb ftwv ftwy ftzf; do
+		echo "Map ${m}.map" >>"${T}"/50frakturx.cfg
+	done
+	insinto /etc/texmf/updmap.d
+	doins "${T}"/50frakturx.cfg
+
+	dodoc -r doc/fonts/fraktur/*
+
+	# symlink for texdoc
+	dosym ../../../doc/${PF} ${TEXMF}/doc/fonts/fraktur
+}
diff --git a/dev-tex/frakturx/frakturx-20070103.ebuild b/dev-tex/frakturx/frakturx-20070103.ebuild
deleted file mode 100644
index 63362482bc6e..000000000000
--- a/dev-tex/frakturx/frakturx-20070103.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit latex-package
-
-DESCRIPTION="Collection of blackletter fonts for LaTeX"
-HOMEPAGE="http://www.gaehrken.de/fraktur/"
-SRC_URI="mirror://gentoo/${P}-base.zip
-	mirror://gentoo/${P}-tfrak.zip
-	mirror://gentoo/${P}-obibel.zip
-	mirror://gentoo/${P}-odedruck.zip
-	mirror://gentoo/${P}-odeschmk.zip
-	mirror://gentoo/${P}-oweissfr.zip
-	mirror://gentoo/${P}-oweissgo.zip
-	mirror://gentoo/${P}-talteswab.zip
-	mirror://gentoo/${P}-tbrtkpf.zip
-	mirror://gentoo/${P}-tkngsbg.zip
-	mirror://gentoo/${P}-twieynk.zip
-	mirror://gentoo/${P}-twieyvig.zip
-	mirror://gentoo/${P}-tzentenar.zip"
-
-LICENSE="LPPL-1.2 free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-TEXMF="/usr/share/texmf-site"
-
-src_prepare() {
-	# remove spurious files, so that doins -r is possible later
-	find . -type f -name '.*' | xargs rm -f
-}
-
-src_install() {
-	insinto ${TEXMF}/tex/latex
-	doins -r tex/latex/fraktur
-	insinto ${TEXMF}/fonts
-	doins -r fonts/{tfm,vf,type1,enc}
-	insinto ${TEXMF}/fonts/map/dvips/fraktur
-	doins fonts/map/dvips/*.map
-
-	local m
-	for m in fobi fodd fods fowf fowg ftas ftbk ftkb ftwv ftwy ftzf; do
-		echo "Map ${m}.map" >>"${T}"/50frakturx.cfg
-	done
-	insinto /etc/texmf/updmap.d
-	doins "${T}"/50frakturx.cfg
-
-	dodoc -r doc/fonts/fraktur/*
-
-	# symlink for texdoc
-	dosym /usr/share/doc/${PF} ${TEXMF}/doc/fonts/fraktur
-}
diff --git a/dev-tex/hyphen_show/Manifest b/dev-tex/hyphen_show/Manifest
index 2571fcadc2d7..28f8e2880c38 100644
--- a/dev-tex/hyphen_show/Manifest
+++ b/dev-tex/hyphen_show/Manifest
@@ -1,4 +1,4 @@
 AUX hyphen_show-gcc34.patch 2314 BLAKE2B 1d432748078a9580751acf608ac1dbd79ecb645c0bfe75b1fdaa3b0563bceae381f1ff18c32606753d67bb8f36c325cfd3389d258a79edd4d5e1b5d419a114d0 SHA512 589b6c660a668fb04cc5e8d5ec58ee65ef56a54aa5a94324125943b67b8cee15b62d371c8e324983b44f33ffd8c4c292812e8d91a66d58bf9f28a7f09a521eac
 DIST hyphen-show_20000425.orig.tar.gz 8723 BLAKE2B 8320aca42393d9be2e7557c15a05045ff48f7ba63f5af8f5184f0ead34e755d57891226166c3b7ad1d3b8e46f229f2960169d4de9873cf8165e99ff046418acc SHA512 77904ac52171dd245f900e80c7b7ef48a67fc8dffe13dcb3f321a8582c4fe907295f1f19e8513cc612d2089aedc67c29ba03e1928af94c7009e6fd7327c6552e
-EBUILD hyphen_show-20000425.ebuild 702 BLAKE2B df9c4f335450c89ad6b68e8c8ae86feef364003e78ea067f196b661fb5bd82d02bd67f4dc51faf1c607cbcfcdb01bf741d19b41768b7f92d712f6143b2535ad9 SHA512 288ddfe875eb8e47b21d12a54e6026adac6364a9db8dd9c3e9f1671e4f86f7047c8528f23e337ddd8f65282e7ffe5caa2acdcb67b3d8233a7adf985439f71c4c
+EBUILD hyphen_show-20000425-r1.ebuild 636 BLAKE2B 893d1750665fcc492d32a61a0c5c69dded02f0455093c31a54feec45a28925885324ba7903581fe3da683255aadcbddb03e3d8756420cee2af3567227994a60e SHA512 e1c9cbb4814b51076bbb2c0cd77da74e64f6f1f6873177ab89c2e9419f110fad24a785c42251ee7a348a9fa4a14425603a402cd3964dc74ed70112eb1352431e
 MISC metadata.xml 555 BLAKE2B 0e8fafed25cda424d789b044080643795bb50e7940149b36ca4ea0b1bc50d80fc9f8f0a0302ec8fa68a3431f73e322d08a51fcf9f099d50dcb858e8fe9e8d8c8 SHA512 2384c8699f315875657dc4ea50eea937542a15b283c3670a2ebd88c2b68a661d7c136ebe90e31d9b2518ee999ab09a7c20488e52af0bedc7984307d757f7e68c
diff --git a/dev-tex/hyphen_show/hyphen_show-20000425-r1.ebuild b/dev-tex/hyphen_show/hyphen_show-20000425-r1.ebuild
new file mode 100644
index 000000000000..e465b83c2d43
--- /dev/null
+++ b/dev-tex/hyphen_show/hyphen_show-20000425-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN=${PN//_/-}
+DESCRIPTION="Show hyphenations in DVI files"
+HOMEPAGE="https://packages.debian.org/stable/tex/hyphen-show"
+SRC_URI="mirror://debian/pool/main/h/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-1+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+PATCHES=("${FILESDIR}"/${PN}-gcc34.patch)
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} hyphen_show.c -o hyphen_show || die
+}
+
+src_install() {
+	dobin hyphen_show
+	doman hyphen_show.1
+	dodoc README.hyphen_show
+}
diff --git a/dev-tex/hyphen_show/hyphen_show-20000425.ebuild b/dev-tex/hyphen_show/hyphen_show-20000425.ebuild
deleted file mode 100644
index ca4a35ad7917..000000000000
--- a/dev-tex/hyphen_show/hyphen_show-20000425.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-MY_PN=${PN//_/-}
-DESCRIPTION="Show hyphenations in DVI files"
-HOMEPAGE="http://packages.debian.org/stable/tex/hyphen-show"
-SRC_URI="mirror://debian/pool/main/h/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-gcc34.patch
-}
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} hyphen_show.c -o hyphen_show || die
-}
-
-src_install() {
-	dobin hyphen_show || die
-	doman hyphen_show.1 || die
-	dodoc README.hyphen_show || die
-}
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index a04a604337bd..da783b338c22 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -5,5 +5,5 @@ DIST tex4ht-texlive-2018-05-03.tar.xz 858204 BLAKE2B e302f24ca36ee0f61bad0979a13
 DIST tex4ht-texlive-2019-03-22.tar.xz 868992 BLAKE2B 662cc23de1b3b5f4e3d504655b5b3d87740fea045bef7987cbe2d81971e73375bd88d8ab111d48878ce1fe9d1eece4e4003e443ed0bc0f9b643b7e1653a5fc8c SHA512 44d9e2c4f92ae1ea1d7f14432d7fe1a9f11b30ec8602d55c4b8f3f46283671fb75b08641c8170bd46918e16db1bed696a613a0518acd4e195e173fe12e386833
 EBUILD tex4ht-20090611_p1038-r5.ebuild 3667 BLAKE2B 21c903fd2ccd19fcf9adebbc5fd7afc4994327ac219003ee563329a9cc5d4a895223e37b6e0bff95bb184888737a94f3086851f96b0713157628cbc43ecdf5a6 SHA512 c136cd88318233aa1c94e81626169a19e647eb34668ca27c1372255efbfb7e6f75f43969a6c3ce15661e660de76641b35e02d3a2f74bc13a99e83b2b2999ac56
 EBUILD tex4ht-20090611_p1038-r6.ebuild 3626 BLAKE2B a7b2e0ba7a7671df612ac01eb824085d90748747f02c05ee3ee44155c1cfe300523c3941de04ae70cb9eb10908d1f2282a2ed0f8f5982996fee18519ff514c66 SHA512 28c517c420a498202aff5690aa6486c0141e44aa991b450706408322756aa0c6d05ea94825a76f17a9bb6f456a69d421c73dc47df496d65f9f68b320d87a8706
-EBUILD tex4ht-20090611_p1038-r8.ebuild 3678 BLAKE2B 6e3d51da8f6253c10c1e5c3c33ce603b9225ce3c45755a069b82950dc22109e59e0998799cdc706af0ef35675f48ba03b010cff12608d65f6d6258aa72b50572 SHA512 99d8eb7a26bbbfb7442524201be4b15250ebf04135aa4b8c4a6284d32b6cac1eee5a4c2ae59288e186680632bf8b41b2e4f3719841be3d099ceee78c3add8a81
+EBUILD tex4ht-20090611_p1038-r8.ebuild 3672 BLAKE2B 9ac3b4f4084f49237acc5f98acad8381af599cc8f8f8df4757741c7bc5bbc38179e74797545ec774411b219317052da8ec552ebb1eec764dc759b3923ffc72dc SHA512 dd9ba86f3f807d62b99ccb75450744e5684ef6d30a726c3e78ceaf52dbef22001092233d041f98777bb558e01db607a3eb9e18b8401f0a7a655f75c6143d9414
 MISC metadata.xml 317 BLAKE2B feec903cd392ba092a0dc0f85e44788604c6fde736ebc5c81a930ed0109ecde56c0ba8220f5a56559b06fb1573cd2f159754dcda52c982601bb67306e2c15aa7 SHA512 33ba7a4fa5948eae907a650c1c53b3c5d3b71cef6ae9cc371017c14aca8e641f3badafaf3b3387b6638c877d10787d430bfc16a7e191b2b4327049a56a37b3af
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild
index 178df7d4b617..5e378b9b53fb 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
 
 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="java"
 
 RDEPEND="app-text/ghostscript-gpl
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a7f5c3e406a1..5ebae9587bca 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 03f9702b8fe4..a4d1b83d47a0 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -29,4 +29,4 @@ EBUILD android-tools-5.1.1_p13.ebuild 2077 BLAKE2B edb2e3a9f69c2c8a4f86170b39aed
 EBUILD android-tools-6.0.1_p79.ebuild 2820 BLAKE2B a87ef5bc6d814ef772c3fe4292563c73beabd59cacebae706721d4019059be8b2cf31e27594c473abe202ed1f4afb78993ae3e947ef7c21b5016245797f90b45 SHA512 ccdd6e4fbc6a98ca0e9cfd89618c6a13e11e174abd6c6b3dd1d1b8f7a592a4574cf83e0f4770750918ee481b129d01425ae56fd55ddc323b3409add6ddf10279
 EBUILD android-tools-8.1.0_p1.ebuild 4012 BLAKE2B 9c0a75fefed96a2e86fb9d76c4897789d61eeba3434db61a7e3c0041b7dafa9f8919fb9ff20c14e90d070746d2e077cf9de86e0ecfc6ab55991bc4e01e210d77 SHA512 8ae858338e3c73666ca3aa2c1fcc831ea3902b0da5f91a7df01cc401c9917a7e10eaf7a5353e1f358fce0aed6e5a45c7a75b0de533dcb344f4fc4425ae114374
 EBUILD android-tools-9.0.0_p3.ebuild 4561 BLAKE2B 9c975e4be98866b9fe5156bc4a90b1c787e73f3160fc97bc70ff2f89d0a537b5bf97c25236d8e6e28a96742a14796f11cafb067b7d38cf90a7845505f6394d65 SHA512 c381cf35048c7f40b519670064ab803bc879f5edf6b75e23e9089b01c0d5b421ef49e365cad881755537a8f979e0888fa396dc5b7df94200ea066de8bf3a0958
-MISC metadata.xml 643 BLAKE2B 99ac01fb57cc1d2908955720cd2fee6e97f98a19d9fe9bbbb07e0f9f915b7efca184a75c5f5eb5372b9c21d3ba7db542d061de47ac6f89e6c58fa3dc886d4f21 SHA512 51ee41cf77548eb1ce543b2c1f5f37e9634250c2fa42b36a8128b4a80a73a270b90b9e9e1c2c58d7aeb6dee85238ec73345f1a3a4ac398a4f7b2cd8e8c6e84ee
+MISC metadata.xml 714 BLAKE2B 2ec2b24289241323b1844412e6e0d1edf642dc3391171b474848ea376c51d420c98a4a0c094afad2dc1c7cf55b0efb744ca6a92beeed770d015a6380b07b85b0 SHA512 720b38485a7c248e6a9d43a7056e33a384fe7e295fc843c69e59d48350bb10d7d4446e6cc52b7c87e2b0322733553e16c9dda4e37104753d5aaceec5adf859bd
diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml
index 27a6743c2701..b64b92754f3f 100644
--- a/dev-util/android-tools/metadata.xml
+++ b/dev-util/android-tools/metadata.xml
@@ -5,6 +5,7 @@
 		<bugs-to>https://code.google.com/p/android/issues/list</bugs-to>
 		<changelog>https://android.googlesource.com/platform/system/core.git/+log/HEAD</changelog>
 		<doc>https://android.googlesource.com/platform/system/core.git/+/master/adb/OVERVIEW.TXT</doc>
+		<remote-id type="cpe">cpe:/a:google:android_debug_bridge</remote-id>
 		<remote-id type="github">android/platform_system_core</remote-id>
 		<remote-id type="launchpad">ubuntu</remote-id>
 	</upstream>
diff --git a/dev-util/artifactory-bin/Manifest b/dev-util/artifactory-bin/Manifest
index c35d84babd3a..90d25bbfa3cf 100644
--- a/dev-util/artifactory-bin/Manifest
+++ b/dev-util/artifactory-bin/Manifest
@@ -1,28 +1,7 @@
 AUX artifactory.xml 244 BLAKE2B 86e840e7ba680a87c7f5b00013f5019f4f2f8cd8a4d83fef82c8b51aa86e3cc4fde6c801aaf00c0b5c07c5499e49dce94ef797953304045970c45bf297003450 SHA512 582ba26a9b36a99266ebc35cf6ccad3e58c17c5b6e6a9168732a24842c67478fde72197b7592275e11cc3836ea1ed337785d90b8f3e6181e5f7fc1c102a45f55
 AUX confd 252 BLAKE2B 3c9999b9ee9ea39eda3f548bd0e0143d17e545de89efc7bf3a30aac163b5837b5812544b0bb8f86b00e639794b0efdc7b9219297982831b554019dca9d30822b SHA512 ae3c7e47ae34ce163799ffa57ec4b8a479eecc36a6c3620f30e351ddf8dea3e55d04a6ef459ed7ccefae6b0d39af8ebcf73cac3eea5f7d9355b9a1de7715b1e7
-AUX initd-r2 5371 BLAKE2B 68f4ebafcada8002b7981a101e2b5f6323140469fbe7834a492adcf142dd210362e65d604d52bb3bd55a9a998c2bec8080ddb1595181aae5b92eacda6d4b5bc4 SHA512 c19994a2918cb317a074898b7de294193a8aae1b5ec37d407bd5b60971c40d7c808ead5376c6d48219f41b15b72b2dca85959db677e81052d224a73bfb39cbfb
 AUX initd-r3 5373 BLAKE2B feb7f637c644570225c589767753c27db59b10971ffe5f7886dc94c3002f3cc21bd88405fcf38ea2161f9efde0c2ea2dad67979713a1cd99fc78e790ff0bca93 SHA512 89ef20e27296318cf844130c09e17b16f63c27b3188e53400f8b1dcf170d0d6acfb5a56592eb8580b8fa1281c2fcaa7f2edc4cde43803eaf20ce345030ce3f98
 AUX server.xml 516 BLAKE2B 6ed7e14de91fc1f7a9da25c8caeae4bbc25b783d84a321e69bcc897e5ef68002fa39bece886522f1833d9d4352dfa8391ec1d8c90f0a816beefec70b6afb8a05 SHA512 2c16207cccf29a3733e9759b0eb20d62184de6f91feb8f49037501e62f77ca09aefcd7a95a1544441318ac6a3577a3c366fc12d490726268233658581a64b91c
-DIST artifactory-4.16.0.zip 41455447 BLAKE2B 0f9f575d5ce3ba983c905e70c8e3545946065ff458f9a1c0f0e346bebeffe002bbea4214b7a23829e3a11d8ccf6aec4548f6ba5abd405d30165d3c07e2372e98 SHA512 e861b66ed7586ba881267312462584fd9037e2b72021e930a52489ae718ca2449c7997278cb26cb3dead774f16d74cf285c8ce2fca0c085e7edb444f71deaa14
-DIST artifactory-4.16.1.zip 41489457 BLAKE2B 7854710a5cf4dd52d7c92581a030259df6b0b8038f9843e528b0c57211eafd405a114b709ba5407a9c83e4d693f1ecb8eafe3d5e98bb22542d5c48e15bc3cf6f SHA512 b8f5441f011966837861073c928512704961c7683fadac4603f2177df1c64861432f894c5fe0669c4842a4b7d008553169e88aaffdde6e3d6e6bbdff6adf9d78
-DIST artifactory-5.11.2.zip 96724749 BLAKE2B 832fba6bec97e2974e3cb9e21542a76a3d10c1c6c600692cbd73b6452a50276b12b5081dbcb4a4fc0102e297657f58c77aa3eb0537e7423a480b79a8a1f957b8 SHA512 8c6d6305799631f430f7f7d74c4ef37e9a4cea50b5c3d50d44b37346a2296bd99cf96d09752006e61c97a6d6fea684183dc2b52d383810f06b3cbeabf41189ef
-DIST artifactory-5.3.2.zip 45729254 BLAKE2B 1fe6ec8a5a33d8735bd92d480e8fb7b035af2b27bf9034791f1bdca3c3d2a13794ba06613fb508ea8f221cc1647f2a8e213994ef7603d92c88b17037fd3c7266 SHA512 60fbbed97c9915ed4a7627a3b893fa6c5bcec695932415d3102b9788ba6182c8cef937ad48639d4398a682ab2f517771c3dcda9306842e4202bbd45ab4768f1d
-DIST artifactory-5.4.4.zip 76841935 BLAKE2B d763122cf0d2d1237fad41b825f68ecd6ec3c3453e5ec0a76a5b367c70c5aec4ee3cd81b9ab453628c879db22e0a292fc9b43d2b3d3d5461fc63d43bffde7b2d SHA512 f949e4c2ecaaf4581bc2e96058403684cab09f10b0bec512eda9b65bb41577a792b08d05f7a16e0e7f1614567dc9b0d1d59bb3c6ad6a4dafeb0c054a3add09a8
-DIST artifactory-5.4.6.zip 76857888 BLAKE2B 04185e4c585a6e8121b9b6d78a4565c5107381cae53fe3d8aea647ea6ebb0920f9775a7275ba79d282a0c87a7e0544f6382a2ed10dbecb6b279679be0fd94066 SHA512 08d7895dc823e61be83026d31eea387eb914f17cb2f13b03d5314c6473f30de9279d230d242d8160dba0d3c8f6981b25b5ad46f52ad12d1c39ee820ac7a676fe
-DIST artifactory-5.5.1.zip 77406287 BLAKE2B be60fbbc3b8c61fc9d1a7272889219de7ea4e5b8c760afaa7e0003f6bff48d41783f76d62ac64b81ffa42393a265ed184ad4a4a23789dc79955907290035dae1 SHA512 7327135be0c2a08dd97c575b05be1c3e4be99b38354864313d201334d3276912bcff0c6b0743fb83a2433a82fc8fcf4ec43e98f4183287fc34f1807342abedf8
-DIST artifactory-5.5.2.zip 77438814 BLAKE2B b77d9348fbae8bf871e4fb6716e2a9d357cd0d268d65360ec7509b0999db78a8b80f68eb22cbbc0a85ee2980fbc72c7aa390a60c8129451506441d7cbfd9f776 SHA512 fd052e66316ec050599f6262274cdf5232ebb1385fedd2c19c6ba8e3dca0d9fe86d7a89fddbb8974b28e0f9dc3d7ccda1aac6b3f9159f0b77bfc51873ffd5e3b
-DIST artifactory-5.6.2.zip 91577071 BLAKE2B 1f9687bef239519171bdb28fb033368e5dea10186ef350c7ee7d9e4a33ce99c5e965692d8052d82454c83f42c84e79c18edafbb98540da4b818b65b577a9ac72 SHA512 b4bde9bcf53d2af6901a8e80827f3b09d685a8bbe7073badad586401b6881d046e5cade4165fa68843e981dea2912374c187518e29ab1ee86d3d0fac134a54f0
-DIST artifactory-5.6.3.zip 91592176 BLAKE2B 1214bac4d5bd6f15915e05a2e42de4b6b55b885210fa06ee4b4b63599b8f3c13c6fe46a04569e790ea6e274c4837a09b260736412805119e7f93f7867be8e421 SHA512 a2348b8667a1d936e90dc6fd42e3967f63cc88cc99bf425ea26731ff4c54f0177ea386c5b19be97a4ac8f89ce41e65237d14593112b38656d60ada45d3b62371
 DIST artifactory-6.3.3.zip 98166641 BLAKE2B 33d760bc0f763ba0d8e091ce5484b3a90df4e57f291ea7a96a69bed13579c3c17af0005f95dbda847b2ab428d7dc36ddbee594d008f6e3badbb04e45c3b5dd89 SHA512 12f545d5e66b70e35d8b9967baadcfb503df7457bc48957a80b38d447cc9f024ce8f33b2463da65f5616161906bc64652fdd042446c5e8615e24ecc7f23a527b
-EBUILD artifactory-bin-4.16.0-r1.ebuild 3333 BLAKE2B 57d2c6c0d7d7121d939418d9decab2bf10cc4478dfbd24ecdc08677a4e19c7a2b33c1fe0088ae99674fbccab16f464ca3f41534d4f5d41d38e8fbd570359c936 SHA512 b6b3f2c577275c2732ade5bd69efd168f93e7609e9e959577018f9bafbe159cff0b5324d9f2599e9aa5262d1206ae08c10c4651fce6e5752105f2b78439ad896
-EBUILD artifactory-bin-4.16.1.ebuild 3333 BLAKE2B 57d2c6c0d7d7121d939418d9decab2bf10cc4478dfbd24ecdc08677a4e19c7a2b33c1fe0088ae99674fbccab16f464ca3f41534d4f5d41d38e8fbd570359c936 SHA512 b6b3f2c577275c2732ade5bd69efd168f93e7609e9e959577018f9bafbe159cff0b5324d9f2599e9aa5262d1206ae08c10c4651fce6e5752105f2b78439ad896
-EBUILD artifactory-bin-5.11.2.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.3.2.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.4.4.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.4.6.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.5.1.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.5.2.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.6.2.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-EBUILD artifactory-bin-5.6.3.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
 EBUILD artifactory-bin-6.3.3.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
 MISC metadata.xml 279 BLAKE2B 6e75b275009b71b76ac58588f1283d30718a910a3a6ca8d289ed313645a0a16683d8a308ed9129da37967f3a903b692290c0b03c3a7441098632a32fe9a74641 SHA512 2948e82a333d27863551e8e4d0f1943c53da2e5eb72ce8128b0b90b5a07a011d32fa0108eb9f91d7e2b14e108c11ba36df3efe3e196df9c0abd1fe862e087c97
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.16.0-r1.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.16.0-r1.ebuild
deleted file mode 100644
index c0107b449a6e..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.16.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r2" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-4.16.1.ebuild b/dev-util/artifactory-bin/artifactory-bin-4.16.1.ebuild
deleted file mode 100644
index c0107b449a6e..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-4.16.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r2" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.11.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.11.2.ebuild
deleted file mode 100644
index b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.11.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.3.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.3.2.ebuild
deleted file mode 100644
index b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.3.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.4.4.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.4.4.ebuild
deleted file mode 100644
index b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.4.4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.4.6.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.4.6.ebuild
deleted file mode 100644
index b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.4.6.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.5.1.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.5.1.ebuild
deleted file mode 100644
index b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.5.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.5.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.5.2.ebuild
deleted file mode 100644
index b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.5.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.6.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.6.2.ebuild
deleted file mode 100644
index b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.6.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.6.3.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.6.3.ebuild
deleted file mode 100644
index b36f57e1e592..000000000000
--- a/dev-util/artifactory-bin/artifactory-bin-5.6.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Using a binary ebuild until a source ebuild is doable.
-# This was previously blocked by two major bugs upstream:
-# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
-# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
-# Upstream now releases source and instructions (yay!), but most of artifactory's
-# dependencies are not in portage yet.
-
-EAPI=6
-
-inherit user
-
-MY_P="${P/-bin}"
-MY_PN="${PN/-bin}"
-MY_PV="${PV/-bin}"
-
-DESCRIPTION="The world's most advanced repository manager for maven"
-HOMEPAGE="http://www.jfrog.org/products.php"
-SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND=">=virtual/jre-1.8"
-DEPEND=">=virtual/jdk-1.8
-		app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
-
-pkg_setup() {
-	enewgroup artifactory
-	enewuser artifactory -1 /bin/sh -1 artifactory
-}
-
-limitsdfile=40-${MY_PN}.conf
-
-print_limitsdfile() {
-	printf "# Start of ${limitsdfile} from ${P}\n\n"
-	printf "@${MY_PN}\t-\tnofile\t32000\n"
-	printf "\n# End of ${limitsdfile} from ${P}\n"
-}
-
-src_prepare() {
-	default
-
-	if use ssl ; then
-		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
-		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
-	fi
-
-	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
-	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
-		etc/artifactory.system.properties || die
-
-	# See FIXME in src_install(), this can probably go away,
-	# but catalina.sh may need to be fixed for that:
-	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
-		misc/service/setenv.sh || die
-
-	einfo "Generating ${limitsdfile}"
-	print_limitsdfile > "${S}/${limitsdfile}"
-}
-
-src_install() {
-	local ARTIFACTORY_HOME="/opt/artifactory"
-	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
-
-	insinto ${ARTIFACTORY_HOME}
-	doins -r etc logs misc tomcat webapps
-
-	dodir /etc/opt/jfrog
-	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
-
-	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
-
-	exeinto ${ARTIFACTORY_HOME}/bin
-	doexe bin/*
-
-	# FIXME: this is called by catalina.sh (it echoes the variables before starting
-	# artifactory, as well as makes sure log dir, etc. exists). Those directories
-	# could probably be moved to the ebuild and the script removed from catalina.sh
-	# without consequence (and quieter starts). Would need to check if CATALINA_*
-	# variables are actually used anywhere (from reading code don't appear to be
-	# actually needed)
-	exeinto ${TOMCAT_HOME}/bin
-	doexe misc/service/setenv.sh
-	doexe tomcat/bin/*
-
-	keepdir ${ARTIFACTORY_HOME}/backup
-	keepdir ${ARTIFACTORY_HOME}/data
-	keepdir ${ARTIFACTORY_HOME}/run
-	keepdir ${ARTIFACTORY_HOME}/work
-	keepdir ${TOMCAT_HOME}/logs/catalina
-	keepdir ${TOMCAT_HOME}/temp
-	keepdir ${TOMCAT_HOME}/work
-	keepdir /var/opt/jfrog/artifactory/run
-
-	newconfd "${FILESDIR}/confd" ${MY_PN}
-	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
-
-	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
-	fperms -R u+w ${TOMCAT_HOME}/work
-
-	insinto /etc/security/limits.d
-	doins "${S}/${limitsdfile}"
-}
diff --git a/dev-util/artifactory-bin/files/initd-r2 b/dev-util/artifactory-bin/files/initd-r2
deleted file mode 100644
index c9fbb05bd834..000000000000
--- a/dev-util/artifactory-bin/files/initd-r2
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/sbin/openrc-run
-
-description="Manages the services needed to run Artifactory on a dedicated Tomcat"
-command="/opt/artifactory/tomcat/bin/catalina.sh"
-pidfile="/opt/artifactory/run/artifactory.pid"
-procname="artifactory"
-user=${ARTIFACTORY_USER:-artifactory}
-group=${group:-artifactory}
-
-# Artifactory can be very slow to start, and without locking,
-# restarting via runscript is very error prone
-CATALINA_LOCK_FILE="$(dirname $pidfile)/lock"
-
-CATALINA_MGMT_PORT=8015
-REQUIRED_JAVA_VERSION="1.8"
-START_TIMEOUT=300
-
-# Helper functions:
-is_mgmt_port_used() {
-    mgmt_port_used=$(netstat -vatn | grep LISTEN | grep $CATALINA_MGMT_PORT | wc -l)
-}
-
-get_pid_info() {
-    pidValue=""
-    javaPs=""
-    if [ -e "$pidfile" ]; then
-        pidValue=$(cat $pidfile)
-        if [ -n "$pidValue" ]; then
-            javaPs="$(ps -p $pidValue | grep java)"
-        fi
-    fi
-}
-
-depend() {
-    need net nginx
-    use dns logger netmount
-}
-
-start_pre() {
-    if [ -z "$ARTIFACTORY_HOME" ] || [ ! -d "$ARTIFACTORY_HOME" ]; then
-        eerror "Artifactory home folder not defined or does not exists at $ARTIFACTORY_HOME"
-        return 1
-    fi
-
-    if [ -z "$pidfile" ]; then
-        eerror "Artifactory pid destination pidfile was not set!"
-        return 1
-    fi
-
-    if [ -z "$TOMCAT_HOME" ] || [ ! -d "$TOMCAT_HOME" ]; then
-        eerror "Tomcat Artifactory folder not defined or does not exists at $TOMCAT_HOME"
-        return 1
-    fi
-
-    if [ -z "$ARTIFACTORY_USER" ]; then
-        ARTIFACTORY_USER=$user
-    fi
-
-    current_open_file_limit=$(su -l $ARTIFACTORY_USER -c "ulimit -n")
-    desired_open_file_limit=32000
-    if [ "$current_open_file_limit" != "unlimited" ] && [ $current_open_file_limit -lt $desired_open_file_limit ]; then
-        eerror "Maximum number of open files ($current_open_file_limit) is too small!"
-        eerror "You should add:"
-        eerror "artifactory soft nofile $desired_open_file_limit"
-        eerror "artifactory hard nofile $desired_open_file_limit"
-        eerror "to your /etc/security/limits.conf file."
-        return 1
-    fi
-
-    current_max_process_limit=$(su -l $ARTIFACTORY_USER -c "ulimit -u")
-    desired_max_process_limit=1024
-    if [ "$current_max_process_limit" != "unlimited" ] && [ $current_max_process_limit -lt $desired_max_process_limit ]; then
-        eerror "Number of processes $current_max_process_limit is too small!"
-        eerror "You should add:"
-        eerror "artifactory soft nproc $desired_max_process_limit"
-        eerror "artifactory hard nproc $desired_max_process_limit"
-        eerror "to your /etc/security/limits.conf file."
-        return 1
-    fi
-
-    if [ -n "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then
-        einfo "Found java executable in $JAVA_HOME"
-        _java="$JAVA_HOME/bin/java"
-    elif command -v java > dev/null 2>&1 ; then
-        _java=java
-    else
-        eerror "No Java Runtime Environment (jre) found! At least java-$REQUIRED_JAVA_VERSION is required."
-        return 1
-    fi
-    if [ "$_java" ]; then
-        java_version=$($_java -version 2>&1 | grep 'version' | cut -d ' ' -f3 | tr -d \")
-        java_major=$(echo $java_version | cut -d . -f1-2)
-        if [ "$java_major" != "$REQUIRED_JAVA_VERSION" ] ; then
-            eerror "Java version $java_version is too old, java-$REQUIRED_JAVA_VERSION is required."
-            return 1
-        fi
-    fi
-}
-
-# We have to pass start/stop through to catalina.sh, which doesn't understand restart (and restart can't be overridden in OpenRC):
-start() {
-    get_pid_info
-    is_mgmt_port_used
-    if [ $mgmt_port_used -ne 0 ] || [ -n "$javaPs" ]; then
-        eerror "$RC_SERVICE already started!"
-        return 1
-    else
-        ebegin "Starting $RC_SERVICE"
-        start-stop-daemon --exec $command --pidfile $pidfile --user $user:$group --wait $START_TIMEOUT start
-        RETVAL=$?
-        eend $RETVAL "start-stop-daemon failed to start $RC_SERVICE"
-    fi
-
-
-    is_mgmt_port_used
-    seconds=1
-    while [ $mgmt_port_used -eq 0 ] && [ $seconds -lt $START_TIMEOUT ]; do
-        sleep 1
-        ((seconds=seconds+1))
-        is_mgmt_port_used
-    done
-    if [ $mgmt_port_used -eq 0 ]; then
-        eerror "$RC_SERVICE did not start in $START_TIMEOUT seconds!"
-        return 1
-    elif [ $mgmt_port_used -eq 1 ]; then
-        einfo "$RC_SERVICE started"
-        [ $RETVAL=0 ] && touch $CATALINA_LOCK_FILE
-    else
-        eerror "Got unexpected result when checking port $CATALINA_MGMT_PORT"
-        return 1
-    fi
-    return $RETVAL
-}
-
-stop() {
-    ebegin "Stopping $RC_SERVICE"
-    start-stop-daemon --stop --pidfile $pidfile --wait $START_TIMEOUT stop
-    RETVAL=$?
-    eend $RETVAL "Failed to stop $RC_SERVICE!"
-
-    [ $RETVAL=0 ] && rm -f "$CATALINA_LOCK_FILE" "$pidfile"
-    return $RETVAL
-}
-
-status() {
-    is_mgmt_port_used
-    if [ $mgmt_port_used -eq 0 ]; then
-        if [ -e "$pidfile" ]; then
-            eerror "$RC_SERVICE stopped but the pid file $pidfile still exists!"
-            RETVAL=1
-        else
-            if [ -e "$CATALINA_LOCK_FILE" ]; then
-                eerror "$RC_SERVICE is stopped but the lock file $CATALINA_LOCK_FILE still exists!"
-                RETVAL=2
-            else
-                eerror "$RC_SERVICE is stopped"
-                RETVAL=3
-            fi
-        fi
-    else
-        einfo "$RC_SERVICE is running"
-        RETVAL=0
-    fi
-    return $RETVAL
-}
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 0e3b4b1a6c9b..189b460bbed6 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -5,6 +5,7 @@ DIST bazel-0.26.1-dist.zip 244633948 BLAKE2B 667078bda6e52f696127b7a4914ec52ab67
 DIST bazel-0.27.0-dist.zip 247946763 BLAKE2B f061793de89144c77bd42de56c495e8b3399ac1892bdd2b0e210102ea1c2835a848432b2964ddcc6ebe77aa580efa378d46afad1faa6dec0831666f201a6dd74 SHA512 f5c6a0c789eb55790479ff839f7f959e7d0e46e5f14b5cdcd720e4dc2c36122345c9dcd6bfa803f88fb5264553a3d63ae0c8e4c7b9779bfc65183e2aaee5a666
 DIST bazel-0.27.2-dist.zip 247948037 BLAKE2B ee3dafbb104f434080ad803cb40585e36a8c816eddac3d1a680752dd4ac65d588f1d5f4bb759dad0f59e9f6d7aad0ea5b54cd050d75a5434ee6ef079d8127641 SHA512 5fd7c2af2123424d3e5e4c9216de10d12ce604798f4831800c8d68cfd9bcf1133f4db9a947f0ee16db1a1513be17340ab8e36fba994a016d98c74ad5e026b4ab
 DIST bazel-0.28.1-dist.zip 256641169 BLAKE2B 489dfb1a27f83ff244cd05c11ec206689c12319a48f000379277073a108a79ad2dff61ed159efcbb1405531114ccb2d749e974004f969623cd4e9470166609f0 SHA512 640d3a9644436379e989d5993b5de9f2dc14d651a9f444c8795853989fdded7a62d71ab7cfa491d2aaf6402020c4931c8dc190d4dae63727b172ccb48ed55931
+DIST bazel-0.29.1-dist.zip 265744999 BLAKE2B 8495ab96947b02ec827cc2b5f542454e0d631eb077514c740d8be813495644f0be1020e706e2dbd321fa6f39af3060c4a7b2e68499201eaffc197704c1ecf760 SHA512 4da49e3f1ba681003afc2536d55954ed5a2c29de4a68e5a07f2627f3573d97bd6e244bc8a4f43c8951ecddd221041d87270ca9b7dd59ab16676306c9716f003d
 EBUILD bazel-0.20.0.ebuild 3072 BLAKE2B e357ef6c41a91ecd538250fd47830076db961e2234c7c734d24ae3c501517d0f16bf5934896a0e7efe271af926953b083c47c924c581b7ef208af2c4d53bf623 SHA512 982ca89595f13670dc117ba3504e8de6f3d5f4a7ec2af3a11bfadc3ce25bd75c85387b53464bd0348b0842d25454a1c1398ecc4f1146f9eb2fafa857e2193487
 EBUILD bazel-0.22.0.ebuild 2881 BLAKE2B 695d96ecc9d2cb3639f65fa4f78b79d3c4baea2855a0b55b7bc416d4de031f38f7d80c68e774299fcf04fbeac313922783c0608e7b9a4b56a495ab51b7ea0932 SHA512 973714e250185a402177c7c73d17eae5eb44cb9267c0d5029bd9d4d252664e5a528e070ee9c9b325693e36b15ba75b86d702938c6a3292cd3dd8eee3da12b8c4
 EBUILD bazel-0.24.1-r1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
@@ -13,4 +14,5 @@ EBUILD bazel-0.26.1-r1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd
 EBUILD bazel-0.27.0-r1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 EBUILD bazel-0.27.2.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 EBUILD bazel-0.28.1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
+EBUILD bazel-0.29.1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.29.1.ebuild b/dev-util/bazel/bazel-0.29.1.ebuild
new file mode 100644
index 000000000000..84224be11667
--- /dev/null
+++ b/dev-util/bazel/bazel-0.29.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools"
+# strip corrupts the bazel binary
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS}; do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	default
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
+	VERBOSE=yes ./compile.sh || die
+
+	./scripts/generate_bash_completion.sh \
+		--bazel=output/bazel \
+		--output=bazel-complete.bash \
+		--prepend=scripts/bazel-complete-header.bash \
+		--prepend=scripts/bazel-complete-template.bash
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+	output/bazel shutdown
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh_completion/_bazel
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+	fi
+}
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 1fc178640749..59f970253e0a 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -4,4 +4,4 @@ DIST buildbot-console-view-1.3.0.tar.gz 640506 BLAKE2B bf68136edbe734514b662a580
 EBUILD buildbot-console-view-0.9.12.ebuild 1141 BLAKE2B 0f0e870f4063f2062efac2bc573d5e9dea7568ac2e4064299aa22eada3fba565ce1045f39c3c26918cba874125cf42233177c4b8cdf09236806de30cd2b307dd SHA512 e2b853c3c6039a9a70f2319c498f1ff2ca1ee2a9ee1016f55ba8a5cf5d6ccf9a550ba60e68e90180c51a3f1d1f3915cd8732ca5dfcc837d6e38d7cd238afca47
 EBUILD buildbot-console-view-1.1.2.ebuild 1138 BLAKE2B 389ff1f782f7da3bc61b06167d94d561090a099ca4c85fa2af47da25b6e6e02cf66148b51be8be768e636782439f60a8b1154f5f8e259e5ab0fd4296ab9b48d7 SHA512 e1c866d38d17c580245f873f2e7b7b34c5781e2c1468e717bb6fba7326a9509d5b57b3809e7959eddd311d92e3d79e3a3c7f6059a424a57220635a969123e320
 EBUILD buildbot-console-view-1.3.0.ebuild 1138 BLAKE2B 389ff1f782f7da3bc61b06167d94d561090a099ca4c85fa2af47da25b6e6e02cf66148b51be8be768e636782439f60a8b1154f5f8e259e5ab0fd4296ab9b48d7 SHA512 e1c866d38d17c580245f873f2e7b7b34c5781e2c1468e717bb6fba7326a9509d5b57b3809e7959eddd311d92e3d79e3a3c7f6059a424a57220635a969123e320
-MISC metadata.xml 660 BLAKE2B dd64f91ba93d64ffa1d1aec035eddab0863d2332664ae9292d54ddb394c3d406ca4f5c55cc4da7e0163563623d27602dbc51656e100e587797653b4fdd01f5b2 SHA512 975022375960d255342c24364513b4352e6eb6ec34ef8f16f8a7c08a978969202660516957eea8f61e4afe13622dec826ad8a5f69673d0cabffb9f52e91e0992
+MISC metadata.xml 582 BLAKE2B 7b70e690ee782b2e32a79def5816c289e258339bd94aa5001297406ad9075e8dbf2623119c717a937a5dc42c034396700b1943e845cf7d7c4797714018280a56 SHA512 28aa58be60e1ce0675809fddfc84e864d801bc5438a9212b714a684cfbe97c9dcea40a74853656b5000de58e81c6babc5997ed3e354bc6d478071f968b379778
diff --git a/dev-util/buildbot-console-view/metadata.xml b/dev-util/buildbot-console-view/metadata.xml
index 0ac5c019b302..c45630a197bd 100644
--- a/dev-util/buildbot-console-view/metadata.xml
+++ b/dev-util/buildbot-console-view/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The buildbot-console-view plugin is the user interface code used to
 		display information about the builds to the console.
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index f5b064a66a82..5ccc42633b0b 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -4,4 +4,4 @@ DIST buildbot-grid-view-1.3.0.tar.gz 638845 BLAKE2B fb52b8fccbce298cbaf715feb1d7
 EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1110 BLAKE2B ee3ffc432b8844906ded608e3eb7cf01c8a9c303c111f8fb8c1bd728c9f32e0cdb4b1f04c70156576848e6443b2dbc80bd32ac6a43a02f1ab4b420f7cff74cb3 SHA512 775e3bcbc9643aa6e7bbdc70a53eb6cedbb66f3acec99e6fdb313a41ae39baf6c6f69e26311d8de3730892bcf999e8e04ae5442ae9207dafb2ff8e1625048c26
 EBUILD buildbot-grid-view-1.1.2.ebuild 1103 BLAKE2B 2e4977f8fe7e7aa6d443929189b36a7f79d012705e2fd27938044ad01445921042542db8e1f339bac74df60bc9d6bcbff1d764682babf6f457b013fec481f785 SHA512 2244a4b235452b00c24471c6e56aaba659be7c94bd8f423b2e74e4abf5caf09c245b2499462490349cac2959c820ccae09273d7369d233cce2e097c4623cdb5a
 EBUILD buildbot-grid-view-1.3.0.ebuild 1103 BLAKE2B 2e4977f8fe7e7aa6d443929189b36a7f79d012705e2fd27938044ad01445921042542db8e1f339bac74df60bc9d6bcbff1d764682babf6f457b013fec481f785 SHA512 2244a4b235452b00c24471c6e56aaba659be7c94bd8f423b2e74e4abf5caf09c245b2499462490349cac2959c820ccae09273d7369d233cce2e097c4623cdb5a
-MISC metadata.xml 639 BLAKE2B 563a20f38d4d1476b8833f8e858110adfcf70f9abbe589e5538eac0289ce0d232d5359a111d710b371030342571bab3298e3a2425bc360cecc11d0c976653835 SHA512 5f1f6e27005ff78eb008f4e9a74cac6fb58dc0b73155fa52325b2771f8723691755e5123382a33beb427a4a33c1832f796b56fc94eaafc7eb91c7042546e964d
+MISC metadata.xml 561 BLAKE2B be04eb0a5ba4b476810f1f53459ac6839ef9d83871c8e415ca09b3f6927aef34f6ebbcba8f67b6460b9ed940613fc9d754512e7e3d1deca401936c29a88856e2 SHA512 57e18994b8280d38538b93af66ecc756abbb8bbc70117cb1b89f0b30fde66fe5241faf9bad84cb2f8e11ee67d29ae30eeec435e0b6a9af7c178b2bf58d966b27
diff --git a/dev-util/buildbot-grid-view/metadata.xml b/dev-util/buildbot-grid-view/metadata.xml
index 876330a1b4c0..a43f9bff6dea 100644
--- a/dev-util/buildbot-grid-view/metadata.xml
+++ b/dev-util/buildbot-grid-view/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The buildbot-grid-view plugin is the user interface code used to
 		display information about the builds.
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index c4dfc177c85d..d23b3793d320 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -5,4 +5,4 @@ DIST buildbot-pkg-1.3.0.tar.gz 4835 BLAKE2B d035060ebf1e5823979adea8b7d31a13cc7b
 EBUILD buildbot-pkg-0.9.12.ebuild 1068 BLAKE2B 2db6c1832fd1305ac8a44b7c644d01a93b6c6f845bccce20c014986b6ec85824c505f758489b58c6432bf4d8007f85010f9415d8115039bc9b530bbb5432d0a4 SHA512 68f406a27589210f237334b11186d4d3ea56fbc0d18083923b119c0e22523f468a1f41998edabbf47e2b6fc44176aa953f22d8b67282e89a98b4bfe4dc44d5fe
 EBUILD buildbot-pkg-1.1.2.ebuild 1155 BLAKE2B 766c0e653890ae4318ffec25cf02a53aaf600817539753c6e8b82f4851f6ae8e31460b722bdcac825e709307be85bfc8a466c5aece34e634e7e0c16e724f3240 SHA512 3e61b1cf62e6a12e3cda6d62d418a0bae56fee07c332b2ca13dcbd80252d32d12866f329df5162a274f2be8b5827f5b606e1b055cc6a8c1fc394194d09c4c65a
 EBUILD buildbot-pkg-1.3.0.ebuild 1155 BLAKE2B 766c0e653890ae4318ffec25cf02a53aaf600817539753c6e8b82f4851f6ae8e31460b722bdcac825e709307be85bfc8a466c5aece34e634e7e0c16e724f3240 SHA512 3e61b1cf62e6a12e3cda6d62d418a0bae56fee07c332b2ca13dcbd80252d32d12866f329df5162a274f2be8b5827f5b606e1b055cc6a8c1fc394194d09c4c65a
-MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f
+MISC metadata.xml 1120 BLAKE2B 04e28b3993f21c0ec80375dc377079dadeb00e51e071958806505985bd3b10647e0a8396ff4a06f2f635f08d1cc802071b33ca1e6ffbadb712c0be49f81ef47f SHA512 f384c87c8bdc67372bad64103155dac6f7bf7d91b1f3f962e1b1c08cbfe648c8becc21e8af7d7b96c9096073215cb1bab87978132deafa94ce6370eaa027590c
diff --git a/dev-util/buildbot-pkg/metadata.xml b/dev-util/buildbot-pkg/metadata.xml
index f15869d650cd..3c1d80ae6865 100644
--- a/dev-util/buildbot-pkg/metadata.xml
+++ b/dev-util/buildbot-pkg/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 	BuildBot is a system to automate the compile/test cycle required
 	by most software projects to validate code changes.
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index a7fa1c732ef7..ac6ad5efc891 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -4,4 +4,4 @@ DIST buildbot-waterfall-view-1.3.0.tar.gz 713879 BLAKE2B 42e838bfb5925850cfa6797
 EBUILD buildbot-waterfall-view-0.9.12.ebuild 1145 BLAKE2B b04cf48ed5b4849436b4ea7e6414131307a1a3ffb9524543a6801b69df0ffc63282290d4b2ecedd88459d221e352d4e62f46bda68af1406466ba05a069166103 SHA512 6b6180ed60a93200a86adae7a006de353c9dad0ab8f5846896e4e76f255ecb2ff57e0431068288c3ff3daa01aa03992fd3be4246777ac12bcb6c2678c27dd819
 EBUILD buildbot-waterfall-view-1.1.2.ebuild 1142 BLAKE2B 1fe5002e9588fbedced771f8736e164194ab56fd93307bf4e2cc354b9c99eb912f792703bab9320c777a3c1fd291bd7a98458526bb06f3f347dc65fe45ca9bdd SHA512 0db5aa9024e4ac2634caac0da3a422ad34de6e7af10f5c210c7e97a65031e34cced4c6c947442fcc0a2d4f6950fa06fb4495926a998cfc75b30bc48469bc79c1
 EBUILD buildbot-waterfall-view-1.3.0.ebuild 1142 BLAKE2B 1fe5002e9588fbedced771f8736e164194ab56fd93307bf4e2cc354b9c99eb912f792703bab9320c777a3c1fd291bd7a98458526bb06f3f347dc65fe45ca9bdd SHA512 0db5aa9024e4ac2634caac0da3a422ad34de6e7af10f5c210c7e97a65031e34cced4c6c947442fcc0a2d4f6950fa06fb4495926a998cfc75b30bc48469bc79c1
-MISC metadata.xml 680 BLAKE2B 47bfc9bb17933438a0c3ec478c1dad7da7f398cde2133ab96c472d0665e563f4d5c8d09ba04bcdccf820603cf3dcc18086b1e217aa86f7ae4d8067178922020b SHA512 266fd7fb76a1373c9342b438487d73a319209f320097981041bae9cf3892dc9d091fd253532457328a3f6f52ec37b0a0e6cd1119c6800de42bf19d7fc6054133
+MISC metadata.xml 602 BLAKE2B 345536cb04360976a1851b9979c40c8b487b7fecea7936dda78fdecdddc6aadf454aacf83f41406ea031ed22e4243ada64847acdeb0e011a839bb7c8757c82c4 SHA512 218340a7d39d3a7a7f410d18911ebfc4412dcef9041db41160619c6c77c855abf56e877c1d7976329c3017ee4462922735a3e3aee329f23ab1b6e4b4a7c2ffd5
diff --git a/dev-util/buildbot-waterfall-view/metadata.xml b/dev-util/buildbot-waterfall-view/metadata.xml
index d5c5ab57b9a9..6362c20133d1 100644
--- a/dev-util/buildbot-waterfall-view/metadata.xml
+++ b/dev-util/buildbot-waterfall-view/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The buildbot-waterfall-view plugin is the user interface code used to
 		generate the web pages used to display information about the builds.
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 6f7804ed66fa..e95a583f9e2c 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -8,4 +8,4 @@ EBUILD buildbot-worker-0.9.12.ebuild 4808 BLAKE2B 56e8fb43e57c6a90054296637223fc
 EBUILD buildbot-worker-1.1.2.ebuild 4810 BLAKE2B ac2963d34b9afe8e000db472b2deff56fdf3c5f00a3ffeae31582db71dac30544b31dcbfb5922baf58b87a4de6c0d627ad0207cc8f0c0ba9eb948f77b0605b2b SHA512 44b10d2efbb2156c2444f92f1c5a37fc34c943f02aad96450d9ce3586156a6959f50ab2dbd9b7545aee71e5b15bfbbfbb60c48ed2812da8373e6f9597c8b2c82
 EBUILD buildbot-worker-1.3.0.ebuild 4810 BLAKE2B ac2963d34b9afe8e000db472b2deff56fdf3c5f00a3ffeae31582db71dac30544b31dcbfb5922baf58b87a4de6c0d627ad0207cc8f0c0ba9eb948f77b0605b2b SHA512 44b10d2efbb2156c2444f92f1c5a37fc34c943f02aad96450d9ce3586156a6959f50ab2dbd9b7545aee71e5b15bfbbfbb60c48ed2812da8373e6f9597c8b2c82
 EBUILD buildbot-worker-9999.ebuild 4810 BLAKE2B ac2963d34b9afe8e000db472b2deff56fdf3c5f00a3ffeae31582db71dac30544b31dcbfb5922baf58b87a4de6c0d627ad0207cc8f0c0ba9eb948f77b0605b2b SHA512 44b10d2efbb2156c2444f92f1c5a37fc34c943f02aad96450d9ce3586156a6959f50ab2dbd9b7545aee71e5b15bfbbfbb60c48ed2812da8373e6f9597c8b2c82
-MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
+MISC metadata.xml 402 BLAKE2B 8ae4401e82aeac4b9e28c94cbfefaaf2f15d15dad0771fda3e1447dc98ef99fd4578b6dbc8e475eb3354ae781f481dd8c6422c06a67d0612ea89e7f39a1d33ab SHA512 a47717971189510d5781fa3ea41de026fe2518d32619eb6830cdc1cbad89182dc01dc2c57877c9689565fcea713ac08dd36af9f51ef47888319ea2380b488deb
diff --git a/dev-util/buildbot-worker/metadata.xml b/dev-util/buildbot-worker/metadata.xml
index 04061719612a..02cba1b8df4a 100644
--- a/dev-util/buildbot-worker/metadata.xml
+++ b/dev-util/buildbot-worker/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>devel@buildbot.net</email>
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index d0f98cf387bf..f3642dbf9108 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -4,4 +4,4 @@ DIST buildbot-wsgi-dashboards-1.3.0.tar.gz 626828 BLAKE2B 9c44bca995a1849246c71c
 EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1150 BLAKE2B e9354da5dc2bcb0ed8570ba566a483c75c5d99616c36a897d429a55b3ddf8106acfa8552ad00da622c74e7f9fda20b6bbdbf5ea692d68c9e5fbcb70dabfc2e21 SHA512 c5f35d782a8f6b642d28ebd0c4038a89a0efe89f16a0581c2769c03f03655b618dfaf0a9aad5e616662e3dc99f2447e514897c6d87a51eaab82492650c641548
 EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1147 BLAKE2B 21659d6708b7bc8f29954d6d46765c238573a8cc1e2d4179f7ca51b709baa457499158d872a4e35f6c2a062c46bd9657bccf51a29388e98c36e56a9ad68dcf34 SHA512 66d0e207a955f066b974b9ab0e372de15e251f4fa87cffb7273870b94d728bd49b0af650b530e0e5613e35f9b6cc588fccc284208fa3724a3af3e82fd848da70
 EBUILD buildbot-wsgi-dashboards-1.3.0.ebuild 1147 BLAKE2B 21659d6708b7bc8f29954d6d46765c238573a8cc1e2d4179f7ca51b709baa457499158d872a4e35f6c2a062c46bd9657bccf51a29388e98c36e56a9ad68dcf34 SHA512 66d0e207a955f066b974b9ab0e372de15e251f4fa87cffb7273870b94d728bd49b0af650b530e0e5613e35f9b6cc588fccc284208fa3724a3af3e82fd848da70
-MISC metadata.xml 679 BLAKE2B 9ce30ea17fc3c2fa7f7c4fba8ad2f521bdf828662683893a8b6e8fc43f4c1ce8fcd8afdb1bc237153751eeb5d134df683b1abe9f0bf7a70f1b6c98517640d3b9 SHA512 47cebf0aa635cee9157445057c21b2d1272b222291874371791656823f75b20f59772ebae2eb1dd8230752808878f284879127650f7130e2b9820ce60fc6d92b
+MISC metadata.xml 601 BLAKE2B eeb2a7e4d63561b48e7eb2e77fcae315008e4a567baff579bc086623118fba8675590e059ea3a6437d158e9e9992eea7ed8c0fa46a778d5dc333786dc70a58aa SHA512 2bd94cca6be055e75c5f772913570f01ef07eba909c8ab79c21df89a806548a8920016fb6fb139ddfc9c613101432e51bc9dd2600e3c6f01a6986d06107844b2
diff --git a/dev-util/buildbot-wsgi-dashboards/metadata.xml b/dev-util/buildbot-wsgi-dashboards/metadata.xml
index b97bf609846d..3ea7eeda80ab 100644
--- a/dev-util/buildbot-wsgi-dashboards/metadata.xml
+++ b/dev-util/buildbot-wsgi-dashboards/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The buildbot-wsgi-dashboards plugin is the user interface code used to
 		integrate flask or bottle dashboards to buildbot's web interface.
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index df990b1c41a4..870297b2296e 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -4,4 +4,4 @@ DIST buildbot-www-1.3.0.tar.gz 717517 BLAKE2B 57b0ed7ef46fecb242562a0f93e234985c
 EBUILD buildbot-www-0.9.12.ebuild 1182 BLAKE2B 15e5f4e434388e046289db3cdab2419cff90b6878e2f206b33ee0add43709c1519a23d1bc9bb98f6538d16939e95b24f3e94a8f69045f1c34227effb42f6ef70 SHA512 040ec4dba0f0e5e15d64f368063a78244dbaa58ab1ba5ba12969d9e29a69a4c2a00d8dca1f42c84f08825c7f3a7aff682d34f8305df10b50d024201ca839ae9c
 EBUILD buildbot-www-1.1.2.ebuild 1179 BLAKE2B 68e1cb0c1f5a70246eccc70c4b8f480cf6d36936492bc195ff502d3b02732453e2f65a7c09251ed963a73d93c1349f2a1d2265c0326b04435c0fc862f845b9a1 SHA512 7b133af1d0d2e56b84895ba6be5901a4e2ad9fd72dec9d27470f6aa68da816067c437045522c152020269b9ac82e3673635d857d78041a0babe682ff063e8a13
 EBUILD buildbot-www-1.3.0.ebuild 1179 BLAKE2B 68e1cb0c1f5a70246eccc70c4b8f480cf6d36936492bc195ff502d3b02732453e2f65a7c09251ed963a73d93c1349f2a1d2265c0326b04435c0fc862f845b9a1 SHA512 7b133af1d0d2e56b84895ba6be5901a4e2ad9fd72dec9d27470f6aa68da816067c437045522c152020269b9ac82e3673635d857d78041a0babe682ff063e8a13
-MISC metadata.xml 666 BLAKE2B 2fc8d01c607e9f1fc0de5d151e0256fd7adbc1572d2497126012b0792967dbafe2522b269232a72c5208a5c0a6b9eddb9094afdde5d99d4b27995ad506c08f03 SHA512 1d00795d602f0df5e1dac771d38dc068e80edd098add25231bafb11d0f8d2ce783e884e41c3b0eba1a52fc2dac26a62f4c1c29603e20d6cb0af7c6977f437907
+MISC metadata.xml 588 BLAKE2B b50149f2f21f5ddb5dfc4bbff2830c3a6f047ab04df1487fb1a462b403d6d4201eb7945a069ce662fb6682782e98720970c58fd3b27c4252d2b7843ae083599b SHA512 a215b7802240ef70f0c64e6fb511913aa83f514a79e79e24da98c36b68ed0105288f4515b0b016bda96ff3ce187694b41e508b4d22fa5a42ab57306fb8511491
diff --git a/dev-util/buildbot-www/metadata.xml b/dev-util/buildbot-www/metadata.xml
index 1f4ae627be1c..0ba9d3ff6c0a 100644
--- a/dev-util/buildbot-www/metadata.xml
+++ b/dev-util/buildbot-www/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The BuildBot-www package is the base or common code used for the other
 		user interface packages such as the waterfall and console views.
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index f44f809fa2d6..c142dfeedfe2 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -13,4 +13,4 @@ EBUILD buildbot-0.9.12-r1.ebuild 6434 BLAKE2B c5d990555a23357803c9e6dfdaf5694671
 EBUILD buildbot-1.1.2.ebuild 6545 BLAKE2B 4047c82720ee5495ed62a90a6059aece3b21605983cebdb654db29c3ab2121a8e384f8b4a249141f0ab2611108059ebf597191a6600fd16483b769d801fbb12b SHA512 1ef262f9231a59a30ac907e631c7fd415d0b5a0cbb387309feb0bec672e505ad714a1ee1f35b31b4c38e640d2cde0c3dfe44d98a62de9e3b48eb93e16513d6d8
 EBUILD buildbot-1.3.0.ebuild 7198 BLAKE2B c663e73bf0fb73325d368c48647d8ec9709b89f9142d906c4f7f97e8453b28da1729ea50e1b879dff4d14ee1000ced786cbe188e6c8ad4bd642d5465af805e5f SHA512 4c5802a4c0a7ef5c638eaddd65540b26f69181b7e44fdaa444404e4be4f0d3ec3e3dfe813ac39e3d5697220479763447f73e964fdd3db936a8f552365cebaf77
 EBUILD buildbot-9999.ebuild 7198 BLAKE2B c663e73bf0fb73325d368c48647d8ec9709b89f9142d906c4f7f97e8453b28da1729ea50e1b879dff4d14ee1000ced786cbe188e6c8ad4bd642d5465af805e5f SHA512 4c5802a4c0a7ef5c638eaddd65540b26f69181b7e44fdaa444404e4be4f0d3ec3e3dfe813ac39e3d5697220479763447f73e964fdd3db936a8f552365cebaf77
-MISC metadata.xml 1505 BLAKE2B d07e69e8ef573b7cf2a5575a19f3bd875058903e1fc59c4100a4300e72825c1fb137eb4b804a505a7ec1877b7fae91621e35e611964abea4062fad37a9c6cc29 SHA512 795f29b373d7fa6190fa61f2ffe986e1e1857b11cf68a787a09c7d5ea485c1e55cc7f745d2bf84de3c431e8e29f6176d094df92f760432e808ba2abe12c065bf
+MISC metadata.xml 1427 BLAKE2B 61fb937ec5b16eccfbca293455b8f1dbc8b98f489eeb150a0209b32bf53d79b3ea12841a2bd2a39d9b120009e897469e40aaa189fab33e67e9ef6a396353acd9 SHA512 eec1f2c30d650ae90c80266ffac401e432c75605422110511d40162635da39f3428e33bb04ef58de8124830e34434d2e8b582600d75ffed0bfa8d8e25e2ad1a6
diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml
index 924d82319f5d..6bb44137e07a 100644
--- a/dev-util/buildbot/metadata.xml
+++ b/dev-util/buildbot/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 	BuildBot is a system to automate the compile/test cycle required
 	by most software projects to validate code changes.
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 7610f797e4a4..4a6c1cd35fe3 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,6 +1,8 @@
+DIST catfish-1.4.10.tar.bz2 213951 BLAKE2B ff8f710d5f3b5d59e98bd6af9b1dd11499ea331b2d7c78945ebc1051d1b49d28069e47bd8aa3f12d57b646fc6764ccd4f365cda9fdfea15f5a3a4334b6e9b17e SHA512 baf9007b2ce2418fa5704e10884f509e4361505537e2ce70a7f8c8c61009094a09d7d032e0a6b4ca174f33bf76783ee2665f781cce47d2b236f2633e25192f29
 DIST catfish-1.4.7.tar.bz2 162289 BLAKE2B 2f24485f0f059a177a8544632ab583acad1149f96921f8b10027e5788adb2eaf4da0911f3363174feef570c8f75615ec1f943a2d5d2e8622efd4be9892a0fcd2 SHA512 cafa8eaaa40522f50111b3bb9c09a116ebad827532b0cfc88bc643fb2e2d89edee53057fbbed23719f4091ca384d7ea025633e571e160d7dfced008f788a3ffd
 DIST catfish-1.4.8.tar.bz2 181027 BLAKE2B c03270832cb2e6bdc39528801d257d37c52f0c6f361c9225002c31a258a18a1c98cf7af640ca15a4f6e32ac4ac802bda84327123a7bf13d47a1410e67988bfab SHA512 46c9e9112116e0f8ee7957c5a71d16ecdde8c16a60a030f3339933a6f9e73d61d360fed52d5904b0fff21448050cc17df5af63f6254476404760fe9166dfad00
 DIST catfish-1.4.9.tar.bz2 182247 BLAKE2B 343a9a83bed73a5f0416fa2ec61869dd3fdb13b8bc45a46dba7d4901c36d97b17e9f32f616baae8cceece566f4e529d34e55f81cb071504b750f4edda048185b SHA512 c62596a09ed481eac5a4544dcfcc71c02177c115b6bf050b1f2421a575ef589c0c1569ef26d6864e472f2331f0561c7f1146c58bc7873af8036d6e7350465c3d
+EBUILD catfish-1.4.10.ebuild 1089 BLAKE2B eecfd11133132625e85709f77c28e3d9ebad74b2061773369542f0e470532be320a1d25df825c5863ac89c1ca68023dd32b890f47c317f67d6b96416b9393f79 SHA512 9733034aac8ab0e60a4dd74684754a7f8e924fed1ff21c2559ff239848060760dfc54b368bb20aebddd021f2a1e479cb097aed8e1b7268800bcaa6f200e23edc
 EBUILD catfish-1.4.7.ebuild 947 BLAKE2B cb3fa62e138ae25d38f6d01e9adf0dbaeb6b4d67b6dd35de6f1e479ce29a1fd12ae1dd8a020db2d77e26cc8ee1442c9f5bacfc49fbb14eb18ac9b2792641feaf SHA512 0cb196c16e7f798c0db251f5aa1942d5c9c7388dad8e44e153c86c3fbcc981d1a86c1a91807de303a68a739d7c8ffa8bc28e9a923a1da242e814a27d9525b2c6
 EBUILD catfish-1.4.8-r1.ebuild 1071 BLAKE2B 99e71a14716847ec22defeca8824dde5abd2cded8a423f29b7a55e35c3bebd5e0592cad3a912036382fbf27d17b84ac07e407b09de7dae60f32483b7a8ea767f SHA512 5e3ee490a3dcd677c983b7f90c9a3d35f15d022d7125adf644ddc0e4989a5fc91d076e560649bd9ff56480d7ec8d61bedb3ed5541219e2bdcd31a1c459a49977
 EBUILD catfish-1.4.8.ebuild 949 BLAKE2B f07556d8a90c1f5fb0510ddfd10ed5721871be076199e51fb5caa2bcac541e85b1202c336fbc0febf1ea34792c259647b0216c6a74554f027a6e755947fd55de SHA512 dc32d008d3620f787b21013a454021290e7e5ed45f5fc299a75361ceb2b48f4870824aaeacd10c238eeba06a1630560e2655f0bd456aa2b8208e220541fab890
diff --git a/dev-util/catfish/catfish-1.4.10.ebuild b/dev-util/catfish/catfish-1.4.10.ebuild
new file mode 100644
index 000000000000..8833b3e29740
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	rm -r "${ED%/}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index a4c5e66ea17a..a9f7f465efe7 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -6,7 +6,9 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-3.7.1.tar.xz 349276 BLAKE2B 4f36ccb378b614668777d8be32dd343a0e59e36885a845ba004082f7ca0f69a5e4d01ed08af445c33bff218d33ad0385ed6ade383c06da20e3d0271b2f7423dd SHA512 c2f369c861998f82600272deedc436840af7f85baa355a1e119dacea8f41275d601a0805c3e2a8bc434df621a4e52647bd8654a71c2329542a8b160f7f179cdf
 DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147
 DIST ccache-3.7.3.tar.xz 351416 BLAKE2B f825eea87e89246edecbbc0b02cd0f67bbb0e9eb082a4f0c3d9aadca14a20e2d8e9af5f2c067d78393ea92c11878a11423402160210f3f79a3135d345225e0ad SHA512 74e6dd9558273af74aaf085d932955e8ded3d9f7d7b316172109af8f703f00a75fcc27187469d9cb5ba8654bcad12e406bede77cfcacbc0a752d5ca42e52c628
+DIST ccache-3.7.4.tar.xz 351576 BLAKE2B fa2a9c051ff3f9c0550c6301e8d6c9e0eb7ac68687a30a6e8c1ee794ecd6b62925fdc940d493a9fb22d9094c5f2a0f3b2788c6291430ca532661ea6ddef45456 SHA512 cc382f37f7efb30a64f6fc2b136ef7424fe51795a778dbb18dde7c9e80636515f242f51c3ef3231f74d154e65ed9e815abf8241eb1a8f4e0b4fe4f533ea27146
 EBUILD ccache-3.7.1.ebuild 2136 BLAKE2B c9e243c7cabac39716581c38271779a706f95a20d35cb40c3bef1d6b3768260fe5abcc05a35a43b34017e3ad5637758f27a386ff0b9cddf6be6751fe3a9fb50b SHA512 77335fd55a5fc9166a21a6b94a272107c97cb5b8b74bef26b3cc69a50f62a2c4f04673dba3f9dda1784c962effc2934be25fd5fe838ca5523c59a3131e1fddd2
-EBUILD ccache-3.7.2.ebuild 2139 BLAKE2B 240194a3f617a5ee2915220504a7c5a61c2f086c07c595bf58b0e9338870da5a4467bf871c25a6d5ee2b31b6c3ba379d656eab26272c087461caf35d32a72f41 SHA512 a000a04d0ddf031e7b6ebbd5094a2394cf7a0e09dba7d6e7fe2df1924b7c9ce61f92cfe104a58281875b8254da537e142b5da6dbe2338577878156cef97b142d
+EBUILD ccache-3.7.2.ebuild 2136 BLAKE2B c9e243c7cabac39716581c38271779a706f95a20d35cb40c3bef1d6b3768260fe5abcc05a35a43b34017e3ad5637758f27a386ff0b9cddf6be6751fe3a9fb50b SHA512 77335fd55a5fc9166a21a6b94a272107c97cb5b8b74bef26b3cc69a50f62a2c4f04673dba3f9dda1784c962effc2934be25fd5fe838ca5523c59a3131e1fddd2
 EBUILD ccache-3.7.3.ebuild 2036 BLAKE2B d9a00991a72a8ccf1ea4f218edd246c39dd780ffa1b435e6f311d2c7f029b3bc8a000971d1c7b05d86dafdfd63e2bd9bc66dedf1e0e32a9223b123669521bb5f SHA512 50c39ce2528656d7eae8ec9089ab1d2fa3cb33c72802c441ac14caabe23234dbaa1facd7b7569b2d95f86fb83771caf614caf002a7a78b90f211fdf5c3767c71
+EBUILD ccache-3.7.4.ebuild 2219 BLAKE2B 88d9c491f7fd7f177b1e170b1e79365838e05ee1b84ac236360ea650e0c584bc2311788a3ef9d94267cef3ef6e1469d04eb1f6abf8baf18429c45f958ba4c14e SHA512 f2e6c2b87b789c8a8e7c5801033bd9224af44e72365bf9ae352fdccb1b0bb9542a5ca64299fc5a2c416c2a233137e32f3adf9d4766e495492fae912d66f311b4
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.2.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
index 9b42e14bf5fa..7e0c22e120ad 100644
--- a/dev-util/ccache/ccache-3.7.2.ebuild
+++ b/dev-util/ccache/ccache-3.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.4.ebuild b/dev-util/ccache/ccache-3.7.4.ebuild
new file mode 100644
index 000000000000..084b27b64c6f
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="test"
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+# clang-specific tests use it to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+="
+	test? ( dev-libs/elfutils )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+)
+
+src_prepare() {
+	default
+
+	# make sure we always use system zlib
+	rm -rf src/zlib || die
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	emake check V=1
+}
+
+src_install() {
+	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+	default
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<'/usr/lib/ccache/bin'
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before
+'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/clair/Manifest b/dev-util/clair/Manifest
index b5e8fb83d1d0..7d0ae72a4444 100644
--- a/dev-util/clair/Manifest
+++ b/dev-util/clair/Manifest
@@ -1,7 +1,5 @@
 AUX clair.confd 75 BLAKE2B 8700f0e19734c3a6c0f0596e5fcbee5aafaf2bf19dd66fff0a94a29c9f886d6dba1803ba8e3a9e7f9286eaef512c34524a281c952943d455e35446b9a0511187 SHA512 9ff72a41da4600f7c266a7c763520c947e41c1c06dc93f9c8fcdc3f92d5b10ac4a2483122fedc4cf3bfc5de0a48f61366b0d2b72bcc348b736fa958b7065cc87
 AUX clair.initd 593 BLAKE2B ec5f50ef2fe997cd0f5e3aa7837be9bb7e39f4a5b766011034bde27c38d7eb32fc61853c8cc82d738724b4c6c5e01306c6e20c9968be0e4bbe8a5f4e7a79b7eb SHA512 827bf28ba4ad7a40f4eb916f315978da6d3fab52a8ac9b3316383d67ed90006f0b13e7cec3a8843d73e5d23ef27bcd53a9a02ec70c1795725cb98e5d1de788bb
-DIST clair-2.0.6.tar.gz 5195113 BLAKE2B 6044ba36d63d74eaecad5cc48173cd56867fb3004c7a667b9134105815171fb34b99d86f7fbb7b9a3f69ff6061a7419a63ceb23a07280eedba36b9046a401ad6 SHA512 7d996200e9a30fb569243592f88a9ef4b3a7b32852abb953518e3b6b2833bdb8e81fa8528f35feda0a16d514e48714fa60b716d038fdeafd5f3398cbccec145a
 DIST clair-2.0.8.tar.gz 5196242 BLAKE2B 9daa91599f9fe98f9a30a043fd261882b36abde5fe985097b47b48a9630db528d978f90f6bd68b32bae9d20a92f598199054cf188b1514a42876666703937b3e SHA512 000ba7c10ca540aaba34de91cf8060f6d28b704060457d320791d188871bf10ea1a8b5eb0526ae0aeebf6b6a307b096c2cc4038ddd5f955d200d20b96f1a725b
-EBUILD clair-2.0.6.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
 EBUILD clair-2.0.8.ebuild 1048 BLAKE2B b5c1bcef67e5bcf097d7ce2c4f9a1718a67291934ce94b2ad7ae28b45cf79efe23be1b2be3bb8d6ff4cd89ed3b3ee4e1decf2d721e268995604f44e8e41695c0 SHA512 51105ad82d34ade4612ea52b0d71d0413d4742a17d50244f7040099275be8b2c46823ac6884282c09de0368d1ae975f6466e99d553686da1e047f74ccc5bff96
 MISC metadata.xml 244 BLAKE2B ce0da14c65df5bf7fc2cae4430ffd0987a290bca46fa277b567e19ea1ac70833236a8979926777633066649665f2c816fbc4b602bc61d26672265436ff67fbdc SHA512 7f3452112634a3eed755c069728dbd8e6f79c52195acb4fa4a6caf7d44764e24bc37fd59daa394823b436adec9a99c932d253fafef7384cc25f0f7b3fb66fe0b
diff --git a/dev-util/clair/clair-2.0.6.ebuild b/dev-util/clair/clair-2.0.6.ebuild
deleted file mode 100644
index 1cb27791309a..000000000000
--- a/dev-util/clair/clair-2.0.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/coreos/clair"
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Vulnerability Static Analysis for Containers"
-HOMEPAGE="https://github.com/coreos/clair"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/rpm
-	app-arch/xz-utils
-	dev-vcs/git
-	!!sci-visualization/xd3d" # File collision (Bug #621044)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	GOPATH="${S}" go build -o bin/${PN} -v ${EGO_PN}/cmd/${PN}  || die
-}
-
-src_install() {
-	dobin bin/${PN}
-	pushd src/${EGO_PN} || die
-	dodoc {README,ROADMAP,CONTRIBUTING}.md
-	insinto /etc/${PN}
-	doins config.example.yaml
-	popd || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index a80bef95b58f..52ba4cbee899 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -1,8 +1,4 @@
-DIST cppunit-1.13.1.tar.gz 841334 BLAKE2B 4c27d666900e46fb2146f939ce7f5f2b036c971616c0642c3f601f349b14d7bb8d3a389fc93f31fe133b4df37551d0381e76bbcfb1785a4becf30db57726ca56 SHA512 3b588dd0ed35eca1dec1a7dcf21da40307b1da26d8e29a26a2fcb16cd4ba7e4dfdf58b6c3d537af2ad127c418b11ba62a1168312abb200d5aab8cb8475766a9d
-DIST cppunit-1.13.2.tar.gz 953596 BLAKE2B 205a631dde2cdd2b543be3e39c66331499f7f76e734bf227e94958dc1a4ce57e3ec11a3d555ddf3b8bb8a55b34478b74ac766147630478a53af0c96b606b43e6 SHA512 8f4be569f321d577cec31931f49f4df143bc94e283605509b6ea50c60690aa91a2aed940e7eebd4b2413a4218f9a6c3978d312d8e587eab040283c6563846ecd
 DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
-EBUILD cppunit-1.13.1.ebuild 1519 BLAKE2B b947d09d79ae72338dcd884cea61ebfd4540f2cb8cdba41b116b6d73f4c28982b29676ac8904628ff75da8a4b1c9aff5d4e58190c4da05d90087e81040b03005 SHA512 828a553548f581e0de5c161e1c113943a87b4ce7a53389e6d0bdee808ac4acf75acef2c393a41cf142aaeccef1732f618a99500a91dc400a9c00f43f2b1362b5
-EBUILD cppunit-1.13.2-r2.ebuild 1723 BLAKE2B 669773bfcd5343b03f4b23f3a39299d405ae686cc7c077f82d73c6b9e2778628648614b206e0ff81260c0b05237053a84b0f20dfa5ed40b4599fd9434b8d2b0e SHA512 97e501aabb9c2ed2589b3f7566b0990955816ecf7d052d6765d1e219677c08a8c75eb2f4486ab7090d51ac1123cdd0a67363b2dad3cd3891fb002405405ab2d4
 EBUILD cppunit-1.14.0.ebuild 1722 BLAKE2B ea258759c776266c6db28b138f60b31c60c628be29ccbb23afbe6dea75c0137d8c43f12742f0df12516e0016d5c62979c7170d975337b6b27cb3d4e7871b139a SHA512 713f4a0b7ed0c565744af7512cc0772976b1dbba81b46cb2aebe230a6497f5e75ed59f5d518de6578150e6d54e62392f43bffa5c554ef84b1c0d815989313097
 EBUILD cppunit-9999.ebuild 1736 BLAKE2B 5bde8ba9a2298f612f2396f3f3de5893ebf5ae7868eb74e1ab78bfe9e8d739560d97f9d3d10c8abc4a216f768360ad307490ac008566161037a231e99089818a SHA512 38b35d01aa20d7e1c28832403a002b174ba44b656b5ba0f400972907b10bef5e94cc88292dd442aa2c59881e46fb0b8c98bad5d8cbaec93b29a3b7b38cfd6afb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cppunit/cppunit-1.13.1.ebuild b/dev-util/cppunit/cppunit-1.13.1.ebuild
deleted file mode 100644
index 3384ff90fa8d..000000000000
--- a/dev-util/cppunit/cppunit-1.13.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
-[[ ${PV} = 9999 ]] && inherit git-2 autotools
-inherit eutils flag-o-matic
-
-DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
-[[ ${PV} = 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} = 9999 ]] || \
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		media-gfx/graphviz
-	)"
-
-DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
-
-src_prepare() {
-	[[ ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# Anything else than -O0 breaks on alpha
-	use alpha && replace-flags "-O?" -O0
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc doxygen) \
-		$(use_enable doc dot) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--disable-silent-rules
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	if use examples ; then
-		find examples -iname "*.o" -delete
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-}
diff --git a/dev-util/cppunit/cppunit-1.13.2-r2.ebuild b/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
deleted file mode 100644
index 9c300614235f..000000000000
--- a/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
-[[ ${PV} = 9999 ]] && inherit git-r3 autotools
-inherit eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
-[[ ${PV} = 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} = 9999 ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		media-gfx/graphviz
-	)"
-
-DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/cppunit-config
-)
-
-src_prepare() {
-	[[ ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# Anything else than -O0 breaks on alpha
-	use alpha && replace-flags "-O?" -O0
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable doc doxygen) \
-		$(multilib_native_use_enable doc dot) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--disable-silent-rules
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	if use examples ; then
-		find examples -iname "*.o" -delete
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-}
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index a49ae243e2bb..b5839931ea24 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -1,19 +1,4 @@
 AUX crash-5.1.1-install-fix.patch 469 BLAKE2B 110aada551499ba765499de40880b8658bac253adf066de0f33fb43ac99c7738aac90e8254eab46626024392903d3d859fc2304e21fc427bab830ac77721f14f SHA512 c9f08e57a3cfd6b1ca4d8a7f5d497658430e0f2c16f1ce73c8fdac4d6566d48e56ab8acf53f4c4db1e88943f188967cbce23b64ecb117aae598f92128f4d78ef
-AUX crash-7.1.4-sysmacros.patch 692 BLAKE2B cf5672e27f87c53008356d0b0d2fba61221f4111dcb1fd64f1564e53abac926aa04eb876687c5ae35ab1549dd2ab16f069275ef0a2a29bb48aa99cc0bec00989 SHA512 5ff35ce3c9a1eacf5842c1077a272678941ce787b9bf5746f2222aba6bef077fecaf026fb2b039fec3e0f4594dadfd521527a4510cccf54ec2c6d1a87de9775e
-DIST crash-6.1.4.tar.gz 26781448 BLAKE2B 4a0a02bc9e5ae69e7dfaa777569c4af39a87a28f1c67cf09ea349acdc58b2160e27d2c8b9d6ce116ad98ad22db3545783250218dfc466303bd82100fe9038315 SHA512 b9f2e2a84dcf5765422e2aad845c292955455793284b9a8fd32b59836ca220b861645646a3c15b33f29e7bffa4916a692fbcbe02b2274aa0279d21d51605bd4e
-DIST crash-7.0.0.tar.gz 32007997 BLAKE2B b92db03e396cdf7252ef6b281a216d9736a30de24ab0cd2a01e66fed058c7928c26c9a25ad30251b0b03764e1bb1d537cafc82457b2abdf31aaabbb35ca6552a SHA512 29f59b73a7cd17f6f6473511831d2c8610e2464057e260c1673b52f5e3476bc64bdd0cdcfff36ead16957b98b985dbd19b7d7a6daa29e115eea2e5271c4aeb4f
-DIST crash-7.0.3.tar.gz 32020508 BLAKE2B 7445559c901b3ea2a42dfea4597d8d27bd94ad3dfbd14ebc451968d7887748db74991b50e0952ab37405f75fa3367107a350e02baf9fdbb94af8212e98a16b17 SHA512 bff8781589709a161975954abf5dc2fde6f937cbe334bf23aa889d32114eb2337d918c4c3e7b5e26beb437bfa9d6939339941af8542296ab69c8c51245be76ec
-DIST crash-7.0.7.tar.gz 32041666 BLAKE2B 80593221da82c978eec8edb7916cef0585d62182fa078a4a44a267bc52e310f234998cc8bebe07039b1e61ad86a52a4452066afaa2ee8d7143afe9377c2a8d0f SHA512 51ac33705c8b40117d67797a6f03b78fdaa1be08035f32162816abea906d5193a6fde5f2c826d962047c1ece871ff403e91700c757fe91fd4f940b9bb75c936f
-DIST crash-7.1.4.tar.gz 32137593 BLAKE2B 829335875e111bcf09d3dfc49ce17c893ad8c75b4f275a6e68d3e8698f0da209d769b6667b58569a373046d6553678e6168b50785e18c25c29c47713f8dc71a9 SHA512 6d536397418b99baaf8ae2bd76d72e60c5f92a7aaeef929f81301e58930ee9848e3e146a43ccac7350602c49c1cea4a31f0b74c267d6afd3b5a23f960a1c9cc6
-DIST crash-7.1.8.tar.gz 32154942 BLAKE2B e918e0e1be435edc0c0f6dfa0f2a73ed1e418c1c9f0291a4d6e5429bb51fd94f9530cdf13b812e6ba40a92537d79a8a1d36ea4c17b052b36ed8d56c0209f94db SHA512 21aa71b61077f7f361360f19214d8259a4e813ca5c3a5fb027f32376a7367e7eb16cf2f8a0a4b49b205c5e8550192c49fc64812afd1ccaceacf8d7649ba20bf1
-DIST crash-7.1.9.tar.gz 32160154 BLAKE2B efba2011dc583ee386107aa6808a25d74d0de175c92872ed22daa8d3a3cf756e569e514e1e703bf653de2744a94205b97cf3bec037c0f1d021d8041f52970681 SHA512 1200df0d2509ea864f568ee4861c3b6819b61c2594d61a5f993560b03f3f50a3388ba8fbde2e9d630c96ee9d390ba03eb687732352153b50866c65519591c4ab
 DIST crash-7.2.5.tar.gz 32214678 BLAKE2B 1d19bdb0ead372b4df6f4715f9fc26218d7060ad2a3f774cdf6069d6fe7a85a24968766e6eab19042c1208716e871318bbc44be04012b7ef8527a7f536edd5d9 SHA512 6d07c4aa2bccafafe66567e2022250208ffdd5f0e64aad1aefb4c8d7c10df49464ad772e2ffe0d1067f324dd351e9186841d501680a181c79d7b9b58464d6987
-EBUILD crash-6.1.4.ebuild 503 BLAKE2B 9cc5ba1786ae4e7bb24a6e9194f71c156e77ce4e4854212e2e77cc80a5c22605f66fc8e25d06bebcce979ba3fcf3364853a70abcaa26ce0ec4ef2772502177f4 SHA512 43c334d628dc40e810e483fd842d019c7fd6ece9d675f3db013a912637d73c97fdf329d37e57e398c19faad602c5ca22ae21961953897516bc273d05a91b56b8
-EBUILD crash-7.0.0.ebuild 503 BLAKE2B 9cc5ba1786ae4e7bb24a6e9194f71c156e77ce4e4854212e2e77cc80a5c22605f66fc8e25d06bebcce979ba3fcf3364853a70abcaa26ce0ec4ef2772502177f4 SHA512 43c334d628dc40e810e483fd842d019c7fd6ece9d675f3db013a912637d73c97fdf329d37e57e398c19faad602c5ca22ae21961953897516bc273d05a91b56b8
-EBUILD crash-7.0.3.ebuild 503 BLAKE2B 9cc5ba1786ae4e7bb24a6e9194f71c156e77ce4e4854212e2e77cc80a5c22605f66fc8e25d06bebcce979ba3fcf3364853a70abcaa26ce0ec4ef2772502177f4 SHA512 43c334d628dc40e810e483fd842d019c7fd6ece9d675f3db013a912637d73c97fdf329d37e57e398c19faad602c5ca22ae21961953897516bc273d05a91b56b8
-EBUILD crash-7.0.7.ebuild 503 BLAKE2B 1bf0e8a4d06849d11902f218efd276a55796507e5d34217d0f32fef0f62fd06f6f8a913aaa1a0f3920f79c7a57270bcb08a611c86aa13b1ab5489b6864feeec7 SHA512 a87573e295d8291bfac1ec024d9a4bd31361dcaf6e9cf16bdf35647daa7b6f2f962a1ab428454373c71e34b6828819cbad22318463ea7325e298a63bde8c3b98
-EBUILD crash-7.1.4.ebuild 532 BLAKE2B 3829582253a432bcde5313c5e6fb9b5198215d1695dcab9fb9f80bdc84a38d587510481de1b6e8b83b3bbb85c6e2d6de48fd2d5e72149b26b65c4ba8c0d432f2 SHA512 5d9d6709a5a87ed15fb854dd1041dfd8b92edeb5f21ca08070e14be512b7941aaeb3f32f785b87d70663e198a842158dd3337074dbf21dd9a26c3b752f3d3800
-EBUILD crash-7.1.8.ebuild 474 BLAKE2B 0743da404cda8dab3c9da501623ef6260a318c186cf4098251e79d6a45a517334c2a334e01899e30036bd068d23665eee298ab729e7b583adf8e22858588f63d SHA512 e22d97d213ecf90cec49454285f4547718b2e7c5b7e0badc58fc77dcf8c804946cd7711d48690bd22dd70cb8ed0f5ad4855de3ccef4ddac20fee6bd876c45eda
-EBUILD crash-7.1.9.ebuild 474 BLAKE2B 0743da404cda8dab3c9da501623ef6260a318c186cf4098251e79d6a45a517334c2a334e01899e30036bd068d23665eee298ab729e7b583adf8e22858588f63d SHA512 e22d97d213ecf90cec49454285f4547718b2e7c5b7e0badc58fc77dcf8c804946cd7711d48690bd22dd70cb8ed0f5ad4855de3ccef4ddac20fee6bd876c45eda
 EBUILD crash-7.2.5.ebuild 584 BLAKE2B 23361a8f51416c016d84ca434bf09750004b51f6da06d32cff7ada13c1cae930799c90da216e68090722f575028e6f9ef395a4d4647cd575db2bb41d862b7eaf SHA512 f36e973e2ec92795c85dd1ccc77b2afaa795fc58112d6336e8cb5861212b502ef119c26db6fee4d7abca706fd0dbcd1062aaf139a7082b24da6c7b3a1fa4838b
-MISC metadata.xml 647 BLAKE2B d88035e0778e0f8e6af171e7bfcd3eff14ee964f2521e00ec2d8b978ab560a4e321a60cce49775dc2f34187107309aea657f55bde348cfc4a830be4aff60463c SHA512 4e5b97c2f7306f4113f842e4683a2f4c3ed684c229c8e21483d08889e4a1d8656bfda699300cd71c70389510816f19d5eb93a37715c5861b669b285bff61ef78
+MISC metadata.xml 567 BLAKE2B 146285d4713a120dd476acb4b032e7d68179aade464b4657642af03c4bb92cfc1a41a4c73757f0cdb32dfbe119de4fd0f3daae5b3ac4452e1f7644de4f1900f4 SHA512 e726e4cda51e9a904662a9c1c0946a421bf5a350d9057a3cb0df080441892ca6399998f78b37dab883d34250380b5bc8d8ef5565a1adeccd1a8085d67f877f1f
diff --git a/dev-util/crash/crash-6.1.4.ebuild b/dev-util/crash/crash-6.1.4.ebuild
deleted file mode 100644
index 552bb1430a44..000000000000
--- a/dev-util/crash/crash-6.1.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility. Used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-}
diff --git a/dev-util/crash/crash-7.0.0.ebuild b/dev-util/crash/crash-7.0.0.ebuild
deleted file mode 100644
index 552bb1430a44..000000000000
--- a/dev-util/crash/crash-7.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility. Used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-}
diff --git a/dev-util/crash/crash-7.0.3.ebuild b/dev-util/crash/crash-7.0.3.ebuild
deleted file mode 100644
index 552bb1430a44..000000000000
--- a/dev-util/crash/crash-7.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility. Used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-}
diff --git a/dev-util/crash/crash-7.0.7.ebuild b/dev-util/crash/crash-7.0.7.ebuild
deleted file mode 100644
index e16819baaf09..000000000000
--- a/dev-util/crash/crash-7.0.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility. Used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-}
diff --git a/dev-util/crash/crash-7.1.4.ebuild b/dev-util/crash/crash-7.1.4.ebuild
deleted file mode 100644
index 6583d7e9041b..000000000000
--- a/dev-util/crash/crash-7.1.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-	epatch "${FILESDIR}"/${PN}-7.1.4-sysmacros.patch #580244
-}
diff --git a/dev-util/crash/crash-7.1.8.ebuild b/dev-util/crash/crash-7.1.8.ebuild
deleted file mode 100644
index d2d1df9f47a7..000000000000
--- a/dev-util/crash/crash-7.1.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-}
diff --git a/dev-util/crash/crash-7.1.9.ebuild b/dev-util/crash/crash-7.1.9.ebuild
deleted file mode 100644
index d2d1df9f47a7..000000000000
--- a/dev-util/crash/crash-7.1.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.1.1-install-fix.patch
-}
diff --git a/dev-util/crash/files/crash-7.1.4-sysmacros.patch b/dev-util/crash/files/crash-7.1.4-sysmacros.patch
deleted file mode 100644
index 6e6d40cca4d2..000000000000
--- a/dev-util/crash/files/crash-7.1.4-sysmacros.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f22dabb45448e5a8d2df85703fd72b0f83fe7eda Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 21 Apr 2016 00:44:04 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-These funcs are defined in the sys/sysmacros.h header, not sys/types.h.
-Linux C libraries are updating to drop the implicit include, so we need
-to include it explicitly.
----
- filesys.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/filesys.c b/filesys.c
-index 2ed25f4..9b59998 100644
---- a/filesys.c
-+++ b/filesys.c
-@@ -16,6 +16,7 @@
-  */
- 
- #include "defs.h"
-+#include <sys/sysmacros.h>
- #include <linux/major.h>
- #include <regex.h>
- #include <sys/utsname.h>
--- 
-2.7.4
-
diff --git a/dev-util/crash/metadata.xml b/dev-util/crash/metadata.xml
index bfe00424921c..c81bcd9e0c3a 100644
--- a/dev-util/crash/metadata.xml
+++ b/dev-util/crash/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The Red Hat crash analysis utility is loosely based on the SVR4 UNIX
 		crash command, but has been significantly enhanced by completely merging
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
index 4540fb968c56..e4e47e09060d 100644
--- a/dev-util/creduce/Manifest
+++ b/dev-util/creduce/Manifest
@@ -1,11 +1,8 @@
-AUX creduce-2.7.0-llvm-5.patch 2491 BLAKE2B c2f7fed04c8da9095ad4c4995119181575c644231db6eed46fcfd7097e3ed5c85e46af52accfa8b78c59a3f8e61715df929e0d60c7693a7542fa83eecc9b05ce SHA512 31808043b9a9727632b76a81041a0ddffd318fb5ae8190b7e4cca70b1117c8c938dd7dda9d9785a841c3d62d51dc876a53dce63ab45695ae77d40f834073c08c
 AUX creduce-2.8.0-link-libs.patch 1038 BLAKE2B d28b790141a898c72e2102d25cb14a48c1a4ed6e0902e413510932be66b224ec28caf23c7bb3741c07be0ee6e3efbcd4c7bb9cd774d4239eeaec84bcde652d9b SHA512 1ce357c17cebdc9f81692c545c020358d52bf542f5235c8a7c6ff3c1740b08089909204841eb1e93035c8f069d372656fba4026fa8ee848d837228a2b7f7e20e
 AUX creduce-llvm-7.patch 4046 BLAKE2B 013685de9ad7f364cfff647a6f6783615dcd2289af8ab602f4119401373b6422385e63e1c5aaeec65dd6e922fae945f44f29f18bfe02b581b0a12f129f83e0b9 SHA512 9a0cd0373fa8e0bd14907e5522b97c3c4cdb89a3350e38316edfa6a75dbc5bbe53756c4b605385b1feda5674bbf17d92b4d2e21c58b4a937bd2c61e76e322b0a
 DIST creduce-095c551a5f9ccaf2986edb836e7be9872d36c233.tar.gz 724597 BLAKE2B 9d7a57349b8e14599c795a27bdf2cb4536f5b41f02faf10263c3d883bf94efd83ce7483bbf72aee0c2fe00d8515490e5f5a9c8df575abe80e90231a4373c9318 SHA512 a317bae5e47ee85b4be401d8dae490bd0ba86640aff6e7b0e9d6fe14d1f87199b4e12edbfa3eddcb5341b926a753dae17131f5e571362849c01377eda00407fa
-DIST creduce-2.7.0.tar.gz 768832 BLAKE2B ddc471b658a7feb8591dd4e402ac51d7c97a1705ef5b3787eec0b652bba64fb82cc39db21fa7c87ae0104977514f792b77802b6b35cf7afecb79b4cde16a5b52 SHA512 0ded47fdb4303d84619d63fbedd7bc12141b4857679dda8438683199dbdc98b985f848e797b9dc25a31dda591ee54bcb94580285890b23495fcf151aa3636226
 DIST creduce-2.8.0.tar.gz 774668 BLAKE2B d799372d107c0cb45e9ed95f82c29634fd9de053c4eda1a2dfce8b2152ca84f7fff5e7b679e21e6dbe869d139e1cfd73963c02751ad30809a3470316ce10e077 SHA512 9d616dc421d0e932656ab0220ebfe1a4f20a08d46bf4ee004ef96a693ff37caeadf96c769262574a9789ac52c2bb4586e2b8602f7d44b627229b8eb45f5af0ea
 DIST creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz 720872 BLAKE2B 031104f5e7ca3d3cfb41087f432ec0cf1b1c125171ffac31b6f3b0a9a4483b5ca8a667331aacae7f5acdaaf99e8b688bb62b332405c1266d2b114a4bdceca9cc SHA512 36cc12015d85acfa99f0d04440184517da1f766df7a804ee02719f1208f67aff4f4db7af4066817b17efdc89a6d2cf7ab62b0c622a611bc9b03a89b8d1b68d01
-EBUILD creduce-2.7.0-r1.ebuild 784 BLAKE2B 093f61657be92f1efd7dcb1abea1a79ba13def8c3ec013572c648357b1bdbeb4a39be827eafcac9763f8fd2a24ca90b8609924b27c45f32a8e95c7eaa3acbaf4 SHA512 a73b178134f28b22bcd070682f9d656fe8fb8dc05ba956c8ca5e25a18b1127ee85bf32614bb77350413afd884bd46d6bfd1b17536cfcfaddebc934a40b9067fa
 EBUILD creduce-2.8.0.ebuild 814 BLAKE2B 2fa4ada35468979232ad1fe3fc6624d09df764454188933dea519ac1adac1cbec5c839ddcc71fbe569c80b74ef5cba199bc912c88ae090cbbaf68ee3983a4dee SHA512 0ade02bd6ba2c664940bb5971e71d973132ca6708cd887daad785b911b2b0e0523a7316c23bac612c75b5475b52df670a1a7714be6faf36a63ff8dda2d5acb2f
 EBUILD creduce-2.8.0_pre20180411-r1.ebuild 935 BLAKE2B 7aa0a8ca0800a216918a65bf00fa6926f2210d688b2e6385e4a6147f9b913d365971923dff7a2df8d1da442ebebc9c6befb4e243175ceaab29572d0ed57411e4 SHA512 403502450479f91306f97d3462a5f5b300a71d5d618e8bc735189031c0a630cfecdc86d568b712fc2e50e8feeb504be4ebd58bbe84698e363d174a9e900a5a7c
 EBUILD creduce-2.8.0_pre20180411.ebuild 886 BLAKE2B 0e7f8cfab414f998d5b8a3872c14d680b6848f17107a77cf00738f3b3a4961289862a44571888c125db3dc3bd9a7805a5a72ca4641abdc3f7e79cf353f8f6544 SHA512 500c0b3462147f872fab9a1b27266a848adb2cabc39a40c591bc057176a78c23b785da6e37acbbd5a6c3bf8efd30ec3e3faec39bee9c1c9b7044d16edeecdb34
diff --git a/dev-util/creduce/creduce-2.7.0-r1.ebuild b/dev-util/creduce/creduce-2.7.0-r1.ebuild
deleted file mode 100644
index 617b8e64e48d..000000000000
--- a/dev-util/creduce/creduce-2.7.0-r1.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"
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-inherit cmake-utils llvm
-
-DESCRIPTION="C-Reduce - a plugin-based C program reducer"
-HOMEPAGE="https://embed.cs.utah.edu/creduce/"
-SRC_URI="https://embed.cs.utah.edu/creduce/${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-LLVM_MAX_SLOT=5
-
-COMMON_DEPEND="
-	>=dev-lang/perl-5.10.0
-	sys-devel/clang:${LLVM_MAX_SLOT}"
-RDEPEND="${COMMON_DEPEND}
-	dev-perl/Exporter-Lite
-	dev-perl/File-Which
-	dev-perl/Getopt-Tabular
-	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-llvm-5.patch
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
diff --git a/dev-util/creduce/files/creduce-2.7.0-llvm-5.patch b/dev-util/creduce/files/creduce-2.7.0-llvm-5.patch
deleted file mode 100644
index ecf2ac70fa81..000000000000
--- a/dev-util/creduce/files/creduce-2.7.0-llvm-5.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 97e2b29956adbe61973228ef7d8bff28e83d04d4 Mon Sep 17 00:00:00 2001
-From: Yang Chen <chenyang@cs.utah.edu>
-Date: Thu, 27 Apr 2017 20:55:32 -0700
-Subject: [PATCH] Fix build failure with LLVM trunk
-
-Patch provided by Markus Trippelsdorf. Thanks!
-
-"InputKind was refactored in Clang r301442.
-
-The IK_Preprocessed* comparisons are superfluous now and can be dropped."
----
- clang_delta/TransformationManager.cpp | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/clang_delta/TransformationManager.cpp b/clang_delta/TransformationManager.cpp
-index 8b6bdf454847..5db190cd71d1 100644
---- a/clang_delta/TransformationManager.cpp
-+++ b/clang_delta/TransformationManager.cpp
-@@ -101,16 +101,16 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
-   CompilerInvocation &Invocation = ClangInstance->getInvocation();
-   InputKind IK = FrontendOptions::getInputKindForExtension(
-         StringRef(SrcFileName).rsplit('.').second);
--  if ((IK == IK_C) || (IK == IK_PreprocessedC)) {
--    Invocation.setLangDefaults(ClangInstance->getLangOpts(), IK_C, T, PPOpts);
-+  if (IK.getLanguage() == InputKind::C) {
-+    Invocation.setLangDefaults(ClangInstance->getLangOpts(), InputKind::C, T, PPOpts);
-   }
--  else if ((IK == IK_CXX) || (IK == IK_PreprocessedCXX)) {
-+  else if (IK.getLanguage() == InputKind::CXX) {
-     // ISSUE: it might cause some problems when building AST
--    // for a function which has a non-declared callee, e.g., 
--    // It results an empty AST for the caller. 
--    Invocation.setLangDefaults(ClangInstance->getLangOpts(), IK_CXX, T, PPOpts);
-+    // for a function which has a non-declared callee, e.g.,
-+    // It results an empty AST for the caller.
-+    Invocation.setLangDefaults(ClangInstance->getLangOpts(), InputKind::CXX, T, PPOpts);
-   }
--  else if(IK == IK_OpenCL) {
-+  else if(IK.getLanguage() == InputKind::OpenCL) {
-     //Commandline parameters
-     std::vector<const char*> Args;
-     Args.push_back("-x");
-@@ -135,7 +135,7 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
-                                        &Args[0], &Args[0] + Args.size(),
-                                        ClangInstance->getDiagnostics());
-     Invocation.setLangDefaults(ClangInstance->getLangOpts(),
--                               IK_OpenCL, T, PPOpts);
-+                               InputKind::OpenCL, T, PPOpts);
-   }
-   else {
-     ErrorMsg = "Unsupported file type!";
--- 
-2.15.1
-
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index eae3239b37e5..fd7f44ef590b 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,3 +1,3 @@
 DIST d-feet-0.3.14.tar.xz 177064 BLAKE2B be1150cead543dab3daf1c8beae4047d3c32e60dbf9a73a50ef95fe62cbafbf6af9ab174c7f9128212b0d33aa111545b598c6aab6d359625c94f0029ca5f1a20 SHA512 1ea3bd2251693884592d375f1459681043b5185c341299dc28cbc8e4e05f3ff3a423c051b650806f6b930d8b89e0d751983ada7ad9a74b380f74f3205125b1b4
 EBUILD d-feet-0.3.14.ebuild 1042 BLAKE2B 0e24e26b8661c47987dc1765ac5e6b7c6caf7961f119ea29e41af307a8d76e74188d44b44372fbe45fc3c3ce71339ffd0f68b6a131406fe98d40490e975b2c4a SHA512 fe348cfc705e238a49852647785be482a10b88f90000e664be6a9795c32e1d8c04c11003780d992811957b9098207e2d8a5b72408e14dec92f13ed64c9a43131
-MISC metadata.xml 432 BLAKE2B bdc09ed75743fc3fa8155849638634790a2eedc0b58330991b7a6d0a05eb201cc64743033d35586ab6b91ec85c385b23f9ea744d826bf41ffc0cff3a493f8a77 SHA512 0cf318c10b2e7b85135560df21bde6857dcb101d101ae51f384dc613681afb29c15303de0ffd23b8478b2b81dbd5faa051e816df71155230e1eef1b6a99bc699
+MISC metadata.xml 251 BLAKE2B c20c56e3f057e8bba258876f96b8ef08720698ee3aea60b765a79b1ff134df44036e6a230e071bdac6e5350a3b494975859db42c9693cbf165627bfecc566efd SHA512 0f975a0edfae95b6d15e292492de323063860e21caa4cc1e0ad70509bc3d3ead872daa50c66817efc9a8820e565ab9126d11f20d5daddf5f86b2e96100a4b9b1
diff --git a/dev-util/d-feet/metadata.xml b/dev-util/d-feet/metadata.xml
index bac79bab471d..52f14ba32077 100644
--- a/dev-util/d-feet/metadata.xml
+++ b/dev-util/d-feet/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>cardoe@gentoo.org</email>
-  <name>Doug Goldstein</name>
-  <description>Feel free to bump or do any updates as needed</description>
-</maintainer>
 <maintainer type="project">
   <email>gnome@gentoo.org</email>
   <name>Gentoo GNOME Desktop</name>
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 13b7b803daa2..a8e4db2dadc4 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,3 @@
-AUX debugedit-4.14.2-no-reorder.patch 2225 BLAKE2B 03bac95d316855a9a8e2b78cb7530c5de746b462a32a4fb0887bddf039b371198ea77a0b85b69b6501504e9583832a7f7b055b3c22e3e3b309ecaf995fb164d6 SHA512 7f665c8c985d622e52e87996f1719900131fa7d6455e548cb2cd00b2223231b54b4fc9c24ed3079c93dd5e3c287c03f37aa17072e2e1e5d4f0cd8ee695bf08bc
 DIST rpm-4.14.2.tar.bz2 4151934 BLAKE2B eb7e32dd736a195f2e5effc184ee8f2c700dcaf80477574c2112b6c96504d86a67c81e611f82ea35ce244e95fad339bd262eb51c35ada5eeffa8d306b6938cb7 SHA512 22e309e8be936e6070430cedd6f5ea0c3871db4c6aadd0d567a9c418796c178c8dd45d44920d7eaa66681790cc2821347affe471cb215d7a490fe7947fbf291c
-EBUILD debugedit-4.14.2-r1.ebuild 1862 BLAKE2B 7298cef549ff97777f748cb871d01d959ed5b680cf693e4c42b0a7826c13d42df121243788f7c965cf56ef2297a00119dcab40a5914315cb1353bf587eb6971f SHA512 951edb87d4e6c55d73d3837140747ce098562787333198ee0cb35c06418b75d4f4e82b54bb6f23c01a0c98cb6999b402ec307fc35e7d78720713dc25d6df919a
 EBUILD debugedit-4.14.2-r2.ebuild 1725 BLAKE2B 7897371964b247c6076d629b6ae6f01473c41d71356c1447bd6f991449320ccda71b6f86b42a3c82c491efec20d2ebf2e4ad559940ce748f4e40f3cd4dac86d9 SHA512 4e36e020e4aada2c378466818763c5b49d888f76627692bf40074ac154678225e77921627ccb2b398026603dfef403548657c1f0068508e309207f41ab097f79
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.14.2-r1.ebuild b/dev-util/debugedit/debugedit-4.14.2-r1.ebuild
deleted file mode 100644
index ad6b532ec6c8..000000000000
--- a/dev-util/debugedit/debugedit-4.14.2-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=rpm-${PV}
-DESCRIPTION="Stand-alone debugedit from RPM"
-HOMEPAGE="http://www.rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	sys-libs/zlib:=
-	>=dev-libs/popt-1.7
-	dev-libs/elfutils
-	dev-libs/nss
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# do not reorder sections, ever; otherwise it breaks gcc
-	# https://bugs.gentoo.org/666954
-	eapply "${FILESDIR}"/debugedit-4.14.2-no-reorder.patch
-	eapply_user
-
-	# cheat it into believing we're bundling db
-	mkdir -p db/dist || die
-	touch db/dist/configure || die
-	chmod +x db/dist/configure || die
-	echo 'install:' > db3/Makefile || die
-
-	# TODO: why do we need to do this?
-	mkdir rpm || die
-	find -name '*.h' -exec cp {} rpm/ ';' || die
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	local myconf=(
-		# force linking to static librpmio
-		--disable-shared
-
-		# disable linking compression libraries
-		ac_cv_header_bzlib_h=no
-		ac_cv_header_lzma_h=no
-		--disable-zstd
-
-		# fake some libraries we don't use
-		ac_cv_header_magic_h=yes
-		ac_cv_lib_magic_magic_open=yes
-
-		# use nss as crypto provider
-		--with-crypto=nss
-
-		# disable other stuff irrelevant to debugedit
-		--disable-nls
-		--disable-python
-		--without-acl
-		--without-archive
-		--without-cap
-		--without-external-db
-		--without-hackingdocs
-		--without-lua
-		--without-selinux
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -C misc
-	emake -C rpmio
-	emake debugedit
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	dobin debugedit
-}
diff --git a/dev-util/debugedit/files/debugedit-4.14.2-no-reorder.patch b/dev-util/debugedit/files/debugedit-4.14.2-no-reorder.patch
deleted file mode 100644
index 0c196a842b4c..000000000000
--- a/dev-util/debugedit/files/debugedit-4.14.2-no-reorder.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0779d60cb5941610dd1f31632aa1655bf2cc447a Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 6 Oct 2018 17:56:00 +0100
-Subject: [PATCH] debugedit: don't reorder sections
-
-In https://bugs.gentoo.org/666954 debugedit processed
-crtbeginS.o from gcc-8.2.0 and turned into invalid ELF:
-
-```
-$ cp crtbeginS-ok-7.3.0.o.back crtbeginS-ok-7.3.0.o
-$ debugedit -i -b $(pwd) -d /usr/src/debug -l ./foo crtbeginS-ok-7.3.0.o
-$ export LANG=C
-$ readelf -a crtbeginS-ok-7.3.0.o.back >/dev/null && echo ok
-readelf: Warning: [ 9]: Info field (8) should index a relocatable section.
-ok
-
-$ readelf -a crtbeginS-ok-7.3.0.o >/dev/null && echo ok
-readelf: Warning: [ 9]: Info field (8) should index a relocatable section.
-readelf: Error:  bad symbol index: 54495f00 in reloc
-readelf: Error:  bad symbol index: 656c6261 in reloc
-readelf: Error:  bad symbol index: 62615465 in reloc
-readelf: Error:  bad symbol index: 69665f61 in reloc
-readelf: Warning: local symbol 11 found at index >= symtab's sh_info value of 11
-readelf: Warning: local symbol 14 found at index >= symtab's sh_info value of 11
-readelf: Warning: local symbol 15 found at index >= symtab's sh_info value of 11
-```
-
-Ths fix is not to reorder sections as debugedit does not
-account for offset change.
-
-debugedit already does it for final executables and shared libraries.
-
-Bug: https://bugs.gentoo.org/666954
-Closes: https://github.com/rpm-software-management/rpm/issues/423
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- tools/debugedit.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/tools/debugedit.c b/tools/debugedit.c
-index 84568dd29..a723283c0 100644
---- a/tools/debugedit.c
-+++ b/tools/debugedit.c
-@@ -2347,10 +2347,9 @@ fdopen_dso (int fd, const char *name)
-       goto error_out;
-     }
- 
--  /* If there are phdrs we want to maintain the layout of the
--     allocated sections in the file.  */
--  if (phnum != 0)
--    elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT);
-+  /* We maintain the layout of the allocated sections in the file:
-+     https://github.com/rpm-software-management/rpm/issues/423  */
-+  elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT);
- 
-   memset (dso, 0, sizeof(DSO));
-   dso->elf = elf;
diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest
index 0d205c93e8bd..c824c41b5396 100644
--- a/dev-util/ftjam/Manifest
+++ b/dev-util/ftjam/Manifest
@@ -1,8 +1,6 @@
-AUX ftjam-2.5.3-debug-commandline.patch 314 BLAKE2B acc09bae7b2abd0d10ff8557b6c7f28f457b5d009c8117008c01507250afad7b22be92fc1f5f49cd9f8c30783e1d353d3b619c48366c14f011a1ba2ac51014f0 SHA512 c9e59c3785678d347510525b10824af2648f4de040bfc2d97ca2301298628d82f78c13f63b30da1baef0a8c2ed6142fa2db63650fc982601e491aaff8e15378b
 AUX ftjam-2.5.3-false-flags.patch 1682 BLAKE2B 5b57ea37f2d99439e8ff550a6a8100922e27f8d36920b2da7fec6d8e58cb480aec7e328155d9ff7bef336b6efafecfd2de4459c087100ce01a6b91e39cf346a2 SHA512 b9b97127c6a5d89759563cd4a1e4f87ed911610b70bbfff309105ab733290f74087bd0eb066eaad860be5624573ad2dfc1245eb45347c2d1c9800033c35e5c0a
 AUX ftjam-2.5.3-i-hate-yacc.patch 1756 BLAKE2B 26aefb56b2125b765eee2b6dc9a55fd0d3accc9244b8aa70dedca621a3ca69cb89218ba7920f2a47a4af6548b5343960fcde8701fc11c15c0ebe0bcd1f8ea452 SHA512 e02948ccccb963ddfeb777c217efafaf19239cacff80514c167166ec666a6301b90e1a86a2b97ab58fee006f509106cc0e3dacbbde822efd0db2b9f5f4645be8
 AUX ftjam-2.5.3-nostrip.patch 780 BLAKE2B 7299ec77c1ed3ccbc87669850ee54d6d61534983793f076e56d95ea83e9c8617c80ec08d84bad24bbf45f11b6e0275167f4454223366ef041a81a4360d1b1d09 SHA512 6d8b399f8a4047c34b1315a230cf47e8ab76c7fbad9089fd4c3c18b2ba7fbb2f3ecbcb2d3a1075f0d95d36e547490de345167ba55fed75221b2b8162796ccc25
 DIST ftjam-2.5.3rc2.tar.bz2 215963 BLAKE2B 77e92dba10dd2b99b53bea87dc47c7f1d5da2a39789cc938d8141debf3ba5d6e25ab4092e1a3b69266b3353866c76e72706d13d3751a321e42bc5aafdf87e8cd SHA512 18a40c6741493adf293f032d9c7a9ab419402505a37993fa859e36e7a1655ec9d3d07662e6ee242487b143aa7e0f6c46f253bc7e23c3162c7381aaced001bfcd
-EBUILD ftjam-2.5.3_rc2-r1.ebuild 1120 BLAKE2B 9e492d187622a734ad37d59613ba99bfcd063d7625a636eb11b56bb2063919c477cc556f6fa00af63e2244cdaeb8e4bdbf60374801e20c3bf24eeaa6c9bdbd26 SHA512 fbd5d795bded29338f0bac374717c20a7153436fff55c50164eab245c4fa518c52173321c633506501b4570da1531e06f63b78a9b7b9f08028fe0b0bcaba75c9
 EBUILD ftjam-2.5.3_rc2-r2.ebuild 820 BLAKE2B 827b71923e06e10a237dddcef36c6b32b0b825045b0cfd2b15c005b652b780b00e76d72bf806033a5936bb41b8148e5a48d294fa249800a9f2c5d788ca066e3d SHA512 002d9e21ecc3413d75fd227203da2553852202659a9846db6b60ba09478330b22022fbaead7ff0e3ce8efd7ea7139acd73f89b500c9d9360b550f058237d4b22
 MISC metadata.xml 243 BLAKE2B 08246d6c76c2720c2feb89cba6d9c817718a9910f19ae5b0e90da4c8bfe7fb25616e02b46c860fe81b93ce71a78c341093062cfcfddd449bdaba1aa4497fd9ab SHA512 2e71aa0db138811dd97cc5d3e5fcadc54dd877ee5adb9d8988c30680e55e764e1391b0628e8a298fb2679bee30061d7a0f9a4678d29ce248183d5b9a25f8a343
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch b/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch
deleted file mode 100644
index ba6613430308..000000000000
--- a/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Make jam print the commandline it's executing.
-Only useful for ebuild debugging - I just always forget how to enable it.
-
---- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in
-+++ ftjam-2.5.3rc2/builds/unix/Makefile.in
-@@ -16,7 +16,7 @@
- 
- all: jam0
- 	chmod a+w jambase.c
--	./jam0
-+	./jam0 -dx -q
- 
- include common.mk
- 
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
deleted file mode 100644
index 2e8142c44fce..000000000000
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator _)
-
-DESCRIPTION="FTJam is a 100% compatible, enhanced implementation of the make alternative Jam"
-HOMEPAGE="http://freetype.sourceforge.net/jam/index.html"
-SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
-
-LICENSE="perforce GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="!dev-util/jam
-	sys-devel/bison"
-RDEPEND="!dev-util/jam"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.5.3-nostrip.patch
-	epatch "${FILESDIR}"/${PN}-2.5.3-i-hate-yacc.patch
-	epatch "${FILESDIR}"/${PN}-2.5.3-false-flags.patch
-#	epatch "${FILESDIR}"/${PN}-2.5.3-debug-commandline.patch  # development only
-}
-
-src_compile() {
-	tc-export CC
-	econf
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README README.ORG CHANGES INSTALL RELNOTES
-	dohtml Jam.html Jambase.html Jamfile.html
-}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index ad39c69dc5b3..1b6457f9109c 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -4,6 +4,6 @@ DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b4
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 EBUILD gdbus-codegen-2.58.3.ebuild 2122 BLAKE2B 7a07be31d76197c0d4472e5e36a141944df7a6f0aa28bef8e41e8324821eec7ec8b4279be123532ffbe4b46b65f7fbfbde1638c623ba10fe535739c5bc64ef60 SHA512 3d3b02b4fdbcd3000e7778a37bc6d1c647fbb9dba7a4b097b4d921472af379bea326aff1f3c0bf21711d9cd9c9cf5e9cba1f60a4a3c2840ba38eaeb3ee494ac1
-EBUILD gdbus-codegen-2.60.6.ebuild 2048 BLAKE2B a50962cd741be429374ca1854199c02ae0fee5deba37903da653376cdf395bde1e44b2afde0795154f5038760ede015cb5614ca8fe0d0d819850e2ecd708a079 SHA512 2203f69b88acfa0192f646826ae9ce41822cb25f7e2793fbb2ed295efca575023d23cbdc7e9d266afc183c478fa04eb7cbef2f610cd48b371d2742c3b7b494b9
+EBUILD gdbus-codegen-2.60.6.ebuild 2047 BLAKE2B 8735748fb0c72ec01750e343f3bde9bc46a9da51dd26a2f50caae5e271091a4d3e2e693894440a63c39ad60ca13322b64aeec52ea8391760ab791d1654a9fda8 SHA512 581cb8941547c80b792565de4db486bdfe02f830471977e11408eab13006ffa8e71d319a51e4bae011c04a32e6f3d05d0601eb58594e137a1e95695dc57268ab
 EBUILD gdbus-codegen-2.60.7.ebuild 2054 BLAKE2B 98c1af744514e90c1d868cca51bb8bfee22f0b42075836614ef148ed15a0ea83da32c9f1b98cbd252e094e1f59156c5e13411f446af19ff9daa5ef52be5723c3 SHA512 afa27bc27c59b4e355f1c7c8aef4045b68c7ef26b47cceec89366cde559db3771c0844d37de5306843b6d70eb8202bea520278ecab46f5e31e1c9f9580d3e821
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
index eb44d7ca49dc..0f4c4cd28673 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 5336dbf236aa..5ac858c9d35e 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
 DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
 EBUILD glade-3.20.4.ebuild 2386 BLAKE2B 8f4d42898dfe18c870f0ea90442c0ab98d43ea75299ce210a80b7527157a0f8e1bda0527c22f51c4832f6c42b6539e5294e112f822a2a94b156ac089313384fe SHA512 3cccd8c8e69e26ea881565673ed6883a68f00d11d5aa72386ca123f0c982ecac4af509359c1512517457b54c52aa5b58caac09116b6fc1c7592833ce34b348b9
-EBUILD glade-3.22.1.ebuild 2329 BLAKE2B c7fb05647f04c8a74e85703873620680bee94cfa5f43f227602386eec4b9cbc97745ac2d9786fb61527d93fa2f03eb0640475433f9fb4bdbb56ed20884b25a47 SHA512 f86f398a1f87d6debe5407f5b6ca6d5bc4114d0d937464260ff4174123052ac70207153c81e50b4754524dd573eebdac93060104c920a57032f6a29ae9df8284
+EBUILD glade-3.22.1.ebuild 2328 BLAKE2B d000831404e21ed73ae1619776bf8357ae17f0c11c0de43d898234f2fe8c168d9c308c4f53fa912d29e47983f0e283313b337100aad5b58107e609e8a8e3d9c5 SHA512 2194a5479c5bdcc8094743e0aae4c2aa29420b70b5df9121927171d734802c90cd7cdbc7ca615318b5bb81d601ae382d03a216ffbf649ce4b5eaa3e8a3d0af5a
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.22.1.ebuild b/dev-util/glade/glade-3.22.1.ebuild
index 77500747cd9e..68c852cb93e0 100644
--- a/dev-util/glade/glade-3.22.1.ebuild
+++ b/dev-util/glade/glade-3.22.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 61c138aa20e7..b0081bd6b1c1 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -2,6 +2,6 @@ DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b4
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 EBUILD glib-utils-2.58.3.ebuild 2407 BLAKE2B df14fadeb6dece6527b3c6fcc9a851dc662b2ff59842c83c3ca57007575575e80176bb42b6d6e0f02e9dc4598c7c0605c5bc0855427bb48dfd8417b9c2847582 SHA512 4d57615eee2d86c75b33f4c8be6a8076ca0be894dea5e5e3f2858346b87ad4c2545fc9c639f8f8f68c4816bf147ec73e1c38a243588c9a4cf72c5cc3db0fc880
-EBUILD glib-utils-2.60.6.ebuild 2423 BLAKE2B 8e274dae1e4bcdc765dc8e47cd0fa6d03d824d8b3ec0d32f131460ba4703fdbbc52195dd3e73fc5d8359db560cb1589cdfb31d3837cf3c005d61558841cf1b5b SHA512 312b5c2d139b7c334452b47caa066603ef281e792e0937324ad193e5a637e0a54f449c719d1ebbd09d1cdb3d2155a9cbbe4496b739b918126c3eb50b9c8222e6
+EBUILD glib-utils-2.60.6.ebuild 2422 BLAKE2B 305e6170b340fcb4ec66008b5be054391f3bbb9aa88fbafa61e662f32a041a70d25f62aaa0f7e02c638dd74fea103c7972bc0a74b080010cabbce36e7de004cd SHA512 7fd710acc86f4e75f0762e0a3469f11261bd14af3f964c542c77461f9db9b4dc0b14ef50e5baadfcc7e0a3a66837d406afeb7295300357aa837fdda8cc15b414
 EBUILD glib-utils-2.60.7.ebuild 2429 BLAKE2B 43565d10ebccf632edfb09b0ede6aef02b3f4330d12d415c72b54e88d11d9f2e524c1bc4c92b0bb9565700159f477baebfd8f15c10f3d5f1f849f68fb0f449b7 SHA512 d75f3ac2ca4dfe56482fe602b47c9eb300500d31563f05d74c8fa5c8e5724e6d96e5ab3232785cdf3940ccaa01a191ee79fdebc8edae10c79f2ad00d46f06339
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.60.6.ebuild b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
index 16b0d8f4047b..b40aa0f9de23 100644
--- a/dev-util/glib-utils/glib-utils-2.60.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index f042409a1dfb..29f9f60a0b8c 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,3 @@
 DIST goland-2019.1.2.tar.gz 312490907 BLAKE2B 9cc0abdb9d86b1bd9cdf67e3e65548bce229d3575a62ed153435585d0d82489b193cc775341e194107cc09e4e6e2ee84f4639259c998a7191b765edb6f5695ee SHA512 fb5c597634cc2a84f2abaeae9d0a31e332ba0123d44a5cbbf1587e05cd8da0358794ab80bb873d3395385aeb87d1d92ca4dd7e606523a621fab16aeec85aaeda
-EBUILD goland-2019.1.2.ebuild 1037 BLAKE2B ac2928910ecd153c1408e23bea8f428c21cd4d6bf7ff07839371d357fa8e0749571edf2b22dc804f4782f30f3d460bc7726272922b1770149d171492ba6f33cb SHA512 28ef739f655709535288f66783b0c6b0fb9bfcd3dec2e95ecb1472c774ab82b589b34b9182c292c664cafa212b43a79cfe61ecc36fbcd43777aff0ca6a117f47
+EBUILD goland-2019.1.2.ebuild 1063 BLAKE2B f4014580858fb07afe158c8d3b129b99cfbf2f6b05ffa64c59f0e893d52646f193d6f06bab01c138f3557548119e870afe4c296a61ae32c5c907d904062ce599 SHA512 540b767ec045af21d59915000952758356265d1bc7d8812fbeb5885c30de5403b88a6fde921e9b37eb61ee35104f4eb59aea1f4f0ca10cefcc2f70b6ecb76fa5
 MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/dev-util/goland/goland-2019.1.2.ebuild b/dev-util/goland/goland-2019.1.2.ebuild
index 824cf5bfe3d6..28875598ec42 100644
--- a/dev-util/goland/goland-2019.1.2.ebuild
+++ b/dev-util/goland/goland-2019.1.2.ebuild
@@ -14,6 +14,7 @@ HOMEPAGE="http://www.jetbrains.com/go"
 KEYWORDS="~amd64"
 LICENSE="IDEA
 	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+RESTRICT="bindist mirror"
 
 QA_PREBUILT="opt/${P}/*"
 
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index f69facfbff33..9c1d9b243d43 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,7 +1,5 @@
-DIST gperftools-2.4.tar.gz 890402 BLAKE2B f4893d7c9bbd3a8dc5b4d8a25837039261fa32782e13653991002ab666d6e81de637932a8b46c66df219336adcc395a217a4ce32332e8e1558beeb140ea642f2 SHA512 77198c150ee26579adc8f190be0c4ba90a9e3854b006c3aa9252b5863b1fce317fd690c6aa0ed202c81f0bbcfbe2d5f8a182263e77b7fb4fbc6b3e8bfffc9fb0
 DIST gperftools-2.6.2.tar.gz 911744 BLAKE2B e5798a2f0f2973f02bccabb2550a9df54319e505fc715795cd836ced631b29bfd8e6f8ddf3c7f6dceb0f166523bb0fa55564b1cbc896c8cd8cfd475263c07c39 SHA512 20c3460f806c6425d54e8d1020f15bc8940aacd7bf1367b03a116fb873bbd6c1e1fbb75df1d0ca341eaec813552fec394327175115ea8442a4b7a1ef17f0df2f
 DIST gperftools-2.7.tar.gz 916919 BLAKE2B c48882df45415110c1ec39298e84ec9384f6a82851d95e92435649d2b253b9fb8e29664b474e45881599abf3781731c47ead0b6c454c33be9a207a6a2401a97c SHA512 9aa39689bc18603123204f024ab6dc96099b70a3d304e31ef0cc1e9893cc77bd14ee6eb420e597d40e81e487a2a45e77cf1965873646d056fd4b7bee22a4b0bb
-EBUILD google-perftools-2.4.ebuild 2294 BLAKE2B 1aaa5d14010c35af89fbe126a6c9d24a2a6921300e273be96868a7254dbedc97e5012ac5d7353e3555b2777268cb299ca576452c7d406234f597d010e6577926 SHA512 8a0d186e63ee7aed584cee1d0897c02eda37b7a0f980a11c715e38513ae684cc0c78675aaf6c8c5ebcfc77da4b1f88f8fc364f38fc856a61ae7365a52f802750
 EBUILD google-perftools-2.6.2.ebuild 2313 BLAKE2B 76778b92beab5a0c5c9bcca957551ab891e64dfb47db73eb296fffde41608b9c031e6f20f6d480202865e0776f844bf10b046a2cf4d6d7a656afd05be064245e SHA512 dd7328c32fdf020bfbbd35e074f12b43d7d8fb3cb59aadb430d2c0119be6bb08bb2fd7a22c62314b477aad6edff92e6a42c686d203fd9abceb0e3cd8587073db
 EBUILD google-perftools-2.7.ebuild 2353 BLAKE2B 20cf4d3c719658c6172fb116966932cd976fd8d008f0fa50a1a1d1ff4c91050c9d9bdc733fe231189af292ef7a0b53ef6f2c169ae989471533ad68916773a9a9 SHA512 ef93ac049915cb17ac6857b309532c6fb5117ea1bf088d2569bd9cca8b2551102d36d88fa2a5e7eef9541c4e3b8b10804658977a1f5e2cd7f449439ba378c0af
 MISC metadata.xml 921 BLAKE2B 71a3db16b3a5a561ee677caf593ff5c45c01bf1cd449da8782e430ffce02b8661c4a011643192f12329ce164ce0148ee206bef85bf55503aae1161067b8e88ca SHA512 e8198e40382ece3675dd43a1878af9cf189d492bc79f246547423b37426981ab2ab624c6d69bc7d57e8a7bdb1f8f4eee32efb1b7d70ecac159dc2a939e480efb
diff --git a/dev-util/google-perftools/google-perftools-2.4.ebuild b/dev-util/google-perftools/google-perftools-2.4.ebuild
deleted file mode 100644
index da07048b388b..000000000000
--- a/dev-util/google-perftools/google-perftools-2.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="gperftools-${PV}"
-inherit toolchain-funcs flag-o-matic vcs-snapshot autotools multilib-minimal
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/tarball/${MY_P} -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-# contains ASM code, with support for
-# freebsd x86/amd64
-# linux x86/amd64/ppc/ppc64/arm
-# OSX ppc/amd64
-# AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="largepages +debug minimal optimisememory test static-libs"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS="doc"
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		MAKEOPTS+=" noinst_PROGRAMS= "
-}
-
-src_prepare() {
-	default
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable debug debugalloc) \
-		$(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi)
-}
-
-src_test() {
-	case "${LD_PRELOAD}" in
-		*libsandbox*)
-			ewarn "Unable to run tests when sandbox is enabled."
-			ewarn "See https://bugs.gentoo.org/290249"
-			return 0
-			;;
-	esac
-
-	multilib-minimal_src_test
-}
-
-src_install() {
-	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
-		MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/gperftools/heap-checker.h
-			/usr/include/gperftools/heap-profiler.h
-			/usr/include/gperftools/stacktrace.h
-			/usr/include/gperftools/profiler.h
-		)
-	fi
-
-	multilib-minimal_src_install
-}
diff --git a/dev-util/gyp/Manifest b/dev-util/gyp/Manifest
index 52334b18529e..406180c38309 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20170904022846.tar.xz 447608 BLAKE2B 41f0e28d04039358a9e4ec9628fe1d936d19748061ea882a4e47f2cb23549db3866c5281e102b8f95d6ed37cfe999e7342129a81333671ee42534fc53d2a0d0e SHA512 9336be1103048fe5f51f90fcb2a153bba7638e71e4b579c47b725db81ae4257a56a8f7dacddc936e627862ee6149a453f1c7f5bede633cbd3076e0fa2fce07a7
 EBUILD gyp-20170904022846.ebuild 917 BLAKE2B 80903a671bf2f4839514d0078fa44cb7b99461f08f09974c1892bd42cc445a72f5a577d9ae508bd5b635e2dc213b789b18452bc4b9c19b58d545cac5d66b7ff3 SHA512 2e725f98f1bac4af1b8f8519f178335ba111a8831b110c8137d152d777efe6fb35f85413f086e566f2e3c00ed98737085b3b4a35f07e473e7660aac29515a72a
 EBUILD gyp-99999999999999.ebuild 901 BLAKE2B 7796a9f7cdbc7bb7742e5637246a393214a149fc81d3be3e928b637ce3000bfd7fa629e8e1c4f735f6a63abe56d029535327d8f53528e48f9cea14bf5a6e8822 SHA512 723a2c6be5dd7e4b0032462eee18949cbfb8596d158c37fb08220020bceae4070ba6db3a037e23b6b5479291d54451923aba8834f272afc530f63f8a8418d34c
-MISC metadata.xml 273 BLAKE2B 287fddc66f0f3a2547c1d7892ca0ca381ca3f90c0a24935119d1cf30b0a2be976d20ce00b92f720fb58cec08d6b1147dee207bee998d17c80638c8a6a95d7a63 SHA512 52d2bba092d7ed694e06c90dd9cfca1a0003e34fffc0bebb25fc4262f5b6b2ae8903454f7d406aff28d40c9ffca5157fe021701cd60ac1fbf7a7b24215578341
+MISC metadata.xml 415 BLAKE2B bee460235492c13da7eb83441f00a502d900c169b48c91802a8891f9856c5f87aa225e61d8efd90ac2aade3ec52a93db293e3927b73c9b9b2708f723370d8585 SHA512 378e53a81fa2177409ae4557c336ddfb62b8657bf2d756ae651011d5dc5e94604d52aece3cdda38fbd0f123d5a1f83b721ccee3ecc5870cc562670fd748631c9
diff --git a/dev-util/gyp/metadata.xml b/dev-util/gyp/metadata.xml
index 7b9c409fca7e..db283761922a 100644
--- a/dev-util/gyp/metadata.xml
+++ b/dev-util/gyp/metadata.xml
@@ -5,4 +5,9 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index 8c576884ef5a..881fc90aef6b 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -1,5 +1,3 @@
-DIST hadolint-1.10.4.tar.gz 39126 BLAKE2B afec4a6308ac19d31207ad9cc89f3d75c24ae1bc7d09e89c9437863e117ffaf0041df7a110cb0264a4b76a67ff6c2901fdfb372a5ca7660a806f059db95cf572 SHA512 ca0dad6f64247a514b562cacd5744ba9b5ab87353144b8075bbcfbfbe8893228f08bd45b6c9885c2be1f3a3a12c4afbe4d8f6afa0031405b5958836a8b415021
 DIST hadolint-1.12.0.tar.gz 39932 BLAKE2B 1d7f7acaf5a8ebacb9b0555e60a31e2bf70474045b33f1a8fefded796c455d9ab6587acdcfdfddf23b78585cf69cd4f609320c4ac39f956bfff62322595f026b SHA512 306eeebc357352d50c48b30d424ed50e0b89deff059a61b78ae0f7493c0ac2099bf32caaf84cdb2620ff6abecb69d3e6d61ad9e5223c42cce73923cb1da376c6
-EBUILD hadolint-1.10.4.ebuild 1137 BLAKE2B b5fb51af0ca3137c7666aab77ed9fb911f1d3aca892c0dfed7cb9039685566c90a5abf1855034e5ffa841a59320d3b570303c9d0fc80093ad0a8a702c4443cca SHA512 bf97efd4f7d4316e958a8904f372919e1e6dfb3d404074869a94d5ee22ad203705c4ef13280540639d0c078bb7aebd67b5149ce0e87e0dd9977181c82ba8bda5
 EBUILD hadolint-1.12.0.ebuild 1164 BLAKE2B dc3096d62e52a798b0371f5e0b9492f2d142ab65b267cebb6ef18d8e2f1587b227ad1bdcc82eee53fa0630165f09b48cf5038299d12fc2c6ca46156b78908f74 SHA512 8e6ed7a8e3cac87ce38312bf495bfb7382e6a01aa1e9233d7a9d61f656af92b88b29cd0fe9471c0a146f2c4fd57f3d70433d76770b07855e4b499369b4077c9f
 MISC metadata.xml 286 BLAKE2B 28047949bae509153b03e8627389845792a69fce265c8c90e9cbd14f05aae3dcf91777ef0a3e657f4c7f4ab4f26b92739fa12b313bfcf986a285e0135722079f SHA512 cfc6ff695eb5112d9be7f5cce18103ab0ba258147d98c31d7446305372bda8dc02f598e52098dbf4630189b7469427b179f71983f00b89c92c5e29bd50f2739d
diff --git a/dev-util/hadolint/hadolint-1.10.4.ebuild b/dev-util/hadolint/hadolint-1.10.4.ebuild
deleted file mode 100644
index 4c740b4d0998..000000000000
--- a/dev-util/hadolint/hadolint-1.10.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Dockerfile Linter JavaScript API"
-HOMEPAGE="https://github.com/hadolint/hadolint"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-6.0.4:=[profile?] <dev-haskell/language-docker-7:=[profile?]
-	>=dev-haskell/megaparsec-6.4:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/optparse-applicative-0.14.0:=[profile?]
-	>=dev-haskell/split-0.2:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/void:=[profile?]
-	dev-haskell/yaml:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-	>=dev-util/shellcheck-0.5.0:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
-	test? ( dev-haskell/hspec
-		>=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	default
-	sed -i -e "s/-static//" ${PN}.cabal || die
-}
diff --git a/dev-util/hfstospell/Manifest b/dev-util/hfstospell/Manifest
new file mode 100644
index 000000000000..073ee8117e24
--- /dev/null
+++ b/dev-util/hfstospell/Manifest
@@ -0,0 +1,3 @@
+DIST hfstospell-0.5.1.tar.gz 152056 BLAKE2B fa589908312bd4a4b40b88b221ee5f6bdc281d6151984a87b237372b0141157db87b3494e357d74a17f0ee137fd5ce35ec8caddb12d5bffe15930a74345cd3ee SHA512 bd8ffdd3ee822da2a57a3405b139ec1e635dc8bb293dbd9abd05912b8929df29633304e64b97522e4590a3907ddfa3aefec3e4da5ab709b9be1857cc2ecd2018
+EBUILD hfstospell-0.5.1.ebuild 589 BLAKE2B 442221f168f9c7378130bc5e23a795246cfbe4504cd9af4e008bc82349bbf403d52c3ff590eea374fa8c0b937674fa5e0a2ca195d194c6260c902a19d446a802 SHA512 d98f860d6f9a5a11c1d6caa34ab19c065f4b1a841c76fb61cdcdbcfb53940ad9da0ce07ba89a9b2c7c13ff7d1b5e6ebc54f35aa95db033b5972173c55a7fdb78
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-util/hfstospell/hfstospell-0.5.1.ebuild b/dev-util/hfstospell/hfstospell-0.5.1.ebuild
new file mode 100644
index 000000000000..7aac0223c0d7
--- /dev/null
+++ b/dev-util/hfstospell/hfstospell-0.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="HFST spell checker library and command line tool"
+HOMEPAGE="https://github.com/hfst/hfst-ospell"
+SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/libarchive
+	dev-cpp/libxmlpp:2.6
+	dev-libs/icu:=
+	dev-libs/tinyxml2"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/hfst-ospell-${PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/dev-util/hfstospell/metadata.xml b/dev-util/hfstospell/metadata.xml
new file mode 100644
index 000000000000..6b0a0fb3a729
--- /dev/null
+++ b/dev-util/hfstospell/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index 49e359df5f3d..5941b382ad8f 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,7 +1,4 @@
 DIST ideaIU-173.3942.27-no-jdk.tar.gz 562044023 BLAKE2B 57da196682db817b175158b9c9913502490c2a692153e5e5b8a4449958c5613469a0060f1260095e9fb70ca54b5adaf59494cd9c0f6b0cb0b9f7c25cc4571335 SHA512 9cc7e687bef5d213f37e2e24aa2464e0d3dc9a40cb683d1d8fd1438efc6ca988134509a96f558ec87960e950336e062d5161ef6cb491f9c1c572ba077dd0a990
 DIST ideaIU-173.3942.27.tar.gz 635548505 BLAKE2B e123d731b3516dee3342310b3204dce2247430e81240e4dc729b23146887fef552001bee9aad7528d46c0717654507f16b505f76baf8407609cb9cca7aa9d773 SHA512 1f3586bc2082feec5b986298334445c7b91318f6d5f3d71fe6bfbb1546a63bb33e2bc978ef5fc4438e13d2a3d1dd5abc96fdd4ea5659f64563afbdd3410df8b4
-DIST ideaIU-173.4127.17-no-jdk.tar.gz 562765679 BLAKE2B 7d287c2723646b4fa541c314099cee96242c058cd67811ec1633737ce33e90678504d0d0b9af1cf1279dbf7281fb87ec9c2723bdb926d554f5a1f0793e13867c SHA512 a3c0afa388705158f431064223f42a7b0daacaa928ef9bc68df1cd5ace542f22c3648620d56478896f663688ea1bf773dc04d8d0ab962d195ace7b057708a272
-DIST ideaIU-173.4127.17.tar.gz 636265697 BLAKE2B b01efe844375b009c03474df362d2a208008a47e14696e816ded1573f591a777e23db393838c8592277d68817b3d7ebd714bb79445cd0cf0653da3d575af5bf2 SHA512 e05dd3986f77d39bb48f12ac6af5ab76d9c67b3502772c2bc16c16f922c90a3e6b8adb24537eb37defea2e3488968a6dff343eeabf4c6c78740895c8ec7c93fd
-EBUILD idea-ultimate-2017.3.1.173.3942.27.ebuild 2625 BLAKE2B fde443d28a0df190be9ee6f0b7132d58ce92f1575a0481e8b1bd1dc995f5051fc85080a0a5fbab5747d4d21672e20a1ec7b7653da6c01d937e3642e782e90716 SHA512 b33c3d98f40f96806f33b1705144ac9c6cec0eb8b90f18b7f63c49a7a6e9f4c9bfa1623adddd063c036eaa7b96f361937c4c15f4b319e1266cba8b910b73f2b2
-EBUILD idea-ultimate-2017.3.2.173.4127.17_pre.ebuild 2625 BLAKE2B fde443d28a0df190be9ee6f0b7132d58ce92f1575a0481e8b1bd1dc995f5051fc85080a0a5fbab5747d4d21672e20a1ec7b7653da6c01d937e3642e782e90716 SHA512 b33c3d98f40f96806f33b1705144ac9c6cec0eb8b90f18b7f63c49a7a6e9f4c9bfa1623adddd063c036eaa7b96f361937c4c15f4b319e1266cba8b910b73f2b2
+EBUILD idea-ultimate-2017.3.1.173.3942.27.ebuild 2648 BLAKE2B 2e2e4d18dc878a3a331967d456fa209a44924fc7be1160263326e586161040da3aeb5c0824ad0fcfaf0c156fd2d89338a1f48c3517093fa10ba69d878ed583de SHA512 0b958ef10e508299ec28a46c9cc23a74802dba4e7ccdb021696bd6d78efba0e1b61d4fcf8989b9d097b02b9d0b36bf77e5f2f8f41cde3663a171cd63d1973ffa
 MISC metadata.xml 535 BLAKE2B 60d09c4839b751d9c6a7ea683ea541ca962d6360bb96526075ff4cc941796cb5ca082834dc81926133533c96b791ba57257c09c4caead13775079242df717b54 SHA512 a01da16279cb79d0b6a0b806bdf78f1030877ab491de95461c5d27ee6c1c8565a580cba03dcbed836e438be9c7a94ea5958c91383cce1e40398622435f86bfe8
diff --git a/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild b/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
index 6a53389fc5c9..abad0541b71f 100644
--- a/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,7 @@ HOMEPAGE="https://www.jetbrains.com/idea"
 LICENSE="IDEA
 	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
 IUSE="-custom-jdk"
+RESTRICT="bindist mirror"
 
 DEPEND="!dev-util/${PN}:14
 	!dev-util/${PN}:15"
diff --git a/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild
deleted file mode 100644
index 6a53389fc5c9..000000000000
--- a/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="
-	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
-	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz )
-	"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="
-	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
-	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz )
-	"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-IUSE="-custom-jdk"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	eapply_user
-	if ! use amd64; then
-		rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
-	fi
-	if ! use arm; then
-		rm bin/fsnotifier-arm || die
-		rm -r plugins/tfsIntegration/lib/native/linux/arm || die
-	fi
-	if ! use ppc; then
-		rm -r plugins/tfsIntegration/lib/native/linux/ppc || die
-	fi
-	if ! use x86; then
-		rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
-	fi
-	if ! use custom-jdk; then
-		if [[ -d jre ]]; then
-			rm -r jre || die
-		fi
-	fi
-	rm -r plugins/tfsIntegration/lib/native/solaris || die
-	rm -r plugins/tfsIntegration/lib/native/hpux || die
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
-	if use custom-jdk; then
-		if [[ -d jre ]]; then
-		fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 23cf5860b895..a0c3a56b7b37 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,8 +1,6 @@
-DIST include-what-you-use-5.0.src.tar.gz 439081 BLAKE2B 85246aa5333a073bb195b873d7bfe084a56c343cece92322706717ce699bcd75b737203858277202791ec0eb91f560b06a371e902cb175cdb2858562a4830e74 SHA512 9d4a9717a3a3f6752f8bdd1392b6d7a5e8b8dc277ef46a50f24185a089360380e1da92a61fd150598843f5c24cff03e74bc674e57579960d977acde755e34c52
 DIST include-what-you-use-6.0.src.tar.gz 440406 BLAKE2B 485a61dd4f72c158ad9c798c8121d7af9134d79b94c9c30c14674a62007e9fc05acc7e2341cc3282288611beb9138768bf11cd2d73efed372adab83e90b268db SHA512 2bf2593dba252d870074125f976a237e901e969323969f2c8fb030e8376bb230f1d5c2baecc8cd8fad7099e83589c7666c44cd178d2094f6e883cace1e53ad90
 DIST include-what-you-use-7.0.src.tar.gz 541840 BLAKE2B bf20a5598f02f03e5f714582653b8062eab6e414967ef2374c28bb6c1cdce8f73f80e3b2f4953fd943587ce17dc657cf6ab2a9db4208a59030d432f6a40532e5 SHA512 50d186b2e09c3595cc2dc7513e5db74da0038987158c2c45ef4279c67c50de621ca6499b07894ee203f25566aafaddde4b05840946f921678499d2efc131575a
 DIST include-what-you-use-8.0.src.tar.gz 545788 BLAKE2B 7b70d951b7ab2d62a8a6168ebf86dc76fd406159155dd93a509b8c39953506166ac18da3028be8dc7edfbb39eb96613b0e344067154dd8614fe7c63ad3ef04c6 SHA512 e75e91ce198b1ec446ed34afcf9fdbcb0534c5edc5346e4884f0f589c73512d778c428aa71c1b109d45a45543a952438610ab21e32ef1f03ff1a014823ed8425
-EBUILD include-what-you-use-5.0.ebuild 1319 BLAKE2B 9e80fbe8541e9a2179a3c3a16ff1664b5ba15ff35723b298a8ffc5764591c2d4508c724341e6989a5e9425008cae3bdad41cec78c5387ca43f2c1fb8982543f1 SHA512 38ef2977761377c078553619960d4fcb71f0d141d08191421eb2f0f3b9e3a01f758ddc22b65d50bb97661b98e42be65905a911de02655e5c73234a4076f10695
 EBUILD include-what-you-use-6.0.ebuild 1319 BLAKE2B f3304e57585cc3e52ea9181fee7214eca19620e239b5009927a967649c8f66288c7044320721755820e54d8ddcc547d15a01b1f894800715340b183042b4e4be SHA512 e511f24c4b09caa070d390e3d9ba6bbe72cdd5cf5157ccbe64836efef525a937923ff42180c1ad5b3f741a495b4a35f7260d642b6d6b625fead0b92f681cde58
 EBUILD include-what-you-use-7.0.ebuild 1216 BLAKE2B c8ee0c61209225b05b50625799b786e6e115576e383d50ebc3fab065e96310019c97dbf371ec683f4cd10382d4e88eebcf114b843736ae1d0e9a3113b0512d52 SHA512 03e2042d26614945f25d4e0f86efb733f51f5e0130b3d44de0fe2d85d00b4f290daa9f9bdff3d0c3af1888d5e1c0e32567112f0c1ca0e1d328f178d16fa0cd05
 EBUILD include-what-you-use-8.0.ebuild 1216 BLAKE2B 09b50d9d452f36bb3d044e42af3952f2612813251209875404847cf4f0d065991b7eef3a31577a876a769263680c9559beba838a2cce97f00876dc17e03d2d48 SHA512 173540c5ca5c145bb3764a9c13fc601e7121be7039a1ec45f0bd9dd6aa91b70a998939b10628024f679b69e267242bd989baba97d9fffd547d800f73a1a78300
diff --git a/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild
deleted file mode 100644
index 9a0851f65682..000000000000
--- a/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit cmake-utils flag-o-matic llvm python-single-r1
-
-DESCRIPTION="Find unused include directives in C/C++ programs"
-HOMEPAGE="https://include-what-you-use.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LLVM_MAX_SLOT=5
-
-RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}-clang_${PV}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
-		-DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
-
-		# Note [llvm install path]
-		# Unfortunately all binaries using clang driver
-		# have to reside at the same path depth as
-		# 'clang' binary itself. See bug #625972
-		# Thus as a hack we install it to the same directory
-		# as llvm/clang itself.
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPYTHON}" run_iwyu_tests.py
-}
diff --git a/dev-util/kcov/Manifest b/dev-util/kcov/Manifest
index f00ce105b6af..cf807e62f8ed 100644
--- a/dev-util/kcov/Manifest
+++ b/dev-util/kcov/Manifest
@@ -1,6 +1,4 @@
-DIST kcov-33.tar.gz 276028 BLAKE2B bed7f2b2feb3ecb1a861928306626b44904af52f30d5721cd0e6ba9ad5db5edb1ffb51fd64ab0fba5f99fc0329bbe87949b901bc73e2299c2075817f606113aa SHA512 e35ba3c4dc320cef0cde097cfa2c4067ec6bf86a5ee797d3ec111facffa036da4fc4d403e63bd3767d03eac511987592e77ed61810605f8e2da77c26570e245c
 DIST kcov-34.tar.gz 296345 BLAKE2B de6acbecd35b1d85a4a0f9f43fdf5dcb09331f88622a236fee672a8624c77baf4a8589d61aaecfb51220b83d28d98426ed32bfb345b717bb13fb180f479cc371 SHA512 63ea8e47f00e53b55be4c37697a7f0b78c15f887a40fc0679d7e92f1561bd379a526a82179ee243838fe6f6bd5b89c9eb76716cdb5add7bfb0f312176422a346
-EBUILD kcov-33.ebuild 509 BLAKE2B 8e9bb470e023a442d4aeedc2ba564d8ad8c9a2c40c2619b28b130a14b225ab49ec619aa161444ef31d078dd49226c159be28a11833a8dbbebc92dd7ef748f2ef SHA512 7cbdaf21d0b35a72f994c05b1aff180b9f805d7bfb05f1af89e7d5d33db9543bd1cd468813c8c5518305fa0de3926ec1b3d8b093badfabf11df53811086a7a58
 EBUILD kcov-34.ebuild 509 BLAKE2B 8e9bb470e023a442d4aeedc2ba564d8ad8c9a2c40c2619b28b130a14b225ab49ec619aa161444ef31d078dd49226c159be28a11833a8dbbebc92dd7ef748f2ef SHA512 7cbdaf21d0b35a72f994c05b1aff180b9f805d7bfb05f1af89e7d5d33db9543bd1cd468813c8c5518305fa0de3926ec1b3d8b093badfabf11df53811086a7a58
 EBUILD kcov-9999.ebuild 638 BLAKE2B fdd240a4bf38de8939b29ba7c04c1f29fe8977a074fb2c35bf23c80ac34539da1a0f39d60073a785d2850194e92d03f8618e6169ab00706cb0b686dd458ba5ce SHA512 cec899ac8769080dfa88b1d34d9f4a0b2da654da9712a4236cc343533e3bc33815159ef84074c843eba3053ee672f034ac2c439e9431ae2e0a0b4eac5f584eca
 MISC metadata.xml 250 BLAKE2B 4aa2c984b48b686831ccaa542ffffed7eb9bbdbc41d1f4ede551845768fdf0f2a3443502037db80e77e6105f97c0932d4512a84b244d67e6e8aab8e1dcbb83f2 SHA512 aabb9dd0e703f923f2d03a759fbdb731e6c07b2149cea06d1215cb8e282cdddf0a1f9b7bee7adcc391583566bd7962d7e4f2c7d61286bac56c0c2549bfadbc7c
diff --git a/dev-util/kcov/kcov-33.ebuild b/dev-util/kcov/kcov-33.ebuild
deleted file mode 100644
index 7f1e7488e3b2..000000000000
--- a/dev-util/kcov/kcov-33.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash"
-HOMEPAGE="https://github.com/SimonKagstrom/kcov"
-SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/elfutils
-	net-misc/curl
-	sys-devel/binutils:*
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index ac6f13823bd6..35adc6b5b653 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -7,6 +7,6 @@ DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c894
 EBUILD lldb-10.0.0.9999.ebuild 2712 BLAKE2B 6b0d5bed2bad575925e888236e82084a3388e28a9434ac711a1fbcd67fc94a040b3fd7d80788c2e6d55ce37fe3173c4bc0d710d05f7c7599215dce2d38cd0076 SHA512 afca689ce2424be93db8500c407efed77f98eb27b28f7d427c143d04395714d371c5fb8a2a7169315f06a3964390bb0ff3f8837d407326355e7d989bdac159cc
 EBUILD lldb-7.1.0.ebuild 3088 BLAKE2B 246fc131cd7b629ffe3e541c8f108f3f0ef63b28e68c887c503b2bf55987ccd4ec8dfc4a13763ff42a0a237487d2aee58cba7a72471d2f55359c0514e9f24cdf SHA512 52de6ecdfe24cea6f24f78f7d279ccce295189209b1d99a8bf6fb656f7f2a4c8284a03745f0bdf18bb061bd7eea82afe20d93b926e819b2bbd2f64f89e636db0
 EBUILD lldb-8.0.0.ebuild 3011 BLAKE2B c4d28d2f72f001ccfeb108732d073e6c8c52db8dcf7988f4ac282981bc7317c723cd6e4afa695fb072cb321b976a05869f03a8a9062bb06f80e4ebac11bc892a SHA512 86fbe8fb7402865ffb8410751325bcd71fa0d830c562855042fb2029da24026879df77b2f974139a2e3b49bf539a1ab789becaa8342b94f70038f5c60be92e4e
-EBUILD lldb-8.0.1.ebuild 3077 BLAKE2B af58b86667a4d76c8838a083d30af8f2fb77cfc0c2907067a56bc4253be96ee44e3748e7c9bf7c20914163cc78b86614dba045ef3284cf55c44511815627c980 SHA512 d2db4b4e6598f46230120b76b5e384b89f5ef346e385b723903023eff6ed97942c4588be3d0fc70ca1bbb7af6c981da1115fb9f2314fb5f01b0a58436db1a7dd
+EBUILD lldb-8.0.1.ebuild 3079 BLAKE2B 2e8f895fc0481d490279cbbe6d30c847b31abc1a02f34d9f51cbca3c4ec3ea5d18c5f6e68b71eb64c4054c40dc93ef5d09ea704b4373fc2c109692b8bb419a4f SHA512 6525739c5de7e365340582b222c28404142de968776a4acf05b771f41246874eeefa5a37e0336669567f2bf3c9d518065b27a6ba259ffb290692a4d9743b5df7
 EBUILD lldb-9.0.0.9999.ebuild 2737 BLAKE2B a768532e7ff0e18e2ba779054f20bdc04da7571cf1ba66277734c5e11aed22c224763f4b61f2166c3014ea36b6ecd7f9cd5e56304e1c3aa50ada8be76e33a68a SHA512 c61ca46f688826fd96ab8284ec1ec86f861255efb0c401c680c9f4817ddd22d8e5e94889cb122762832e0db3fe4aea2b018837a08621d3a34b8bda72b7506326
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-8.0.1.ebuild b/dev-util/lldb/lldb-8.0.1.ebuild
index 4b8d996e1767..e41221629992 100644
--- a/dev-util/lldb/lldb-8.0.1.ebuild
+++ b/dev-util/lldb/lldb-8.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="libedit ncurses +python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index f0904ecc1968..d6dc5cdc65f5 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,8 +1,5 @@
-AUX mdds-1.2.3-buildsystem.patch 901 BLAKE2B 040cf2db28e1c36c28d617b8f56abfca11909267230e7986e4e2439b8e98d7bedb076bad415a75846db038166583c1f3395cd71affb60959956062c293929378 SHA512 bc48b893c0b3d98aa45d7642bbd9bd10ee0f183bcd3da848a0abe4f33547b693e171a327439aba9b76f0683cc15eeb0410be7ed6f834d28483b8f82f8c13678f
 AUX mdds-1.4.3-buildsystem.patch 893 BLAKE2B 7884c16fcf8b6f1ddde0dbae6e4059e121fed73e7dcbffdf730e1623d0e7b7d0748f06c07433d73a73a7b4729ce32a6742125c8baac946db62a856149b468173 SHA512 0cd8c83f1a354a97871bb0d9bd7662d73765639f3ec4dcd6b922574062e2f1b33c259c322ff6e60c4c9f55e0c581c022b7546a05e0b551ad11123bb1a9dc7b53
-DIST mdds-1.3.1.tar.bz2 287612 BLAKE2B 476f15bea2ab75ba322139834badaf372026a5e0ce67d5487acc61b38321a21dd6b25efacc91dbb0ebdef274338c909b1c7ac0ff6aaedd8dd899458319d94c30 SHA512 c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8
 DIST mdds-1.4.3.tar.bz2 334515 BLAKE2B 3a42b7858346b2907040b8e42b1fae56626fc0881737ed04e20ffe4f9a23d2a2459c45e4244ac77745d2b1c7e3ff1642fe883b16def36e56c5c3d15077445793 SHA512 fd54a93fde89bff74a5ccf84ce5e2e002114297b165ded56a1bae92b28d70864775add140e165c7750f7dbe8ca1bfe83179cd9a835e53312c2e893c9e1f4434c
-EBUILD mdds-1.3.1.ebuild 977 BLAKE2B 64845034c53e9357dc66ac7cddb6724863df6d946797c72f1bd99e0ee1300d01cb8dedd0cffbe72ad7fb65e3bf3435ce500e0d2ec6504d9e40862950830f46bb SHA512 99373e8ad499222f9937661a5689e81f8b658733cbacd10d963dac46fbbdf1ef1b44c6c5bf209fb074009ff42760cd9cd0363e4ce583844151c964de5b4e5ee2
 EBUILD mdds-1.4.3.ebuild 944 BLAKE2B c3b0165e5f6c8448f8a4290c89e44fec9cb29aa5dcc27ea9f7a8882096e92b7d581fff7c648cd9451b4e96672508c29e757c9591ea1b0f55fd4395508b1c8b1c SHA512 686065fb349ab4a5ecd908ecb02ee1d6bd6d034168b46ecb30071f9bfdc68117de482daaa7dca20954e6eaf3afd21b7149285790cf1cf0b036e6e0583a17382c
 EBUILD mdds-9999.ebuild 954 BLAKE2B 46fcd2e4458f073a7142bdbe1df979ea80b9f6b341b5cf0ca7b493652a83763bdd2c9616a2be9a7cb1fbaac94f578af48e5f5520752ee1237d0bb8391152c002 SHA512 b8df297d8988d5310d218737adea9d98c2353dacb541f605fd99dde7cafacb7cd6a148592d6670b5ce6b14f7869a360309dcc7586d4357d0fb03996d499c5c4f
 MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
diff --git a/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch b/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch
deleted file mode 100644
index 89b45d826e04..000000000000
--- a/dev-util/mdds/files/mdds-1.2.3-buildsystem.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-We want to install (not all of) those files manually.
-
---- a/Makefile.am	2017-05-24 23:59:15.000000000 +0200
-+++ b/Makefile.am	2017-05-26 21:52:01.184258647 +0200
-@@ -4,16 +4,12 @@
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include
- 
--dist_doc_DATA = AUTHORS README.md
--nodist_doc_DATA = VERSION
- nodist_pkgconf_DATA = misc/mdds-@API_VERSION@.pc
- 
- DISTCLEANFILES = misc/mdds-@API_VERSION@.pc
- 
- EXTRA_DIST = \
- 	autogen.sh \
--	CHANGELOG \
--	LICENSE \
- 	doc/conf.py \
- 	doc/doxygen.conf \
- 	doc/flat_segment_tree.rst \
-@@ -151,14 +147,6 @@
- 	trie_map_test_mem.mem
- endif
- 
--install-data-local:
--	$(MKDIR_P) $(DESTDIR)$(docdir)
--	$(INSTALL_DATA) $(top_srcdir)/LICENSE $(DESTDIR)$(docdir)/COPYING
--	$(INSTALL_DATA) $(top_srcdir)/CHANGELOG $(DESTDIR)$(docdir)/NEWS
--
--uninstall-local:
--	rm -f $(DESTDIR)$(docdir)/COPYING $(DESTDIR)$(docdir)/NEWS
--
- if BUILD_DOCS
- html-local:
- 	(cd doc && $(DOXYGEN) doxygen.conf)
diff --git a/dev-util/mdds/mdds-1.3.1.ebuild b/dev-util/mdds/mdds-1.3.1.ebuild
deleted file mode 100644
index d2a33d885ee0..000000000000
--- a/dev-util/mdds/mdds-1.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3"
-
-inherit autotools toolchain-funcs ${GITECLASS}
-
-DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
-HOMEPAGE="https://gitlab.com/mdds/mdds"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1/1.2"
-IUSE="valgrind"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.3-buildsystem.patch" )
-
-src_prepare(){
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# docs require dev-python/breathe etc., bug #602026
-	econf \
-		--disable-docs \
-		$(use_enable valgrind memory_tests)
-}
-
-src_compile() { :; }
-
-src_test() {
-	tc-export CXX
-	default
-}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index b03e50f44506..5bdf321a41e3 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,7 +2,7 @@ DIST meson-0.50.1.tar.gz 1402160 BLAKE2B 051e9949f3a216c1074ec826c6a232124a3d261
 DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
 DIST meson-0.51.2.tar.gz 1453328 BLAKE2B 514995ba8db534ecd488e99fb1aed25d33de73ca65fdfaf18584bd8c113eca3602a73ac42f2ae5ddd4362f8989a02d3d3aa75487ba665706c75039e3f039056c SHA512 332fa0801accd91dc8f3cc1e4e701b1139fdb17c4ae8371fab419e83305ef41534e5f367fbd9323936afb6912d5c3e7cffa9cef658550fad0861ccca9812d5b0
 EBUILD meson-0.50.1.ebuild 1717 BLAKE2B fef0e6f1b04e505a25759907af4a0839241a0e3334ee08525f1e91f2ec47dcc36f08ec29cfc80a9b28e0863550724b19590dea1c182c079871a432b36b06a63d SHA512 81d3c76ca483b5ab174a5ba1b1b3b61dff1a03405668f0ee03ba265049684da03c3abe02241135d48d5ca957d7b94095e1749684eba258b88cb7d854239a507b
-EBUILD meson-0.51.1.ebuild 1955 BLAKE2B 262d70d7d4321213248c7fecf2370f921d882c4571d904079605838b3d21815825e265346bfb33f115be6127264a58c495476ed335650c9345bd03433c985584 SHA512 61912689b45e4823e62da762b65d0063267fef830595a94cf29fe1a2e95cc9fca8db2fff72df70fc2abd4a68177f4d8cb365dc7dfd41d2238a3488d92d3a4799
+EBUILD meson-0.51.1.ebuild 1952 BLAKE2B bca35de4afc867607193bee7fc66d2c03f006efc296b666c2983cf576a8a41a8ab66e5139dd5cf0998f54c775b29b76345d3b018a6a457ba225457aabe4b043a SHA512 2ad5fdebccd48b42302e8c1a10a7d7143229396479ba60a4531c632eeada1631d32c89eada26d9c5e4ee0a2d22ed479bf3522fc8ff2523cd6f09f9ba90f29f64
 EBUILD meson-0.51.2.ebuild 1965 BLAKE2B 2957586ed283d5dcb684753b39785e3c02d72acbc7b3d6565cd9e1cd3f76000435c550cff900afc7daa4ab802a56bbc37a465bcfa78ce878630ac02d875cdbb9 SHA512 1ddf31161fe432c40bec328543a3c3c31d3f9d9ca198edf2607fb03555ed48e6610ae167e0226277d59139a2d50c87031268d1041422b5820065dda1cd1baf4f
 EBUILD meson-9999.ebuild 1965 BLAKE2B 2957586ed283d5dcb684753b39785e3c02d72acbc7b3d6565cd9e1cd3f76000435c550cff900afc7daa4ab802a56bbc37a465bcfa78ce878630ac02d875cdbb9 SHA512 1ddf31161fe432c40bec328543a3c3c31d3f9d9ca198edf2607fb03555ed48e6610ae167e0226277d59139a2d50c87031268d1041422b5820065dda1cd1baf4f
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.51.1.ebuild b/dev-util/meson/meson-0.51.1.ebuild
index 74eddfbf1864..2dc8c391c3f0 100644
--- a/dev-util/meson/meson-0.51.1.ebuild
+++ b/dev-util/meson/meson-0.51.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 4d979346db7d..d65b10723612 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,6 @@
 DIST pkgconf-1.5.4.tar.xz 290380 BLAKE2B 8353901e9fe86f05abc82c5906b24ec902086f5c9a08ffdc9f6d53ecdebcf7c52eb9bbaef019285332182ca8f489cfe872f25bfe110e280031a553331df09bcb SHA512 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
 EBUILD pkgconf-1.5.4.ebuild 1393 BLAKE2B 07808f0e52d9fe36b5a3a54758d956e1fc726bcad1110cc17c0b065afd8fc3727b293682d590ab6d3bf3af35ed3112c1aad3485f37a0520e0d041056f1e19b55 SHA512 0da4bc185049ad5387261fb80979ced945f3c5f8b75d3d310f6a282bf5323035e06b345fb3c92f56cf58cdbfc9dc8b3513bf4d587c98a5265bc6df9775698105
-EBUILD pkgconf-1.6.3.ebuild 1667 BLAKE2B adf15678d3c814f2d2afeafacaea8ddd636f6a19680cca166e26e7eb6822dda6832c4d29a9e81f82746d74c36ef25d8980f67686f5f8d3c81bab4ee008da3874 SHA512 fd509030288c89acb4ec955af4373b15d6311519518cf4dc0984d854ecf95ea0fcc732fb37e0dc4c044203ccb8a492f83b774e8a281aebc91c5e183dc029779e
+EBUILD pkgconf-1.6.3.ebuild 1666 BLAKE2B ae9f9e8f8fd64fdb4553bc901118daa43d4dfc5a4c7e3451196e6f70bbc29ef7a3f91cfc504d3e2aff0e0b0d3cdda9896b38d14170a113d208bd423f93eb8381 SHA512 07de0fb755c85d4ebb5c20f27de30306ab150db6e2b98fe234d94e2e0d00239b2027dd058546e01fa0679a4add25fc3046f1fd11f87092a24a71d5880c7d30e0
 EBUILD pkgconf-9999.ebuild 1676 BLAKE2B e002af8ed8e0fd66befdc63c6da948f317814cca96a9a05b621152f7275f602bdf51675c6efb42298d281bebb89fc40c547831a3831b2a82c79d1d9e5808d0ed SHA512 a34a92898fd598e3eadd092c63750fcba010d64aaa366a231f790a6323a462c54416c02a7d7002dfe0439ab2e1192b60a099051a7fbffed2779c8e79c11a95f6
 MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 8cf602f946e1..4346444fe6a3 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/pkgconfig-openbsd/Manifest b/dev-util/pkgconfig-openbsd/Manifest
index bbcb1c56ad4c..c5555af0df77 100644
--- a/dev-util/pkgconfig-openbsd/Manifest
+++ b/dev-util/pkgconfig-openbsd/Manifest
@@ -1,6 +1,5 @@
 AUX pkgconfig-openbsd-20130507-zap-warning.patch 525 BLAKE2B 7da7e41a0ad141df1df0a291a87c9ec874dc279613649afa33825f1d3b1149e843ea5686621da50ffae9ca337cfdc0026475f017a2f68b4d44ca3582b340f91e SHA512 984d662b5918a4a0f1bc75cee538f8414ca431a6e3132b74f86a2e3ef538479b7966042f414a103393a78ff236a78eb5aeef0107c16493ffe86f3c66cc64f791
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 DIST pkgconfig-openbsd-20130507.tar.xz 10876 BLAKE2B 38beb8dfe17742fe83d57e62d5898de1d6d029ec5bf4caa5d16edb317e179e45fc6bf3c5d7bd56792b5e774ebc53d7cb51a721abd62753f67b1cd5cb76bdfb1a SHA512 39335c986be0f58fe22bfcda9b6196b34c7c8b7e889df2df0d9707fc699ba6e45df7aaa1d1f4bbe53098ea5fb1bb4aa3e5e33c22971978b40bba395642b41b69
-EBUILD pkgconfig-openbsd-20130507-r1.ebuild 1719 BLAKE2B b17123ea49628de44d728108ee8ddd125c77dd4d808acfef2e6bc82e897c5189e28f719409a2376970e3cf60267c1def5d76e643acd0d226c338d8ec4e3573d0 SHA512 8a5bcb1bc6d16ada5f7b3b913e8c3eafaead8a17b15de12e90c3422127e0f93a728cc344d5444e66f0ccffe5b12b361f44b6e63816bc1d2ecd0fe1e18eff37c9
 EBUILD pkgconfig-openbsd-20130507-r2.ebuild 1765 BLAKE2B 76fd533299735c8aa83a3a0fe60975b7c93fc48f300e6f49fb048c2516e736bb3d5ca2e41c14507391b2202c22178f6c2f930ff8e8e694e8754162e1dbc0438f SHA512 71e2cea8ef068c4e0b6f81796529f6c6be6db03264621a3a7b676f311697d606a53554f07e6132626f8955757f9bef585ee88d6c8f6dcc1b551edd13d417120b
 MISC metadata.xml 277 BLAKE2B 4e2570bd81b94d1f9e5b33eb615a8bd632cfd09de51be61f755b5ff9fbf8023a31317be1a04051aaa9a02d56df8a2417c7b46e62df2a0b926409ee3b31955181 SHA512 d1acb1b992610407fafa7341abc0a042a3ccdd04f155a62e0280d7ed4bc403109a6937943d878851966f1c4295a6abf868c71de0f2c32989971b8f00c57fd4a5
diff --git a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild b/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild
deleted file mode 100644
index ff2fbadd47bb..000000000000
--- a/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils multilib perl-module multilib-minimal
-
-# cvs -d anoncvs@anoncvs.openbsd.org:/cvs get src/usr.bin/pkg-config
-
-PKG_M4_VERSION=0.28
-
-DESCRIPTION="A perl based version of pkg-config from OpenBSD"
-HOMEPAGE="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/"
-SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz
-	pkg-config? ( https://pkgconfig.freedesktop.org/releases/pkg-config-${PKG_M4_VERSION}.tar.gz )"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pkg-config"
-
-RDEPEND="virtual/perl-Getopt-Long
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkgconf[pkg-config]
-	)"
-
-S=${WORKDIR}/src
-
-src_prepare() {
-	epatch_user
-	ecvs_clean
-
-	# Config.pm from dev-lang/perl doesn't set ARCH, only archname
-	sed -i -e '/Config/s:ARCH:archname:' usr.bin/pkg-config/pkg-config || die
-
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config )
-	else
-		MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config-openbsd )
-	fi
-}
-
-multilib_src_install() {
-	local pc_bin=pkg-config
-	use pkg-config || pc_bin+=-openbsd
-
-	newbin "${S}"/usr.bin/pkg-config/pkg-config ${pc_bin}
-	newman "${S}"/usr.bin/pkg-config/pkg-config.1 ${pc_bin}.1
-
-	# insert proper paths
-	local pc_paths=(
-		/usr/$(get_libdir)/pkgconfig
-		/usr/share/pkgconfig
-	)
-	sed -i -e "/my @PKGPATH/,/;/{s@(.*@( ${pc_paths[*]} );@p;d}" \
-		"${ED%/}/usr/bin/${pc_bin}" || die
-}
-
-multilib_src_install_all() {
-	if use pkg-config; then
-		insinto /usr/share/aclocal
-		doins "${WORKDIR}"/pkg-config-*/pkg.m4
-	fi
-
-	perl_set_version
-	insinto "${VENDOR_LIB}"
-	doins -r "${S}"/usr.bin/pkg-config/OpenBSD
-}
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index 49ddf63df5fa..894556d8bf2f 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,5 +1,3 @@
-DIST rebar-2.6.1.tar.gz 191063 BLAKE2B bf3407007957c2cb67f47c0c2a049d9b9f9e51e6bfe4a2b278e58828781217c203d2dfc9c39a19bdc3b9fc6bc7f4d9ca85b6d0019057a2841d8b394cc39bdd84 SHA512 0baa10aac65ad78c05d6ecd180327b8752a31bbc51f3b3aa6060f4d2adf9269de83c6481767d9abc8a599e231f569c0496edc6c47f43d1e2892c4e98de6ccd85
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
-EBUILD rebar-2.6.1.ebuild 631 BLAKE2B 767d3538242b6c7165543ab2030fa1af1d16779dcabf35d745e5702fc9a9ba58517e116fc623b287d128a4e1dd983b3d926112081895839e4f46a6d0e2e21b08 SHA512 f6e545bd98f66499f9fe846c19bff96dc121748fb99d6e6b9c5b74adec066e1d5b035ed4df9da3577d93c68c0b72713070fab19ae48ec4c8298d5005d3366da9
 EBUILD rebar-2.6.4.ebuild 628 BLAKE2B c8b961179e05c6d4a393336772342f227fbfec9ae6b70bc2dabfe798cfc656003329edd96c3b139b6116c5041b314dac050f9047e77b36908e4c4a0ba2d988e5 SHA512 e511d5f6eda6646fd8b15c786c766d76e436d2ff6046fd9283c2e85cbc3e344d70595a52825be43e1c74f96d86e66d333a21c511241b70ccae07379e2baaeb5e
 MISC metadata.xml 248 BLAKE2B 404382bd4b92d22cc627b066d14310ac5f538e3bcac366e8cddb43c871c13d4efade2036bb49f5e8ac3c7511f28e6eae58a1e350bc48ef8b9f2031b460c741c1 SHA512 c6b32cd3a892084eff028d3afb657fef0e0921e6636628cfc2d81b7bada9d0c7d03005f8c8ed1ffddc7d491bd6725c771506dd3da20dc5a60619efaccf0974aa
diff --git a/dev-util/rebar/rebar-2.6.1.ebuild b/dev-util/rebar/rebar-2.6.1.ebuild
deleted file mode 100644
index ee7f7421d880..000000000000
--- a/dev-util/rebar/rebar-2.6.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/rebar/rebar"
-SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	emake xref
-}
-
-src_install() {
-	dobin rebar
-	dodoc rebar.config.sample THANKS
-	dobashcomp priv/shell-completion/bash/${PN}
-}
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
index d7451b336ec4..6ffd448e3c7a 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1,5 +1,3 @@
-DIST scanmem-0.16.1.tar.gz 202133 BLAKE2B bb07234aaf1f93dba5f7feb0af0efcdadb7cd7cabfce2d62f19da01ba947cf9f4ba91024db2379e218b91953679a77080a4fa711ceaca659ac7b3f01645e3f93 SHA512 5e0a97e020a8a392aed75e2654cc6bcfad68590b9caab43444e57c3180be45ce1269f5acb02355bee57ff8bb5b9349b4f65e0fe96655206a812ea645796b153b
 DIST scanmem-0.17.tar.gz 220489 BLAKE2B b1ae07f96fd736e9ca6a5d55ad2d6b06b7d0dc4828915e0f2adaa2d58b053d9734ccd7425fb5391289249f838773cf3f9a81dbe76bacd42f41203d27dcffed05 SHA512 6d74f3d1d3492d41cabc342cfd1189815536dcbd57857d8a92e05c5dcaebcb9b1df886aee706c56eaf3344737070ea0fe852eef164ef3fe7907f66c626d8523e
-EBUILD scanmem-0.16.1.ebuild 984 BLAKE2B c069e8b0389b74d19120d7646fc686b4eb91d487a5f44e24f3d5d7a09048a7135b27992171d804cc092941f93342531d7ccab0ef4f20c614e554c62ce0c012c9 SHA512 621af86f741b3e24a0a6db83380909b246973c12ed1c2ec1fa565edcc371fc72a581f8f8f7fbbf76112f64631b8f204a420e6fe12f4f4809a0893637b261de3e
 EBUILD scanmem-0.17.ebuild 1085 BLAKE2B 6845287ac7ac73c9325552fb4d7d103b287a80c1c16fc6c43d263e00bb0f6c79cd19530204408a1124a7196603503c6c0752eec0c9ed7fe6809a47413e270a86 SHA512 849fb77928c61c5b0faf2a04096df8df71543f2f66eab498ca002f8237947c143d40a25d5ea6ba2967a8eb4d546706c628e0bf88a3a06beb2e70d669ad26295d
 MISC metadata.xml 317 BLAKE2B 6d3e5903daa28fe65c109b4a75c8e143a90b7a99095353bc440d41566e9f942f0e415b5561b220bf23fd8e1e0b658d298a6d49d8a442b66042b129c6ee60057f SHA512 44f1ccb76808c4bd5c2bdade165d0f32d68ca07fbec73b2c074ff5b486cb69df2b23cb619d590b5a15d1adfe2f444f2b91aad3f238b29c752aaad97b3a5616b0
diff --git a/dev-util/scanmem/scanmem-0.16.1.ebuild b/dev-util/scanmem/scanmem-0.16.1.ebuild
deleted file mode 100644
index d46dad01e3a3..000000000000
--- a/dev-util/scanmem/scanmem-0.16.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="Locate and modify variables in executing processes"
-HOMEPAGE="https://github.com/scanmem/scanmem"
-SRC_URI="https://github.com/scanmem/scanmem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui"
-
-DEPEND="sys-libs/readline:="
-RDEPEND="${DEPEND}
-	gui? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3
-		sys-auth/polkit
-	)"
-
-REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use gui && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i "/CFLAGS/d" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-readline
-		$(use_enable gui)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use gui ; then
-		docinto gui
-		dodoc gui/{README,TODO}
-		python_fix_shebang "${D}"
-	fi
-}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 7c1a63400e64..0341bcec102c 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -3,13 +3,6 @@ AUX scons-3.0.1-env-passthrough.patch 1507 BLAKE2B 9e21e0b14a3b6c95e2c501b5d2649
 AUX scons-3.0.3-respect-cc-etc-r1.patch 3381 BLAKE2B f7003c4fc7b054dbbfe4f185876470cf04461fd1a408f44bbac2967c9e709e7f16293dcdaf2042bda811610ca65e3007dceb0f8764b7ac2ea7675e901159d097 SHA512 054037a917a8cdc57fbca940a23699bb6ba55554b4753774df7d0b5102e0468ebb770910727f96ade949e69a6db94f2ed60e84061bd3967ff2366724980eb129
 AUX scons-3.0.5-jdk-include-path.patch 878 BLAKE2B 7fb21bac419af3a74c6323d02082fedd80221102f87d87781bf2eafac1b877a96e11b992016b97556e24245faee85b67bfd75dcd4f5aab9b9fbdacc4c37788a1 SHA512 9cf4b31387c6630f7a6574913966cfdf355885d6f1e0c5d74951a5e69c187a768931db097e8178db0ec73201b0062a5a9c8c497cec30e9cdd6170c49610c35ff
 AUX scons-3.0.5-jni.h-include-path.patch 875 BLAKE2B ff8e4fc290dd3afc2593fa56d737f3fa1867ae02e7f128fc6316cb2c272db9e90bb345b243a29462dcdfff60f03c75f7e4106713367c988df5f406989b4005f2 SHA512 443297e374f053c0dbc66df50a53556bb3bf68ae372bd8f2150bd4ad21ee1cae22afd24fca62ce528e1d82ca13b8856dc20685711685e89aae144a14315a9ae3
-DIST scons-2.5.1-user.html 1112180 BLAKE2B 93df42b296d1be6ffcb73143c5ec9f46225e3e9d07154cf8f703d5f624d2996d85569ff302093a7a73dc0001cfeddf49ee9e57d9a1939d3c6b4689f8773e3ede SHA512 5be58a6bba4b92fc51f0b271fd7e08b820dda10775aaa40a012c0e54d485e02ebf6d0d0be379bd90980a9b496e86a951c8760a4a90107fb3b8f422e874e46046
-DIST scons-2.5.1-user.pdf 2522755 BLAKE2B 0dbf4ec98cd1dfb4889595762fdf57c2988a6784d75f8c3ac53e79d686b745ae4dd7b674ce34d61255c798e203fb6de93eaaf936a4842b27990350fa73b6bd46 SHA512 0bd7f67a1355ec33125bef87ce1bc352bda5b0befd9809673a427851c843191d74930b4ca9add705152393521f81d926595d173b0101013da216217dc5b64397
-DIST scons-2.5.1.tar.gz 620909 BLAKE2B 021e02583dab06a859e46d164be79dcaa49a1a383c5d3fb9baa64afabb793e049b7ebefff1bbbcc8be1f364ca5c64e1a9c7ef937c32407853e39f4d84a91e51d SHA512 0e39f7f22a6c4ecc13edcd843b050754da5ded5371b3a8b406395f7b53dd280f95f804707eec271f8de3624d06f5b4ba3cc788dc4eb891cad224a163544f51b9
-DIST scons-3.0.4-user.html 1127751 BLAKE2B 5bafa81d075c063cc8c0c4d147fdf7573834e7b0af9099b7b68d7cf3c8872061b7ecc93e7119723eaa9d393e4463744a9e9bd8074ce28d8b518d366a11e4a215 SHA512 f3bc5591b90fb05420b00a110d32921394b867255b3925fab97420b864579702a956237983fb5b0a25d2f6d0268493b0f1819fbcb6f1027cc10ad7b59e2836a3
-DIST scons-3.0.4-user.pdf 2561758 BLAKE2B aefd100912345f399e52d805bc2f01846f0bcdfb31524212e69fb41713c193a233a30dcea9133e35001a145ce62b84c648b6d57856c0d5dfa019974546cb4d82 SHA512 03b9e1e8b60ca07986956f1e5c63d56573222ea303bed1976167239b4e9ad73056776a80c7fe2529987aa90856c35bc1c858d1a445f34e7964b675e700845e71
-DIST scons-3.0.4.gh.tar.gz 5500498 BLAKE2B 2157141d70f0f6d80606a0d53e0b6b99f72ac6d5f8b63e8825c1f484eb5c92979b50e897d2aadc2b201ee6f06a0d1df00ab272b96cc303c34f75124123f40a90 SHA512 d57924f0e7713ec2e5d7159fbf0078947aa5ce49f7cdf7a4ea47c19efbce7ec335a5e5448e200240be1095655c5c25f1466285f0bed5bdadeb2673845b23c4f5
-DIST scons-3.0.4.tar.gz 652334 BLAKE2B 742909dcc598780c7ca7884c2403d9fa0cab44228c6597975157148f460dadf789d3c6aaa36125815ea8fc5ba70538ede56542cbecc656c2918341e2827657b3 SHA512 064a604939460fa85aa247776e5a2083ce98cac5f49f6035886d207f5cf167255756ee10cc00dd8228278d0d1efbed2afd8793bf3ca736a3ac970fabc3c4b627
 DIST scons-3.0.5-user.html 1130793 BLAKE2B 24bf6d5d566fe3c06879b797a77df5eda738246ddf5631ee3f0f49c3c44a53916a8cd5bd075bcffa350e1b5c99f53f81f229d4f74bcc871572a02a0dfafefada SHA512 1b9c965fac6b792e049ad1975e104d40ff6b99fe4bd247aa375955daaebb46e2ed42afb8484dad652df71b695b7db2ee92df34dc0f1d3372d55fad0d27c4b78d
 DIST scons-3.0.5-user.pdf 2562305 BLAKE2B 48c206386f163a2779b27ede1b77783067a695e7f59255473343ddd3a19c4d39ceb7c7e5ccf819f76eda9282f5fb8d36bd0250a4a18f5e9d1a65fd3148276173 SHA512 443855ecddd1bc56f06b150da5d7b276a4dfe5ff8c5376b3c35b73f8281a89583308ddd138e120e33f67afa2cdd1b9a1366a533306ba4dfa460f439e4a2f33b4
 DIST scons-3.0.5.gh.tar.gz 5510846 BLAKE2B 64489a9335a9aa0e2b58a78c6bba613de41d7035f03e8b5b1c1db8aae92e54808f1bd5ad4e97b8481db0f5276c184040663ec31d7307c30a6b092c860c0bb1c0 SHA512 afd4e3d5a76c009f7a3f55934c2d479c611df5713fdaf60aaa9860fc685f95a314bbe54df92fcbca3570dc9a5b244dcf08bf63ce0cef837c3767a37628abae02
@@ -22,10 +15,8 @@ DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34
 DIST scons-3.1.1-user.pdf 2564248 BLAKE2B 702e57a9646779ff1aa077aa7ae7a815d004cda08166f948ef3b893a786c7ccf13e9d1f8621640573802acd0b6a7acaaf68ebea984d5922112a30c4457740bc4 SHA512 0c0f8e93e3bddd9dc0ec661f629f2995ec9375908b3b7bf2b67c9518571cb31754d13fca46fc1182019976e5c0a417832447692ff61f5ee4613b7f56c7891594
 DIST scons-3.1.1.gh.tar.gz 5528538 BLAKE2B cbb13a0ec9c5ade9b965592f012af5a3ab5253a3c30a049da499631ff58fc1201666209316d9fbcc8f0a715b194327f3cebe5a50fde01635fdb0304b8fbbb2f6 SHA512 3347a7ec5c6c7b596c0d51bb4a9654b971734736febe3834df0f40e7839e1f0578dafeae838d5ddd9f3319ac3d17b6790666fa1602c30480eba25122355179a5
 DIST scons-3.1.1.tar.gz 663878 BLAKE2B 095d5f45885ac12937066be247194e70d33e8f5dc0955e7d693c4b0d3a4b61e776bc1d64cd00ebc89d1e85a7992747b8f448255a76c1b6c2d9df8fa173967711 SHA512 2e80b45571679d8acc0554273538f56163488df5aa9007c7c9c3a6deb2698909ab05da8df91502ea287c0cc0ff0a98f226454f67fcfb7a943570f673f4bd8f54
-EBUILD scons-2.5.1.ebuild 1591 BLAKE2B 5a370c069a841b45cb9d7ec214c66312f5b3f9febcb953fd466662c5e70b866a1f48c70adacc7d9a43f11bcb8c07cb7d18a7f3dde80843460812742d982b108a SHA512 a08e399a4b43143f13b13d4731e839039dbc1b53482078b990d67f06c65a481f4eca889616fb5fccbc9fccd6c1703f307af5b8a010466039ec149eca5c7fa309
-EBUILD scons-3.0.4.ebuild 2115 BLAKE2B 87f1ed75b61212eb76233c2f3b91903a9e40c8214d164a0b2c72a86d32c80cfea76681176b333738ba577c4c73edd0d1474e1e10125caa85ddd19c070351b850 SHA512 71fe9496eebdf581b1b4ae793da2a3987ac900dfb50f62bf7e68bb1a3cc1f3539f4d226222e7b541be87fd661a0afb981c6ca65cb6c3e73c9ac34eba6294ec21
 EBUILD scons-3.0.5-r1.ebuild 2934 BLAKE2B da024a78f8779bb9acd0def27c39285145745553902af6df29ee0b88e9d70b164fc129cb548bab7ef0f6bad1b832c037bf26866f0af36941071756626e7a1d8d SHA512 09364d9f64c8003c7b363859f0bd99c1f1d084ba3c2b96ce6d973017f5b9a9e77c07529c66d5aaa29027bf4ae990a3c2451b5df3453923a3df0f05f063c24415
 EBUILD scons-3.0.5.ebuild 2112 BLAKE2B 17dc37551614e235adbf199ea6a7a1400f2fb2e5b6f0597598c898aab63d03ec45ca30d30d2efd163819c6d9f4f7dda7c0a9414752c7711728a47f4ada631c3f SHA512 e47023c29074d2dc3f3cd028be53a5e579274d607aceb6fd1060b5a4d9f595f662b2369d794763077025f2d69832c3fadd3f4bb348bb5fa01b5185ba50459fb0
 EBUILD scons-3.1.0.ebuild 2665 BLAKE2B 75bd542ba1d21f0bbeda322629e3d74b05e79c9862ebf61f138477952b0ffc7b1d43b5d49dce093c637b70417f4dd4644a3c233e4ec76ac9a0e005a1c034e54c SHA512 9773d952644741b475883a202482d54d2716d035bf3f2c440188af6bba6035c3ba5783d07b0ea1c1381d6149423819667922159a9c8acfb490ad5802896bce07
-EBUILD scons-3.1.1.ebuild 2665 BLAKE2B 75bd542ba1d21f0bbeda322629e3d74b05e79c9862ebf61f138477952b0ffc7b1d43b5d49dce093c637b70417f4dd4644a3c233e4ec76ac9a0e005a1c034e54c SHA512 9773d952644741b475883a202482d54d2716d035bf3f2c440188af6bba6035c3ba5783d07b0ea1c1381d6149423819667922159a9c8acfb490ad5802896bce07
+EBUILD scons-3.1.1.ebuild 2658 BLAKE2B c6a1862049b329d9124166eb6bd3f1c521842b4d367010274fa78b0cad6feca7882e8aa77df67685f63d194aa22d5ccc98a028e7a6d5e6a6680800bccae024f9 SHA512 d4613f388316c0f9244990b7863405ffd34af2259e5e63290a40def24ebb7beddd4ba2cc2af6306bfb0329ae0a470688108ecb14ea76e868911aa78f2c840c47
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
deleted file mode 100644
index bb60b4875ce3..000000000000
--- a/dev-util/scons/scons-2.5.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-#PATCHES=(  )
-
-python_prepare_all() {
-	# bug #361061
-	if use prefix ; then
-		eapply "${FILESDIR}"/scons-2.5.1-respect-path.patch
-		eprefixify engine/SCons/Platform/posix.py
-	fi
-	# and make sure the build system doesn't "force" /usr/local/ :(
-	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--standard-lib \
-		--no-version-script \
-		--install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Build system does not use build_scripts properly.
-	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
-	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
diff --git a/dev-util/scons/scons-3.0.4.ebuild b/dev-util/scons/scons-3.0.4.ebuild
deleted file mode 100644
index 78790a3eb13e..000000000000
--- a/dev-util/scons/scons-3.0.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
-	)
-	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-# unresolved & unpredictable test failures
-RESTRICT="test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	# remove half-broken, useless custom commands
-	# and fix manpage install location
-	sed -i -e '/cmdclass/,/},$/d' \
-		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-	rm "${ED%/}/usr/bin/scons.bat" || die
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
index 4da9718eabcf..742084aa3701 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/shellcheck-bin/Manifest b/dev-util/shellcheck-bin/Manifest
index 2286f17c3a11..319645fe7363 100644
--- a/dev-util/shellcheck-bin/Manifest
+++ b/dev-util/shellcheck-bin/Manifest
@@ -3,5 +3,5 @@ DIST shellcheck-v0.6.0.linux.x86_64.tar.xz 1484496 BLAKE2B 2f0d40b53a59dea15ae6b
 DIST shellcheck-v0.7.0.linux.armv6hf.tar.xz 2502980 BLAKE2B 5e8281a9a8bd7105bb852f917cb2fb252b7d5abdda26da8fc8a5d9aca2a3543fcaf88707ae3aae277578a4fcf973d66e1d457c1769ca4838e3131a1928b56437 SHA512 3cb41d339b0da7790b8451b9fb8c6e6d52444ab0f3115871049dbe04968ce88868b305d2be267af627991949f346ee1a8eb95dce4cb0e46c81a24b01d4f18f74
 DIST shellcheck-v0.7.0.linux.x86_64.tar.xz 1545588 BLAKE2B 30f4cfacdf9024a4f4c8233842f40a6027069e81cf5529f2441b22856773abcd716ee92d2303ad3cda5eaeecac3161e5980c0eedeb4ffa077d5c15c7f356512e SHA512 84e06bee3c8b8c25f46906350fb32708f4b661636c04e55bd19cdd1071265112d84906055372149678d37f09a1667019488c62a0561b81fe6a6b45ad4fae4ac0
 EBUILD shellcheck-bin-0.6.0.ebuild 633 BLAKE2B f822a45382a505abcd59572d39a0d6296cec646035b14291a15f13da4e4c0d64eb022992f5fe4dd7adaa4d08af8bcb0a90c55439f09da4680a566a0367695428 SHA512 66e316ed5eea9c11dfdd951bcd5dfa42ba2be60d3d34581fed1fd684beedd381b4f31f463f83412e70340ea2894defe0bf0762e5d62ab115e614567a69150b1c
-EBUILD shellcheck-bin-0.7.0.ebuild 634 BLAKE2B 44203d313988c05afd88316c3811b28ee53f30a8b62434a2e6e5ee5ea815effa72b3f9c7e0067bbc4315dde9dd0c7b48fb2b2fb5d094915c1f32a5f6c6734874 SHA512 437cdaaf0450eadcf69d94be971e576824c83797522c6481f403160bb3f5a2d9b5bd22c5427aff44a34ce72a8da470f345c6e537a850f3a324044d83ce6d8a28
+EBUILD shellcheck-bin-0.7.0.ebuild 633 BLAKE2B f822a45382a505abcd59572d39a0d6296cec646035b14291a15f13da4e4c0d64eb022992f5fe4dd7adaa4d08af8bcb0a90c55439f09da4680a566a0367695428 SHA512 66e316ed5eea9c11dfdd951bcd5dfa42ba2be60d3d34581fed1fd684beedd381b4f31f463f83412e70340ea2894defe0bf0762e5d62ab115e614567a69150b1c
 MISC metadata.xml 469 BLAKE2B 639f0079f57c613dff06b282358be8cdd287fbf2d361b053ebc62ede4efa2f4c17d9b27f420e97cde73f085446ded30d488e6f7efdec2584384688d68781ff34 SHA512 296cd96c77ffd3e87877ca773954954a08723d274ef91e7a292fc95f0b5a8d10f1d981a9c9ba2ed7c239347e3cd8eb47df2984071a58274a452e10abc2a58ad2
diff --git a/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild b/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild
index 8b6f2c39aa76..77b8ddc5654e 100644
--- a/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild
+++ b/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="amd64 ~arm"
 
 DEPEND="!dev-util/shellcheck"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index bf0111f327b7..8dde81df4776 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -7,5 +7,5 @@ EBUILD shellcheck-0.4.6.ebuild 859 BLAKE2B 666e8057d0e035efe735dfb76c6c58f24dc8a
 EBUILD shellcheck-0.4.7.ebuild 861 BLAKE2B 36567203b1e8cf28594109bf34de03f9d8030e5c5829e7bd16921639f55a774b74d46f75e9876e457b09efbf935f6cc947cd89072d7fff83892f85c738973c6d SHA512 adafc1f025ee6f3c2c04626873d5ce06099f2130ab977dcf6b2b38e6610553ad9ee9c30888b3ceff45a59b70192cb13c6a03470932bf56f6bbddc666a5d9643f
 EBUILD shellcheck-0.5.0-r1.ebuild 926 BLAKE2B 87532d0d1a95dafc036ebeccd92c3fee9aa48b37dc6eaf60ddab0b2afa4a046006ee861c7d972c2e8127740161ff596fa06c972f41fce4a47a2a4caec2608a6e SHA512 2b3e2d8f164c29091f28247a0db505e12ee81cef2d3295df17c4431606601fa82c9ed3389592732a284ff68f7bedb2f41b6d1bc19b19cc6d16369df6630e09fa
 EBUILD shellcheck-0.6.0.ebuild 923 BLAKE2B b2064e8e8a7dee1a7a04522f75477e2fb01be248d51757b7c41f2a9ca96c71f79a49861109e5d7901c69707c4ba97780840ae691b47de6f6a33b843ef9e19f95 SHA512 a9cc09599bf55687e9b1e99d3b66a8c9700f46f239ef845db9a2d06a8475eccf603bb51588d9af89d94bca1ab5271c867ec54fc5588d158901d6129494d94ff6
-EBUILD shellcheck-0.7.0.ebuild 930 BLAKE2B f648e205a8948a6cf29db3cafe6943ac456744400cd6d2972f335efecf38eaf351708fd58f8ab60aa88fc816dee53bc32fe8f64d19b8dec55eac4822bf5395ca SHA512 f7e3bdae11ab89167d4911339ce5cca49a7fe2c815cc240fb5d6677f4bc9b6addcefcd2cefbfde0228d84b68a08cb89a1d40bcf5803bc9f95b5b91b9de4b75bb
+EBUILD shellcheck-0.7.0.ebuild 928 BLAKE2B b1ead285dd5cf59c68aaabf76d7ecda67d3d6139bcce2ab27a758e1424770393e2ae2519e87c4e048fa77bd7b74e7f917738cfe3373f5b46a346846ecd760979 SHA512 8ed271669dc7829a7ee6a2357bb96353389523013b80086fcdfbda4d064ce6f00cb90667a14c6321e8fecb13480121e1634a38f904bc1c6b6a6c15ab2ebdeec8
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.7.0.ebuild b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
index cafe13dbaa67..848d0d21e3c9 100644
--- a/dev-util/shellcheck/shellcheck-0.7.0.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 9676f91dc4f4..6950ab2b5a50 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,5 +1,3 @@
-DIST sysdig-0.26.3.tar.gz 902206 BLAKE2B ec25d0441c69b8c4c4fc431d073d2f93e476ece7add98412e54ce4286bcd7e32d4b1ff89f75dd728dc66c7d77da157bed2182bad85557c0dcec09648f86abb3d SHA512 f700d1ddae687a3474a8bf6816d2fef6c69e963a269a90a8362287dee698ac9799da18f01f383368c906d294ceb046160a8b0792292a72a3b08fc614b5b69d32
 DIST sysdig-0.26.4.tar.gz 902181 BLAKE2B a7ac38be2f7a3d7e4f4fdec6a2fbf5305a8224ee27352da70f509139ebefd14616f84c7b8860f50d2546819a94deb1117034bceddd22128fcf25386b835274f2 SHA512 f56f5d0a522b861df4803bfdafcaf8db3fc9c0e751d06c321082757f6828a210cb86bab4550a3b35bf6412f930e44ab0f5cf709a30651c57dd7064a68e273a88
-EBUILD sysdig-0.26.3.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
 EBUILD sysdig-0.26.4.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.26.3.ebuild b/dev-util/sysdig/sysdig-0.26.3.ebuild
deleted file mode 100644
index 2d4c0de2f51f..000000000000
--- a/dev-util/sysdig/sysdig-0.26.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0
-	modules? ( || ( MIT GPL-2 ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-cpp/tbb:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	dev-libs/protobuf:0=
-	net-dns/c-ares:0=
-	net-libs/grpc:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED}"/usr/etc || die
-}
diff --git a/dev-util/webstorm/Manifest b/dev-util/webstorm/Manifest
index e628809df85e..e9885a23f406 100644
--- a/dev-util/webstorm/Manifest
+++ b/dev-util/webstorm/Manifest
@@ -1,3 +1,3 @@
 DIST WebStorm-2017.2.4.tar.gz 257748171 BLAKE2B 2b0951e94f92a0d690bf9261573963dd6250d9b896784b7156dde8b39ec3a59f94da023bcd3183b404e4bfa16d27928d3eecedf54f5b9036e856af5237e8c5ed SHA512 283339f7757093affde698cfb751f7ced18d54159db7696c9fe6b4d37751e94ad1ca9f0c54db9d5ca256da35ee24454a3b48ced21d6db434c23ec94b023a4d09
-EBUILD webstorm-2017.2.4.172.4155.35.ebuild 962 BLAKE2B 4d02ab25da40ac32e7f459000739b4c7790bb8ed668afe4782877316750387634d4a9b26420e7d6ac61caaad164d968e97103b23d4ac77773d204cae8c18db97 SHA512 efa137495db4eeb93f46494bc00f2c5695f31ab58891efc0baa7ad048ce993eb7e3e020c121090cfd23d12ad533ab9216b2bd0b5b9af635a603b918fa9e97c1b
+EBUILD webstorm-2017.2.4.172.4155.35.ebuild 977 BLAKE2B 3a64256b0e9e8e86e622e6d0deefe74c3114aa2eb28e6ff93001989955baaf596f51a18a17020672cd58fb86338b5bd28eab11c58e315a4754e39e95b9e124fa SHA512 6accbba6b2d80ee5ecedd03ad2aed982fdd1bbf531bba3603b20ff427107abaead0c0a886bd68b5b29eab5b183693c8ac2dadc620e9065c14e9644c0284be6aa
 MISC metadata.xml 353 BLAKE2B 00bc5dc6cf44dbf5b4efecf6f8960fed13737d92ecd2813af24d696a88a3d9fe63789584b4afe8ec6cb2068c77066f5c3260af9dc243dd03b2f85b3cd3bb902b SHA512 141b9620fe7a3839c6fdf2dad646948e413c85c3a9b1ae15aa2582db0af57461f741c038127627873d02c62411262cbbdc7dd21705ea304bc3072ae3491bdcac
diff --git a/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild b/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
index 4171a9a4f433..29f6a26054a5 100644
--- a/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
+++ b/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
@@ -16,7 +16,7 @@ SLOT="2017"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RESTRICT="splitdebug" #656858
+RESTRICT="bindist mirror splitdebug" #656858
 
 RDEPEND=">=virtual/jdk-1.7"
 
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 8a98bfdfd196..b7007206c711 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-mailz/Manifest b/dev-vcs/git-mailz/Manifest
index ea231e124318..223e4da4e157 100644
--- a/dev-vcs/git-mailz/Manifest
+++ b/dev-vcs/git-mailz/Manifest
@@ -1,5 +1,3 @@
-DIST git-mailz-0.12.tar.gz 7957 BLAKE2B 9969833c70f7d3f3d5c40a4d1c8a7a8ef0f70f4c598c2370837d2e406e4ed232f115cf812a73dc36c8b822111bb900103a85f3037727ebff5e1b2ba141e66acd SHA512 811f646e5d89fa3e870fbd59e79e350329097f5533b42e7830409f97bfc35248cf1965591df40300bd6ef5a44c71928504dc0b8aba1037126df3b5bd7a427b51
 DIST git-mailz-0.14.tar.gz 8204 BLAKE2B e008216319b2ec39eed132e4c2792afabc75066b390d04f3a9e645aab234391f9d07c0fea3d965a4fe67b39f87536c2f2b3ee0959ecfdfabc7fb2e1a3c10c2de SHA512 fd6c518de135113482f2f3a4e9d89b41b1797c8219e1ed9f424a5c4ae575400e7ccd9f835b40be5d74a5eb4e1bc7d3dfedd2412a317baea7e20494169399b70c
-EBUILD git-mailz-0.12.ebuild 458 BLAKE2B 3319b486b783fb96a98fc49cdf01ee107da9c58839e7713983c5c5ffd925d9c384d603574372b4545e7674a35bf0555395ebe9a3e7f224bdbbedd3375a5e93b1 SHA512 a113564a83df0d2369458354015501b10b19d51c305621a1a9a37ad95526a8a3812f2b3936b6dd117ccea504174d212b2acc93712920a05b6d115a6ffc49b9c3
 EBUILD git-mailz-0.14.ebuild 458 BLAKE2B 3319b486b783fb96a98fc49cdf01ee107da9c58839e7713983c5c5ffd925d9c384d603574372b4545e7674a35bf0555395ebe9a3e7f224bdbbedd3375a5e93b1 SHA512 a113564a83df0d2369458354015501b10b19d51c305621a1a9a37ad95526a8a3812f2b3936b6dd117ccea504174d212b2acc93712920a05b6d115a6ffc49b9c3
 MISC metadata.xml 255 BLAKE2B f8c0e4254a2e06ac72445e5f911320f562b42f04def6bfcda25a04a5041332523032da6ea62d298b95142b92f67c3b4089916bff4e7276403d17485ed0b58c19 SHA512 d3ab8986894d0c5b99042ede02c5ac9101f976400a70a30b1735734825f856b34eb1060c6e23b16029db478a871e12b46550d0b4f4de6aa55e1fe8e096078a2f
diff --git a/dev-vcs/git-mailz/git-mailz-0.12.ebuild b/dev-vcs/git-mailz/git-mailz-0.12.ebuild
deleted file mode 100644
index fa497e490bf4..000000000000
--- a/dev-vcs/git-mailz/git-mailz-0.12.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Send a collection of patches as emails"
-HOMEPAGE="https://github.com/roman-neuhauser/git-mailz/"
-
-SRC_URI="http://codex.sigpipe.cz/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-
-RDEPEND="
-	virtual/mta
-	dev-vcs/git
-	app-shells/zsh
-"
-
-src_install(){
-	emake PREFIX="${ED}/usr" install
-}
diff --git a/dev-vcs/git-merge-changelog/Manifest b/dev-vcs/git-merge-changelog/Manifest
index 5a3be7c17d76..05ec608622ec 100644
--- a/dev-vcs/git-merge-changelog/Manifest
+++ b/dev-vcs/git-merge-changelog/Manifest
@@ -1,5 +1,3 @@
-DIST git-merge-changelog-20140223.tar.xz 298332 BLAKE2B 25a16f5b5b29c6a7eee0a53e37628968d528338870e270a1ad34ba4fbf358ef5ed3347f40c720b8d38c05042940ec48f0ee84877e75e67fdb480e44eba23c6df SHA512 ea5fcb0a0839e37976e333dc773d0bca43a1fce4821af08c5baba8e5783e129f8b4de4efd4b1b3399a7c1d3796e4094916843ac2d360d81396d67f571e020638
 DIST git-merge-changelog-20170131.tar.xz 315000 BLAKE2B a2a9e35d5973b43ebe1ae481cb59b0a8a43d517f82d5eb69f33c0a10ee1c32c1df3b25c93629dccc15f8d5bf28d9849dba1986f8443d6c4c0079314335d7de42 SHA512 4d7a5d9edf7bf52fcdd0934e842297364fc0ae0972b309d7221059856e0c87abd437edc1451a61ee4a6924f77d95c1c743b3a6a31b3bc039e2278fc38039c786
-EBUILD git-merge-changelog-20140223.ebuild 701 BLAKE2B 0974e0d2976be6a11b6494a4ea71be164d58d9be2591057fb6c6f0fbcce34eb86ddc257c73ee0ba5186553794365e66b96adc8fbf9733b67e2cb8a52ff527ce1 SHA512 ed81173c742da63942656f0edfa6c7c46186010ff6b18ecdf7f88f06aad345733c3f50414724222bfe79a729bc61899b87040e6c0b7138acb56680ab85c2420d
 EBUILD git-merge-changelog-20170131.ebuild 740 BLAKE2B 29c220fe2603b60685ec97ac7d36b3458af19e9a641d9797683fcb7c39ee021c6db7df5f52041a6fe8ddbd12e0dc4284f8b9eb4d2283e4639d53f8e2ab44562e SHA512 90c0de7803eaccf2fc1a394d3232d967dbf9a179114d9fb4dfc1383b8f7e1b42230743982137cfd3ccf1c9387e5297e891307eefb82350fe35b855d11177e8ca
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild b/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild
deleted file mode 100644
index 8567ded85f7b..000000000000
--- a/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# snapshot extracted from git://git.savannah.gnu.org/gnulib.git using
-# ./gnulib-tool --create-testdir --without-tests --dir=${PN} ${PN};
-# cd ${PN}; ./configure; make maintainer-clean
-
-EAPI=5
-
-DESCRIPTION="Git merge driver for GNU style ChangeLog files"
-HOMEPAGE="https://www.gnu.org/software/gnulib/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -n "/README/{h;:x;n;/^#/!{H;bx};g;s/\n*$//;s:/usr/local:${EPREFIX}/usr:g;p;q}" \
-		gllib/git-merge-changelog.c >README || die
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 2535aa437de7..dee498cf1821 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
index 0ce7545cd1c5..c2e643332ccc 100644
--- a/eclass/acct-user.eclass
+++ b/eclass/acct-user.eclass
@@ -108,7 +108,8 @@ readonly ACCT_USER_NAME
 # @REQUIRED
 # @DESCRIPTION:
 # List of groups the user should belong to.  This must be a bash
-# array.
+# array.  The first group specified is the user's primary group, while
+# the remaining groups (if any) become supplementary groups.
 
 
 # << Boilerplate ebuild variables >>
diff --git a/eclass/ada.eclass b/eclass/ada.eclass
new file mode 100644
index 000000000000..338b73bab86b
--- /dev/null
+++ b/eclass/ada.eclass
@@ -0,0 +1,435 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: ada.eclass
+# @MAINTAINER:
+# Ada team <ada@gentoo.org>
+# @AUTHOR:
+# Tupone Alfredo <tupone@gentoo.org>
+# @BLURB: An eclass for Ada packages
+# @DESCRIPTION:
+# This eclass set the IUSE and REQUIRED_USE to request the ADA_TARGET
+# when the inheriting ebuild can be supported by more than one Ada
+# implementation. It also set ADA_USEDEP and ADA_DEPS with a suitable form.
+# A common eclass providing helper functions to build and install
+# packages supporting Ada implementations.
+#
+# This eclass sets correct IUSE. Modification of REQUIRED_USE has to
+# be done by the author of the ebuild (but ADA_REQUIRED_USE is
+# provided for convenience, see below). ada exports ADA_DEPS
+# and ADA_USEDEP so you can create correct dependencies for your
+# package easily.
+#
+# Mostly copied from python-single-r1.eclass
+
+case "${EAPI:-0}" in
+	0|1|2|3|4)
+		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
+		;;
+	5|6|7)
+		# EAPI=5 is required for sane USE_EXPAND dependencies
+		;;
+	*)
+		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+		;;
+esac
+
+EXPORT_FUNCTIONS pkg_setup
+
+# @ECLASS-VARIABLE: ADA_DEPS
+# @DESCRIPTION:
+# This is an eclass-generated Ada dependency string for all
+# implementations listed in ADA_COMPAT.
+#
+# The dependency string is conditional on ADA_TARGET.
+#
+# Example use:
+# @CODE
+# RDEPEND="${ADA_DEPS}
+#   dev-foo/mydep"
+# DEPEND="${RDEPEND}"
+# @CODE
+#
+
+# @ECLASS-VARIABLE: _ADA_ALL_IMPLS
+# @INTERNAL
+# @DESCRIPTION:
+# All supported Ada implementations, most preferred last.
+_ADA_ALL_IMPLS=(
+	gnat_2016 gnat_2017 gnat_2018 gnat_2019
+)
+readonly _ADA_ALL_IMPLS
+
+
+# @FUNCTION: _ada_impl_supported
+# @USAGE: <impl>
+# @INTERNAL
+# @DESCRIPTION:
+# Check whether the implementation <impl> (ADA_COMPAT-form)
+# is still supported.
+#
+# Returns 0 if the implementation is valid and supported. If it is
+# unsupported, returns 1 -- and the caller should ignore the entry.
+# If it is invalid, dies with an appopriate error messages.
+_ada_impl_supported() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	[[ ${#} -eq 1 ]] || die "${FUNCNAME}: takes exactly 1 argument (impl)."
+
+	local impl=${1}
+
+	# keep in sync with _ADA_ALL_IMPLS!
+	# (not using that list because inline patterns shall be faster)
+	case "${impl}" in
+		gnat_201[6789])
+			return 0
+			;;
+		*)
+			[[ ${ADA_COMPAT_NO_STRICT} ]] && return 1
+			die "Invalid implementation in ADA_COMPAT: ${impl}"
+	esac
+}
+
+# @FUNCTION: _ada_set_impls
+# @INTERNAL
+# @DESCRIPTION:
+# Check ADA_COMPAT for well-formedness and validity, then set
+# two global variables:
+#
+# - _ADA_SUPPORTED_IMPLS containing valid implementations supported
+#   by the ebuild (ADA_COMPAT - dead implementations),
+#
+# - and _ADA_UNSUPPORTED_IMPLS containing valid implementations that
+#   are not supported by the ebuild.
+#
+# Implementations in both variables are ordered using the pre-defined
+# eclass implementation ordering.
+#
+# This function must be called once in global scope by an eclass
+# utilizing ADA_COMPAT.
+_ada_set_impls() {
+	local i
+
+	if ! declare -p ADA_COMPAT &>/dev/null; then
+		die 'ADA_COMPAT not declared.'
+	fi
+	if [[ $(declare -p ADA_COMPAT) != "declare -a"* ]]; then
+		die 'ADA_COMPAT must be an array.'
+	fi
+	for i in "${ADA_COMPAT[@]}"; do
+		# trigger validity checks
+		_ada_impl_supported "${i}"
+	done
+
+	local supp=() unsupp=()
+
+	for i in "${_ADA_ALL_IMPLS[@]}"; do
+		if has "${i}" "${ADA_COMPAT[@]}"; then
+			supp+=( "${i}" )
+		else
+			unsupp+=( "${i}" )
+		fi
+	done
+	if [[ ! ${supp[@]} ]]; then
+		die "No supported implementation in ADA_COMPAT."
+	fi
+
+	if [[ ${_ADA_SUPPORTED_IMPLS[@]} ]]; then
+		# set once already, verify integrity
+		if [[ ${_ADA_SUPPORTED_IMPLS[@]} != ${supp[@]} ]]; then
+			eerror "Supported impls (ADA_COMPAT) changed between inherits!"
+			eerror "Before: ${_ADA_SUPPORTED_IMPLS[*]}"
+			eerror "Now   : ${supp[*]}"
+			die "_ADA_SUPPORTED_IMPLS integrity check failed"
+		fi
+		if [[ ${_ADA_UNSUPPORTED_IMPLS[@]} != ${unsupp[@]} ]]; then
+			eerror "Unsupported impls changed between inherits!"
+			eerror "Before: ${_ADA_UNSUPPORTED_IMPLS[*]}"
+			eerror "Now   : ${unsupp[*]}"
+			die "_ADA_UNSUPPORTED_IMPLS integrity check failed"
+		fi
+	else
+		_ADA_SUPPORTED_IMPLS=( "${supp[@]}" )
+		_ADA_UNSUPPORTED_IMPLS=( "${unsupp[@]}" )
+		readonly _ADA_SUPPORTED_IMPLS _ADA_UNSUPPORTED_IMPLS
+	fi
+}
+
+# @FUNCTION: ada_export
+# @USAGE: [<impl>] <variables>...
+# @DESCRIPTION:
+# Set and export the Ada implementation-relevant variables passed
+# as parameters.
+#
+# The optional first parameter may specify the requested Ada
+# implementation (either as ADA_TARGETS value, e.g. ada2_7,
+# or an EADA one, e.g. ada2.7). If no implementation passed,
+# the current one will be obtained from ${EADA}.
+#
+# The variables which can be exported are: GCC, EADA, GNATMAKE.
+# They are described more completely in the eclass
+# variable documentation.
+ada_export() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local impl var
+
+	case "${1}" in
+		gnat_201[6789])
+			impl=${1}
+			shift
+			;;
+		*)
+			impl=${EADA}
+			if [[ -z ${impl} ]]; then
+				die "ada_export called without a ada implementation and EADA is unset"
+			fi
+			;;
+	esac
+	debug-print "${FUNCNAME}: implementation: ${impl}"
+
+	local gcc_pv
+	case "${impl}" in
+		gnat_2016)
+			gcc_pv=4.9.4
+			;;
+		gnat_2017)
+			gcc_pv=6.3.0
+			;;
+		gnat_2018)
+			gcc_pv=7.3.1
+			;;
+		gnat_2019)
+			gcc_pv=8.3.1
+			;;
+		*)
+			gcc_pv="9.9.9"
+			;;
+	esac
+
+	for var; do
+		case "${var}" in
+			EADA)
+				export EADA=${impl}
+				debug-print "${FUNCNAME}: EADA = ${EADA}"
+				;;
+			GCC)
+				export GCC=${EPREFIX}/usr/bin/gcc-${gcc_pv}
+				debug-print "${FUNCNAME}: GCC = ${GCC}"
+				;;
+			GCC_PV)
+				export GCC_PV=${gcc_pv}
+				debug-print "${FUNCNAME}: GCC_PV = ${GCC_PV}"
+				;;
+			GNATBIND)
+				export GNATBIND=${EPREFIX}/usr/bin/gnatbind-${gcc_pv}
+				debug-print "${FUNCNAME}: GNATBIND = ${GNATBIND}"
+				;;
+			GNATMAKE)
+				export GNATMAKE=${EPREFIX}/usr/bin/gnatmake-${gcc_pv}
+				debug-print "${FUNCNAME}: GNATMAKE = ${GNATMAKE}"
+				;;
+			GNATLS)
+				export GNATLS=${EPREFIX}/usr/bin/gnatls-${gcc_pv}
+				debug-print "${FUNCNAME}: GNATLS = ${GNATLS}"
+				;;
+			ADA_PKG_DEP)
+				ADA_PKG_DEP="dev-lang/gnat-gpl:${gcc_pv}"
+
+				# use-dep
+				if [[ ${ADA_REQ_USE} ]]; then
+					ADA_PKG_DEP+=[${ADA_REQ_USE}]
+				fi
+
+				export ADA_PKG_DEP
+				debug-print "${FUNCNAME}: ADA_PKG_DEP = ${ADA_PKG_DEP}"
+				;;
+			*)
+				die "ada_export: unknown variable ${var}"
+		esac
+	done
+}
+
+_ada_single_set_globals() {
+	_ada_set_impls
+	local i ADA_PKG_DEP
+
+	local flags=( "${_ADA_SUPPORTED_IMPLS[@]/#/ada_target_}" )
+	local unflags=( "${_ADA_UNSUPPORTED_IMPLS[@]/#/-ada_target_}" )
+	local allflags=( ${flags[@]} ${unflags[@]} )
+
+	local optflags=${flags[@]/%/(-)?}
+
+	IUSE="${allflags[*]}"
+
+	if [[ ${#_ADA_UNSUPPORTED_IMPLS[@]} -gt 0 ]]; then
+		optflags+=,${unflags[@]/%/(-)}
+	fi
+
+	local deps requse usedep
+	if [[ ${#_ADA_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
+		# There is only one supported implementation; set IUSE and other
+		# variables without ADA_SINGLE_TARGET.
+		requse=${flags[*]}
+		ada_export "${_ADA_SUPPORTED_IMPLS[0]}" ADA_PKG_DEP
+		deps="${flags[*]}? ( ${ADA_PKG_DEP} ) "
+	else
+		# Multiple supported implementations; honor ADA_TARGET.
+		requse="^^ ( ${flags[*]} )"
+
+		for i in "${_ADA_SUPPORTED_IMPLS[@]}"; do
+			ada_export "${i}" ADA_PKG_DEP
+			deps+="ada_target_${i}? ( ${ADA_PKG_DEP} ) "
+		done
+	fi
+	usedep=${optflags// /,}
+	if [[ ${ADA_DEPS+1} ]]; then
+		if [[ ${ADA_DEPS} != "${deps}" ]]; then
+			eerror "ADA_DEPS have changed between inherits (ADA_REQ_USE?)!"
+			eerror "Before: ${ADA_DEPS}"
+			eerror "Now   : ${deps}"
+			die "ADA_DEPS integrity check failed"
+		fi
+
+		# these two are formality -- they depend on ADA_COMPAT only
+		if [[ ${ADA_REQUIRED_USE} != ${requse} ]]; then
+			eerror "ADA_REQUIRED_USE have changed between inherits!"
+			eerror "Before: ${ADA_REQUIRED_USE}"
+			eerror "Now   : ${requse}"
+			die "ADA_REQUIRED_USE integrity check failed"
+		fi
+
+		if [[ ${ADA_USEDEP} != "${usedep}" ]]; then
+			eerror "ADA_USEDEP have changed between inherits!"
+			eerror "Before: ${ADA_USEDEP}"
+			eerror "Now   : ${usedep}"
+			die "ADA_USEDEP integrity check failed"
+		fi
+	else
+		ADA_DEPS=${deps}
+		ADA_REQUIRED_USE=${requse}
+		ADA_USEDEP=${usedep}
+		readonly ADA_DEPS ADA_REQUIRED_USE ADA_USEDEP
+	fi
+}
+_ada_single_set_globals
+unset -f _ada_single_set_globals
+
+# @FUNCTION: ada_wrapper_setup
+# @USAGE: [<path> [<impl>]]
+# @DESCRIPTION:
+# Create proper 'ada' executable wrappers
+# in the directory named by <path>. Set up PATH
+# appropriately. <path> defaults to ${T}/${EADA}.
+#
+# The wrappers will be created for implementation named by <impl>,
+# or for one named by ${EADA} if no <impl> passed.
+#
+# If the named directory contains a ada symlink already, it will
+# be assumed to contain proper wrappers already and only environment
+# setup will be done. If wrapper update is requested, the directory
+# shall be removed first.
+ada_wrapper_setup() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local workdir=${1:-${T}/${EADA}}
+	local impl=${2:-${EADA}}
+
+	[[ ${workdir} ]] || die "${FUNCNAME}: no workdir specified."
+	[[ ${impl} ]] || die "${FUNCNAME}: no impl nor EADA specified."
+
+	if [[ ! -x ${workdir}/bin/gnatmake ]]; then
+		mkdir -p "${workdir}"/bin || die
+
+		local GCC GNATMAKE GNATLS GNATBIND
+		ada_export "${impl}" GCC GNATMAKE GNATLS GNATBIND
+
+		# Ada compiler
+		cat > "${workdir}/bin/gcc" <<-_EOF_ || die
+			#!/bin/sh
+			exec "${GCC}" "\${@}"
+		_EOF_
+		chmod a+x "${workdir}/bin/gcc"
+		cat > "${workdir}/bin/gnatmake" <<-_EOF_ || die
+			#!/bin/sh
+			exec "${GNATMAKE}" "\${@}"
+		_EOF_
+		chmod a+x "${workdir}/bin/gnatmake"
+		cat > "${workdir}/bin/gnatls" <<-_EOF_ || die
+			#!/bin/sh
+			exec "${GNATLS}" "\${@}"
+		_EOF_
+		chmod a+x "${workdir}/bin/gnatls"
+		cat > "${workdir}/bin/gnatbind" <<-_EOF_ || die
+			#!/bin/sh
+			exec "${GNATBIND}" "\${@}"
+		_EOF_
+		chmod a+x "${workdir}/bin/gnatbind"
+	fi
+
+	# Now, set the environment.
+	# But note that ${workdir} may be shared with something else,
+	# and thus already on top of PATH.
+	if [[ ${PATH##:*} != ${workdir}/bin ]]; then
+		PATH=${workdir}/bin${PATH:+:${PATH}}
+	fi
+	export PATH
+}
+
+# @FUNCTION: ada_setup
+# @DESCRIPTION:
+# Determine what the selected Ada implementation is and set
+# the Ada build environment up for it.
+ada_setup() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	unset EADA
+
+	if [[ ${#_ADA_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
+		if use "ada_targets_${_ADA_SUPPORTED_IMPLS[0]}"; then
+			# Only one supported implementation, enable it explicitly
+			ada_export "${_ADA_SUPPORTED_IMPLS[0]}" EADA GCC GCC_PV GNATMAKE
+			ada_wrapper_setup
+		fi
+	else
+		local impl
+		for impl in "${_ADA_SUPPORTED_IMPLS[@]}"; do
+			if use "ada_target_${impl}"; then
+				if [[ ${EADA} ]]; then
+					eerror "Your ADA_TARGET setting lists more than a single Ada"
+					eerror "implementation. Please set it to just one value. If you need"
+					eerror "to override the value for a single package, please use package.env"
+					eerror "or an equivalent solution (man 5 portage)."
+					echo
+					die "More than one implementation in ADA_TARGET."
+				fi
+
+				ada_export "${impl}" EADA GCC GCC_PV GNATMAKE
+				ada_wrapper_setup
+			fi
+		done
+	fi
+
+	if [[ ! ${EADA} ]]; then
+		eerror "No Ada implementation selected for the build. Please set"
+		if [[ ${#_ADA_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
+			eerror "the ADA_TARGETS variable in your make.conf to include one"
+		else
+			eerror "the ADA_SINGLE_TARGET variable in your make.conf to one"
+		fi
+		eerror "of the following values:"
+		eerror
+		eerror "${_ADA_SUPPORTED_IMPLS[@]}"
+		echo
+		die "No supported Ada implementation in ADA_SINGLE_TARGET/ADA_TARGETS."
+	fi
+}
+
+# @FUNCTION: ada_pkg_setup
+# @DESCRIPTION:
+# Runs ada_setup.
+ada_pkg_setup() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	[[ ${MERGE_TYPE} != binary ]] && ada_setup
+}
diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
index 10bd6bc7e5ad..598a0f87fe6d 100644
--- a/eclass/bzr.eclass
+++ b/eclass/bzr.eclass
@@ -140,6 +140,17 @@ EXPORT_FUNCTIONS src_unpack
 # by users.
 : ${EBZR_OFFLINE=${EVCS_OFFLINE}}
 
+# @ECLASS-VARIABLE: EVCS_UMASK
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Set this variable to a custom umask.  This is intended to be set by
+# users.  By setting this to something like 002, it can make life easier
+# for people who do development as non-root (but are in the portage
+# group), and then switch over to building with FEATURES=userpriv.
+# Or vice-versa.  Shouldn't be a security issue here as anyone who has
+# portage group write access already can screw the system over in more
+# creative ways.
+
 # @ECLASS-VARIABLE: EBZR_WORKDIR_CHECKOUT
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -197,7 +208,7 @@ bzr_update() {
 # working copy.
 bzr_fetch() {
 	local repo_dir branch_dir
-	local save_sandbox_write=${SANDBOX_WRITE}
+	local save_sandbox_write=${SANDBOX_WRITE} save_umask
 
 	[[ -n ${EBZR_REPO_URI} ]] || die "${EBZR}: EBZR_REPO_URI is empty"
 
@@ -214,6 +225,10 @@ bzr_fetch() {
 	repo_dir=${EBZR_STORE_DIR}/${EBZR_PROJECT}
 	branch_dir=${repo_dir}${EBZR_BRANCH:+/${EBZR_BRANCH}}
 
+	if [[ -n ${EVCS_UMASK} ]]; then
+		save_umask=$(umask)
+		umask "${EVCS_UMASK}" || die
+	fi
 	addwrite "${EBZR_STORE_DIR}"
 
 	if [[ ! -d ${branch_dir}/.bzr ]]; then
@@ -240,8 +255,11 @@ bzr_fetch() {
 		bzr_update "${EBZR_REPO_URI}" "${branch_dir}"
 	fi
 
-	# Restore sandbox environment
+	# Restore sandbox environment and umask
 	SANDBOX_WRITE=${save_sandbox_write}
+	if [[ -n ${save_umask} ]]; then
+		umask "${save_umask}" || die
+	fi
 
 	cd "${branch_dir}" || die "${EBZR}: can't chdir to ${branch_dir}"
 
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index c885345a7a83..bcd80a9ee9ca 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -38,7 +38,8 @@
 # @DESCRIPTION:
 # Space separated list of patches to apply after unpacking the sources.
 # Patch files are searched for in the current working dir, WORKDIR, and
-# FILESDIR.
+# FILESDIR.  This variable is semi-deprecated, preferably use the
+# PATCHES array instead if the EAPI supports it.
 
 # @ECLASS-VARIABLE: ELISP_REMOVE
 # @DEFAULT_UNSET
@@ -59,12 +60,6 @@
 # Space separated list of Texinfo sources.  Respective GNU Info files
 # will be generated in src_compile() and installed in src_install().
 
-# @ECLASS-VARIABLE: DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# DOCS="blah.txt ChangeLog" is automatically used to install the given
-# files by dodoc in src_install().
-
 inherit elisp-common
 case ${EAPI:-0} in
 	4|5) inherit epatch ;;
@@ -101,7 +96,7 @@ elisp_pkg_setup() {
 # WORKDIR for packages distributed that way.
 
 elisp_src_unpack() {
-	[[ -n ${A} ]] && unpack ${A}
+	default
 	if [[ -f ${P}.el ]]; then
 		# the "simple elisp" case with a single *.el file in WORKDIR
 		mv ${P}.el ${PN}.el || die
@@ -132,10 +127,10 @@ elisp_src_prepare() {
 		esac
 	done
 
-	# apply any user patches
+	# apply PATCHES (if supported in EAPI), and any user patches
 	case ${EAPI} in
 		4|5) epatch_user ;;
-		*) eapply_user ;;
+		*) default ;;
 	esac
 
 	if [[ -n ${ELISP_REMOVE} ]]; then
@@ -177,11 +172,13 @@ elisp_src_install() {
 	if [[ -n ${ELISP_TEXINFO} ]]; then
 		set -- ${ELISP_TEXINFO}
 		set -- ${@##*/}
-		doinfo ${@/%.*/.info*} || die
-	fi
-	if [[ -n ${DOCS} ]]; then
-		dodoc ${DOCS} || die
+		doinfo ${@/%.*/.info*}
 	fi
+	# install documentation only when explicitly requested
+	case ${EAPI} in
+		4|5) [[ -n ${DOCS} ]] && dodoc ${DOCS} ;;
+		*) declare -p DOCS &>/dev/null && einstalldocs ;;
+	esac
 	if declare -f readme.gentoo_create_doc >/dev/null; then
 		readme.gentoo_create_doc
 	fi
diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
index 2789e6046b9f..78104b55fb6e 100644
--- a/eclass/mozcoreconf-v6.eclass
+++ b/eclass/mozcoreconf-v6.eclass
@@ -208,14 +208,16 @@ mozconfig_init() {
 	# Additional ARCH support
 	case "${ARCH}" in
 	arm)
-		# Reduce the memory requirements for linking
-		if use clang ; then
-			# Nothing to do
-			:;
-		elif tc-ld-is-gold || use lto; then
-			append-ldflags -Wl,--no-keep-memory
-		else
-			append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+		if [[ ${PN} != seamonkey ]] ; then
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
 		fi
 		;;
 	alpha)
@@ -230,14 +232,16 @@ mozconfig_init() {
 		;;
 	ppc64)
 		append-flags -fPIC
-		# Reduce the memory requirements for linking
-		if use clang ; then
-			# Nothing to do
-			:;
-		elif tc-ld-is-gold || use lto; then
-			append-ldflags -Wl,--no-keep-memory
-		else
-			append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+		if [[ ${PN} != seamonkey ]] ; then
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold || use lto; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
 		fi
 		;;
 	esac
diff --git a/eclass/perl-app.eclass b/eclass/perl-app.eclass
index 6b762dd83b3d..074902294e59 100644
--- a/eclass/perl-app.eclass
+++ b/eclass/perl-app.eclass
@@ -21,7 +21,6 @@ case "${EAPI:-0}" in
 esac
 
 # @FUNCTION: perl-app_src_prep
-# @USAGE: perl-app_src_prep
 # @DESCRIPTION:
 # This is a wrapper function to perl-app_src_configure().
 perl-app_src_prep() {
@@ -29,7 +28,6 @@ perl-app_src_prep() {
 }
 
 # @FUNCTION: perl-app_src_configure
-# @USAGE: perl-app_src_configure
 # @DESCRIPTION:
 # This is a wrapper function to perl-module_src_configure().
 perl-app_src_configure() {
@@ -37,7 +35,6 @@ perl-app_src_configure() {
 }
 
 # @FUNCTION: perl-app_src_compile
-# @USAGE: perl-app_src_compile
 # @DESCRIPTION:
 # This is a wrapper function to perl-module_src_compile().
 perl-app_src_compile() {
diff --git a/eclass/prefix.eclass b/eclass/prefix.eclass
index 8ae3e3a531d5..435e99fdf922 100644
--- a/eclass/prefix.eclass
+++ b/eclass/prefix.eclass
@@ -111,7 +111,7 @@ hprefixify() {
 }
 
 # @FUNCTION: prefixify_ro
-# @USAGE: prefixify_ro <file>.
+# @USAGE: <file>
 # @DESCRIPTION:
 # prefixify a read-only file.
 # copies the files to ${T}, prefixies it, echos the new file.
diff --git a/eclass/s6.eclass b/eclass/s6.eclass
index 32521515497d..245df1e11187 100644
--- a/eclass/s6.eclass
+++ b/eclass/s6.eclass
@@ -48,7 +48,7 @@ s6_get_servicedir() {
 }
 
 # @FUNCTION: s6_install_service
-# @USAGE: servicename run finish
+# @USAGE: <servicename> <run> [finish]
 # @DESCRIPTION:
 # Install an s6 service.
 # servicename is the name of the service.
@@ -75,7 +75,7 @@ s6_install_service() {
 }
 
 # @FUNCTION: s6_service_down
-# @USAGE: servicename
+# @USAGE: <servicename>
 # @DESCRIPTION:
 # Install the "down" flag so this service will not be started by
 # default.
@@ -97,7 +97,7 @@ s6_service_down() {
 }
 
 # @FUNCTION: s6_service_nosetsid
-# @USAGE: servicename
+# @USAGE: <servicename>
 # @DESCRIPTION:
 # Install the "nosetsid" flag so this service will not be made a session
 # leader.
diff --git a/eclass/sgml-catalog-r1.eclass b/eclass/sgml-catalog-r1.eclass
new file mode 100644
index 000000000000..6dc870af629a
--- /dev/null
+++ b/eclass/sgml-catalog-r1.eclass
@@ -0,0 +1,73 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: sgml-catalog-r1.eclass
+# @MAINTAINER:
+# Michał Górny <mgorny@gentoo.org>
+# @AUTHOR:
+# Michał Górny <mgorny@gentoo.org>
+# @BLURB: Functions for installing SGML catalogs
+# @DESCRIPTION:
+# This eclass regenerates /etc/sgml/catalog, /etc/sgml.{,c}env
+# and /etc/env.d/93sgmltools-lite as necessary for the DocBook tooling.
+# This is done via exported pkg_postinst and pkg_postrm phases.
+
+case ${EAPI:-0} in
+	7) ;;
+	*) die "Unsupported EAPI=${EAPI} for ${ECLASS}";;
+esac
+
+EXPORT_FUNCTIONS pkg_postinst pkg_postrm
+
+if [[ ! ${_SGML_CATALOG_R1} ]]; then
+
+RDEPEND=">=app-text/sgml-common-0.6.3-r7"
+
+# @FUNCTION: sgml-catalog-r1_update_catalog
+# @DESCRIPTION:
+# Regenerate /etc/sgml/catalog to include all installed catalogs.
+sgml-catalog-r1_update_catalog() {
+	local shopt_save=$(shopt -p nullglob)
+	shopt -s nullglob
+	local cats=( "${EROOT}"/etc/sgml/*.cat )
+	${shopt_save}
+
+	if [[ ${#cats[@]} -gt 0 ]]; then
+		ebegin "Updating ${EROOT}/etc/sgml/catalog"
+		printf 'CATALOG "%s"\n' "${cats[@]}" > "${T}"/catalog &&
+		mv "${T}"/catalog "${EROOT}"/etc/sgml/catalog
+		eend "${?}"
+	else
+		ebegin "Removing ${EROOT}/etc/sgml/catalog"
+		rm "${EROOT}"/etc/sgml/catalog &&
+		{ rmdir "${EROOT}"/etc/sgml &>/dev/null || :; }
+		eend "${?}"
+	fi
+}
+
+# @FUNCTION: sgml-catalog-r1_update_env
+# @DESCRIPTION:
+# Regenerate environment variables and copy them to env.d.
+sgml-catalog-r1_update_env() {
+	# gensgmlenv doesn't support overriding root
+	if [[ -z ${ROOT} && -x "${EPREFIX}/usr/bin/gensgmlenv" ]]; then
+		ebegin "Regenerating SGML environment variables"
+		gensgmlenv &&
+		grep -v export "${EPREFIX}/etc/sgml/sgml.env" > "${T}"/93sgmltools-lite &&
+		mv "${T}"/93sgmltools-lite "${EPREFIX}/etc/env.d/93sgmltools-lite"
+		eend "${?}"
+	fi
+}
+
+sgml-catalog-r1_pkg_postinst() {
+	sgml-catalog-r1_update_catalog
+	sgml-catalog-r1_update_env
+}
+
+sgml-catalog-r1_pkg_postrm() {
+	sgml-catalog-r1_update_catalog
+	sgml-catalog-r1_update_env
+}
+
+_SGML_CATALOG_R1=1
+fi
diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass
index 68478ffbcd69..360c5e3b816f 100644
--- a/eclass/tmpfiles.eclass
+++ b/eclass/tmpfiles.eclass
@@ -63,7 +63,7 @@ esac
 RDEPEND="virtual/tmpfiles"
 
 # @FUNCTION: dotmpfiles
-# @USAGE: dotmpfiles <tmpfiles.d_file> ...
+# @USAGE: <tmpfiles.d_file> ...
 # @DESCRIPTION:
 # Install one or more tmpfiles.d files into /usr/lib/tmpfiles.d.
 dotmpfiles() {
@@ -84,7 +84,7 @@ dotmpfiles() {
 }
 
 # @FUNCTION: newtmpfiles
-# @USAGE: newtmpfiles <old-name> <new-name>.conf
+# @USAGE: <old-name> <new-name>.conf
 # @DESCRIPTION:
 # Install a tmpfiles.d file in /usr/lib/tmpfiles.d under a new name.
 newtmpfiles() {
@@ -102,7 +102,7 @@ newtmpfiles() {
 }
 
 # @FUNCTION: tmpfiles_process
-# @USAGE: tmpfiles_process <filename> <filename> ...
+# @USAGE: <filename> <filename> ...
 # @DESCRIPTION:
 # Call a tmpfiles.d implementation to create new volatile and temporary
 # files and directories.
diff --git a/eclass/udev.eclass b/eclass/udev.eclass
index baf60584938f..2873ae9a92c3 100644
--- a/eclass/udev.eclass
+++ b/eclass/udev.eclass
@@ -80,7 +80,7 @@ get_udevdir() {
 }
 
 # @FUNCTION: udev_dorules
-# @USAGE: rules [...]
+# @USAGE: <rule> [...]
 # @DESCRIPTION:
 # Install udev rule(s). Uses doins, thus it is fatal in EAPI 4
 # and non-fatal in earlier EAPIs.
@@ -95,7 +95,7 @@ udev_dorules() {
 }
 
 # @FUNCTION: udev_newrules
-# @USAGE: oldname newname
+# @USAGE: <oldname> <newname>
 # @DESCRIPTION:
 # Install udev rule with a new name. Uses newins, thus it is fatal
 # in EAPI 4 and non-fatal in earlier EAPIs.
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index efff7d180b28..86712e026427 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 7489754fee1a..17cc5f2d648d 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,4 +1,5 @@
+AUX odamex-0.8.1-SearchDir.patch 529 BLAKE2B d4c2e996f5f3489d344b385f86b9a1cbe534365715088cbd163d5232a29ff751e2bacf2241ca2bba5c13c6acd6ca39387323edd43311c128c8050c7ddbb82f4b SHA512 336560f2305af9d6eaab889ec644d63c4af10acfe53d05c94533f1e60b27e64b560cb3fe1bfcf8996283cd152666989e2525077918c83f44b7795b131eac979a
 AUX odamex-0.8.1-miniupnpc.patch 1378 BLAKE2B 06ea9b7154e574d487a2a241474e401951319c7dd0ce71135605d84c8b3442fce1e23fc30ec5b12c77521dff2215640faa4eb1b99484272a51b0ccf67e232cb2 SHA512 5bcf602ae484eed180dbd02c315e2a6bab38a5e90711466a5ba005fed6782ea6a7244b9e8b8ebea38df5875f1d4eced1e51aaaa98e1124710f11aaafe4480049
 DIST odamex-src-0.8.1.tar.bz2 8520197 BLAKE2B 9744460f2a2bff375cbf80416a38212e7576a4ef6874d2647c1371dc66b464666d67dd69ac61c918c51bee6da0150cbb70799eb81fc2fd7ff62edaec332241a5 SHA512 5cdd05df9683c9b26cac5e2947f5365405b0c6239890d89ab962f4ac088788148bb1eabc15e80b0f13fca0dea69bffcd9e80e8aa80c6ac0a5d7e63b0bd983642
-EBUILD odamex-0.8.1.ebuild 1814 BLAKE2B f536da171ffe7e9d65250883e8ee9bd01ce339429b97b5534c9be0b375e8d494c958542f96e978d167561395561930056a669f51a1a03f208d608e4dc580995e SHA512 81721c8b46961b3877afce97c8a53037c649958f12b5d4b85ee0d05f914c7f55cd08e6f8d0f9b4f8a1d42aba08aef9fac6abe27c0011f79dae332692045b6d1b
+EBUILD odamex-0.8.1-r1.ebuild 1885 BLAKE2B 7f8b5fa772c6d0d603e98b6a6c02c029855afd2bc6c1c572a32ebc8314201589c4b74c98ded9e7ba48aca0790f6d3d82a611c502e9572b5531157fac8a11acfa SHA512 83b56eef88b27222dea2e262433c9362c932f57ed8cc1bc359a10e9602409057416f19660b9935085317ee82a4fa5019810478881e118d80ed32960a79a251ae
 MISC metadata.xml 1530 BLAKE2B 03aad8e7b52331b6b2c0be004c82459219661acbce414880cb9b223eff121f9cdfabe6404309d20191b2c64f68878dc617d370d93bb6aaf4ebf74203a4b04dea SHA512 dc325607fdc57449f4fb61f56f42837a7969965f4c09f43867fa83a20783fcb9dc926b770dc587ed9e4649080c89094efe4c32ea7b55f12ec230dadb09edc6fa
diff --git a/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch b/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch
new file mode 100644
index 000000000000..70bd476eb3f2
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.8.1-SearchDir.patch
@@ -0,0 +1,11 @@
+diff -Naur a/common/d_main.cpp b/common/d_main.cpp
+--- a/common/d_main.cpp	2019-07-22 19:11:28.000000000 +0100
++++ b/common/d_main.cpp	2019-09-09 22:57:47.624246017 +0100
+@@ -459,6 +459,7 @@
+ 	D_AddSearchDir(dirs, INSTALL_PREFIX "/" INSTALL_DATADIR "/games/odamex", separator);
+ 	#endif
+ 
++	D_AddSearchDir(dirs, "/usr/share/doom", separator);
+ 	D_AddSearchDir(dirs, "/usr/share/games/doom", separator);
+ 	D_AddSearchDir(dirs, "/usr/local/share/games/doom", separator);
+ 	D_AddSearchDir(dirs, "/usr/local/share/doom", separator);
diff --git a/games-engines/odamex/odamex-0.8.1-r1.ebuild b/games-engines/odamex/odamex-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..c823dedd980d
--- /dev/null
+++ b/games-engines/odamex/odamex-0.8.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake-utils desktop prefix wxwidgets xdg
+
+DESCRIPTION="Online multiplayer free software engine for DOOM"
+HOMEPAGE="https://odamex.net/"
+SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${PN}-src-${PV}.tar.bz2"
+
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+client master +odalaunch portmidi server upnp X"
+REQUIRED_USE="|| ( client master server )"
+
+RDEPEND="
+	client? (
+		media-libs/libpng:0=
+		media-libs/libsdl2[joystick,sound,video]
+		media-libs/sdl2-mixer
+		odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+		portmidi? ( media-libs/portmidi )
+		X? ( x11-libs/libX11 )
+	)
+	server? (
+		upnp? ( net-libs/miniupnpc:= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="games-util/deutex"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-miniupnpc.patch
+	"${FILESDIR}"/${P}-SearchDir.patch
+)
+
+src_prepare() {
+	rm -r libraries/libminiupnpc odamex.wad || die
+	hprefixify common/d_main.cpp
+
+	use odalaunch && setup-wxwidgets
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_MASTER=$(usex master)
+		-DBUILD_ODALAUNCH=$(usex odalaunch)
+		-DBUILD_SERVER=$(usex server)
+		-DENABLE_PORTMIDI=$(usex portmidi)
+		-DUSE_MINIUPNP=$(usex upnp)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# Build odamex.wad
+	cd wad || die "cd failed"
+	deutex -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt ../odamex.wad || die
+}
+
+src_install() {
+	if use client ; then
+		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
+		make_desktop_entry "${PN}" "Odamex"
+
+		if use odalaunch ; then
+			newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
+			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
+		fi
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/games-engines/odamex/odamex-0.8.1.ebuild b/games-engines/odamex/odamex-0.8.1.ebuild
deleted file mode 100644
index 8cfa9cbee75a..000000000000
--- a/games-engines/odamex/odamex-0.8.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake-utils desktop wxwidgets xdg
-
-DESCRIPTION="Online multiplayer free software engine for DOOM"
-HOMEPAGE="https://odamex.net/"
-SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${PN}-src-${PV}.tar.bz2"
-
-LICENSE="GPL-2+ MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client master +odalaunch portmidi server upnp X"
-REQUIRED_USE="|| ( client master server )"
-
-RDEPEND="
-	client? (
-		media-libs/libpng:0=
-		media-libs/libsdl2[joystick,sound,video]
-		media-libs/sdl2-mixer
-		odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-		portmidi? ( media-libs/portmidi )
-		X? ( x11-libs/libX11 )
-	)
-	server? (
-		upnp? ( net-libs/miniupnpc:= )
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="games-util/deutex"
-
-S="${WORKDIR}/${PN}-src-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-miniupnpc.patch
-)
-
-src_prepare() {
-	rm -r libraries/libminiupnpc odamex.wad || die
-
-	setup-wxwidgets
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CLIENT=$(usex client)
-		-DBUILD_MASTER=$(usex master)
-		-DBUILD_ODALAUNCH=$(usex odalaunch)
-		-DBUILD_SERVER=$(usex server)
-		-DENABLE_PORTMIDI=$(usex portmidi)
-		-DUSE_MINIUPNP=$(usex upnp)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	# Build odamex.wad
-	cd wad || die "cd failed"
-	deutex -rgb 0 255 255 -doom2 bootstrap -build wadinfo.txt ../odamex.wad || die
-}
-
-src_install() {
-	if use client ; then
-		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
-		make_desktop_entry "${PN} -waddir /usr/share/doom" "Odamex"
-
-		if use odalaunch ; then
-			newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
-			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
-		fi
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index b22f2d67f7d5..cddafe6984a7 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/deutex/Manifest b/games-util/deutex/Manifest
index d6aa09ad66f0..20988ae67531 100644
--- a/games-util/deutex/Manifest
+++ b/games-util/deutex/Manifest
@@ -1,3 +1,3 @@
 DIST deutex-5.2.0.tar.xz 165772 BLAKE2B 4451e6abc13d3d6e9176a5d8aad6a5d3d986b2b280b2094d89876ec9bea68db5aa9179f8d650932499a2f8853fb57644f723e4214f5a973f217ef34e236e57a9 SHA512 5baa3e06e8562e36e9e520a52a7b4407277e7741deb543eb7b68587a9aab3f409c574415654e8a1ef15d2afb7750aa603189f8de749353666295c6a292b92a33
-EBUILD deutex-5.2.0.ebuild 560 BLAKE2B 6ebbe70524efd07d676e51453aa16a2ead731dc30013b52517df31cd673356a8644867dc7d60fe4bb6f27b80d0ef829a4c255fcd1eee3f0b1d544f2cb2b40aa7 SHA512 e10c9341be1cdb7db1f57b1b2b69e7814039110266c84ede873628ae92e54c19b371582e778a8c12bd00f8c70c000ee66c45697310d34a066b1b77e159bdbb50
+EBUILD deutex-5.2.0.ebuild 565 BLAKE2B 0e507e25b9617714c7e183564af787cb8fc997a08228db79e7b4657764852e695b71ff931652ffb75d0bcdc1436b9f9c5ee453ab9f6ba81e283c5bbdf68f4f7d SHA512 a89f01e8255532877c22bcf0e12232c02e02a6d794fb69cb6734b5f70b69d5d72d4ecd6794342e05d909c72c653e147d3dbf35b3af0fd6b6972fc4bcb3cc1a29
 MISC metadata.xml 1225 BLAKE2B 5c2a69f813915309ef9da4cdc45c5b6e25cec5c742f6abe321c06245786055c176698ae7275dd507ad06dfb37b6eb093778aa4593a472c9324c97d35ef1c4e27 SHA512 65ab35a0d9b12e6e5dda98b5277bf17ab2f6c655c2fdb09c9b9bed3684a338b7bdf655f864390b6d74207c94ac8baa6776e825db7f8b1f3060c9ca3983885602
diff --git a/games-util/deutex/deutex-5.2.0.ebuild b/games-util/deutex/deutex-5.2.0.ebuild
index f4802fcadd48..2edf639b6faa 100644
--- a/games-util/deutex/deutex-5.2.0.ebuild
+++ b/games-util/deutex/deutex-5.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Doom-Utils/${PN}/releases/download/v${PV}/${P}.tar.x
 
 LICENSE="GPL-2+ LGPL-2+ HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="man png"
 
 DEPEND="png? ( media-libs/libpng:0= )"
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index e5bfca70fac2..ee48669fd97f 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,6 +1,8 @@
 DIST lutris_0.5.2.1.tar.xz 1742968 BLAKE2B 676f5019260714ab5205366f51a5911e0459f353f6debead49fded4bc8c764b0e621a86b98c7663df2cd9fd3c59c23944d516f8991cd455c271b10ef02c485eb SHA512 1aaf69be8bdfb72a427e10c4c73ad06c80ebda59a5dd0bfc6d484240250160770854ad28698d3d60af1e3f19b58ade973ab688c6416169df3a4c6ab3c0981301
 DIST lutris_0.5.2.2.tar.xz 1742640 BLAKE2B 683ebb790ccae20fd939bdd8338a5940cbd1151a7d3b476679291f1fc84278c77ebcc9676c3701e491664563281b884067ca85cf1ff10e79545186deea046078 SHA512 634182676f7ff921bc0d320aa130203f37cfec83acea397d24001c41647e35600ab4709e67ffda5f5e5b08b2b5018bbf78609ef7d4f70ed93c965d0fb5f2309f
+DIST lutris_0.5.3.tar.xz 1821184 BLAKE2B cf4d1fee654202c88d98414ab7d9efbb76d77887007b8a66ee62313b3c672a7e515777fc360a6faca84c3d7f324503e81846b5c413011a4f961df6753467cf7a SHA512 85ae405d711f86c0b610030464030748b0deaa5f858dee72f31fab0268ea1428aaa2c1af7cf3acc17e6d455dae5d870203224ff8c99f1b3b48d753de7c86574e
 EBUILD lutris-0.5.2.1.ebuild 1670 BLAKE2B 4cc77b386bd0f23f79eeb8f12c3f92822186df71acabbe6ebe80319eec895a00e03ab0ea85838f94a7dc0e4e9e0efdb9b6cbc4d84f750b7405fed506d684d993 SHA512 0c0d9fab2cc370064c90ea35253cc52c1ea1437dd5e9c27be80611340b139fc442c28094d5a201efd7257aba68e341a79bc2b5bcc9d9ba59f230144c818e52d9
 EBUILD lutris-0.5.2.2.ebuild 1670 BLAKE2B 4cc77b386bd0f23f79eeb8f12c3f92822186df71acabbe6ebe80319eec895a00e03ab0ea85838f94a7dc0e4e9e0efdb9b6cbc4d84f750b7405fed506d684d993 SHA512 0c0d9fab2cc370064c90ea35253cc52c1ea1437dd5e9c27be80611340b139fc442c28094d5a201efd7257aba68e341a79bc2b5bcc9d9ba59f230144c818e52d9
+EBUILD lutris-0.5.3.ebuild 1670 BLAKE2B 4cc77b386bd0f23f79eeb8f12c3f92822186df71acabbe6ebe80319eec895a00e03ab0ea85838f94a7dc0e4e9e0efdb9b6cbc4d84f750b7405fed506d684d993 SHA512 0c0d9fab2cc370064c90ea35253cc52c1ea1437dd5e9c27be80611340b139fc442c28094d5a201efd7257aba68e341a79bc2b5bcc9d9ba59f230144c818e52d9
 EBUILD lutris-9999.ebuild 1670 BLAKE2B 4cc77b386bd0f23f79eeb8f12c3f92822186df71acabbe6ebe80319eec895a00e03ab0ea85838f94a7dc0e4e9e0efdb9b6cbc4d84f750b7405fed506d684d993 SHA512 0c0d9fab2cc370064c90ea35253cc52c1ea1437dd5e9c27be80611340b139fc442c28094d5a201efd7257aba68e341a79bc2b5bcc9d9ba59f230144c818e52d9
 MISC metadata.xml 661 BLAKE2B 8b05694fe3755a3b2b1546c1392bccb408d99f430c361e6058702107d665b13e0d36834d37c2a31ab7065290363e6af7712fcf4b36542222b59e47b508b7d1ef SHA512 e5d7a7023e9aa025d8d526457ba61ec9d9ceadf472d3f04f6b799cb3c130543e4300a56ce1830c163650f0554e2a87d705152b3771bb4f7fd9edeba3db16b9a7
diff --git a/games-util/lutris/lutris-0.5.3.ebuild b/games-util/lutris/lutris-0.5.3.ebuild
new file mode 100644
index 000000000000..37e850aab99e
--- /dev/null
+++ b/games-util/lutris/lutris-0.5.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE="sqlite,threads(+)"
+
+inherit distutils-r1 virtualx xdg
+
+DESCRIPTION="An open source gaming platform for GNU/Linux"
+HOMEPAGE="https://lutris.net/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/lutris/lutris.git"
+	inherit git-r3
+else
+	SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+BDEPEND="
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unrar
+	app-arch/unzip
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-evdev[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	gnome-base/gnome-desktop[introspection]
+	media-sound/fluid-soundfont
+	net-libs/libsoup
+	net-libs/webkit-gtk:4[introspection]
+	x11-apps/mesa-progs
+	x11-apps/xgamma
+	x11-apps/xrandr
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify
+"
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst docs/installers.rst )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	virtx nosetests -v || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	# Quote README.rst
+	elog "Lutris installations are fully automated through scripts, which can"
+	elog "be written in either JSON or YAML. The scripting syntax is described"
+	elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
+	elog "available online at lutris.net."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 6e2b61efb39b..b8bb5f4bb825 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 0d56b01ecb98..b2c196e7858d 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,6 +1,9 @@
 AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b058579587dcf55918b07b4bc9708dc9cc19192acddfb225c540806b4866a2e431acc42d461f91fdd935626af366341617595 SHA512 aeaba2126d4e87caf7c467118f2e2d42330fbf5c1d0786c52a2782550c64f41e482034c08e4624cc231e49ec9f39e824d29796b4078090613cfe54adbd420eaa
+AUX 0.32.0-drop-vapigen-dep.patch 1113 BLAKE2B 17bc1da864e0a706aee7574115604e8bd8fa3048febdc2daa8bc0792a0ebd676d3ad3d334d1af86a4441d13074bf9dbf1a66c832d36c036b4909736f2c166aef SHA512 bca6484acb0a7cba34c16c3ac841970a93f4da3f439c7352824049641f256164588b7f184781b77e2d85e0906750b55573bcbd0a8819247f64bc702bf95e5231
 DIST dconf-0.26.1.tar.xz 218516 BLAKE2B ddb23a1f6519b5460903b1a91ba48242f144a768f7ec5b9e82953589474df998061a4fbfb3605027cb51db44f7e49f88c774a735600de2bedaf8889b58e050bc SHA512 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da
 DIST dconf-0.30.1.tar.xz 104376 BLAKE2B c5a90c092b6e028dafbc9aee2f29f622dc4a696e815266355de4a056fe507b0cca9eaa9b10753501ee44f74ee57d0095fd55aafc7205ffea1f0321ed705dbe0b SHA512 f7d136aec7cb75b64c7d9446d520f4c4af368e6d22346b7bb8ad66c08afaa03a72aacd44016dae7690e37b7d0deb9a16187445db176427a12a8b3cd3885c9e03
+DIST dconf-0.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0
 EBUILD dconf-0.26.1.ebuild 1498 BLAKE2B 7829c513e07d7d7f40404f18a173310b4d7f9d591650b807529512b37431c34404fbc8a3b02cf854044e450c6009eb02b1a5582dc930dac621aa2a961d46f14d SHA512 229b151dc70b0dffce0998fab2dcb6e7f8b44c518e9f07ca80340f53124b9a91cc6b2c1c2ca6c64be9704511ed46505ee3c6f45c14fe666f2e64ed96adeb5e7b
 EBUILD dconf-0.30.1.ebuild 1833 BLAKE2B 992db142e268c021eaaa09f4e923cd5a51d4a83648b042b6742cf4669a9897120ee96f2dbe3f83ecc999522a5c4396eb0def38825c029f0c9ddf62de8528ba48 SHA512 20bddd4e4399da71113e34a19436ca344564895d987fec4df19a86b476b3b581cb35cfcf642e86553b2c14a754df31dcdf9d6e547a8a5b2f68ed9f3f5ada94e4
+EBUILD dconf-0.32.0-r1.ebuild 2119 BLAKE2B ba1b3594c0879866da0dd7803b82e3db668a25fe2d6e9626a6ce14518438faaec23e4fb0b497afaba7efcac4fc0c4e2ef5ce4666ddef421bf29c9e2b4b6b4a09 SHA512 7680177935489778b066dfe7166029604aa57e6bd7bc465b68f0192719cce4b6b385474d06b11306bf34d615aafe79b6456dc51882102d1f1f1b3b33347aefa2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.32.0-r1.ebuild b/gnome-base/dconf/dconf-0.32.0-r1.ebuild
new file mode 100644
index 000000000000..8e9d9a0257d7
--- /dev/null
+++ b/gnome-base/dconf/dconf-0.32.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Simple low-level configuration system"
+HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="gtk-doc"
+RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	sys-apps/dbus
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	gtk-doc? ( >=dev-util/gtk-doc-1.15 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.30.1-bash-completion-dir.patch
+	"${FILESDIR}"/${PV}-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-Dman=true
+		$(meson_use gtk-doc gtk_doc)
+		-Dvapi=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# GSettings backend may be one of: memory, gconf, dconf
+	# Only dconf is really considered functional by upstream
+	# must have it enabled over gconf if both are installed
+	# This snippet can't be removed until gconf package is
+	# ensured to not install a /etc/env.d/50gconf and then
+	# still consider the CONFIG_PROTECT_MASK bit.
+	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
+	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
+	doenvd 51dconf
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_giomodule_cache_update
+
+	# Kill existing dconf-service processes as recommended by upstream due to
+	# possible changes in the dconf private dbus API.
+	# dconf-service will be dbus-activated on next use.
+	pids=$(pgrep -x dconf-service)
+	if [[ $? == 0 ]]; then
+		ebegin "Stopping dconf-service; it will automatically restart on demand"
+		kill ${pids}
+		eend $?
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_giomodule_cache_update
+}
diff --git a/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch b/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch
new file mode 100644
index 000000000000..55959a7febf0
--- /dev/null
+++ b/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch
@@ -0,0 +1,44 @@
+From 22d4c12d73238d24b91a753c414c5f5a5a9c76b6 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 8 Sep 2019 14:17:20 +0300
+Subject: [PATCH] build: Don't hard require vapigen.pc
+
+.. by having a fallback to the well known location of packages shipped
+vapi files
+---
+ client/meson.build | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/client/meson.build b/client/meson.build
+index f3b7122..7dbca97 100644
+--- a/client/meson.build
++++ b/client/meson.build
+@@ -57,17 +57,21 @@ pkg.generate(
+ )
+ 
+ if get_option('vapi')
+-  vapigen_dep = dependency('vapigen')
++  vapigen_dep = dependency('vapigen', required: false)
+ 
+   vapi_data = files(
+     'dconf.vapi',
+     'dconf.deps',
+   )
+ 
+-  vapi_dir = vapigen_dep.get_pkgconfig_variable(
+-    'vapidir',
+-    define_variable: ['datadir', dconf_datadir]
++  if vapigen_dep.found()
++    vapi_dir = vapigen_dep.get_pkgconfig_variable(
++      'vapidir',
++      define_variable: ['datadir', dconf_datadir]
+   )
++  else
++    vapi_dir = dconf_datadir / 'vala' / 'vapi'
++  endif
+ 
+   install_data(
+     vapi_data,
+-- 
+2.20.1
+
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 9f4819c80e6f..96bcb7deee52 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,5 +1,8 @@
 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b
 DIST gnome-settings-daemon-3.30.2-patchset.tar.xz 20132 BLAKE2B b8f2573e806ee5aedcc1476de3550cdc39933c869d64c9d13e463cdf27fa7695e69e57612738fa5438988eda78ae998808508c94fbf841ec037eb1f103921458 SHA512 7318029f4145379b05f7a95686917b4ea7623fd0059559930072350db12170d6083d75c170578516bcede5282da677013086c343abe779b9d1696bd882b7e34d
 DIST gnome-settings-daemon-3.30.2.tar.xz 1376776 BLAKE2B a7cf276c5a802b7d9a6f738048b5bc34d97f79723c6f4cfb4f29ac3ed0f43e307cbdd6793e8d8115f51981ee576737d75c58531dcd5d0779d9f3670b68523a60 SHA512 517cb6bab3da10d5d47ab9c9690da3fa23e64d023d01b7cc101441f6b65639f3b6c8d0a0d19da80b22924b3dbe6430b2573fb861060f02fda248b24f00be5d84
+DIST gnome-settings-daemon-3.32.1-patchset.tar.xz 9840 BLAKE2B 0b0249b6335fc64c111cfd4c221b408460105bd544527ca29a32b2ceb82d39c1ca8c9813916cde9afdac1cf146c1286ed937dadb07eb0263b5ab3ada2a95e0aa SHA512 175f4d0200b88b696b73fc7e7b10065b3e6f046e48955408cc438499fdc6464483420b4801dbb77b5ae819cb52a131e2594a628b9731eaa167b802b5b2cbe855
+DIST gnome-settings-daemon-3.32.1.tar.xz 1372968 BLAKE2B ba0596d9f2019f2ecff32b70c03d962dd7966c282d1fb0ea94c38fc895b7ef788d9dd179a037b74a319ca520811e985465578a725bf14d1eff92846f188445ea SHA512 8d6aca1041cbd50d7dda67dc711269a51c4a5148d55dc63969f47c21bf309126f5d5cb13c1e6fa9e6498fbb30dc70fa7a049fead7d32c6a20d550da0ce8828c3
 EBUILD gnome-settings-daemon-3.30.2-r1.ebuild 3885 BLAKE2B d59a394535e6c4589d67bfcae5e9b2e0f6690f9523f617dd3b214c1f79c9c40fd40262a2ccfce56671dcb266d8f43b51728cb151f4f58d4425ccb239eb534251 SHA512 6ddd62b160bfaf78c5004e7bb66c7f7204d612806997b5e196a17b1cb4c9f436c08cfce9b736a4033419bf520623b4ec71cf74c84a45d51209efe90a0a06b5df
+EBUILD gnome-settings-daemon-3.32.1.ebuild 3849 BLAKE2B 208e23f41162df6a9682bc660349c720632ba7cf499b4dc3bb272052ec887cf7e6e293c2d872e38f10b077b00cc773307fd67d27b50ae2fcb15fff2131e0a397 SHA512 0904befde465cb65cc88d0e88c525783235d1afae98ba60e117c372ca75c4d9c27a7695f396ae019222a84cea3e83af43aa72b21a3982fe8ee8245ed721de46f
 MISC metadata.xml 454 BLAKE2B 271588e1f1a6a9799ba121f1da6f69ea1b5ba4c006f11c3a997833eac097143ba19bfe445759f17b7269414892af5efeb04eaaa752c0c330e1238c66004f30ed SHA512 ada9cf6a61a63bd96807bd1c4840a19ed2e59b7889d54af7796ec07af6b8250ce03953d907545c92aa75c59d2bee3ecb4120c571f1830a5c2b06e4ebf7005eee
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild
new file mode 100644
index 000000000000..92e5c92709b2
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug elogind input_devices_wacom networkmanager smartcard systemd test +udev wayland"
+REQUIRED_USE="
+	^^ ( elogind systemd )
+	input_devices_wacom? ( udev )
+	wayland? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# >=polkit-0.114 for ITS translation rules of .policy files
+COMMON_DEPEND="
+	>=sci-geosciences/geocode-glib-3.10
+	>=dev-libs/glib-2.56:2
+	>=gnome-base/gnome-desktop-3.11.1:3=
+	>=gnome-base/gsettings-desktop-schemas-3.27.90
+	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
+	>=dev-libs/libgweather-3.9.5:2=
+	colord? (
+		>=x11-misc/colord-1.0.2:=
+		>=media-libs/lcms-2.2:2 )
+	media-libs/libcanberra[gtk3]
+	>=app-misc/geoclue-2.3.1:2.0
+	>=x11-libs/libnotify-0.7.3
+	>=media-sound/pulseaudio-2[glib]
+	>=sys-auth/polkit-0.114
+	>=sys-power/upower-0.99:=
+	x11-libs/libX11
+	udev? ( virtual/libgudev:= )
+	wayland? ( dev-libs/wayland )
+	input_devices_wacom? ( >=dev-libs/libwacom-0.7
+		>=x11-libs/pango-1.20.0
+		x11-libs/gdk-pixbuf:2 )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	networkmanager? ( >=net-misc/networkmanager-1.0 )
+	media-libs/alsa-lib
+	x11-libs/libXi
+	x11-libs/libXext
+	media-libs/fontconfig
+"
+# logind needed for power and session management, bug #464944
+# gnome-session-3.27.90 and gdm-3.27.9 adapt to A11yKeyboard component removal (moved to shell dealing with it)
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/dconf
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+	!<gnome-base/gnome-session-3.27.90
+	!<gnome-base/gdm-3.27.90
+"
+# rfkill requires linux/rfkill.h (and USE=udev), thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+	x11-base/xorg-proto
+	${PYTHON_DEPS}
+	test? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
+		gnome-base/gnome-session )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+# Tests go a bit better in 3.26, but still fail some for me; revisit with 3.30+ (incompatible build system python needs until then as well)
+#RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Translation updates from gnome-3-30 branch
+	# Allow disabling udev and networkmanager on Linux
+	# Make colord and wacom optional
+	"${WORKDIR}"/patches/
+)
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		#-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss?
+		-Dudev_dir="$(get_udevdir)"
+		-Dalsa=true
+		$(meson_use udev gudev)
+		$(meson_use colord)
+		$(meson_use cups)
+		$(meson_use networkmanager network_manager)
+		$(meson_use udev rfkill)
+		$(meson_use smartcard)
+		$(meson_use input_devices_wacom wacom)
+		$(meson_use wayland)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	# Don't auto-suspend by default on AC power
+	insinto /usr/share/glib-2.0/schemas
+	doins "${FILESDIR}"/org.gnome.settings-daemon.plugins.power.gschema.override
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 5f4701b40e4c..0dea384b9841 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -7,5 +7,5 @@ DIST gvfs-1.38.3.tar.xz 1202280 BLAKE2B fb4d4f6d0187f4f1bdfdff42f496402c64077958
 DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c
 EBUILD gvfs-1.32.2.ebuild 3811 BLAKE2B e0980669a87db9f15e07e81e281ecec55ce72aa98f924acf182fbf9aef851dc8b7566ae15b81f635fca1150da730aa17f1d20e5242e4116f08d16117cd80d174 SHA512 a7e156297e36658b14b9c76c2c78318ea135a4be914ff06f587cafe3cedd5b9c44d6e946117ad520a65551b15fba5fdfd65de2862f3d8ad10fd6f729f983ddb4
 EBUILD gvfs-1.38.3.ebuild 3769 BLAKE2B b8d9a194313ffcf85e4e4364bcc658f5c8e8874fa0c24338f0214685a7d3f4f3930220bc9764bdd06fcf5de70b1babd7e12a2d2c86247288074db30b46af41e8 SHA512 352e5b0800c192ab6e629318c2b975d2d1149e5d9613bee39812d6a7ae3213a0cf1b92397bc46c1a7b59643cc8eff197773306c8ed4ebd7c7293db37e2dff77c
-EBUILD gvfs-1.40.2.ebuild 3806 BLAKE2B 3bc05beb1d4d25c5c41a8f90905a22a106831fb2b7b34c004aab2be6c456d250a6d46f8038d660c9aeac4b486e0a52934de0510700229dd5df0dcea95e9a7308 SHA512 9646b5c0d32fdcba4b62f848790b3d2a9a1a6a3722807a729bcf6cb8711faad179afe40a3bc4c00d957e4d61b24f730f4719ef23ae08593d45e1aafa6769996e
+EBUILD gvfs-1.40.2.ebuild 3805 BLAKE2B 5131cb590cf6b4d104cf6856077cf471ab7903fa71fe1704cb035fe7618d41ee515cc169b1a6bfe0f3df31533cde03832282067b61a10caff8ba6ae8347f2991 SHA512 979785f4954a085afcfad90d727f9f86d4bacc02eb4789974a4fe8e20fcdfd4731cc1128a92edc5560fccd30e2a1b560594e2fa115a3e1e6a7ee5de5e97f5c5b
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
index 9bd7d4c8cd88..5ec4eaa4d7d2 100644
--- a/gnome-base/gvfs/gvfs-1.40.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.57.2:2
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 9688147113ef..015572847424 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 55f1e65388b2..5f8835f346f9 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -2,6 +2,6 @@ DIST libgsf-1.14.43.tar.xz 618272 BLAKE2B a381125ce75d06ae4bf1c9dbe9b2e207534ff7
 DIST libgsf-1.14.45.tar.xz 618476 BLAKE2B f577859578de6ca359a7377dcced424e95779d3fd155cdbeb1c2874f7a0d0c7a09a2322d2538452b48798ea979e8260be77215140f298dc58ee32a0b9ead0e47 SHA512 2e993150b6fec336a14fd85d5c631e4a3b43187039dab0cba3b8badf62873f39814392db92bb737b92aa9a6d8b4ba41f1fb248c1fe07b88cddd28ded5e4d9ebd
 DIST libgsf-1.14.46.tar.xz 689360 BLAKE2B d5d66e96dc74fa68111781ce9bcbfaed2b8a99f9d2bcb16e32a650e103716633b5def7c93f133538449a3b6d9299e4709ba29bc6a520d5c7fe144bcbf78d3ae1 SHA512 130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0
 EBUILD libgsf-1.14.43.ebuild 1000 BLAKE2B ab04bfba11ed11f061bf2074d72b20086e9b3b41edf4ffcd8cf0ce3dc7a8816f61f15c9ed20544123e3f928289782d6f3f61c4ace27a539abe76545b73c38062 SHA512 0426fd92c203dd7a38a1b8a63f169c38d89b8e18d52b7c51db433540619d20574075fa2bccd2ff64eb1fea8b583773d364ac049f7e19782058b9b05c88d08233
-EBUILD libgsf-1.14.45.ebuild 1005 BLAKE2B f6112cd864eceb569d3bd719951f2c4a219d787d82dde357f579ac7857381ae12f1e4f751cf76997341457e0f05710cd99a7631d1dba3bc0588cda047c873735 SHA512 68c849f28c5eff6526f7197436431b136e4ae296dacd87cc405d60fa57e5b1970913c64acf45bed51afe115424d9547b12021d603896d9ed737e69d86d131c23
+EBUILD libgsf-1.14.45.ebuild 1004 BLAKE2B e2e4309855f6bd188b2e19789cfd70cf5b989209f333a836b70f68c296ada5e04d8c6b023e397c506c9acb13cc8ea2ba3aa13bc1ed6900bf7c8ac46abbf999cf SHA512 2fdcc8ecdccfe0b86f150cac82d1ccd244c69300bbdc962e022b346df089c326ebafd51b5584d64d7a1f5b45cf7014de7522a46cd3218710e279446bb1bbf6d5
 EBUILD libgsf-1.14.46.ebuild 1010 BLAKE2B 8916d0707ff006845f3c0d103e178567743615103c0f13323eec85d8d072eedf082022216fe580c1517df920fa3efc3da5132f1e90f9263676fd656a219c1218 SHA512 17594b7634342c69976bd1f5e9fe6cc5fedb017c72ae58979e8408b2b56efa2bfe2e554c4bcc1d3d2721c0cf4687bdfdaa70e0acd23bd98c801220b0a684259a
 MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.45.ebuild b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
index e36f75f51eaa..bbf262c75ce4 100644
--- a/gnome-extra/libgsf/libgsf-1.14.45.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index dd43357690d0..ee1181f30be6 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,3 @@
-DIST network-manager-applet-1.8.20.tar.xz 1551392 BLAKE2B 91258012715f226467126e4eefdfcd6ebde36958be80ae5e264dbf5168e0b772ce04404030d3f7dac9a6f72088918a2c5160aba694b6b7f7d4d6289b716b76f1 SHA512 5020aefe1803ad3b59562478e793737b52a3e5fd294470cfb430c73937cdbc0be6ecba5f3f8e8dbcc5bb5ac293df2866ecc919dd5019a3e681a434078d235a41
 DIST network-manager-applet-1.8.22.tar.xz 2058500 BLAKE2B e4b31ea3dfe91f07a61b7dd4c34521bc4fc2d7a1b7e5649690336cce0c425d57128ff8011b18a6505893982bfd81170eb8239b9e83de6f91afa11190cfac3b4d SHA512 d2f679a67b79b011762f9249798c5a4ccad3d0fdd01d8d45956a65ab75398ccc07167fc5452748a12294315f729b10115edcb9f11e05475bb0b15b2ade638dd3
-EBUILD nm-applet-1.8.20.ebuild 1652 BLAKE2B 7c46f50db0ade503045cb33d9d267d879718809d4e68f5c810a90acc26293be0e328b3bb81fcf0488292b3439e1aec00fa43ef4da4c2baa6db3f66fbb3ba8355 SHA512 0afd250aa5b7a857f16b37624aa34a5ab8ec85edb0a952757c54ee7221958b5ce2439d23714423d5916d090e9df0d14ab97d2f8fc8d1e117614da9ee0534e87b
-EBUILD nm-applet-1.8.22.ebuild 1651 BLAKE2B 9cc6a6aec6201209f7c721934bc74810b477ba3df709aad033ff5737c6fcc7ef80459d148fa5ab014769c9aab0cd533cbcfc86bd94da6786225dcb981d56bc78 SHA512 e529d282af870ce6d2b439d8b778fdd2dc948f7ce9234a5c1a793a3731fe5e4c2929909c027d930abe8c5c11bd7037e3fc06efb254c1bdafdb428a77cc44e1cb
+EBUILD nm-applet-1.8.22.ebuild 1650 BLAKE2B 577f91d275acae5ef15bda487c0e11cd2cf36b0ec71f0b9456accf479843b3fa9eeadb8fd212e828919554272eab5403f44b9374bc13a4bee8a4cd0da084b2a1 SHA512 2eee1bc81f1c4e3c511e0df9d7cc86bb3c18ddba0e8723bb81ced863f708d620cc7c03dc7113a1edf2d92237d35ef92e701df495fa3b54bd977b9f071e646456
 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild
deleted file mode 100644
index 5532c487d811..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=app-crypt/libsecret-0.18
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3.10:3[introspection?]
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
-	net-misc/mobile-broadband-provider-info
-
-	ayatana? (
-		dev-libs/libappindicator:3
-		>=dev-libs/libdbusmenu-16.04.0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	virtual/freedesktop-icon-theme
-	virtual/libgudev:=
-	gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
-	modemmanager? ( net-misc/modemmanager )
-	selinux? ( sys-libs/libselinux )
-	teamd? ( >=dev-libs/jansson-2.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.0
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-src_configure() {
-	local myconf=(
-		--with-appindicator=$(usex ayatana ubuntu no)
-		--with-libnm-gtk
-		--disable-lto
-		--disable-ld-gc
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		$(use_enable introspection)
-		$(use_with gcr)
-		$(use_with modemmanager wwan)
-		$(use_with selinux)
-		$(use_with teamd team)
-	)
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild
index a9669752da59..578c09c6d1d0 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-crypt/libsecret-0.18
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 6454fda74001..7c4fc0783664 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/waybar/Manifest b/gui-apps/waybar/Manifest
index 78f183f467f4..853994a590cf 100644
--- a/gui-apps/waybar/Manifest
+++ b/gui-apps/waybar/Manifest
@@ -1,4 +1,4 @@
-DIST waybar-0.7.2.tar.gz 101206 BLAKE2B d44b46c840094340e1e5f70d4ef3d01faf483a8c744ce6b549c1fa8767bf455c4c0ef67b564c61795e44c652d37c09848cce6f50ee3664de73477da6b4bce84e SHA512 d83f92d0111cdd01b276907fad18344dbf35be1e0bbbce2208f928e0d5e0fcccfa65ff2279de5a7e4dad5f04a6c99521670d75d65e32a0382bec2bf32eea00e2
-EBUILD waybar-0.7.2-r1.ebuild 1308 BLAKE2B 82a7f8be5413cd2a4c72344853ff8a8ce9a9889ff72f0603c0f4b222479cc9d192e52923171fe16f5d076f240c6c693d9e9db2af75e96aba39bc8c44ea645853 SHA512 14f9d375ec051c64eeb38891283bf9cf4068db4c8954feb490a87e26d987f19517f0c44fbbbb68c37627a20d0d757245276b76962baa58cd74a83acfd466db16
-EBUILD waybar-9999.ebuild 1308 BLAKE2B 82a7f8be5413cd2a4c72344853ff8a8ce9a9889ff72f0603c0f4b222479cc9d192e52923171fe16f5d076f240c6c693d9e9db2af75e96aba39bc8c44ea645853 SHA512 14f9d375ec051c64eeb38891283bf9cf4068db4c8954feb490a87e26d987f19517f0c44fbbbb68c37627a20d0d757245276b76962baa58cd74a83acfd466db16
-MISC metadata.xml 1090 BLAKE2B 5715f34c1493cb3c3b32697c30abe64c40dd28eec3cac3db8bd9c12b288c11d32ed21b8e11f744b8d9401965e29807a2126885f441f038e923b6c2357b8adea7 SHA512 b8dd49c8c049fcc4bf914e1aaa3ec178f59a3cb1094bb0130b2127016033fd2fb1e684e263412d1527159569c899dbe1720ccb5886dc31cb7a54da4f72ccabea
+DIST waybar-0.8.0.tar.gz 112019 BLAKE2B b3b61e02a104599e8f9047f9e2f76ec57ef7dd164edca2afd7b0afbb6b2c2341e20d6175905eba525337df9215473afa6cf017f736bb2de24e4daa169a5af3ee SHA512 c670fd21a7d29396d8bbe1b7540ddbbe44a98f7fb49f8518e0cc302aa57e5bb993ff8306973a7b8ca4ec000a7ecc311872762a0782ce19e4bf4cff8ea09caccb
+EBUILD waybar-0.8.0.ebuild 1276 BLAKE2B 8768bd945677fee49b286d8e34de755b687c222525dd8d34bfad3459a2e2f49c9da0a7415bf1c709a9bdc0ee6e39a857060b72d98685a221c38bc3ba6cc0bf1d SHA512 edea2c41126379a6887a6c33e87a59322eb241fd9afc855e6183b44aefee72b32d6f73cbf77cfd968f1c05bc4f7b27a145bd4c907253168301b61151b752a637
+EBUILD waybar-9999.ebuild 1276 BLAKE2B 8768bd945677fee49b286d8e34de755b687c222525dd8d34bfad3459a2e2f49c9da0a7415bf1c709a9bdc0ee6e39a857060b72d98685a221c38bc3ba6cc0bf1d SHA512 edea2c41126379a6887a6c33e87a59322eb241fd9afc855e6183b44aefee72b32d6f73cbf77cfd968f1c05bc4f7b27a145bd4c907253168301b61151b752a637
+MISC metadata.xml 998 BLAKE2B 2aeae48c242cc18cd6a6a28ba48424d5bdb5a2b2cff65553d99ee408e2242f0402ddc6bd2e0e45fbe44d380d7a3e5f5201c4d988048ccc3727932453e86c285a SHA512 cfdbd3845174d2e00dab95c2bb7e11854de2a54bdd5972026e3a1451627f29dc6cc1ae759a4db885625919265c8598a0bf2df1eec492d89430611c575d610d8c
diff --git a/gui-apps/waybar/metadata.xml b/gui-apps/waybar/metadata.xml
index 3ff34b03135a..c61fcb565127 100644
--- a/gui-apps/waybar/metadata.xml
+++ b/gui-apps/waybar/metadata.xml
@@ -13,7 +13,6 @@
         Highly customizable Wayland bar for Sway and Wlroots based compositors.
     </longdescription>
     <use>
-        <flag name="libcxx">Build with Clang's libc++ instead of libstdc++ on Linux.</flag>
         <flag name="mpd">Enable support for the Music Player Daemon</flag>
         <flag name="network">Enable libnl support for network related features</flag>
         <flag name="tray">Enable support for tray</flag>
diff --git a/gui-apps/waybar/waybar-0.7.2-r1.ebuild b/gui-apps/waybar/waybar-0.7.2-r1.ebuild
deleted file mode 100644
index c26192592d71..000000000000
--- a/gui-apps/waybar/waybar-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors."
-HOMEPAGE="https://github.com/Alexays/Waybar"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Alexays/${PN^}.git"
-else
-	SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="libcxx mpd network pulseaudio tray +udev"
-
-DEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-libs/jsoncpp:=
-	dev-libs/libinput:=
-	dev-libs/libsigc++:2
-	>=dev-libs/libfmt-5.3.0:0/5
-	>=dev-libs/spdlog-1.3.1:=
-	dev-libs/wayland
-	dev-libs/wayland-protocols
-	gui-libs/wlroots
-	libcxx? ( sys-libs/libcxx )
-	mpd? ( media-libs/libmpdclient )
-	network? ( dev-libs/libnl:3 )
-	pulseaudio? ( media-sound/pulseaudio )
-	tray? ( dev-libs/libdbusmenu[gtk3] )
-	udev? ( virtual/libudev:= )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} != 9999 ]]; then
-	S="${WORKDIR}/${PN^}-${PV}"
-fi
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use libcxx)
-		$(meson_feature mpd)
-		$(meson_feature network libnl)
-		$(meson_feature pulseaudio)
-		$(meson_feature tray dbusmenu-gtk)
-		$(meson_feature udev libudev)
-	)
-	meson_src_configure
-}
diff --git a/gui-apps/waybar/waybar-0.8.0.ebuild b/gui-apps/waybar/waybar-0.8.0.ebuild
new file mode 100644
index 000000000000..8cd23063c51d
--- /dev/null
+++ b/gui-apps/waybar/waybar-0.8.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Highly customizable Wayland bar for Sway and Wlroots based compositors."
+HOMEPAGE="https://github.com/Alexays/Waybar"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Alexays/${PN^}.git"
+else
+	SRC_URI="https://github.com/Alexays/${PN^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="mpd network pulseaudio tray +udev"
+
+BDEPEND="
+	>=app-text/scdoc-1.9.2
+	virtual/pkgconfig
+"
+
+DEPEND="
+	dev-cpp/gtkmm:3.0
+	dev-libs/jsoncpp:=
+	dev-libs/libinput:=
+	dev-libs/libsigc++:2
+	>=dev-libs/libfmt-5.3.0:=
+	>=dev-libs/spdlog-1.3.1:=
+	dev-libs/wayland
+	dev-libs/wayland-protocols
+	gui-libs/wlroots
+	mpd? ( media-libs/libmpdclient )
+	network? ( dev-libs/libnl:3 )
+	pulseaudio? ( media-sound/pulseaudio )
+	tray? ( dev-libs/libdbusmenu[gtk3] )
+	udev? ( virtual/libudev:= )
+"
+
+RDEPEND="${DEPEND}"
+
+if [[ ${PV} != 9999 ]]; then
+	S="${WORKDIR}/${PN^}-${PV}"
+fi
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature mpd)
+		$(meson_feature network libnl)
+		$(meson_feature pulseaudio)
+		$(meson_feature tray dbusmenu-gtk)
+		$(meson_feature udev libudev)
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/waybar/waybar-9999.ebuild b/gui-apps/waybar/waybar-9999.ebuild
index c26192592d71..8cd23063c51d 100644
--- a/gui-apps/waybar/waybar-9999.ebuild
+++ b/gui-apps/waybar/waybar-9999.ebuild
@@ -18,36 +18,38 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="libcxx mpd network pulseaudio tray +udev"
+IUSE="mpd network pulseaudio tray +udev"
+
+BDEPEND="
+	>=app-text/scdoc-1.9.2
+	virtual/pkgconfig
+"
 
 DEPEND="
 	dev-cpp/gtkmm:3.0
 	dev-libs/jsoncpp:=
 	dev-libs/libinput:=
 	dev-libs/libsigc++:2
-	>=dev-libs/libfmt-5.3.0:0/5
+	>=dev-libs/libfmt-5.3.0:=
 	>=dev-libs/spdlog-1.3.1:=
 	dev-libs/wayland
 	dev-libs/wayland-protocols
 	gui-libs/wlroots
-	libcxx? ( sys-libs/libcxx )
 	mpd? ( media-libs/libmpdclient )
 	network? ( dev-libs/libnl:3 )
 	pulseaudio? ( media-sound/pulseaudio )
 	tray? ( dev-libs/libdbusmenu[gtk3] )
-	udev? ( virtual/libudev:= )"
+	udev? ( virtual/libudev:= )
+"
 
 RDEPEND="${DEPEND}"
 
-BDEPEND="virtual/pkgconfig"
-
 if [[ ${PV} != 9999 ]]; then
 	S="${WORKDIR}/${PN^}-${PV}"
 fi
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use libcxx)
 		$(meson_feature mpd)
 		$(meson_feature network libnl)
 		$(meson_feature pulseaudio)
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index e3e48250f8c0..7e14499544c0 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 5a23bf411821..9450eb0d5064 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,3 +1,3 @@
 DIST libhandy-v0.0.9.tar.bz2 110100 BLAKE2B c1abf60b37d76a0b2f0ed82152decc9a87c9feff664af8df91ede192018a70003ac7ff3c1307668e7196089f59bb5dc21d1449ccc1deb3e2e362f32ff8f9f30b SHA512 d3256c2ff49a7fd0ccfec14ba3e34ed51577841c1670902d25f2a0166e63820428e689c722dddbccf787e1380c7f9a8ddc5b9042a1632b688b151ecce0f6d262
-EBUILD libhandy-0.0.9.ebuild 1496 BLAKE2B 88fff2db178cbf349e94699b1753fac6e0126e7e139024595db71ecbe1e1b7d2b3e3f4284da367ec8124a98de308a1acfa56515bb05ec792913197a7ff208c7b SHA512 1be91194f37e9183137c1c00d15fa95ce88e3c24171afd2b6af3f6e805c4fe3d7e582b99f9d30129f09eaab6f6c3da807772901a7b2be6c16f58bb24ba544b06
+EBUILD libhandy-0.0.9.ebuild 1501 BLAKE2B fec75926cb366648f86086b5595391b30b5769c450635905b700af7a6c7549ac3dda16dfdeb1cb1f7da5e1d6082b8169c9725c4cd6d3a7e96aae5a73343106a8 SHA512 b0a4822f146ace4a95ba379dc9b8130b6985ca6016fca36c65c711b24c9f14304015c6963242e987cc11926c6bcbc464d8209a7bcb4343a1d677d07483198942
 MISC metadata.xml 474 BLAKE2B b8fba1ac64b79eaadbd70099133bc57a69be78738b9da3742ac9381286f62e5198b5b6dc5bf51dd5a11e0ea06819d3ccc00157f7f69939f18db18016db47705a SHA512 d9c79fbc1e8549dcdf6e42263040844efd729440d725df7c8f06bdf5e6c8da0de8f24186c94a2444e03f4396aaa1e4043d1893996770cfa2e5ea9f1b0ca71b4a
diff --git a/gui-libs/libhandy/libhandy-0.0.9.ebuild b/gui-libs/libhandy/libhandy-0.0.9.ebuild
index 8ecc861052b3..28172d856370 100644
--- a/gui-libs/libhandy/libhandy-0.0.9.ebuild
+++ b/gui-libs/libhandy/libhandy-0.0.9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1+"
 SLOT="0.0/0" # It may or may not break ABI in future versions at this point; if new
 # SLOT happens, it'll likely file conflict on gtk-doc and glade library and catalog
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE="examples glade gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 10e17d0681bc..2fc228a6a6b8 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 5ca16a081902..e0dab961d98b 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-19.04.3.tar.xz 332632 BLAKE2B 928fc1ce338f90fa16378eddab3861aa49938f35d434259675362ca1a4461cfc7c4181f2c14f5b037be8f4e512ba917b3adb58440415c34c4a1c91259bab2c3c SHA512 b72b79c51d007669f637299a60dc246a363a9484f332983c348984e62e8e1dfd3f7808e6de9014efc09786f78a12bb705cf11193c32071aef7b916c7a4abc3e2
 DIST akonadi-calendar-19.08.1.tar.xz 331352 BLAKE2B 10eb4a6452e4c7b73fe5277290a737f4f592c1bc49866fef6f10b60644c17b3f04b9d13cb03e1fbadfc71a7e3fbc7fa7e4ba2ca1369da6ff2108813a3345f1f6 SHA512 107f9a94243a5a6be0338dbf773515cd03679319cb32ed7cc4c5a2324bbbeba9252f81034954cc38543075346c36dc1ccd2eee39ca547a41ea1bc80f58af588f
 EBUILD akonadi-calendar-19.04.3.ebuild 1158 BLAKE2B 5810b19759b28d1ccb55642dbb9b27d757176006ec15173515971f0c710bedd3f18b8d46d0400ba984bfffcf0d98b4013ffd4d382f1dc724a6348a82ef971330 SHA512 8accd7ad834b011f61f7ee16f87cb6baca1888c1016766adabac903fb62234450998b4bc850c398ca1de7ba9c7d7c8e57ef4869f4b4bfd4707e1b09152e60c31
-EBUILD akonadi-calendar-19.08.1.ebuild 1063 BLAKE2B b0d94af73531fb07e24dace9ceacfa9e2102d4a705bbc0525665f1bd20dc1ade152415a4a8b72425aad4bbd2818d25a65fa1549f3eaa5a48d55a2dea362f21f1 SHA512 0f4e17f01236ed9557169a127e2aa7bf155d223edca8f7c54bf7eed23cffbb8b7463652cc17104e3e3236efacb18a00a58929eb9121a023cc35a8317186f1b09
+EBUILD akonadi-calendar-19.08.1-r1.ebuild 1100 BLAKE2B 9bffc4187ba8ff627904d2d19fe7ef41d278d55d3b251ff599e4e1f489a4036dd1163c1835c4ccde9fd9b74f80ece49e00a88d83fefa0b23f0185834dbc06b8b SHA512 507dfd3e96f34d3b834518a3a9c9f0958509807e55a8bcd9da007af0f0207a95c96505138e0865bfcbb94f641076f7fa12839e0defd046a4cce95c5f8c8bfa86
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.1-r1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.1-r1.ebuild
new file mode 100644
index 000000000000..da83a34cc7d6
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi calendar integration"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.1.ebuild
deleted file mode 100644
index 1b6ebdae27d5..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index d2b695634ba0..a8cd3e3eb06a 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-addons-19.04.3.tar.xz 2076656 BLAKE2B 1b60fb43489836081a4456836d9c5e521368002550ce2b451ca13565519be04a18e08f5ca7e02ec63ae25efb9614f1fd5da2a519361c4cca488d10e711448fb1 SHA512 b5111cde99153939fb7bc4165331467fcaf607098b81be5ad711ddbdb953f93612ace52a76c6b784060b212ca84af3e1034180964cbc0397bfebf25274509dc9
 DIST kdepim-addons-19.08.1.tar.xz 2092564 BLAKE2B c3b54492dfa5dbc72607d41f7bce147c9ff688c9be3bdb8f443fedf7073b7dee06d4709b197a767a0f80ce5efa78d2e3e67d064e9c02d9d4b23633b0e546f60f SHA512 a962703a507dc5e89a390e4a032684046e954ad370dcb603e918670341d8b9d7950a9b1d420a193a69155130348824583b437c3b477503900bf359767f46ccbb
 EBUILD kdepim-addons-19.04.3.ebuild 2406 BLAKE2B a0369974a7c15003602461ef3c3f59cde976aeb229136d1e4cdf474183068778c070573ecd04ede4e91ffd9d72a4d0036c2c5c767c975f85315cf64c8b90c740 SHA512 90223da6066fdea518da99204fa4e3b3f2e0ba1c134e7f50b6d8a586b63e3b89dacd82aaa23812719e212398f1038913188497e10fc91f4a25586af80ecb4f03
-EBUILD kdepim-addons-19.08.1.ebuild 2410 BLAKE2B 0ca5b1fbedda81a1e3dc65e22f345edaa6e640399901504cef2d0835b02a5481e160b7983763d2fee3eeb62a8a50c11f87de46f7816e0ed379f059b10e66737d SHA512 51e2c265db2e09a23debda99c249ba3a318288715281c9b569b5fc106f1a60a48e3d324f42d053b152030af0bcc5d517f78e14c1fbe631295310b91fc92e4b92
+EBUILD kdepim-addons-19.08.1-r1.ebuild 2381 BLAKE2B 31aa18a3ec0c392b6669eaff69f827ec1f342dc9fe77b1f9ce41d4d9fdf87961db5b3f5bb224112cc63014c922eed489c6422319296588c07669ab14350edbd0 SHA512 31864681d78533ff6747b6553b8a45194f97c6e7283ec7a983a1558fe9497589c5dd10f37f6553109747a1b5a40fed4186510c0a0791bf06cd850b4fba4ea46d
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.08.1-r1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.08.1-r1.ebuild
new file mode 100644
index 000000000000..6ec62ae4c2c1
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.08.1-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_EXAMPLES="true"
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://kde.org/applications/office/kontact/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="importwizard markdown"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kitinerary)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpkpass)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
+	markdown? ( app-text/discount )
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
+		$(cmake-utils_use_find_package importwizard KPimImportWizard)
+		$(cmake-utils_use_find_package markdown Discount)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
+		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
+	fi
+}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.08.1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.08.1.ebuild
deleted file mode 100644
index f7e0dfb16b33..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-19.08.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_EXAMPLES="true"
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://kde.org/applications/office/kontact/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="importwizard markdown"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kitinerary)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpkpass)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
-	markdown? ( app-text/discount )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package importwizard KPimImportWizard)
-		$(cmake-utils_use_find_package markdown Discount)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
-		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
-	fi
-}
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 4335faab8367..f48e7c7af162 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index ffc2bc487b51..2f913c5b0966 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -2,5 +2,5 @@ AUX kwayland-5.60.0-system-wl-protocols.patch 10861 BLAKE2B 9e49babd1bd48214196f
 DIST kwayland-5.60.0.tar.xz 344868 BLAKE2B 54f021380a461b19941d1c17f81887fd102f3c172a650fd2d5cb51d4539a0accc80c942122e190f29d9c3edcaccbb46ae42576d51659a0001e7b3e13ee058467 SHA512 63c4e968a7a492f0e1b2af2f6c511b02e4e56adc35a0504ba9c7c8cea4e463847e36c2ca7c498d3dd2307949fcf62b247f0a85c83ccfd8ab74ac5908dc2784ea
 DIST kwayland-5.61.0.tar.xz 330308 BLAKE2B 2598c718f2ae261ed8f35d16913fa99d968058473ad0940d8facf4f81d81446c0be9e37039e4d927d4d6d12c94946afb5bf433c1dc21876a3ace451d99ff01aa SHA512 11baa6183fa6651133adf1fc32195ac94b9f270a48ecd15b37e883b572c2b9a876c6eeb032e7b2dc98c3dbd68a1e7f8f6fe25c84b6d5453886222c98e0faf7ce
 EBUILD kwayland-5.60.0.ebuild 666 BLAKE2B 9d536411cadf9fbb5615e266fe490e6c083548c1eee13ff7b7267889b63fa25c54a1f86a964f380139c20bc41202f4adb23992496871aa07616a1212807364c6 SHA512 55a1f22651d20309c113395cac513e13b298c934bd9dec404fa6b39ccbebcda243c257d259d715dc6fce38b37163fd4ae9465fca72932a3badba405ae0677818
-EBUILD kwayland-5.61.0.ebuild 611 BLAKE2B f979ca18f3377fad419484c4e6ff8f4e69c5432258fb6cef82e426c5772407f2819816a5f09ac2cc4e95f7f01dfd0ffcf601907eaf1c102cdd12f70194328194 SHA512 7d80ff329a4ca120a7b9e08e7dd98d65c39da9430d855d7d9c1699384ce7a1b625c354e293e77a679b3113f8ab42e89f0ae5c2d9db8d176c7ddc62ccdb402806
+EBUILD kwayland-5.61.0.ebuild 618 BLAKE2B 85ec3378bcfecba0142f3084d65e26904b291a7b651e2a8b6e5b6db803c7c9d383e967432e9ed126ed37a0941bdaeb782fac8e2d738db4b584ea267dfab72ab9 SHA512 f1e6fe829fc289be489d7c975f9184731054d3ea58dde6929423150967fe1575f2d0f93162d300675b932c368cfc7bcce3d0905ab6db24c6a66644fd168efad1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/kwayland-5.61.0.ebuild b/kde-frameworks/kwayland/kwayland-5.61.0.ebuild
index d1a1dd1b09f1..36f5fdef150d 100644
--- a/kde-frameworks/kwayland/kwayland-5.61.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.61.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
 HOMEPAGE="https://cgit.kde.org/kwayland.git"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 993f0465ad71..e0f585fee4e6 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,5 @@
 DIST solid-5.60.0.tar.xz 261152 BLAKE2B 0dfbf35a8fa435d92e97a0e8745a0e0e38e89f0d58b81a8db8f985fe453647d045ba1e7c9523f276c55d3d72630226069b6b05a7991c9fd9698c6a91d0d193c4 SHA512 51781374fede9e16f546924d1a103704e68e1d67a852d53ca9c6e69cf00c3b46a92533b398aad7ba434eefbf25f6201696f46af532623bc5cfac01e4f1cae755
 DIST solid-5.61.0.tar.xz 260576 BLAKE2B 27a74047344a17ee88fe1f649bb83c0ee8d2f9499a06a97073b95af9452b1acc6a3dc193489e0b27714b51bd071d4fff77ea5d02b731988ae9d8f7dfeb3512fb SHA512 5a0aea44255a72ca3c92a8851d2ffe38eab9e68330787fc8ed9436d53da4aa5ffd2441efbf9ab41e5b5e1f4a5fd180aa1e80e3dfd5a843c944e0acd064ca1ceb
 EBUILD solid-5.60.0.ebuild 770 BLAKE2B 0a55f1a63f0c54bef1705fd124b4b87cef32fbf4f00ce76f56e9f00f32613306615da0edec8b7eadca8879482d4ce77f8a129167070199950c4dacb84380f441 SHA512 fbb97c0083ac57c367c622847bfb65e9fbdfa3bec5d4e4c0bb36f581317460af455e011efa13b6032ab3f621fd6fe2d25f02e861df714bbb9878e7fd1d953c33
-EBUILD solid-5.61.0.ebuild 773 BLAKE2B 7023232cddd377bbfcbcb9b6ea391ff5ef2d61d5607297094cf582ecbc2ea38832a2523c8f60a67971fa5b41be4fe700490272761a8c1661033f03b7feaa372d SHA512 2d3a6aa55860a1f1ceab798d02dadafec2d5530aa43372bf6a1f409b83cf6742da6b6cb091d78a764763a7d17952828d2ad9d6ab7feeb6b95927d0d3373cfe8d
+EBUILD solid-5.61.0.ebuild 780 BLAKE2B 5696cda581e9b2792ceee1f230278e7dfb290ca07f5b12247da76d61926579ec6e791b64cc91b3ddad6eae8cf3e0bc067c3b27d188b1e77930b983713b8919d4 SHA512 67887e5ec4f7533eaed9c6467fc5e4a844da48758105c842c678967abc460840289dcc6f28b0d15e348a0383af35e779ed1757a958a219a492c993fb87dd29d9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.61.0.ebuild b/kde-frameworks/solid/solid-5.61.0.ebuild
index 39b3869d7cf6..465afb9a5c4c 100644
--- a/kde-frameworks/solid/solid-5.61.0.ebuild
+++ b/kde-frameworks/solid/solid-5.61.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 5b9029a7c18a..b12a48286ba9 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index c59f179b3ba6..1b7ffcdcfb95 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,6 +1,4 @@
 AUX kdeconnect-1.3.0-no-wayland.patch 523 BLAKE2B c29b58a3f1f97f09c67270f6b55f8122ccca834b979717bc1c5ad279675106acaa23da1d4a4a08dcc4194b6837cb5fce23ecfd12d5d8d1ed4adb8b4fdd077eae SHA512 68527f15ec3f0af14e33e857567c2fcc622f5dd5fc0652dc0af95e91dc5b96929df9db4961d9aa528be73b87e021877d7f6ee5894a2a195446a7235ca979b664
-DIST kdeconnect-kde-1.3.4.tar.xz 286724 BLAKE2B bf3353c317ebbb98e770a1c408940cb4ff5884f1e4a6a7ec4add5e26edf280c723af60f05ece904e624035f214757a8c8b7aeda578479bb6626c848a02155ee3 SHA512 286620cd5ed8da7a0f237710467f12be41ae139b14127b7049ee72c8a7042f67b599b642eb7c3e10a3504f1df11f5a9778db80fba4ac2e2fcd2ab4e8cafccfb9
 DIST kdeconnect-kde-1.3.5.tar.xz 292248 BLAKE2B 9f3cf111f7ed6ed0fd5790e3de19a4f60aea464b7048da423051475824f73ac8ea47f909a88d831e2372c650dcb62cbc845dc519f597f5932c6f973f0ae734b1 SHA512 ddcc8fb9707618e1dadf03fd74d4561c91fe944e72aefa2e6b488efc2fc4803e1f12d889b15aad56582e48bcd0f219b450d6c68e40b5f01d6b0ae109ef45a99d
-EBUILD kdeconnect-1.3.4.ebuild 2154 BLAKE2B d38c9dfe42d9652fef4a598f57cae450fca965bf29164919c95be28830323c3a8d2a58514f5fdf58efc9877cdfca3874611d1a4a6e2f96ca5eb80e9e8b9dd7f2 SHA512 02cef094847c8297ebf894db2d92b3d86baf84593a7c39cd98c3c7eb7f60519c011f6ed7c0288dadc262d0332e5ecda4c4f884eb05a37032542a52666e467d46
-EBUILD kdeconnect-1.3.5.ebuild 2000 BLAKE2B 81f7d10040f8f2876e46f580b2193802ab4fdd785f73699848983e93400211b44144c70c615cee1cbd26d186fe6e800fed2d83277eb0eb2049b7f502bd8150f8 SHA512 0af1ae748892d23cc60f526ed1b48a79d040783bc73fef5c0a8d523289c0a036f7ec982a0144a392c1192c03318f1d959a0c7581db1004106f73c25f8886bea4
+EBUILD kdeconnect-1.3.5.ebuild 1999 BLAKE2B 68c6f2e3fe53fedc4527e06957be4a1a8bd1c14d315e0ad6a31c770a78c9deaec7fb51fcbdfb6687381767c035b27d8eaad14c31ee317e45e9546dc0493333ee SHA512 36f7fe31b5847be7cd82881b7c48f110f13e984054f6f565c700915b681000f6be4e45bcd99c1baaf1cbbe0b89d424ab489f57430b51389dd7adedc4b1d2e806
 MISC metadata.xml 542 BLAKE2B ca880a9dbf862f3b76d30b2fe8bdcf83487606179785fa7060dfc50342df4b73c55a45302b8eb0306559d5da907d958c71ccde0028f23ddf3353465b446a536a SHA512 76c1a4ccab6959be8982ffaab3830fbbe4e3c1c55ad5793bd07fa1c037b1632a2b568d2049bf83f71d437b72f01638d6fe54e17744df95cfe04b2d99828a08bf
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.4.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.4.ebuild
deleted file mode 100644
index 506094ccbc36..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-1.3.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-KMNAME="${PN}-kde"
-KDE_SELINUX_MODULE="${PN}"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://kde.org/ https://community.kde.org/KDEConnect"
-LICENSE="GPL-2+"
-IUSE="app bluetooth mousepad wayland"
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=app-crypt/qca-2.1.0:2[qt5(+),ssl]
-	app? ( $(add_frameworks_dep kdeclarative) )
-	bluetooth? ( $(add_qt_dep qtbluetooth) )
-	mousepad? (
-		x11-libs/libfakekey
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-RDEPEND="${DEPEND}
-	net-fs/sshfs
-	app? ( $(add_frameworks_dep kirigami) )
-	!kde-misc/kdeconnect:4
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3.0-no-wayland.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed \
-		-e 's#${LIBEXEC_INSTALL_DIR}#@KDE_INSTALL_FULL_LIBEXECDIR@#' \
-		-i daemon/kdeconnectd.desktop.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DEXPERIMENTALAPP_ENABLED=$(usex app)
-		-DBLUETOOTH_ENABLED=$(usex bluetooth)
-		$(cmake-utils_use_find_package mousepad LibFakeKey)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst(){
-	kde5_pkg_postinst
-
-	elog "The Android .apk file is available via"
-	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
-	elog "or via"
-	elog "https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp"
-}
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild
index e4a432e2a629..16d096057aa1 100644
--- a/kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 394940b3a620..5bb3d018a0f1 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index a343a224239a..dcf7e4ffc10a 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.15.5.tar.xz 500116 BLAKE2B 1a22e419af79685e241265d392eed7502998df88168adc4292c8500a152a8d1142d56c4a34dee409b29745d8a07f889c241b3ab9ab8f09f3eec68d1ec5826c79 SHA512 ae74adac0a4b20d9ddcf9b172542a3c96de46adb66b2f6c1d4e5f97562572e365f777d1daffd82e677ca1be37e868425112f69bd6e85e51118dc557f66ab5b8e
 DIST ksysguard-5.16.5.tar.xz 500304 BLAKE2B f2e5cb8dd43df8fc16365a0f263bd769e2b01e071ac8e4e49260aa7de5a6e63c70a95b87831a0b2910f523a37ba64d923a20b8e02866fbe8f0aac0f73d85ed7a SHA512 579175da2cc4d9255b36890b716e1f060106a24c609d4cd92accc38aa2c47bf9723e1a19dfa80678619db811b59b40c853655bf678c187d802e137978c3a970b
-EBUILD ksysguard-5.15.5.ebuild 1115 BLAKE2B b111aeed28af34f6abec20f61a9fa7b3c6e3ea4705d50d351a726f3d7078885250f60fbe6b4dc82ee9971365eaf441030ea2ead6142e0f21532cd1b922e66b05 SHA512 3f84a0ef64d5b2741e31599d2fe79ce886967cb3e232a63faaffd07439567c1390804524be22353ed8f26c7bd90a64aadc1a2e99aacb2a5fca81035bbd47ac9e
-EBUILD ksysguard-5.16.5.ebuild 1118 BLAKE2B fd549508418aa805e816b357bc16f349774921dc3566e16a9b95afdafdaa3074da54a073285407d5677c3a1432e3f2b2b2fda8e270273ff6a4259e30389abd1e SHA512 a825e54d5730326648c702866c2bad500554bfc0f890d0c7590c9a21e3ee7cef352648f7396c71fb04abb421a4cac66c96c8a8a809691a457288fb652cf76ff6
+EBUILD ksysguard-5.15.5.ebuild 1115 BLAKE2B ee7aedd0a34cbbf10ac673fa138f2ca3bc0f2ac31b1be14cbfaa9bec988a62132898e122efae8cf281223b30f315a45811c107decc6a255f4576f27058b08867 SHA512 a7d96fa4181bee1c1f1443ac02e03ac663373229cf9a47703f5c80331f4f38fe67d681c57582332a32a263b10a287cef42b108e8c92abc9a4f5d87f6156b763d
+EBUILD ksysguard-5.16.5.ebuild 1118 BLAKE2B f8b47b595b1157311bbabc7109b385072d134ce197a0743f80fa675d841a035f7b6e64cc134f4c3ceb0aa89d2305bd82147d6ffc699483f6670aae656c9626f5 SHA512 ef144abf54483690045c67553b46521cad41f93930cec6cbf42584bd785c0c1d688e662e6c2385f6f8d60d884608c557b9db52605c4566a3209fe03119dbf75a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
index e8a0d00137e7..0a4f54edf90f 100644
--- a/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Network-enabled task manager and system monitor"
 LICENSE="GPL-2+"
 KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="lm_sensors"
+IUSE="lm-sensors"
 
 DEPEND="
 	$(add_frameworks_dep kcompletion)
@@ -32,13 +32,13 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm_sensors Sensors)
+		$(cmake-utils_use_find_package lm-sensors Sensors)
 	)
 
 	kde5_src_configure
diff --git a/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
index dc21acd63e69..b85ffb962120 100644
--- a/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Network-enabled task manager and system monitor"
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="lm_sensors"
+IUSE="lm-sensors"
 
 DEPEND="
 	$(add_frameworks_dep kcompletion)
@@ -32,13 +32,13 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm_sensors Sensors)
+		$(cmake-utils_use_find_package lm-sensors Sensors)
 	)
 
 	kde5_src_configure
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index a89290c722cf..e90684d3680e 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.15.5.tar.xz 81000 BLAKE2B 53193ee41d81576c8f87053dfb388ff1e13c1fc7800956228e9f3d5e776789d4649e41f39829152bd51ba0de9a1ca6fe87b63e0870327947dea939da05488c81 SHA512 038ea60f534edfd1ceaf523a2d00ecb53f62b6f64ce9900b1313f9ab25b7099146167cbce50b31c799644fb0d5c9522a9bcbaad81e9022feb7532c911b2ec030
 DIST libkscreen-5.16.5.tar.xz 81028 BLAKE2B 9afeb4f96c39ce7bf4771ec704da7d8f639af478ce04a0e761b29a13b6cadf010a88a06d9becfec76873b2c7c23c9419605914088b72fe86fbb946d73f8cadef SHA512 f9dd46052cb5b45d896c6c366383d912e659ec617a0214c0c887d4f78951f620c5d368fc55ea615f9999920b010bbbda4a34f7fabc2fcf6fa106cc3561f9e007
 EBUILD libkscreen-5.15.5.ebuild 490 BLAKE2B 650b346825abe5e379592b4054ee2fdcc5f2bbe5ff081550a8179f2d48f6d85e47d8e960b9c3105cc8b9c817c519ff7774dd091e6e17d0ae20c3ff7caecb1084 SHA512 becc6a71c9cf15fd0ca4782dc6a7afbd94f938994ab33925401d5ce9d2d87b4389b2cbbb569f354d7dc6e16d06626decad627856b6405f5ed1572e7d0c854310
-EBUILD libkscreen-5.16.5.ebuild 493 BLAKE2B 2146aa1a0295483478cdc4eaa1edcb55dbd43b1267c9a694a2e4d668475caa6ce656639ff4cd3ffdf767a1c6f8caa41bbc12beaa3251299f36dc93b488666b46 SHA512 7f0247e2c714f26ab403edd2f1bf9f310dbd9abeb5ebe292580bdcf2f8c8e05572f0088f95b4d5a6a9bc4942c33c28835c1d5c174b3c4b2e41b4e42d6773df78
+EBUILD libkscreen-5.16.5.ebuild 500 BLAKE2B 5ae439d1a20a9fec5a316f07d17831cff1dee10f809c070964f3be767db52a1ba1d1db8211108687514766edde4768920b52371d20b3bbe8ffbe68c8af523974 SHA512 cf13e31770edfcaa4261a2b86ae5075b0773f1496529f63537440052712317ea2e5f6cbae5e3f17c92eac795dd41386cf671c933750f969266d28d184c2a7700
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.16.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.16.5.ebuild
index 175530ee8c02..b4ee895edd18 100644
--- a/kde-plasma/libkscreen/libkscreen-5.16.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.16.5.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Plasma screen management library"
 SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 23611cdc45b0..f93ffc54fa20 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.15.5.tar.xz 182452 BLAKE2B 215706f06d842a4be26e5032087ab6eca7b19a93ba998eb46d90593796b351bde893234d7cb097326a58d78a30584312eaae9e0ce3addf44ecfee0553e6075d7 SHA512 9bf486096c8e22779354ce1cf1028f7e55c1dae98da2bd9fcfe496c761e819d26756490d75e531049e519c0ffc0eeb643577004e022c0b0a988730d833ce6ec7
 DIST systemsettings-5.16.5.tar.xz 180252 BLAKE2B 75860a6aad43dc2804cdb4eaa649dedeaba9fbb3d5a78bb4c49309e2e452cbb08b29040426643d5a07ff904041787d72ec0e924b4e0b81b5ad17aa0599139e8e SHA512 b9899ff13a16fcc59d3daf47d327e2711ec544c672e61ac875a4cfb02716849d735b8aaed20e4e38ac5f8f9f926ee01065d2d2d6db76f74e72ad5333c96cfb0e
 EBUILD systemsettings-5.15.5.ebuild 1492 BLAKE2B 05805262ba9a7c1cd84a9fdec25abf7d929fba64d084bb7a462a55ad07717d4a01d882324a16d752676593b4c590968c5c2d0095b5c924a590677af3df6d127f SHA512 9615a4a30efafacc73e646775e06b166423d27ee0b2961b573b5fc9bc546abd1cadffd16bd9606c08fe927b05fac7f1fb9f206dc50c151eddc128e3bcbb9973f
-EBUILD systemsettings-5.16.5.ebuild 1495 BLAKE2B 051f196d1b22dc8ad122babf77457cdfa40e5a9ecb6c35697513d89c59aefe4524583e4dea340302a6b2e32a9da12f2bd7621efb6ffe5d605d79fbe668d9c364 SHA512 36912552a68f2207fb681a9ea853453742e06f014b6cb66a38c43fa7c8da891d3283dec231c6b843302ff1712970fa541d28e4705cc92cefcadb874a7efe595c
+EBUILD systemsettings-5.16.5.ebuild 1414 BLAKE2B 08d73f08fc975c6297619619db78fa4088c4cae2052d0c61c4845f3c272d6bdacdeb07fa2423d365bc23a211173c211fd846a806cda07b13b5657b68d0b71800 SHA512 e9115e4b61fc90931348a410d8cfd41c48e1451975a1a5b8a3547b676a28e7054fe3ee71822af41a0156089b0f5db7fee20cd71068538820e9d68d7b066cfcdb
 MISC metadata.xml 363 BLAKE2B f3d12ec4c4202f55b6f32033a4bb62d41da1cd188c5661a308c315f8eb86fc7190cb3c4316d4a393f686b722f09e5a3415a48c5216ad8818579d7bd9db8022cd SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb
diff --git a/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild
index 3822242a75c3..ffaee9dd4312 100644
--- a/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild
@@ -6,9 +6,9 @@ EAPI=7
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="System settings utility"
+DESCRIPTION="Control Center to configure KDE Plasma desktop"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="classic gtk"
+IUSE=""
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -36,11 +36,9 @@ DEPEND="
 	$(add_qt_dep qtdeclarative 'widgets')
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
-	classic? ( $(add_frameworks_dep khtml) )
 "
 RDEPEND="${DEPEND}
 	$(add_frameworks_dep kirigami)
-	gtk? ( $(add_plasma_dep kde-gtk-config) )
 "
 
 src_prepare() {
@@ -53,7 +51,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package classic KF5KHtml)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
 	)
 
 	kde5_src_configure
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 90103e745361..1c9529737a55 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxmenu-data/Manifest b/lxde-base/lxmenu-data/Manifest
index cca6e50aa1d3..43d511f10c1a 100644
--- a/lxde-base/lxmenu-data/Manifest
+++ b/lxde-base/lxmenu-data/Manifest
@@ -1,3 +1,3 @@
 DIST lxmenu-data-0.1.5.tar.xz 199192 BLAKE2B 2aeec1e350a06c0fbdc74136590ce132944503f5e411df2c22a0db61cf9ccd02303b28326dde9d0b0ad5098327e9cc35c4a9abccb9ccec0c05370128e68d12ba SHA512 ea1a1ad511d9e56c7692a8d96feb52c53aa7bd7595f2312d4f41fc15a12a056551c70d6a2c55a30f849e2ac2fd1a06436751573472ae70e0158e069736578b40
-EBUILD lxmenu-data-0.1.5.ebuild 516 BLAKE2B 3eac7562e15e045e7e6b8c657b33c9f7c063aebb161bc7c5be6390ac350baebfbafbd7ca05ab483ddc9183b88ea7d3f8fbe4378f0b80fd8656b5fd2c8c06c4f0 SHA512 4cf53f4a2d419843773409eb4b87778c60fd20310146d85dcf21e568f46a50ef00cc759964cae707dbb3c82399762b33f3c714b7f271beac491c527086029f18
+EBUILD lxmenu-data-0.1.5.ebuild 520 BLAKE2B 5f6ef1ead8b54ec9402ecf568db73e52a9d891ba4e0e94789d3cf69116ca53f35e1e5557199d9ab9c4bf5e8146acdddc77e5d89b4a757c9cce41fbe02836f390 SHA512 68cdb002d2bee4bc62686d1cd158edd0b02528a5403521dc5cbc1d2659449db7cdba0d0bbe59519e0e447c89843f45548a0b534e5e6602d3dae4d599cdf53f4b
 MISC metadata.xml 335 BLAKE2B 8cda3e7dd4b3668ffc5c311b5f002afaaff19143f058eb873d5d917c63f6752fec6da156d869061939803ea0bacbed80ea0a56e92d53b6e06025ed9b3f3c9462 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7
diff --git a/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild b/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
index 357b91d992a6..953ba4af97f9 100644
--- a/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
+++ b/lxde-base/lxmenu-data/lxmenu-data-0.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index 97372285db9e..e55b62b1417b 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -5,6 +5,6 @@ AUX lxsession-0.5.2-reload.patch 1324 BLAKE2B 9457c86d228db27eef0f32149af14acf75
 DIST lxsession-0.5.2.tar.xz 354092 BLAKE2B 3acbf1be74ed461d331ea8ed10e5c403057671d5f7f32c72951ba89681ad4b0b1a104c2962805738e5b414549e84db3e12327172ffe1b7c6f13a09e09c44fd0f SHA512 2e08e5263bb4ef9d8051e84997347a12d2f1ba75cf4e70f9e3ba783a509246f0d6efd672ac1cc1d0fffc8707710ddb148298449b5365deb6785623d596bc3da1
 DIST lxsession-0.5.4.tar.xz 422756 BLAKE2B a04c67dbbb9da6405e165a05eb43d82f9d7ecc943147a8c5ab4fb5edf50b40b408db102ea1e96e142f61fcc2d1ead023685c33e1c26c09a4183882cfe9c5c930 SHA512 5b92d6e703ef692e3788554a3a34eca7bb4b7bb23d735af838c35bfaab142238eaeee3095176e5e4a7464468ab5478a596c670b0e2488f8599091f3e2fc8482b
 EBUILD lxsession-0.5.2.ebuild 1757 BLAKE2B 47b9ba8b2df76bba57ac7d9f7703679dd12e403ea594af067834251425cc0ec3f310217612ab42f25ef0e6e7c5911ad3bd2828833f71026bc166a14eb1696f58 SHA512 2d9aecf337f2db774aad29ea4ef92d40e05b46d6a081ea784bb8a400f6d2d1445d409a381ae85be989551196cd1324d12fc87d50b48f2bd98d40bae8f0955775
-EBUILD lxsession-0.5.4-r1.ebuild 1291 BLAKE2B 0d965bb254b94e1713a41b528eede2d9fdfd16cb414ab32058b80221bb088210cc73ce8ccc571838bf90ec262c40e523a770aee34a6b89cdaee650af5bfcd737 SHA512 95c802de41ebe502eed91ffb33ba714b077899aa1de440533ef3cdaa66591a88c7c7532a08b70208a45466debdb476b50f58486d02855bc7a23160867036ee90
+EBUILD lxsession-0.5.4-r1.ebuild 1290 BLAKE2B 93b1bdf8336815ead7047ec60eee217f368794dedcb64275f089c0eb193c27a8676b6b3b5bcf19b87b72a2dffa1f32a3824d573a79961051ece9eaaf255de62d SHA512 2a0603fa679e5000e0fa476655641f8608647beaa5e347491962b756a57b5596b6d9b3a8bee49ecbcb2253ebfadf16466d956a1fad5eface8da077b1a45df806
 EBUILD lxsession-0.5.4.ebuild 1311 BLAKE2B 01b9d7d65131918545a0290174e75ec1085b9d282c6a5c20897942dbe7b36474b3462849307044159f4d0d36c72c2b612bc6bf900b2a98979471fa212949d15f SHA512 be85604140af0e52cd71695bdab0b315322cbc8e69253181821227c33f3df3d58c9b386763749cb6d2056a54f014da05e87c14ffc11baf16f592fedd46a38f0b
 MISC metadata.xml 335 BLAKE2B 8cda3e7dd4b3668ffc5c311b5f002afaaff19143f058eb873d5d917c63f6752fec6da156d869061939803ea0bacbed80ea0a56e92d53b6e06025ed9b3f3c9462 SHA512 4c2d3c8ed34571ef578e11a64d7cfebe44e87353c59e1711f61ecaf224bf8596e8693651b1f3c185c87275f6b980d4ccbedc16828f30a16ee3899a2f020c53f7
diff --git a/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild b/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild
index bc053c8f2998..d8dc1eea684d 100644
--- a/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild
+++ b/lxde-base/lxsession/lxsession-0.5.4-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.lxde.org/en/LXSession"
 SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ppc x86 ~x86-linux"
 SLOT="0"
 
 # upower USE flag is enabled by default in the desktop profile
diff --git a/lxqt-base/Manifest.gz b/lxqt-base/Manifest.gz
index 7df80f98a035..55ddc9ef11a8 100644
--- a/lxqt-base/Manifest.gz
+++ b/lxqt-base/Manifest.gz
diff --git a/lxqt-base/liblxqt/Manifest b/lxqt-base/liblxqt/Manifest
index 7e3e65e5398b..44516e9720a1 100644
--- a/lxqt-base/liblxqt/Manifest
+++ b/lxqt-base/liblxqt/Manifest
@@ -1,3 +1,3 @@
 DIST liblxqt-0.14.1.tar.xz 81704 BLAKE2B 9aa190fce337068d02962af90c1847acd51a63c44019c9ccdc729dea00d52cd65826e50850e913306f5e6f0a20d1e25b4f90cd09ebb9012c2c3337aaeaa3665f SHA512 28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba
-EBUILD liblxqt-0.14.1.ebuild 849 BLAKE2B 509af4066113cf65371709314965b297d19b2c83d3481b798345d30c0c8036726e4bf4c00ff5ffa28887b108227931da8cc64d3e2eff103f4b0fdf3ca55d0ce4 SHA512 da7c14adfbc86b99b7017543e4091daad8e2841e0a5f12d33bb713f247f207935ea9531fb65c8fbf985f3d7840a8c3007227e5f8ec2675b8436abef0b4c6309f
+EBUILD liblxqt-0.14.1.ebuild 856 BLAKE2B 443c2851059a5861a131b217c664a85d34b4749a237c4a1c9251504cd280c6bbdb44dc1bc4ff37341c8058de431e4beaeb3eb0868f050d9c35d33a51d0ea06b5 SHA512 0ee36cebdbe59e041c1a2431646e216c8a94ed3bbfaf97d089eb70f91bfee90a8e0e64b1f420d556e3c075b6066e6d52077bd38fee60ed201a1e9711b6e00280
 MISC metadata.xml 313 BLAKE2B 6eee2dbe392f7cd8b5f033d718e5ef3c4d07b788a09d99d97f06ff7571153366bf9367bec44b18d8c096c9afbd8be76776623b0fcc78bc2507422e78ab197405 SHA512 e3a460c17c69d21bb39bc75a79f36154afdd3b38abe18bac568afb28b5739ffc2ffe5d33607037ae32b7d6925512eebf560562b3e157dcf1e882d3bd9deaff54
diff --git a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
index 2aea29f7f743..5ad13018bb8f 100644
--- a/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+ BSD"
diff --git a/lxqt-base/lxqt-about/Manifest b/lxqt-base/lxqt-about/Manifest
index c844127ab9ba..fdacc03c8ac5 100644
--- a/lxqt-base/lxqt-about/Manifest
+++ b/lxqt-base/lxqt-about/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-about-0.14.1.tar.xz 36204 BLAKE2B 99bb41746b2ba3943f3817a59dd0786a3fe95a3ff9046a7a382351e17a835953c5fb8748619c2520e18fa5ba665bcadf05fe2c0992dec39366270de26f009fcd SHA512 09cbb4c6c331b16b551d1b63ad4643f424fbaa35cfa9e2d4c70393fae499d403bf8a70c8105d258bd84200d06862033bfe0a082500e794b0db10df38d27b407a
-EBUILD lxqt-about-0.14.1.ebuild 652 BLAKE2B 985691928caa0b34c06f2790cc96613f980958beb502c6e5443026a606aa5c98488ecc8681ba059e0dd35962e4b06498edb8b3e2b0db80e80a47b55a28a1a919 SHA512 60e86441b0326f25bb2a12b61d7ab72f0814b1110abdf960a2094ef11da27f3a958b4ac0f737e9215b4427e179787235425f371aef2524d23b8cee45fbb8f887
+EBUILD lxqt-about-0.14.1.ebuild 659 BLAKE2B 347cd729c1d2473e18f74616465aaa8836b878b0287c6db77a72aa8f8505acecc3359336ad5ce8c0224ddc4e9fdbb43e384272e07a3118f7c283c669072803a6 SHA512 0d799928bd26ae81176d069b4e129dc6c6661e2d8032cbda68bb4d34e5e2644f230510a30c6c9d339fedda4c12bba885352af1cd13961b9262c401f8f2ac9254
 MISC metadata.xml 316 BLAKE2B 36bfefa13949cfad10150cddaf4d8e2fdbf96632479d9b6a3343f7b9b51e83d34134242b0e5d3a5a0e25a3159030d7a5bc1c97e9ea27d0d85663be67dbadaeff SHA512 b5109f43afacd0a858485db451a587e8dcf9ce2d8f3e146d0c24efcd5a88404265c8e99578aeb7da55ba3429e27c52e27acf6adddc1015eda4f8e57c5f37ef91
diff --git a/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
index 4d0effe311d3..6b986282a3c0 100644
--- a/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
+++ b/lxqt-base/lxqt-about/lxqt-about-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-config/Manifest b/lxqt-base/lxqt-config/Manifest
index 771f5ed01500..ac20b137d229 100644
--- a/lxqt-base/lxqt-config/Manifest
+++ b/lxqt-base/lxqt-config/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-config-0.14.1.tar.xz 293304 BLAKE2B f090d7878815edc4f3f0078301a099ffc8ff57865516a9097db75faa1627af33c60d76b75cef8a7da5e9e790869e6768f54c3b17c59b038578f22d645c3c22fd SHA512 747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f
-EBUILD lxqt-config-0.14.1.ebuild 1456 BLAKE2B cfb215ec259e1c71c4d68016f8007f6c8f4385e23d22c5b808c0739e736f2edcf4fb01f8d0142b6ea9ed837703076c42e8ac011ef4b728722d5a5acf5a6afe9c SHA512 19224c98ca49a85f21bfc60000f2d9c27be774ac3f5137d72b72f8da5222926dedddc4a343e53ef4d944c34bd5f76af568434705c8033f992279d65683316845
+EBUILD lxqt-config-0.14.1.ebuild 1463 BLAKE2B 61fa87db025c0f76a5283a8a08562ffd69f9873a36130577bdb439bf2736c4f980804a2b94877d94417ba3906a9c553af1f4a95150a4eb475709eea59a6daabb SHA512 5e6fbb24c45836e0d64ea41a1414736d308be2bccca4b064495cdb7802722636c9db4adaa1230fbbb5a5078b49380d35511d3004f7b30b2a3bdbcf31c7cde24c
 MISC metadata.xml 450 BLAKE2B 6f59cf0984e8e6c625eef75e01275d3d9e0b09fdbc1fc82fffb8611b44654da27da256148350c632673352ebc397f07b4696efad6f1f0d35489468752a4293cb SHA512 9e74d2cdc46c1c7797ac91f141995fbab7e11f4f05bef094e2af89d3cfe7d47d209de3de5726eee2eb45926185803ff7c7f012aad994f1acbc43feca88e798fc
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild
index 8a62a41a479c..9ca987137e59 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
diff --git a/lxqt-base/lxqt-globalkeys/Manifest b/lxqt-base/lxqt-globalkeys/Manifest
index 1293b4b89d67..45b331656d60 100644
--- a/lxqt-base/lxqt-globalkeys/Manifest
+++ b/lxqt-base/lxqt-globalkeys/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-globalkeys-0.14.1.tar.xz 63496 BLAKE2B 9186b04d290260503a133f4baf9e4156abc056647687f518eaf460c8bd0e4e48d7f4639d1f51ab87f9adc1e2139f0315940eb3da5d098b3b0824e98ae97eee90 SHA512 7683971a916adb0dff8efd5567dad11e0860e48960bb6ed650aa2cd8e1bc33f7b8cbff95e19f198e00b61eea4f7492b41e7a0acf19365143c1c0ce8ea0cbb2a3
-EBUILD lxqt-globalkeys-0.14.1.ebuild 828 BLAKE2B 849a2498c0ddd402e9ea06b596ad87439f84835627ece1751336bd52c827839f7abe71cbc9e4396eff56cd2f4c8b11cbc8ecd4470b1d03fd6063ff42c8409d72 SHA512 109737bb960c4fec2ade68da6e5498d1ed274d4210b57a933462c9df4efe5e46af29ed82de5a7613de587157783136eace5f951a8d1356cd1356547474f56bcf
+EBUILD lxqt-globalkeys-0.14.1.ebuild 835 BLAKE2B 13c9ad062fbe4f57514796f215cf93c7947c8ba72b6e5274232f07fe8388ad94c196b7ca4cdd632a65f6481fe2da275764b3e7eb769758dd3afe966681591ffb SHA512 1efa546d54764131e69857f07432205a21c31f55e7d8cae00cdcf4fb683a01e75994ae4639931236ac70f9de9f9739e96ca6166e60d35b1dc30305c3e96ce0a7
 MISC metadata.xml 321 BLAKE2B e4171574ab9b2b3ce038ad57a140049f2835aaad88c8ff7d372e3f65f2b696d27719c1dc2c1b8e98ad6dc657eae88405fb2e9d0a5c88ba48db772f30b1511e5b SHA512 2ab81bdddeec9b554082577559910d8d7f6def6aece5bc1ede46d5d74e5f1e23f86b6256f4e7b6cd55e88523261dcccda4970f26016a817c922d0249fcc30589
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
index 8e1ed79e32ba..49dee3033b36 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-meta/Manifest b/lxqt-base/lxqt-meta/Manifest
index 2ce8d33cec73..15322e21a0e6 100644
--- a/lxqt-base/lxqt-meta/Manifest
+++ b/lxqt-base/lxqt-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD lxqt-meta-0.14.1-r1.ebuild 1741 BLAKE2B 98dff60ac91f7f6b5fed773fd0c7c74ab88d5c38dd3bcb0baceee68a3818592a53457d4a8005fd36a7592a540e34b86a78f41e8271826339628b152c52ea5614 SHA512 c2f8e82f0188e8a9a44f3b8e3b273b86093a8fc5f7471de4219e5ad2601e99a8014f09027fd04e09a65f5b25bb7f94ac353b497d3ab7d33d3b1846ff188a9b33
+EBUILD lxqt-meta-0.14.1-r1.ebuild 1748 BLAKE2B e12a4f66b1fb6bead5a55b9132aaa5b7836d9aa10bd58edd1e28b8cbc3a439aaa8d1c3187248559e43dc341bff849f04db3e203cedf681df386df515c3b8f381 SHA512 31707c8acdf43339fb4ffaea6e7ba2355d4baaf7d3d4f20c282cb345730bd37e18794feceefcb739fe42d345088f20a8d36a8aa4c0f77fc2140e15a2ddb98869
 MISC metadata.xml 1526 BLAKE2B 904b5a67781f80fe9467970ea81a52444e5936114ffc5e7e91ee2da9ea68f1d2bc16531e76d08345bf258b1cf3025a63f9333d4bfe74b5a04329c982abab868f SHA512 b8a34fdc1db1caf60524fb7348da13bbe2064dc71a4943c60fbdbfac6a676a5c283e78c77729004952a4f88826c1af7a0435d4aed0db6ae0a96afc5a28998435
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
index cf39cb918110..2b3a117cfc9b 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.14.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
 HOMEPAGE="https://lxqt.org/"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="metapackage"
diff --git a/lxqt-base/lxqt-notificationd/Manifest b/lxqt-base/lxqt-notificationd/Manifest
index 0c1cc568e45e..4e7430110fd9 100644
--- a/lxqt-base/lxqt-notificationd/Manifest
+++ b/lxqt-base/lxqt-notificationd/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-notificationd-0.14.1.tar.xz 47356 BLAKE2B b80febe059a17e30df4abb81e6d63271b8955211474d80853dc54ea65112081160bf270766654498b50c78c58df4444682e1e9b9cac800c4afb294fdb2fdbaeb SHA512 dcd1892ff66d6beb5c8953c6731f798a59272365fb7439277732b145cc9e6479314415481d9e8aae9fd670d779011c3d7bb3874b05a67cfad2a722f467866795
-EBUILD lxqt-notificationd-0.14.1.ebuild 748 BLAKE2B 06ddf586fa47663f6913ea29a5e99ad9cafae3880030d800693df15937a392a3abc6c2d86e77dd7757fe6f0b66cf73a03779e5af08ec7cfa6e6058507111f3b5 SHA512 32830099724f54901296bc6b126f2f66a66e7ab4d8124aefd592d8977d777609d57d27dbdb4c19f49b7306d415a5d4ae7008d0d833f86540def2d4da78d04303
+EBUILD lxqt-notificationd-0.14.1.ebuild 755 BLAKE2B a39694f67fcf6804021931795e0e7ae0649e0f55f5b3adced7151f25f4bac763a19188bff8267b16a704f1a693682f98dabf016fd1f88db031d101569e68454d SHA512 6c9e66ba542d10ebc9913602a4290319c0ca4cec2472c1c70daf3da2b074681dd2901ed1985743b604dd9055693fa5e9e152a17b21aa511c520a59cbb9f19f5c
 MISC metadata.xml 323 BLAKE2B cc28b17d478bed98b59743c03ceb630cc65495414d1dd5703b917643f54ff606518016358e2b0149cc25082097a1e8dd5cb2ee173c235aa6cc4197d9cc258493 SHA512 3aa6fb296384049f738b51edf21ea16a7a68cad1cf5bc79c6c34f970f12292afdb44eb34bf6b48c8e884903dfad041e1078b7409427aaeaabee48d5ee5c1bc14
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
index 5e97db50bc2f..7db414c40593 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-openssh-askpass/Manifest b/lxqt-base/lxqt-openssh-askpass/Manifest
index c867960288fd..0bc575dfa6d2 100644
--- a/lxqt-base/lxqt-openssh-askpass/Manifest
+++ b/lxqt-base/lxqt-openssh-askpass/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-openssh-askpass-0.14.1.tar.xz 16848 BLAKE2B b774027c878c75324a5908244ef2cf33b0a092cbd2c0801c92c1304a6eed40fc8a18919ac25c6632ba306bd7f56cfc64cf9880cf166639cf5a8eea4a1bfad66e SHA512 ab35cd719d4a31a495bed68a30cad5bf85701d223ee7306f0dad40717d0c2821af53e07a929b5855fb0cd680684fb790a638b59a1ea3ef288e0f656ab490b5bf
-EBUILD lxqt-openssh-askpass-0.14.1.ebuild 831 BLAKE2B 2cd3c3fd5a20fbf353d38a483b7474ab9e0473a0a186e631a10068496ae0050b115ffd09719df4fff8508ce2aae636f756ce56f8c92c36bb465da3ec28006f92 SHA512 ed4d5c2f6ade63577827d191dc1379ee344d1fa3e0619682fbdb5cfdbb48ed6822ec41a62cc380f5178750dc1962783b116e6bda103e696938471a86ff71d989
+EBUILD lxqt-openssh-askpass-0.14.1.ebuild 838 BLAKE2B abb723b548929cc3e70e5205dccb1a5c6ef8249dfbb09075528dc0e182e57b617b05ff7b25809315646eb34f3777ee1825e888df776a5a4de1cec9e5f3421a0a SHA512 cadb4a5cd1a67982b85db324c9a69fc389ecf92e4308fdaa96122a31154a401d1680bf663c5c517d6b983cc58f82be4613ef1de9b9d3f7df5df7c6945bc5f8ef
 MISC metadata.xml 326 BLAKE2B 1e00f54527db197d3a43db75f66f6f3d7575560895b815593763522c4696dfc15d5293283cbbf2105747d1b367b3da0c15b1ba2d8bd8bb6905899d0ed51641d4 SHA512 b3984c193ce7a1aa091c4bc90c8933245e1479094ba3022fd9c922c89f81c53a2469542606d6e87d5d6ff78b980999a4d4fa42297363cb31daec41ec9bb0a3da
diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
index 4a238a176bd1..aa20a07bf10e 100644
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-panel/Manifest b/lxqt-base/lxqt-panel/Manifest
index d5f7409b9bd6..170fe6323652 100644
--- a/lxqt-base/lxqt-panel/Manifest
+++ b/lxqt-base/lxqt-panel/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-panel-0.14.1.tar.xz 439252 BLAKE2B 28172f61cba99450965ca2c1660ca51f268a93ffc32769b270e5c5984b8f3534c3e8736f07334bdec1a1eb408ef35a20bf12de5a445faff161a93efbdacbe51c SHA512 e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687
-EBUILD lxqt-panel-0.14.1.ebuild 2886 BLAKE2B 94f6fc488f88e6ba186677242cd2b8e04e602d96cddc9fd70aeb0a3231b1a7ab3149fabad37d324b2530c1e246b8105e3296eaa5fe5b14fee135f0e48a45d0f5 SHA512 22000c78dad5c66c28a9c587bc7d68a1e79ee9330767474686124f176d1637249967fcd6299c7f6cb5af078e023c0adcddd1bb08b4a492f478835a7d6f9add7c
+EBUILD lxqt-panel-0.14.1.ebuild 2893 BLAKE2B 36cb00a73f8d7708aacf318045e5ba8b58d440db74d39b68c849f50ecdf89541738ca84f10eb019174df5294ab364af944b4e0e281eb558bda49cb8ab0a7c94c SHA512 197dfd07db67ebdf8e1fb5ab74b8a24101af0d25b2e58ccbcee551d4dab0e4ebf74bc0577295bc9ba4db21c59859ef318cc5217a07529ae719c557051e3edf50
 MISC metadata.xml 1370 BLAKE2B 6f9292ad43d3b829ba3968762f767e65b91bd71156e5e81f77168eb1377d812790e087e173e2db80e30238d423cebb9909013528e8cb8e83dad22f6cf8ade9f6 SHA512 cfa369a013c942515cdb50400c03ca57089d0a81eefca77997e217928af08357f71cbb77e526815cf3bc101f597dbf813acf56fbd04e4e593fe6110e8f711747
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
index 37900fb9d409..7be8a5fd4e4b 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
@@ -54,7 +54,7 @@ DEPEND="
 	kbindicator? ( x11-libs/libxkbcommon )
 	mount? ( kde-frameworks/solid:5 )
 	networkmonitor? ( sys-libs/libstatgrab )
-	sensors? ( sys-apps/lm_sensors )
+	sensors? ( sys-apps/lm-sensors )
 	statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] )
 	sysstat? ( >=lxqt-base/libsysstat-0.4.1 )
 	tray? (
diff --git a/lxqt-base/lxqt-policykit/Manifest b/lxqt-base/lxqt-policykit/Manifest
index 924e6b18c63b..234317a56fe4 100644
--- a/lxqt-base/lxqt-policykit/Manifest
+++ b/lxqt-base/lxqt-policykit/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-policykit-0.14.1.tar.xz 37616 BLAKE2B 05175f99bd63fae795499eff02b224a589842e6f4ce0faa66dcb949d99625d8fcdd54600d80832b5211e297e9c0da3aa33ecd6e47b5dd7b0e544a1d301e4e483 SHA512 c3df41a45ef4d04eba9ce0c9f29d4c9b68a192302e85e192a26ae73617b87d0ad70ec64135f500485d4c10095754e36935bf9790ffd83d0197b1bb784971a940
-EBUILD lxqt-policykit-0.14.1.ebuild 817 BLAKE2B a4a19029dfb9e43afff35b95475a6503e0cf9d2008559a92bc4cd55e85d234da65c23035f5e5398f8741bcd0f4e18d0cd28f1fbbca0531a14909003f1dae9ede SHA512 bbb8d52bb1f0333e07adc262c0f7d04a7eb822c58968591dbbab42f93a49c1565c2b8b6442e4c0913933bfc1b1486782d99444e1ae341afdba99178d0d3571e2
+EBUILD lxqt-policykit-0.14.1.ebuild 824 BLAKE2B 8455784d68baec7fb641f1efa33072e2027c7b70ece547993d0a362b34ba43e1ba0b297f5d380f23d554e00db94915be75a8a319cfcd6cc449ef52686d5f78e0 SHA512 3c325f2074cdde18bcf91617cb9c2844ef4af5042cada2a976596bce4a56ddd8045a223162289168e451f06d5099278f44dcfd6495c8e3bf4456a99d157805cc
 MISC metadata.xml 320 BLAKE2B 06af6102783b41528cf4a8afd437db1524460cc47ff1004e4e45a8903673019f6c85ff948472d07f053787a767c2d5b3c1986ad20645e0418198e8b7e2d20736 SHA512 24085bd13cb0c25b25737c74a4817ab6a252079c0cd3d29f3caf1ab5e02e85f944653844059ecedf28629b38ec46a02163c806f600bcd044528d4951868e168b
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
index 3fd7c16d7fa6..a363f9991e9a 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-qtplugin/Manifest b/lxqt-base/lxqt-qtplugin/Manifest
index f14297e1a0aa..0c7e3ab9075d 100644
--- a/lxqt-base/lxqt-qtplugin/Manifest
+++ b/lxqt-base/lxqt-qtplugin/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-qtplugin-0.14.0.tar.xz 22336 BLAKE2B 8155722880cff279aa26676ed425a011b2259ba94bf92122c59643a0ac6dd89b2841bcbeeac26ac24ef1e351dcdbcabf339c4a2bcee2dac30f2f9298434f7294 SHA512 33188bc03ee48a9b6e3cc5823cdcb5c96dba0cda65da511fe603d952c5de24e292cb02208cf357b04718df90f98d53bf48eaf6793d70d043214e429f57ccf53c
-EBUILD lxqt-qtplugin-0.14.0.ebuild 752 BLAKE2B 0627063577b193da7e78cb15140157f81bfacd9fabb3025e6596352e6e660d8cad47e6f88e4bb4613f144212d5d01c507a77b1563f5bed0f3f565a5f0fd7c0e9 SHA512 3ec2320bb085cabb4ca0ed45ad64cd48988b5118abf8870200f6ae154dc9d81f4defa4e0142088702f3f429211f9ff7cb8892f0e1cdbd00a7fc3bf8584b273e4
+EBUILD lxqt-qtplugin-0.14.0.ebuild 759 BLAKE2B 49c6d7e38f5e1a25e9cce79fd25c7255df3ff1f1d25b63b427a360eed23454844757556307459800e30d7426205165ff7c269a3c82a2a329394893041c0dfdcf SHA512 2a5c3e55892034b1108b6dcc6799b7c23f2fa0f5e04242f49e52a7ece5c436400f0a3be353d7623f088808675c00f18adc4693890d60c104665ebe5e628fed3d
 MISC metadata.xml 319 BLAKE2B ed7979a51580013c60fc88f432f2d8a0597a4970fe80282c91bac412d9e742d563972b30099fef401a5fa2d9bd66fc94b139e082f9eca9f0be9426a0cb8bf9de SHA512 960097272754abbf37028a661cc950852cc2a5573081acc2eb8f101ee865513d639a18f3dafe720a92b52ec5b8b48f52f4c79823dee88d0ffc59df432e506a78
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
index 650a7de2aab2..784e94a33996 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.14.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-runner/Manifest b/lxqt-base/lxqt-runner/Manifest
index 94d8aa19dc76..dee7f5f54de7 100644
--- a/lxqt-base/lxqt-runner/Manifest
+++ b/lxqt-base/lxqt-runner/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-runner-0.14.1.tar.xz 223628 BLAKE2B c9f5879bc4c58d0a9cbc19e6efef7fc26bd479e14b7e7109458501372e9b3e251bf87889a1913e6bbc99b68b96b450e71ca57c764aac52afedd35e9904aedd40 SHA512 62d196d37e87bc9154fa2cd9abcb8671277bffdb8673a6531bcb93161944cb8a31298587f8323d79a290292fc73765ea15990106828335879b87029ff1aba28c
-EBUILD lxqt-runner-0.14.1.ebuild 920 BLAKE2B 309e1406dad7fbed6689c4c10b5949e01b9f00e8522a479cbac97356ebfb48dacbd3bce828f96540f0d48260cad3876b215556f83bc07d8ad267ba29fa422301 SHA512 cea6087d127513e81a7fe8363b6c835079e306c982f6ea4d89dff972cb3b752cde395c397c44f891f8324f84f6c38ca6180eb74389b0208fec5073c9a1af7617
+EBUILD lxqt-runner-0.14.1.ebuild 927 BLAKE2B 9ab5de4051f6d83cf63d1c33ee557e9b5e1e2e14db6fab3d5fb89f0f5e2d24942211e8c1b39e70a098d74a824af388464d905e6f2e534f9d100a6fdaa1b93b27 SHA512 2e7d450f151d741a9de4b366af6902f6132927bd2e29fea71768eab53118989144bb4b941e7f1208abb4d6f6117c0e9dc65c4010818be10bdfd662108a779cd6
 MISC metadata.xml 317 BLAKE2B 1407054872d1acf5f80332fe07317c5cd8f8a3bd44bbfb7a74a6dc7738c861a2f925387208ee12ee32e6d8c8578f03a7ae3d07ea05d65bf6ce44361be87b9f87 SHA512 7ac300651df6b6a5cd22ed838779e880ab16717d07cbe084bb7536a8c41bb092168497482688fd3e9208bf2ee6528d62b2e0f7e69c6980d520cce4838b555e77
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
index 790f3d3de34d..836a13a4c295 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-0.14.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/lxqt-base/lxqt-session/Manifest b/lxqt-base/lxqt-session/Manifest
index ccc600bdddaf..95bba8a77a19 100644
--- a/lxqt-base/lxqt-session/Manifest
+++ b/lxqt-base/lxqt-session/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-session-0.14.1.tar.xz 178600 BLAKE2B a4f0f096b994ea409e47d364bbde93bb66bfb4b5fb157ec1acb78a3055584dd31772ca2ed6a6592940e6fb578bbca3d0499f6eaa9775f84ce9703c39b0fc0bf3 SHA512 9274564f3eabe33744bbe8555b1177d8ff6f241f5849bef29f0bb344f506e590e1deab87bf2fdeb867872ebaa0262cda0400f16179951fd66fbcb4d9f7358c4c
-EBUILD lxqt-session-0.14.1.ebuild 1207 BLAKE2B 52f81a93eb5f26b8a5b7117e46c3c2f14ed2867de163c2a41251be3fd4722c5f54f81b31eabe0f5bfcbf69c808d999dfd3fcb1d6be4c9f3bdf643a0d5b531b00 SHA512 55277218704e75088ebfdc81b77821c56def74ea1a2528e7079eb74f4171c6efb552b98dc9bdd1b9ab1a1e91de8e448d56d35f5a90db8952c9f4dadfba74d9a9
+EBUILD lxqt-session-0.14.1.ebuild 1214 BLAKE2B ed1a479d598f19033eda2c4c5e372940769ea56288911e21213b4017b0369f4a8efcbd3b5c3e21861d234acf1533b089bade661441a4bee4ed5d5e7c4c513633 SHA512 d0769ca352cb3bde029c6ae608818e251ef1e836365e8ddbc370daa49b3496e67d161856f3aca2ba030b02e2028049085e021b453a4181520fe4d84f9c8abc71
 MISC metadata.xml 395 BLAKE2B 842bf93924f29beba87d230d19017136a5d8a55d62f68a4448860641b5dc7dff042e947d3075a653baf915a14b266caec30d249d64ac2759bf54d1997223d029 SHA512 c2843aefd069f9f8c8b96137a0962a7e672b566a48960d2a24e0a6020ec01fdaec3319cab3160ac530d3a50d43c06a0f8cb59977c679aa6e072f7fd4000e34da
diff --git a/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
index f4bfd3596624..74b9a9739947 100644
--- a/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.14.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 IUSE="+themes +udev"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 793c675adfdf..8259de0f91d0 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/clawsker/Manifest b/mail-client/clawsker/Manifest
index 4eb142a773b9..02539b3af9fb 100644
--- a/mail-client/clawsker/Manifest
+++ b/mail-client/clawsker/Manifest
@@ -1,7 +1,5 @@
-DIST clawsker-0.7.10.tar.gz 67488 BLAKE2B acfd00bb1d27ddf011f06a09210570a76fd4f6cffc86a6d596ef84a60c170379395bcd2a1f241c5fd97e13297d01be8be14829d2e5605c807eaa70d14cb176ae SHA512 1b7b3638485af509e4b32be5cdb6ffa2e56b7ddb661dbde291ac4cb7804c98363ddcaa46d36ffba0699c77d0a66e84ff5b58be29ddb3d7d9f9ec0e6567a9075f
 DIST clawsker-0.7.8.tar.gz 66210 BLAKE2B 0e3bc8c17b5672922153f60d1c83da869565488e56d4354c93d5681f5b220caae3eb94b268626263269db09518d3b1ca7aee831b04ce3e7eaf3736763ae9f2e8 SHA512 2dd1cccc45641aeb58769630f095d23f68b0bdc8276711cea1d25597c2c3fd94ef5b318bafc5332f4c3880715052949f07e3a2b8ad554baa4b871434547abdca
 DIST clawsker-1.1.0.tar.xz 153404 BLAKE2B 8d19eaa94339b49689bd97921101e8c064f8cd35802a08248ddcebf6e595e1cfd8b577b68dcf1534c054d21dc1ea92d109a2c20ed30b7387aa88c60518576d34 SHA512 e76be7214e5f7568423890cc29e736c163678bb4501911467afd5a4ded2f61a6493c31ac08ca2f55cd143109a37c0f2f27481a0b556628cfaf6d477112375f2b
-EBUILD clawsker-0.7.10.ebuild 558 BLAKE2B e187fae284d27a1e123c30b88e026a7dd80d0203c17d1fe63354f0460e39f6f86c7154010e2c05654b982001d00a4760549dc3f49014afa1130fc3fcfa474e83 SHA512 552d277281664c55279c71c8327d72992604a0990da4552b9c27a0afb384751a4c74bcde6b4cb2f655f0ce4d2a566b8e021e1a0ad43dcaed100760ab32913302
 EBUILD clawsker-0.7.8.ebuild 556 BLAKE2B 3be780a3ef4e76eac4242b4202e6c8f31e5e9f877272f9847d2526294b89afbb405242c822578fd5eaeb690bc190866528150fe74627313d0bd9bdb74709e260 SHA512 1cf91d8b93fa3590249cb0914d4db893f4f47a05433be07dd7a87fc5a11e443d3950cca8ee8097ecd21043a84c3a1b8faf60ce9ce4632294599344149e2bce62
 EBUILD clawsker-1.1.0.ebuild 540 BLAKE2B 0e3572301ae27f096ffcf8047c4a24a892b6c2a5dc905a78c0dc2bcfb468edcd0c85dc581ffb69e0cba4653490668f1af1f4b727ad6c26c232b9b65b92cfa605 SHA512 63efb159d09443a3a6282e7e6c186e2f8e32789e3426c087fa83b640574a0d348b581592e780d1c3d2e0f89ced1834452be410e39b53aea723d6542a0e72b0f5
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-client/clawsker/clawsker-0.7.10.ebuild b/mail-client/clawsker/clawsker-0.7.10.ebuild
deleted file mode 100644
index 0cc9ea4dbd1e..000000000000
--- a/mail-client/clawsker/clawsker-0.7.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Applet to edit Claws Mail's hidden preferences"
-HOMEPAGE="http://www.claws-mail.org/clawsker.php"
-SRC_URI="http://www.claws-mail.org/tools/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.0
-	>=dev-perl/Gtk2-1.200
-	>=dev-perl/Locale-gettext-1.05
-	>=mail-client/claws-mail-3.5.0"
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX=/usr || die
-}
diff --git a/mail-client/cone/Manifest b/mail-client/cone/Manifest
index c6672a241d35..793bf0997380 100644
--- a/mail-client/cone/Manifest
+++ b/mail-client/cone/Manifest
@@ -1,10 +1,4 @@
 AUX cone-1.0-no-spelling.patch 1507 BLAKE2B ccbb1672ff8c623d27a4167e547a365ef808a63c91ff58333e74c10f3c0424a8847a83c3b4cdf3176659ffca8a89f14cacd25d22b89b50b1110cd0916070b314 SHA512 34bb65dd7fbd2a5f4014e9760d5bddf3c0d73962b2acce913bb06c48f3029cb5d13fe4e87fe9e9e6e06ab671b1deef1128349c35cffe937e950123632cdda730
-DIST cone-0.92.tar.bz2 3774451 BLAKE2B 3686ca90249f38c0be83138bf310802f5a5ea1e0694abef5ec9311a00e9c81692abf2148cf23640932ba1fe0c49ea6738689189c618412e985b02a45dba9c7a4 SHA512 8d764ed3cb2a22caff21d11beff74131fdbbe0f66dbf1a40293f62862e9af7a472840ff00a069df10143f7154c2db85ac5421999476516f27b8f090e5c1232fc
-DIST cone-0.95.tar.bz2 3748331 BLAKE2B 9461cc28afb255e7ca4080e4c876f5391e916c493b6596b0bfc0ec2d0cedb837d10cbd6904cd49b0b425e5edddd42c123b952725339b7388fb5a2debd72c04c1 SHA512 545d17286b937eb33b5fa14c36a480eea0146802f6c8a36e55987206b125bac55b25ab79a4c833ffa1fdcdbe56b2949acd5c8bdfd27c900bf64d5e738677ef4a
-DIST cone-0.96.tar.bz2 3752115 BLAKE2B d4548083f86adc096534750e69db648d24fc5b643961041df04257d71f4e8af2c3456948f9227e652d2bdc80f65948bf8b543c3eba738187e17d6d9f5c424e28 SHA512 6bdc8ac1a8ae8345bb09eb03857cf5db2c55ac57e3f76726a7371fd763a4265f02dbda7bcbf03090d3004bc800a5bb42a328ead900ff71609246aaa4a314609e
 DIST cone-1.0.tar.bz2 3793288 BLAKE2B e2c8aa91adfff77d3f0207a3caca5d13ebae8c9455402c296a98364708acd3d4138ea4642044b2dfe396eaef18c3b90ebf0ef3702bc73351a4317219a4c28863 SHA512 6fc30158cebed62b0598787d53e1936b50a32b6590266e93dbacbd63371d4fa8e43ffe95e0f4ee51991e2d892b26c1531b563203e45108815f05a091b7051161
-EBUILD cone-0.92.ebuild 1203 BLAKE2B 8f178b8e745d42a35003db91d7dfa9d1a6972216e98cc041bee1e9c28a60c9c6542efc0dd30924cefcc10de9714dcd3989e72c7c17887a871f9855b0fc602035 SHA512 364fa555ecc58cc312ca4dba20b86cb6a6765591854522e4ee218886d7acf4822a9152c64c31b9c51186487fb86aba737c121961c9fc1e22d0116f6cb70f21ff
-EBUILD cone-0.95.ebuild 1219 BLAKE2B e09eca9f51ebfb0150e0c733e566b2fdd4b6367fa4e5bf1e45c7a76ebaee0d2b4fe50b276f1fb9d18f1aa8bb1fe51b01ef2f3b83b87627037b233ba70439ba6e SHA512 d4d493937662020b042a2792d050747ee8884de0a1c9cb8d7f83b859eca42de48cc81cb4fe9aac9bd0f0334dabcc0065fff002366e655ea9cd75283077f7d444
-EBUILD cone-0.96.ebuild 1217 BLAKE2B 7bbaccc1cdbc9724333cc87c04abe9987a4f1322a803023e3f8ab622f4e8e5798f1ce589221f6da6a88d4ed1e100164aa8efde942280c9b5df77bad2e1c81435 SHA512 861cdbc8e75fb0b68a7a7d97f53dbef80acb1d6ceba1d2ea2345ebca2779af081445dc5d53e5cb4f867ebfec21b93d2ade0d8fcfc0dfe7b4c8bbc371e734e3ab
 EBUILD cone-1.0.ebuild 1710 BLAKE2B a438dda765f8e5ca7e3193b29d55ec34ad30d8850b2f6b2410f58d6cabd3620d4198c235e52fc2c81a0c50f8475d7c21d822143e1bc8132e59b804b048ae064c SHA512 787cee613016d7b6cc61ffab28f12ec2a6d640d895abbd4e467f93416c9ef1114801d4a68e12507096d457f1d2a01084304c38b7cab0fd3e2733901aff162158
 MISC metadata.xml 244 BLAKE2B 45f1b3e90ac17489176656777b4c699037769fba524d6128f5e35653bad136b3227d2d99e60fa91d467bce25c90db4b263f177a6f972d73edc8c509f2f8c8d8f SHA512 0c197888b8bd38dae328bca5f561c69eacee7e82dc995676705861dc3e9da8a4d99c1f03c10a20860e169a4e1a50970c81b0601c3a313fdf100291d34425a203
diff --git a/mail-client/cone/cone-0.92.ebuild b/mail-client/cone/cone-0.92.ebuild
deleted file mode 100644
index ac1484a77c5f..000000000000
--- a/mail-client/cone/cone-0.92.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="CONE: COnsole News reader and Emailer"
-HOMEPAGE="https://www.courier-mta.org/cone/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="crypt fam gnutls idn ipv6 ldap"
-
-RDEPEND=">=dev-libs/openssl-0.9.6:0=
-	dev-libs/libxml2
-	sys-libs/ncurses
-	>=net-libs/courier-unicode-1.2
-	app-text/aspell
-	crypt? ( >=app-crypt/gnupg-1.0.4 )
-	fam? ( virtual/fam )
-	gnutls? ( net-libs/gnutls )
-	idn? ( net-dns/libidn )
-	ipv6? ( net-dns/libidn )
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	# move local macro to m4 and run eautoreconf
-	mkdir "${S}/m4"
-	sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > \
-		m4/sysconftool.m4 || die
-	sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-spellcheck=aspell \
-		$(use_with ldap ldapaddressbook) \
-		$(use_with gnutls) \
-		$(use_with idn libidn) \
-		$(use_with ipv6)
-}
-
-src_install() {
-	default
-	emake DESTDIR="${D}" install-configure
-}
diff --git a/mail-client/cone/cone-0.95.ebuild b/mail-client/cone/cone-0.95.ebuild
deleted file mode 100644
index 612dca33218c..000000000000
--- a/mail-client/cone/cone-0.95.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils autotools
-
-DESCRIPTION="CONE: COnsole News reader and Emailer"
-HOMEPAGE="https://www.courier-mta.org/cone/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="crypt fam gnutls idn ipv6 ldap"
-
-RDEPEND=">=dev-libs/openssl-0.9.6:0=
-	dev-libs/libxml2
-	sys-libs/ncurses:=
-	>=net-libs/courier-unicode-1.2
-	app-text/aspell
-	crypt? ( >=app-crypt/gnupg-1.0.4 )
-	fam? ( virtual/fam )
-	gnutls? ( net-libs/gnutls )
-	idn? ( net-dns/libidn )
-	ipv6? ( net-dns/libidn )
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	default
-
-	# move local macro to m4 and run eautoreconf
-	mkdir "${S}/m4"
-	sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > \
-		m4/sysconftool.m4 || die
-	sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-spellcheck=aspell \
-		$(use_with ldap ldapaddressbook) \
-		$(use_with gnutls) \
-		$(use_with idn libidn) \
-		$(use_with ipv6)
-}
-
-src_install() {
-	default
-	emake DESTDIR="${D}" install-configure
-}
diff --git a/mail-client/cone/cone-0.96.ebuild b/mail-client/cone/cone-0.96.ebuild
deleted file mode 100644
index 8f7516ca655d..000000000000
--- a/mail-client/cone/cone-0.96.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils autotools
-
-DESCRIPTION="CONE: COnsole News reader and Emailer"
-HOMEPAGE="https://www.courier-mta.org/cone/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="crypt fam gnutls idn ipv6 ldap"
-
-RDEPEND=">=dev-libs/openssl-0.9.6:0=
-	dev-libs/libxml2
-	sys-libs/ncurses:=
-	>=net-libs/courier-unicode-2
-	app-text/aspell
-	crypt? ( >=app-crypt/gnupg-1.0.4 )
-	fam? ( virtual/fam )
-	gnutls? ( net-libs/gnutls )
-	idn? ( net-dns/libidn )
-	ipv6? ( net-dns/libidn )
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	default
-
-	# move local macro to m4 and run eautoreconf
-	mkdir "${S}/m4"
-	sed -n -e '/# AC_PROG_SYSCONFTOOL/,+33 p' "${S}"/aclocal.m4 > \
-		m4/sysconftool.m4 || die
-	sed -i -e '/^SUBDIRS/i ACLOCAL_AMFLAGS = -I m4' "${S}"/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-spellcheck=aspell \
-		$(use_with ldap ldapaddressbook) \
-		$(use_with gnutls) \
-		$(use_with idn libidn) \
-		$(use_with ipv6)
-}
-
-src_install() {
-	default
-	emake DESTDIR="${D}" install-configure
-}
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 14cc65d5dff0..b830e3d95a07 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -167,13 +167,69 @@ DIST thunderbird-68.0-uk.xpi 671458 BLAKE2B bd66d58c1a0770e4d4453d8b5d305943aa50
 DIST thunderbird-68.0-vi.xpi 623426 BLAKE2B 7692f160aa39dd0c221e6037074d02eaab8bcdc8f0f8c9a809211824fb0340be7ed7587eeb0c7bff27ced9b06f7f084a46d0d25354f0d5ea905bd7562625d701 SHA512 4fa2b202881d45680da6fed5e3c9332b64c6aa539e6f19f4568f06ec0819e7157392270a4009db2e45ba9815ce696a87179b2709839d68236405e88542892857
 DIST thunderbird-68.0-zh-CN.xpi 626822 BLAKE2B f752bbef52690476470161486e4ace8daaae45941f4f501341c70794ffcda1e3ee40436083eb543271cf0f6325e5a18c2ec912284ab89ca598a404e32e58e27d SHA512 5941448b8971b54ae783c7dcff796375aa60e9ae40f9d4e22bb4ae6d25454031defe8c49fdbfe9bccd397d41c74b860677ebdeded9471e0d90335036964ec74d
 DIST thunderbird-68.0-zh-TW.xpi 627478 BLAKE2B a2c827e9cdc6f6fa2fa2a59a31b3e719de2120d4d5e83ca1773e77191f343b81764bd7eba8cf7c806579dadf67b792f490a8ff3312ef9018be75e31c7f1e6013 SHA512 69780086f4749b01bf6b3a3c27422d239c78851de371eeea6212c69d347ede4620edba5f59045bfb1b008a083535c348056be1b44d61c188afb9c207f1513e9f
+DIST thunderbird-68.1.0-ar.xpi 617169 BLAKE2B f2c052345364bcf33f47c8924d2442c891ecc2fe0a17b3675f97dee18e38d18d139768010a80a69de7d45ccf31c328a50146d8dc2ae67051eadbe34d889db68f SHA512 ddeb1671822f4081e644dbef3e6ebb3ea1d48a0390eed1fcc7ad99ffba4cf00b916c661e74e87e07faf614c9e7226a385825f2eb9ab676058d20b6c560ee42b7
+DIST thunderbird-68.1.0-ast.xpi 551302 BLAKE2B 25a2cbd819dd587e27a3b9460f52f9b6b730b0d6f7f10688729ceb1aaa69d1f2e3a5fc93ac3387061ee2de4734f27246d958cd0c1ae235b38e53d8a772123e42 SHA512 c43d209b55af877bef377f109a387fd409fb2a04e0eb39f3453679d159aaa04ab4e68b97e4dc9eea55da8ecbd7adbfc6f7551c94c2421d9273903029b77d83d5
+DIST thunderbird-68.1.0-be.xpi 646281 BLAKE2B 1b977ba362d5636b7ba102510c9e0fd881f5c822fcb8ac71f348af0e4576d7cfeb23dd41e39bcc3cdd806e8c95008c3175a440a39b06d532f9cddd77ebebfa06 SHA512 e01e19e92b43380076467c26bd2c015c91402c8dd8f823ba05b5184d91c4f91d3d228918c812e06f08e174c798f0df0cc6f683bc4a43460ad52eb5a82417a810
+DIST thunderbird-68.1.0-bg.xpi 646229 BLAKE2B 68112d2c182b9c05db30a1c103dc172e2a1e99ffe19dce1600f78ab29ac64940731b8c4eaa2d1bc7cf343d1d7b9a76e8cbcee05667d2177f6df8ce262d949d3f SHA512 af3f4075c95ad4dd26ff973e411d58df18b81a1a9443db2816517149c95641108921ab495577c1a459039f4062ac62b21ab8176e23bda415b5fcd895e42d5ec9
+DIST thunderbird-68.1.0-br.xpi 574853 BLAKE2B b6f1d8f102d7fb4c4f2a2733f4549dfa9148ab745790b018f24ae0bb8287f3ea3742e04571c6c800d3b4ab8f3298687816c5ec62571878915b0162fab095edac SHA512 b4a11a85f641ce6c19819287e71d1bc4da841e579e8662041d5f634156022a1e845c9f07530a1f56a2e3d957e446b98f5009f248d0cefee2a13cc70057d57906
+DIST thunderbird-68.1.0-ca.xpi 578441 BLAKE2B 846ce092dbf1c8dcc6eaeb2ac158971aa1bed34492dc1f567f8b1c7542baa1b7e028903ce81de11719e945433b346d8446de34b0f618760c1e6a494e6ce3ad0b SHA512 4069e41ef89bd77e175a7860ea5af914cc4931122b0f3357a31c0dd6a62f5d3fbe976fae6c89cebd94c481c0113e18e644eee74081833008bc017cb66785bb95
+DIST thunderbird-68.1.0-cs.xpi 603045 BLAKE2B 7b51ed3f0b84c9a3536c6bcece686885b28393734ad20ad389ba5649501db9ee219ae872c284b9737cf7509f1561dc0ab15f60bab2dcea4189c93759aa6c1842 SHA512 a68b0227d748dd67b7e0e85de489c9973914a6ac3d859ae766f67761b6c80827ed7ae57fdb2cc222c5da25ef901cd9b17e1cba8723ea7143b76b49e9397d3501
+DIST thunderbird-68.1.0-cy.xpi 589905 BLAKE2B b9eba3068f38a64e66ba175cb1ea61e2fa85c9ce9f82cca643745ccf974c4abf21f0aeb041714ea3d13dad2df70629557429ba6efd60add804dab03a6d60b8f1 SHA512 6bb69e2dcec1aadc635cbc2b1e904e7a75bb7e0348f6cccf185e3df605cafe44d04c0577535dd79896c3ade3524ba7946cd9c204d992a118a5bdc8097c88a0d7
+DIST thunderbird-68.1.0-da.xpi 588352 BLAKE2B f398b905834486c26358b615076d6b8a1818a966f9ddae60542dee97c1c0204284614adeebf337d65886ddc1796113e51ce279ebc11b38bfd7baf75cc845be39 SHA512 75768a064d16e8e9cb5c43d59c4b8df5870d94c92cbbff6161d065111872489c14c010b03427c3f99556365a7c284fd8b804904468fca1862225b21f88f7ae60
+DIST thunderbird-68.1.0-de.xpi 597806 BLAKE2B 3ef6c05315259ee073324bd703827dbd58c310b2ae74fa8584d33fa61fab76194f339d90a7c795b83a276801b6463c5bf6d83a0a84b9743a93ed65d102d44f1e SHA512 9bd399c527228008886b2916a58e1c5cef35faa86309737ea079a0225ce6b6f431adf7ca3f3de1f77daa0013e5ffe97b3c93c1038c6696cd8f079404e8459083
+DIST thunderbird-68.1.0-el.xpi 699223 BLAKE2B a7a5eda069bf7b14dd58dce9864e31722f45f2dc1ac076d699a369335491e83058024e6cb94c116a9f8551cc96176ca7820b2ac732505b0621888d659f4faeca SHA512 54199d2ea585ae213722035e26b6afe67eeaa2676a8204cdc7a68b2e9b6d6dc3b678af0cb387e2992cb9d264c51e9cd938052764feedac0bc40d509197648f15
+DIST thunderbird-68.1.0-en-GB.xpi 556405 BLAKE2B 7eeb4b66407fac8b713aac3e6890c5e6d20bab7f8dd2ee103880b9362eda8ff82899a9c9fbd85f2fee7a38f2738f1933f22a0353157ca8abb90dc35db15ba2d0 SHA512 d918ccdce2631affc69c554c5a18b5d6c558f874bc85a23cf87bfff111b1176327d059a18a5a74f579b9b8e5ceeecc8b6545bf6c9653bbcf01f0f928cbb51956
+DIST thunderbird-68.1.0-es-AR.xpi 596554 BLAKE2B a451b27ac4a8eb177d016c376d683fcfe902b7a19a8cebe1be2e735777f907504b338e2d5cde42ee80aed63fd90fc7d5c2fe2f6c49c8652504f0d71c28ac00f8 SHA512 c7eaffdacd5fef01854afab2135df48a417c7ec0047aa639ab11a64a39f872556ae0ef39fdd07b4f969382436db258c471995fd7289673bcb6223c1a22135820
+DIST thunderbird-68.1.0-es-ES.xpi 518353 BLAKE2B 4cecac1c3abd80e31165bf8426ddd1709b868428f7a594475dc65683aed770a4d5539356794865956fd338ddcbb79c066af60ca286e15c69e30143bcc423e5fe SHA512 cba91ad6acfc7e42393a106313b42b2fc597594e68b82ec26bceabb4af2b9f9ad6953e87a74cee2181d013d4b2b7c699d1d1386052f6a8d90bca4f7ae30cda07
+DIST thunderbird-68.1.0-et.xpi 573582 BLAKE2B 0f41bf4c7206e8e01ec8b4e9109231a62aec05bfd8d3511d2228570b038fc0111d319eec754bf19fcdc0a2a3d2bab9848036a8a0abd75dd9e8c10377c3f1e4f1 SHA512 32bc624c0cc526f7be4e898a5b83ad7049e9ef7c1957f7077e770f9f967ea61fede3af30a1b4cf4cd1502889443e570cee97b3cdd026077b08b3ad04893a235c
+DIST thunderbird-68.1.0-eu.xpi 579945 BLAKE2B 42ad1265a054d839ea403dd5273d21b20255a31d983a35b882c30bffcc0aac62b86a34f193c4d0692bca7cac55e6050713f9f285fb6772605bf49d9d1116773e SHA512 15cc36103fcf58a49f12664798211182aed97ea35dc4874694e6900138bc3ed2e2b423f5876a8a455a58e8677dcd5fd67f07432a0fd62ae39992b5f069f90d5c
+DIST thunderbird-68.1.0-fi.xpi 578420 BLAKE2B 266de74e7a85d7a71d0ac74305ef6de1b930628de32610644718defdc1db25a7acb5fce716bbe11737c8adb9728ac3fcf5982c537c1bb3f8715924039785eaac SHA512 c6fadd61e6feceffae6180530318b35b3e5319dddc12074cfe727bc8fd9745ed03a92e7555e6daa99588bc9aa9bd731939af7151cec5c6083b736aa2f37275f6
+DIST thunderbird-68.1.0-fr.xpi 607812 BLAKE2B 131d735f828cc051861c604af50ffadf273e9744e3124bdde4036c1c4d2d9f6d68839f3a1bfcab8a910d557c522a8829cde070fb857fdab22bff0372d113f564 SHA512 2a86aa969828c30430d89dec23bb04e842bde87eb35d2ee6759eda07148efaa6a29e84ace654ab224dab34d5fa061a61172f41824643479934e10ad73cb9f209
+DIST thunderbird-68.1.0-fy-NL.xpi 594470 BLAKE2B fe9094febccd3f84182666e52be9718d012e4035308dc2b085abaa9558f85568b33c30b8f9049abe08016a151243c0a46fe71822dd1acdfa80eb6d6d442644f1 SHA512 6732b5bb3c18cae9c0021bc38d7a4b71c1ac8c266e0b06d7d83309a07d45f8e3da64672118e58e4c160d6a0b91916e0e52e505bec65327914c5342dab1bbc2d8
+DIST thunderbird-68.1.0-ga-IE.xpi 588711 BLAKE2B e132885a47c8d4877c7baad0dbd85b65a87746ee124877b71ceea8ee8de8c93c732b0165954b8ac18e5767f17507ef02614eded9200c81a0c079dd48bb363763 SHA512 cce49ce68eb7145e360fde34f88bd411ed9ffc70bfd7d0aad5f78bfa46d79ca3e1a52c6b036f4affebd1477818199ac6ef2f515640ca2e646c45f1fe1896930b
+DIST thunderbird-68.1.0-gd.xpi 587112 BLAKE2B 868bac6b84d91729d0291cb22abbca5306c94b96e49fc0dad738e7f30ffcdeffa9939c520aba9cf38c4ed6bb080458db6104fcfd1d63d5ff3f9342e51461dbcb SHA512 501c39c75fae95eb688d85f28c2b5993afa9d645354e402d82041f578f92039134cad6ee74a21fc48562b7271bfb58e87d565108c3c65fda1611772a5f1f0270
+DIST thunderbird-68.1.0-gl.xpi 568399 BLAKE2B 6d8812bf4e7e1cb97578690ff1d9e54326a572360c9298fdde71ff82b9d18d9a2559da0dab449527d69c960ebf33ff5c65b3bd01b23528f52b9a537728ee6ae3 SHA512 25bb290e5e25d85333c114b95c5f62e3c2cd8f1a9c1bbb180f234be1933754a8e4511166e314486c3899df1269ae3e58f737312dfcb484dced8e8561b8f15768
+DIST thunderbird-68.1.0-he.xpi 604790 BLAKE2B 8894a405cf308d58e24d033ec375e96a200040145380c6b999394c1d1a67bab89281c947e5bcc218e1de6d9b7133c92f2062e180c1766629189aa8ebaa7f2a2a SHA512 5fa36355c907cd1eefdc473ba68294fe5cf8214dab6d3f0c603333e7a15ebd17be61f5206c871546c8cce7e74acabc6ed415b0f319f03bc8ff1355399280deaa
+DIST thunderbird-68.1.0-hr.xpi 583784 BLAKE2B f425f09a95b3cfaac01a66ed514803cb892cfe692d38c94878eed63dc2791c3248528077f459c53211b289be69db9bf85adb916ab986fb964f2d4eb6eb1a6a51 SHA512 277eb466c6a22f9e2639802481bebb5088eed77f50725983125bd2d470aaccd36ee52247c8f261ab14282b171938e994bac459fede6fc7f0af4cfa7ed25988f9
+DIST thunderbird-68.1.0-hsb.xpi 616037 BLAKE2B 5fc6f21fcca7fad7c491ce2d7f8bd97a08e3791e062c3c6020df80cdfc9b549f60f76b7ff03eb6f6caf1c119da10285a880781127e8ff73fbc69e3a6a016dc6d SHA512 0e978f5cc7f5f5f8737d8e4ed2b917dd77e69f337a12feb0d8a8b24c8eb5baaa55e1d0225473a4ffd802c701e6bd5674160e7b5ef7801f35cb0d78e39c9a5dd5
+DIST thunderbird-68.1.0-hu.xpi 618155 BLAKE2B 1a4d1cf8ec29eb4eac0f24470eae945dc6e3bdd0bff4f84bd2de8eca522e752ba157fc85cdaab1ed9a8a18cd64908bcca93cc74571d61ef1e5e7a2986ec3e6bb SHA512 adadfca956bd3e29c260e70498318e748d5309f84a63d2cf392b124b362bd5e1188a2dcfb8302c2e44a47abf2240067db40d1a05fb7c3c8f4ea8649647169461
+DIST thunderbird-68.1.0-hy-AM.xpi 630527 BLAKE2B 25b8d2c0acb8dd099a111143735c0e25f8c9e68f53b258ef2212dd2bb336caf5328578f61fd00b84c100fb847ca5892975340b5fa840487dde16dee08de6525f SHA512 32ba837e14145b8348d132bac7178ab30f4979600157c57f621e18f85d727cf34dc4fedd5f363b6085371c657a45d39c5a73eae88ac55f46bd68ea84ff89bdba
+DIST thunderbird-68.1.0-id.xpi 567749 BLAKE2B 1fd32cfc990c3886ba5deebce62495655bd501349134b94db48c47825c8b0c7056e082674bff3dfb541d3e0c3cab7a2181fee850f410dc38c8fcd0748bacdde3 SHA512 f0790b6dc0753b6bf6774568e9ae688f2f664b85776e2e98c2c7982d6f029142330f85a6070480b216fac4d5b114dadeb8b03e7afa6f71a37a0ce894861c6dbe
+DIST thunderbird-68.1.0-is.xpi 575442 BLAKE2B 6d5ba555b30913c15da817a7803b82de19cd43d6d5a853e077eb1922927c6ce6a9f3067f48cbae5592e45dd071dacabb0ae50577f789b31dc5bc76680e61e33a SHA512 dba89e9f575603ce819e7a35c31a890499d289a34e4d26ee336fc10e12390295f00950b796ad9fad273788757168e67c74fef21e034f3ff350095b7f6788bd2b
+DIST thunderbird-68.1.0-it.xpi 489522 BLAKE2B dc98233f8cffa4c60bd384fd67f52a77795fe8628d29f12db04744b421a802f2d158e59e0ae4fe0a45d1fe0b69bdb0ba5f9561b0a498f91ee397e592918f0bdd SHA512 42a30ee490fac970f64b36ff49678bffff1c6936217c791eb63aa0a5c65995090e08c91799e8991cd6293cb65b53649bb2e7d380934d22855d9d7a3af286e8d1
+DIST thunderbird-68.1.0-ja.xpi 643575 BLAKE2B 38098e5be3826ac22aa5bcbbcbbdab85b46afbba9207f26d6f37d769fb6b0e642026de3f7cd7dae14475553456d8b615429a92f6f9bede07a268687db6288ab6 SHA512 aa907bfec130efcc49eabf0d5e2a44614a297be644f4c7c70a5eb0af3371381996549d86c752b866c42136bfa5ef53bf82fe0c0d673f5748d2bfc24567544752
+DIST thunderbird-68.1.0-ko.xpi 620532 BLAKE2B fb381e0cd1c995af77fa787c2092dad87863aa97ff23d1f36b9d91db55e92a58eb65a9663451ab6af89c8b69188671bb1276612b8feeff66f9deba1d0f580cb0 SHA512 d38316178643cc32e98bd0e0349db22950742c7cbe1958b26d885e67da21b9826d4d5b3f54007985d8aadc4efad7c1cfa86dd0dff230036b9535664fc0f38905
+DIST thunderbird-68.1.0-lt.xpi 603848 BLAKE2B 502083b480c4239952a42c0b7300c9e688c163394a4cfea4ba9cbc6a009759cfdf09193e6cd1f205f24e06b2e8eee23e6a7948d4748e9d26db23dfae1d025e41 SHA512 6cc4a83f09a406f797d012c53fac311cb4e8fa1a9d01e9f9439f229a2ec1b02ea87c48d75b9d2092335090f98379a3bdafc383f8b3608393d33479b077773ef2
+DIST thunderbird-68.1.0-nb-NO.xpi 574023 BLAKE2B 2b9521973dc54f121da43ae1de8e27ad3ebb89d1fcabe4b1a29e9a370a6c5cee30f44c5baac9d189b4a3c0b92a097871aeb413a490519210d32e5d4d34f2c9d3 SHA512 cf40bc431860dc18969c68305467ef46682cc968e5ad7f3d41cdeeefbb1b588fdf81c06a971e696ca76f87051da3c0199d80637801af971d350ed71d3333d0cb
+DIST thunderbird-68.1.0-nl.xpi 581355 BLAKE2B dc32f6dfaac88a741558c0c5c335bfe68fc81793415d59dfd2e69760829f916a603667d7db6ade7a2da4df1877e9b135dbc1d2da129a24cc604d70b7ca45495d SHA512 9d0b86fcb86d0a6626f07ed2c75ad84aba6829637ef3a590e549914acb1d615581fa46d46dc0ca6afd7079dcaadf17712e9f5a1904b0bd54c3eb7ef486bda4d6
+DIST thunderbird-68.1.0-nn-NO.xpi 574948 BLAKE2B 7fe72d1ee1d7eb90dc85b8ed0929e28c8645fd5c8673ccca41de0db9aba3989a6568b111d556517075ac8ef31cd173a214b9cbbf8a65ae786e7ac6d06201ce15 SHA512 0ce857987c1b3de4e5d58c12aa5c4740f706217bd0086b7e8e97a342b1ba41ebec57564c7d7d64cd9fd7985cfb0083bcacaf151ec5f8f679d668ae63212600e8
+DIST thunderbird-68.1.0-pl.xpi 576087 BLAKE2B 7000e10cd0c5be8017fea6a6419c7216a76a407de6dea9d0d2b342f6e2c8ee7f569a1b89417dd7f3ce31790d802b95f04aabc22875d20b805662dc77cd1a6d81 SHA512 b5d871f7e41c7fb9786abe92fae62a07a8f7535e349a231892c9f96f2cef93981a01dfe0afcb64f6a9a0486d4946ddb6817f58793be8394aacd600da1546339a
+DIST thunderbird-68.1.0-pt-BR.xpi 589838 BLAKE2B e9f0cfb6ceaf8bff5fa3a41b68a5a4bb8f6c1d5531af6870d28a9e9ed5e2ec3ab9b197a7366e044eae7c2c386a1a788fca9389fae421032cae5521cabe5ffd9a SHA512 23c54db7c1ecf776339d890b19e60c5ccc34ac3e7b951b783f32b2596eee3e1d94cfaf8b0524a68c123503cda147abddf2e5370026c261c87660568a1e0dc518
+DIST thunderbird-68.1.0-pt-PT.xpi 588105 BLAKE2B a997dc08cff42faa5607c9acd8cf4ba3c3caf3be137839f68a40c0eb2719bc97cb34fd64b661bb4cd00f9ea172d1f07d08e7582efe08e49d3553274a1c113939 SHA512 c0df20c77b1a811157a416f2e394a7c11ac7543d2eb423bc7b5e0cd51753258a8d12b58eac84fdeeac3867faa9ab9b0a490d33cf84277691ea4f1acaf7f4e89c
+DIST thunderbird-68.1.0-rm.xpi 578052 BLAKE2B 42347c322cbd54a4eb7fdc0554c0cfa9f97f836b1265d82d733cd3251aa3fdaaa9632630fe459be03e9b8c21e12cc9a4ebd77fd3c17d9ad148f8e7360862bd09 SHA512 0bcbb9b306f88abfba65c475bdc96be526963ecac686c7f0547da81a4c080746b94ad08b24af678982b1a202203be7e78bb069ac684bdaffd4c011b31d8add41
+DIST thunderbird-68.1.0-ro.xpi 594843 BLAKE2B 3c94b1984e647dc52b462411e4c072a0b1150900be582d3a2609edd63833550257b2c35f2a4ee6877a73eca52016841e13dd4d52a789a59102672958045a9be8 SHA512 027831d7b2ee8f333072b240007c90bfbf1ed2587f76ef4835732d245bdaf2eb440e289a5f421e2cb36b5ed7838d89a5c65424411d5e9d9e41d390099a79c9dc
+DIST thunderbird-68.1.0-ru.xpi 683326 BLAKE2B cf4892f2c3b7fb2e42c6a15c6b542c6232c435c8630c4eac4caf7284f0b19fc74b5f323ee49af73e34463da2ac620a860a047151afdb5ac1d33a3fc4a01c60ad SHA512 3464b6043bc6c4b615ec97c0182d5db1b18d2dd2cdebba189f3afd6ae819180de0601dd0d12236e2c41707accfbabacd70cfb9b27dbc26c59ae0541254578d10
+DIST thunderbird-68.1.0-si.xpi 637407 BLAKE2B 1fe283e54c90ad1dc981b9eed3de04950d5b170777fa5eb4f0449d1bd436da18600457551e9729621d74161f26a611dba98df7a62f44d169df59723e7a57f2e1 SHA512 5f4ed5f27d8561d0e9301115ad93970608486b688fd4c35fb02a1a4d8c3eadeddb66db4ead3afa61e94920885b1bde3793e97d503b718a9eac7829e920bff055
+DIST thunderbird-68.1.0-sk.xpi 609755 BLAKE2B f017a9d54396befb3fc40470cf82eee753dff009823ef3292ab2be1b14f95a33963fd58027a247a8ccf796c281241e2c0052ae5ede42f6cef380512777c059df SHA512 ff87a93690e0bdeab82d99bfedebbe940498a4e1ac4e473de42b5cd1a381d4966eaf937060e64bb968ad4fb05753fd29a12986f03ceb61b7ea1837e8b111ab48
+DIST thunderbird-68.1.0-sl.xpi 590631 BLAKE2B 14fa8a630abc0fba63173dc70fc97300e09b314debac5b340e627ac45cfcb11eef650876ae9f3f0922b0160d344cc3d2833fce8e732bd5809e95af74bca324f2 SHA512 4a346553f14dfc0aef74e73ca8ff247eaef2eac444bc6e7705485806aa6c098432918e8a13461d0d2eaaa44add51d88c77e4fbfca699bf2dc417a5283c250ace
+DIST thunderbird-68.1.0-sq.xpi 598902 BLAKE2B 09247b404a189fcfbe88afea6ff35a3f47bea9f1d318b6a5a829ab5fd48c05565c0efa60100ca1c1feb9b5e5f100d058f0c52c796cd2fa22366f7c729351fe92 SHA512 08a4e32481b608d191075f1dd02e67d505300facd2d652e57da70bd79b11ac7e448c7b84f183b1b05e549be9e56e974d6d58f7827456306d0079414fab7f042a
+DIST thunderbird-68.1.0-sr.xpi 624898 BLAKE2B 6a1c707d19251f53d32b1655bc429fff9404dddffb385a07f5c0e6432b5de0aa11780618433dfd09af435738bfd5145778c90c2d34f30259a3ba22b578a44785 SHA512 147eabefe4ee72653e49b5a2390f3283f1b527d0f4f89f967771457807f9fa9500c0b953fe0473df85facf9c925826df6ffe46703c37b7726a30ca96a863e550
+DIST thunderbird-68.1.0-sv-SE.xpi 591599 BLAKE2B 15f4cdd4e0e620c8f9d19e9e537e0498b8a65a3fc06ca8a675ecec75cccb345211f00b228fdc42ee536cb4a4e9d0ff10bdc343741014ae70a93e1ca0e2363efe SHA512 346efb8e4df9ca17241000bcebf1ce70e4efedb37d59c081725402ea86ef405543d3d237a434987606b927fa24e93d5330e7c427f6db1fd27c3ed000d08cdda6
+DIST thunderbird-68.1.0-tr.xpi 599709 BLAKE2B 1e3636ec0900cb65c23bdc56c40bce2c3ec8548d8dce4e2039ace53140fb8f4b35c7b5487729ece0d1bf0a2e39e95e9d77d2a8c9314f9ffafb36fb5a115b2dd1 SHA512 9d53788495096fe5567caee9110e7c7df9333cf7330705768895730adf18f83ba53c10dd621cd5e99330d79c58cb05b64917858f65685805a91b1cc33377e0fe
+DIST thunderbird-68.1.0-uk.xpi 671454 BLAKE2B cb0d130d35bf3f9d249c04dac2c84f056bd32ae1d50f7287b6a9a5642414d92f7bcb88ca31d33c3f48f409c7d336da10a040247bbdd1de25143bd35aaa4006cd SHA512 e80cf803c794114110dd6477d5d57cad5166a20ece54c86465d105e69b733b9b086fbe66c506dd2484040d74b5d92fb921a8bda3d88599b9ceff3f77c20300a8
+DIST thunderbird-68.1.0-vi.xpi 623424 BLAKE2B 727c003698a48314b735c7aeab8097966bf4d5f876aed7716b908eb7d78d6230bcaab5e9515c609232d92ae50c23fac413c82de946ea608d243231d6ac82e281 SHA512 0a71b075d23e5751e38aebd4a855c1842b515c2ce9ad52ff39f668ad97f709f2a59cb8c32d5e00f54627473afad6a882ecd4eb3164c754c3811b1cc4f579b4e0
+DIST thunderbird-68.1.0-zh-CN.xpi 626821 BLAKE2B 18e4d225bdd0b765d7f9c1a5351c9978ef515d26682c1d209f9c2e272363dc3d5f0d49df88c97f869ad2042d2b51f940e65bb8f7897cbccc29b38e8ecfc53cec SHA512 64b6098dea658bb422037014a9f1ecba5673f7297e98fc86e1c2e5dd8a85bad21d1a6c609b69db88886d048453460d910363d3c3000aa22432924b45466d1d46
+DIST thunderbird-68.1.0-zh-TW.xpi 627477 BLAKE2B ff3b76ddbdffefcb7c75c185812eef137e66ed370f819d94372696004e702d9f18aa370df5a51217fe24bb7eb705614606052dae30a58d10ca9d2a6ee5ceaeff SHA512 5d4fe1509272f1c0a4d857d6cb44eb6d6fa4d3c8f2e573d0200f39ce1de937f53438a2defe194b397104c49adb92991a20324cb0a79baa7e4f74a791cbffd955
 DIST thunderbird-bin_i686-52.9.1.tar.bz2 51223475 BLAKE2B a30b4679ff844fc9f9752fc6048b266662708217021b65406d587c0f8e8c0793eae3f171465bee58bdfcd635a909398bc65d3d4f07c3cd986f9edcf069d06612 SHA512 69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78
 DIST thunderbird-bin_i686-60.8.0.tar.bz2 52674194 BLAKE2B 06ecf87d3788db44a2d15de33e64fbb5c4ea530c4d638167e6e1e01543c349c36a6d9160c98509c9fceaf38719206780100053e83d837454da46e027b774dc0d SHA512 5f989316cfe29ff75adae5feb34e6914f25e6e7980c17fe902d70deede44ebe54052d2540cfbe3d4629e927d9f2129edf19f659bb2cae9f09ab984be7d47aaaa
 DIST thunderbird-bin_i686-68.0.tar.bz2 57137293 BLAKE2B 38c0cec86dfddc46c192faf93596f747ea827aba1ea685757c53c42766e974430886486ec1eb4bda73e8a880e3cb6a7ee6548adf4c27b1630c662c270402c339 SHA512 6004186b0b27165a4d54191a9c2daef34b580c2d97b1e0472e8d8d863e3df51ed56ef17abb7c6944f4da214772780b5c69785b9ad22ca26ba1a8f0390beedc19
+DIST thunderbird-bin_i686-68.1.0.tar.bz2 57122527 BLAKE2B c4be069e15eb7ccfdf8135d918f1907bcc13440a0d385efa9865af76d285cd776bf68a3af3524d635b872881286ce673052ce29b302b433d3cc5f7b424e9c5c0 SHA512 adc1dddf36116435b3948810cd9d647febfc97d62443032100b0f2d722913aa051d44244f057c29cb8c6cf494fc67b3044b83ebfd5eacbc36b6cd9c88361078e
 DIST thunderbird-bin_x86_64-52.9.1.tar.bz2 49930254 BLAKE2B d0029fc31e02f6790953fa5bdd6057be9d9aa68151bc70c6effa91c17812604998cddd14ef71f2458331ecc85422dcc069311de944e7b10019f422e50fc88fff SHA512 98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7
 DIST thunderbird-bin_x86_64-60.8.0.tar.bz2 50477272 BLAKE2B 60c8c33d5eab011c6eeef44288d0a483927a0793818633fdaf5800beb6223a675c39b8a3a4c4bdca6f307ac5e47bde2bb672eb034c421092ba1188a9c6d4359d SHA512 c0eeec28c235be86760dca83941a202475846153a1b186ad948eb673e0c6b1e870cb1c485f5a1dd9ed885eaac52f36cdde4417ba86dca388c43c03299b0adcea
 DIST thunderbird-bin_x86_64-68.0.tar.bz2 54593293 BLAKE2B c5975073a9fd4343dee9d1b4eec2e4b830d0107ed8e743349f4663f4ca83511215847c8865348575aeac2a47a8275de91e9ee1052b449c95e6dec08498e018a7 SHA512 257528761f0eca38528ded4b31329886093418f562aa2fac73b3a5bedda51fe80b34758c10afae1735cf37b37a86413dcf08642aecb1e8bea1fb6b0b94ade5c7
+DIST thunderbird-bin_x86_64-68.1.0.tar.bz2 54551785 BLAKE2B 99429bcfd82bca0e31f222365afe7652798f29d416e8a34c4375ae343c0dba3dd4b230fd37dab8cacf91c3a953533c81d9b059cbd5e0974171d016eebe6d0d99 SHA512 7a29cf0a238e44a2051b53e5476bc8f622dffd088251b66d951ad6874fba5fba180f440c80c7d5ae154c688d3e29fcc6c889f0031d81a018b7fd1dfd53f112a5
 EBUILD thunderbird-bin-52.9.1-r1.ebuild 4736 BLAKE2B 2002dc9eba63e845b7fe90f03796c55afe556300f5728e75af8656de46e4f6c0298087ae8ca953e807eb7fa7a9b62440396298fb4b711b884b0a8934d709528b SHA512 9212c41221a8c0a1fc860f01ef15a839f8f50619b1b2eb7e70518425e119081ca6c7d9ec8a96558b92e369ed47d04449b489f8ae9ab3ddc9e64db64dadc29e58
 EBUILD thunderbird-bin-60.8.0.ebuild 5365 BLAKE2B 5159852639ac25b76c22a5d2162e03c54f925db8ddfd6c9feef1996788cadbdc3d6d34e8701e0e2775dea85b48246052468253e9c637bedcf54b4a5583d6f918 SHA512 c284a8827c47e5b81e8481b5fe86fe64045b79619ddf353c49f9cb7ec7c6e90ca8a30c4e1901313a0e5cd2af0b7cb172aa2a6d61ba4e086eeaa5d2f529df9ca6
 EBUILD thunderbird-bin-68.0.ebuild 5280 BLAKE2B a43977f8a4628326b80c1b53986953a30d8fe58688fa72cf9ee6c7019454724dd5cb0deb417c9553a5652826abafe7ac1764e111a73408e7b9c0b67ce665cbab SHA512 2076cf2bcf38d7e527e02a63637f1da5d68594353e15476429e716ffcb7a6993b14767454e0cef0139db968062a738b844603cdb9f1115eeba1b96d70e35dda1
+EBUILD thunderbird-bin-68.1.0.ebuild 5280 BLAKE2B a43977f8a4628326b80c1b53986953a30d8fe58688fa72cf9ee6c7019454724dd5cb0deb417c9553a5652826abafe7ac1764e111a73408e7b9c0b67ce665cbab SHA512 2076cf2bcf38d7e527e02a63637f1da5d68594353e15476429e716ffcb7a6993b14767454e0cef0139db968062a738b844603cdb9f1115eeba1b96d70e35dda1
 MISC metadata.xml 448 BLAKE2B 6bc86854f6ee50c3cbb028baebbed3da9d37342aca5a628b8d25de7553c0ef76eca88f54daa2d60d7e27564d6ebbd6c342aa69f2b99d4eee0d1a783fda8eb601 SHA512 bb5d5bed37f9880afbba222abcdd39b344e359098825954ead9052ee75b5bcf360cfa9af323480e81fe1c70eb9b3e5d79547772080294495e7c1db7c53d46d53
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-68.1.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-68.1.0.ebuild
new file mode 100644
index 000000000000..a890fcb69d7e
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-68.1.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="68.0b6"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases"
+
+inherit eutils multilib pax-utils xdg-utils nsplugins mozlinguas-v2
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )
+	https://dev.gentoo.org/~juippis/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz"
+# the below only works when upstream releases the xpi with all locales bundled
+#	${MOZ_HTTP_URI/${MOZ_PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+
+HOMEPAGE="https://www.thunderbird.net/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+crashreporter +ffmpeg +pulseaudio selinux"
+
+DEPEND="app-arch/unzip
+	app-arch/zip"
+
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10:2
+	virtual/freedesktop-icon-theme
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	pulseaudio? ( !<media-sound/apulse-0.1.9
+		|| ( media-sound/pulseaudio media-sound/apulse ) )
+	ffmpeg? ( media-video/ffmpeg )
+	crashreporter? ( net-misc/curl )
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/pingsender
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/minidump-analyzer
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+}
+
+src_prepare() {
+	default
+
+	# Lightning
+	local emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	local emxpi="${S}/distribution/extensions/${emid}.xpi"
+	if [[ ! -f "${emxpi}" ]]; then
+		die "Lightning is missing -- something is wrong. Please check ebuild/src!"
+	else
+		ebegin "Add localization to Lightning ..."
+		# hide warning regarding extra bytes at beginning or within zipfile
+		unzip -qo "${emxpi}" -d "${WORKDIR}/${emid}" 2>/dev/null
+		rm -f "${emxpi}" || die
+
+		# Install language packs for calendar
+		mozlinguas_xpistage_langpacks \
+			"${WORKDIR}/${emid}" \
+			"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+		# roll a .xpi that mimicks what upstream would roll
+		pushd "${WORKDIR}/${emid}" &>/dev/null || die
+		zip -9 -q -r "${emxpi}" * || die
+		popd &>/dev/null || die
+		eend 0
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	local size sizes icon_path icon name
+	sizes="16 22 24 32 48 128"
+	icon_path="${S}/chrome/icons/default"
+	icon="${PN}-icon"
+	name="Thunderbird"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png"
+	done
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/chrome/icons/default/default48.png "${icon}.png"
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME}
+	cd "${WORKDIR}" || die # PWD no longer exists so move to somewhere that does
+
+	# Install language packs
+	MOZEXTENSION_TARGET="distribution/extensions" \
+		mozlinguas_src_install
+
+	# Create /usr/bin/thunderbird-bin
+	local apulselib=$(usex pulseaudio "/usr/$(get_libdir)/apulse:" "")
+	newbin - thunderbird-bin <<- _EOF_
+		#!/bin/sh
+		unset LD_PRELOAD
+		LD_LIBRARY_PATH="${apulselib}${MOZILLA_FIVE_HOME}" \\
+		exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+	_EOF_
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN}
+
+	# Enable very specific settings for thunderbird
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	newins "${FILESDIR}"/thunderbird-gentoo-default-prefs-r1.js all-gentoo.js
+
+	# Plugins dir
+	share_plugins_dir
+
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+	use pulseaudio || ewarn "USE=-pulseaudio : audio will not play without pulseaudio installed"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index be19f67696a3..e24cec63a100 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -179,7 +179,62 @@ DIST thunderbird-68.0-vi.xpi 623426 BLAKE2B 7692f160aa39dd0c221e6037074d02eaab8b
 DIST thunderbird-68.0-zh-CN.xpi 626822 BLAKE2B f752bbef52690476470161486e4ace8daaae45941f4f501341c70794ffcda1e3ee40436083eb543271cf0f6325e5a18c2ec912284ab89ca598a404e32e58e27d SHA512 5941448b8971b54ae783c7dcff796375aa60e9ae40f9d4e22bb4ae6d25454031defe8c49fdbfe9bccd397d41c74b860677ebdeded9471e0d90335036964ec74d
 DIST thunderbird-68.0-zh-TW.xpi 627478 BLAKE2B a2c827e9cdc6f6fa2fa2a59a31b3e719de2120d4d5e83ca1773e77191f343b81764bd7eba8cf7c806579dadf67b792f490a8ff3312ef9018be75e31c7f1e6013 SHA512 69780086f4749b01bf6b3a3c27422d239c78851de371eeea6212c69d347ede4620edba5f59045bfb1b008a083535c348056be1b44d61c188afb9c207f1513e9f
 DIST thunderbird-68.0.source.tar.xz 338451344 BLAKE2B 02e262b860076fe84adcfde2e208868576a48e63ceef4327e9a5196532e50c2a2b5069868d3b91d683373899257f377daf7a86d33eee1a0d4b8174e6eece2fea SHA512 91f82016b71d65b58c1383248ac6f7a8cd8217409323eb14e8aabf2e509391bba4d18e0aa6d0cdac191d10e9794977f22f509078b7c5e3ac7c22afe379a0f299
+DIST thunderbird-68.1.0-ar.xpi 617169 BLAKE2B f2c052345364bcf33f47c8924d2442c891ecc2fe0a17b3675f97dee18e38d18d139768010a80a69de7d45ccf31c328a50146d8dc2ae67051eadbe34d889db68f SHA512 ddeb1671822f4081e644dbef3e6ebb3ea1d48a0390eed1fcc7ad99ffba4cf00b916c661e74e87e07faf614c9e7226a385825f2eb9ab676058d20b6c560ee42b7
+DIST thunderbird-68.1.0-ast.xpi 551302 BLAKE2B 25a2cbd819dd587e27a3b9460f52f9b6b730b0d6f7f10688729ceb1aaa69d1f2e3a5fc93ac3387061ee2de4734f27246d958cd0c1ae235b38e53d8a772123e42 SHA512 c43d209b55af877bef377f109a387fd409fb2a04e0eb39f3453679d159aaa04ab4e68b97e4dc9eea55da8ecbd7adbfc6f7551c94c2421d9273903029b77d83d5
+DIST thunderbird-68.1.0-be.xpi 646281 BLAKE2B 1b977ba362d5636b7ba102510c9e0fd881f5c822fcb8ac71f348af0e4576d7cfeb23dd41e39bcc3cdd806e8c95008c3175a440a39b06d532f9cddd77ebebfa06 SHA512 e01e19e92b43380076467c26bd2c015c91402c8dd8f823ba05b5184d91c4f91d3d228918c812e06f08e174c798f0df0cc6f683bc4a43460ad52eb5a82417a810
+DIST thunderbird-68.1.0-bg.xpi 646229 BLAKE2B 68112d2c182b9c05db30a1c103dc172e2a1e99ffe19dce1600f78ab29ac64940731b8c4eaa2d1bc7cf343d1d7b9a76e8cbcee05667d2177f6df8ce262d949d3f SHA512 af3f4075c95ad4dd26ff973e411d58df18b81a1a9443db2816517149c95641108921ab495577c1a459039f4062ac62b21ab8176e23bda415b5fcd895e42d5ec9
+DIST thunderbird-68.1.0-br.xpi 574853 BLAKE2B b6f1d8f102d7fb4c4f2a2733f4549dfa9148ab745790b018f24ae0bb8287f3ea3742e04571c6c800d3b4ab8f3298687816c5ec62571878915b0162fab095edac SHA512 b4a11a85f641ce6c19819287e71d1bc4da841e579e8662041d5f634156022a1e845c9f07530a1f56a2e3d957e446b98f5009f248d0cefee2a13cc70057d57906
+DIST thunderbird-68.1.0-ca.xpi 578441 BLAKE2B 846ce092dbf1c8dcc6eaeb2ac158971aa1bed34492dc1f567f8b1c7542baa1b7e028903ce81de11719e945433b346d8446de34b0f618760c1e6a494e6ce3ad0b SHA512 4069e41ef89bd77e175a7860ea5af914cc4931122b0f3357a31c0dd6a62f5d3fbe976fae6c89cebd94c481c0113e18e644eee74081833008bc017cb66785bb95
+DIST thunderbird-68.1.0-cs.xpi 603045 BLAKE2B 7b51ed3f0b84c9a3536c6bcece686885b28393734ad20ad389ba5649501db9ee219ae872c284b9737cf7509f1561dc0ab15f60bab2dcea4189c93759aa6c1842 SHA512 a68b0227d748dd67b7e0e85de489c9973914a6ac3d859ae766f67761b6c80827ed7ae57fdb2cc222c5da25ef901cd9b17e1cba8723ea7143b76b49e9397d3501
+DIST thunderbird-68.1.0-cy.xpi 589905 BLAKE2B b9eba3068f38a64e66ba175cb1ea61e2fa85c9ce9f82cca643745ccf974c4abf21f0aeb041714ea3d13dad2df70629557429ba6efd60add804dab03a6d60b8f1 SHA512 6bb69e2dcec1aadc635cbc2b1e904e7a75bb7e0348f6cccf185e3df605cafe44d04c0577535dd79896c3ade3524ba7946cd9c204d992a118a5bdc8097c88a0d7
+DIST thunderbird-68.1.0-da.xpi 588352 BLAKE2B f398b905834486c26358b615076d6b8a1818a966f9ddae60542dee97c1c0204284614adeebf337d65886ddc1796113e51ce279ebc11b38bfd7baf75cc845be39 SHA512 75768a064d16e8e9cb5c43d59c4b8df5870d94c92cbbff6161d065111872489c14c010b03427c3f99556365a7c284fd8b804904468fca1862225b21f88f7ae60
+DIST thunderbird-68.1.0-de.xpi 597806 BLAKE2B 3ef6c05315259ee073324bd703827dbd58c310b2ae74fa8584d33fa61fab76194f339d90a7c795b83a276801b6463c5bf6d83a0a84b9743a93ed65d102d44f1e SHA512 9bd399c527228008886b2916a58e1c5cef35faa86309737ea079a0225ce6b6f431adf7ca3f3de1f77daa0013e5ffe97b3c93c1038c6696cd8f079404e8459083
+DIST thunderbird-68.1.0-el.xpi 699223 BLAKE2B a7a5eda069bf7b14dd58dce9864e31722f45f2dc1ac076d699a369335491e83058024e6cb94c116a9f8551cc96176ca7820b2ac732505b0621888d659f4faeca SHA512 54199d2ea585ae213722035e26b6afe67eeaa2676a8204cdc7a68b2e9b6d6dc3b678af0cb387e2992cb9d264c51e9cd938052764feedac0bc40d509197648f15
+DIST thunderbird-68.1.0-en-GB.xpi 556405 BLAKE2B 7eeb4b66407fac8b713aac3e6890c5e6d20bab7f8dd2ee103880b9362eda8ff82899a9c9fbd85f2fee7a38f2738f1933f22a0353157ca8abb90dc35db15ba2d0 SHA512 d918ccdce2631affc69c554c5a18b5d6c558f874bc85a23cf87bfff111b1176327d059a18a5a74f579b9b8e5ceeecc8b6545bf6c9653bbcf01f0f928cbb51956
+DIST thunderbird-68.1.0-es-AR.xpi 596554 BLAKE2B a451b27ac4a8eb177d016c376d683fcfe902b7a19a8cebe1be2e735777f907504b338e2d5cde42ee80aed63fd90fc7d5c2fe2f6c49c8652504f0d71c28ac00f8 SHA512 c7eaffdacd5fef01854afab2135df48a417c7ec0047aa639ab11a64a39f872556ae0ef39fdd07b4f969382436db258c471995fd7289673bcb6223c1a22135820
+DIST thunderbird-68.1.0-es-ES.xpi 518353 BLAKE2B 4cecac1c3abd80e31165bf8426ddd1709b868428f7a594475dc65683aed770a4d5539356794865956fd338ddcbb79c066af60ca286e15c69e30143bcc423e5fe SHA512 cba91ad6acfc7e42393a106313b42b2fc597594e68b82ec26bceabb4af2b9f9ad6953e87a74cee2181d013d4b2b7c699d1d1386052f6a8d90bca4f7ae30cda07
+DIST thunderbird-68.1.0-et.xpi 573582 BLAKE2B 0f41bf4c7206e8e01ec8b4e9109231a62aec05bfd8d3511d2228570b038fc0111d319eec754bf19fcdc0a2a3d2bab9848036a8a0abd75dd9e8c10377c3f1e4f1 SHA512 32bc624c0cc526f7be4e898a5b83ad7049e9ef7c1957f7077e770f9f967ea61fede3af30a1b4cf4cd1502889443e570cee97b3cdd026077b08b3ad04893a235c
+DIST thunderbird-68.1.0-eu.xpi 579945 BLAKE2B 42ad1265a054d839ea403dd5273d21b20255a31d983a35b882c30bffcc0aac62b86a34f193c4d0692bca7cac55e6050713f9f285fb6772605bf49d9d1116773e SHA512 15cc36103fcf58a49f12664798211182aed97ea35dc4874694e6900138bc3ed2e2b423f5876a8a455a58e8677dcd5fd67f07432a0fd62ae39992b5f069f90d5c
+DIST thunderbird-68.1.0-fi.xpi 578420 BLAKE2B 266de74e7a85d7a71d0ac74305ef6de1b930628de32610644718defdc1db25a7acb5fce716bbe11737c8adb9728ac3fcf5982c537c1bb3f8715924039785eaac SHA512 c6fadd61e6feceffae6180530318b35b3e5319dddc12074cfe727bc8fd9745ed03a92e7555e6daa99588bc9aa9bd731939af7151cec5c6083b736aa2f37275f6
+DIST thunderbird-68.1.0-fr.xpi 607812 BLAKE2B 131d735f828cc051861c604af50ffadf273e9744e3124bdde4036c1c4d2d9f6d68839f3a1bfcab8a910d557c522a8829cde070fb857fdab22bff0372d113f564 SHA512 2a86aa969828c30430d89dec23bb04e842bde87eb35d2ee6759eda07148efaa6a29e84ace654ab224dab34d5fa061a61172f41824643479934e10ad73cb9f209
+DIST thunderbird-68.1.0-fy-NL.xpi 594470 BLAKE2B fe9094febccd3f84182666e52be9718d012e4035308dc2b085abaa9558f85568b33c30b8f9049abe08016a151243c0a46fe71822dd1acdfa80eb6d6d442644f1 SHA512 6732b5bb3c18cae9c0021bc38d7a4b71c1ac8c266e0b06d7d83309a07d45f8e3da64672118e58e4c160d6a0b91916e0e52e505bec65327914c5342dab1bbc2d8
+DIST thunderbird-68.1.0-ga-IE.xpi 588711 BLAKE2B e132885a47c8d4877c7baad0dbd85b65a87746ee124877b71ceea8ee8de8c93c732b0165954b8ac18e5767f17507ef02614eded9200c81a0c079dd48bb363763 SHA512 cce49ce68eb7145e360fde34f88bd411ed9ffc70bfd7d0aad5f78bfa46d79ca3e1a52c6b036f4affebd1477818199ac6ef2f515640ca2e646c45f1fe1896930b
+DIST thunderbird-68.1.0-gd.xpi 587112 BLAKE2B 868bac6b84d91729d0291cb22abbca5306c94b96e49fc0dad738e7f30ffcdeffa9939c520aba9cf38c4ed6bb080458db6104fcfd1d63d5ff3f9342e51461dbcb SHA512 501c39c75fae95eb688d85f28c2b5993afa9d645354e402d82041f578f92039134cad6ee74a21fc48562b7271bfb58e87d565108c3c65fda1611772a5f1f0270
+DIST thunderbird-68.1.0-gl.xpi 568399 BLAKE2B 6d8812bf4e7e1cb97578690ff1d9e54326a572360c9298fdde71ff82b9d18d9a2559da0dab449527d69c960ebf33ff5c65b3bd01b23528f52b9a537728ee6ae3 SHA512 25bb290e5e25d85333c114b95c5f62e3c2cd8f1a9c1bbb180f234be1933754a8e4511166e314486c3899df1269ae3e58f737312dfcb484dced8e8561b8f15768
+DIST thunderbird-68.1.0-he.xpi 604790 BLAKE2B 8894a405cf308d58e24d033ec375e96a200040145380c6b999394c1d1a67bab89281c947e5bcc218e1de6d9b7133c92f2062e180c1766629189aa8ebaa7f2a2a SHA512 5fa36355c907cd1eefdc473ba68294fe5cf8214dab6d3f0c603333e7a15ebd17be61f5206c871546c8cce7e74acabc6ed415b0f319f03bc8ff1355399280deaa
+DIST thunderbird-68.1.0-hr.xpi 583784 BLAKE2B f425f09a95b3cfaac01a66ed514803cb892cfe692d38c94878eed63dc2791c3248528077f459c53211b289be69db9bf85adb916ab986fb964f2d4eb6eb1a6a51 SHA512 277eb466c6a22f9e2639802481bebb5088eed77f50725983125bd2d470aaccd36ee52247c8f261ab14282b171938e994bac459fede6fc7f0af4cfa7ed25988f9
+DIST thunderbird-68.1.0-hsb.xpi 616037 BLAKE2B 5fc6f21fcca7fad7c491ce2d7f8bd97a08e3791e062c3c6020df80cdfc9b549f60f76b7ff03eb6f6caf1c119da10285a880781127e8ff73fbc69e3a6a016dc6d SHA512 0e978f5cc7f5f5f8737d8e4ed2b917dd77e69f337a12feb0d8a8b24c8eb5baaa55e1d0225473a4ffd802c701e6bd5674160e7b5ef7801f35cb0d78e39c9a5dd5
+DIST thunderbird-68.1.0-hu.xpi 618155 BLAKE2B 1a4d1cf8ec29eb4eac0f24470eae945dc6e3bdd0bff4f84bd2de8eca522e752ba157fc85cdaab1ed9a8a18cd64908bcca93cc74571d61ef1e5e7a2986ec3e6bb SHA512 adadfca956bd3e29c260e70498318e748d5309f84a63d2cf392b124b362bd5e1188a2dcfb8302c2e44a47abf2240067db40d1a05fb7c3c8f4ea8649647169461
+DIST thunderbird-68.1.0-hy-AM.xpi 630527 BLAKE2B 25b8d2c0acb8dd099a111143735c0e25f8c9e68f53b258ef2212dd2bb336caf5328578f61fd00b84c100fb847ca5892975340b5fa840487dde16dee08de6525f SHA512 32ba837e14145b8348d132bac7178ab30f4979600157c57f621e18f85d727cf34dc4fedd5f363b6085371c657a45d39c5a73eae88ac55f46bd68ea84ff89bdba
+DIST thunderbird-68.1.0-id.xpi 567749 BLAKE2B 1fd32cfc990c3886ba5deebce62495655bd501349134b94db48c47825c8b0c7056e082674bff3dfb541d3e0c3cab7a2181fee850f410dc38c8fcd0748bacdde3 SHA512 f0790b6dc0753b6bf6774568e9ae688f2f664b85776e2e98c2c7982d6f029142330f85a6070480b216fac4d5b114dadeb8b03e7afa6f71a37a0ce894861c6dbe
+DIST thunderbird-68.1.0-is.xpi 575442 BLAKE2B 6d5ba555b30913c15da817a7803b82de19cd43d6d5a853e077eb1922927c6ce6a9f3067f48cbae5592e45dd071dacabb0ae50577f789b31dc5bc76680e61e33a SHA512 dba89e9f575603ce819e7a35c31a890499d289a34e4d26ee336fc10e12390295f00950b796ad9fad273788757168e67c74fef21e034f3ff350095b7f6788bd2b
+DIST thunderbird-68.1.0-it.xpi 489522 BLAKE2B dc98233f8cffa4c60bd384fd67f52a77795fe8628d29f12db04744b421a802f2d158e59e0ae4fe0a45d1fe0b69bdb0ba5f9561b0a498f91ee397e592918f0bdd SHA512 42a30ee490fac970f64b36ff49678bffff1c6936217c791eb63aa0a5c65995090e08c91799e8991cd6293cb65b53649bb2e7d380934d22855d9d7a3af286e8d1
+DIST thunderbird-68.1.0-ja.xpi 643575 BLAKE2B 38098e5be3826ac22aa5bcbbcbbdab85b46afbba9207f26d6f37d769fb6b0e642026de3f7cd7dae14475553456d8b615429a92f6f9bede07a268687db6288ab6 SHA512 aa907bfec130efcc49eabf0d5e2a44614a297be644f4c7c70a5eb0af3371381996549d86c752b866c42136bfa5ef53bf82fe0c0d673f5748d2bfc24567544752
+DIST thunderbird-68.1.0-ko.xpi 620532 BLAKE2B fb381e0cd1c995af77fa787c2092dad87863aa97ff23d1f36b9d91db55e92a58eb65a9663451ab6af89c8b69188671bb1276612b8feeff66f9deba1d0f580cb0 SHA512 d38316178643cc32e98bd0e0349db22950742c7cbe1958b26d885e67da21b9826d4d5b3f54007985d8aadc4efad7c1cfa86dd0dff230036b9535664fc0f38905
+DIST thunderbird-68.1.0-lt.xpi 603848 BLAKE2B 502083b480c4239952a42c0b7300c9e688c163394a4cfea4ba9cbc6a009759cfdf09193e6cd1f205f24e06b2e8eee23e6a7948d4748e9d26db23dfae1d025e41 SHA512 6cc4a83f09a406f797d012c53fac311cb4e8fa1a9d01e9f9439f229a2ec1b02ea87c48d75b9d2092335090f98379a3bdafc383f8b3608393d33479b077773ef2
+DIST thunderbird-68.1.0-nb-NO.xpi 574023 BLAKE2B 2b9521973dc54f121da43ae1de8e27ad3ebb89d1fcabe4b1a29e9a370a6c5cee30f44c5baac9d189b4a3c0b92a097871aeb413a490519210d32e5d4d34f2c9d3 SHA512 cf40bc431860dc18969c68305467ef46682cc968e5ad7f3d41cdeeefbb1b588fdf81c06a971e696ca76f87051da3c0199d80637801af971d350ed71d3333d0cb
+DIST thunderbird-68.1.0-nl.xpi 581355 BLAKE2B dc32f6dfaac88a741558c0c5c335bfe68fc81793415d59dfd2e69760829f916a603667d7db6ade7a2da4df1877e9b135dbc1d2da129a24cc604d70b7ca45495d SHA512 9d0b86fcb86d0a6626f07ed2c75ad84aba6829637ef3a590e549914acb1d615581fa46d46dc0ca6afd7079dcaadf17712e9f5a1904b0bd54c3eb7ef486bda4d6
+DIST thunderbird-68.1.0-nn-NO.xpi 574948 BLAKE2B 7fe72d1ee1d7eb90dc85b8ed0929e28c8645fd5c8673ccca41de0db9aba3989a6568b111d556517075ac8ef31cd173a214b9cbbf8a65ae786e7ac6d06201ce15 SHA512 0ce857987c1b3de4e5d58c12aa5c4740f706217bd0086b7e8e97a342b1ba41ebec57564c7d7d64cd9fd7985cfb0083bcacaf151ec5f8f679d668ae63212600e8
+DIST thunderbird-68.1.0-pl.xpi 576087 BLAKE2B 7000e10cd0c5be8017fea6a6419c7216a76a407de6dea9d0d2b342f6e2c8ee7f569a1b89417dd7f3ce31790d802b95f04aabc22875d20b805662dc77cd1a6d81 SHA512 b5d871f7e41c7fb9786abe92fae62a07a8f7535e349a231892c9f96f2cef93981a01dfe0afcb64f6a9a0486d4946ddb6817f58793be8394aacd600da1546339a
+DIST thunderbird-68.1.0-pt-BR.xpi 589838 BLAKE2B e9f0cfb6ceaf8bff5fa3a41b68a5a4bb8f6c1d5531af6870d28a9e9ed5e2ec3ab9b197a7366e044eae7c2c386a1a788fca9389fae421032cae5521cabe5ffd9a SHA512 23c54db7c1ecf776339d890b19e60c5ccc34ac3e7b951b783f32b2596eee3e1d94cfaf8b0524a68c123503cda147abddf2e5370026c261c87660568a1e0dc518
+DIST thunderbird-68.1.0-pt-PT.xpi 588105 BLAKE2B a997dc08cff42faa5607c9acd8cf4ba3c3caf3be137839f68a40c0eb2719bc97cb34fd64b661bb4cd00f9ea172d1f07d08e7582efe08e49d3553274a1c113939 SHA512 c0df20c77b1a811157a416f2e394a7c11ac7543d2eb423bc7b5e0cd51753258a8d12b58eac84fdeeac3867faa9ab9b0a490d33cf84277691ea4f1acaf7f4e89c
+DIST thunderbird-68.1.0-rm.xpi 578052 BLAKE2B 42347c322cbd54a4eb7fdc0554c0cfa9f97f836b1265d82d733cd3251aa3fdaaa9632630fe459be03e9b8c21e12cc9a4ebd77fd3c17d9ad148f8e7360862bd09 SHA512 0bcbb9b306f88abfba65c475bdc96be526963ecac686c7f0547da81a4c080746b94ad08b24af678982b1a202203be7e78bb069ac684bdaffd4c011b31d8add41
+DIST thunderbird-68.1.0-ro.xpi 594843 BLAKE2B 3c94b1984e647dc52b462411e4c072a0b1150900be582d3a2609edd63833550257b2c35f2a4ee6877a73eca52016841e13dd4d52a789a59102672958045a9be8 SHA512 027831d7b2ee8f333072b240007c90bfbf1ed2587f76ef4835732d245bdaf2eb440e289a5f421e2cb36b5ed7838d89a5c65424411d5e9d9e41d390099a79c9dc
+DIST thunderbird-68.1.0-ru.xpi 683326 BLAKE2B cf4892f2c3b7fb2e42c6a15c6b542c6232c435c8630c4eac4caf7284f0b19fc74b5f323ee49af73e34463da2ac620a860a047151afdb5ac1d33a3fc4a01c60ad SHA512 3464b6043bc6c4b615ec97c0182d5db1b18d2dd2cdebba189f3afd6ae819180de0601dd0d12236e2c41707accfbabacd70cfb9b27dbc26c59ae0541254578d10
+DIST thunderbird-68.1.0-si.xpi 637407 BLAKE2B 1fe283e54c90ad1dc981b9eed3de04950d5b170777fa5eb4f0449d1bd436da18600457551e9729621d74161f26a611dba98df7a62f44d169df59723e7a57f2e1 SHA512 5f4ed5f27d8561d0e9301115ad93970608486b688fd4c35fb02a1a4d8c3eadeddb66db4ead3afa61e94920885b1bde3793e97d503b718a9eac7829e920bff055
+DIST thunderbird-68.1.0-sk.xpi 609755 BLAKE2B f017a9d54396befb3fc40470cf82eee753dff009823ef3292ab2be1b14f95a33963fd58027a247a8ccf796c281241e2c0052ae5ede42f6cef380512777c059df SHA512 ff87a93690e0bdeab82d99bfedebbe940498a4e1ac4e473de42b5cd1a381d4966eaf937060e64bb968ad4fb05753fd29a12986f03ceb61b7ea1837e8b111ab48
+DIST thunderbird-68.1.0-sl.xpi 590631 BLAKE2B 14fa8a630abc0fba63173dc70fc97300e09b314debac5b340e627ac45cfcb11eef650876ae9f3f0922b0160d344cc3d2833fce8e732bd5809e95af74bca324f2 SHA512 4a346553f14dfc0aef74e73ca8ff247eaef2eac444bc6e7705485806aa6c098432918e8a13461d0d2eaaa44add51d88c77e4fbfca699bf2dc417a5283c250ace
+DIST thunderbird-68.1.0-sq.xpi 598902 BLAKE2B 09247b404a189fcfbe88afea6ff35a3f47bea9f1d318b6a5a829ab5fd48c05565c0efa60100ca1c1feb9b5e5f100d058f0c52c796cd2fa22366f7c729351fe92 SHA512 08a4e32481b608d191075f1dd02e67d505300facd2d652e57da70bd79b11ac7e448c7b84f183b1b05e549be9e56e974d6d58f7827456306d0079414fab7f042a
+DIST thunderbird-68.1.0-sr.xpi 624898 BLAKE2B 6a1c707d19251f53d32b1655bc429fff9404dddffb385a07f5c0e6432b5de0aa11780618433dfd09af435738bfd5145778c90c2d34f30259a3ba22b578a44785 SHA512 147eabefe4ee72653e49b5a2390f3283f1b527d0f4f89f967771457807f9fa9500c0b953fe0473df85facf9c925826df6ffe46703c37b7726a30ca96a863e550
+DIST thunderbird-68.1.0-sv-SE.xpi 591599 BLAKE2B 15f4cdd4e0e620c8f9d19e9e537e0498b8a65a3fc06ca8a675ecec75cccb345211f00b228fdc42ee536cb4a4e9d0ff10bdc343741014ae70a93e1ca0e2363efe SHA512 346efb8e4df9ca17241000bcebf1ce70e4efedb37d59c081725402ea86ef405543d3d237a434987606b927fa24e93d5330e7c427f6db1fd27c3ed000d08cdda6
+DIST thunderbird-68.1.0-tr.xpi 599709 BLAKE2B 1e3636ec0900cb65c23bdc56c40bce2c3ec8548d8dce4e2039ace53140fb8f4b35c7b5487729ece0d1bf0a2e39e95e9d77d2a8c9314f9ffafb36fb5a115b2dd1 SHA512 9d53788495096fe5567caee9110e7c7df9333cf7330705768895730adf18f83ba53c10dd621cd5e99330d79c58cb05b64917858f65685805a91b1cc33377e0fe
+DIST thunderbird-68.1.0-uk.xpi 671454 BLAKE2B cb0d130d35bf3f9d249c04dac2c84f056bd32ae1d50f7287b6a9a5642414d92f7bcb88ca31d33c3f48f409c7d336da10a040247bbdd1de25143bd35aaa4006cd SHA512 e80cf803c794114110dd6477d5d57cad5166a20ece54c86465d105e69b733b9b086fbe66c506dd2484040d74b5d92fb921a8bda3d88599b9ceff3f77c20300a8
+DIST thunderbird-68.1.0-vi.xpi 623424 BLAKE2B 727c003698a48314b735c7aeab8097966bf4d5f876aed7716b908eb7d78d6230bcaab5e9515c609232d92ae50c23fac413c82de946ea608d243231d6ac82e281 SHA512 0a71b075d23e5751e38aebd4a855c1842b515c2ce9ad52ff39f668ad97f709f2a59cb8c32d5e00f54627473afad6a882ecd4eb3164c754c3811b1cc4f579b4e0
+DIST thunderbird-68.1.0-zh-CN.xpi 626821 BLAKE2B 18e4d225bdd0b765d7f9c1a5351c9978ef515d26682c1d209f9c2e272363dc3d5f0d49df88c97f869ad2042d2b51f940e65bb8f7897cbccc29b38e8ecfc53cec SHA512 64b6098dea658bb422037014a9f1ecba5673f7297e98fc86e1c2e5dd8a85bad21d1a6c609b69db88886d048453460d910363d3c3000aa22432924b45466d1d46
+DIST thunderbird-68.1.0-zh-TW.xpi 627477 BLAKE2B ff3b76ddbdffefcb7c75c185812eef137e66ed370f819d94372696004e702d9f18aa370df5a51217fe24bb7eb705614606052dae30a58d10ca9d2a6ee5ceaeff SHA512 5d4fe1509272f1c0a4d857d6cb44eb6d6fa4d3c8f2e573d0200f39ce1de937f53438a2defe194b397104c49adb92991a20324cb0a79baa7e4f74a791cbffd955
+DIST thunderbird-68.1.0.source.tar.xz 333332920 BLAKE2B b4bd65b6751b377a0d42c3069e3d8b02d293b6e049e3c16f7e750636fcf6afb81e593dc80ede4646f28b5f77d534d1a285168fe69a88abb7268ddbcaa469f4bf SHA512 eb2a71bbf4b87ee1156f32b3829cf6970855187f9e60f5003bd3f3680b53b80f34220ed2575c26834bc2960b2c85b2b53c2ee5437b4c19031f94eae5ca9a010c
 EBUILD thunderbird-52.9.1.ebuild 10477 BLAKE2B afcc8251288a25fab08a79fa124a4160885c1f0649c5288c170a87de543144c89086aa1c1299cc7bf73edc2c8ff445d9f4805f7c85e698c307181956017398fe SHA512 0e5ec531150c4803e9fdbed0065ecba4817c5fce5c61cc5c5b89e0cf1e7e66cf77b5d10c441fa8da44242261c42b843a0613bfb119db997163f26e87cb27ef90
 EBUILD thunderbird-60.8.0.ebuild 18267 BLAKE2B 24d2b3c67258cf244ac039b564be2745b9e2db9bec34997f206b90a8f6a572e5902665daebc3ab9b7649f55e6a4d2a355e5408ae9c07463989bc332666b7c466 SHA512 0aea16f24405ba73b053a30838058f69863d51f9ea7a152151b90c5cf8155ae53fbaac5deaabcdc9177e71253df997d81ce9fff809713f8f0eefd1144cda5c2e
 EBUILD thunderbird-68.0-r2.ebuild 24610 BLAKE2B 25e89232f280eee07e53d267d7a4a366c848c0c4ff9cb6dd32d36de98e85a04f147fcdbb103c3fae20024df469e03e2bcc99c28f3dfb5ce322d8a8cf7330dddd SHA512 eb03c124da0aee6afc2a47b1d1e7d1a257ec527395530e0502a3527610fbdeff49c27d1cd8a47f6d09fb91cda5a7521dcf2b2871c77f9879bf8db5e59b474b26
+EBUILD thunderbird-68.1.0.ebuild 24621 BLAKE2B 0c8e14cb0808ddd0ff32e7a925f24aa49ad2f5fe532878e298068198999483a934e099414ac7159cc423a77dca5f87a9e2dc0587490f47bab0d0121f9517adac SHA512 05131c4d9735dc03253b43b59a9735e7990cca72ba707f97534dd3e302c42c367c8d952f013a294b4967b52cf5aae99f765ee8497a3e2c8bf099719504051eca
 MISC metadata.xml 2542 BLAKE2B 1e617a66e86efb25f296a8a143e8af392527084920dc1df71d542b982ac688a5e86b323f74e57efe06315cd34448b57fe1c7a04d9d14ec7737d0d9bf6649b517 SHA512 f0bd9d7c97448dec77ace57252598714a86d334e355adb1c61b3eccc1a2a702ab7e81667ceaa50558f9e3a61310d8d3193dbffcb777d3543b815632cd3502d63
diff --git a/mail-client/thunderbird/thunderbird-68.1.0.ebuild b/mail-client/thunderbird/thunderbird-68.1.0.ebuild
new file mode 100644
index 000000000000..658382a52e51
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-68.1.0.ebuild
@@ -0,0 +1,764 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIRTUALX_REQUIRED="pgo"
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="6.2.5"
+MOZ_LIGHTNING_GDATA_VER="4.4.1"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it
+ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT rm ro ru si sk sl sq sr
+sv-SE tr uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+
+# Patches
+PATCHFF="firefox-68.0-patches-11"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+LLVM_MAX_SLOT=8
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.mozilla.org/thunderbird"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free
+	+gmp-autoupdate hardened jack lightning lto neon pgo pulseaudio
+	 selinux startup-notification +system-av1 +system-harfbuzz +system-icu
+	+system-jpeg +system-libevent +system-sqlite +system-libvpx
+	+system-webp test wayland wifi"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCHFF}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
+	https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
+	${PATCH_URIS[@]}"
+
+inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
+		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
+		autotools mozlinguas-v2 virtualx
+
+CDEPEND="
+	>=dev-libs/nss-3.44.1
+	>=dev-libs/nspr-4.21
+	dev-libs/atk
+	dev-libs/expat
+	>=x11-libs/cairo-1.10[X]
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35:0=[apng]
+	>=media-libs/mesa-10.2:*
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	virtual/freedesktop-icon-theme
+	dbus? ( >=sys-apps/dbus-0.60
+		>=dev-libs/dbus-glib-0.72 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=virtual/libffi-3.0.10:=
+	virtual/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
+	system-icu? ( >=dev-libs/icu-63.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
+	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
+	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager ) )
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	pulseaudio? ( || ( media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9 ) )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	>=dev-util/cbindgen-0.8.7
+	>=net-libs/nodejs-8.11.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	|| (
+		(
+			sys-devel/clang:8
+			!clang? ( sys-devel/llvm:8 )
+			clang? (
+				=sys-devel/lld-8*
+				sys-devel/llvm:8[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:7
+			!clang? ( sys-devel/llvm:7 )
+			clang? (
+				=sys-devel/lld-7*
+				sys-devel/llvm:7[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:6
+			!clang? ( sys-devel/llvm:6 )
+			clang? (
+				=sys-devel/lld-6*
+				sys-devel/llvm:6[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
+			)
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	>=virtual/cargo-1.34.0
+	>=virtual/rust-1.34.0
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+REQUIRED_USE="wifi? ( dbus )
+	pgo? ( lto )"
+
+S="${WORKDIR}/${MOZ_P%b[0-9]*}"
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]] ; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+		return 1
+	fi
+
+	if use pgo ; then
+		if ! has usersandbox $FEATURES ; then
+			eerror "You must enable usersandbox as X server can not run as root!"
+		fi
+	fi
+
+	if use clang ; then
+		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${LLVM_SLOT}!"
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# Avoid PGO profiling problems due to enviroment leakage
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+
+	if ! use bindist ; then
+		einfo
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation."
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
+	fi
+
+	addpredict /proc/self/oom_score_adj
+
+	llvm_pkg_setup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use pgo || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	# Apply firefox patchset then apply thunderbird patches
+	rm "${WORKDIR}"/firefox/2013_avoid_noinline_on_GCC_with_skcms.patch || die
+	eapply "${WORKDIR}/firefox"
+	pushd "${S}"/comm &>/dev/null || die
+	eapply "${FILESDIR}/1000_fix_gentoo_preferences.patch"
+	popd &>/dev/null || die
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
+	if use ia64 ; then
+		sed -i \
+		-e '/^OS_LIBS += no_as_needed/d' \
+		-e '/^OS_LIBS += as_needed/d' \
+		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
+		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
+		|| die "sed failed to drop --as-needed for ia64"
+	fi
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/comm/mail/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Keep codebase the same even if not using official branding
+	sed '/^MOZ_DEV_EDITION=1/d' \
+		-i "${S}"/browser/branding/aurora/configure.sh || die
+
+	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
+	# However, when available, an unsupported version can cause problems, bug #669548
+	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
+		"${S}"/build/moz.configure/rust.configure || die
+
+	# Autotools configure is now called old-configure.in
+	# This works because there is still a configure.in that happens to be for the
+	# shell wrapper configure script
+	eautoreconf old-configure.in
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	# Add information about TERM to output (build.log) to aid debugging
+	# blessings problems
+	if [[ -n "${TERM}" ]] ; then
+		einfo "TERM is set to: \"${TERM}\""
+	else
+		einfo "TERM is unset."
+	fi
+
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		strip-unsupported-flags
+	fi
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	# common config components
+	mozconfig_annotate 'system_libs' \
+		--with-system-zlib \
+		--with-system-bz2
+
+	# Must pass release in order to properly select linker
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	if use pgo ; then
+		if ! has userpriv $FEATURES ; then
+			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
+		fi
+	fi
+
+	# Don't let user's LTO flags clash with upstream's flags
+	filter-flags -flto*
+
+	if use lto ; then
+		local show_old_compiler_warning=
+
+		if use clang ; then
+			# At this stage CC is adjusted and the following check will
+			# will work
+			if [[ $(clang-major-version) -lt 7 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			# Upstream only supports lld when using clang
+			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+		else
+			if [[ $(gcc-major-version) -lt 8 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			# Bug 689358
+			append-cxxflags -flto
+
+			if ! use cpu_flags_x86_avx2 ; then
+				local _gcc_version_with_ipa_cdtor_fix="8.3"
+				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
+
+				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
+					# due to a GCC bug, GCC will produce AVX2 instructions
+					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
+					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
+					append-ldflags -fdisable-ipa-cdtor
+				else
+					einfo "No GCC workaround required, GCC version is already patched!"
+				fi
+			else
+				einfo "No GCC workaround required, system supports AVX2"
+			fi
+
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		fi
+
+		if [[ -n "${show_old_compiler_warning}" ]] ; then
+			# Checking compiler's major version uses CC variable. Because we allow
+			# user to control used compiler via USE=clang flag, we cannot use
+			# initial value. So this is the earliest stage where we can do this check
+			# because pkg_pretend is not called in the main phase function sequence
+			# environment saving is not guaranteed so we don't know if we will have
+			# correct compiler until now.
+			ewarn ""
+			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
+			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
+			ewarn ""
+			sleep 5
+		fi
+
+		mozconfig_annotate '+lto' --enable-lto=thin
+
+		if use pgo ; then
+			mozconfig_annotate '+pgo' MOZ_PGO=1
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_annotate "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	if use hardened ; then
+		append-ldflags "-Wl,-z,relro,-z,now"
+		mozconfig_use_enable hardened hardening
+	fi
+
+	# Modifications to better support ARM, bug 553364
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_annotate '' --with-thumb=yes
+			mozconfig_annotate '' --with-thumb-interwork=no
+		fi
+	fi
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build
+		fi
+	fi
+
+	mozconfig_use_enable !bindist official-branding
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+	mozconfig_annotate '' --enable-system-pixman
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
+	fi
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_annotate '' --enable-rust-simd
+	fi
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
+	if use wayland ; then
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# Disable built-in ccache support to avoid sandbox violation, #665420
+	# Use FEATURES=ccache instead!
+	mozconfig_annotate '' --without-ccache
+	sed -i -e 's/ccache_stats = None/return None/' \
+		python/mozbuild/mozbuild/controller/building.py || \
+		die "Failed to disable ccache stats call"
+
+	mozconfig_use_enable dbus
+
+	mozconfig_use_enable wifi necko-wifi
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+	mozconfig_annotate '' --enable-ldap
+	mozconfig_annotate '' --enable-calendar
+
+	# Enable/Disable eme support
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# disable webrtc for now, bug 667642
+	use arm && mozconfig_annotate 'broken on arm' --disable-webrtc
+
+	# allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
+	fi
+
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	mkdir -p "${S}"/third_party/rust/libloading/.deps
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	local _virtx=
+	if use pgo ; then
+		_virtx=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+		addpredict /etc/gconf
+	fi
+
+	GDK_BACKEND=x11 \
+		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
+		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+		MOZ_NOSPAM=1 \
+		${_virtx} \
+		./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js-2 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# set dictionary path, to use system hunspell
+	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
+		>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+
+	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
+	if use system-harfbuzz ; then
+		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	# force cairo as the canvas renderer on platforms without skia support
+	if [[ $(tc-endian) == "big" ]] ; then
+		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
+			>>"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" || die
+	fi
+
+	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	local plugin
+	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+			"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+			|| die
+	done
+
+	cd "${S}"
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	DESTDIR="${D}" ./mach install || die
+
+	# Install language packs
+	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
+
+	local size sizes icon_path icon
+	if ! use bindist; then
+		icon_path="${S}/comm/mail/branding/thunderbird"
+		icon="${PN}-icon"
+
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		icon_path="${S}/comm/mail/branding/nightly"
+		icon="${PN}-icon-unbranded"
+
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${icon_path}"/default48.png "${icon}".png
+	# Install icons for menu entry
+	sizes="16 22 24 32 48 256"
+	for size in ${sizes}; do
+		newicon -s ${size} "${icon_path}/default${size}.png" "${icon}.png"
+	done
+
+	# Disable built-in auto-update because we update firefox through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true"\
+			 >> "${ED}/usr/share/applications/${PN}.desktop" \
+			|| die
+	fi
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
+		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid} \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/bin/distribution/extensions/${emid}/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mkdir -p "${ED}"/${MOZILLA_FIVE_HOME}/extensions
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+
+		# manifest.json does not allow the addon to load, put install.rdf in place
+		# note, version number needs to be set properly
+		cp -RLp -t "${T}/${emid}" "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/install.rdf
+		sed -i -e '/em:version/ s/>[^<]*</>4.1</' "${T}/${emid}"/install.rdf
+
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# thunderbird and thunderbird-bin are identical
+	rm "${ED%/}"${MOZILLA_FIVE_HOME}/thunderbird-bin || die
+	dosym thunderbird ${MOZILLA_FIVE_HOME}/thunderbird-bin
+
+	# Required in order to use plugins and even run thunderbird on hardened.
+	pax-mark pm "${ED%/}"${MOZILLA_FIVE_HOME}/{thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# doesn't need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		einfo "APULSE found - Generating library symlinks for sound support"
+		local lib
+		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# a quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if ! use gmp-autoupdate && ! use eme-free ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 0394059fdcd5..f66c25d5c7b0 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -3,5 +3,5 @@ AUX trojita-0.7-gpgme.patch 1416 BLAKE2B dba95c0954a6ac704e5145d140e905bf6f886db
 AUX trojita-0.7-qt-5.11b3.patch 9678 BLAKE2B 0bcf00db610594ff084f5ca3bcfe2d3ad40d44b461358c4b9fc730f6dba787d82837c16f2e6bc84df9d3f57ac404d7c006fc7db223efeacfb9e833b6209b4374 SHA512 c16f3a7b9555e70e61656eb8caf25f778ec14a1dfdd18f786ddc3d8ee49b28fd39c4f438d051dbf961afbaf8cafc3d84a5befa10111ba216b4dec300cd67e228
 DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
 EBUILD trojita-0.7-r2.ebuild 1913 BLAKE2B 045e1f76dc240bdb7f8b9205f44c98a49642dbaba21d697f2b41c302d12253070822b3617b13faac108a88307b43df793ab8a576c257d051bbe1edda07effdcc SHA512 b52d541396a5c99310af90ded525aae4af885b8a897202bba0d2386cffbdd8b7ff4c81584f05d84497a46fc99d62eb6c983a6f130ee666282824c67b29d4b8a6
-EBUILD trojita-9999.ebuild 1811 BLAKE2B e84ef5dd17183f4c650bdf34d0711941a9b9754b7d54753f2ea706f24ba8971eb79d8543c590d4d821698633487251b63d65c5f0f710370c8ded6cf68704cbe3 SHA512 5dfdea3243f858c8786ec583777fab4438c740d52670102bfa13c770b389cc2cc4995705a28c6ef6793f12b61b4539b74f51658737d1eb2c1bfc723221c696b8
-MISC metadata.xml 727 BLAKE2B ba6e65633a7e29af6b5e1da2722236e44c0f5672567508680e9ce2f6c58867124d446efe1eeab3eaaab7fa45d8bb3de0362099bbde555037fcfd5c9d4293ddc9 SHA512 b3152743cb47801f78ce5d45b94a809e1299aac7dffcb758fc36ea8d606541c5a0ff49824e05cd20a56a5576cd754997ed05dc0eb2933efc197b848db3af3e76
+EBUILD trojita-9999.ebuild 1788 BLAKE2B 46f2c14468e64aaac068daf7674d3cd2fdad3393d2a9010b92a9038c0bc6cc143c4d30b7e0653fd488e8eaf00346d5746e45afb6446f813907247b1c44060be2 SHA512 5ccb01b7721f00bb085b9fc94a02d554d090bcd0867d4d875b56361efb23ac3cd4ef6608124f0f4cc67006bb44dae4352d89e41276e5eaf97673e35ac79a9d2b
+MISC metadata.xml 766 BLAKE2B b3fccdefcadc2ab93429fd991581a8b085546605ad00e68899a2d731f2217113f7271d5b53cef35dfab8063db05fd9662bdaff715a95bf73cfd8fa9c636f184f SHA512 b13adf41bd68543886b25fb0dfdc3c924e5fc050de4f4bbea383e91cb2d4542de83050695bd67b913f2707d8f6a689d6d387253c718ec7c78dd50abed3a3f633
diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index 7a659b227afb..d5712067bc92 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -14,8 +14,8 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="addressbook">Build <pkg>kde-apps/akonadi</pkg> addressbook plugin</flag>
 		<flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag>
+		<flag name="pim">Enable support for KDE PIM resources integration via <pkg>kde-apps/akonadi</pkg> addressbook plugin</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">trojita</remote-id>
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index 7740a0aa6ff7..fb3c38171e0d 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -17,16 +17,15 @@ HOMEPAGE="http://trojita.flaska.net/"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="addressbook +crypt +dbus debug +password +spell test +zlib"
+IUSE="+crypt +dbus debug +password pim +spell test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )
 	zlib? ( virtual/pkgconfig )
 "
-DEPEND="
+RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
@@ -34,17 +33,19 @@ DEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
-	addressbook? ( kde-apps/akonadi-contacts:5 )
 	crypt? (
 		>=app-crypt/gpgme-1.8.0[cxx,qt5]
 		dev-libs/mimetic
 	)
 	dbus? ( dev-qt/qtdbus:5 )
 	password? ( dev-libs/qtkeychain[qt5(+)] )
+	pim? ( kde-apps/akonadi-contacts:5 )
 	spell? ( kde-frameworks/sonnet:5 )
 	zlib? ( sys-libs/zlib )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
 
 DOCS=( README LICENSE )
 
@@ -58,13 +59,13 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_ABOOKADDRESSBOOK_PLUGIN=OFF
-		-DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex addressbook)
+		-DWITH_ABOOKADDRESSBOOK_PLUGIN=ON
 		-DWITH_CRYPTO_MESSAGES=$(usex crypt)
 		-DWITH_GPGMEPP=$(usex crypt)
 		-DWITH_MIMETIC=$(usex crypt)
 		-DWITH_DBUS=$(usex dbus)
 		-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
+		-DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex pim)
 		-DWITH_SONNET_PLUGIN=$(usex spell)
 		-DBUILD_TESTING=$(usex test)
 		-DWITH_ZLIB=$(usex zlib)
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 5b64ad589275..42139fa10152 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/amavisd-milter/Manifest b/mail-filter/amavisd-milter/Manifest
index b75640436b30..28f26ff3adaa 100644
--- a/mail-filter/amavisd-milter/Manifest
+++ b/mail-filter/amavisd-milter/Manifest
@@ -5,7 +5,5 @@ AUX amavisd-milter.initd-r1 679 BLAKE2B c6d8d8a8b23c01923e2909f5b58cc8228ac693d2
 DIST amavisd-milter-1.5.0.tar.gz 175759 BLAKE2B c9de40eadbfca71a3a35c340372163ed7b685ff7150cdb85ab073cc78abcbc5dfb5fcaccc0b1518fa3a354d6ddcf19b6690d5a125e0f2ccb3ea190be57348b88 SHA512 ef206cd2c64cf48edb8a679b92a960451e0edbec11e0c207942bf6f435f7d14538a409d8197774ea4bbf63f27ed73d52a7c51531155be6d8724981b5dd9e0037
 DIST amavisd-milter-1.6.0.tar.gz 187994 BLAKE2B 87d3d870236b50e9c8c7bf3876fc476fb28ff6ee208c8da77c2f9ab2f1ccc0b883cc551718f4f9639125484965180100088d94557f065c7bf904fc912dd2794a SHA512 2e0b39b733f88742fcb2f4e884e528b70731ad5950bd56d3af1391d666dc018d2f6c1ad4212e787872a503bccbc65c52d55ae195c384e9333e4f39d25b1d1a34
 EBUILD amavisd-milter-1.5.0-r1.ebuild 681 BLAKE2B fd6a954e839da2eb92d023615cdc8d65358e6ee22a7c29aed0f4adfaaa6f04cc70024818fa1005cc71c7d0e16e9841c57c62672cb73d0870f5138cf28bc0cf55 SHA512 0f9c5b732a70a3e9a9206e62c6d92115f9c998c642bdbfa7f6813b4b29865dc793d41de0c27c95a48febbf1e312ef2960efa34f79aa84c2b7a3ad9ba28a2cc92
-EBUILD amavisd-milter-1.5.0.ebuild 631 BLAKE2B b7dc7eca801539dcfc92109342095ff618f14be2121328284fd3a04dd078012060c20e168245414b2a3738e2e0469cc26ef3b51afea8c6b41c96c0f825ba1b69 SHA512 aaacbdb73059e13e11155527a085673b6d61b525b17320982894181aeef61d5d5d827b95f1d5bf1621e97385640e0a92aebf99f1d5cec83b9ccbd5a7f34511d5
 EBUILD amavisd-milter-1.6.0-r1.ebuild 730 BLAKE2B 1a451372ba7008105209790587ee1560346a694e4752b7db09fd6b920e8e8a78c633a087baeb57f7c629b4a5e55a4827002ba1f653560877f14a04d6858b0769 SHA512 43e7ce94bea93f1b4b08966f43669715ee7545c5ab176421aa19fd1dff3741c82bcd4725fd64884fa83b25a074ccdd75be3af2dcf736a011e44b1cc8b59776b5
-EBUILD amavisd-milter-1.6.0.ebuild 686 BLAKE2B 1e8af7b0bf1352a60abd2b8e5e84161cc32e3dd8c4490207c701918c139f875a50058b205b99aba4a6aa714e067ce8589a0a138671e09cd6d99579291ad16c96 SHA512 ed938157111b4233f8463d27a54d77be39e199fd7cedace300a52d7a55eb42ca4990c14af95327e4a91507f44468cbd9bcdde0347ce910d8b7942d871008ecfa
 MISC metadata.xml 251 BLAKE2B e1367be44411f535beb8cbf57139e7b0fb032a7ddd9cc49ff85de4b4b884822b0b0b61f0bbd3663fd5af8aa2ab14bf0aba2eeff35cf68322549ca27c82ef703c SHA512 b3b1e3c58e9c9f9774ced1b8358ecba8fd4c8f69f8feafbadec5d6e58c820cbbd4971472dd61039fa75279c5f4f33ccc3de950cb2aeac14c2fe0b307ee80697b
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.5.0.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.5.0.ebuild
deleted file mode 100644
index 8f8126c5fe4f..000000000000
--- a/mail-filter/amavisd-milter/amavisd-milter-1.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="sendmail milter for amavisd-new"
-HOMEPAGE="http://amavisd-milter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-		mail-filter/amavisd-new"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS CHANGES INSTALL README TODO
-
-	newinitd "${FILESDIR}/amavisd-milter.initd" amavisd-milter
-	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
-}
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild
deleted file mode 100644
index 2ea91b4704b0..000000000000
--- a/mail-filter/amavisd-milter/amavisd-milter-1.6.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="sendmail milter for amavisd-new"
-HOMEPAGE="http://amavisd-milter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
-		mail-filter/amavisd-new"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS CHANGES INSTALL README TODO
-
-	newinitd "${FILESDIR}/amavisd-milter.initd-r1" amavisd-milter
-	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
-}
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index e73d95316ae4..f55347596ffa 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,10 +1,5 @@
-DIST imapfilter-2.5.4.tar.gz 52585 BLAKE2B c23ace9d5c4642ea7455406886dc0a045bb954d6edfa92e9c14b08b9f4500a1b9b3d566b3fef0967a920766f200d30bd8810f18ad6584e27177845243bcf4140 SHA512 33d8cc822a4ccd02ede6df7f30b5d2893088b352b9d1900df6597fd6443ae51ceb9ff22cd0100f9ec9e28dc84ac294bb717e0a85c4670677dfb09b5e5da76915
 DIST imapfilter-2.5.6.tar.gz 53579 BLAKE2B a62900f29d6a1056985e41e4ba4d36c193ef2cbe44c870f2e6b5d2fe012320c5d872605f579149b1e5b4ba2f96ebc823f8a5e7df795b29415fe76ca8388a381e SHA512 98bca5cea00cdbbd0bcb3b98c381ae75ec43a3b6651a171cce47df38948d6d7f043f5bd6f42c8f9e30297db17f5d542bb0174dfbd46fc83d25cb5ea6e60d962c
-DIST imapfilter-2.5.7.tar.gz 54861 BLAKE2B 24c8fdd32c946cd446fa8fc0aa6bc855c82ddb7cabacae6537b98a4a02a39531d74d5137893f1718fa031de73debe04778f54540c4130877d1e9300022db4121 SHA512 9297e98812312fbf2c92aa5477bdfecb522048e45b4bc4922e312bd89a72b020a98f5547e3f0882ae665c24db21e6995eda839b762947adc48bc413ab0c882f1
 DIST imapfilter-2.6.12.tar.gz 59249 BLAKE2B 5d828bfb7680feee0787741e48a5e61fde33b41dd0e0034f7d91b3b8865704f5acd3766e00c277c37b1276204ebb356c459ac5ea626dbee58af0e2b07777f918 SHA512 1425041c288ac46833af6119fd0169cf783a1fec61bf07dfad6f732ec74834ec3beb4e81c3b19f7436310324d9a4369c4ec61aa3a83eef203d7897ea0fc26528
-EBUILD imapfilter-2.5.4.ebuild 793 BLAKE2B b687c4beb92ca50a033f0a5c268758b3c396bb158315bc39296f608c9b77c8c581893bd14c2de5f43cfc279f2c536a9bf09d8014b90f93c094c2e6b689e942bc SHA512 a67954775d74149be63c27bbdaa4de0ef5f43db61e42c02ccd75b24fa8f28a703577e0fe6a8ec8acd23016ed19da1f48edbb1352eeab60cbe97fc2b97b09d501
 EBUILD imapfilter-2.5.6.ebuild 793 BLAKE2B b687c4beb92ca50a033f0a5c268758b3c396bb158315bc39296f608c9b77c8c581893bd14c2de5f43cfc279f2c536a9bf09d8014b90f93c094c2e6b689e942bc SHA512 a67954775d74149be63c27bbdaa4de0ef5f43db61e42c02ccd75b24fa8f28a703577e0fe6a8ec8acd23016ed19da1f48edbb1352eeab60cbe97fc2b97b09d501
-EBUILD imapfilter-2.5.7-r1.ebuild 877 BLAKE2B df18f8c5ebee719cc1c858d6d1a46eedc063acd013f00929f5e28789f3c055fc6179494e8b2b15a113ab9aa37e58c6405c3ca232fdc38a340013678ff7a8c10e SHA512 690908c780a1a8c6cfd2515623ea495a23e0c62a305f83a53f82ff54951aeff5c792a80232d15ce1fe4c1166f8ccdf4168aeef8066798734a8879d58ac487d54
-EBUILD imapfilter-2.5.7.ebuild 810 BLAKE2B 6497e07d3def2c187cb91678444b5f4a510363dda35fef39fc7d1632a458ecf88bf98fe3bc2d8da3aef64f811d18bb0f578c749c1e27e61bd532752456421735 SHA512 c597b163d3e81ce0a468cde8eb8448bad789053bf5b935df035d55c964b1f67145f5befde51bd01b8821a07a36c06097b771435728df7b3e8bd3da5327afd9f6
 EBUILD imapfilter-2.6.12.ebuild 898 BLAKE2B ccf32725cf7a31769523eadf3da76700e7e7df38bfc932babe1bc67566c7b1d13d72dfa521333a5c489166ae0b49e0fdc5e477d8e7f823d5b955ac9fe906ca88 SHA512 75ea1168731120ebbcb315d9af068afb54137fcf0056aadff3725500cb8a42e76e6a8b0e6cf275bb12a2147eab0f2a6f8bfb0aa10ada2581f6a0e282b44f05d6
 MISC metadata.xml 249 BLAKE2B 8f4404564610b1fc4705b073c963909d882aa72717e386d0ddaa11f4a58ea4fedb0505711baf498cb59107d8486b890eb337d56fad641a0c656d4553fc0139fd SHA512 8fb3a6309758c23abad3fd09a007212a6f5c0beb6d03d3c7d94f5fc8b8818d5cbddd55ef8fbe25700eb11dce04486295ddcc413a3fe568b5ba620b0b5fe0b0a6
diff --git a/mail-filter/imapfilter/imapfilter-2.5.4.ebuild b/mail-filter/imapfilter/imapfilter-2.5.4.ebuild
deleted file mode 100644
index 78c29f258103..000000000000
--- a/mail-filter/imapfilter/imapfilter-2.5.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=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="http://imapfilter.hellug.gr"
-SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="dev-libs/openssl:0=
-	dev-libs/libpcre
-	>=dev-lang/lua-5.1"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README samples/*"
-
-src_prepare() {
-	sed -i -e "/^PREFIX/s:/local::" \
-		-e "/^MANDIR/s:man:share/man:" \
-		-e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
-		-e "/^CFLAGS/s/-O//" \
-		src/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	default
-	doman doc/imapfilter.1 doc/imapfilter_config.5
-}
diff --git a/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild b/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
deleted file mode 100644
index e0489a8fead9..000000000000
--- a/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="http://imapfilter.hellug.gr"
-SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl )
-	dev-libs/libpcre
-	dev-lang/lua:*"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README samples/*"
-
-src_prepare() {
-	sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^MANDIR/s:man:share/man:" \
-		-e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
-		-e "/^CFLAGS/s/-O//" \
-		src/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	default
-	doman doc/imapfilter.1 doc/imapfilter_config.5
-}
diff --git a/mail-filter/imapfilter/imapfilter-2.5.7.ebuild b/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
deleted file mode 100644
index 790a22454336..000000000000
--- a/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="An IMAP mail filtering utility"
-HOMEPAGE="http://imapfilter.hellug.gr"
-SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="dev-libs/openssl:0=
-	dev-libs/libpcre
-	dev-lang/lua:*"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README samples/*"
-
-src_prepare() {
-	sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^MANDIR/s:man:share/man:" \
-		-e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
-		-e "/^CFLAGS/s/-O//" \
-		src/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	default
-	doman doc/imapfilter.1 doc/imapfilter_config.5
-}
diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
index c2e721cbb6c0..4bd776b45f44 100644
--- a/mail-filter/libspf2/Manifest
+++ b/mail-filter/libspf2/Manifest
@@ -1,7 +1,4 @@
 AUX libspf2-1.2.10-gcc5.patch 1080 BLAKE2B ce085a71cba9f6a493c7b276dada02dceb8efdb75df9d0062b74acd9b0e9d5a9c56cdd970743cc9e4860a4714e24d0e4687d9a2c5d321e320a6888c06f88e6c3 SHA512 cd2af129e334e0e1efcd722680f8f7cb064e6f5581ce41c791cb4f5f34d1eb4ac0dc586114b3017b4fd2ba350f11972f78a4029a8fc03118cf74c4f1276cd12b
-AUX libspf2-1.2.9-ipv6.patch 1796 BLAKE2B 939a59e17a9e06b4eb4cab62ad555e493d733d940527c549a050b36384f340a9ed21e916aa3ac90812205d06b2e9f50b6f2c548b7186e38f6862991347d8d0f0 SHA512 d79187ba3bdf6f093600f5ad9a530e17791689e141861b09486ee4a54a9c54d9c100c19ab45839c28aa8535fb6af9b2bbcac937a2b4b2519feaff52d51515ded
 DIST libspf2-1.2.10.tar.gz 508842 BLAKE2B d15a44f64c5e3da20aa349e61a6cc02a15f83ed3acff93fe4c23970e30533d6424b1db35d7d60ff488c9a239d343f8544426fbf8fcb66271237155e0b57df1b5 SHA512 162ce382628c6fcadac3e11f5a12442db622bb23f7ec503e16f5ba7fc88afdd777bce6b093c12a58210355985fd11b74b140f08fab347334d82d953dd183b130
-DIST libspf2-1.2.9.tar.gz 518001 BLAKE2B 711a10d8d7799a09f4f0a801ed7a4c7e82611bd8a6dd9a55f616827548761dae9924ca65c64c7271f8cf0f6f605ccb98ff5e8e3035fc3776ee4e7604ec0a02cd SHA512 3137571f438704c176c5251e7b93fd0a8b6b04e52ad37218685b42b1fc5da6286baee578da1a14291d185216bd2a909cca3e55d64ffe580e71be059d1043a248
 EBUILD libspf2-1.2.10.ebuild 1219 BLAKE2B 85afd0c834ce4a81635a7535ad0f218cffe3bd445112c4add6e6a7864995daf44912ff57dab5a203209a30f1377d6054844b51c81050657aa501468e607ea14a SHA512 99e4467440c5ed53ecf255d0fcd95eaf6731b51dcd3e18b0e858a0de1a3ac2cc19cb7596950bd457b127521abe63c74bcc16d764bcc9be99280cb734377f6a38
-EBUILD libspf2-1.2.9-r3.ebuild 1124 BLAKE2B d50b3f79242b706dc9bcf3142dbc53cd4ee0a0220cb1502d815014c4384b153efa25bce1d8785f9736748b7cce27678a7bf56d8326ea48dede11ce6176e4efce SHA512 f82a8f69f82bef84a33c512e434f6a683e5ddb97689c6c317c6d372cfa7b528be49ac7757c824c1bf393dd8d064eb869137839fe61717832ebc7786b22ae2abc
 MISC metadata.xml 588 BLAKE2B f2a34d6c55b8678f9ef69824ccce32a51508fe251af758d4d4c3ae05b51498b543e5f60757764a4a47dbc98587bc2b57faced4965d8c401e35f8e36605313a4c SHA512 8328d959a8b69fa3e10108f21cf2c53a3daf4aacbd9646af8e5af95ec818eeb6aebc20185b991e4ce6a3a2d0101bf67ce47b7af85dec4b06c2748d5f4fafd18e
diff --git a/mail-filter/libspf2/files/libspf2-1.2.9-ipv6.patch b/mail-filter/libspf2/files/libspf2-1.2.9-ipv6.patch
deleted file mode 100644
index 76e8cd37c27d..000000000000
--- a/mail-filter/libspf2/files/libspf2-1.2.9-ipv6.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/09/08 10:36:27 tron Exp $
-
-Fix an abort() caused by miscalculating the size of an internal buffer.
-This can crash applications using "libspf2" (e.g. "milter-greylist")
-in an e-mail gets delivered via SMTP over IPv6 depending on the
-remote machine's IPv6 address.
-
---- src/libspf2/spf_expand.c.orig	2008-11-03 21:29:00.000000000 +0000
-+++ src/libspf2/spf_expand.c	2009-09-08 11:27:52.000000000 +0100
-@@ -245,7 +245,7 @@
- 		case PARM_CLIENT_IP:		/* SMTP client IP				*/
- #ifdef COMPUTE
- 			if (compute_length) {
--				len = sizeof(ip6_buf);
-+				len = sizeof(ip6_rbuf);
- 				if (d->dv.url_encode)
- 					len *= 3;
- 				buflen += len;
-
-http://www.gossamer-threads.com/lists/spf/devel/35098
-
---- src/libspf2/spf_compile.c	2008-11-03 15:37:33.000000000 -0500
-+++ src/libspf2/spf_compile.c	2009-09-07 23:46:02.000000000 -0400
-@@ -778,7 +778,7 @@
- 	const char			*end;
- 	const char			*p;
- 
--	char				 buf[ INET_ADDRSTRLEN ];
-+	char				 buf[ INET6_ADDRSTRLEN ];
- 	size_t				 len;
- 	int					 err;
- 
---- src/libspf2/spf_interpret.c	2008-10-22 11:47:43.000000000 -0400
-+++ src/libspf2/spf_interpret.c	2009-09-08 00:42:25.000000000 -0400
-@@ -505,7 +505,7 @@
- 	char		dst_ip6_buf[ INET6_ADDRSTRLEN ];
- 
- 	struct in6_addr		src_ipv6;
--	int				cidr, mask;
-+	int				cidr, cidr_save, mask;
- 	int				i;
- 	int				match;
- 
-@@ -517,6 +517,7 @@
- 	cidr = SPF_i_mech_cidr(spf_request, mech);
- 	if ( cidr == 0 )
- 		cidr = 128;
-+	cidr_save = cidr;
- 
- 	match = TRUE;
- 	for( i = 0; i < array_elem( ipv6.s6_addr ) && match; i++ )
-@@ -538,7 +539,7 @@
- 		INET_NTOP(AF_INET6, &ipv6.s6_addr,
- 							dst_ip6_buf, sizeof(dst_ip6_buf));
- 		SPF_debugf( "ip_match:  %s == %s  (/%d):  %d",
--				src_ip6_buf, dst_ip6_buf, cidr, match );
-+				src_ip6_buf, dst_ip6_buf, cidr_save, match );
- 	}
- 
- 	return match;
-
diff --git a/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild b/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
deleted file mode 100644
index 6e99cae55055..000000000000
--- a/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils autotools
-
-DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols"
-HOMEPAGE="http://www.libspf2.org"
-SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 BSD-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="static static-libs"
-
-DEPEND=""
-RDEPEND="!dev-perl/Mail-SPF-Query"
-REQUIRED_USE="static? ( static-libs )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ipv6.patch"
-	if ! use static; then
-		sed -i -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \
-			-e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \
-			-e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \
-			-e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am \
-			|| die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README TODO INSTALL
-
-	use static-libs || rm -f "${D}"/usr/lib*/libspf2.la
-}
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 5ec7af107215..363be275f49f 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,13 +1,6 @@
 AUX maildrop-3.0.0-testsuite.patch 1948 BLAKE2B fcfdfd488873fa4f14c7087ee54bbc2e2d1544532ccdd586b6913958a9b934b5cd31b3295c72afc881ee79aaf26985b21d930925d7e5612e75d5f2788c228916 SHA512 49b1bd03df4df4337acbc135f86b058a0def9cb320b9cf8e0033f134d967f600db5c5afa9832efc99f1b0dead422f3e8348c57db3f6794295b27039af54d6d51
 AUX maildrop-disable-fam.patch 2291 BLAKE2B dd57e9c6d176fd7ca6cedafb9c0f497dd4454920e60d8d2799f105fd98f51b5a0faa4ecc9d8a688aa4cc9022a6b62b434389d5516bd06abd273e02bf32926b57 SHA512 547f78a9e5dce501ac61584912a2e74b43e36b2189bab27d1811af7718def5e07d3683fb2ef0937ae026bd53cffc68b735319322c089bcfff0a17a6edebed1fb
-AUX maildrop-testsuite-r3.patch 2591 BLAKE2B 597c04ed270b1e7a2e54861942dbf40a76844b4c6ee2192b4c4c337ca0a689655060c11ca160113e7e3177956945098818bc37de6af41e1a820c40d2e1d3a476 SHA512 92626418bb1f51bed7bf549e411035db4134f7cf328cfc2922078d909b6e8b8471a8e9f07e9990b5e4baed1423124d2641d80bfbb841aa966f5259ecd8c58e1e
 AUX maildroprc 58 BLAKE2B b9ee443f0e9223690f077983541de86dd55c8b36ae2bafdea69563f74dff60ba4234c8388fe257045a36d61bc5f1db4c5a89c56678cbb8b0d4f187120e70a4cb SHA512 3077160382882db22d095dff4b27368e7482b63a9756a3cf7a61e8470ed933af0fdb04a61ebae155b14a7b1fafc598a4cdd1bb660d957f00190b95eb41e81f4e
-DIST maildrop-2.8.3.tar.bz2 1992695 BLAKE2B be17fa1ac38f8a54670e40f2b4207c2ee5e8976f20e29c6a528ccf50a716c8b4aedb0546a9722f1147573afd9d43f8a8caa59aec8bf9069ef833226cb2ea0562 SHA512 25168945764eda5c74641e205e3c784ca2ae27c15a5a6ddfe7a1c7b238cd6c3d5b0a3f7ce8b405b578d067f6f2aae5d7d6110da8bc89f91ac1c7fdc224ffd054
-DIST maildrop-2.8.5.tar.bz2 2072987 BLAKE2B e067e0ef77f850fd9ce97584893dd5301a7a91fcebea02351da8b22d3d7f0b74f3809cdc3874b29117a62d5c496962f72a5254470cd5f92b787b80d066f1fec1 SHA512 c04120af29ee8e72aeabd211301c5052fe4a2dc0f337074e1fa57b8adb9652512cd744e0bba3894a8b0e3b21a3511bbf4a4f045faec3536edb8be0f8bdc84cf5
-DIST maildrop-2.9.0.tar.bz2 2075698 BLAKE2B 2a918214e471a4a54aa7e0412e062ca85ac3ce4757bf4642fb0c0a9776a7c1b1bc417ef426c9bd7767d99b9d783085bf6c67f402ea43b0e7eba10c82d98b5619 SHA512 366a04d1e6e10ef1c824fbb5dfe406ff74fe17b80a46619fd8aa8cde3b4fef9a10b4ed3cc6329ed04632582d58104aaf16134c6dc82e17917b82fb6f18316dd6
 DIST maildrop-3.0.0.tar.bz2 2091018 BLAKE2B 3c8e3ae5c2c2f636b0223e2bafadcb88bf34be63c792a177febac5c41ccd50cab04755f14a26731c38a35531abea1faa70d4af5587a6e68a21735f050f2d46d8 SHA512 1f1e1682ec7c2d0c1f2e71059f186d9a9d3118194b1e558d3a6e5826721fb14a661f4d75df42ce2626430ac072b50e723b563ae00c1ebdeb4da96abfeb534eff
-EBUILD maildrop-2.8.3.ebuild 3850 BLAKE2B 2092ce2c1d6850859e9594175debc4698b943ce744896250c694aff98727f2c97cad0b542c707745544a802f46c1b19c72a4546901be0a87bb5e4bef2041070a SHA512 4c667ca6fc6c8c62f6b70035f2c86704089c276fc361ec3bd8e28f58fdc01c29bc455a7936eb64f40c8c0c728a9bda7f463561e64fdf9a3c0aa6a81257d213d2
-EBUILD maildrop-2.8.5.ebuild 3853 BLAKE2B 6a7aac741d903d1569a70564724c522f8259d2840ad6c2536399e4739b036e1747f8b4770d665a2ac0570cf57ade6c5120c4424065572e7540d2cd1c32f33c62 SHA512 fbd3aa6e7a07ae7ecb718eb32ccb15d5db1efb6b77405c1a34e2f487546dca2e487f58b7591cb637e74d03a1fc7d5ede0181f17bc8cb9b27374894df1d413cc5
-EBUILD maildrop-2.9.0.ebuild 3713 BLAKE2B 9c8a9cd45f85e373d17a1a1e5a00d158d19fbecc843ac2bbc82eee0659cc7b03a526fab5d172858750738ee802b819e126f8e73888428ce291c2fb841a265c61 SHA512 9ff32d6f39bbeeaea6a0cee7a660c1db66b257fc4012501f7f77e72600a8aa48b4e38130970373452331f2df51f6f6daf40d990b6ff7212bd6da86fdff7bf01c
 EBUILD maildrop-3.0.0.ebuild 3649 BLAKE2B c74138052d56f41d023267c547a972691f937ac57dfdf6bde30bc3c74b47b5af9052f564e36925327441ddf69fd4fd5f4dc2376775d58fa48447b077bf0c1d3a SHA512 c74224a4f02dc7d88f5339fc0ecd4e3cd1d066e0ca4cbecc8acd5285f8df72192cfd90ebae068141d349333d07aa6743d48428f0c6dd7e33bb5f982ed5488f08
 MISC metadata.xml 553 BLAKE2B 259c46533fe17a5fa0cb8a8f66e0934f048debde8aa2d3e8c231461ad9cd0840854ad5cd25170c8945c8c92fb6281b751db44180be6087c198a4057306487af6 SHA512 42f25a0370d0c41dedfd0ec15e244527ed97ac6d577b170794e9c10930a0a0603e9edba090b004c8fa648ff6bf164a05d7aa2b4cbe2576bd8d9dda6dc54e6e42
diff --git a/mail-filter/maildrop/files/maildrop-testsuite-r3.patch b/mail-filter/maildrop/files/maildrop-testsuite-r3.patch
deleted file mode 100644
index fd6d729370a0..000000000000
--- a/mail-filter/maildrop/files/maildrop-testsuite-r3.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -uNr maildrop-2.8.3.ORIG/libs/maildrop/configure.ac maildrop-2.8.3/libs/maildrop/configure.ac
---- maildrop-2.8.3.ORIG/libs/maildrop/configure.ac	2017-07-25 22:49:44.044032091 +0100
-+++ maildrop-2.8.3/libs/maildrop/configure.ac	2017-07-25 22:50:48.205113368 +0100
-@@ -195,6 +195,15 @@
- AC_DEFINE_UNQUOTED(MAXLONGSIZE, $MAXLONGSIZE,
- 				[ Maximum character size of a long ])
- 
-+dnl check for en_US locale
-+check_en_US() {
-+locale -a | grep en_US.utf8 > /dev/null
-+return $?
-+}
-+AC_MSG_CHECKING([for en_US.utf8])
-+AM_CONDITIONAL([HAS_EN_US], [check_en_US])
-+AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])])
-+
- dnl Checks for library functions.
- 
- AC_FUNC_CLOSEDIR_VOID
-diff -uNr maildrop-2.8.3.ORIG/libs/maildrop/Makefile.am maildrop-2.8.3/libs/maildrop/Makefile.am
---- maildrop-2.8.3.ORIG/libs/maildrop/Makefile.am	2017-07-25 22:49:44.054032259 +0100
-+++ maildrop-2.8.3/libs/maildrop/Makefile.am	2017-07-25 22:51:13.335536823 +0100
-@@ -75,9 +75,11 @@
- 	maildrop.lsm testsuite.txt.idn testsuite.txt.noidn testsuite2
- 
- check-am:
-+if HAS_EN_US
- 	@chmod +x testsuite
- 	./testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
- 	@SHELL@ $(srcdir)/testsuite2
-+endif
- 
- noinst_DATA=maildrop.html maildrop.1 maildropfilter.html maildropfilter.7 \
- 	maildropgdbm.html maildropgdbm.7
-diff -uNr maildrop-2.8.3.ORIG/libs/rfc2045/configure.ac maildrop-2.8.3/libs/rfc2045/configure.ac
---- maildrop-2.8.3.ORIG/libs/rfc2045/configure.ac	2017-07-25 22:49:44.054032259 +0100
-+++ maildrop-2.8.3/libs/rfc2045/configure.ac	2017-07-25 22:50:48.205113368 +0100
-@@ -60,6 +60,15 @@
- AC_CHECK_FUNC(strncasecmp,,CFLAGS="$CFLAGS -Dstrncasecmp=strnicmp")
- AC_CHECK_FUNC(strcasecmp,,CFLAGS="$CFLAGS -Dstrcasecmp=stricmp")
- 
-+dnl check for en_US locale
-+check_en_US() {
-+locale -a | grep en_US.utf8 > /dev/null
-+return $?
-+}
-+AC_MSG_CHECKING([for en_US.utf8])
-+AM_CONDITIONAL([HAS_EN_US], [check_en_US])
-+AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])])
-+
- AC_ARG_WITH(package, [], package="$withval",
- 	[
- 		package="$PACKAGE"
-diff -uNr maildrop-2.8.3.ORIG/libs/rfc2045/Makefile.am maildrop-2.8.3/libs/rfc2045/Makefile.am
---- maildrop-2.8.3.ORIG/libs/rfc2045/Makefile.am	2017-07-25 22:49:44.054032259 +0100
-+++ maildrop-2.8.3/libs/rfc2045/Makefile.am	2017-07-25 22:51:26.555759572 +0100
-@@ -76,6 +76,8 @@
- endif
- 
- check-am:
-+if HAS_EN_US
- 	@SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
- 	@SHELL@ $(srcdir)/testsuitemm | cmp -s - $(srcdir)/testsuitemm.txt
- 	@SHELL@ $(srcdir)/testrfc3676parsersuite | diff -U 3 $(srcdir)/testrfc3676parsersuite.txt -
-+endif
diff --git a/mail-filter/maildrop/maildrop-2.8.3.ebuild b/mail-filter/maildrop/maildrop-2.8.3.ebuild
deleted file mode 100644
index 25104ffb1e67..000000000000
--- a/mail-filter/maildrop/maildrop-2.8.3.ebuild
+++ /dev/null
@@ -1,143 +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 autotools
-
-DESCRIPTION="Mail delivery agent/filter"
-[[ -z ${PV/?.?/}   ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${SRC_URI}   ]] && SRC_URI="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/maildrop/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86"
-IUSE="berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota"
-
-CDEPEND="!mail-mta/courier
-	net-mail/mailbase
-	dev-libs/libpcre
-	net-dns/libidn
-	net-libs/courier-unicode
-	gdbm?     ( >=sys-libs/gdbm-1.8.0 )
-	mysql?    ( net-libs/courier-authlib )
-	postgres? ( net-libs/courier-authlib )
-	ldap?     ( net-libs/courier-authlib )
-	authlib?  ( net-libs/courier-authlib )
-	fam?      ( virtual/fam )
-	!gdbm? (
-		berkdb? ( >=sys-libs/db-3:* )
-	)
-	tools? (
-		!mail-mta/netqmail
-		!net-mail/courier-imap
-		!mail-mta/mini-qmail
-	)"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dovecot? ( net-mail/dovecot )"
-REQUIRED_USE="mysql? ( authlib )
-			postgres? ( authlib )
-			ldap? ( authlib )"
-
-S=${WORKDIR}/${P%%_pre}
-
-src_prepare() {
-	# Prefer gdbm over berkdb
-	if use gdbm ; then
-		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
-	fi
-
-	if ! use fam ; then
-		epatch "${FILESDIR}"/${PN}-disable-fam.patch
-	fi
-
-	# no need to error out if no default - it will be given to econf anyway
-	sed -i -e \
-		's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \
-		"${S}"/libs/maildrop/configure.ac || die "sed failed"
-
-	epatch "${FILESDIR}"/${PN}-testsuite-r3.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local mytrustedusers="apache dspam root mail fetchmail"
-	mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias"
-
-	# These flags make maildrop cry
-	replace-flags -Os -O2
-	filter-flags -fomit-frame-pointer
-
-	if use gdbm ; then
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb ; then
-		myconf="${myconf} --with-db=db"
-	else
-		myconf="${myconf} --without-db"
-	fi
-
-	if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
-		myconf="${myconf} --disable-authlib"
-	fi
-
-	# Default mailbox is $HOME/.maildir for Gentoo
-	maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf \
-		$(use_enable fam) \
-		--disable-dependency-tracker \
-		--with-devel \
-		--disable-tempdir \
-		--enable-syslog=1 \
-		--enable-use-flock=1 \
-		--enable-use-dotlock=1 \
-		--enable-restrict-trusted=1 \
-		--enable-trusted-users="${mytrustedusers}" \
-		--enable-maildrop-uid=root \
-		--enable-maildrop-gid=mail \
-		--enable-sendmail=/usr/sbin/sendmail \
-		--cache-file="${S}"/configuring.cache \
-		$(use_enable static-libs static) \
-		$(use_enable dovecot dovecotauth) \
-		$(use_with trashquota) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use authlib ; then
-		fperms 4755 /usr/bin/maildrop
-	fi
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README \
-		README.postfix README.dovecotauth UPGRADE \
-		maildroptips.txt
-	docinto maildir
-	dodoc libs/maildir/AUTHORS libs/maildir/INSTALL \
-		libs/maildir/README*.txt
-
-	# bugs #61116 #374009
-	if ! use tools ; then
-		for tool in "maildirmake" "deliverquota"; do
-			rm "${D}/usr/bin/${tool}"
-			rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9]
-			rm "${D}/usr/share/maildrop/html/${tool}.html"
-		done
-		rm "${D}/usr/share/man/man5/maildir.5"
-	fi
-
-	dodir "/usr/share/doc/${PF}"
-	mv "${D}/usr/share/doc/maildrop/html" "${D}/usr/share/doc/${PF}/" || die
-	rm -rf "${D}"/usr/share/doc/maildrop
-
-	dohtml *.html libs/maildir/*.html
-
-	insinto /etc
-	doins "${FILESDIR}"/maildroprc
-
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}
diff --git a/mail-filter/maildrop/maildrop-2.8.5.ebuild b/mail-filter/maildrop/maildrop-2.8.5.ebuild
deleted file mode 100644
index 965ee203aedb..000000000000
--- a/mail-filter/maildrop/maildrop-2.8.5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic autotools
-
-DESCRIPTION="Mail delivery agent/filter"
-[[ -z ${PV/?.?/}   ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${SRC_URI}   ]] && SRC_URI="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/maildrop/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota"
-
-CDEPEND="!mail-mta/courier
-	net-mail/mailbase
-	dev-libs/libpcre
-	net-dns/libidn
-	net-libs/courier-unicode
-	gdbm?     ( >=sys-libs/gdbm-1.8.0 )
-	mysql?    ( net-libs/courier-authlib )
-	postgres? ( net-libs/courier-authlib )
-	ldap?     ( net-libs/courier-authlib )
-	authlib?  ( net-libs/courier-authlib )
-	fam?      ( virtual/fam )
-	!gdbm? (
-		berkdb? ( >=sys-libs/db-3:* )
-	)
-	tools? (
-		!mail-mta/netqmail
-		!net-mail/courier-imap
-		!mail-mta/mini-qmail
-	)"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dovecot? ( net-mail/dovecot )"
-REQUIRED_USE="mysql? ( authlib )
-			postgres? ( authlib )
-			ldap? ( authlib )"
-
-S=${WORKDIR}/${P%%_pre}
-
-src_prepare() {
-	# Prefer gdbm over berkdb
-	if use gdbm ; then
-		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
-	fi
-
-	if ! use fam ; then
-		epatch "${FILESDIR}"/${PN}-disable-fam.patch
-	fi
-
-	# no need to error out if no default - it will be given to econf anyway
-	sed -i -e \
-		's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \
-		"${S}"/libs/maildrop/configure.ac || die "sed failed"
-
-	epatch "${FILESDIR}"/${PN}-testsuite-r3.patch
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local mytrustedusers="apache dspam root mail fetchmail"
-	mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias"
-
-	# These flags make maildrop cry
-	replace-flags -Os -O2
-	filter-flags -fomit-frame-pointer
-
-	if use gdbm ; then
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb ; then
-		myconf="${myconf} --with-db=db"
-	else
-		myconf="${myconf} --without-db"
-	fi
-
-	if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
-		myconf="${myconf} --disable-authlib"
-	fi
-
-	# Default mailbox is $HOME/.maildir for Gentoo
-	maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf \
-		$(use_enable fam) \
-		--disable-dependency-tracker \
-		--with-devel \
-		--disable-tempdir \
-		--enable-syslog=1 \
-		--enable-use-flock=1 \
-		--enable-use-dotlock=1 \
-		--enable-restrict-trusted=1 \
-		--enable-trusted-users="${mytrustedusers}" \
-		--enable-maildrop-uid=root \
-		--enable-maildrop-gid=mail \
-		--enable-sendmail=/usr/sbin/sendmail \
-		--cache-file="${S}"/configuring.cache \
-		$(use_enable static-libs static) \
-		$(use_enable dovecot dovecotauth) \
-		$(use_with trashquota) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use authlib ; then
-		fperms 4755 /usr/bin/maildrop
-	fi
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README \
-		README.postfix README.dovecotauth UPGRADE \
-		maildroptips.txt
-	docinto maildir
-	dodoc libs/maildir/AUTHORS libs/maildir/INSTALL \
-		libs/maildir/README*.txt libs/maildir/*.html
-
-	# bugs #61116 #374009
-	if ! use tools ; then
-		for tool in "maildirmake" "deliverquota"; do
-			rm "${D}/usr/bin/${tool}"
-			rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9]
-			rm "${D}/usr/share/maildrop/html/${tool}.html"
-		done
-		rm "${D}/usr/share/man/man5/maildir.5"
-	fi
-
-	#dodir "/usr/share/doc/${PF}"
-	#mv "${D}/usr/share/doc/maildrop/html" "${D}/usr/share/doc/${PF}/" || die
-	#rm -rf "${D}"/usr/share/doc/maildrop
-
-	insinto /etc
-	doins "${FILESDIR}"/maildroprc
-
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}
diff --git a/mail-filter/maildrop/maildrop-2.9.0.ebuild b/mail-filter/maildrop/maildrop-2.9.0.ebuild
deleted file mode 100644
index c3afde7b5982..000000000000
--- a/mail-filter/maildrop/maildrop-2.9.0.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic autotools
-
-DESCRIPTION="Mail delivery agent/filter"
-[[ -z ${PV/?.?/}   ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[[ -z ${SRC_URI}   ]] && SRC_URI="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/maildrop/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota"
-
-CDEPEND="!mail-mta/courier
-	net-mail/mailbase
-	dev-libs/libpcre
-	net-dns/libidn
-	>=net-libs/courier-unicode-2.0
-	gdbm?     ( >=sys-libs/gdbm-1.8.0 )
-	mysql?    ( net-libs/courier-authlib )
-	postgres? ( net-libs/courier-authlib )
-	ldap?     ( net-libs/courier-authlib )
-	authlib?  ( net-libs/courier-authlib )
-	fam?      ( virtual/fam )
-	!gdbm? (
-		berkdb? ( >=sys-libs/db-3:* )
-	)
-	tools? (
-		!mail-mta/netqmail
-		!net-mail/courier-imap
-		!mail-mta/mini-qmail
-	)"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-	dovecot? ( net-mail/dovecot )"
-REQUIRED_USE="mysql? ( authlib )
-			postgres? ( authlib )
-			ldap? ( authlib )"
-
-S=${WORKDIR}/${P%%_pre}
-
-src_prepare() {
-	# Prefer gdbm over berkdb
-	if use gdbm ; then
-		use berkdb && elog "Both gdbm and berkdb selected. Using gdbm."
-	fi
-
-	if ! use fam ; then
-		epatch "${FILESDIR}"/${PN}-disable-fam.patch
-	fi
-
-	# no need to error out if no default - it will be given to econf anyway
-	sed -i -e \
-		's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \
-		"${S}"/libs/maildrop/configure.ac || die "sed failed"
-
-	epatch "${FILESDIR}"/${PN}-testsuite-r3.patch
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local mytrustedusers="apache dspam root mail fetchmail"
-	mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias"
-
-	# These flags make maildrop cry
-	replace-flags -Os -O2
-	filter-flags -fomit-frame-pointer
-
-	if use gdbm ; then
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb ; then
-		myconf="${myconf} --with-db=db"
-	else
-		myconf="${myconf} --without-db"
-	fi
-
-	if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then
-		myconf="${myconf} --disable-authlib"
-	fi
-
-	# Default mailbox is $HOME/.maildir for Gentoo
-	maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf \
-		$(use_enable fam) \
-		--disable-dependency-tracker \
-		--with-devel \
-		--disable-tempdir \
-		--enable-syslog=1 \
-		--enable-use-flock=1 \
-		--enable-use-dotlock=1 \
-		--enable-restrict-trusted=1 \
-		--enable-trusted-users="${mytrustedusers}" \
-		--enable-maildrop-uid=root \
-		--enable-maildrop-gid=mail \
-		--enable-sendmail=/usr/sbin/sendmail \
-		--cache-file="${S}"/configuring.cache \
-		$(use_enable static-libs static) \
-		$(use_enable dovecot dovecotauth) \
-		$(use_with trashquota) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use authlib ; then
-		fperms 4755 /usr/bin/maildrop
-	fi
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README \
-		README.postfix README.dovecotauth UPGRADE \
-		maildroptips.txt
-	docinto maildir
-	dodoc libs/maildir/AUTHORS libs/maildir/INSTALL \
-		libs/maildir/README*.txt libs/maildir/*.html
-
-	# bugs #61116 #374009
-	if ! use tools ; then
-		for tool in "maildirmake" "deliverquota"; do
-			rm "${D}/usr/bin/${tool}"
-			rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9]
-			rm "${D}/usr/share/maildrop/html/${tool}.html"
-		done
-		rm "${D}/usr/share/man/man5/maildir.5"
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/maildroprc
-
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}
diff --git a/mail-filter/scmail/Manifest b/mail-filter/scmail/Manifest
index 506c0465f8ad..d37195cce35e 100644
--- a/mail-filter/scmail/Manifest
+++ b/mail-filter/scmail/Manifest
@@ -2,5 +2,5 @@ AUX scmail-doc-encoding.patch 1271 BLAKE2B c554ebfed8350a10939364b9d4b50d446d839
 AUX scmail-gauche-0.9.patch 1295 BLAKE2B 2bf2ee2aa2c99ef72d6fbd25c65448a99d1c3a16be20373db867c3ec07604b94ea2fb7a6fac76f1bca4aa8be378140dc6eb6718ead1f61844cba9127a0bd2ea8 SHA512 4aee907271c20254a41035160418429fcd7e35890a0d7a6251d4adefcaafe8581dc5e3df4bc70b27b541eb6a888acc7811231a183d62f2c267b1d2ccf652dc69
 AUX scmail-undefined-reference.patch 1351 BLAKE2B b0758cf2a1de5be0bd32d16bbc44d28d7e3b4e3a65f9a9151e76245c4f5473e8c82a682324544018e7aecf53f2534cc5e2fa2d27451947ff285684221b091e55 SHA512 2b8acf57f55a3367157bf20da796f2529258e48877b049f2928ff06c3365c24c41c6a8824f32b0fbf14fb193f94a2f147afa97c9c03a13227b62b13bd0b550d0
 DIST scmail-1.3.tar.gz 52744 BLAKE2B 2e2848472bb6f9ce913fea381c905ec28a1cac5201fe3a8c89e25c96a0fd646e7f96ddcf6cdfd1e0d88f34b5d51ea754faa5c3574635715ed1dc92cfd9d2980c SHA512 ae94de7f34f9279e892533137d76f07642ade63f9d179bbc96202003f49cf8ae6dd6cc5b9d53fa1d2f8be2bebcbe071635910d48593c9e57fb6609cc7ec6e95d
-EBUILD scmail-1.3.ebuild 865 BLAKE2B 00cc7be560ab91dcb7ef79c667cf87b3eeb1b06c9bc052bab1620106ff2580e8b8b7873672b0bc861d43c877f605f50ac8821de9a3fb08b0adf96877bacd89f1 SHA512 3c489c5e8c86c032925f313086e1ec876738ac312f053c8cb1d92dae9bbdf4e1d6e9fdc4ddfcd27031a01068591c42d7fb78234848910dcd27af0277003e38bf
+EBUILD scmail-1.3.ebuild 864 BLAKE2B c00af9ca1b45bed5d8ac8ab5146fd5eb233ac4c7c576a894ad2086852ca2fad8bea6980350c2604687c933a37c12d855db6485f2a421065cfdd6f1ed587d2b23 SHA512 1b47d5b876c09a24e2ca7ed2b8fa68725b206e60f2cc7e82f0582c06bd6ff234fab27375aba5668eb2b704fb81f47c8d1e91251a70767fd56bf0170d9cf22b18
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/mail-filter/scmail/scmail-1.3.ebuild b/mail-filter/scmail/scmail-1.3.ebuild
index de13bf90310e..34ce96c9044c 100644
--- a/mail-filter/scmail/scmail-1.3.ebuild
+++ b/mail-filter/scmail/scmail-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 ~ppc x86"
 IUSE=""
 
-RDEPEND="dev-scheme/gauche"
+RDEPEND="dev-scheme/gauche:="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/mail-filter/spamdyke/Manifest b/mail-filter/spamdyke/Manifest
index c43301e77bc0..859d73694afa 100644
--- a/mail-filter/spamdyke/Manifest
+++ b/mail-filter/spamdyke/Manifest
@@ -1,7 +1,6 @@
 AUX spamdyke-4.3.0-gcc46.patch 237 BLAKE2B c60cfe8f6680b246268fd769c30eb81acf2d87a04ef08c73b70b7e9cdb1b052d1e9b5eac6c6160855a2d2b03852ed0726ab9251ec7306813141fedcef8560ac2 SHA512 3714399437215680057a2266added2c158f015da518f4e00021f7a1492c287fdf8db4875b0c5f7e242782cc40f676dca9f610931047a7d23f8bdd5876e629846
 DIST spamdyke-4.3.0.tgz 525399 BLAKE2B 46e3fd1508ea91d925675186ec2555e63a9d22d2fe07d9417fb5a151af76bae22676410dd6c648696621fe80d34c6e87f845b581a0db09b7b19f45e46d656f09 SHA512 6ba4b440e6d20e677c39439c78037ae3e2ff291bde7f48500a4e2eac8a3f17eeb7230b8ded7feee60c66f01b6aec2d259eb2d9a5794535860345957b1102d118
 DIST spamdyke-5.0.1.tgz 383720 BLAKE2B 5128ef128af1b136e9a78df6e38f727d06e51bae82cb604513f80458265eee03d5966655ae70544d6ba24f0719c35dcc9a153e245a8c2c7ef1f7dab3ee90e561 SHA512 a022c8a8d4a8d74f5249f8e2d901d3de423ee853bbaffaf7e86cece1d19880d9039135892ef6ccb8a2a0fb11532c487402dc97a8dd6d89c9de431752c55f6eb9
-EBUILD spamdyke-4.3.0-r1.ebuild 2215 BLAKE2B df58eba17d1fca388545717ae5c0a362ae4f632f5953255a787c2f9ccb897d2092524620cb1bb6c65449286d8cd7a164e9a49c3a12ce97d8d31436940f3e4aa3 SHA512 f02d5e1038e98f170e43382883c6c293613e4111dfda5a81f22a20102038de6f672c4244af571d02a558496e77f2f34e8957893fe095a50954a0ea119d638c53
 EBUILD spamdyke-4.3.0.ebuild 2148 BLAKE2B 2bd0569c7dae493461da8b4b136b5524f88686ef14fd22b02f908cf56ac3de51288706d3f3cf634a6430feb8b06de41ccdb497e7cf37aabb1db9e0e79862cb63 SHA512 107d9bc05b9cb2edbc559463e2458538700e4f4428afe9c76c654677fc125e1d98b6c0f7421793dc627fa25f7a215ccbbc73554144682cb69929575080da1168
 EBUILD spamdyke-5.0.1.ebuild 1994 BLAKE2B 01fecf83c74b474f52c9fff6903c9f2f1124182b7c9c3629cd1fac9f8048115299cdf15fed0104135a352f00599d465238c32afc1de5ddb897793b2040ae2cb4 SHA512 21210746356b7cb995ad4e650b75b9ae9bbda1ee1f4a3bc8c09b94d983724002b530e730ccdd56a055478a4888383ebac7c0bb82c17caa2cbfb094b875b0aff0
 MISC metadata.xml 699 BLAKE2B 1de53fdcbf9aaab78f797ea694ac050237d2b76de346684781caf994756abd8f6411c090737eb4da8aee3da6570545fa91811a77f3beae0592bb4fc61232a22e SHA512 2a154b87869e0b058be083c0930843ca3d8d524847dfede27f5499517867261756d056c114b864eaa545d3a5fac4e42180f2e4eb2242e825bbddf8effd11ff81
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild
deleted file mode 100644
index 02c6a579d924..000000000000
--- a/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools
-
-DESCRIPTION="A drop-in connection-time spam filter for qmail"
-HOMEPAGE="http://www.spamdyke.org/"
-SRC_URI="http://www.spamdyke.org/releases/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +ssl"
-
-DEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)"
-RDEPEND="${DEPEND}
-	virtual/qmail"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-	echo "# Configuration option for ${PN}" > ${PN}.conf
-	if use ssl; then
-		echo "tls-certificate-file=/var/qmail/control/clientcert.pem" \
-			>> ${PN}.conf
-	fi
-	echo "graylist-level=always-create-dir" >> ${PN}.conf
-	echo "graylist-dir=/var/tmp/${PN}/graylist" >> ${PN}.conf
-	echo "reject-empty-rdns" >> ${PN}.conf
-	echo "reject-unresolvable-rdns" >> ${PN}.conf
-	echo "dns-blacklist-entry=zen.spamhaus.org" >> ${PN}.conf
-	echo "local-domains-file=/var/qmail/control/rcpthosts" >> ${PN}.conf
-	sed -i \
-		-e "/STRIP_CMD/d" \
-		Makefile.in || die "sed on Makefile.in failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ssl tls) || die "econf failed"
-	cd ../utils
-	econf || die "econf failed in utils"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" || die "emake failed"
-	cd ../utils
-	emake CFLAGS="${CFLAGS}" || die "emake in utils died"
-}
-
-src_install() {
-	dobin ${PN} || die "Installing ${PN} binary failed"
-	insinto /etc/${PN}
-	doins ${PN}.conf || die "Installing ${PN} configuration file failed"
-	dodir /var/tmp/${PN}/graylist
-	fowners -R qmaild /var/tmp/${PN}/graylist
-	cd ../utils
-	dobin domain2path || die "Installing domain2path binary failed"
-	cd ../documentation
-	dodoc {Changelog,INSTALL,UPGRADING}.txt
-	dohtml FAQ.html \
-		README.html \
-		README_ip_file_format.html \
-		README_rdns_directory_format.html \
-		README_rdns_file_format.html
-}
-
-pkg_postinst() {
-	elog "In /var/qmail/control/conf-smtpd insert the line:"
-	elog "QMAIL_SMTP_PRE=\"${QMAIL_SMTP_PRE} spamdyke -f /etc/${PN}/${PN}.conf\""
-	elog "Run spamdyke with the '-h' flag to see the available options and"
-	elog "update /etc/spamdyke/spamdyke.conf accordingly"
-}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 8c5f30d0e76f..c876fd2dd69b 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 5e5d751c6d82..33ce4c0ceff6 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -27,5 +27,5 @@ DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b21
 EBUILD exim-4.92-r3.ebuild 13225 BLAKE2B 3ffd746469baaaaa28f0f82246adf6aae895b4ccd50ea01831a2303dd17874d2aa700306345827e37facf44772d7f6bc4fc19d8cd521a46cbbbb97c993adf3ea SHA512 2f638601cad3cfa2b7bfab588ffe2ba03cf35cd3b1d0511ba60cd67327f8d5ad98939c81784058799253602e72fb17ea11237e1638f2da7b2f9efaddac361c90
 EBUILD exim-4.92-r4.ebuild 13525 BLAKE2B 402675112b870144268e9be64b82fe691dfe9547fbc47442748949e6a9ab9e74a4133224913de5888098c346755ff0fe6d783cfb971ce991af9d550fdcf74d0b SHA512 6653b2746ec357e2def6121116a4d5575ba8652bd92524f54073c3930e45b1d284e71781985e0acd06a69b7002f679b1c7bf1f45fb96b37caaaf09583626e560
 EBUILD exim-4.92.1-r1.ebuild 13533 BLAKE2B d3c0b9419bf863bc12cd3bcee53f8680bceaedebb4696b75f8467ebc3814046b3c84256ef38d6299ab2247cd447c5af51f52b1b416ea87540582a13ff4ea925e SHA512 018c5a14cf2425fe98ad136c81d2f4f83dccc517efc16aa6ff53691b3b73833491a8ead9eb03d45688e78317e043f439fba92e0f19f500b428e56aa8df281356
-EBUILD exim-4.92.2.ebuild 13610 BLAKE2B f669bfcad895de45be87e8e2ad7a05905c9cdf74fb9a3b532181eb133ee2f34c216493823652d1b1a10d815e51b149ec479e6f6068ae54915c982e92f5f1ef55 SHA512 98b2c65bea37b5e927204de580f960c067a65c7e70adc107e0c07a486a556634fb826e9c3e4ac77ae808a439ff488a3a976d5ab0afc30549f95941b3be12dcb0
+EBUILD exim-4.92.2.ebuild 13605 BLAKE2B e726b015d7b61c6405c6ef98c76020e35188e6106b97e69fbd285458b7c085ed55f96442bd9dbd4b85a99d22bbe1e52a996e1ffbf688a46507178968af32f6ae SHA512 a63d98495ae50938f5fbf84146c07cd0d7c3d05851af7f50dcf652b6b7dcbdb6e517ba01c99ecd020648c02cb345fa52340c49f77d7105ed2739ca5abe98cf89
 MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f
diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index 8ccda5caf156..3d80bfb9a265 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 0e7c9821d973..c4303672c81e 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -15,6 +15,5 @@ DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3
 DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
 EBUILD netqmail-1.06-r2.ebuild 3955 BLAKE2B 80a549c28b008ca7a9bbd9c514b1239487be72f2c2381231cc92fa3ff345b5c700ceab4a1f95d8585e3be61a17f6b4b0fed93621f910e2493c9f1291289844e2 SHA512 4da917138b1e48d4a4926f12a9d25f2b3b89f2c08c02c02c2728195c3ee44ebcdecbde43675ec369677083981f23c51acc1b74be9ef5be5d77ee7e5bea1ce814
 EBUILD netqmail-1.06-r4.ebuild 4168 BLAKE2B 4e8f5cbdbf4d3dad977814856d8b757cf73b1851bf79cafe8ec46975872241770281827e5e1a061d08be41edd79c9f55770681bb5dd3ce477efeda4f98c99978 SHA512 2a79163fe009405f4bb77f725fc520ff6503005377c9a949611002a99e124e1baf266f8d48d9a17cced99d3ef3f09d9a588f319fcf6eccd2e40c611c89b91fc8
-EBUILD netqmail-1.06-r5.ebuild 4317 BLAKE2B ff4d410a11f3360e34976fd1f32ee6127d58c6c46c89f5661c0f1cbec06e0fb6c7e92b5d55b9c8580bb2600e4c43a35e77866c94839cb339daa24e49408d4adf SHA512 ea7ac067e5931596c2ccc60a558ffb13e75d73281a7472f0a9bf3883e782e62efdd5cf822b9abd1329284a9c3b6019a8841f9c3e68e915e218a47d9ba2cb5ba4
-EBUILD netqmail-1.06-r6.ebuild 4340 BLAKE2B 377c258e39fca2e6efa2295724367ddf8605db0ed6b7d5f3be98153a0039fa8e0f74221cf0a632f7c4c5325a72a2c5cf70e0dd1f31f458b9909fdfb3ccb23bc7 SHA512 cb2db3c701b76d80c71ac163170909e008a806cd3b8b1ab696881519800336eb9a2f98bc020fc133ea33789efe3e2a797e4ed13e63709f3ba2ba88bc77b8ef10
+EBUILD netqmail-1.06-r6.ebuild 4346 BLAKE2B 6947e256e37c6d7645269d42546312b44c2793a3db994a82053da41a094126e41b22f30ec4f7f9d628faaa3ba84c5055d2653843de0b516acc335505bedc744b SHA512 2c318c4241f19cef9ab3778e4e783982957582764189dad1f7b5914d0ba2b5090fdcc6a6e58d7b0c45b0086aa0bd75dcd45e5b1e59e9470003d2ccef4f0204c9
 MISC metadata.xml 478 BLAKE2B d947af2777a19a9c422bf722a2755c00302885909dfcf3877624c3c3baf2f5bc13befdbd8865a9de246e3ea3ab446a0bb42d5f26febb5bc585393e66b76d214e SHA512 13a8e6e9fb1bb277d98625b6e87d03aea279802263806476ebb8057248e787eb6abbca5fc9b5f4855750f47b8281adefadc87fec7ef61cb2a1e74b0d8a0f346e
diff --git a/mail-mta/netqmail/netqmail-1.06-r5.ebuild b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
deleted file mode 100644
index f6f4cfb3deec..000000000000
--- a/mail-mta/netqmail/netqmail-1.06-r5.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENQMAIL_PV=20080406
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20070417
-QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
-QMAIL_TLS_CVE=vu555316.patch
-
-QMAIL_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
-
-QMAIL_LARGE_DNS='qmail-103.patch'
-
-QMAIL_SMTPUTF8='qmail-smtputf8.patch'
-
-inherit eutils qmail
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
-HOMEPAGE="
-	http://netqmail.org
-	https://cr.yp.to/qmail.html
-	http://qmail.org
-"
-SRC_URI="mirror://qmail/${P}.tar.gz
-	https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-	https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
-	http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
-	http://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
-	!vanilla? (
-		highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
-		qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-		ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
-	)
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
-REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
-RESTRICT="test"
-
-DEPEND="
-	!mail-mta/qmail
-	net-mail/queue-repair
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	sys-apps/gentoo-functions
-	sys-apps/groff
-	net-dns/libidn2
-"
-RDEPEND="
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	>=sys-apps/ucspi-tcp-0.88-r17
-	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
-	virtual/daemontools
-	>=net-mail/dot-forward-0.71-r3
-	virtual/checkpassword
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	${DEPEND}
-"
-
-pkg_setup() {
-	if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-		eerror
-		eerror "The QMAIL_PATCH_DIR variable for custom patches"
-		eerror "has been removed from ${PN}. If you need custom patches"
-		eerror "you should create a copy of this ebuild in an overlay."
-		eerror
-		die "QMAIL_PATCH_DIR is not supported anymore"
-	fi
-
-	qmail_create_users
-}
-
-src_unpack() {
-	genqmail_src_unpack
-	use qmail-spp && qmail_spp_src_unpack
-
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-exit.patch
-	epatch "${FILESDIR}"/${PV}-readwrite.patch
-	epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
-	epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
-
-	ht_fix_file Makefile*
-
-	if ! use vanilla; then
-		if use ssl; then
-			# This patch contains relative paths and needs to be cleaned up.
-			sed 's~^--- ../../~--- ~g' \
-				< "${DISTDIR}"/${QMAIL_TLS_F} \
-				> "${T}"/${QMAIL_TLS_F} || die
-			epatch "${T}"/${QMAIL_TLS_F}
-			epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
-		fi
-		use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
-
-		if use qmail-spp; then
-			if use ssl; then
-				epatch "${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
-			else
-				epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
-			fi
-			cd "${WORKDIR}" || die
-			epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
-			cd - || die
-		fi
-	fi
-
-	cd "${WORKDIR}" || die
-	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-	use ssl && epatch "${FILESDIR}"/qmail-smtputf8.patch
-	cd - || die
-
-	qmail_src_postunpack
-
-	# Fix bug #33818 but for netqmail (Bug 137015)
-	if ! use authcram; then
-		einfo "Disabled CRAM_MD5 support"
-		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
-	else
-		einfo "Enabled CRAM_MD5 support"
-	fi
-}
-
-src_compile() {
-	qmail_src_compile
-	use qmail-spp && qmail_spp_src_compile
-}
-
-src_install() {
-	qmail_src_install
-}
-
-pkg_postinst() {
-	qmail_queue_setup
-	qmail_rootmail_fixup
-	qmail_tcprules_build
-
-	qmail_config_notice
-	qmail_supervise_config_notice
-	elog
-	elog "If you are looking for documentation, check those links:"
-	elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail"
-	elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
-	elog "http://www.lifewithqmail.com/"
-	elog "  -- Life with qmail"
-	elog
-}
-
-pkg_preinst() {
-	qmail_tcprules_fixup
-}
-
-pkg_config() {
-	# avoid some weird locale problems
-	export LC_ALL=C
-
-	qmail_config_fast
-	qmail_tcprules_config
-	qmail_tcprules_build
-
-	use ssl && qmail_ssl_generate
-}
diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
index f78baf94aacb..f58a3c0abad7 100644
--- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
@@ -48,7 +48,7 @@ DEPEND="
 	!mail-mta/qmail
 	net-mail/queue-repair
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
+		!libressl? ( >=dev-libs/openssl-1.1:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
 	sys-apps/gentoo-functions
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 3de2b6235567..ffb0108d75e7 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -8,10 +8,10 @@ AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e
 DIST postfix-2.10.9.tar.gz 3820525 BLAKE2B ed1fc10f016cdc63fe2b86c68cca270c98348417babf6d8e05f76fa2550f5cbca95825f14cf54897e66323cdbe6132a1046402b853b6f000ade630277278c748 SHA512 c77df7ccc051bd72271dc5298da0ca4e45397b1ba96fc8be31e095f5b15cd30ebc0b29cf638e76efc65503cb241efd937f2d64aaa97243402c35e2927b7a7b91
 DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 9de66cab6eea610fc83e4629980b3e201b4e3f9185729cb84933aa940b64b7818d0439c5145ea0b635666db92c970e1974f4f439cd3b733c58e1fe5794c046fa SHA512 af59d960b40799f7667935bef8fafb93ae6dcb70abaa77a15cf498571f37fa0429f411f9f08b1b6bfa588d3f572260d14d6d5409f0cd1e82b1c59928b2124c94
 DIST postfix-3.4.6.tar.gz 4571771 BLAKE2B e08b2e6c01fe54fcc7439182783190f4adb81758a1bbcc1bfec71e02dca91a779308f624e081837f7e2deec8666f10bc51238e90cc952de6c8371fb18790604f SHA512 96430d60cf58b9876e52a742dbfe3ca1da4ec82eeea5cd35c6ee4e69714ddd5601561a6663aac51a34b2d64db4f7678d7c5d720ec9ead807b5d7e87e37434961
-DIST postfix-3.5-20190724.tar.gz 4606145 BLAKE2B e197542d71d953ca1b86e8bd4bc433a50b52d0ad2aa0874680d1c611be1cf9fdbf309b29884fb7bb7707a5d3380de5131fb5361fceb359048ca0106e5576f7b6 SHA512 eb08681c8660073681ab5c8b6c36acebddaf4f8780b69583117293ba275d03a1bd94f7c08cbcd0dd65f010a480867e419cd008eb9c29a9b95a2101b5ad3b34a0
+DIST postfix-3.5-20190908.tar.gz 4607181 BLAKE2B 804ea087123037e78b4f9a480b4156d3e576b2a998f70b5a4765add6af5927e5dc808ea825a18106dff1f564b893ba40547bb197e61acd3ab12116c194c615f4 SHA512 993db29a613433e9a48daa23db4684a99e7ef0f150826747f4754d7f7c65779e42dbf67b9a73aca11ce9717306cb5749f5c3d8ba3b4423ad6443d504e318b413
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62
 EBUILD postfix-2.10.9.ebuild 8728 BLAKE2B 6170156f1dded2c727b6e2979e45d9d8e6ad77ef456e4e7da8491b03cfabe7fda627f77dc6090ca7285891619f77c5d3546c45536b25356641f5fa37c23f27d4 SHA512 e59ed518a63a41937e1ff8e68fe811bb13abbefbb6c0ff8ab7655434e8f297a18e7da0adb61442f46e8cee87dcd680909be148f1d5f1f75525f2080819eaa75e
 EBUILD postfix-3.4.5-r1.ebuild 8985 BLAKE2B a59730210c3cb71aac658e50142122a035e987b335a62aa51cdd320513fe5da41b7dbb96cc052daa6a6ecf215b9a1a57a2770c38274374330aa47bdbfbaf7a34 SHA512 726ba0211a0fe817e927a1443c9fbb22503297cf4ff19a90b8b6472ad99adc3e6ca99cce5b45f73767ab2be162f43f2031c35f895c21c17a058dccc1a7af2609
 EBUILD postfix-3.4.6.ebuild 8994 BLAKE2B e6270859e157d29deb7e9d069b4fd305cc0b8bcba3b0023eaae7711360d5005cf7e6f4fbd63d1f0ec257de38cb211ff45836740662341e295fb17b281ba19d87 SHA512 500f3d61806129ce2b023992a93df0c89905e41a8a48a059c073b367e24dc2f63a5294eef9e25bedf857da48aa4880b7654b0872b13d5f744979f1c934911ab5
-EBUILD postfix-3.5_pre20190724.ebuild 8997 BLAKE2B f5433226698cf551a5658a0182bcb633ce5ae043e456f16e33fcc1d229e591781f55ee7d18a482d05771caba2b8886ef4249ad4450f78d2797d9e470db5d5be8 SHA512 7584bc2df9bf9da65e83cfeba6f1c0037a116f838207551864be44e74941d9cc037cb460b3cfff0892dc17e696ea561343efa482b048a6198d545f26d1cc0554
+EBUILD postfix-3.5_pre20190908.ebuild 8882 BLAKE2B c313a91bfbff1f40d0af0dd99cfa335f7329add56c335fd92de2431e706baefc5d18b0b12ed424ca009ac10b5cea5bf13502877e2ad06d25c82cb3ffdb26660e SHA512 347429b477460a2f0e88e36fb58b28e1a2238bb6a80a687f52c6f6facff464963f12199c325d7d01211b045161e52d34acdf967fd9052047602fd838e757bd93
 MISC metadata.xml 1023 BLAKE2B f0bcd846c18bf1459ac85c75b6e41c90857d800d49b3efdffdd0106616e453869f43004c9a38395c71e2766b9b7f83b25a702b3b39d6264d83f79481b6cbba43 SHA512 2511ca5d5cc134afa04d1f596084eb2f7102c45e883edf3290c00b2f733b8a1a74ecddcd6b182381ac86da2616097c86a8acedeca199747b33e403b8488067b4
diff --git a/mail-mta/postfix/postfix-3.5_pre20190724.ebuild b/mail-mta/postfix/postfix-3.5_pre20190724.ebuild
deleted file mode 100644
index 7d66f59daa06..000000000000
--- a/mail-mta/postfix/postfix-3.5_pre20190724.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic pam systemd toolchain-funcs user
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
-
-DEPEND=">=dev-libs/libpcre-3.4
-	dev-lang/perl
-	berkdb? ( >=sys-libs/db-3.2:* )
-	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
-	eai? ( dev-libs/icu:= )
-	ldap? ( net-nds/openldap )
-	ldap-bind? ( net-nds/openldap[sasl] )
-	lmdb? ( >=dev-db/lmdb-0.9.11 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nis? ( net-libs/libnsl )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:* )
-	sasl? (  >=dev-libs/cyrus-sasl-2 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( >=dev-libs/libressl-2.9.1:0= )
-	)"
-
-RDEPEND="${DEPEND}
-	memcached? ( net-misc/memcached )
-	net-mail/mailbase
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]
-	!net-mail/fastforward
-	selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-libressl-certkey.patch"
-	"${FILESDIR}/${PN}-libressl-server.patch"
-)
-
-pkg_setup() {
-	# Add postfix, postdrop user/group (bug #77565)
-	enewgroup postfix 207
-	enewgroup postdrop 208
-	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
-	default
-	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
-		src/util/sys_defs.h || die "sed failed"
-	# change default paths to better comply with portage standard paths
-	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-}
-
-src_configure() {
-	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
-	do
-		local AUXLIBS_${name}=""
-	done
-
-	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
-	AUXLIBS_PCRE="$(pcre-config --libs)"
-
-	use pam && mylibs="${mylibs} -lpam"
-
-	if use ldap; then
-		mycc="${mycc} -DHAS_LDAP"
-		AUXLIBS_LDAP="-lldap -llber"
-	fi
-
-	if use mysql; then
-		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		AUXLIBS_MYSQL="$(mysql_config --libs)"
-	fi
-
-	if use postgres; then
-		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
-	fi
-
-	if use sqlite; then
-		mycc="${mycc} -DHAS_SQLITE"
-		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
-	fi
-
-	if use ssl; then
-		mycc="${mycc} -DUSE_TLS"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-
-	if use lmdb; then
-		mycc="${mycc} -DHAS_LMDB"
-		AUXLIBS_LMDB="-llmdb -lpthread"
-	fi
-
-	if ! use eai; then
-		mycc="${mycc} -DNO_EAI"
-	fi
-
-	# broken. and "in other words, not supported" by upstream.
-	# Use inet_protocols setting in main.cf
-	#if ! use ipv6; then
-	#	mycc="${mycc} -DNO_IPV6"
-	#fi
-
-	if use sasl; then
-		if use dovecot-sasl; then
-			# Set dovecot as default.
-			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
-		fi
-		if use ldap-bind; then
-			mycc="${mycc} -DUSE_LDAP_SASL"
-		fi
-		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	elif use dovecot-sasl; then
-		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
-	fi
-
-	if ! use nis; then
-		mycc="${mycc} -DNO_NIS"
-	fi
-
-	if ! use berkdb; then
-		mycc="${mycc} -DNO_DB"
-		if use cdb; then
-			# change default hash format from Berkeley DB to cdb
-			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
-		fi
-	fi
-
-	if use cdb; then
-		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
-		# Tinycdb is preferred.
-		if has_version dev-db/tinycdb ; then
-			einfo "Building with dev-db/tinycdb"
-			AUXLIBS_CDB="-lcdb"
-		else
-			einfo "Building with dev-db/cdb"
-			CDB_PATH="/usr/$(get_libdir)"
-			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
-				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
-			done
-		fi
-	fi
-
-	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
-	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
-	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-	filter-lfs-flags
-
-	# Workaround for bug #76512
-	if use hardened; then
-		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
-	fi
-
-	# Remove annoying C++ comment style warnings - bug #378099
-	append-flags -Wno-comment
-
-	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
-	emake makefiles shared=yes dynamicmaps=no pie=yes \
-		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
-		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
-		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
-		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
-		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
-	LD_LIBRARY_PATH="${S}/lib" \
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		config_directory="/etc/postfix" \
-		manpage_directory="/usr/share/man" \
-		command_directory="/usr/sbin" \
-		mailq_path="/usr/bin/mailq" \
-		newaliases_path="/usr/bin/newaliases" \
-		sendmail_path="/usr/sbin/sendmail" \
-		|| die "postfix-install failed"
-
-	# Fix spool removal on upgrade
-	rm -Rf "${D}"/var
-	keepdir /var/spool/postfix
-
-	# Install rmail for UUCP, closes bug #19127
-	dobin auxiliary/rmail/rmail
-
-	# Provide another link for legacy FSH
-	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
-	# Install qshape, posttls-finger and collate
-	dobin auxiliary/qshape/qshape.pl
-	doman man/man1/qshape.1
-	dobin bin/posttls-finger
-	doman man/man1/posttls-finger.1
-	dobin auxiliary/collate/collate.pl
-	newdoc auxiliary/collate/README README.collate
-
-	# Performance tuning tools and their manuals
-	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
-	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/postfix
-	fowners -R postfix:postfix /var/lib/postfix
-	fperms 0750 /var/lib/postfix
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02755 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	keepdir /etc/postfix/postfix-files.d
-	if use mbox; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	LD_LIBRARY_PATH="${S}/lib" \
-	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-		-e ${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}"/smtp.pass saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
-	# do not start mysql/postgres unnecessarily - bug #359913
-	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
-	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
-	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-	# postfix set-permissions expects uncompressed man files
-	docompress -x /usr/share/man
-
-	pamd_mimic_system smtp auth account
-
-	if use sasl; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}"/smtp.sasl smtpd.conf
-	fi
-
-	# header files
-	insinto /usr/include/postfix
-	doins include/*.h
-
-	if has_version mail-mta/postfix; then
-		# let the sysadmin decide when to change the compatibility_level
-		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
-	fi
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	if has_version '<mail-mta/postfix-3.4'; then
-		elog
-		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
-		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
-		elog "Before backing out to an older Postfix version, edit the master.cf"
-		elog "file and remove the postlog entry."
-		elog
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -e /etc/mail/aliases.db ]] ; then
-		ewarn
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-		ewarn
-	fi
-
-	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions
-
-	# configure tls
-	if use ssl ; then
-		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
-			elog "To configure client side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-client
-		fi
-		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
-			elog "To configure server side TLS settings:"
-			elog "${EROOT}"/usr/sbin/postfix tls enable-server
-		fi
-	fi
-}
diff --git a/mail-mta/postfix/postfix-3.5_pre20190908.ebuild b/mail-mta/postfix/postfix-3.5_pre20190908.ebuild
new file mode 100644
index 000000000000..7e5bdb3906c9
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.5_pre20190908.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam systemd toolchain-funcs
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	nis? ( net-libs/libnsl )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( >=dev-libs/libressl-2.9.1:0= )
+	)"
+
+RDEPEND="${DEPEND}
+	acct-group/postfix
+	acct-group/postdrop
+	acct-user/postfix
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-certkey.patch"
+	"${FILESDIR}/${PN}-libressl-server.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02755 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	keepdir /etc/postfix/postfix-files.d
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	if has_version '<mail-mta/postfix-3.4'; then
+		elog
+		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
+		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
+		elog "Before backing out to an older Postfix version, edit the master.cf"
+		elog "file and remove the postlog entry."
+		elog
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# check and fix file permissions
+	"${EROOT}"/usr/sbin/postfix set-permissions
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"/usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest
index ecbd6694b980..12fabc384514 100644
--- a/mail-mta/protonmail-bridge-bin/Manifest
+++ b/mail-mta/protonmail-bridge-bin/Manifest
@@ -1,9 +1,5 @@
-DIST protonmail-bridge-1.1.3-1.x86_64.rpm 53554820 BLAKE2B 2fb0eb7b1a1d95ed3cf5785e527692497429f73eeb37dd9a98da7b5b30cafde048898026c8934b76630976585eb43c0a9392efdcb10b8f2ae8002884312a9142 SHA512 61a4a28fe9efbeeaecd79392eb730916e67dfffc1bcc5bbee156e3dd786dfeae5b39092ccab4c6d5ff9719d0792752732b52bc87615a7922c16cf6203eb57f5b
-DIST protonmail-bridge-1.1.4-1.x86_64.rpm 53566050 BLAKE2B 1221a885680704f9018cf8676c747cd6ffae9b1b351ce3bc47213af81c181ea1f5aa8ee3238bc9c93d115c09e2f0389b75eb1c8d5c8274bf812bf4050f9c0dfb SHA512 87668ba2563ebe3d815538c74591d1281bb0f882863528e56a0b6571feb95ddebe2b2cec89564f009429458eac703f7613bb2c6a8bb3f5d07c45b5ff76b486bd
-DIST protonmail-bridge-1.1.5-1.x86_64.rpm 53598661 BLAKE2B 8f0a8e74ad54642e79fd5b30cbd884dbcb26e4becee73f10a3108e1659a170933591aad90b5784ebe37ecc882f558924c037a1b5932c0375c267206695ab76f8 SHA512 c72e7abdb2ce95ac07afc090dcc2d50d5c334f451d5311e3e547b572f114dee80d8253392b9bae3c7e07307915a54d963cf9d755f64984b5260a8093502b5159
 DIST protonmail-bridge-1.1.6-1.x86_64.rpm 52547264 BLAKE2B abfc9657e7f15596f12609b9541a7616a405a86d02539340aa406f78c5abf1b766283dd6d954a15ebbb439402290f4a937d6c9a3d5b61de57383142dc878a379 SHA512 65524367fe9bf2a9fee7bb0be1cefc01eadf60494b65be9cb03c7ce73949d92c3312589a6f2801ca3cac89db226250529eefea12b0af744ca1c95ee4fc175435
-EBUILD protonmail-bridge-bin-1.1.3.ebuild 8914 BLAKE2B 832f25103989ba5c5e413435c63e960c5ae101b4f21d823991860ca8f6a8657b8471722c657dfc45f11c4f810e6baf1d11aaca79db7c623128c8b9f4fbb4ce69 SHA512 9e9b30a476e3d228323e69e047381beafc3346f62f46c60ecd1268d2804ad093440535c435a6cd461eb53a1d52813829af96865a135a90e4e9765b38fbeeb931
-EBUILD protonmail-bridge-bin-1.1.4.ebuild 8914 BLAKE2B 832f25103989ba5c5e413435c63e960c5ae101b4f21d823991860ca8f6a8657b8471722c657dfc45f11c4f810e6baf1d11aaca79db7c623128c8b9f4fbb4ce69 SHA512 9e9b30a476e3d228323e69e047381beafc3346f62f46c60ecd1268d2804ad093440535c435a6cd461eb53a1d52813829af96865a135a90e4e9765b38fbeeb931
-EBUILD protonmail-bridge-bin-1.1.5.ebuild 8914 BLAKE2B 832f25103989ba5c5e413435c63e960c5ae101b4f21d823991860ca8f6a8657b8471722c657dfc45f11c4f810e6baf1d11aaca79db7c623128c8b9f4fbb4ce69 SHA512 9e9b30a476e3d228323e69e047381beafc3346f62f46c60ecd1268d2804ad093440535c435a6cd461eb53a1d52813829af96865a135a90e4e9765b38fbeeb931
+DIST protonmail-bridge-1.2.2-1.x86_64.rpm 52777739 BLAKE2B 84c11176e57586f11e0fb511bcdbc98fbc85a563ba68dd44454a9b10e493a01b4414bf776929afa0990f3e1677fd47ab1b6c16e7799e964cff617f8cc5190bd7 SHA512 7dad4fd0ef99925a0e70fa2fbce89b16d900b4fdbe8da7c914451aa60ac47121da0de2a5b475b8e3e5bd024bbe7b67667c8c9733b6e7435c222f034ca9406c58
 EBUILD protonmail-bridge-bin-1.1.6.ebuild 8721 BLAKE2B adf78e924e818eda91a6c19ce4058e7a62efbbac902b799721ebb406b9524b0f6b7a29996d741156a254e0e7fbfe14a448ab12ae82c522d8805fbc3ba14fb952 SHA512 3a38bc03ac813656c2e0d7f4e3f30842d4baad81c71c24ecabc2dc946856f73d47facef9174f9b6977304262ae35a3ade84d09eb7192b0926c07995773d3a762
+EBUILD protonmail-bridge-bin-1.2.2.ebuild 8721 BLAKE2B adf78e924e818eda91a6c19ce4058e7a62efbbac902b799721ebb406b9524b0f6b7a29996d741156a254e0e7fbfe14a448ab12ae82c522d8805fbc3ba14fb952 SHA512 3a38bc03ac813656c2e0d7f4e3f30842d4baad81c71c24ecabc2dc946856f73d47facef9174f9b6977304262ae35a3ade84d09eb7192b0926c07995773d3a762
 MISC metadata.xml 477 BLAKE2B 8d29a65220a234802a25b8979e598393883a4e905ed6b114297801b93f82212165749f8317791459314afe1c59c6f5a7c2e871bc85637387bc3decae250cec21 SHA512 7d081e416b0bf6b91e6ba69a1de51c35839ff1512ab3c93be3f161ab5e6a4a554d58549460bb7fb73e1dbaf44f76b673067f0f33c4d775143f500416e096f0bc
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.3.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.3.ebuild
deleted file mode 100644
index 35b2fe8b0702..000000000000
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.3.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm
-
-DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
-HOMEPAGE="https://protonmail.com/bridge/"
-SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
-
-RESTRICT="bindist mirror"
-
-LICENSE="MIT protonmail-bridge-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-crypt/libsecret
-	dev-libs/glib:2
-	media-sound/pulseaudio[glib]
-	sys-apps/dbus
-	virtual/opengl
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXext
-	x11-libs/libXi
-"
-BDEPEND="dev-util/patchelf"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	# Some bogus files got into package.
-	rm -rf usr/lib/.build-id
-
-	# Bug #660366. To workaround preserving libs, set RUNPATH and rm unused libs
-	cd "${S}/usr/lib/protonmail/bridge" || die
-	patchelf --set-rpath '$ORIGIN/lib' protonmail-bridge || die "patchelf failed"
-	patchelf --set-rpath '$ORIGIN' lib/libicui18n.so.56 || die "patchelf failed"
-	patchelf --set-rpath '$ORIGIN' lib/libicuuc.so.56 || die "patchelf failed"
-
-	rm "lib/libQt53DCore.so.5" || die
-	rm "lib/libQt53DExtras.so.5" || die
-	rm "lib/libQt53DInput.so.5" || die
-	rm "lib/libQt53DLogic.so.5" || die
-	rm "lib/libQt53DQuick.so.5" || die
-	rm "lib/libQt53DQuickExtras.so.5" || die
-	rm "lib/libQt53DQuickInput.so.5" || die
-	rm "lib/libQt53DQuickRender.so.5" || die
-	rm "lib/libQt53DRender.so.5" || die
-	rm "lib/libQt5Concurrent.so.5" || die
-	rm "lib/libQt5Gamepad.so.5" || die
-	rm "lib/libQt5QuickParticles.so.5" || die
-	rm "plugins/audio/libqtaudio_alsa.so" || die
-	rm "plugins/audio/libqtmedia_pulse.so" || die
-	rm "plugins/bearer/libqconnmanbearer.so" || die
-	rm "plugins/bearer/libqgenericbearer.so" || die
-	rm "plugins/bearer/libqnmbearer.so" || die
-	rm "plugins/canbus/libqtpeakcanbus.so" || die
-	rm "plugins/canbus/libqtsocketcanbus.so" || die
-	rm "plugins/canbus/libqttinycanbus.so" || die
-	rm "plugins/designer/libqquickwidget.so" || die
-	rm "plugins/designer/libqwebengineview.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-emu-integration.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-x11-integration.so" || die
-	rm "plugins/gamepads/libevdevgamepad.so" || die
-	rm "plugins/generic/libqevdevkeyboardplugin.so" || die
-	rm "plugins/generic/libqevdevmouseplugin.so" || die
-	rm "plugins/generic/libqevdevtabletplugin.so" || die
-	rm "plugins/generic/libqevdevtouchplugin.so" || die
-	rm "plugins/generic/libqtuiotouchplugin.so" || die
-	rm "plugins/geometryloaders/libdefaultgeometryloader.so" || die
-	rm "plugins/geometryloaders/libgltfgeometryloader.so" || die
-	rm "plugins/geoservices/libqtgeoservices_esri.so" || die
-	rm "plugins/geoservices/libqtgeoservices_itemsoverlay.so" || die
-	rm "plugins/geoservices/libqtgeoservices_mapbox.so" || die
-	rm "plugins/geoservices/libqtgeoservices_mapboxgl.so" || die
-	rm "plugins/geoservices/libqtgeoservices_nokia.so" || die
-	rm "plugins/geoservices/libqtgeoservices_osm.so" || die
-	rm "plugins/iconengines/libqsvgicon.so" || die
-	rm "plugins/mediaservice/libgstaudiodecoder.so" || die
-	rm "plugins/mediaservice/libgstcamerabin.so" || die
-	rm "plugins/mediaservice/libgstmediacapture.so" || die
-	rm "plugins/mediaservice/libgstmediaplayer.so" || die
-	rm "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so" || die
-	rm "plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so" || die
-	rm "plugins/platforms/libqeglfs.so" || die
-	rm "plugins/platforms/libqlinuxfb.so" || die
-	rm "plugins/platforms/libqminimal.so" || die
-	rm "plugins/platforms/libqminimalegl.so" || die
-	rm "plugins/platforms/libqoffscreen.so" || die
-	rm "plugins/platforms/libqvnc.so" || die
-	rm "plugins/platformthemes/libqgtk3.so" || die
-	rm "plugins/playlistformats/libqtmultimedia_m3u.so" || die
-	rm "plugins/position/libqtposition_geoclue.so" || die
-	rm "plugins/position/libqtposition_positionpoll.so" || die
-	rm "plugins/printsupport/libcupsprintersupport.so" || die
-	rm "plugins/qmltooling/libqmldbg_debugger.so" || die
-	rm "plugins/qmltooling/libqmldbg_inspector.so" || die
-	rm "plugins/qmltooling/libqmldbg_local.so" || die
-	rm "plugins/qmltooling/libqmldbg_messages.so" || die
-	rm "plugins/qmltooling/libqmldbg_native.so" || die
-	rm "plugins/qmltooling/libqmldbg_nativedebugger.so" || die
-	rm "plugins/qmltooling/libqmldbg_profiler.so" || die
-	rm "plugins/qmltooling/libqmldbg_quickprofiler.so" || die
-	rm "plugins/qmltooling/libqmldbg_server.so" || die
-	rm "plugins/qmltooling/libqmldbg_tcp.so" || die
-	rm "plugins/renderplugins/libscene2d.so" || die
-	rm "plugins/sceneparsers/libassimpsceneimport.so" || die
-	rm "plugins/sceneparsers/libgltfsceneexport.so" || die
-	rm "plugins/sceneparsers/libgltfsceneimport.so" || die
-	rm "plugins/sensorgestures/libqtsensorgestures_plugin.so" || die
-	rm "plugins/sensorgestures/libqtsensorgestures_shakeplugin.so" || die
-	rm "plugins/sensors/libqtsensors_generic.so" || die
-	rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so" || die
-	rm "plugins/sensors/libqtsensors_linuxsys.so" || die
-	rm "plugins/sqldrivers/libqsqlite.so" || die
-	rm "plugins/sqldrivers/libqsqlmysql.so" || die
-	rm "plugins/sqldrivers/libqsqlpsql.so" || die
-	rm "plugins/xcbglintegrations/libqxcb-egl-integration.so" || die
-	rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so" || die
-	rm "qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so" || die
-	rm "qml/Qt/labs/platform/libqtlabsplatformplugin.so" || die
-	rm "qml/Qt/labs/settings/libqmlsettingsplugin.so" || die
-	rm "qml/Qt/labs/sharedimage/libsharedimageplugin.so" || die
-	rm "qml/Qt3D/Animation/libquick3danimationplugin.so" || die
-	rm "qml/Qt3D/Core/libquick3dcoreplugin.so" || die
-	rm "qml/Qt3D/Extras/libquick3dextrasplugin.so" || die
-	rm "qml/Qt3D/Input/libquick3dinputplugin.so" || die
-	rm "qml/Qt3D/Logic/libquick3dlogicplugin.so" || die
-	rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die
-	rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die
-	rm "qml/QtCanvas3D/libqtcanvas3d.so" || die
-	rm "qml/QtGamepad/libdeclarative_gamepad.so" || die
-	rm "qml/QtLocation/libdeclarative_location.so" || die
-	rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die
-	rm "qml/QtNfc/libdeclarative_nfc.so" || die
-	rm "qml/QtPositioning/libdeclarative_positioning.so" || die
-	rm "qml/QtQml/Models.2/libmodelsplugin.so" || die
-	rm "qml/QtQml/StateMachine/libqtqmlstatemachine.so" || die
-	rm "qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so" || die
-	rm "qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so" || die
-	rm "qml/QtQuick/Controls/libqtquickcontrolsplugin.so" || die
-	rm "qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so" || die
-	rm "qml/QtQuick/Dialogs/libdialogplugin.so" || die
-	rm "qml/QtQuick/Extras/libqtquickextrasplugin.so" || die
-	rm "qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so" || die
-	rm "qml/QtQuick/Particles.2/libparticlesplugin.so" || die
-	rm "qml/QtQuick/PrivateWidgets/libwidgetsplugin.so" || die
-	rm "qml/QtQuick/Scene2D/libqtquickscene2dplugin.so" || die
-	rm "qml/QtQuick/Scene3D/libqtquickscene3dplugin.so" || die
-	rm "qml/QtQuick/VirtualKeyboard/Styles/libqtvirtualkeyboardstylesplugin.so" || die
-	rm "qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so" || die
-	rm "qml/QtScxml/libdeclarative_scxml.so" || die
-	rm "qml/QtSensors/libdeclarative_sensors.so" || die
-	rm "qml/QtTest/libqmltestplugin.so" || die
-	rm "qml/QtWebChannel/libdeclarative_webchannel.so" || die
-	rm "qml/QtWebEngine/libqtwebengineplugin.so" || die
-	rm "qml/QtWebSockets/libdeclarative_qmlwebsockets.so" || die
-	rm "qml/QtWebView/libdeclarative_webview.so" || die
-	rm "lib/libQt5MultimediaGstTools.so.5" || die
-	rm "lib/libQt5OpenGL.so.5" || die
-	rm "lib/libQt5QuickWidgets.so.5" || die
-	rm "lib/libQt5EglFsKmsSupport.so.5" || die
-	rm "plugins/position/libqtposition_serialnmea.so" || die
-	rm "plugins/webview/libqtwebview_webengine.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so" || die
-	rm "plugins/texttospeech/libqtexttospeech_speechd.so" || die
-	rm "plugins/canbus/libqtpassthrucanbus.so" || die
-	rm "qml/QtQuick/Shapes/libqmlshapesplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die
-	rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die
-	rm "qml/Qt/labs/handlers/libhandlersplugin.so" || die
-	rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die
-
-	default
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR usr "${D}"/ || die "Failed to copy files"
-
-	dosym "protonmail-bridge" "/usr/bin/${PN}"
-
-	insinto /etc/revdep-rebuild
-	newins - "50-${PN}" <<-EOF
-		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
-	EOF
-}
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.4.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.4.ebuild
deleted file mode 100644
index 35b2fe8b0702..000000000000
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.4.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm
-
-DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
-HOMEPAGE="https://protonmail.com/bridge/"
-SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
-
-RESTRICT="bindist mirror"
-
-LICENSE="MIT protonmail-bridge-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-crypt/libsecret
-	dev-libs/glib:2
-	media-sound/pulseaudio[glib]
-	sys-apps/dbus
-	virtual/opengl
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXext
-	x11-libs/libXi
-"
-BDEPEND="dev-util/patchelf"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	# Some bogus files got into package.
-	rm -rf usr/lib/.build-id
-
-	# Bug #660366. To workaround preserving libs, set RUNPATH and rm unused libs
-	cd "${S}/usr/lib/protonmail/bridge" || die
-	patchelf --set-rpath '$ORIGIN/lib' protonmail-bridge || die "patchelf failed"
-	patchelf --set-rpath '$ORIGIN' lib/libicui18n.so.56 || die "patchelf failed"
-	patchelf --set-rpath '$ORIGIN' lib/libicuuc.so.56 || die "patchelf failed"
-
-	rm "lib/libQt53DCore.so.5" || die
-	rm "lib/libQt53DExtras.so.5" || die
-	rm "lib/libQt53DInput.so.5" || die
-	rm "lib/libQt53DLogic.so.5" || die
-	rm "lib/libQt53DQuick.so.5" || die
-	rm "lib/libQt53DQuickExtras.so.5" || die
-	rm "lib/libQt53DQuickInput.so.5" || die
-	rm "lib/libQt53DQuickRender.so.5" || die
-	rm "lib/libQt53DRender.so.5" || die
-	rm "lib/libQt5Concurrent.so.5" || die
-	rm "lib/libQt5Gamepad.so.5" || die
-	rm "lib/libQt5QuickParticles.so.5" || die
-	rm "plugins/audio/libqtaudio_alsa.so" || die
-	rm "plugins/audio/libqtmedia_pulse.so" || die
-	rm "plugins/bearer/libqconnmanbearer.so" || die
-	rm "plugins/bearer/libqgenericbearer.so" || die
-	rm "plugins/bearer/libqnmbearer.so" || die
-	rm "plugins/canbus/libqtpeakcanbus.so" || die
-	rm "plugins/canbus/libqtsocketcanbus.so" || die
-	rm "plugins/canbus/libqttinycanbus.so" || die
-	rm "plugins/designer/libqquickwidget.so" || die
-	rm "plugins/designer/libqwebengineview.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-emu-integration.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-x11-integration.so" || die
-	rm "plugins/gamepads/libevdevgamepad.so" || die
-	rm "plugins/generic/libqevdevkeyboardplugin.so" || die
-	rm "plugins/generic/libqevdevmouseplugin.so" || die
-	rm "plugins/generic/libqevdevtabletplugin.so" || die
-	rm "plugins/generic/libqevdevtouchplugin.so" || die
-	rm "plugins/generic/libqtuiotouchplugin.so" || die
-	rm "plugins/geometryloaders/libdefaultgeometryloader.so" || die
-	rm "plugins/geometryloaders/libgltfgeometryloader.so" || die
-	rm "plugins/geoservices/libqtgeoservices_esri.so" || die
-	rm "plugins/geoservices/libqtgeoservices_itemsoverlay.so" || die
-	rm "plugins/geoservices/libqtgeoservices_mapbox.so" || die
-	rm "plugins/geoservices/libqtgeoservices_mapboxgl.so" || die
-	rm "plugins/geoservices/libqtgeoservices_nokia.so" || die
-	rm "plugins/geoservices/libqtgeoservices_osm.so" || die
-	rm "plugins/iconengines/libqsvgicon.so" || die
-	rm "plugins/mediaservice/libgstaudiodecoder.so" || die
-	rm "plugins/mediaservice/libgstcamerabin.so" || die
-	rm "plugins/mediaservice/libgstmediacapture.so" || die
-	rm "plugins/mediaservice/libgstmediaplayer.so" || die
-	rm "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so" || die
-	rm "plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so" || die
-	rm "plugins/platforms/libqeglfs.so" || die
-	rm "plugins/platforms/libqlinuxfb.so" || die
-	rm "plugins/platforms/libqminimal.so" || die
-	rm "plugins/platforms/libqminimalegl.so" || die
-	rm "plugins/platforms/libqoffscreen.so" || die
-	rm "plugins/platforms/libqvnc.so" || die
-	rm "plugins/platformthemes/libqgtk3.so" || die
-	rm "plugins/playlistformats/libqtmultimedia_m3u.so" || die
-	rm "plugins/position/libqtposition_geoclue.so" || die
-	rm "plugins/position/libqtposition_positionpoll.so" || die
-	rm "plugins/printsupport/libcupsprintersupport.so" || die
-	rm "plugins/qmltooling/libqmldbg_debugger.so" || die
-	rm "plugins/qmltooling/libqmldbg_inspector.so" || die
-	rm "plugins/qmltooling/libqmldbg_local.so" || die
-	rm "plugins/qmltooling/libqmldbg_messages.so" || die
-	rm "plugins/qmltooling/libqmldbg_native.so" || die
-	rm "plugins/qmltooling/libqmldbg_nativedebugger.so" || die
-	rm "plugins/qmltooling/libqmldbg_profiler.so" || die
-	rm "plugins/qmltooling/libqmldbg_quickprofiler.so" || die
-	rm "plugins/qmltooling/libqmldbg_server.so" || die
-	rm "plugins/qmltooling/libqmldbg_tcp.so" || die
-	rm "plugins/renderplugins/libscene2d.so" || die
-	rm "plugins/sceneparsers/libassimpsceneimport.so" || die
-	rm "plugins/sceneparsers/libgltfsceneexport.so" || die
-	rm "plugins/sceneparsers/libgltfsceneimport.so" || die
-	rm "plugins/sensorgestures/libqtsensorgestures_plugin.so" || die
-	rm "plugins/sensorgestures/libqtsensorgestures_shakeplugin.so" || die
-	rm "plugins/sensors/libqtsensors_generic.so" || die
-	rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so" || die
-	rm "plugins/sensors/libqtsensors_linuxsys.so" || die
-	rm "plugins/sqldrivers/libqsqlite.so" || die
-	rm "plugins/sqldrivers/libqsqlmysql.so" || die
-	rm "plugins/sqldrivers/libqsqlpsql.so" || die
-	rm "plugins/xcbglintegrations/libqxcb-egl-integration.so" || die
-	rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so" || die
-	rm "qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so" || die
-	rm "qml/Qt/labs/platform/libqtlabsplatformplugin.so" || die
-	rm "qml/Qt/labs/settings/libqmlsettingsplugin.so" || die
-	rm "qml/Qt/labs/sharedimage/libsharedimageplugin.so" || die
-	rm "qml/Qt3D/Animation/libquick3danimationplugin.so" || die
-	rm "qml/Qt3D/Core/libquick3dcoreplugin.so" || die
-	rm "qml/Qt3D/Extras/libquick3dextrasplugin.so" || die
-	rm "qml/Qt3D/Input/libquick3dinputplugin.so" || die
-	rm "qml/Qt3D/Logic/libquick3dlogicplugin.so" || die
-	rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die
-	rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die
-	rm "qml/QtCanvas3D/libqtcanvas3d.so" || die
-	rm "qml/QtGamepad/libdeclarative_gamepad.so" || die
-	rm "qml/QtLocation/libdeclarative_location.so" || die
-	rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die
-	rm "qml/QtNfc/libdeclarative_nfc.so" || die
-	rm "qml/QtPositioning/libdeclarative_positioning.so" || die
-	rm "qml/QtQml/Models.2/libmodelsplugin.so" || die
-	rm "qml/QtQml/StateMachine/libqtqmlstatemachine.so" || die
-	rm "qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so" || die
-	rm "qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so" || die
-	rm "qml/QtQuick/Controls/libqtquickcontrolsplugin.so" || die
-	rm "qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so" || die
-	rm "qml/QtQuick/Dialogs/libdialogplugin.so" || die
-	rm "qml/QtQuick/Extras/libqtquickextrasplugin.so" || die
-	rm "qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so" || die
-	rm "qml/QtQuick/Particles.2/libparticlesplugin.so" || die
-	rm "qml/QtQuick/PrivateWidgets/libwidgetsplugin.so" || die
-	rm "qml/QtQuick/Scene2D/libqtquickscene2dplugin.so" || die
-	rm "qml/QtQuick/Scene3D/libqtquickscene3dplugin.so" || die
-	rm "qml/QtQuick/VirtualKeyboard/Styles/libqtvirtualkeyboardstylesplugin.so" || die
-	rm "qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so" || die
-	rm "qml/QtScxml/libdeclarative_scxml.so" || die
-	rm "qml/QtSensors/libdeclarative_sensors.so" || die
-	rm "qml/QtTest/libqmltestplugin.so" || die
-	rm "qml/QtWebChannel/libdeclarative_webchannel.so" || die
-	rm "qml/QtWebEngine/libqtwebengineplugin.so" || die
-	rm "qml/QtWebSockets/libdeclarative_qmlwebsockets.so" || die
-	rm "qml/QtWebView/libdeclarative_webview.so" || die
-	rm "lib/libQt5MultimediaGstTools.so.5" || die
-	rm "lib/libQt5OpenGL.so.5" || die
-	rm "lib/libQt5QuickWidgets.so.5" || die
-	rm "lib/libQt5EglFsKmsSupport.so.5" || die
-	rm "plugins/position/libqtposition_serialnmea.so" || die
-	rm "plugins/webview/libqtwebview_webengine.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so" || die
-	rm "plugins/texttospeech/libqtexttospeech_speechd.so" || die
-	rm "plugins/canbus/libqtpassthrucanbus.so" || die
-	rm "qml/QtQuick/Shapes/libqmlshapesplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die
-	rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die
-	rm "qml/Qt/labs/handlers/libhandlersplugin.so" || die
-	rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die
-
-	default
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR usr "${D}"/ || die "Failed to copy files"
-
-	dosym "protonmail-bridge" "/usr/bin/${PN}"
-
-	insinto /etc/revdep-rebuild
-	newins - "50-${PN}" <<-EOF
-		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
-	EOF
-}
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.5.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.5.ebuild
deleted file mode 100644
index 35b2fe8b0702..000000000000
--- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.5.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rpm
-
-DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
-HOMEPAGE="https://protonmail.com/bridge/"
-SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
-
-RESTRICT="bindist mirror"
-
-LICENSE="MIT protonmail-bridge-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-crypt/libsecret
-	dev-libs/glib:2
-	media-sound/pulseaudio[glib]
-	sys-apps/dbus
-	virtual/opengl
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXext
-	x11-libs/libXi
-"
-BDEPEND="dev-util/patchelf"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="*"
-
-src_prepare() {
-	# Some bogus files got into package.
-	rm -rf usr/lib/.build-id
-
-	# Bug #660366. To workaround preserving libs, set RUNPATH and rm unused libs
-	cd "${S}/usr/lib/protonmail/bridge" || die
-	patchelf --set-rpath '$ORIGIN/lib' protonmail-bridge || die "patchelf failed"
-	patchelf --set-rpath '$ORIGIN' lib/libicui18n.so.56 || die "patchelf failed"
-	patchelf --set-rpath '$ORIGIN' lib/libicuuc.so.56 || die "patchelf failed"
-
-	rm "lib/libQt53DCore.so.5" || die
-	rm "lib/libQt53DExtras.so.5" || die
-	rm "lib/libQt53DInput.so.5" || die
-	rm "lib/libQt53DLogic.so.5" || die
-	rm "lib/libQt53DQuick.so.5" || die
-	rm "lib/libQt53DQuickExtras.so.5" || die
-	rm "lib/libQt53DQuickInput.so.5" || die
-	rm "lib/libQt53DQuickRender.so.5" || die
-	rm "lib/libQt53DRender.so.5" || die
-	rm "lib/libQt5Concurrent.so.5" || die
-	rm "lib/libQt5Gamepad.so.5" || die
-	rm "lib/libQt5QuickParticles.so.5" || die
-	rm "plugins/audio/libqtaudio_alsa.so" || die
-	rm "plugins/audio/libqtmedia_pulse.so" || die
-	rm "plugins/bearer/libqconnmanbearer.so" || die
-	rm "plugins/bearer/libqgenericbearer.so" || die
-	rm "plugins/bearer/libqnmbearer.so" || die
-	rm "plugins/canbus/libqtpeakcanbus.so" || die
-	rm "plugins/canbus/libqtsocketcanbus.so" || die
-	rm "plugins/canbus/libqttinycanbus.so" || die
-	rm "plugins/designer/libqquickwidget.so" || die
-	rm "plugins/designer/libqwebengineview.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-emu-integration.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-x11-integration.so" || die
-	rm "plugins/gamepads/libevdevgamepad.so" || die
-	rm "plugins/generic/libqevdevkeyboardplugin.so" || die
-	rm "plugins/generic/libqevdevmouseplugin.so" || die
-	rm "plugins/generic/libqevdevtabletplugin.so" || die
-	rm "plugins/generic/libqevdevtouchplugin.so" || die
-	rm "plugins/generic/libqtuiotouchplugin.so" || die
-	rm "plugins/geometryloaders/libdefaultgeometryloader.so" || die
-	rm "plugins/geometryloaders/libgltfgeometryloader.so" || die
-	rm "plugins/geoservices/libqtgeoservices_esri.so" || die
-	rm "plugins/geoservices/libqtgeoservices_itemsoverlay.so" || die
-	rm "plugins/geoservices/libqtgeoservices_mapbox.so" || die
-	rm "plugins/geoservices/libqtgeoservices_mapboxgl.so" || die
-	rm "plugins/geoservices/libqtgeoservices_nokia.so" || die
-	rm "plugins/geoservices/libqtgeoservices_osm.so" || die
-	rm "plugins/iconengines/libqsvgicon.so" || die
-	rm "plugins/mediaservice/libgstaudiodecoder.so" || die
-	rm "plugins/mediaservice/libgstcamerabin.so" || die
-	rm "plugins/mediaservice/libgstmediacapture.so" || die
-	rm "plugins/mediaservice/libgstmediaplayer.so" || die
-	rm "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so" || die
-	rm "plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so" || die
-	rm "plugins/platforms/libqeglfs.so" || die
-	rm "plugins/platforms/libqlinuxfb.so" || die
-	rm "plugins/platforms/libqminimal.so" || die
-	rm "plugins/platforms/libqminimalegl.so" || die
-	rm "plugins/platforms/libqoffscreen.so" || die
-	rm "plugins/platforms/libqvnc.so" || die
-	rm "plugins/platformthemes/libqgtk3.so" || die
-	rm "plugins/playlistformats/libqtmultimedia_m3u.so" || die
-	rm "plugins/position/libqtposition_geoclue.so" || die
-	rm "plugins/position/libqtposition_positionpoll.so" || die
-	rm "plugins/printsupport/libcupsprintersupport.so" || die
-	rm "plugins/qmltooling/libqmldbg_debugger.so" || die
-	rm "plugins/qmltooling/libqmldbg_inspector.so" || die
-	rm "plugins/qmltooling/libqmldbg_local.so" || die
-	rm "plugins/qmltooling/libqmldbg_messages.so" || die
-	rm "plugins/qmltooling/libqmldbg_native.so" || die
-	rm "plugins/qmltooling/libqmldbg_nativedebugger.so" || die
-	rm "plugins/qmltooling/libqmldbg_profiler.so" || die
-	rm "plugins/qmltooling/libqmldbg_quickprofiler.so" || die
-	rm "plugins/qmltooling/libqmldbg_server.so" || die
-	rm "plugins/qmltooling/libqmldbg_tcp.so" || die
-	rm "plugins/renderplugins/libscene2d.so" || die
-	rm "plugins/sceneparsers/libassimpsceneimport.so" || die
-	rm "plugins/sceneparsers/libgltfsceneexport.so" || die
-	rm "plugins/sceneparsers/libgltfsceneimport.so" || die
-	rm "plugins/sensorgestures/libqtsensorgestures_plugin.so" || die
-	rm "plugins/sensorgestures/libqtsensorgestures_shakeplugin.so" || die
-	rm "plugins/sensors/libqtsensors_generic.so" || die
-	rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so" || die
-	rm "plugins/sensors/libqtsensors_linuxsys.so" || die
-	rm "plugins/sqldrivers/libqsqlite.so" || die
-	rm "plugins/sqldrivers/libqsqlmysql.so" || die
-	rm "plugins/sqldrivers/libqsqlpsql.so" || die
-	rm "plugins/xcbglintegrations/libqxcb-egl-integration.so" || die
-	rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so" || die
-	rm "qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so" || die
-	rm "qml/Qt/labs/platform/libqtlabsplatformplugin.so" || die
-	rm "qml/Qt/labs/settings/libqmlsettingsplugin.so" || die
-	rm "qml/Qt/labs/sharedimage/libsharedimageplugin.so" || die
-	rm "qml/Qt3D/Animation/libquick3danimationplugin.so" || die
-	rm "qml/Qt3D/Core/libquick3dcoreplugin.so" || die
-	rm "qml/Qt3D/Extras/libquick3dextrasplugin.so" || die
-	rm "qml/Qt3D/Input/libquick3dinputplugin.so" || die
-	rm "qml/Qt3D/Logic/libquick3dlogicplugin.so" || die
-	rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die
-	rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die
-	rm "qml/QtCanvas3D/libqtcanvas3d.so" || die
-	rm "qml/QtGamepad/libdeclarative_gamepad.so" || die
-	rm "qml/QtLocation/libdeclarative_location.so" || die
-	rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die
-	rm "qml/QtNfc/libdeclarative_nfc.so" || die
-	rm "qml/QtPositioning/libdeclarative_positioning.so" || die
-	rm "qml/QtQml/Models.2/libmodelsplugin.so" || die
-	rm "qml/QtQml/StateMachine/libqtqmlstatemachine.so" || die
-	rm "qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so" || die
-	rm "qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so" || die
-	rm "qml/QtQuick/Controls/libqtquickcontrolsplugin.so" || die
-	rm "qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so" || die
-	rm "qml/QtQuick/Dialogs/libdialogplugin.so" || die
-	rm "qml/QtQuick/Extras/libqtquickextrasplugin.so" || die
-	rm "qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so" || die
-	rm "qml/QtQuick/Particles.2/libparticlesplugin.so" || die
-	rm "qml/QtQuick/PrivateWidgets/libwidgetsplugin.so" || die
-	rm "qml/QtQuick/Scene2D/libqtquickscene2dplugin.so" || die
-	rm "qml/QtQuick/Scene3D/libqtquickscene3dplugin.so" || die
-	rm "qml/QtQuick/VirtualKeyboard/Styles/libqtvirtualkeyboardstylesplugin.so" || die
-	rm "qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so" || die
-	rm "qml/QtScxml/libdeclarative_scxml.so" || die
-	rm "qml/QtSensors/libdeclarative_sensors.so" || die
-	rm "qml/QtTest/libqmltestplugin.so" || die
-	rm "qml/QtWebChannel/libdeclarative_webchannel.so" || die
-	rm "qml/QtWebEngine/libqtwebengineplugin.so" || die
-	rm "qml/QtWebSockets/libdeclarative_qmlwebsockets.so" || die
-	rm "qml/QtWebView/libdeclarative_webview.so" || die
-	rm "lib/libQt5MultimediaGstTools.so.5" || die
-	rm "lib/libQt5OpenGL.so.5" || die
-	rm "lib/libQt5QuickWidgets.so.5" || die
-	rm "lib/libQt5EglFsKmsSupport.so.5" || die
-	rm "plugins/position/libqtposition_serialnmea.so" || die
-	rm "plugins/webview/libqtwebview_webengine.so" || die
-	rm "plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so" || die
-	rm "plugins/texttospeech/libqtexttospeech_speechd.so" || die
-	rm "plugins/canbus/libqtpassthrucanbus.so" || die
-	rm "qml/QtQuick/Shapes/libqmlshapesplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin.so" || die
-	rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die
-	rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die
-	rm "qml/Qt/labs/handlers/libhandlersplugin.so" || die
-	rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die
-
-	default
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR usr "${D}"/ || die "Failed to copy files"
-
-	dosym "protonmail-bridge" "/usr/bin/${PN}"
-
-	insinto /etc/revdep-rebuild
-	newins - "50-${PN}" <<-EOF
-		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
-	EOF
-}
diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.2.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.2.ebuild
new file mode 100644
index 000000000000..f3a5ead03295
--- /dev/null
+++ b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.2.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://protonmail.com/bridge/"
+SRC_URI="https://protonmail.com/download/${P/-bin/}-1.x86_64.rpm"
+
+RESTRICT="bindist mirror"
+
+LICENSE="MIT protonmail-bridge-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/glib:2
+	media-sound/pulseaudio[glib]
+	sys-apps/dbus
+	virtual/opengl
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+"
+BDEPEND="dev-util/patchelf"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	# Some bogus files got into package.
+	rm -rf usr/lib/.build-id
+
+	# Bug #660366. To workaround preserving libs, set RUNPATH and rm unused libs
+	cd "${S}/usr/lib/protonmail/bridge" || die
+	patchelf --set-rpath '$ORIGIN/lib' protonmail-bridge || die "patchelf failed"
+	patchelf --set-rpath '$ORIGIN' lib/libicui18n.so.56 || die "patchelf failed"
+	patchelf --set-rpath '$ORIGIN' lib/libicuuc.so.56 || die "patchelf failed"
+
+	rm "lib/libQt53DCore.so.5" || die
+	rm "lib/libQt53DExtras.so.5" || die
+	rm "lib/libQt53DInput.so.5" || die
+	rm "lib/libQt53DLogic.so.5" || die
+	rm "lib/libQt53DQuick.so.5" || die
+	rm "lib/libQt53DQuickExtras.so.5" || die
+	rm "lib/libQt53DQuickInput.so.5" || die
+	rm "lib/libQt53DQuickRender.so.5" || die
+	rm "lib/libQt53DRender.so.5" || die
+	rm "lib/libQt5Concurrent.so.5" || die
+	rm "lib/libQt5Gamepad.so.5" || die
+	rm "lib/libQt5QuickParticles.so.5" || die
+	rm "plugins/audio/libqtaudio_alsa.so" || die
+	rm "plugins/audio/libqtmedia_pulse.so" || die
+	rm "plugins/bearer/libqconnmanbearer.so" || die
+	rm "plugins/bearer/libqgenericbearer.so" || die
+	rm "plugins/bearer/libqnmbearer.so" || die
+	rm "plugins/canbus/libqtpeakcanbus.so" || die
+	rm "plugins/canbus/libqtsocketcanbus.so" || die
+	rm "plugins/canbus/libqttinycanbus.so" || die
+	rm "plugins/designer/libqquickwidget.so" || die
+	rm "plugins/designer/libqwebengineview.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-emu-integration.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-x11-integration.so" || die
+	rm "plugins/gamepads/libevdevgamepad.so" || die
+	rm "plugins/generic/libqevdevkeyboardplugin.so" || die
+	rm "plugins/generic/libqevdevmouseplugin.so" || die
+	rm "plugins/generic/libqevdevtabletplugin.so" || die
+	rm "plugins/generic/libqevdevtouchplugin.so" || die
+	rm "plugins/generic/libqtuiotouchplugin.so" || die
+	rm "plugins/geometryloaders/libdefaultgeometryloader.so" || die
+	rm "plugins/geometryloaders/libgltfgeometryloader.so" || die
+	rm "plugins/geoservices/libqtgeoservices_esri.so" || die
+	rm "plugins/geoservices/libqtgeoservices_itemsoverlay.so" || die
+	rm "plugins/geoservices/libqtgeoservices_mapbox.so" || die
+	rm "plugins/geoservices/libqtgeoservices_mapboxgl.so" || die
+	rm "plugins/geoservices/libqtgeoservices_nokia.so" || die
+	rm "plugins/geoservices/libqtgeoservices_osm.so" || die
+	rm "plugins/iconengines/libqsvgicon.so" || die
+	rm "plugins/mediaservice/libgstaudiodecoder.so" || die
+	rm "plugins/mediaservice/libgstcamerabin.so" || die
+	rm "plugins/mediaservice/libgstmediacapture.so" || die
+	rm "plugins/mediaservice/libgstmediaplayer.so" || die
+	rm "plugins/platforminputcontexts/libibusplatforminputcontextplugin.so" || die
+	rm "plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so" || die
+	rm "plugins/platforms/libqeglfs.so" || die
+	rm "plugins/platforms/libqlinuxfb.so" || die
+	rm "plugins/platforms/libqminimal.so" || die
+	rm "plugins/platforms/libqminimalegl.so" || die
+	rm "plugins/platforms/libqoffscreen.so" || die
+	rm "plugins/platforms/libqvnc.so" || die
+	rm "plugins/platformthemes/libqgtk3.so" || die
+	rm "plugins/playlistformats/libqtmultimedia_m3u.so" || die
+	rm "plugins/position/libqtposition_geoclue.so" || die
+	rm "plugins/position/libqtposition_positionpoll.so" || die
+	rm "plugins/printsupport/libcupsprintersupport.so" || die
+	rm "plugins/qmltooling/libqmldbg_inspector.so" || die
+	rm "plugins/qmltooling/libqmldbg_local.so" || die
+	rm "plugins/qmltooling/libqmldbg_messages.so" || die
+	rm "plugins/qmltooling/libqmldbg_native.so" || die
+	rm "plugins/qmltooling/libqmldbg_nativedebugger.so" || die
+	rm "plugins/qmltooling/libqmldbg_profiler.so" || die
+	rm "plugins/qmltooling/libqmldbg_quickprofiler.so" || die
+	rm "plugins/qmltooling/libqmldbg_server.so" || die
+	rm "plugins/qmltooling/libqmldbg_tcp.so" || die
+	rm "plugins/renderplugins/libscene2d.so" || die
+	rm "plugins/sceneparsers/libassimpsceneimport.so" || die
+	rm "plugins/sceneparsers/libgltfsceneexport.so" || die
+	rm "plugins/sceneparsers/libgltfsceneimport.so" || die
+	rm "plugins/sensorgestures/libqtsensorgestures_plugin.so" || die
+	rm "plugins/sensorgestures/libqtsensorgestures_shakeplugin.so" || die
+	rm "plugins/sensors/libqtsensors_generic.so" || die
+	rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so" || die
+	rm "plugins/sensors/libqtsensors_linuxsys.so" || die
+	rm "plugins/sqldrivers/libqsqlite.so" || die
+	rm "plugins/sqldrivers/libqsqlmysql.so" || die
+	rm "plugins/sqldrivers/libqsqlpsql.so" || die
+	rm "plugins/xcbglintegrations/libqxcb-egl-integration.so" || die
+	rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so" || die
+	rm "qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so" || die
+	rm "qml/Qt/labs/platform/libqtlabsplatformplugin.so" || die
+	rm "qml/Qt/labs/settings/libqmlsettingsplugin.so" || die
+	rm "qml/Qt/labs/sharedimage/libsharedimageplugin.so" || die
+	rm "qml/Qt3D/Animation/libquick3danimationplugin.so" || die
+	rm "qml/Qt3D/Core/libquick3dcoreplugin.so" || die
+	rm "qml/Qt3D/Extras/libquick3dextrasplugin.so" || die
+	rm "qml/Qt3D/Input/libquick3dinputplugin.so" || die
+	rm "qml/Qt3D/Logic/libquick3dlogicplugin.so" || die
+	rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die
+	rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die
+	rm "qml/QtCanvas3D/libqtcanvas3d.so" || die
+	rm "qml/QtGamepad/libdeclarative_gamepad.so" || die
+	rm "qml/QtLocation/libdeclarative_location.so" || die
+	rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die
+	rm "qml/QtNfc/libdeclarative_nfc.so" || die
+	rm "qml/QtPositioning/libdeclarative_positioning.so" || die
+	rm "qml/QtQml/Models.2/libmodelsplugin.so" || die
+	rm "qml/QtQml/StateMachine/libqtqmlstatemachine.so" || die
+	rm "qml/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so" || die
+	rm "qml/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so" || die
+	rm "qml/QtQuick/Controls/libqtquickcontrolsplugin.so" || die
+	rm "qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.so" || die
+	rm "qml/QtQuick/Dialogs/libdialogplugin.so" || die
+	rm "qml/QtQuick/Extras/libqtquickextrasplugin.so" || die
+	rm "qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so" || die
+	rm "qml/QtQuick/Particles.2/libparticlesplugin.so" || die
+	rm "qml/QtQuick/PrivateWidgets/libwidgetsplugin.so" || die
+	rm "qml/QtQuick/Scene2D/libqtquickscene2dplugin.so" || die
+	rm "qml/QtQuick/Scene3D/libqtquickscene3dplugin.so" || die
+	rm "qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so" || die
+	rm "qml/QtScxml/libdeclarative_scxml.so" || die
+	rm "qml/QtSensors/libdeclarative_sensors.so" || die
+	rm "qml/QtTest/libqmltestplugin.so" || die
+	rm "qml/QtWebChannel/libdeclarative_webchannel.so" || die
+	rm "qml/QtWebEngine/libqtwebengineplugin.so" || die
+	rm "qml/QtWebSockets/libdeclarative_qmlwebsockets.so" || die
+	rm "qml/QtWebView/libdeclarative_webview.so" || die
+	rm "lib/libQt5MultimediaGstTools.so.5" || die
+	rm "lib/libQt5OpenGL.so.5" || die
+	rm "lib/libQt5QuickWidgets.so.5" || die
+	rm "lib/libQt5EglFsKmsSupport.so.5" || die
+	rm "plugins/position/libqtposition_serialnmea.so" || die
+	rm "plugins/webview/libqtwebview_webengine.so" || die
+	rm "plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so" || die
+	rm "plugins/texttospeech/libqtexttospeech_speechd.so" || die
+	rm "plugins/canbus/libqtpassthrucanbus.so" || die
+	rm "qml/QtQuick/Shapes/libqmlshapesplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Fusion/libqtquickcontrols2fusionstyleplugin.so" || die
+	rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die
+	rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die
+	rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die
+
+	default
+}
+
+src_install() {
+	# Using doins -r would strip executable bits from all binaries
+	cp -pPR usr "${D}"/ || die "Failed to copy files"
+
+	dosym "protonmail-bridge" "/usr/bin/${PN}"
+
+	insinto /etc/revdep-rebuild
+	newins - "50-${PN}" <<-EOF
+		SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge"
+	EOF
+}
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 850eb50cd4a4..fdba06b204b4 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -12,9 +12,6 @@ AUX site.config.m4 564 BLAKE2B 85bcbe7b9a26071aedf0d1b530c1276d93de21d82972add09
 AUX sm-client.service 418 BLAKE2B a9057cac008c11d3cfd5a4b662cf3fc71a33be79e8890a54e556a258b098ceccc2e9941f62dce868498751bd22f23f45289bc84a8250020b140acbd2b6508b58 SHA512 26e5a64790fd7106e45de0f4dfafb3b648094953bd1831a223ca7c60b7cb75b673fb554b426a6aa0e7dc200a134fd042b4ecc6795641cfddd82bd04e4c7ea324
 DIST sendmail.8.14.9.tar.gz 2114293 BLAKE2B 51c24478724a1dd87e3bbda0bf0e8c9c64bc8f36eaa624752eda50942520a4f19262d2c8cebbb0a02467bb3f49e1e7edd78a69f0327effa3834e4234b289f04c SHA512 a541fe687e9967fb87f2f6c6263ecc698aac42c6a52e81e7ee556f0c3d719b9c996dfccf10cc2e0e5c6d03dd8d3ce79b856b78ca049dd47665e38c77763fa424
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
-EBUILD sendmail-8.14.9-r1.ebuild 7110 BLAKE2B bb8f35fdfc6a63c590445984a3ac1fca444106af6cfe0199d1293d63dab6fd39fecbe25e658b8cb626df6ebb08855c645d9ea58b64341797aca775fb05e0c660 SHA512 1a64fb6d117712ff0371663db3bf514f5e1e5b09d033e4539159385aa8adf52adffefdaddd0d7a084b6991a373470c4f795f850a5ecca7b1bc7d1305f18c1782
 EBUILD sendmail-8.14.9.ebuild 7038 BLAKE2B 61e6ba9e7b36ae1dfc4e733cd201c50c8655a57184e8d092a9282bbb8db33d636622978df6241897ef8246cb21d5f13a9536313898b937e51753aeec3654719b SHA512 1039f0200eb87e2c5c8f0416f0a512584932bd21bb1f3b7aeb8cef7c8b9e779c7ff4c376018eaa89a1105057a38d6ce063b291e0cec612dc3fc8f1a583b224f1
-EBUILD sendmail-8.15.2-r1.ebuild 7124 BLAKE2B 644f9c03564f9f85b46f5cf1ae1f4f238e3b96ee8cd96e6ca57e6e7a0120c54e97766419a798d632ff01d21c5810da6b034f3f825aeb328b3cb917c2c7eb58f6 SHA512 da7df1ea484e5b4b493a889e4e33e050b03b9ff4af5bc3de02ca9ca76357ec6cb980ed133e1f7bb18abe65c9716632fead39b878df6c5e3896bb7303bd8a0745
-EBUILD sendmail-8.15.2-r2.ebuild 7228 BLAKE2B 5c51357ee5fcd56a5ce299d720092f310f451937686036b02096d6cf52b76c3be91525f284e8dd1174f3859273c806e7bec4bdeb1452873b1f13a41c1fa2cd92 SHA512 a2f5abc5c57cac49281d366982dbd3d7b79bc73744ab2f2da058e81540b583edc0dbcd172ec911df13af70d9278bfb64a0a6337f0c66d372ad93b300b9b63d84
-EBUILD sendmail-8.15.2.ebuild 7073 BLAKE2B 27f6b9c30a0ce34980264329a4d51d86464c554e45519b5f2a0c545adc157aec40d10f09babe36b6cbe36f73614ab5b6a799a7c9a676cc6b8f7d0e3fa25a05ce SHA512 7ee4aeb9f202bfc0278d39a03a1048d5360348d195a432924943715d968a163b2f48e2cefce16bcdcf445768badaf55270dca07dbb5e3e79e67e3aa692b93d44
+EBUILD sendmail-8.15.2-r2.ebuild 7223 BLAKE2B db20488b3d4d6c3b7590070422d6d1b6ded8cc95dd69c5f5f7272e9519a91c44e3bdf7bfafe77ab9343ce9149f070baf7623d25a0f55fa6fc42116b95d8bdcf5 SHA512 5becbe409bd2b7e62c42a0f5fbb7e7985225227142cbbd66850f338fa17a0f055adf0bd401ebdb88b023d5d12822c1e7edcef26aca3256324fae05224b9cd3e0
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/mail-mta/sendmail/sendmail-8.14.9-r1.ebuild b/mail-mta/sendmail/sendmail-8.14.9-r1.ebuild
deleted file mode 100644
index 6b54b50e57a8..000000000000
--- a/mail-mta/sendmail/sendmail-8.14.9-r1.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils multilib systemd toolchain-funcs user
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl ldap libressl sasl tcpd mbox ipv6 nis sockets"
-
-DEPEND="net-mail/mailbase
-	sys-devel/m4
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-3.2
-	!net-mail/vacation
-	"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/opensmtpd
-	!mail-mta/qmail-ldap
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]"
-
-PDEPEND="!mbox? ( mail-filter/procmail )"
-
-# libmilter library is part of sendmail, but it does not share the version number with it.
-# In order to find the right libmilter version number, check SMFI_VERSION definition
-# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
-# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
-LIBMILTER_VER=1.0.2
-
-pkg_setup() {
-	enewgroup smmsp 209
-	enewuser smmsp 209 -1 /var/spool/mqueue smmsp
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/"${PN}"-8.14.6-build-system.patch
-	epatch "${FILESDIR}"/sendmail-delivered_hdr.patch
-	epatch "${FILESDIR}"/libmilter-sharedlib.patch
-	epatch "${FILESDIR}"/"${PN}"-8.14.5+db-5.0.patch
-	epatch "${FILESDIR}"/sendmail-starttls-multi-crl.patch
-
-	local confCC="$(tc-getCC)"
-	local confCCOPTS="${CFLAGS}"
-	local confLDOPTS="${LDFLAGS}"
-	local confMAPDEF="-DMAP_REGEX"
-	local conf_sendmail_LIBS=""
-	use sasl && confLIBS="${confLIBS} -lsasl2"  \
-		&& confENVDEF="${confENVDEF} -DSASL=2" \
-		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
-	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
-		&& confLIBS="${confLIBS} -lwrap"
-	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
-		&& confENVDEF="${confENVDEF} -D_FFR_TLS_1" \
-		&& confLIBS="${confLIBS} -lssl -lcrypto" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
-	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
-		&& confLIBS="${confLIBS} -lldap -llber"
-	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
-	use nis && confENVDEF="${confENVDEF} -DNIS"
-	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
-	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
-		-e "s/@@confLDOPTS@@/${confLDOPTS}/" \
-		-e "s/@@confCC@@/${confCC}/" \
-		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
-		-e "s/@@confENVDEF@@/${confENVDEF}/" \
-		-e "s/@@confLIBS@@/${confLIBS}/" \
-		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
-		"${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4
-}
-
-src_compile() {
-	sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "compilation failed in main Build script"
-	pushd libmilter
-	sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" MILTER_SOVER=${LIBMILTER_VER} || die "libmilter compilation failed"
-	popd
-}
-
-src_install () {
-	local MY_LIBDIR=/usr/$(get_libdir)
-	local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`"
-	dodir /usr/bin ${MY_LIBDIR} /usr/include/libmilter
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-	keepdir /var/spool/{clientmqueue,mqueue}
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
-	do
-		make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C "${MY_OBJDIR}/${dir}" \
-			|| die "install failed"
-	done
-	for dir in rmail mail.local
-	do
-		make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			force-install -C "${MY_OBJDIR}/${dir}" \
-			|| die "install failed"
-	done
-
-	make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
-		SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-		MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-		LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-		MSPQOWN=root CFOWN=root CFGRP=root \
-		MILTER_SOVER=${LIBMILTER_VER} \
-		install -C "${MY_OBJDIR}/libmilter" \
-		|| die "install failed"
-
-	fowners root:smmsp /usr/sbin/sendmail
-	fperms 2555 /usr/sbin/sendmail
-	fowners smmsp:smmsp /var/spool/clientmqueue
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	dosym /usr/sbin/makemap /usr/bin/makemap
-	dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
-	newdoc sendmail/README README.sendmail
-	newdoc sendmail/SECURITY SECURITY
-	newdoc sendmail/TUNING TUNING
-	newdoc smrsh/README README.smrsh
-	newdoc libmilter/README README.libmilter
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-	cp -pPR cf/* "${D}"/usr/share/sendmail-cf
-
-	docinto contrib
-	dodoc contrib/*
-
-	insinto /etc/mail
-	if use mbox
-	then
-		newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc
-	else
-		newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
-	fi
-	m4 "${D}"/usr/share/sendmail-cf/m4/cf.m4 "${D}"/etc/mail/sendmail.mc \
-		> "${D}"/etc/mail/sendmail.cf
-	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
-		> "${D}"/etc/mail/submit.mc
-	cat "${D}"/usr/share/sendmail-cf/cf/submit.mc >> "${D}"/etc/mail/submit.mc
-	echo "# local-host-names - include all aliases for your machine here" \
-		> "${D}"/etc/mail/local-host-names
-	cat <<- EOF > "${D}"/etc/mail/trusted-users
-		# trusted-users - users that can send mail as others without a warning
-		# apache, mailman, majordomo, uucp are good candidates
-	EOF
-	cat <<- EOF > "${D}"/etc/mail/access
-		# Check the /usr/share/doc/sendmail/README.cf file for a description
-		# of the format of this file. (search for access_db in that file)
-		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-		# package.
-		#
-
-	EOF
-	cat <<- EOF > "${D}"/etc/conf.d/sendmail
-		# Config file for /etc/init.d/sendmail
-		# add start-up options here
-		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-	EOF
-	if use sasl; then
-		dodir /etc/sasl2
-		cat <<- EOF > "${D}"/etc/sasl2/Sendmail.conf
-		pwcheck_method: saslauthd
-		mech_list: PLAIN LOGIN
-
-		EOF
-	fi
-
-	doinitd "${FILESDIR}"/sendmail
-	systemd_dounit "${FILESDIR}"/sendmail.service
-	systemd_dounit "${FILESDIR}"/sm-client.service
-
-	keepdir /usr/adm/sm.bin
-}
diff --git a/mail-mta/sendmail/sendmail-8.15.2-r1.ebuild b/mail-mta/sendmail/sendmail-8.15.2-r1.ebuild
deleted file mode 100644
index b4933bf74357..000000000000
--- a/mail-mta/sendmail/sendmail-8.15.2-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib systemd toolchain-funcs user
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl ldap libressl sasl tcpd mbox ipv6 nis sockets"
-
-DEPEND="net-mail/mailbase
-	sys-devel/m4
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-3.2
-	!net-mail/vacation
-	"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/opensmtpd
-	!mail-mta/qmail-ldap
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]"
-
-PDEPEND="!mbox? ( mail-filter/procmail )"
-
-# libmilter library is part of sendmail, but it does not share the version number with it.
-# In order to find the right libmilter version number, check SMFI_VERSION definition
-# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
-# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
-LIBMILTER_VER=1.0.2
-
-pkg_setup() {
-	enewgroup smmsp 209
-	enewuser smmsp 209 -1 /var/spool/mqueue smmsp
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${PN}"-8.14.6-build-system.patch
-	eapply -p0 "${FILESDIR}"/sendmail-delivered_hdr.patch
-	eapply "${FILESDIR}"/libmilter-sharedlib.patch
-	eapply -p0 "${FILESDIR}"/sendmail-starttls-multi-crl.patch
-	eapply "${FILESDIR}"/${P}-openssl-1.1.0-fix.patch
-
-	local confCC="$(tc-getCC)"
-	local confCCOPTS="${CFLAGS}"
-	local confLDOPTS="${LDFLAGS}"
-	local confMAPDEF="-DMAP_REGEX"
-	local conf_sendmail_LIBS=""
-	use sasl && confLIBS="${confLIBS} -lsasl2"  \
-		&& confENVDEF="${confENVDEF} -DSASL=2" \
-		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
-	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
-		&& confLIBS="${confLIBS} -lwrap"
-	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
-		&& confENVDEF="${confENVDEF} -D_FFR_TLS_1" \
-		&& confLIBS="${confLIBS} -lssl -lcrypto" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
-	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
-		&& confLIBS="${confLIBS} -lldap -llber"
-	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
-	use nis && confENVDEF="${confENVDEF} -DNIS"
-	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
-	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
-		-e "s/@@confLDOPTS@@/${confLDOPTS}/" \
-		-e "s/@@confCC@@/${confCC}/" \
-		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
-		-e "s/@@confENVDEF@@/${confENVDEF}/" \
-		-e "s/@@confLIBS@@/${confLIBS}/" \
-		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
-		"${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4
-
-	eapply_user
-}
-
-src_compile() {
-	sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "compilation failed in main Build script"
-	pushd libmilter
-	sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" MILTER_SOVER=${LIBMILTER_VER} || die "libmilter compilation failed"
-	popd
-}
-
-src_install () {
-	local MY_LIBDIR=/usr/$(get_libdir)
-	local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`"
-	dodir /usr/bin ${MY_LIBDIR} /usr/include/libmilter
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-	keepdir /var/spool/{clientmqueue,mqueue}
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
-	do
-		make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C "${MY_OBJDIR}/${dir}" \
-			|| die "install failed"
-	done
-	for dir in rmail mail.local
-	do
-		make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			force-install -C "${MY_OBJDIR}/${dir}" \
-			|| die "install failed"
-	done
-
-	make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
-		SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-		MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-		LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-		MSPQOWN=root CFOWN=root CFGRP=root \
-		MILTER_SOVER=${LIBMILTER_VER} \
-		install -C "${MY_OBJDIR}/libmilter" \
-		|| die "install failed"
-
-	fowners root:smmsp /usr/sbin/sendmail
-	fperms 2555 /usr/sbin/sendmail
-	fowners smmsp:smmsp /var/spool/clientmqueue
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	dosym /usr/sbin/makemap /usr/bin/makemap
-	dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
-	newdoc sendmail/README README.sendmail
-	newdoc sendmail/SECURITY SECURITY
-	newdoc sendmail/TUNING TUNING
-	newdoc smrsh/README README.smrsh
-	newdoc libmilter/README README.libmilter
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-	cp -pPR cf/* "${D}"/usr/share/sendmail-cf
-
-	docinto contrib
-	dodoc contrib/*
-
-	insinto /etc/mail
-	if use mbox
-	then
-		newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc
-	else
-		newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
-	fi
-	m4 "${D}"/usr/share/sendmail-cf/m4/cf.m4 "${D}"/etc/mail/sendmail.mc \
-		> "${D}"/etc/mail/sendmail.cf
-	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
-		> "${D}"/etc/mail/submit.mc
-	cat "${D}"/usr/share/sendmail-cf/cf/submit.mc >> "${D}"/etc/mail/submit.mc
-	echo "# local-host-names - include all aliases for your machine here" \
-		> "${D}"/etc/mail/local-host-names
-	cat <<- EOF > "${D}"/etc/mail/trusted-users
-		# trusted-users - users that can send mail as others without a warning
-		# apache, mailman, majordomo, uucp are good candidates
-	EOF
-	cat <<- EOF > "${D}"/etc/mail/access
-		# Check the /usr/share/doc/sendmail/README.cf file for a description
-		# of the format of this file. (search for access_db in that file)
-		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-		# package.
-		#
-
-	EOF
-	cat <<- EOF > "${D}"/etc/conf.d/sendmail
-		# Config file for /etc/init.d/sendmail
-		# add start-up options here
-		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-	EOF
-	if use sasl; then
-		dodir /etc/sasl2
-		cat <<- EOF > "${D}"/etc/sasl2/Sendmail.conf
-		pwcheck_method: saslauthd
-		mech_list: PLAIN LOGIN
-
-		EOF
-	fi
-
-	doinitd "${FILESDIR}"/sendmail
-	systemd_dounit "${FILESDIR}"/sendmail.service
-	systemd_dounit "${FILESDIR}"/sm-client.service
-
-	keepdir /usr/adm/sm.bin
-}
diff --git a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
index 33ce68bff6ee..dce6b2f09634 100644
--- a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
+++ b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
 
 LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ssl ldap libressl sasl tcpd mbox ipv6 nis sockets"
 
 DEPEND="net-mail/mailbase
diff --git a/mail-mta/sendmail/sendmail-8.15.2.ebuild b/mail-mta/sendmail/sendmail-8.15.2.ebuild
deleted file mode 100644
index efdf5057c209..000000000000
--- a/mail-mta/sendmail/sendmail-8.15.2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib systemd toolchain-funcs user
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl ldap libressl sasl tcpd mbox ipv6 nis sockets"
-
-DEPEND="net-mail/mailbase
-	sys-devel/m4
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-3.2
-	!net-mail/vacation
-	"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp[mta]
-	!mail-mta/netqmail
-	!mail-mta/nullmailer
-	!mail-mta/postfix
-	!mail-mta/opensmtpd
-	!mail-mta/qmail-ldap
-	!<mail-mta/ssmtp-2.64-r2
-	!>=mail-mta/ssmtp-2.64-r2[mta]"
-
-PDEPEND="!mbox? ( mail-filter/procmail )"
-
-# libmilter library is part of sendmail, but it does not share the version number with it.
-# In order to find the right libmilter version number, check SMFI_VERSION definition
-# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
-# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
-LIBMILTER_VER=1.0.2
-
-pkg_setup() {
-	enewgroup smmsp 209
-	enewuser smmsp 209 -1 /var/spool/mqueue smmsp
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${PN}"-8.14.6-build-system.patch
-	eapply -p0 "${FILESDIR}"/sendmail-delivered_hdr.patch
-	eapply "${FILESDIR}"/libmilter-sharedlib.patch
-	eapply -p0 "${FILESDIR}"/sendmail-starttls-multi-crl.patch
-
-	local confCC="$(tc-getCC)"
-	local confCCOPTS="${CFLAGS}"
-	local confLDOPTS="${LDFLAGS}"
-	local confMAPDEF="-DMAP_REGEX"
-	local conf_sendmail_LIBS=""
-	use sasl && confLIBS="${confLIBS} -lsasl2"  \
-		&& confENVDEF="${confENVDEF} -DSASL=2" \
-		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
-	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
-		&& confLIBS="${confLIBS} -lwrap"
-	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
-		&& confENVDEF="${confENVDEF} -D_FFR_TLS_1" \
-		&& confLIBS="${confLIBS} -lssl -lcrypto" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
-	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
-		&& confLIBS="${confLIBS} -lldap -llber"
-	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
-	use nis && confENVDEF="${confENVDEF} -DNIS"
-	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
-	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
-		-e "s/@@confLDOPTS@@/${confLDOPTS}/" \
-		-e "s/@@confCC@@/${confCC}/" \
-		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
-		-e "s/@@confENVDEF@@/${confENVDEF}/" \
-		-e "s/@@confLIBS@@/${confLIBS}/" \
-		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
-		"${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4
-
-	eapply_user
-}
-
-src_compile() {
-	sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "compilation failed in main Build script"
-	pushd libmilter
-	sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" MILTER_SOVER=${LIBMILTER_VER} || die "libmilter compilation failed"
-	popd
-}
-
-src_install () {
-	local MY_LIBDIR=/usr/$(get_libdir)
-	local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`"
-	dodir /usr/bin ${MY_LIBDIR} /usr/include/libmilter
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-	keepdir /var/spool/{clientmqueue,mqueue}
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
-	do
-		make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C "${MY_OBJDIR}/${dir}" \
-			|| die "install failed"
-	done
-	for dir in rmail mail.local
-	do
-		make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			force-install -C "${MY_OBJDIR}/${dir}" \
-			|| die "install failed"
-	done
-
-	make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
-		SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-		MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-		LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-		MSPQOWN=root CFOWN=root CFGRP=root \
-		MILTER_SOVER=${LIBMILTER_VER} \
-		install -C "${MY_OBJDIR}/libmilter" \
-		|| die "install failed"
-
-	fowners root:smmsp /usr/sbin/sendmail
-	fperms 2555 /usr/sbin/sendmail
-	fowners smmsp:smmsp /var/spool/clientmqueue
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	dosym /usr/sbin/makemap /usr/bin/makemap
-	dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
-	newdoc sendmail/README README.sendmail
-	newdoc sendmail/SECURITY SECURITY
-	newdoc sendmail/TUNING TUNING
-	newdoc smrsh/README README.smrsh
-	newdoc libmilter/README README.libmilter
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-	cp -pPR cf/* "${D}"/usr/share/sendmail-cf
-
-	docinto contrib
-	dodoc contrib/*
-
-	insinto /etc/mail
-	if use mbox
-	then
-		newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc
-	else
-		newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
-	fi
-	m4 "${D}"/usr/share/sendmail-cf/m4/cf.m4 "${D}"/etc/mail/sendmail.mc \
-		> "${D}"/etc/mail/sendmail.cf
-	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
-		> "${D}"/etc/mail/submit.mc
-	cat "${D}"/usr/share/sendmail-cf/cf/submit.mc >> "${D}"/etc/mail/submit.mc
-	echo "# local-host-names - include all aliases for your machine here" \
-		> "${D}"/etc/mail/local-host-names
-	cat <<- EOF > "${D}"/etc/mail/trusted-users
-		# trusted-users - users that can send mail as others without a warning
-		# apache, mailman, majordomo, uucp are good candidates
-	EOF
-	cat <<- EOF > "${D}"/etc/mail/access
-		# Check the /usr/share/doc/sendmail/README.cf file for a description
-		# of the format of this file. (search for access_db in that file)
-		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-		# package.
-		#
-
-	EOF
-	cat <<- EOF > "${D}"/etc/conf.d/sendmail
-		# Config file for /etc/init.d/sendmail
-		# add start-up options here
-		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-	EOF
-	if use sasl; then
-		dodir /etc/sasl2
-		cat <<- EOF > "${D}"/etc/sasl2/Sendmail.conf
-		pwcheck_method: saslauthd
-		mech_list: PLAIN LOGIN
-
-		EOF
-	fi
-
-	doinitd "${FILESDIR}"/sendmail
-	systemd_dounit "${FILESDIR}"/sendmail.service
-	systemd_dounit "${FILESDIR}"/sm-client.service
-
-	keepdir /usr/adm/sm.bin
-}
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index fc4f1a839607..31243839a79f 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index c192e820124e..49d85daa7246 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,3 +1,3 @@
 DIST mate-sensors-applet-1.22.1.tar.xz 496776 BLAKE2B 1f3ca3e7b6b48a3bdb4e3b370c65bd34bcbde250d21d2c9214eceadf790d2c1a45f87ccf615387edf9abaad2c3a899a536b78d8afece0574d735d80095c1b595 SHA512 4b6e608c92f03051044863f770b295d1526b19a9668513b566e81adeb28bc8524d8f458d114d2b44acf00f20c2f0a8d86b1ca7254fa165fde3b867c75a6b83e6
-EBUILD mate-sensors-applet-1.22.1.ebuild 1341 BLAKE2B 4c5b0a611bc8bddc25f0c5fc0d91a36109aad973ce1ac7b2c232a023bf918ceb7af7b41c1f65c7027d0e4a515af2bb0cd452402b2baf1bf225571e77f6b5bc56 SHA512 92c2ed89a0b7969bcadda1f65f65cff201e9abc99fe52a42ab25b87c41453154e2d00c41304041907acf08c7af7535a98584f7e2d226587c5b320b6a987dbf54
+EBUILD mate-sensors-applet-1.22.1.ebuild 1341 BLAKE2B 4ef978754b86f8f4b4aa7924f00f8486da0570a73b47181fd34676930b921a1adf98752cec27baf05b7448cb7385815726470f922a8c9ce468ebe7d7acf7600b SHA512 c2e53ef07461c900482d0d2ec8380c3e8637705b12d731bd1367c0a267c356af4f9bfdc9989ab57f57bc5d3173e8f2041f86786da4d85896dea18f285822ec8c
 MISC metadata.xml 348 BLAKE2B 3e34850491c3dce6bfe3771ed94ea37e68d9c8131594f4056c40e754f5556a4dbf03e434a0f3d19eaa6177a0a484a1b50b8de1c67a4eadf1faf6e5b56fa70166 SHA512 32cad99749c326ae12caa346b0bbf85779cbf9f35b85c4f729358dd7171d468f486c761e33d2938fcac445485ec256d733150d7dedc7c9e6b271702ba7c454ab
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
index 7df62276db70..1d46b635f650 100644
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="MATE panel applet to display readings from hardware sensors"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+dbus hddtemp libnotify lm_sensors video_cards_nvidia"
+IUSE="+dbus hddtemp libnotify lm-sensors video_cards_nvidia"
 
 COMMON_DEPEND=">=dev-libs/glib-2.50:2
 	>=mate-base/mate-panel-1.17.0
@@ -25,7 +25,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.50:2
 	virtual/libintl
 	hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )
 	libnotify? ( >=x11-libs/libnotify-0.7 )
-	lm_sensors? ( sys-apps/lm_sensors )
+	lm-sensors? ( sys-apps/lm-sensors )
 	video_cards_nvidia? ( || (
 		>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
 	) )"
@@ -56,7 +56,7 @@ src_configure() {
 		--disable-static \
 		--without-aticonfig \
 		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
+		$(use_with lm-sensors libsensors) \
 		$(use_with video_cards_nvidia nvidia) \
 		${udisks}
 }
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index f2de94c65ddc..4ab2708702ca 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/noto-cjk/Manifest b/media-fonts/noto-cjk/Manifest
index ffa63ab28371..dca066289fda 100644
--- a/media-fonts/noto-cjk/Manifest
+++ b/media-fonts/noto-cjk/Manifest
@@ -4,5 +4,5 @@ DIST noto-cjk-20170602.tar.gz 1667938394 BLAKE2B 51ed7c48bccef0dff75ddc5ec108b61
 DIST noto-cjk-20190416.tar.gz 1882149745 BLAKE2B 0936414381624db8a601cb2af53928658c9f74ed3dac34955f5597e7cb14cdacc517c8b7bffe203d73e03a2c2d4013d3cfc47ce13ae3aa497c6547cd8dcce430 SHA512 8abebae9412622f50adb0f755621d97002233d8db367f8fc38dda6a0828c3ea879e9ac780a3b09239b0570ada1091b0a7889bb7301a9486da9dfdca7200e50da
 EBUILD noto-cjk-20150615.ebuild 756 BLAKE2B c1ee13c7340cf90d0dcd9130c3377332e9772828df9948cf8eb5d3df337c77e67bde57d53c2cdd1ad6129e1cceaec8e5e28179535036ef98c970c602ca95b411 SHA512 c8696b1655b25cfcb1004898d80d757e5cd2273fbe71e01cead68b379643259072917b03cd893de3213d9d76f8fab245255f030b48e5cb39b9d1eccdfe81cc14
 EBUILD noto-cjk-20170602.ebuild 644 BLAKE2B b996054820cc1fe2621968a4a4c91267823af08b4e3dd6a61953c336361d963172d701408c3ed391f942b30c472b8ffab4217e3a864fcc380087913fd99c5f0a SHA512 d4750ab9746e8c7be333f547d07973e2f31d415b6baffe32a8511aa176fd45cd62a5678d2b7bc57db9c3f6baa35aeeed07e29622f330c53b7676a13c90ecfda7
-EBUILD noto-cjk-20190416.ebuild 641 BLAKE2B e3de6ff6c19fc0fc7fba77c08318abe59b5e3ac0291cd41a78e6f6ce2b155feb047e71f5d669b0be1a162803a1f4bda79eef3a537526289b20f08020b918c860 SHA512 1f9810be6b46b20691cf92b2f2668e6253368ebdc57e43e63a1f533cc9eb6c922f62f8e23b7637c9e03437175dccec5a2e3353911dd62b4a01914f5cc0446a6e
+EBUILD noto-cjk-20190416.ebuild 640 BLAKE2B 23fe26db84fcde0434d23b11750027bc31445b4bf67a4347d18ac677ddb313a9f7527098a4a70c71998433d3e46dd6f828d81dd8361c87082e8c34eb6e817319 SHA512 efa8f7ef5459d701bf4585c2ca779914353dc1db1e9e0d7fa2ad4f838859d54ee83e14a6d041ccd48bf8c012604eef861abd64d71b591ff37fde10ea3f402baa
 MISC metadata.xml 449 BLAKE2B f30d4df6c9ddc672a839eeb6433bd9583fa4af65c32190b09bca261e1a53e0c9bb396808811a3591c8b90337002fba8433d8eb816af4475f57339c299b8eaa06 SHA512 04d7f718df7e4d83823b778f09f1cb4e78ffceb154030dc1f8980cd9ca9cf8ed0140d0354b44e6523952e6ddae3e4879a467a1855092cfb7052ea97e099c98d4
diff --git a/media-fonts/noto-cjk/noto-cjk-20190416.ebuild b/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
index 46aa0dde424d..b12889b41557 100644
--- a/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
+++ b/media-fonts/noto-cjk/noto-cjk-20190416.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googlei18n/noto-cjk/archive/${COMMIT}.tar.gz -> ${P}
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RESTRICT="binchecks strip"
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 640e2d7ca20c..f187edd0c3f2 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -6,5 +6,5 @@ DIST noto-20181024.tar.gz 726721580 BLAKE2B d19d32d98419395df1bb3ca360bd67a50487
 DIST noto-20190524.tar.gz 740252290 BLAKE2B e169ee60c9a83c13656ebd5dbce32aad183bbebc057035c69723788725a1c14a016c37bea7ccf30fc9d776e421515c2fa03f929b5f7bf95d9e3abb1abbeccbbf SHA512 668f7d015da420b3c32f8c0313037bab731bd915875f476beb47e6c3e8d33a30cd608d2f351194607afbf28f8f3efc1eb5f8470c03fd88a83df33b478fa78147
 EBUILD noto-20170403.ebuild 819 BLAKE2B 3bf921503660437c91da43ac3e7e9e05fff70ff95e9842b1c5d884d005a28286a929cc66772afa8f9c74d919045f9e45218ce8f2bfa0eb9539b1ceea26c8762e SHA512 728276eef93954d03eb649f2772d4cde19b3080e7bdff2da344d70026d992f5dd1d521f6786c50f32f38c1780988288463705fdd522cec298ba4c8d51bd6b8d7
 EBUILD noto-20181024.ebuild 928 BLAKE2B 394b9decc5153dad3d77a2ef0078ca4be32ecdd3c7048a80a5e4566994fa9cef0d5059f092649341014737c877cafbd0f791937ba2350ebf7440ecabc06d38df SHA512 eae13a5c8ed1e8cfc7dbc63cb1eb4ea6398f1c0cc4a25b3babe0f93c9dfb2f0d0a1a200519490e562a1b25f05f7c2273ebe42f4290feef7617421777fb173809
-EBUILD noto-20190524.ebuild 1274 BLAKE2B c0f35b51bae35ce82be1658007c492b9e3bb6102b3c72d57f58375a6a20fb98f0792f41ad34895c34ae8c584f59ff8b98a4d0caf7dcec83017c716f7a583055a SHA512 62f86fadc4fba9b696b368b034ffed3b212ac843b6685fa70c8969637778f614660c328ee5407885447725354bb351d39e5084d77e7b6fa50b9ccab2e3b2c313
+EBUILD noto-20190524.ebuild 1273 BLAKE2B 0531ccd4ba287043bfdbf34f8652932809646c9ab8cc45f6bb5868111e9c88bada2efb649ecb3e1dcca124837f053964bd52070f677ea63728b01247333144a3 SHA512 6c3fdae251483364ca1cc1456d3c512b4b3360808c69e9a69a9ded7c8bba67bf6d5aae6c60bb18530aa5610491bce9a9109c1c72cfd5cade99716f7a0d669cdf
 MISC metadata.xml 523 BLAKE2B f44295f5bef7ef8248755f8dce32e6916bfcf3f4a6058c2cca7cf449cecfcd3b40ce134c01931190c2b9ca00349891d9ad3b2ba828d550d0344fb8b8c70960ce SHA512 3b876b78c73894a6c51b4026cb0fd9aeb816710ebaf85e297cc2dc627fd7cbfd934a75f6cc1e1bd75857171f1259a01ee71b0665928792f025047cc97cb63e5c
diff --git a/media-fonts/noto/noto-20190524.ebuild b/media-fonts/noto/noto-20190524.ebuild
index ce6cb392d75b..1d9c18213e78 100644
--- a/media-fonts/noto/noto-20190524.ebuild
+++ b/media-fonts/noto/noto-20190524.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86"
 # Extra allows to optionally reduce disk usage even returning to tofu
 # issue as described in https://www.google.com/get/noto/
 IUSE="cjk +extra"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 1eb434555a4d..0d80e74e621e 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 8eabd4328225..543a04b20dd4 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -3,4 +3,4 @@ AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316
 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec
 DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
 EBUILD blender-2.79b-r1.ebuild 8140 BLAKE2B 4378e2bb61c8a9c6627d6eb67664c383b4a75eca548c2c007d58680b543c3d17b593b2c1da52326a2347b1f5f7f6efb6a6a4e880d005417a19f82f91c1f2cfd3 SHA512 1d6a6391d2497217e0c9661fdb7f42e5f2442061568c70274e699068623d810800064e0892a08e22e1465b0b23cb860bf82e8c8cb6250c75d0944b2c0227e14d
-MISC metadata.xml 2623 BLAKE2B 2c42f1167627f2c4f27163aaef77f6be41cca231f3183c61a7b57d25a39402d410b3693ac52ff0b5c2b040055acd6615ad5f4e886ecd4a7f7054551c1ca95083 SHA512 b725cd3113852eb8eaeaac1455499c2f85765808aaea1d7335ed88065e71dd9f90a57d618eaead32eb7443350e1a6b4d001eec01042d6acf0c84bbf4ecd32276
+MISC metadata.xml 2628 BLAKE2B b6ac04e033bd54bf3b6918737289e0a12ece3f87543b033ff85748934b6cecdb0cf8084a3c0e7fd766965b6defa4a402980244bec1a0ed2772ffbd12bfe96a8f SHA512 a47e7a85cc98bf0befad9b5ef5ad75276a6649bb5949367294177f19ae763a3dd0eae1ce8d179463c18c33533c37c283c7beabe08fe27d861bd54eb761675e35
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 6f5b51065dff..7f510c45ba1f 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dracwyrm@gentoo.org</email>
-		<name>Jonathan Scruggs</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
 	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
 		<email>graphics@gentoo.org</email>
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index c5b96ee029e2..d07a110b30be 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,13 +1,10 @@
-AUX digikam-6.0.0-cmake.patch 1972 BLAKE2B 103f282e8cdc33d6e7cc3982bb15b290ff2381846d6262005922b97df1b54d9dd7572fb95eee01a3cf413dda9eed28e0201123bfedddc7beda6dc4ddc99e5d55 SHA512 8efe171f763692efd7c8449e1365e2d531a4d1b6da79fe1f5048dbe1b328f70b6e923298015f2a162751843eb88db2dd1af744a2b2cd3219e0f44aea4d3a569a
 AUX digikam-6.2.0-cmake.patch 2011 BLAKE2B da9e459cd8c7f89d986166cf19dde36d599565f573831057c0d68706c05f4b49240215e159d36e377f16b178c7de04e713bdfb3214bd83e114cbbd5b40f4f37a SHA512 44a63a08da538bee35efc965789b463455646c3ee9ed8fbe6f22591155c20b623e48838af52f8b521a35b3548fe44909516a15a4d815347e61de71d07bbfad17
 AUX digikam-6.2.0-googlephoto-upload.patch 1072 BLAKE2B 5384a259b2fdd15cf195fed8f5aa1a16a0af3932af1e2226b3bfd2be95d19f6fee003fd9d3344c0921ff5655d22ea4f30f98e8ed7c1e5dee1d4b91d4d031562e SHA512 c71ab51371e45538f33ba9603eabdc8e3e518f7e38aa274407d90f216a14f6071066f388291d072fca46eb6589e3cafe0eb5b78f3bb3520ca9aa85add092d265
 AUX digikam-6.2.0-imagemagick-7.0.8.60.patch 641 BLAKE2B c2a7261a92cb757aa39f2ccb5a561b8cb34563540e1c0e84662a056dad66e17c941a77ee9d42b168e83d18f72786e9bf49e741f73bf20c714496fad80ad22987 SHA512 d1ecf5a25a3cdf542ababa6d4306bf6bce25b5f04e8f880460a8a67f4f4eac283f139b82848a085a28dc16b0a8a9310a3ed294d110105b0562239ef21ce6e442
 AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d
 AUX digikam-6.3.0-googlephoto-import-crash.patch 2815 BLAKE2B e39efa7815aef3f7b165e0915610e54af188479af3bef140717d5d903e557bb0da49fa493e06df9a76b9695df7ebe84cbf6132674209f45476da0a1d4752ceb7 SHA512 523dc9add1ee5b9ffb675c1983e8f54624b7537dbec567a60661fdd58b045978f2a794a47093f5a3d268e4aa159a8064cd6b261798bf19cfeb5241fd5ce4cdb8
-DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb
 DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
 DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
-EBUILD digikam-6.0.0.ebuild 3904 BLAKE2B d3184396f4e28bd1eb765074fcac1a5b29eac28444375502b09cbc6b74d36a24f62febe9a28e360ce25783223fe4c533d156b41f19a2a4e468cc63894be38b5d SHA512 7524e08ea4e8daa15786e3d5bf4f2fa085d88bf5687b9f1cb6809c3fb9b732f0532e1240a43d14da473d6221706fb19bc679f254b9d78b118561d3376792cf60
-EBUILD digikam-6.2.0.ebuild 4167 BLAKE2B 42ea9b4b5a8e407b6c6b60cb1af2e9de1a4ad7db15ec7e34df559c88734a7e70756db554250cbfcb8a6c193b5afc44b48e9b56fed2694573d61c31d6851b7f02 SHA512 8275593169c750e21d779946f7b2d11bda4c5f767d4d83a7d2b643e1df8f12a6eff971f4e6a1d719137d7d58009851121936b8d77ae913a6323084edf7e1ea79
+EBUILD digikam-6.2.0.ebuild 4166 BLAKE2B 7dda2079c57b887ba01a6243c6f5d4506baa4eb285b218d05c2ee6de84f1d1014154a621bcfc4c4980ec1dd5d4d1c2d3d6c80a33187b1e52638e9c67fb041ac5 SHA512 ee99c9c55687aa28283179c92e6e9fc1e19027206fe0ff3a51541da23bb024297c1d03c9ab59039f481820856ae44de03f4958db26333f3a9f0976c3729d8ea0
 EBUILD digikam-6.3.0.ebuild 4127 BLAKE2B dd3aadddedca2bb93412994ff869c486b9653eedeea4faffc4dc970886b80448a0d487cc36173ea93a93e617aebfec39f012910a18885ef1f468093dfbb165e8 SHA512 58c0c44f993dd4ed6088ca6697c9f2a00ea7c33b75f6c80877308cc17d0a292305b9c423d7eae7e4896571097d3025602714c4e8379732f66949f9fb0264d2fe
 MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild b/media-gfx/digikam/digikam-6.0.0.ebuild
deleted file mode 100644
index 2e6852810eb2..000000000000
--- a/media-gfx/digikam/digikam-6.0.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # keep until CMAKE_MIN_VERSION=3.13.4
-inherit kde5 toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	SRC_BRANCH=stable
-	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
-	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
-
-BDEPEND="
-	sys-devel/gettext
-	panorama? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql 'mysql?')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	dev-libs/expat
-	>=media-gfx/exiv2-0.26:=
-	media-libs/lcms:2
-	media-libs/liblqr
-	media-libs/libpng:0=
-	>=media-libs/opencv-3.1.0:=
-	media-libs/tiff:0
-	virtual/jpeg:0
-	addressbook? (
-		$(add_kdeapps_dep akonadi-contacts)
-		$(add_kdeapps_dep kcontacts)
-	)
-	calendar? ( $(add_kdeapps_dep kcalcore) )
-	gphoto2? ( media-libs/libgphoto2:= )
-	lensfun? ( media-libs/lensfun )
-	marble? (
-		$(add_frameworks_dep kbookmarks)
-		$(add_kdeapps_dep marble)
-		$(add_qt_dep qtconcurrent)
-	)
-	mediaplayer? (
-		media-libs/qtav[opengl]
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/opengl
-	)
-	panorama? ( $(add_frameworks_dep threadweaver) )
-	scanner? ( $(add_kdeapps_dep libksane) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	vkontakte? ( net-libs/libkvkontakte:5 )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost[threads]
-"
-RDEPEND="${COMMON_DEPEND}
-	mysql? ( virtual/mysql[server] )
-	panorama? ( media-gfx/hugin )
-"
-
-RESTRICT+=" test"
-# bug 366505
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	kde5_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	kde5_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_APPSTYLES=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake-utils_use_find_package calendar KF5CalendarCore)
-		$(cmake-utils_use_find_package gphoto2 Gphoto2)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		$(cmake-utils_use_find_package lensfun LensFun)
-		$(cmake-utils_use_find_package marble Marble)
-		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-		$(cmake-utils_use_find_package mediaplayer QtAV)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
-		-DENABLE_QWEBENGINE=$(usex !webkit)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild
index 04257cd79584..b91dd599e0f1 100644
--- a/media-gfx/digikam/digikam-6.2.0.ebuild
+++ b/media-gfx/digikam/digikam-6.2.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_BRANCH=stable
 	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
 	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-gfx/digikam/files/digikam-6.0.0-cmake.patch b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch
deleted file mode 100644
index f90067f48126..000000000000
--- a/media-gfx/digikam/files/digikam-6.0.0-cmake.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0d24a8971700454533c66ab9fc63043c67d44da6 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 17 Feb 2019 23:51:03 +0100
-Subject: [PATCH] Un-break optional Qt5 detection
-
----
- core/CMakeLists.txt | 22 ++++++++++------------
- 1 file changed, 10 insertions(+), 12 deletions(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 27d3819323..17c8aa0320 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -134,16 +134,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
- )
- 
- if(ENABLE_QWEBENGINE)
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets)
-+    find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE)
- else()
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets)
-+    find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE)
- endif()
- 
--find_package(Qt5 ${QT_MIN_VERSION}
--             OPTIONAL_COMPONENTS
--             DBus
--             OpenGL
--)
-+find_package(Qt5DBus ${QT_MIN_VERSION})
-+
-+find_package(Qt5OpenGL ${QT_MIN_VERSION})
- 
- if(ENABLE_DBUS)
-     if(NOT Qt5DBus_FOUND)
-@@ -154,10 +152,10 @@ endif()
- # Dependencies For unit tests and CLI test tools
- 
- if(BUILD_TESTING)
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS
--                 Test
--                 Qml WebView  # Optional, for 'sialis' O2 library test tool.
--    )
-+    find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
-+    # Optional, for 'sialis' O2 library test tool.
-+    find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE)
-+    find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE)
- endif()
- 
- find_package(KF5 ${KF5_MIN_VERSION}
-@@ -323,7 +321,7 @@ find_package(OpenGL)                               # For Presentation tool.
- find_package(X11)
- 
- if(X11_FOUND)
--    find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
-+    find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
-     set(HAVE_X11 TRUE)
- else()
-     set(HAVE_X11 FALSE)
--- 
-2.20.1
-
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index 1440366ac25b..b7ef0e3bc513 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,11 +1,4 @@
-AUX feh-2.6.2-debug-cflags.patch 197 BLAKE2B a5a9b2c2ac22869401303706b92a10474d091cb01869c6272adac79000eb02591e424fd71734d3c0bd29d253854a27f4fe1fe21f99ba55cd48c66325521dc836 SHA512 eb09a90a9ff3ba2ae7a40c8ef9e5b361d42bb045e194ddb5823111d780da265371ee087c6f80963d80f5cd1d0427478f46fec9b0f0607ad2bb122415a9c2e397
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
-DIST feh-3.1.1.tar.bz2 2109534 BLAKE2B ea02ab09791ef61a9ac5db84b5a0f69ddc76f994343660cf4072a41769a59ddd2936e0f047eeed26be0b3676711b1e440c0483325e6bb621205788ebe13c1fca SHA512 cbdf6e36831a750a6bdb9f1a5735c814662b5274d9c453392de88b98926b539cc54e2041fc0cd2a393762f14ec24b81435de6d506d9efc1ee4c7d80105aa6243
-DIST feh-3.1.3.tar.bz2 2110285 BLAKE2B ee42b766eccf7e4661a47bd6c748b2e0cc6345fb9c08de425b0f4ef87c7fb383dd20140fb2c8b2fc540b70a6c01bb612b48aa76fc1f47a117f2503257bf3b403 SHA512 dc4960706e4134bbe6c34036a9c9b7cd98eb8935e13e2354504664a1599d4af193c6b977433a40c7e3638b2b3e2928960e0c755b04f7c48076ef15445f792583
 DIST feh-3.2.1.tar.bz2 2112281 BLAKE2B 2918d2714f0557e1b67284709bce22c5e14d8f7f545ca33c16ec7928273edf18c9be48a685c3e9a032170bf2b7e572a4b78664f37b2a16c5ae5829b3cc55ca76 SHA512 11a136990f7d02409501f10553659c64ad5d18d4bfaa4e5cfdeb7a2f53ffdb8bd9b8347796c65e75c49615ac4c12bc81bf3a58325f778cb5e0c1608181d7b53a
-DIST feh-3.2.tar.bz2 2111743 BLAKE2B 2fd9838845bb86cc17d99650ac595c2b9f573be30d6ea86512a37a2f0439b10d6fe0b6bc028b81d03219530db2c0c58b1e6642834c32a621b191a310d53c7499 SHA512 f87d07edb9aa098a6c71b37306c42fdfe2b9cdb8cafcd72dd04f82b5a79da47c4e55979a0a8365fe22681f857215120009c84cde34b6f36e599522a2c4af6f70
-EBUILD feh-3.1.1.ebuild 1497 BLAKE2B f6e2659966cface0e1f154b219101caf560c075699545d52611e5c5f4f49fa8caafe9b96a06e7a8b06712cf5023feef0433fea82c377a08b737c41fb70dded2d SHA512 73681572193a12dfdb2c7bbb8bd99a29ebfda1ef01be4664ca7664afa00e8633ddaeb0a7929859882f9c0f8cf8a10b09c40efcd0fa9fdb1b877d49e4acdd18e9
-EBUILD feh-3.1.3.ebuild 1501 BLAKE2B 1e2bfdded6414e79a76ba2365246e9baf5d525b999e0a3f61a692b1724b3d2455567e924b6c2c675519c78d1ad3845479429e149328140854f02d78f9d9d9932 SHA512 702a19de9be1bb591d2daadd4285bd9a942de5ebda401de2f62ca03984ee0f68bc437689b405c35aa405e641638e98ef8c9d765b6f8c107a7e19d9c2181bc764
 EBUILD feh-3.2.1.ebuild 1522 BLAKE2B 79c8a59656764fc43e28f15616dc26ffd40b81b1417d885e5c1b89e32a6ff854c7b6af763acddd0897ce58bf0231eb7250319090c48fa282f14218dfb477edd2 SHA512 6e4ef3a5b5a962510bbce7957b09b11d46111ffd10593159d965bd86e09c7da7800175459b8cdc553a58ac616d146a7752253cf72afd6be003cf93be81eb5409
-EBUILD feh-3.2.ebuild 1494 BLAKE2B af02b7ba7319db9101fd13ed9e3bf797b11aff36591802cd7a3bf3a6f32b728ed392d6e9ae579a2f7e0fec94709e6ba0da9885c205ef56610b8e0cab070a22d9 SHA512 17ec2bf6d4ae373e9dcf32d2235e2cd3d5149c9e363c71da207c27076073d9f8c6140f8b0538165e96d9cd7cc284fb012c3047a4902e5349af9fdf2e45104d41
 MISC metadata.xml 358 BLAKE2B 602fb8b872f5f209abd20adbb141035c0d0396a7712839c950cfa19e78201c0c39e88fa5e8bebc6224459bb8e328e732ff30db848f6c84510f91830951f2087c SHA512 51fad9cc41f31b03f42e0ac4254ea05a848df755091cdd47ee4ce73f7189acd83e8956c230329ea0053d1f794b529e498525f6ce282a947c9809c4954a5b9a19
diff --git a/media-gfx/feh/feh-3.1.1.ebuild b/media-gfx/feh/feh-3.1.1.ebuild
deleted file mode 100644
index 9c2309b6d220..000000000000
--- a/media-gfx/feh/feh-3.1.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs gnome2-utils xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
-IUSE="debug curl exif test xinerama"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.1.3.ebuild b/media-gfx/feh/feh-3.1.3.ebuild
deleted file mode 100644
index e701805c82c7..000000000000
--- a/media-gfx/feh/feh-3.1.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs gnome2-utils xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug curl exif test xinerama"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.2.ebuild b/media-gfx/feh/feh-3.2.ebuild
deleted file mode 100644
index 299ad0eac2eb..000000000000
--- a/media-gfx/feh/feh-3.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs gnome2-utils xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug curl exif test xinerama"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/files/feh-2.6.2-debug-cflags.patch b/media-gfx/feh/files/feh-2.6.2-debug-cflags.patch
deleted file mode 100644
index a4a71acef30c..000000000000
--- a/media-gfx/feh/files/feh-2.6.2-debug-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- feh-2.6.2/config.mk
-+++ feh-2.6.2/config.mk
-@@ -32,7 +32,7 @@
- endif
- 
- ifeq (${debug},1)
--	CFLAGS += -DDEBUG -O0
-+	CFLAGS += -DDEBUG
- 	MAN_DEBUG = . This is a debug build.
- else
- 	MAN_DEBUG =
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 30eff8c38195..c02325618d9c 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.10-56.tar.xz 8950748 BLAKE2B 5d1b4ad20ec3aa6f89aedf08ac91266be218464cd998ca950623c1a23954968f84b21bfc140c1a1dfdcd68c8420ddcd39f76cd31d3872d43bf631b5782980665 SHA512 e5d1dd4da8b361858ff2d7a4c7956280bd55053022c7b0ad27fac4a70e9d2cafb75299e7970e1b2091b83b3bedd2355d5752e9bff6999f9272619a92a8892c0f
 DIST ImageMagick-6.9.10-60.tar.xz 8939576 BLAKE2B a4b493838da9bfa183f55d19d9643dcd83fe533884b28d579b9586357af7d3ffba16f88e73ed42658a3b41ac47de9ebf7a7ddbefc0339bd90338a1f32dbd96a7 SHA512 cd34014322bd48b02d3680564756db58292fabd5487a187bb3913ec9f5ffd0b990a112a145a9be544cfc334cb917232683cdafc815baee85638a95a9a89f4604
-DIST ImageMagick-7.0.8-56.tar.xz 9465124 BLAKE2B c31c66ae84e9bb91fc744673c07d12300a5e5a07729eaee9654e988efc46cc9d5321e6906325fe9fcfbeb81785a74a52e6059d2983c280b86d0ad305c0818b9d SHA512 22651b0f5b0b0821b7ae74a10671590d8ecfddcc95b60bf056ef7a7cbeab37beedaf49d0bcf97cb0ac2f1ec564192c15c7820c9593db965b4b192338abdaf5dc
+DIST ImageMagick-6.9.10-64.tar.xz 9060412 BLAKE2B 1c27abab10910f4013ff65dfdf32b4bcf8541b1a15195eefa7bd32a6a375abe6cfe3e5f243716c0e6aa7b82acf498fec142efa72b1bdf1696138c727be159113 SHA512 e4be41a7a47da479e2128791fa0cafdd6a1a369c0520e68b34049ba951590635aad956df58f52c84f676b0909689aabea6c9e3d7fdcb82040e78f368d4eb76b4
 DIST ImageMagick-7.0.8-60.tar.xz 9464992 BLAKE2B 26a75c0df77459582b9025612c0f70b30bedf9fee7bdfe5b0083ca9f5a7184d19e849c8a18d3781ed39d1788a17d6b1de608424193c24ec5e11ab9b50bd64874 SHA512 4db1c24942b522cab1ff80c3eb3df7a81cfd2ec7f7f91dcd00b2d4867b2afe5026ffbeacbed83ddb9178448f1ded3dacb34002fc65892704e863794338ba6436
-EBUILD imagemagick-6.9.10.56.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
-EBUILD imagemagick-6.9.10.60.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
-EBUILD imagemagick-7.0.8.56.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
-EBUILD imagemagick-7.0.8.60.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
+DIST ImageMagick-7.0.8-64.tar.xz 9463488 BLAKE2B db44b8d0a03f15c26d6912ada5900932bf393eefa6fe8ead03c668552810b06078fca4f9cef9f78e78049b61222ecb6abf2072a5719a0326aca357ff2f49eae0 SHA512 6ddd12a6b5e7870364575f6646e38ca49dc14c2857d8a41217d24e3dccf87cf8730d2aef692dc7b62616e54eb76f320c550e9f409376e22bfcf89e472f8dd0e6
+EBUILD imagemagick-6.9.10.60.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8
+EBUILD imagemagick-6.9.10.64.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf
+EBUILD imagemagick-7.0.8.60.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f
+EBUILD imagemagick-7.0.8.64.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245
 EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba
-MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece
+MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild
deleted file mode 100644
index b6bca9ea8b20..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RESTRICT="perl? ( userpriv )"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local mesa_cards ati_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild
index b09291336ccb..b6bca9ea8b20 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.64.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.64.ebuild
new file mode 100644
index 000000000000..b09291336ccb
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.10.64.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local mesa_cards ati_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild
deleted file mode 100644
index 59c2b130c53d..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-else
-	MY_PV="$(ver_rs 3 '-')"
-	MY_P="ImageMagick-${MY_PV}"
-	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/${PV}"
-IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild
index 69c412db11b7..59c2b130c53d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild
new file mode 100644
index 000000000000..69c412db11b7
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 0ca390d487a7..0c9668ee1af7 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -16,4 +16,7 @@
     <flag name="q32">Set quantum depth value to 32</flag>
     <flag name="q8">Set quantum depth value to 8</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:imagemagick:imagemagick</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 65c8b25c4f86..f592067e1fd2 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -4,6 +4,8 @@ AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c
 AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
 DIST krita-4.2.5.tar.xz 170060232 BLAKE2B fba124653edad23826fd6d4d932cb1ea4c63450d460bebf2b2e2d9167e437331a31d76b19d57d9f15f603195c0eea367463ea6d9e610e74d0844bb80d21f0741 SHA512 5134c0a889cb039c5253759965acfba5cef0c431e8230236c1288e0253628feba52a493eaa42c93adb1716014c17818232294c1c90ade760ad89940833599d9e
+DIST krita-4.2.6.tar.xz 164332440 BLAKE2B d60c87743de77d300b2c2c9d1f1b3a31b238e8ef434981d3762713094eeebbe5e51547987c981b9f50d82f2363881ec74ef488b35d27cd5271d568987607557e SHA512 c6c6bb0b2d46b421c6edd38427f7a71636c78267413a4265a61123509ebac8f24d981ce5b5540f0813e26b89e655d44c2cc32395694161eb925f2789b0e8119e
 EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
 EBUILD krita-4.2.5.ebuild 3134 BLAKE2B 286e53a3758f23f90c0f972158d125779dc91d7d0ad2a552dacaf5447a14321dbaa81a59a6f5a2c263720641b9a146141f9571961db7ba7acc0a79c451f1f35d SHA512 e20075fb679c828347155280315f368faab8aafa5d25d35765ba2516fbcf868e1de54071c185cc7409806e3b39df08e969b0ff35743a8eb2887b3547bffeed26
+EBUILD krita-4.2.6.ebuild 3134 BLAKE2B 286e53a3758f23f90c0f972158d125779dc91d7d0ad2a552dacaf5447a14321dbaa81a59a6f5a2c263720641b9a146141f9571961db7ba7acc0a79c451f1f35d SHA512 e20075fb679c828347155280315f368faab8aafa5d25d35765ba2516fbcf868e1de54071c185cc7409806e3b39df08e969b0ff35743a8eb2887b3547bffeed26
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.6.ebuild b/media-gfx/krita/krita-4.2.6.ebuild
new file mode 100644
index 000000000000..0cb6e37c9883
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.6.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui '-gles2' '' '5=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	dev-libs/quazip
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4[calligra_features_krita]
+	!app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package color-management OCIO)
+		$(cmake-utils_use_find_package fftw FFTW3)
+		$(cmake-utils_use_find_package gif GIF)
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package heif HEIF)
+		$(cmake-utils_use_find_package jpeg JPEG)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake-utils_use_find_package vc Vc)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index bfda0d84101e..f80c6150534f 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -5,5 +5,5 @@ DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce
 EBUILD libimagequant-2.12.2.ebuild 1451 BLAKE2B c2864c295cca60262bd47c613d60fafa2f6f5cb3f3fdf6db13c334fd7470d8109fff3a75b2fa95ba267dd528e25ac5ffa0cb5c32ea241e179d76108b56a2e010 SHA512 132f76b9be03b93143f7117de9923f2f79d8e1b05843320bcfc57cffc5ee5f8b89890a4edc964f08d389c801f4f9be298548be297c4507e001f555602901a378
-EBUILD libimagequant-2.12.3.ebuild 1455 BLAKE2B cadabeda73ed89e9eba80becbb547a16b605d9dd7480ab4a4404212677ee2d0a6d946ed5099b0d6e63d95591656db1d36f44fa854af602bd64cd08f0ef3c7da4 SHA512 5223e918e3b19df4b3baaf7b2e745a239398199a09bbaa5d573595982d71ab4f793833d0d8891e4c95d441af62145fa9051e104e63adb490492919023ccd60e8
+EBUILD libimagequant-2.12.3.ebuild 1453 BLAKE2B b24ebd32b44478f6750844e253f97ba11f5a57c6eb1b8496dda379b7cfdcdb138aaf88f37c0a2cb52a33b3452c5712939649a361266d6fbf7a75a76ca910ac7c SHA512 24cf319daee94c6a1e3a5ac1e78f3d2432b1af71e8788f2989f780947771f2e86aea4c4e1cf98a7ec962760af1787a3e9b6aad48a4e301df47670e43affbd32b
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
index 0cb22153f6fd..f9eacf2fae59 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index 14d503b085a4..030b4de56c5e 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,3 +1,3 @@
 DIST lximage-qt-0.14.1.tar.xz 78960 BLAKE2B c58e5c553e2803cd8d40d807cd1650b72e4de6297f29cdffce19cf3eb402d01735d869ed4e31e9c28ce03e09038628331cc547aebcb636c34dc936b349e33c9a SHA512 61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd
-EBUILD lximage-qt-0.14.1-r1.ebuild 873 BLAKE2B 9c51a5bf90065b0b13b2f506f538244e0af20b0c1704daa7a56b395dcc0fe84220a9b646d016941822bbb72ec634f96b6d6a248a990ade99b33ffe4c2e75fbf2 SHA512 bbd759e21943a7ead75e3f7d7a2808140da1de1f7106bb68e757c6b62524e8334708ed0c75061612fe48660590bb4611c0ddd501a943979ced535a15857d0874
+EBUILD lximage-qt-0.14.1-r1.ebuild 880 BLAKE2B 3ca53743d4547793947308b288763b570dc83abc8a79af34202c22a277646fc3d6db65690087a7c3957f9dd913942da87710c16fc0dfc73ad076fb967dd2b62d SHA512 e64b5b4f4b70d460629a332904171d9999556e4b9d4fd35bbf843dd3de57fc723a41bbb750e78c6fed614c1d0dec50b02bbec8e488bbe94f5dd3d3ab82b7cf29
 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53
diff --git a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
index 3b7064657413..6a97c334b7a4 100644
--- a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 9cb8f384520c..754b62999fb2 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,8 +1,3 @@
-AUX mypaint-1.1.0-build-env-vars.patch 1812 BLAKE2B 4af7b90bdcd19dafd712631abe8282d9092caf55ea964511888c299188e28f952c3990feb6ce26f83dd327568ce315801dbdbcd3a3b0df3036f7027704a1be0d SHA512 336a9c838ac9e51f929f9727008feab8251ab9defd106d7161fe5d5b5150460573c66873b88f202d616e4668d3bf272b8dc8305e367ef7c450620b6a48330fe9
-AUX mypaint-1.1.0-desktop.patch 626 BLAKE2B efe635fc8c58d91935be0491c5847a69da1bd78b8a83e9e6ff110d1d69c17dbde91a36f9a2baa5fc97b8a0d81ee47759e040e319a5ca7f43fa6626228a61c425 SHA512 77f267ad6a12b6d18fa955b5b9f8ef3a3eb6fed832745eda4db539d75c49056bb7fd6474ee904e6ac7cab12ae286beb48617e4825b826ca77a439764873e8d75
-AUX mypaint-1.1.0-json-c-0.11.patch 403 BLAKE2B 1608cb7706d85cb84284cc58bb78921c063bf1e1d04d32eb11c7abdc61e3d03eabbe014f66f9c43f13ff8b0a583f900c85fe24fc17bdf4cf3c7ff0ebaccaf37b SHA512 554d0f0cc8c9cb4a48b1f9c57532247461e9705ad819c52f2e264ea238783fe60728af3e51e01667dc0c60883375727624811a48d1603436ad9970282a682605
-DIST mypaint-1.1.0.tar.bz2 37416388 BLAKE2B 4ced9087a51b855ad943d104801d06a03a6f78dfd39eba975cbdeddd304c12ffb0ccd48267fcf31f3608acc069b88bc3f07ed2ab750d77eb31bd64df2f6492a9 SHA512 a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
-EBUILD mypaint-1.1.0-r2.ebuild 1927 BLAKE2B e0d4354567a619e5d259fcb50820186fc8b6f4f6f7108c0676059da9a3065830b504b68a2f9e575032fb30e0b5b6e8e71de23d4e4f778cc28bb0d8e3220282ae SHA512 356a6bef73fb283b0e7953be068bdd8feec0d92a3e06a1fdf0fbe1d80fe6225a777cf95c6ae198afa40269bad9d25f8762c9ac318a8b2e4a3763912b40127477
 EBUILD mypaint-1.2.1-r3.ebuild 1838 BLAKE2B 142ff5c4619f973055f9db2fab1535ec6f7be72e64876a94b657f850f4dd23678c1f51ba43f60a128e660c6382f9f24c48f14015f356913a703f318c922cb73d SHA512 85dbdf683e5f415e89f1199f44220f708ba75f177aee0c1272b18b7871d32f74723e1846ac200f390deb274154ba3b5b625bb2cec5314f49e2c80e8dd84e1a74
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch b/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch
deleted file mode 100644
index 7d7ac3e36359..000000000000
--- a/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 516d184b5db8ebdd8b184ef871050c3ab3f03fdf Mon Sep 17 00:00:00 2001
-From: Andrew Chadwick <andrewc-git@piffle.org>
-Date: Sun, 21 Apr 2013 22:51:05 +0100
-Subject: [PATCH] SConstruct: support standard build environ vars
-
-Support the standard build environment vars CC, CXX, CFLAGS, CXXFLAGS,
-CPPFLAGS, and LDFLAGS everywhere.
-
-Partially addresses https://gna.org/bugs/?20754
----
- SConstruct |   19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/SConstruct b/SConstruct
-index 0b55da1..ef39b9e 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1,6 +1,7 @@
- import os, sys
- from os.path import join, basename
- from SCons.Script.SConscript import SConsEnvironment
-+import SCons.Util
- 
- EnsureSConsVersion(1, 0)
- 
-@@ -45,6 +46,24 @@ print('using %r (use scons python_config=xxx to change)' % env['python_config'])
- if sys.platform == "win32":
-     # remove this mingw if trying VisualStudio
-     env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts)
-+
-+# Respect some standard build environment stuff
-+if os.environ.has_key('CC'):
-+   env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+   env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+   env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+   env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('CPPFLAGS'):
-+   env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
-+   env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+   env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+if "$CCFLAGS" in env['CXXCOM']:
-+   env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","")
-+
- opts.Update(env)
- 
- env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
--- 
-1.7.10.4
-
diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch b/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch
deleted file mode 100644
index b992131bf29e..000000000000
--- a/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Andrew Chadwick <andrewc-git@piffle.org>
-Date: Tue, 8 Jan 2013 13:53:01 +0000
-Subject: desktop: remove deprecated Encoding key
-
-The Encoding key is deprecated as of 1.0 of the Desktop Entry Specification
-(8 Jan 2012)
-
-http://standards.freedesktop.org/desktop-entry-spec/1.0/apc.html
----
- desktop/mypaint.desktop |    1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/desktop/mypaint.desktop b/desktop/mypaint.desktop
-index 9850b54..24383db 100644
---- a/desktop/mypaint.desktop
-+++ b/desktop/mypaint.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=MyPaint
- TryExec=mypaint
- Exec=mypaint %f
--- 
diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch b/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch
deleted file mode 100644
index f2aa9b9a0edf..000000000000
--- a/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=467322
-Patch-by: Helmut Jarausch <jarausch@igpm.rwth-aachen.de>
-Fixes pkgconfig name for new json-c (since 0.11)
-
---- brushlib/SConscript.ORIG	2012-12-31 18:03:38.000000000 +0100
-+++ brushlib/SConscript	2013-04-26 11:47:27.008232199 +0200
-@@ -73,7 +73,7 @@
- 
- env.Append(CPPPATH='./')
- 
--pkg_deps = ['json']
-+pkg_deps = ['json-c']
- libs = ['m']
- linkflags = []
- 
diff --git a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
deleted file mode 100644
index 8c81ae609842..000000000000
--- a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit fdo-mime gnome2-utils multilib scons-utils toolchain-funcs python-single-r1
-
-DESCRIPTION="fast and easy graphics application for digital painters"
-HOMEPAGE="http://mypaint.intilinux.com/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
-
-RDEPEND="
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	>=dev-libs/json-c-0.11:=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# multilib support
-	sed -i -e "s:lib\/${PN}:$(get_libdir)\/${PN}:" \
-		SConstruct SConscript || die
-	# respect CXXFLAGS,CXX,LDFLAGS
-	epatch "${FILESDIR}"/${P}-build-env-vars.patch
-	# fix mypaint.desktop
-	epatch "${FILESDIR}"/${P}-desktop.patch
-	# pkgconfig patch for json-c-0.11. 467322
-	epatch "${FILESDIR}"/${P}-json-c-0.11.patch
-}
-
-src_compile() {
-	#workaround scons bug with locales. Bug #352700
-	export LANG="en_US.UTF-8"
-	tc-export CC CXX
-	escons
-}
-
-src_install () {
-	escons prefix="${D}/usr" install
-	newicon pixmaps/${PN}_logo.png ${PN}.png
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			rm -rf "${ED}"/usr/share/locale/${x} || die
-		fi
-	done
-
-	python_optimize "${D}"usr/share/${PN}
-	# not used and broken
-	rm -rf "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 075ce3b00505..6432ed005a6e 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -6,4 +6,4 @@ DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f5
 DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
 EBUILD openvdb-4.0.2-r2.ebuild 2050 BLAKE2B 019c4b6ba119dff7aff5cc3b41846f03e65f6680274199c89be04cc573e85af95a28e5d81b6f6d4a62fc1ecdcc733aba9911f4f97abb40128215147ca006a640 SHA512 c806cbdfd23bc085c032212672686e3ff19a1d414e9003570090373d82382a309f3f8d5673de2a791bd6a54a1f491e318e97cef982b03d15a51d21b5392af396
 EBUILD openvdb-5.2.0.ebuild 1785 BLAKE2B b16a9beabf0e755da3daf1213703eb1103bc4a93681c5686842cfd814c1ac13753a8380d4a432772977f328fc5f4ba0e7eb5422142e9c11771952b7ef2b3de0c SHA512 e9ac1a52a478e9bd4108ef78eb124934a22310b9ec96239bf6e796abb873f1a36c527416b68d99e5fea077def2edbb4949198ef0e733532dc9a8daecf86e09a0
-MISC metadata.xml 1028 BLAKE2B a6d852019e2bf507aa175846fc1687f101df9fc498b7dd2c7de25d860f419e86eb37549e3a2b742c32d0a2f5c6fc0450b3c82da18ef96c65fc81e547f3e7e944 SHA512 2f9d7a4271998fd9fef7a0c4fbd9d77187ba0fe41d31a807e88b19554cc5b624686e3dca44a47e8e69edc71fa89a06fcd89de59f09bccf3378418500b268d287
+MISC metadata.xml 1033 BLAKE2B 303f49be8253322a0bbb94875f7b9b03e127e9d2ab2eea64fbac1cd51f50d5be749c4c45c9491fbf3f56de7420fdb47913b6ef3c2d12f5ea0545042f68d990d4 SHA512 a81a1cd4684197d1d9455b1398c9ba1592d596d52c8e8fc5c0cc8de0357c1f1df7478fd76e4e42cda09524b0bbf41985e13cf530adb7ca7f1605f086207301a8
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index b059b111063c..747061595948 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -1,14 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dracwyrm@gentoo.org</email>
-		<name>Jonathan Scruggs</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Libraries from Dreamworks Animation for the efficient manipulation 
 		of volumetric data used in big budget movies like 'Cloudy with a
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index 58323dc75b23..c73a7f1c4a63 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,4 +1,4 @@
-DIST qimgv-0.7.3.tar.gz 266307 BLAKE2B b13794f4bd7ff8b2c9309f95453baa65f91c60d155e22a86eac1eb79b3dc7f9da003dbfdbfc2d14cbb6242c769516283785ed72e2f50d5bb51b394db05c167b8 SHA512 fae7986ce29941232dd2863a0900651fb3a7d6d184b05e763670b16c74bb0cc27ce6eb936b2a41a2183e3dc5c33006e3fe3491ed043c6e357ea31d6a716d80e0
-EBUILD qimgv-0.7.3.ebuild 1087 BLAKE2B 470d072b17c63ab07b40bdda43a1416fe0f62f24ca553e0357c4cc088c07cd7478956306a3939c2a1cc685100d9d6698e5984626a6e04787d5a7df722597954c SHA512 0cb3f80c0b83a830f1aff592bc59bb870b019efd5fdd3e6206deef2f4921de32d1603d81e09c339265f7be8479afe1bce9b6ef8b000aa21775737ec65bd8585f
+DIST qimgv-0.8.2.tar.gz 237098 BLAKE2B da71da019e87041cfa9f21592827e5a5623b2088e1349e534c437b0d5e50377980279fe99b7a18fb447c99ddb643a15c418fcfa2f261d3a559c639f560add0c4 SHA512 e80caa356cd2c7607a1d92a4ef4a79486ed504adb8ae454557e6a94d1d3ca5c023b78921e49777b1a06ca82556255d51357948281aae6a671ec01c597492a2cf
+EBUILD qimgv-0.8.2.ebuild 1112 BLAKE2B e05f594b38b95380bbeed1494820efcdd67dd02d9d8ba33d445075a6dc3067364e6b54c73de2b21e511a312cad28225c72e773f3664209fe522a19df5a5144e6 SHA512 205f9d0cd702077c0c37b481eb783a22836af40bc2ae46196ab5d567108b69983391ca9b7824c484ca81920dceff0428189bbb8d4cfbb1988e47e46c7ac7734b
 EBUILD qimgv-9999.ebuild 696 BLAKE2B 4341560b05ddf294b877cd659b3647e5409e55bb39b34161106bec650c451ae46a2398a0a0d78580b1db0f27582b409162e1c199023891df764d77c123809586 SHA512 cb1d5e0eaff96f45f4cb63d50f75033a035ea0687fc801f921b0ca0c63a6812331c3efa17fd957fd07564f8d2a340530bfd4114851dab827b94830dfd09f6670
-MISC metadata.xml 454 BLAKE2B bb9012bfbeff8b79f1f3a4de8b7e24bbb664d0137a92c8bde3189612e99ce7f94f4d135b5fcda3a935b8d3b8181e9ca882b073cbe26a6f7ace7d52ac0a57804f SHA512 3f2ec50c29ac720c91d61a5ede051eb62a58771974e8c9591ee9b3a98a8a8d0af2071b29c8e7abb842999559ab330f63b39d7de87c8a1d6fd560002e9bf7d107
+MISC metadata.xml 365 BLAKE2B 84ac26390de8ab8b943b77f3922629d2b687fc15dd8a983480375c854fea4001b0772e52263a0883a5e0d8b32db7eaf3432c763cf54d0bfb0358b3ffc0fd0e69 SHA512 974bc950ab7ff01bc784247efbf1c5090974d5af3afc668554050bd0f0ae76254245c008175db0161896bf176049c574e421c1173774cb4e89e4ff9bd00db358
diff --git a/media-gfx/qimgv/metadata.xml b/media-gfx/qimgv/metadata.xml
index 21ece4b81016..ccef191fae16 100644
--- a/media-gfx/qimgv/metadata.xml
+++ b/media-gfx/qimgv/metadata.xml
@@ -9,8 +9,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-
-	<use>
-		<flag name="video">Add support for gif/webm playback via libmpv</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-gfx/qimgv/qimgv-0.7.3.ebuild b/media-gfx/qimgv/qimgv-0.7.3.ebuild
deleted file mode 100644
index 002bdbd7f4fd..000000000000
--- a/media-gfx/qimgv/qimgv-0.7.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="A cross-platform image viewer with webm support. Written in qt5"
-HOMEPAGE="https://github.com/easymodo/qimgv"
-SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kde video"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	kde? ( kde-frameworks/kwindowsystem:5 )
-	video? ( media-video/mpv[libmpv] )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# respect make.conf CXXFLAGS
-	sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3")/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDE_SUPPORT=$(usex kde)
-		-DVIDEO_SUPPORT=$(usex video)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/qimgv/qimgv-0.8.2.ebuild b/media-gfx/qimgv/qimgv-0.8.2.ebuild
new file mode 100644
index 000000000000..52a5b418e7b7
--- /dev/null
+++ b/media-gfx/qimgv/qimgv-0.8.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="A cross-platform image viewer with webm support, written in qt5"
+HOMEPAGE="https://github.com/easymodo/qimgv"
+SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif kde"
+
+BDEPEND="
+	dev-util/cmake
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-video/mpv[libmpv]
+	exif? ( media-libs/libexif )
+	kde? ( kde-frameworks/kwindowsystem:5 )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# respect make.conf CXXFLAGS
+	sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -lstdc++fs -O3")/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DEXIV2=$(usex exif)
+		-DKDE_SUPPORT=$(usex kde)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index f653d227c5aa..edc632c106aa 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -11,4 +11,4 @@ AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
 EBUILD sane-backends-1.0.27-r3.ebuild 8133 BLAKE2B f7854db7ed404b086ed600e0435c9bc53227b5b34d237f3b883363bd938cce12893f90432e76446249ff3ba00fad67eed9dd2282b01142439e0c6c6ba8d0483b SHA512 70890882acefc387de8988f51a2d09fc1b90794032016bea46ab0f6c624e7161dfa4fa6904bcbb22748a8c7a368058fd319d9058d37b1c1290672a177b86091d
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/metadata.xml b/media-gfx/sane-backends/metadata.xml
index 6f49eba8f496..92df0ba49ba5 100644
--- a/media-gfx/sane-backends/metadata.xml
+++ b/media-gfx/sane-backends/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<upstream>
+<remote-id type="cpe">cpe:/a:sane-backends_project:sane-backends</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index ddcdc95470dc..b94ac21e043c 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -2,6 +2,6 @@ AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f7
 DIST sxiv-24.tar.gz 47148 BLAKE2B 69d70d64ea6cf6ae7a044d06df78a2e1e53941ef281d6445f54a28c4368112674461bc4e71a0226946588e604de33dd0972960cb072a00efd64512e5273cef09 SHA512 e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b
 DIST sxiv-25.tar.gz 48814 BLAKE2B 17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8 SHA512 ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814
 EBUILD sxiv-24.ebuild 1219 BLAKE2B da05f3f295ee8c8afb247ff3e31609ddf0b8c0fe8fb0db47f7e108b4253aa6565ff9dae5fe8b1c6875d5177705a2260fcf2be2a20e0d56374d31761537f30f65 SHA512 62ba4b36f941fc709a8e83a0be2bd581493041f1f93c21acd43753f8d7d368c9a6d6b8d9d3560dd78c9ebe0c4a15fc09cc48cb8a60fe77c4691b1663d0f8a370
-EBUILD sxiv-25.ebuild 1287 BLAKE2B f9e1ec5504f664946ce7fcd867e16bfc31a44b49cca0a9eaee690dd82846afd4115db0c5e4e42ab92ec7a39109a9332ea33a4761db648bb76af5e73889603dfe SHA512 e0d44bae62dc321155d51576563ac284a9520a772b1e578dfe65c29f8607bc59cf0cab6f9283fd23e8ade17ed0ce3b5cb61d5709f7e338de6473fee2b5c5c044
+EBUILD sxiv-25.ebuild 1286 BLAKE2B ea500e8d7ced602d4616efed270173499204332fe6bb665d6c52e33833a1745423aa15ce417fb3502c5471b3746bf73c438533d9010b193b728154c0fe6a3c5f SHA512 9bade847c07cf76abd4131e6ced11c3dba85d8522b4b441b1556f9f20eef69907221dfcec4b7492c782de17f93a6a39453ae66a24223367145002509e979e35f
 EBUILD sxiv-9999.ebuild 1241 BLAKE2B 4881e1503bf20cb06434fbb1cf4c540ecd2d724fb845c00eae2e349b96fc4440ed54359113f72a710a39564b7d4d2f015465b8754e1e6a6fb94abc1d6702e53f SHA512 1f8b2885556990c7de6b572cfc0f54d94d2fc804a73da9953d7f36511d73256c8318855ac32f578acb8bbb286eb0b70c411581a5cdaac2424239c866bab9d441
 MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
diff --git a/media-gfx/sxiv/sxiv-25.ebuild b/media-gfx/sxiv/sxiv-25.ebuild
index 5ce1e79a92e4..577cc55b305c 100644
--- a/media-gfx/sxiv/sxiv-25.ebuild
+++ b/media-gfx/sxiv/sxiv-25.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 4c8e302e8308..428d18b6b9cb 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,13 +1,3 @@
-AUX xpaint-2.9.10.2-QA2.patch 2235 BLAKE2B ff69a7b5b192d00a7bc308760f2d677e336b81023f458bd890574562c04946d9c1e8693e1edb09bef7c3799ba28c42a77c853f17d5d3730f6449259c5f17006e SHA512 5b8a34d8181f2b3b3b8459d4579b44e8a22807b25458401d3fe9243922ea1c7d565c25e938ff9506202ddd755e70ac103e70f9f258356ad0b240d8cbf2c53271
-AUX xpaint-2.9.10.2-tiff.patch 860 BLAKE2B 147daa24f9ec9ac321f488272873855eb025a0f8857463a7462f7627897b5b5bd9dcc6706a8b9efc9f0eaba1f0aafc91b62bbc21241a8dd2e2610d4c17ca1fe9 SHA512 38a34e3f317a3ac9a0ea5b8a62f3c93566c70889315ffa652c1dbec796e1448efabdcd58c8a7e67e70a4fa185871dfd6ca163bf38f50e9592ac792a4ca827dac
-AUX xpaint-2.9.10.3-Fix-build-with-clang.patch 669 BLAKE2B 72e06035a5cbc8f1f20f1ea22ee61047395f7f503ea77a7737ddc8b57b640be95f04ff199f2c69958fbdac9cdd1448e57ec292a3d2471404578e39db74fbd2b0 SHA512 7a8138a82eb3d4824d138a21d03759986ad03d05d65d0ef24fb911b642e1906bc5b6aba7417836fa4756cb63ae09427b7ec2a05be1588fd86a1668b52418f9e7
-AUX xpaint-2.9.9.4-QA1.patch 3336 BLAKE2B ef04f399152e9a66e774cff98c6b2c8d6f75761ef03736f33363be8af84421e2fec702aa13353124cf552eccbb3b49645cf2d3515955b39a7407fc90b2d29704 SHA512 2760bd60bc1e6335c48ce4576e9176c5893e70568f99d535b48878e6917591258ff5d206851c312b3af6b1bcda93076a60bcb3452176a49f588d4ffa1ed69a79
-AUX xpaint-2.9.9.4-parallel-make.patch 655 BLAKE2B 37c8ecee14090cb6a7a5543c9d53d52baf31446a5ef731ddf6b397660f6f6f6a598ee72c3309a0df82149e60fe123ad31936858eb48e5d1a141c3de54ddbbfcc SHA512 45161a7a76f05ebff009b8dda5c52baddcd936ee8c5984a3e0fa02d80a56947ba55df68c1241115dcce5a1f75d8993794b761ba0dbadb94b86b9c2ebfbe7c3d7
-AUX xpaint-2.9.9.4-submake.patch 747 BLAKE2B bbdce5e4ccbd6eb6b3957b9969261957d5e42ec12e273000abea0d34eef253325e1092b20df5d86ed2b30083acc5627ac2830d557b42d85f52394f3a99ef16f5 SHA512 72525c5cd892772210cba85b0f5ff193a6474657d6ffbead23c711de3346c87f8d306e252fdd8b98ae136f32311d88be6107bbe72932039bf17e4c0c64b70bae
 DIST xpaint-2.10.2.tar.bz2 1891925 BLAKE2B 056ef057357a2441c8a286adf326a98650e5e0905ee07c5ef24b0689dbb57247711c44b63211494e4ca9e44429d6237c017f53e2690f99790fa6100e4ce4d118 SHA512 a25aa940931c686e86cbc2bd8d6fd3c80d2c793a20d7a2dd90fb5cba1cd360b5e1c8433bf0d639e2b86cb2a74040be373f732c4617909aaf8c5ada2624ab5614
-DIST xpaint-2.9.10.2.tar.bz2 1245813 BLAKE2B 9ff1a94bdbaf996f7ca41fd8df86ccfc58d7f51b24b20311f082beb30620dc48a6e9ae0e28ccf2cf41a7cd7901cf303fda1d45a7b48ff4ec356a3ac1f2ccd642 SHA512 8aa388d4b82b5867817eca2188f50734140c395efe663c290a78b4f24314754fb29257165a64c9b8a03634dede03d919d9a3a54c1d32049cc34216a1f3d4e499
-DIST xpaint-2.9.10.3.tar.bz2 1283725 BLAKE2B 46e1798830ddff6cc7d6d827fad0cad6d42a61dd6e6740ae6d3bca70ae7012a7c63d1d3ea5b6ebb21e0b2889c96c3f0e57969ec02bb8e742f945027e0e22e3b8 SHA512 d5d365e0308e50166e5ac70859e388436d8f0cb870b2dea0155fbc9a65a8377a861bea2217df2b5c016f8751c9ff1f74509eaff310acfaacd7b29c51cf726ac5
 EBUILD xpaint-2.10.2.ebuild 1510 BLAKE2B 84c90679da7f4d8f48a57ad494d6a9914f4fa47a97e3d18bfa4f71c13619c94018e49879371fe18f852c15faf1a75ae4c9228e93d97d7b3c3eac62748c443aaa SHA512 8f009d6bdea418b73a4295e8f66e8b255f6b1b221346ddfe86beb44675fc66954ca2b6fb232f5248e2eb20aa19e7c5bd80b2be25c8ca0c9f5e6f849d34adbeea
-EBUILD xpaint-2.9.10.2-r1.ebuild 1634 BLAKE2B fd9d07d153e335a36ad0357348938782f6a887f4b3346ad3191c000cd0237c4f6e1dd3993515686b28da958218f5631c6558ec8b8d7deec8241830aad276823a SHA512 fa3117c3dda557ce2c19717652088d3ad0d7c7546d660ad3e5dbdd788056ffd462905c69f74b3b114658c3f3d7defeeb26307d00425009884a790381f0a259ac
-EBUILD xpaint-2.9.10.3-r1.ebuild 1696 BLAKE2B 140a5a043d216e0350294123b5a9f98da8b36b7648fa4b13c82726392e0fb976015d87fcfe1d2457b28db01ba89b010335d12d5da4c034940c26e3ba9987daa5 SHA512 1fac714e82d6df4f2f0dbe19f5a2fd9751d284496ed3b66487986155d20e4d01de8f0671000214ce87ff7eea09a96f0a3916aa2363c3532837b19f509fe50992
 MISC metadata.xml 1204 BLAKE2B 3cd1cf2062126075b6b4be1b987ab9098ae31b611abe6e81c15e684e62ed0a1133177c4718e5bc51d5be2a0b5b2b58fb4d4a2d67ea77f21ca6d9009f2a4d4150 SHA512 e2b37b1d3381dd97ecdd40f20535426539d7caff8032ffcb5e6b74d65968adb7319523a55e45d31a697a75b9aa384e0a5155059237730ea080cf46532da12c22
diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch b/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch
deleted file mode 100644
index 9179585974c2..000000000000
--- a/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 08bdf5f5d0c64384b2be16bd8ac68244675388d5 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Sun, 6 Oct 2013 21:13:51 +0200
-Subject: [PATCH] respect CFLAGS
-
----
- Makefile.am     | 2 +-
- configure.ac    | 2 +-
- rw/Makefile.am  | 2 +-
- rw/configure.ac | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 4cf1753..414597f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -26,7 +26,7 @@ EXTERN_VIEWER = display
- ##  -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
- ##  -DFUNCPROTO=15 -DNARROWPROTO
- 
--ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC
-+ARCH_DEFINES = -fno-strict-aliasing -fPIC
- 
- ## 
- ## Specific xpaint options
-diff --git a/configure.ac b/configure.ac
-index e058529..3979075 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T
- AC_TYPE_UINT32_T
- AC_TYPE_UINT64_T
- 
--CFLAGS="-I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
-+CFLAGS="$CFLAGS -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
- LIBS="$LIBS -lm"
- echo "VERSION = $VERSION" > .version
- 
-diff --git a/rw/Makefile.am b/rw/Makefile.am
-index d91d5d5..2f50253 100644
---- a/rw/Makefile.am
-+++ b/rw/Makefile.am
-@@ -10,7 +10,7 @@ SHAREDIR = $(prefix)/share/xpaint
- ##  -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
- ##  -DFUNCPROTO=15 -DNARROWPROTO
- 
--ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC
-+ARCH_DEFINES = -fno-strict-aliasing -fPIC
- 
- ## 
- ## Specific xpaint options
-diff --git a/rw/configure.ac b/rw/configure.ac
-index fb4f3d4..d9c7601 100644
---- a/rw/configure.ac
-+++ b/rw/configure.ac
-@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T
- AC_TYPE_UINT32_T
- AC_TYPE_UINT64_T
- 
--CFLAGS="-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFUNCPROTO=15 -DNARROWPROTO -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
-+CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFUNCPROTO=15 -DNARROWPROTO -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
- LIBS="$LIBS -lm"
- 
- dnl check X11
--- 
-1.8.3.2
-
diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch b/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch
deleted file mode 100644
index 20e59872b84d..000000000000
--- a/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Jun 20 13:52:42 UTC 2014
-Subject: fix tiff build switch
-
---- xpaint-2.9.10.2/configure.ac
-+++ xpaint-2.9.10.2/configure.ac
-@@ -125,9 +125,11 @@
- with_libtiff="yes"
- tiff_header_found="no"
- #
--AC_ARG_ENABLE(tiff,
-+AC_ARG_ENABLE([tiff],
- [  --enable-tiff[=[yes|no]]         Build with TIFF support [ [default=yes] ]],
--test "$enable_tiff" = "no"  && with_libtiff="no")
-+	[with_libtiff=$enableval],
-+	[with_libtiff=yes]
-+)
- #
- if test "x$with_libtiff" = xyes ; then
- #TIFF compiled with JPEG and JBIG support?
---- xpaint-2.9.10.2/rw/readWriteTIFF.c
-+++ xpaint-2.9.10.2/rw/readWriteTIFF.c
-@@ -14,6 +14,8 @@
- 
- /* $Id$ */
- 
-+#ifdef HAVE_TIFF
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include "tiffio.h"
-@@ -527,3 +529,5 @@ int WriteTIFF(char *file, Image * image)
- 
-     return 0;
- }
-+
-+#endif /* HAVE_TIFF */
diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch b/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch
deleted file mode 100644
index a5a26214409e..000000000000
--- a/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 69a76e5f4a72d83635cd413b7460df4776b2605f Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Sun, 16 Aug 2015 16:51:26 +0200
-Subject: [PATCH] Fix build with clang
-
----
- rw/readWriteTGA.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rw/readWriteTGA.c b/rw/readWriteTGA.c
-index 306a751..9046ee3 100644
---- a/rw/readWriteTGA.c
-+++ b/rw/readWriteTGA.c
-@@ -607,7 +607,7 @@ int WriteTGA(char *file_name, Image * image)
- 	int tga_defdir = 1;
-         int transparency = -1;
- 
--        if (!image) return;
-+        if (!image) return -1;
-         w = image->width;
-         h = image->height;
-         bpp = image->scale;
--- 
-2.5.0
-
diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch
deleted file mode 100644
index 31e3a38ba005..000000000000
--- a/media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 2987bfa203a8467a697efffa211b90b12858b40b Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Sun, 6 Oct 2013 20:37:28 +0200
-Subject: [PATCH] respect flags, add WITH_PGF option, fix echo
-
----
- util/Makefile | 56 +++++++++++++++++++++++++++++++++++---------------------
- 1 file changed, 35 insertions(+), 21 deletions(-)
-
-diff --git a/util/Makefile b/util/Makefile
-index e6af415..21a0d17 100644
---- a/util/Makefile
-+++ b/util/Makefile
-@@ -1,39 +1,53 @@
--GCC = gcc
--CPP = g++ -fpermissive
-+# set to anything but "no" to enable
-+WITH_PGF=no
- 
-+ifneq ($(WITH_PGF),no)
- all: pdfconcat ppmtops pgf2pnm
-+else
-+all: pdfconcat ppmtops
-+endif
- 
- pdfconcat:
--	$(GCC) -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
-+	$(CC) $(CFLAGS) -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat $(LDFLAGS)
- 
- ppmtops:
--	$(GCC) ppmtops.c -o ppmtops
-+	$(CC) $(CFLAGS) ppmtops.c -o ppmtops $(LDFLAGS)
- 
-+ifneq ($(WITH_PGF),no)
- pgf2pnm: main.cpp pnm.cpp
- 	@if [ -x /usr/include/libpgf ] ; then \
--	$(CPP) -c main.cpp -o main.o -I/usr/include/libpgf ; \
--	$(CPP) -c pnm.cpp -o pnm.o -I/usr/include/libpgf ; \
--	$(CPP) -o pgf2pnm main.o pnm.o -lpgf ; \
-+	$(CXX) $(CXXFLAGS) -fpermissive -c main.cpp -o main.o -I/usr/include/libpgf ; \
-+	$(CXX) $(CXXFLAGS) -fpermissive -c pnm.cpp -o pnm.o -I/usr/include/libpgf ; \
-+	$(CXX) $(CXXFLAGS) -fpermissive -o pgf2pnm main.o pnm.o $(LDFLAGS) -lpgf ; \
- 	else \
--	@echo "libpgf not installed !!" ; \
-+	echo "libpgf not installed !!" ; \
- 	fi
-+endif
- 
--install:
-+install-common:
- 	@if [ -x pdfconcat ] ; then \
--	mkdir -p $(DESTDIR)/usr/bin ; \
--	install -c pdfconcat $(DESTDIR)/usr/bin ; \
--	echo "install -c pdfconcat $(DESTDIR)/usr/bin" ; \
--	mkdir -p $(DESTDIR)/usr/share/man/man1 ; \
--	install -c -m 644 pdfconcat.1 $(DESTDIR)/usr/share/man/man1 ; \
--	echo "install -c pdfconcat.1 $(DESTDIR)/usr/share/man/man1" ; fi
-+	mkdir -p "$(DESTDIR)"/usr/bin ; \
-+	install -c pdfconcat "$(DESTDIR)"/usr/bin ; \
-+	echo "install -c pdfconcat "$(DESTDIR)"/usr/bin" ; \
-+	mkdir -p "$(DESTDIR)"/usr/share/man/man1 ; \
-+	install -c -m 644 pdfconcat.1 "$(DESTDIR)"/usr/share/man/man1 ; \
-+	echo "install -c pdfconcat.1 "$(DESTDIR)"/usr/share/man/man1" ; fi
- 	@if [ -x ppmtops ] ; then \
--	mkdir -p $(DESTDIR)/usr/bin ; \
--	install -c ppmtops $(DESTDIR)/usr/bin ; \
--	echo "install -c ppmtops $(DESTDIR)/usr/bin" ; fi
-+	mkdir -p "$(DESTDIR)"/usr/bin ; \
-+	install -c ppmtops "$(DESTDIR)"/usr/bin ; \
-+	echo "install -c ppmtops "$(DESTDIR)"/usr/bin" ; fi
-+
-+install-pgf:
- 	@if [ -x pgf2pnm ] ; then \
--	mkdir -p $(DESTDIR)/usr/bin ; \
--	install -c pgf2pnm $(DESTDIR)/usr/bin ; \
--	echo "install -c pgf2pnm $(DESTDIR)/usr/bin" ; fi
-+	mkdir -p "$(DESTDIR)"/usr/bin ; \
-+	install -c pgf2pnm "$(DESTDIR)"/usr/bin ; \
-+	echo "install -c pgf2pnm "$(DESTDIR)"/usr/bin" ; fi
-+
-+ifneq ($(WITH_PGF),no)
-+install: install-common install-pgf
-+else
-+install: install-common
-+endif
- 
- clean:
- 	rm -f core *~ *.o pdfconcat ppmtops pgf2pnm
--- 
-1.8.3.2
-
diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch
deleted file mode 100644
index 250f634f9973..000000000000
--- a/media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ae11f5cb975749bd8d6ffda48301eb4aadfee35d Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Sun, 6 Oct 2013 21:02:12 +0200
-Subject: [PATCH] fix parallel make
-
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index b2285a0..4cf1753 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -112,7 +112,7 @@ XPaint.ad: app-defaults
- XPaint.ad.h: substads XPaint.ad
- 	./substads -ad2c XPaint.ad $@
- 
--xpaint.1: xpaint.1.in version.h
-+xpaint.1: substads xpaint.1.in version.h
- 	./substads -single xpaint.1.in xpaint.1 XPAINT_VERSION $(PACKAGE_VERSION)
- 
- install-exec-hook:
--- 
-1.8.3.2
-
diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch
deleted file mode 100644
index e218eb4c75e9..000000000000
--- a/media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 11b369b69c4637431b139960391bded531a9f652 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Sun, 6 Oct 2013 20:25:14 +0200
-Subject: [PATCH] don't run submake
-
----
- Makefile.am | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 5b2caec..b2285a0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -139,11 +139,6 @@ install-exec-hook:
- 	mkdir -p $(DESTDIR)$(SHAREDIR)/messages
- 	cd share/messages ; $(RM) -f *~ ; cp -f Messages* $(DESTDIR)$(SHAREDIR)/messages
- 	chmod -R a+r $(DESTDIR)$(SHAREDIR)/
--	cd util ; make ; make install DESTDIR=$(DESTDIR)$
- 
- clean-local:
- 	rm -f xaw_incdir
--	cd util ; make clean
--
--distclean-local:
--	cd util ; make distclean
-\ No newline at end of file
--- 
-1.8.3.2
-
diff --git a/media-gfx/xpaint/xpaint-2.9.10.2-r1.ebuild b/media-gfx/xpaint/xpaint-2.9.10.2-r1.ebuild
deleted file mode 100644
index 4ca535290046..000000000000
--- a/media-gfx/xpaint/xpaint-2.9.10.2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Image editor with tiff, jpeg and png support"
-HOMEPAGE="http://sf-xpaint.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="jpeg2k pgf tiff"
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng:0
-	x11-libs/libICE
-	x11-libs/libX11
-	>=x11-libs/libXaw3dXft-1.6.2c
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	sys-libs/zlib
-	virtual/jpeg:0
-	jpeg2k? ( media-libs/openjpeg:0 )
-	pgf? ( media-libs/libpgf )
-	tiff? (
-		media-libs/jbigkit:0
-		media-libs/tiff:0
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \
-		"${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable tiff) \
-		$(use_enable jpeg2k libopenjpeg)
-}
-
-src_compile() {
-	# clean up
-	emake clean
-	emake -C util clean
-
-	# parallel make still fails sometimes
-	emake substads
-	emake xpaint.1
-
-	default
-	emake \
-		WITH_PGF="$(usex pgf "yes" "no")" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		-C util
-}
-
-src_install() {
-	default
-	emake \
-		WITH_PGF="$(usex pgf "yes" "no")" \
-		DESTDIR="${ED}" \
-		-C util install
-}
-
-pkg_postinst() {
-	elog "optional dependencies:"
-	elog "  app-text/gv (external viewer for PostScript output)"
-	elog "  media-gfx/imagemagick (external viewer for pixel graphics)"
-	elog "  net-print/cups (printing)"
-}
diff --git a/media-gfx/xpaint/xpaint-2.9.10.3-r1.ebuild b/media-gfx/xpaint/xpaint-2.9.10.3-r1.ebuild
deleted file mode 100644
index 00b7b44564af..000000000000
--- a/media-gfx/xpaint/xpaint-2.9.10.3-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Image editor with tiff, jpeg and png support"
-HOMEPAGE="http://sf-xpaint.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jpeg2k pgf tiff"
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng:0
-	x11-libs/libICE
-	x11-libs/libX11
-	>=x11-libs/libXaw3dXft-1.6.2c
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	sys-libs/zlib
-	virtual/jpeg:0
-	jpeg2k? ( media-libs/openjpeg:0 )
-	pgf? ( media-libs/libpgf )
-	tiff? (
-		media-libs/jbigkit:0
-		media-libs/tiff:0
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \
-		"${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch \
-		"${FILESDIR}"/${PN}-2.9.10.3-Fix-build-with-clang.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable tiff) \
-		$(use_enable jpeg2k libopenjpeg)
-}
-
-src_compile() {
-	# clean up
-	emake clean
-	emake -C util clean
-
-	# parallel make still fails sometimes
-	emake substads
-	emake xpaint.1
-
-	default
-	emake \
-		WITH_PGF="$(usex pgf "yes" "no")" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		-C util
-}
-
-src_install() {
-	default
-	emake \
-		WITH_PGF="$(usex pgf "yes" "no")" \
-		DESTDIR="${ED}" \
-		-C util install
-}
-
-pkg_postinst() {
-	elog "optional dependencies:"
-	elog "  app-text/gv (external viewer for PostScript output)"
-	elog "  media-gfx/imagemagick (external viewer for pixel graphics)"
-	elog "  net-print/cups (printing)"
-}
diff --git a/media-libs/Field3D/Manifest b/media-libs/Field3D/Manifest
index 7679259dcb54..96c0b4b59e6c 100644
--- a/media-libs/Field3D/Manifest
+++ b/media-libs/Field3D/Manifest
@@ -1,4 +1,4 @@
 AUX Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch 5371 BLAKE2B c8a1360db04de4cfa18b739af024934469b9cf2a2314d3fb248ad2df371be902369989f120dc7c1adb86ea77cf01a7a5e0944b9a4a57e9a9e329a06c5d24c97d SHA512 167da6b57983e317266ccbb9670cc5ec03f041343e44af3cbedc14366e349edd1d5f2a0ac163fa919827b2dfdd9811525b81c446a0e32016b3bd51f84f202bcb
 DIST Field3D-1.7.2.tar.gz 502481 BLAKE2B 8d5fbac915b52b36e66250f8fcd2beb5fff9d2446696ad1829e3edf05c9810b5d54928c6ab4f5aa99c1338da24cea446134434a59aa1d053f3da3500c2800f59 SHA512 e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2
 EBUILD Field3D-1.7.2.ebuild 802 BLAKE2B 27dc400e9da29bb4d37a74eaa9af197c23f7950619c6951fc684e0447b099faec54e2295e0ae05136e31936efe3c899432cfa7b837f6e58171c2cfb061824e0c SHA512 6be8c07b78d6c0fd350efedcf7a690cffbf49f6619838ac673f6823cadbc0d0db6412e4201ad650b45437dce8721beec4878691ad00c276524c5873cf07a0d2a
-MISC metadata.xml 820 BLAKE2B e8b04778684298db20cdea68773c50d5791eb0b024fcc0193293dcc34dd06eb0180cfb16075117c3a4b325d1ef1cb78b3bd40b64b67fb3e41e162a17fceb1cbc SHA512 3e8b636aaa7cae681572ceae3b942e20149864be38c5f437227c462185e3acf4660de7a9071988cf59e3a481e47d804de0c563d23674bc772287318cac9a933b
+MISC metadata.xml 708 BLAKE2B b783e8e9cc226dbf51d9033659f49ad45587757791112f704a799a081b02d34f4ec772701f7b88c3bbe1c31a10a2b9bb80ddd51eb5d61376367bb99886c6dad8 SHA512 421af157753908d4743f552d65c649b8852ec4811a9b58eac99b63d377cf3bb289beccc5a6a8c6862884a48c8ebbc4aa9deb7f62fba4d329e17346712ab0f514
diff --git a/media-libs/Field3D/metadata.xml b/media-libs/Field3D/metadata.xml
index c65f6ca4024a..34763bb24f95 100644
--- a/media-libs/Field3D/metadata.xml
+++ b/media-libs/Field3D/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dracwyrm@gentoo.org</email>
-		<name>Jonathan Scruggs</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 52d198e85456..5e184aee6c3f 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index fff0530baa31..227de5f6671b 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -12,4 +12,4 @@ DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359e
 EBUILD fontconfig-2.12.6.ebuild 4914 BLAKE2B 0088f7ef6b497b086c5f90a42330f1727e404e9818b29d25e30340679ddddf3df222cab240ee09021d99660a4fac2a5f16f59faf5b4ff4e56fc6fd6f689aa72b SHA512 7f78420ed60f3b575965e5088cde35c346f6a54ee1ee0ee1321c028a00e60f9df52bf6fcc13b3da53b0c1714209f513e5d49b64e24b5a9a4b4920fa0fadc1e79
 EBUILD fontconfig-2.13.0-r4.ebuild 5180 BLAKE2B 12970aacf5158fd728dcace781e5a93b77b3fb9e1103a0d7448e079651918c13473433c670cd0bbf675e2b0d264ac8341f24ca5cf6aabcf7ceb4e61c2bb7a429 SHA512 13dc7a15de128e158d45481bab5cffba0d504b28fc2cb71539dd11a08abc9810b2d09c8fadf6d25613854959a54da87d7c2fecff0853e26cc87ec3486b6cfb4a
 EBUILD fontconfig-2.13.1-r2.ebuild 5270 BLAKE2B 307e8d2fb618edfe95c70412c738b121490c1470536f70edfa2d93849cc13746de3153286668450ded2b6243a532798017df3e9d7cc0be006e482002faa3892c SHA512 2e9db68cc39fd3a20a3fd6f69da1d94482756a9119ddd6d816c6448a88f88d9dca41d9201f22d22f36818ca9af6b680a55ce36d146952f37dc4a3614d4432a4c
-MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190
+MISC metadata.xml 598 BLAKE2B 9dde998386dce5ea1c1a087103d18c0e0654bc2e8a59e1bd99ef92eab86584b52d0b1a00da4bd1921bf322f00752c9a1954aec1e5daff6c68497eb8cc8e82bf2 SHA512 fa7c42680f0108f22187ff0daac898161bbe7a74265c7370e1fcf1c3cc6f78987e88722b5159ee524b4245daa528474986e0ed69036f3d4b7a95948012acf324
diff --git a/media-libs/fontconfig/metadata.xml b/media-libs/fontconfig/metadata.xml
index cdd439d74505..3a00fc9df0ad 100644
--- a/media-libs/fontconfig/metadata.xml
+++ b/media-libs/fontconfig/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Fonts</name>
 	</maintainer>
 	<longdescription>Fontconfig is a font configuration and customization library, which does not depend on the X Window System. It is designed to locate fonts within the system and select them according to requirements specified by applications.</longdescription>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:fontconfig_project:fontconfig</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index f8040212d5e6..05df3313995f 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -17,4 +17,4 @@ DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb5
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 EBUILD freeimage-3.15.4-r1.ebuild 3004 BLAKE2B b67721500490eab75a294efa32d508eed33e909e0acea8ed5b49dfd79ab7cbcb074ab0e571a0106a606fd996a2afb4c7eafe10b9d3ec31b97f4b3e50da8f8f36 SHA512 c2fe03d952891e8be4709f7819d5326f18d1755cee625f0bdc7e0a6e05e3dde2093b82780183fdf36f639397ffeb511a653b3caadd0b4b26d1f7fe8cf0529275
 EBUILD freeimage-3.18.0-r1.ebuild 2976 BLAKE2B f701f466ef86c26db8a731da62f5686e1b2e17076cb88f8cf750969dab3e27eeaed659c36e60dd7386a73e4c98a73425b91866b51c3e1a75991ac3533f870618 SHA512 7717ee6cd9685b1866133a046a74ae486679ba4362cb66a1f78a5c47169e05a7985131e519ce2d64fe7dde5eb466e5c6b37f6d966d3307369abaf3fa44a60b96
-MISC metadata.xml 332 BLAKE2B e0048362683712cbd48296fa15c743d7ec86e71a7ab1c58f8abece77dd77b38e2f67b099efc2ece05294a9a39258ad81f5947162b66fa020d6fa639f8abb95a9 SHA512 060e17cbb418ebf7df3ee40bb1e99e12ce281101fc50e62e1a1d9cf0294fffbb2f475df1c25e954cb049bf065b316e155ccbf94dcae0bf49acf9e45e306144c5
+MISC metadata.xml 403 BLAKE2B e4d54e3da3203c09e5b281d7d9a5ee1c42f98d081751195edb3754809e9cfc9037b79f70da579f01485b4cda65fe4ddaa70f5522d6138af5b214cdbcbd412928 SHA512 08dffea02b8771a4728338c3cdfa0fd7f312d4570838bdfea4ec395c007cc36f3ef87432db5da44468c7b3834855e2de8ae13ddf9447cba9c88da4367c6cc10c
diff --git a/media-libs/freeimage/metadata.xml b/media-libs/freeimage/metadata.xml
index fec64097dad5..5f7533f155cd 100644
--- a/media-libs/freeimage/metadata.xml
+++ b/media-libs/freeimage/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:freeimage_project:freeimage</remote-id>
 		<remote-id type="sourceforge">freeimage</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index c5619c85d442..a8906b664ce3 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,8 +1,12 @@
 AUX glm-0.9.9.2-avx.patch 1124 BLAKE2B d7cf404b222d98ea4771c354ad3afa712e217be0a4e917c026f79cfb7262e1be9faa2efe85c5bf2cae8df446b421b5f3c1c5545fcc8f6cf3181f6b50425dd680 SHA512 a6a67dccfd9eeecf3ddf083de89da2fd48498a1d815e58d82a9f53feab164d46450c8a41978fcb131b9517e468bdc0949ce4c15b1b24ffe9c0dd6e94516c7874
+AUX glm-0.9.9.6-simd.patch 427 BLAKE2B 9f6e4637ff526497ba9a77247125d1fe5f06eda9bb689b5c42661deb72703b004e2c18f7236503f0673b354ba0e6fa7b13361606ea64fc0e7b9e55eccead91a2 SHA512 72f46827cd6651dd6fddc7ba548f8d9132fd74b9799a8eca6e94435141e96f752917b4343d4c3f37536bbc7713e978e4d85842da6d262c086019eb85f351a431
+AUX glm.pc.in 149 BLAKE2B 9a34ca2590ef006315e004fa6ba0b08469c9da348d8354d0ab6a7e602da1d49126cffbd28c2aab2e2dbe711d047d482b4aead45d1e8770ab571e23e895201b4d SHA512 c875971c208bac82c1a326ebcd327ec9dd92a5b86981d26bf759516107204876a401ac9c57ca6c9965021364678ebbffcaaca6a3b4ee0e532d468d7b03b3ab9b
 DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B 8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
 DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B 4c0bb64bb477ca46d45b4d25d7d992a39a82a7d745d4564dfac04c7f6e31ea0741b33d2d6c7832580e6f51f62a2efe269a9601c10d87f1e68b333e71e20c3d02 SHA512 50e4784fcd5f1da4ae27830948ffe4b412ec53447b89d30c6dcc2b4e0f9ec05cca4b07461d3d8a339eb103fae8dac325fabc87607b5397122ce2021d6e15a1a1
 DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
+DIST glm-0.9.9.6.tar.gz 4354114 BLAKE2B e62af8d4fe22eced565a2703f5d02ad935a18a4c9352302fdb203c85149b9374066684246f940e417882d2700d13b93fc0232921151680ec58c9df80ee0be1fd SHA512 1bc8fc1da21e19f95d4a24259993c7932db328fdd2d0db68dbf60c07f372e19003a8df094fb4e153bb7f50df584c17cf0a540d3d3c38b7a287f3b55314ec2d70
 EBUILD glm-0.9.9.2.ebuild 901 BLAKE2B 1c30f2fc621753312f50d87ec0d30f52ad3b9a7398eac0d2a9616ea7da8e0e64910df8e62906ccb177066ad6bf8c4ba5b0b9e60a1c7ab18f589785fa74fb59fc SHA512 609b1bf19b416890cbfc4be4e2a44dede933227d8c41e766a29a4ca8466432598f9a7a4f8c1f7c43d8a5f84f2adb37f31ea5e4292a853a7765cf46828cbaaf68
 EBUILD glm-0.9.9.4.ebuild 862 BLAKE2B c61eb288647c2a83103c8a86c7b252b4c13a7585ecde28683df41561eb652a0a3cc9eb3ad31041110f55398ecc467ef7e77f41545f340bd2526d80338bb9c1cb SHA512 ccc3cc2e8c95d6b31aa5ebadd3f7c5c5418e3e1060bfd92cb8b2cf595a6c0b03ffea9c837985a60c2c022d17077b18586e492841df8bb18922f3715aa6f70b73
 EBUILD glm-0.9.9.5.ebuild 861 BLAKE2B c26fed064cd65b6f4a56b5c52c6938a6f4035690e5c31931ee316cca499088792dd157ac6f2ea68bcfe54d0fd5c482f293e817acedf339e979b8cedcc9fe2982 SHA512 22779553f39a41a0153ecd14a54d0995194615dde016ff2bfd2a7bc579812631585692a89565f05b05d474cdf88a4c06bea4d088bbad2ad6f18b0958b1670bc9
+EBUILD glm-0.9.9.6.ebuild 1188 BLAKE2B a9e4dae62e1da284caa285fd4d7fc9b36468f0401e4e06a3969eddbb04278939bec0f13265603885f672cd809b56d565ac3398e918548f0df5e678b26f36b190 SHA512 8ab394f2f0ec3c9129889bfb069251ccbf57849b09a68188abba5fa8a4af69dca4bb72e696a4b0a65b563e7baee29d140dfe2fd59d2157d4383ca231fb76831b
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/files/glm-0.9.9.6-simd.patch b/media-libs/glm/files/glm-0.9.9.6-simd.patch
new file mode 100644
index 000000000000..5ed2bf1f6d65
--- /dev/null
+++ b/media-libs/glm/files/glm-0.9.9.6-simd.patch
@@ -0,0 +1,11 @@
+--- a/glm/simd/platform.h	2019-03-06 18:57:53.309630574 +0100
++++ b/glm/simd/platform.h	2019-03-06 18:58:30.796988006 +0100
+@@ -245,7 +245,7 @@
+ 
+ #define GLM_ARCH_NEON_BIT	(0x00000001)
+ #define GLM_ARCH_SSE_BIT	(0x00000002)
+-#define GLM_ARCH_SSE2_BIT	(0x00000004)
++#define GLM_ARCH_SSE2_BIT	(0x00000000)
+ #define GLM_ARCH_SSE3_BIT	(0x00000008)
+ #define GLM_ARCH_SSSE3_BIT	(0x00000010)
+ #define GLM_ARCH_SSE41_BIT	(0x00000020)
diff --git a/media-libs/glm/files/glm.pc.in b/media-libs/glm/files/glm.pc.in
new file mode 100644
index 000000000000..fc5c7bb7f90c
--- /dev/null
+++ b/media-libs/glm/files/glm.pc.in
@@ -0,0 +1,7 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=${prefix}/include
+
+Name: GLM
+Description: OpenGL Mathematics
+Version: @GLM_VERSION@
+Cflags: -I${includedir}
diff --git a/media-libs/glm/glm-0.9.9.6.ebuild b/media-libs/glm/glm-0.9.9.6.ebuild
new file mode 100644
index 000000000000..7049a117fce1
--- /dev/null
+++ b/media-libs/glm/glm-0.9.9.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="OpenGL Mathematics"
+HOMEPAGE="http://glm.g-truc.net/"
+SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( HappyBunny MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+RDEPEND="virtual/opengl"
+
+PATCHES=( "${FILESDIR}"/${P}-simd.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed \
+		-e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@GLM_VERSION@:0.9.9:" \
+		"${FILESDIR}"/glm.pc.in > glm.pc || die
+}
+
+src_configure() {
+	if use test; then
+		local mycmakeargs=(
+			-DGLM_TEST_ENABLE=ON
+			-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
+			-DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	doheader -r glm
+	dodoc -r *md doc/*
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins glm.pc
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index f5c558585cf7..8898f19223a9 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -7,4 +7,4 @@ EBUILD harfbuzz-2.5.3.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd5
 EBUILD harfbuzz-2.6.0.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
 EBUILD harfbuzz-2.6.1.ebuild 3025 BLAKE2B 0794b92e5f2501e7b19f7ce2e46914a61cfa60aad68f81c8231b74c54968c81329fc9da89ad8a5d3d2a113067bd1e4e09551f54b89e0f98cb596e303f24eebd0 SHA512 af619f64bc3cf9d8e5e1cabfba1ad6e0cbfcac365c07986f2397a1407d8f3a4807cb2f05978c4b1a3270911766d0321aa3d140417d79663316b664fed2d3f882
 EBUILD harfbuzz-9999.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
-MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
+MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/metadata.xml b/media-libs/harfbuzz/metadata.xml
index cb52496a1960..1c768f83411d 100644
--- a/media-libs/harfbuzz/metadata.xml
+++ b/media-libs/harfbuzz/metadata.xml
@@ -13,6 +13,9 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:harfbuzz_project:harfbuzz</remote-id>
+	</upstream>
 	<use>
 		<flag name="glib">Compile with GLib Unicode support</flag>
 		<flag name="graphite">Use graphite to render complex non-Roman writing systems</flag>
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 1243cab3de6d..e30f6a2ed36c 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,4 +1,4 @@
 AUX lcms-2.9-BE-test.patch 1367 BLAKE2B 5888ef7f7466c8a76c0b9ba1c87383e274fcfc0570ccc45f2a04c3409421415e7b466b93d9f3acb358ec16481c15cf2d466d0b5d9986f37f48d6fddf0e0be616 SHA512 17d4e612f4aeb6e62ac918aa5438e6ada16f456e4c740b4a13f4560956ff8ee7b6223360420c41de1d7284524460ebb1ba89784782671e258df19fc5a768f1e1
 DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
 EBUILD lcms-2.9.ebuild 1249 BLAKE2B 7ca1b1fa7999d23bd91800514d3bf648ccbba89caf26bd84b8ba732771bbf796203ea8a8b367efa068680509a6c08a6f75a0e4ae329917558e6f0ff2fcef9b3c SHA512 4833632de1375ad3554dc172c1248cb0aef785d2991845a43640eb5df9ef2efbb51b9f709825ec55043b31aee32b1837e5587b29a9d9eefe73602344e056bea3
-MISC metadata.xml 333 BLAKE2B f6b3984af87fe88ac29f5728eb0b45a5e96e99e3647969adf3de68f8754dc85a23c6bc4eff61132c78f168db7e19694d94c087dc81f7bac6009d253a8bb0daa6 SHA512 d8fb0a9e8fb4073583431d2a9668c01fa87230e1f27672a66955c21c842701109d6ad75c50f9f88334849be3809339a4562a745549d79fdf7aad9c7cd1b0485e
+MISC metadata.xml 410 BLAKE2B 9349e230ddeb0fe27ff503a24fcfecb247c3f314b0a68b31c3ae998aca9707a2b513228a98f92dcadc15fc9b91e2d8fdb4b6153b35d9eb9ba5492e1b7d929b7c SHA512 d010ff15cb753002aa9a0f9c6c246e3b633cd4ea4bd75521a4c3c6c5b336852e108dafd0835c7533bf07e30dec8c1237e53218b672a01bf0d838cd48f0033d43
diff --git a/media-libs/lcms/metadata.xml b/media-libs/lcms/metadata.xml
index 08400576a0f2..a42c089bd592 100644
--- a/media-libs/lcms/metadata.xml
+++ b/media-libs/lcms/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Printing Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:littlecms:little_cms_color_engine</remote-id>
 		<remote-id type="sourceforge">lcms</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 310408e7e601..3669e85569eb 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -4,4 +4,4 @@ AUX libexif-0.6.21-CVE-2018-20030.patch 4629 BLAKE2B 574f95d21507887851da9486cbd
 AUX libexif-0.6.21-fix-C89-compatibility-issue.patch 1138 BLAKE2B 5b3923a7fd82fc4c0f267684c67f329b4ff2dc43f9d088acd4a352a9f3c329b08c338c51c77b3f55654e5cf2dbb2f7ba317b10de7e963ccc7b4c1989332fd544 SHA512 a91c2f12141b7a0c399f08f038746ca44cbc468776e5b34672d38921b8a131df3938e400fea04d20c323d6d1363f8fb176a4abac7be4b1ea9bb9694aa902f19e
 DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
 EBUILD libexif-0.6.21-r3.ebuild 1364 BLAKE2B 05d4956de3c4d901780846ec77f11eee72424238e6f26d1a76152e8685db882e7312fcca3bf64f87a810cfc75f2a338c6bd41a19b48c4ff5d0bd6b7f1b7490af SHA512 2a921f46af9fd82ac4669b80c1346a36e2ec5564f2fc33c3022b909a219d6c9e05a47e801c056df291f8097212833c0a783b2becd434847c84ce00646271b428
-MISC metadata.xml 336 BLAKE2B 7f77063db7c0cf51903da446071dff6d4dccf66e552dd1229f01b79ab7716d02adcb146f755971d0fe96c2a04bacbd082f606c4023e6e98f9c502a3f8eda7416 SHA512 8a6e3d7c973692a37f57ce34136c863e6ad14efd064c42ea0be6c14d93beec3c7ae36ed44afd6d2454ab29f4cb633c097a0c3b2ea5c019bf06df4f306dbfced0
+MISC metadata.xml 403 BLAKE2B 174c4d11ebb47cb6037799b340557bc258b854e276a893e70726eb7ae6d57bcf108bb4f17cec453e850bde5693221ae52e825ee73a73c1160c20ac8a86bc81e1 SHA512 43defe52eed54a1fcfdaf2a7057e56267e3286d55e2ee77e32c1c5ccc535d2c5415567d2fd923ccd7dce116a880db022e50d553786f83bae1f07e00b1e73159a
diff --git a/media-libs/libexif/metadata.xml b/media-libs/libexif/metadata.xml
index 9e6e25254761..fc7d045d25f5 100644
--- a/media-libs/libexif/metadata.xml
+++ b/media-libs/libexif/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:curtis_galloway:libexif</remote-id>
 		<remote-id type="sourceforge">libexif</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index a12cd04bcbc7..61f3ec7b4d7e 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,5 @@
 DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f655620a88fb2df2220fbe9337eb0f61b7babd9d36e1f1d58f45ca617c57feab93e9714228eae54c742385c3e4b0fc3667ff5 SHA512 13364a8fdfe137a21ebf04dfd2b30b20c7fb652e11e1b98cd06176e9a1576ef8f67121523111395100ed39d1d3e6e5d6d458b86d58502f7056a1c06a5623640a
 DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
-EBUILD libgphoto2-2.5.20.ebuild 6232 BLAKE2B 3617e5aaababfd54a469f77eb01508fe7341d25e013df88ea76c3775410d615702debc961bffebe69bf885bace54a01b979d1c0a3a0f5e54163af07dc25e1fcd SHA512 4e1d7c288187641e8201f6370134b6e8b379e2e02f56fd713af3477781d6b2df1dc6b6796ea30e24457f9f8919926f308f025236f2d7572becc12f48148bf056
-EBUILD libgphoto2-2.5.22.ebuild 6231 BLAKE2B 87419dc414d34ef6722f6fed1906c026eb9eade7663f6bcd966fbe7c2df55b0d5ff03577d28d146a8d48eae09e172d32ebd02b76e80eb805f10105e2ff71411a SHA512 9bba7a79f8d8fe7f5e6d7007a4ebe142a67057d405b772dd0306484298c3ceb2079fa432a61064ad3e487a977173075fea4610f88863c7f6a86f34cc23e145b4
+EBUILD libgphoto2-2.5.20.ebuild 6211 BLAKE2B 7d3997b57e384300a92039756e999ba0c547563771859f04923cbf9fd21d03a8ee06a2be7f94dcc9fc79594f7a11f18be7fff03f6cc4f92a867dfd0e41870706 SHA512 26f1b44af1fa2575801da2b78339f17e539af77532b87f7b3c2e77bb4cb8e5e7673a25052941665a2454c320dc4a1df6c8d5cf43087da3bdd805bcf81804522f
+EBUILD libgphoto2-2.5.22.ebuild 6210 BLAKE2B 939c02b7ce8508a61e7387053d1972e7a989d820eded908fadfd971d195b12a53cfc81b052eea2c8f08384a276227447c82f2744fd187eaf5787f124efb56682 SHA512 ed29844dbbd72cdb6a9beffd2399af4031827075fd79ef8a17cb2862a37446cfe4768581bbd60510c5ca974f04ca5d302c58bbd58217142d1ededb9f81f1a769
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
index ca608de3fc29..177492cd3233 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
@@ -6,7 +6,7 @@
 #    https://sourceforge.net/p/gphoto/bugs/643/
 
 EAPI=6
-inherit eutils multilib multilib-minimal udev user
+inherit eutils multilib multilib-minimal udev
 
 DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
@@ -50,6 +50,7 @@ done
 
 # libgphoto2 actually links to libltdl
 RDEPEND="
+	acct-group/plugdev
 	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
@@ -80,10 +81,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	enewgroup plugdev
-}
-
 src_prepare() {
 	default
 
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
index b6417dddee32..ae1ae90567d3 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
@@ -6,7 +6,7 @@
 #    https://sourceforge.net/p/gphoto/bugs/643/
 
 EAPI=6
-inherit eutils multilib multilib-minimal udev user
+inherit eutils multilib multilib-minimal udev
 
 DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
@@ -50,6 +50,7 @@ done
 
 # libgphoto2 actually links to libltdl
 RDEPEND="
+	acct-group/plugdev
 	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
 	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
 	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
@@ -80,10 +81,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	enewgroup plugdev
-}
-
 src_prepare() {
 	default
 
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index 91659dfb1d6a..4a5cbe1954ea 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -1,6 +1,4 @@
 AUX dont-strip.patch 596 BLAKE2B 166f289c8e6027ce5c57accf6e2644afe6a275849b178993a37260dfee463b67bd7969e4b2b0365d27aba9da4239a4dc821fe4b9beb0846821312f3f04f29079 SHA512 58906ab0d472f3186f99c14d9fd3c6104b7df1ef9b20f5bb3a334ed357d6cc808ec04609108cc7aab6a1b6ed781624e728bb4f9a14cdc59a5cf84ace591268c6
-DIST libhdhomerun_20140121.tgz 47685 BLAKE2B ab6abcf3307ba2c7c484ef40963212ee2d8cede3c2e54aec06a9caa9a1ec195f3f7c2974dff056ff6276702213d83b4922b5d36355a75558a4e6d9f49100e6e1 SHA512 bf7bfed024980b4a58d860b28194c6f3a394071ba1e3e25b46b2a20709e5de51fbb61779d46c9f1f01efd1553abf0332b3711afeb21479576f7f40da7f22eca1
 DIST libhdhomerun_20150826.tgz 49169 BLAKE2B 6b780d61624e9cca9ca6afbbcdf91377dc134782ee22752c8d92849c6eabac502a3a8a8659035b8a0fd66ae1d7404f6696f78758e0ff4484b46b84ca7282b48f SHA512 9b401c1649dc8c32ea9019b732631f9213cb66c43771aa148fa318202fc11739c005c474be6a77a6a7807818b5179f77debb5b2d2411d865cc87bb3d7ab629a6
-EBUILD libhdhomerun-20140121.ebuild 617 BLAKE2B c3b2e33e10c0f876712233f487c066ff39c6bc265f6c909ccbbe49c13f70f7dfd86d4abfeeeaa17b757606c55a1dd3970f47c97c7408dd01b4ee500b7e57d6fd SHA512 6611b66cfd6a8399f25a289c895dc5e04c7a2df0c343b841a9602084979fa05d640b4d0e789b92df0910182189219f841a309321765ab7ce3b5cad69e3175fd5
 EBUILD libhdhomerun-20150826.ebuild 624 BLAKE2B 118b8847494bc537d9ad5a71c06c8f3b704dc574bc0f5a85008e1099c6fa698ac338c8b03684073b1eb552e6bb44292947d02c8ee1fbdcfcfcb18b51bc0e3d8d SHA512 0d0a49bffdc67789ceb896db00191c65e40e2f02b21c9cc4aa5b312c6c1edad217f35509a61488a7d59ea7e5c55894cb67f509cf5b69a28df16c6f7918b530e7
-MISC metadata.xml 241 BLAKE2B 8298e994c9cb9bc97833f372a17b128f6f4f6495b480a4b1e6f65eac2e92422a832b025e4014c3c3d3c8080d5d4f1ab2c1a1b295495e1f300ea0eb86326d334a SHA512 0fd60d51948a6d792565f32ff2df88859c92779fca9f82821e2cdf95b56b258a73aca63fc5badff843c97f462584d8dcecf273892c3ca8702e6bfce708c1bb16
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libhdhomerun/libhdhomerun-20140121.ebuild b/media-libs/libhdhomerun/libhdhomerun-20140121.ebuild
deleted file mode 100644
index 27dc812b2855..000000000000
--- a/media-libs/libhdhomerun/libhdhomerun-20140121.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="SiliconDust HDHomeRun Utilties"
-HOMEPAGE="http://www.silicondust.com/support/hdhomerun/downloads/linux/"
-SRC_URI="http://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/dont-strip.patch"
-}
-
-src_configure() {
-	:
-}
-
-src_install() {
-	dobin hdhomerun_config
-	dolib libhdhomerun.so
-
-	insinto /usr/include/hdhomerun
-	doins *.h
-}
diff --git a/media-libs/libhdhomerun/metadata.xml b/media-libs/libhdhomerun/metadata.xml
index cc8304b97754..6f49eba8f496 100644
--- a/media-libs/libhdhomerun/metadata.xml
+++ b/media-libs/libhdhomerun/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>cardoe@gentoo.org</email>
-<name>Doug Goldstein</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index c6cd34ee9820..6ab934bd06b6 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -2,10 +2,10 @@ AUX libjpeg-turbo-1.2.0-x32.patch 1248 BLAKE2B 760f35a02c6a565a43702a4188186732f
 AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca8892050507bc7566cacb0b7ff2d2914428971a994bb41d9d717be7fe0a4908cee2ee57a74f6ca8112bee53cb021f4fadbef201536ebee979 SHA512 2542833a6afdbf1f2112695c524197bf5a319ef99c1c6ecea0fe0436681c45321bb6eb59e25fa97d8fa923717452f609e3f85d25547751fa4f8fe99f4ee789c9
 AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a
 DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
-DIST libjpeg-turbo-2.0.1.tar.gz 2159130 BLAKE2B 465003c8cd50ac55b2a1052795073dfbd83f0816e8e2bee845df653b5f033b4bb4a187ac823f714898870c12114dc6ac56fd917383395f2f6011919d7253fc59 SHA512 48ef3324fd61a4f6885210e5c484cd3d18aba8dc091bc27dc86d9bdcd897154e490a90125d2dfab9d863f001dae6aefb29efcfb35d742b25a9fa259227ac8e72
 DIST libjpeg-turbo-2.0.2.tar.gz 2159562 BLAKE2B 3524c5577322c9fa6556ec263da35c85a6e7b7849dbdc51ec76606f975a46d1a8c40c32de5bb9add62a2dfc9c2ec131e5528591cf63d356bdf70496211e56a01 SHA512 204b6d083e99488c975c75efb08699e4dc1c409556e4dee4f21e3ee67e9c6682eb342f2e5712816b0342c00399fbe6e43fbce30c3d22f30f7ef91db006b3be08
+DIST libjpeg-turbo-2.0.3.tar.gz 2161279 BLAKE2B c0def6d6d402eb2070f4861741f9579e5c360e8bc9a64924c7d53c3c65cc8d4577c01e2cf6acf8ddbe7bddc96540f605ddb47d1651a7400738638fb06928824b SHA512 ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-1.5.3-r2.ebuild 2999 BLAKE2B c2b3c72a5eeea74b455c2d095d25d2663ced9cd4e53d35d68faede4345eaa2532c9abc64dcad6cf46b82503ab5a6b908b3e268d1f1932a04a2de34bcc383c095 SHA512 0e1532ea6e04cc05fd4f3d303877095dca0095c35632c27e47840e34eb3e153f4953d948b8dbc62edbc02f655114a79e07ce82d557813c58d6f54afda3074c69
-EBUILD libjpeg-turbo-2.0.1.ebuild 2681 BLAKE2B a6b2c5f2b2a70f216df5cc21c8c5c817b22536695aafb777e736bb4f53954f0d269b40d0fa277b8e8923c4a6d25f5be11f1c1c0abb3b3e1e3753ace2fd9207ed SHA512 8accd6117b7495f86ea39f4ad83ce5970f9b25ba716d693a2129d8259ff0120bcc7eb34ce4435ae3712a997b94339ad522f09e1069c507fc73bddd0c0c8d419e
 EBUILD libjpeg-turbo-2.0.2.ebuild 2681 BLAKE2B 72b792db6168a998bd63ea3eac62d9aff3898d294aa8258ed6848b82e6226eda05890226d40b3c71429d37e3b00cfe5f10a8e7da3ec498c72b337c71b17d0df3 SHA512 68acfa84e14b9a9adf905c07e528871945e6fcdd16c826b46b380b93c5402fd0c41a917d814ff14d3fbbd29d7082ea0687de3ae80e51ebbd55f7f8dabe44edc4
+EBUILD libjpeg-turbo-2.0.3.ebuild 2679 BLAKE2B 2149e4cf39edff83db255090c92c3f85e3d963b66735cdd415a01e54bfbedbb68dce0e0a5e005ce23f63485a87d63b9b2e742701debafa8fedd8b20fa673cf36 SHA512 07d23d291af353ae17d9d4478f9bf9d88d8cb03f047ba75b5c6061f5b0e0c95525048b0e37b63568f438149a488a7cbc4ccba5adcec39cdc63552d581b36f440
 MISC metadata.xml 539 BLAKE2B 6daa06f2aab2c89c5519369550061055eb37612bd8696ca44dc7c3658f81bb38dcd3715419559fc580b0d62d5e54b4aee2c126aadb6845315a3bcf2ca413f76a SHA512 b47273474a5ab74e5b10ec672b326043f5c3699bd6531cea33ac1ba9f38a42f42bda960360f01314bca5461c3b40ee74470c78e6562aebd93ec54944908a2932
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.1.ebuild
deleted file mode 100644
index 08f87ccd3421..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib eapi7-ver java-pkg-opt-2 libtool toolchain-funcs
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG"
-SLOT="0"
-[[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-COMMON_DEPEND="!media-libs/jpeg:0
-	!media-libs/jpeg:62"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.5 )"
-DEPEND="${COMMON_DEPEND}
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-fbsd? ( ${ASM_DEPEND} )
-	x86-fbsd? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-	x64-cygwin? ( ${ASM_DEPEND} )
-	java? ( >=virtual/jdk-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-src_prepare() {
-	default
-
-	cmake-utils_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi && use java ; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_STATIC="$(usex static-libs)"
-		-DWITH_JAVA="$(multilib_native_usex java)"
-		-DWITH_MEM_SRCDST=ON
-	)
-	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if multilib_is_native_abi ; then
-		pushd "${WORKDIR}/debian/extra" &>/dev/null || die
-		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-		popd &>/dev/null || die
-	fi
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	if multilib_is_native_abi ; then
-		pushd "${WORKDIR}/debian/extra" &>/dev/null || die
-		emake \
-			DESTDIR="${D}" prefix="${EPREFIX}"/usr \
-			INSTALL="install -m755" INSTALLDIR="install -d -m755" \
-			install
-
-		popd || die
-		if use java ; then
-			rm -rf "${ED%/}"/usr/classes || die
-			java-pkg_dojar java/turbojpeg.jar
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-
-	insinto /usr/share/doc/${PF}/html
-	doins -r "${S}"/doc/html/*
-	newdoc "${WORKDIR}"/debian/changelog changelog.debian
-	if use java; then
-		insinto /usr/share/doc/${PF}/html/java
-		doins -r "${S}"/java/doc/*
-		newdoc "${S}"/java/README README.java
-	fi
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
new file mode 100644
index 000000000000..7f78841d499a
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG"
+SLOT="0"
+[[ "$(ver_cut 3)" -ge 90 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+COMMON_DEPEND="!media-libs/jpeg:0
+	!media-libs/jpeg:62"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.5 )"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( ${ASM_DEPEND} )
+	x86? ( ${ASM_DEPEND} )
+	amd64-fbsd? ( ${ASM_DEPEND} )
+	x86-fbsd? ( ${ASM_DEPEND} )
+	amd64-linux? ( ${ASM_DEPEND} )
+	x86-linux? ( ${ASM_DEPEND} )
+	x64-macos? ( ${ASM_DEPEND} )
+	x64-cygwin? ( ${ASM_DEPEND} )
+	java? ( >=virtual/jdk-1.5 )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+	default
+
+	cmake-utils_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi && use java ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_STATIC="$(usex static-libs)"
+		-DWITH_JAVA="$(multilib_native_usex java)"
+		-DWITH_MEM_SRCDST=ON
+	)
+	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	if multilib_is_native_abi ; then
+		pushd "${WORKDIR}/debian/extra" &>/dev/null || die
+		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
+		popd &>/dev/null || die
+	fi
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	if multilib_is_native_abi ; then
+		pushd "${WORKDIR}/debian/extra" &>/dev/null || die
+		emake \
+			DESTDIR="${D}" prefix="${EPREFIX}"/usr \
+			INSTALL="install -m755" INSTALLDIR="install -d -m755" \
+			install
+
+		popd || die
+		if use java ; then
+			rm -rf "${ED%/}"/usr/classes || die
+			java-pkg_dojar java/turbojpeg.jar
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	insinto /usr/share/doc/${PF}/html
+	doins -r "${S}"/doc/html/*
+	newdoc "${WORKDIR}"/debian/changelog changelog.debian
+	if use java; then
+		insinto /usr/share/doc/${PF}/html/java
+		doins -r "${S}"/java/doc/*
+		newdoc "${S}"/java/README README.java
+	fi
+}
diff --git a/media-libs/libmetalink/Manifest b/media-libs/libmetalink/Manifest
index da82a26962ff..66c396b44fd6 100644
--- a/media-libs/libmetalink/Manifest
+++ b/media-libs/libmetalink/Manifest
@@ -1,5 +1,3 @@
-DIST libmetalink-0.1.1.tar.bz2 324472 BLAKE2B 7ce82dd8954c96b31d15633995f5e1cad9e3aa56568241601e3f79c25e217a5ea3333df397bc2ed2e96ca790ae1e187d5ebe32113e11cd43f2ecbae9eb6cdf32 SHA512 9e9a2bf17b3696b199844703377cf6615bab44fd61b89be9afef579c21b0ac462f156719f60df9b8e7f7a9edb259d9bf461f20cd11ad9960d8376bf20e04f62c
 DIST libmetalink-0.1.3.tar.bz2 327482 BLAKE2B 08bf06323e38793a4ecdd3860236fe8a5b97a2deb6d91a63938197fbfc06e38fd6c8fc9968f6fcd883270339ddeba9821711ca3a8acdce5e096c167cec28c9ad SHA512 2c944a00f9460447ecf961685d7cfa80243fec7ad462dc2339fba0e944d0b92ff42bdf07032f2ee0695f0cd004e4c45bfe21e5246e1355a0d43756605894c632
-EBUILD libmetalink-0.1.1-r1.ebuild 798 BLAKE2B c2ccd770a6e05721b42daefd89a9a399eb5b88b86db97aa5bda3ae0518f844075a08129257113179d12a48bc9fdcd231afb94d5ab15fb10a22983d20f71f3975 SHA512 12facd74a93ca688f5f56194ef677e572a91bac2905798f0c4550df76f83a35daf28a1926c4199894a3199bb98ac67cbf0d0e185b1a06af59e2ba711ed36acd5
 EBUILD libmetalink-0.1.3.ebuild 815 BLAKE2B 6f2b166d5e79d91bec9241d835498e868599e67c793062eee88094954798fe83a54c0a066b0b74187e392df038a75f61f780e10f938147bd447e64e6abff6b78 SHA512 7fa34b001e2b2124b47fdeceb1aa7cdb085f6eeac58313e45d59d0e0ec955510ba464cfce579bbd908f97070fbe1affb0fce42f3f5de993e357e1a9818de0108
 MISC metadata.xml 246 BLAKE2B 8de378056256c0217da9beda2aaea7afe4967f48fa4b62cf3d8cdf2428791003a6cf4bbef204342dadbfb05e1be7a8914a637de532ca6f8ea9f4f68273cb6f4a SHA512 c7a53354d3381e820c1a7cfdd90850f45dc034c96006ba7d6c9459727fd0f1adf5473a35ab52de8bde5a14b66099cc67333c75953199bcac9e7567dacea2838d
diff --git a/media-libs/libmetalink/libmetalink-0.1.1-r1.ebuild b/media-libs/libmetalink/libmetalink-0.1.1-r1.ebuild
deleted file mode 100644
index 768be2eda71c..000000000000
--- a/media-libs/libmetalink/libmetalink-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib-minimal
-
-DESCRIPTION="Library for handling Metalink files"
-HOMEPAGE="https://launchpad.net/libmetalink"
-SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="expat static-libs test xml"
-
-RDEPEND="expat? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
-	 xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1_p2[${MULTILIB_USEDEP}] )"
-
-REQUIRED_USE="^^ ( expat xml )"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_with expat libexpat) \
-		$(use_with xml libxml2) \
-		$(use_enable static-libs static)
-}
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index a069d43e6569..b4db22e96858 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,4 +1,4 @@
 DIST libmtp-1.1.16.tar.gz 820516 BLAKE2B debc0755b91f44a878c4a5d4eb8d23c92ac17a80cf59ca13ada80bc1884ee7ab771153252258e33c834aba718a064d9e9a1b4618b3e0abe81bbffdfc7e5a2c88 SHA512 0540271930c1c932c5d06dcdd30142d407a4fadd022b195e8339d614fa3ec9b050605bf013b28ac6451f4dfcddf7add949c928acb1382802ab5fd6311c1628a0
-EBUILD libmtp-1.1.16.ebuild 1622 BLAKE2B f7356daf622a2861ffcd8d9a4caa00e40a53f25499df6fb74f34cd5d14ea9277344a4cc003569b43a41f4de6a38992e8bf2f3c7c578eda91de63874e6ac1cc10 SHA512 dcc6821a7bc13e4aa5be63c4558830939d2c4df4e6d0e1bf72f69cc863185d7787d495454b47e77d9bbd3cddb1b5ecf2649e119523dcc126aae56a851565de56
-EBUILD libmtp-9999.ebuild 1628 BLAKE2B bad7949d12c89c03d2d2ab92e83dd19943998aedf2b031f2ce0e60f811653654670388615c43177466fa10110ec077a83c95131df557584197f107624063bd49 SHA512 7942bb95447ea68b21c7da14a2236ba05ea73316350b3a7dfc40db4603a9f16311c3ab0d795278efcbf3550306009209239bdd53a13fec784d4a8ce2d1ca3da7
-MISC metadata.xml 329 BLAKE2B 4d7d938ffffc075084e5d43ca37040cb1612e7d6bdfed9c12d5edb00e0ce536d2d19b070dcd26d64a46a6664985db1f07aed073e2912c3dfc743ff6d55e8d187 SHA512 99fed0095b41d435c1bf82d7fa9c51b03fadc01646d959735693219cbfe2b69f784610fb296d5f1fdc8bb7c84dca4dbf3718effd350745de6483f8a8f9407d6c
+EBUILD libmtp-1.1.16.ebuild 1603 BLAKE2B ed4530b60667621002cede314e06b4d98acd8745d983a0ace464b12629b1a6536f37cbecb4aea61270e668c353555fe1b870c7930d7b4bbbe23e055bc1e1ae9e SHA512 56fa1ffdc209caad56d620c2162bf7eef3a57d737a08124c84a56c333cc5f21528c1d9cca5f32d3df0bfc41f516485bcedbb1b10a71fd1b157dc84da14823082
+EBUILD libmtp-9999.ebuild 1609 BLAKE2B ed0793b93aaba8a6671f1618d912e97b0eb94ee4c45e949b7c7c68aafeb68036950c01131441e7cbe4dbfdc5d82d2bd49db58d1a915fac97e7616a41a7d860b6 SHA512 e83ce0daef077f3343d56c52f0e826e64ce8634b20af89d1dfafec5a5f085c9d5682a881974ffb41f8d8c6b5f267480708a55901125bc654d0595cc68071c749
+MISC metadata.xml 394 BLAKE2B bf7cc1e63c4f81e160cdb34f21a1c9412f917c3183d3728da53c11830413ccc23c835d13798fd4c09d5b9d5424d8e711f13a0d3dd39acea3e5370dd26beca355 SHA512 48695d6eda543de340c36dc778647b753cce9000fde558de1932cf8a0533266d2300993c605d2d340c96f665e4782f62aefca45390322c1614a9dbdcbab44e35
diff --git a/media-libs/libmtp/libmtp-1.1.16.ebuild b/media-libs/libmtp/libmtp-1.1.16.ebuild
index ec06cebf2005..fa0a23bd8d61 100644
--- a/media-libs/libmtp/libmtp-1.1.16.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit udev user
+inherit udev
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
@@ -20,7 +20,9 @@ LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
 SLOT="0/9" # Based on SONAME of libmtp shared library
 IUSE="+crypt doc examples static-libs"
 
-RDEPEND="virtual/libusb:1
+RDEPEND="
+	acct-group/plugdev
+	virtual/libusb:1
 	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -30,10 +32,6 @@ BDEPEND="
 
 DOCS=( AUTHORS README TODO )
 
-pkg_setup() {
-	enewgroup plugdev
-}
-
 src_prepare() {
 	default
 
diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild
index 412b5b9c4da3..1bc630134db3 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit udev user
+inherit udev
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
@@ -20,7 +20,9 @@ LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
 SLOT="0/9" # Based on SONAME of libmtp shared library
 IUSE="+crypt doc examples static-libs"
 
-RDEPEND="virtual/libusb:1
+RDEPEND="
+	acct-group/plugdev
+	virtual/libusb:1
 	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -30,10 +32,6 @@ BDEPEND="
 
 DOCS=( AUTHORS README TODO )
 
-pkg_setup() {
-	enewgroup plugdev
-}
-
 src_prepare() {
 	default
 
diff --git a/media-libs/libmtp/metadata.xml b/media-libs/libmtp/metadata.xml
index 88c60f729d04..7b15a68479f9 100644
--- a/media-libs/libmtp/metadata.xml
+++ b/media-libs/libmtp/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:libmtp_project:libmtp</remote-id>
 		<remote-id type="sourceforge">libmtp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index f3ce82e959de..852416583258 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -2,6 +2,6 @@ AUX libsdl2-2.0.10-static-libs.patch 2388 BLAKE2B 84d6a6fe3a2630ca899aa01c6d16bf
 AUX libsdl2-2.0.6-static-libs.patch 2373 BLAKE2B 4632bf1c0d841d148acfbdf4c0fc25eb0eb3436478c1dddb4165c14d543793e2c378401f7b371976ffea38d6c3ceba4c4e4bfe415c0cfc4d07e62f2ec18dfc3f SHA512 c03037185a21ac3e2a664ab85847a0af95a44f579c2959fbc74d55ea8e59f7ed04775dcaea1fc2e284fca7ce6debca15a4062ba0e9bb0086f3dec49ba8044fb0
 DIST SDL2-2.0.10.tar.gz 5550762 BLAKE2B b51eb0b256da683586889a648f62363935f5c70b31172999aa9b80bac9f3e761bc34a3fc379c02f5dbc50734cde53743d297ca7f79d30b0272ddf0313c8752af SHA512 f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798
 DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03 SHA512 a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10
-EBUILD libsdl2-2.0.10.ebuild 5323 BLAKE2B 972b3515df28ba92c375a9392b2d1db458529f19c5b44e75de665896ebf36cbf2fd8f428884313ae6a3aa9dbf2f1ea3cae6a1f168b9b00b54d4affbfe95f5e06 SHA512 25551a70968934663dbab83640c7a6b710f5a1615768d9671fde80d6d237f70eeb0695af2d140c11879687e1c80b63358505d7b1742b4d7e2217c4c63efe2fb9
+EBUILD libsdl2-2.0.10.ebuild 5317 BLAKE2B 514f47229ea5f5a45442b8b7ce0bb000e0abb7a79bc99f660d5eea07c2dd696475231ab8e8b103fe333f963e7d2115f2e881dcb95a43055520e2c8826069e016 SHA512 7b513bdbf4d03550503ce8ddaa7c4562045b13e8d539de49641d8d13572c58d16dd04e5ad8f25b3de95456ff055b342784fd73ba335909e99f8b39e837f86833
 EBUILD libsdl2-2.0.9.ebuild 5397 BLAKE2B 25db64fa1f24e9e6c097a3dead86ac350afa31712ed6c87bae67b4b30584dc96fbe65c4edca029dc0dcbea510259bcdb4896fbef577b5a951e4455da85bdf759 SHA512 76f69076eaa39510c84284cbedf19614c681eb0708bc98f324155211ca806927232bad73613fa06fd2a5569a503349872707fa5f83b1410f54ec10fc799b00ea
 MISC metadata.xml 1653 BLAKE2B 37ded083266a7086c89e02ecf5a79ea7c56c85ef50474d200035a96f425345c5882288c594c0d7ede0de4edc0f2b570fcaee60f98e64b45d152af1964486be38 SHA512 9af14f6cbf34ade124c668374929122f37badcbbeec765cda4a68a9475d6eb4e5159e71607d82aa2c664c6049d24077d1ab58f163858104a86367f3ef51a33b3
diff --git a/media-libs/libsdl2/libsdl2-2.0.10.ebuild b/media-libs/libsdl2/libsdl2-2.0.10.ebuild
index 9bdb31f10609..6dae045ac1b9 100644
--- a/media-libs/libsdl2/libsdl2-2.0.10.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libvisio/Manifest b/media-libs/libvisio/Manifest
index d7ed21296511..40cf0f6622f2 100644
--- a/media-libs/libvisio/Manifest
+++ b/media-libs/libvisio/Manifest
@@ -1,4 +1,6 @@
 DIST libvisio-0.1.6.tar.xz 676396 BLAKE2B dbd96b64a3789e275a47fe59cd939620787937e31ee11b7af7977575c183ade233afdb952d4c2e362312ae400d23726cbd01e3ccb644c9a413abc84ddbe0f161 SHA512 58cee8cfe4205b2cad2f11dbe17882e57ebf0d10500116ca9d8d120e138f8eb0c65a5fea3bd7d2746bf8140377ee9deb34258597e028f9fdc8d21f270606cce1
+DIST libvisio-0.1.7.tar.xz 854296 BLAKE2B db5dd96d769c237bc2926d52a43c2496adca50b74133ea3c81df7ba5a61824891623eb33b4801b463b27f5c03946ea7ffcf827b98c95139c9659b0a1b0f7b604 SHA512 c26f67a09fa6a6d0bf6f3fff5590d5cf16983630d4f7cfcf86d9461baec58dbdf7989fd934be6db0639ca043c160aac2d008275afb9e047766bc878ac579a9ea
 EBUILD libvisio-0.1.6.ebuild 1210 BLAKE2B d2ea49d29ab3c84b415849c7434fd249e2d2d133c6e68db5f01b6bdb561aec6197ebbe3798a7112ca0c41a307fe3f08ba6e176b0f2ac6a43f7c8984f2a54c136 SHA512 b64ee3644f2eb32d2d9cf7eee267f04e4f60b49015ea7014b341d1643b7a3757d45ee93c6a8eb1ba580991ae5becfeeceefc0cef382a0d63c0239bff229f5530
-EBUILD libvisio-9999.ebuild 1211 BLAKE2B 50fe1bbacc7ac8885aa556a5a1123267567e5cc7b3db06ba5b3341b9511bd254c8899135c6a64bd053908d31a4634b35e26a6f87229fd972a1725d69b1d2df3a SHA512 50653377d8d8e6b326ac79e4de255b793db97f0d4fc12520117174a7d96746c435af694e2f7c8fb367abb7522ee3a3145ff6387dee0cdf85ec14d2d15042b9fa
+EBUILD libvisio-0.1.7.ebuild 1251 BLAKE2B 2bc8acf7656e4a83c5de89d5a33d0bbc39d50865786eb10c3966ec2ec306e7ba00cfb93717aba30aaea9cdaff6b56fd9265bb606c21cb891b37f9ba9ec2b9a5e SHA512 4857277b54992988cf485cc82bbaefbe05504a73e87817dca51e79bb1b1f51b79fac81f0b6775b3552e5f60d4f4b1a31d6449f25ae66bc66babf5d7c184d4471
+EBUILD libvisio-9999.ebuild 1251 BLAKE2B 2bc8acf7656e4a83c5de89d5a33d0bbc39d50865786eb10c3966ec2ec306e7ba00cfb93717aba30aaea9cdaff6b56fd9265bb606c21cb891b37f9ba9ec2b9a5e SHA512 4857277b54992988cf485cc82bbaefbe05504a73e87817dca51e79bb1b1f51b79fac81f0b6775b3552e5f60d4f4b1a31d6449f25ae66bc66babf5d7c184d4471
 MISC metadata.xml 321 BLAKE2B 845e098f8136b178e62b70bb06d8ce26ed7e2b9aec93358180d36cc8de5d4436501fa13521dcc7b4a7f8e311603b25c9d30d23db216008d3d96af5e462611a9a SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12
diff --git a/media-libs/libvisio/libvisio-0.1.7.ebuild b/media-libs/libvisio/libvisio-0.1.7.ebuild
new file mode 100644
index 000000000000..e4147a14c125
--- /dev/null
+++ b/media-libs/libvisio/libvisio-0.1.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libvisio.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev-www.libreoffice.org/src/libvisio/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Library parsing the file format of MS Visio documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="doc static-libs test tools"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/librevenge
+	dev-libs/libxml2
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-util/gperf
+	sys-devel/libtool
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# bug 619688
+	append-cxxflags -std=c++14
+
+	local myeconfargs=(
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libvisio/libvisio-9999.ebuild b/media-libs/libvisio/libvisio-9999.ebuild
index 1f7cc355b43d..e4147a14c125 100644
--- a/media-libs/libvisio/libvisio-9999.ebuild
+++ b/media-libs/libvisio/libvisio-9999.ebuild
@@ -1,35 +1,39 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libvisio.git"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libvisio.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev-www.libreoffice.org/src/libvisio/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
 
-DESCRIPTION="Library parsing the visio documents"
+DESCRIPTION="Library parsing the file format of MS Visio documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libvisio/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc static-libs test tools"
 
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	dev-libs/icu:=
 	dev-libs/librevenge
 	dev-libs/libxml2
 "
 DEPEND="${RDEPEND}
-	dev-lang/perl
 	dev-libs/boost
 	dev-util/gperf
 	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )
 "
 
@@ -43,11 +47,13 @@ src_configure() {
 	# bug 619688
 	append-cxxflags -std=c++14
 
-	econf \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
+	local myeconfargs=(
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
 		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index e411923164c3..12b41b558132 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,3 +1,3 @@
 DIST libvorbis-1.3.6.tar.xz 1195388 BLAKE2B 9fc1dd125fdecb95687ea159b75cd66eed21329ec0795a3050e52e6cc58e1aac7b084ca25c4e52ca6f251ff474f6d71a716c0fbb2367beda8eb6a51a8fa9049a SHA512 a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132
 EBUILD libvorbis-1.3.6.ebuild 1057 BLAKE2B 5633c69a61a40cd406d4c1e4e6b13bc37efc265af077ac12a9b560af0568ac97aac7bea6d5d0ded1360f9709bbfec0bac27dbbe56ecfaa8c683e8934f7222035 SHA512 61921c5138a00fb34a3f5a66e810115cb2eb22c0ab09a413947f8cffa7e3b04f8ccd1a7259cc228905c73852b3275b36137308b9701639fa36a164d35cdcb01a
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
+MISC metadata.xml 329 BLAKE2B a6d5d9be9186aaf3d6735d864b6cb04bffa351cc1a1ddc13e469ca002502048e74ae672f4079626afcb89798faa4628b6b859d200b241c4d643b65ff9c23e6ca SHA512 2fde69847e03cd50deb51ecb44508c41ffbdada22e1838a4e4a6f8165f550aa107849705b666166fe5cd9b1372a76bc5c50eeadb560a76043563dfdc98ce14bf
diff --git a/media-libs/libvorbis/metadata.xml b/media-libs/libvorbis/metadata.xml
index c870d0eef0ab..1240f83acdcf 100644
--- a/media-libs/libvorbis/metadata.xml
+++ b/media-libs/libvorbis/metadata.xml
@@ -5,4 +5,7 @@
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:xiph:libvorbis</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index eb2b32167bd0..daa470e2bcce 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -13,7 +13,7 @@ DIST libvpx-testdata-1.8.0.tar.xz 418337232 BLAKE2B 1336e522f18a8f7812b4e7e4de7b
 EBUILD libvpx-1.5.0.ebuild 3954 BLAKE2B f83ffbdd1a1f157f57f28184e1103bc172d6330d6e1146ae6014fe7792a118d8c7a4237ad638af4b4e441c81a6d0dc9e1edb0e430eb5155921c77d6f2c39283a SHA512 ae28b6eafcbb42b447a715236594c0cd72665925cf763c8579a668d0424ec86f6258ec10a8bdd0baa0ce332f792e9cb919223e5e4b1fedd2fcd49dce14b15c1c
 EBUILD libvpx-1.6.0-r1.ebuild 3566 BLAKE2B a3d55b41879c3b407bc8fdda418574c4d4a3bb5fc4cd6000af3841c28384f50e8d5f2faf72d33cafa65c6a3037876c471b660e6d48d0de26351c9d038555e1c2 SHA512 8b69bee233977ba30075c2330c0713f9e5615a4bb4c6668af182eb622a1cdb6aeb8318659e1fb397330ebfddb096bd158fddfecf8b6680aabb146a69f173dee6
 EBUILD libvpx-1.6.1.ebuild 3920 BLAKE2B e1350052f0e7542d4e5458305eb7b93b8e9f2399894ca52cbdad78145189429b338deafdfd63b5ef42c55a3e0da9d8c6182113e65cdc60f5608e0bf39ada8abe SHA512 fe68cbf448458d1b36434e5ecc5902577d6e557c06a090cb5695360cd32795052d74ffc1994e6e263c896fa463097224d9ec8d6b08f2a187efa6664b2a1f55ad
-EBUILD libvpx-1.7.0.ebuild 3879 BLAKE2B 76860ba6f79982627fc9294783d2fb9b532f2e12465d1ae17ba4e3ee52982a116c21814342e38f1a32de979a12e8f54636aaf4a56a56e235ae9c43ee87bb2ae3 SHA512 25aec6be6cd163592d11a558bb33b7ab1a45824f44c07385f7707748a1403c01accf7b51f9ffc73ca8638bfc362b454ec3c43dbecb060242c789c57fa17f61a8
+EBUILD libvpx-1.7.0.ebuild 3878 BLAKE2B cb544a168e9c1c3a7820fa193e1a61f7f42fb574c8ee1b6a041307c8afda5d4f20e404f6cc9240512ee77309df05c97e2397d62d9ff5c8654a8e3be6eb7eccbe SHA512 f7cbaaa4fcea4614693ac123b25ab91c6cde551502db362a39830005f57b3a56c303ef56ecdc6e2e89ae46c66da3de7031e37ed82300e3a1a8e108e1b7b3edda
 EBUILD libvpx-1.8.0-r1.ebuild 3352 BLAKE2B 2c43ff1789cdfe7858b17435f7e14db4a32c357d8f63d5c32ade679e088d6e8382552b2238ab84b2d608198bf8b7fa60dc73042ac9df64b83ed346c18fe5cffe SHA512 38e95bac7f2bdf989fcebf4f41c609424d1a27771e105e65ab6daa17639a5e3c0465a3ec5c6821e96e110d47df020e812ef2b5c59520dbd4fb8c46362f4ecdca
 EBUILD libvpx-1.8.0.ebuild 3917 BLAKE2B 7519a4bb61ceede17f50345bc1746cd6fef84f4942e8647bf74360ee6c42500351acef6ac0099a6400a902f910fc636db3be03c1fefe1a0f39b9a1ad02c3cdf7 SHA512 798f2eeb93e0e13539c1dea71d34516c31e95d4d3330f5d9e5adbacb26c8eb5be6b421b98a5a1559aba6e600bf7b71031e31e660cf4a77a09c00dd79b214a30d
-MISC metadata.xml 575 BLAKE2B f8e5f9a2663a651155da3bde8284ace9c5c9394842c279a83b58e61f5bbdbcb279b71609b1129c7e1ebd61b02ca6d6f7374313815ea33d98d60affda0144c54f SHA512 748b5a315632723c78b1db5eaa0f62e331d28874a9dbc42ebc66089eee1e2e54fc19f33c7188c4b84977b35762c94c2319787cb7528f7c22382bccd715b247a5
+MISC metadata.xml 664 BLAKE2B 78c866b8ee8a4b266156652bd6352d1ad0b7f28c88922dd31868623b1eca6530aab0a391c7264e5f1dffb9c1379adeb3b115846e99e1ab8a2ae1e58f527234ca SHA512 96644cef2185474da831eb928645cb7607216242097e8d1f1b887071817e282e22ae5646583208bfacf4467029b9dc2d3cfb888bba085bbf5b493dc98c3a7ef9
diff --git a/media-libs/libvpx/libvpx-1.7.0.ebuild b/media-libs/libvpx/libvpx-1.7.0.ebuild
index e37ec4d62fa8..4e8b1c2d3823 100644
--- a/media-libs/libvpx/libvpx-1.7.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.7.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
 REQUIRED_USE="
diff --git a/media-libs/libvpx/metadata.xml b/media-libs/libvpx/metadata.xml
index 5ef09d66f08d..af10bdba3483 100644
--- a/media-libs/libvpx/metadata.xml
+++ b/media-libs/libvpx/metadata.xml
@@ -13,4 +13,7 @@
 		<flag name="postproc">Enable additional post processing filters</flag>
 		<flag name="svc">Enable spatial-svc support (experimental)</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:john_koleszar:libvpx</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 4768075f8e97..7f0b667d0fe2 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -5,12 +5,14 @@ DIST mesa-19.1.5.tar.xz 10938452 BLAKE2B 7d21cad04c8172006e73d84148cfeb785b3d5f9
 DIST mesa-19.1.6.tar.xz 10939908 BLAKE2B cd7204614898621f3b242788667fc64e0ca00f3a5650e60cb8e74ef2760300245734741355874e05c97d482f3bd06a1755fc5e9cee804a6d5a050f20c8bc70a9 SHA512 399ce97a293769893ef9a4a6af1f77c7d835f5405bdbc03bbf9b73e052e4ff3b43dec5dafd6b9fedaaf2c59531aeccaa0f685a8bfdc5719a26c3815fc7f68024
 DIST mesa-19.2.0-rc1.tar.xz 11452972 BLAKE2B 64a844a06110c64f4badd8d64a63cee4fbb25c6e2bb17062277e54094c8a5342eac7058ae7ba7b0aefc4e0795aac371caac26e54cc3612afaf54d41b94e09b18 SHA512 babafb6ec668834e041a62e966452fe315e4f5afef8e1f7d35e038993c73b32ea6ad9929399edae4686f44cd11704fd9a8801821befc1d1767bc0662d4c39fac
 DIST mesa-19.2.0-rc2.tar.xz 11456920 BLAKE2B 673ff105395731ca65cc99bee1f73c582b40e05983bd08c46f07384e579c8d449e7f5371461542ebbcfc32022382f206adf7dcc43ed8713cb35e37c1cc69e03c SHA512 a42f7add01afd327838bd57ea4086ad4b9de669c6caf443129e325171bc53e3321c898d8d0075c7e50c4e0fdd094d66a60e35a0620e25e6c52648c5ac0008dcc
-EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B b828c73a96f85de9c392444fb1a697d86ebc7d98d6b7571757e2900c84f16c62bf82e11fdcf037757ffcd7cf5a560b638da5bc6c51d3086493741fd3f00e286d SHA512 24fbbc005fd0fa7376dc960d6388861c041a5320f6b58f3fd55ffd15d2d09816aff3034154a2047734c0ce9596c1c9187b01973fd45e87a64e04325074463973
-EBUILD mesa-19.1.3.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
-EBUILD mesa-19.1.4.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
-EBUILD mesa-19.1.5.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
-EBUILD mesa-19.1.6.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
-EBUILD mesa-19.2.0_rc1.ebuild 14394 BLAKE2B 5ef689540560ea18a770fc323bc2b0db34a592c5852c83f9dac2ddc7f5e0cef0f835f10894d42476f68b06fa7599fcfbadfdbf251e7904e7f915a75b443ccf46 SHA512 730dd456b2ad407e699f38f977d78804f60093f609937b3a2ae56f7014a63421c62d967ba31475df5ecafc76f89749079dce034d4f45f53eb41660e24d7fb32a
-EBUILD mesa-19.2.0_rc2.ebuild 14394 BLAKE2B e74b64fb5cba5b96b954e5c5a85ac751eb33cba282833d59a03466bb48bbafdfe3299c5724380ad8794703ebf7082d04dd429f32572e1dff25f79de19367fa19 SHA512 09d6cab0d1dd2c14934e8e0803528638128b94bb7e1d15516eae7b740aff9ee298e35e270ae8f4b963223efe6c3974117a527c3ec10c0b2dc265f41cacccc06e
-EBUILD mesa-9999.ebuild 14394 BLAKE2B e74b64fb5cba5b96b954e5c5a85ac751eb33cba282833d59a03466bb48bbafdfe3299c5724380ad8794703ebf7082d04dd429f32572e1dff25f79de19367fa19 SHA512 09d6cab0d1dd2c14934e8e0803528638128b94bb7e1d15516eae7b740aff9ee298e35e270ae8f4b963223efe6c3974117a527c3ec10c0b2dc265f41cacccc06e
-MISC metadata.xml 1945 BLAKE2B 9661d981c3472b6726f603982e94ba9a00066994bee201fcd0127eb8a7b436ea9112d55097054e079ba98f35f12826230e33f4bbb9ed23e19453bcb70d2140f9 SHA512 849994334f6ff6fa8e737e9b33eac509b21d50b0f71e4c0f1f6d7d1d13c7dfbc47611185562fa91a183b4411e9c10352d172ce065bd76c41bf83ac6929950c45
+DIST mesa-19.2.0-rc3.tar.xz 11458088 BLAKE2B 35fac57dbf0d13f62f32695235ecc7c47b505b4eff55e7b06f61e1cd7a9977675ff9e5e2131e20dae3a666ad13b1f52a9ad36405731885c84cfa66a90fc8232e SHA512 378bb27073d99032c489a0fcc44157017d27d01c24c3bb7e3e32f59b298cf0c7409351d18fbbfb1ccfb799e02f9166450dc73390e98a026f60a4ab0583944d68
+EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B c005b9103e2bac385a5c4889ab89a5809ea9a989aa657cf9899b94634d49dc4eb1f31a791aa0aa40482b9a0b64a85200006dbfa1758e7d2a73a5029d585ac320 SHA512 3f496e20c5248ca8c4c83ad18db01bd3ad129496d24020621e85ff68e90b89d4ec5c80b7ebe651f6ee106d340e0afe017f6e9b985d27f012c3c770e601cb7a0d
+EBUILD mesa-19.1.3.ebuild 14274 BLAKE2B 82de3e50d45b9a0be9f608d1da0b7f64325ce0d42f7f8437241fe977dc41799ef771b346db0ba60eee5b406067f5ffa654262fd616b2e8dbf0f2e681aaced65f SHA512 40847bf9551c7a8e1f981fab116b4d3687022901c6a8396d9029f04083aa5e7770b8f555b1dc22ba84a0646f1b67a73350ba95b014c923579227eb81a997baec
+EBUILD mesa-19.1.4.ebuild 14274 BLAKE2B 82de3e50d45b9a0be9f608d1da0b7f64325ce0d42f7f8437241fe977dc41799ef771b346db0ba60eee5b406067f5ffa654262fd616b2e8dbf0f2e681aaced65f SHA512 40847bf9551c7a8e1f981fab116b4d3687022901c6a8396d9029f04083aa5e7770b8f555b1dc22ba84a0646f1b67a73350ba95b014c923579227eb81a997baec
+EBUILD mesa-19.1.5.ebuild 14274 BLAKE2B 82de3e50d45b9a0be9f608d1da0b7f64325ce0d42f7f8437241fe977dc41799ef771b346db0ba60eee5b406067f5ffa654262fd616b2e8dbf0f2e681aaced65f SHA512 40847bf9551c7a8e1f981fab116b4d3687022901c6a8396d9029f04083aa5e7770b8f555b1dc22ba84a0646f1b67a73350ba95b014c923579227eb81a997baec
+EBUILD mesa-19.1.6.ebuild 14274 BLAKE2B 82de3e50d45b9a0be9f608d1da0b7f64325ce0d42f7f8437241fe977dc41799ef771b346db0ba60eee5b406067f5ffa654262fd616b2e8dbf0f2e681aaced65f SHA512 40847bf9551c7a8e1f981fab116b4d3687022901c6a8396d9029f04083aa5e7770b8f555b1dc22ba84a0646f1b67a73350ba95b014c923579227eb81a997baec
+EBUILD mesa-19.2.0_rc1.ebuild 14394 BLAKE2B db2e7cb992c693bb948260bdf04ee057f6ef836b84aa1350f91f52299da85f85f38bdbcffd17fe9bd2b6a5f0b663d93a9a7198c90b589a81518b25c6b92445dd SHA512 d722fa2b8ea85fb783c0b229344ecf936abb1f29b402a3366147aaefc328184bbe967be244dad54159760d6e57414a048dcccb19fd154b1b4fa2d6dbfb97ce59
+EBUILD mesa-19.2.0_rc2.ebuild 14394 BLAKE2B 2aa8740cce7c6fe3973dba6da9d0223f6263dda594a046c1267f96b799dc8b9429e8cdcfe8968dd57891dd90faeb1c3ab454cdaae00a3a2bee47421905f65055 SHA512 61949a0e14489d8850ab94de369120457be092cd68ee033fb818a0c8ab36462e1d07cfd9c9bcb65bdfa8b382d7404acbc6df7b857813b966b3334c7598055b1d
+EBUILD mesa-19.2.0_rc3.ebuild 14394 BLAKE2B 2aa8740cce7c6fe3973dba6da9d0223f6263dda594a046c1267f96b799dc8b9429e8cdcfe8968dd57891dd90faeb1c3ab454cdaae00a3a2bee47421905f65055 SHA512 61949a0e14489d8850ab94de369120457be092cd68ee033fb818a0c8ab36462e1d07cfd9c9bcb65bdfa8b382d7404acbc6df7b857813b966b3334c7598055b1d
+EBUILD mesa-9999.ebuild 14394 BLAKE2B 2aa8740cce7c6fe3973dba6da9d0223f6263dda594a046c1267f96b799dc8b9429e8cdcfe8968dd57891dd90faeb1c3ab454cdaae00a3a2bee47421905f65055 SHA512 61949a0e14489d8850ab94de369120457be092cd68ee033fb818a0c8ab36462e1d07cfd9c9bcb65bdfa8b382d7404acbc6df7b857813b966b3334c7598055b1d
+MISC metadata.xml 2000 BLAKE2B c38c6f85a08bdb71f3921847d03c8a2849a43def253c200cb3f21d68142f3a5065cb2e1a2170093d91f3aba34c99fdd9bab840f2bc62ce05f11484b2edb3cb40 SHA512 d55b9c0ff6a97d995a150ee10643c869359370222ab29712da25f69c5671a4e6988e2d508c956082cc7165db96f42289d25daecf230d36efe2240e4f377d1c72
diff --git a/media-libs/mesa/mesa-19.0.8.ebuild b/media-libs/mesa/mesa-19.0.8.ebuild
index f6cc92985b5b..67340d9d392b 100644
--- a/media-libs/mesa/mesa-19.0.8.ebuild
+++ b/media-libs/mesa/mesa-19.0.8.ebuild
@@ -37,7 +37,7 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
 	vdpau vulkan wayland xa xvmc"
 
 REQUIRED_USE="
@@ -99,7 +99,7 @@ RDEPEND="
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
 			)
 		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
 					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 					dev-libs/libclc
@@ -288,7 +288,7 @@ pkg_pretend() {
 	fi
 
 	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
 		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
 		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
 		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
@@ -349,7 +349,7 @@ multilib_src_configure() {
 	if use gallium; then
 		emesonargs+=(
 			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
+			$(meson_use lm-sensors lmsensors)
 			$(meson_use unwind libunwind)
 		)
 
diff --git a/media-libs/mesa/mesa-19.1.3.ebuild b/media-libs/mesa/mesa-19.1.3.ebuild
index 0fd4ae716a5f..b5c1ff6540fc 100644
--- a/media-libs/mesa/mesa-19.1.3.ebuild
+++ b/media-libs/mesa/mesa-19.1.3.ebuild
@@ -37,7 +37,7 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
 	vdpau vulkan vulkan-overlay wayland xa xvmc"
 
 REQUIRED_USE="
@@ -100,7 +100,7 @@ RDEPEND="
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
 			)
 		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
 					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 					dev-libs/libclc
@@ -293,7 +293,7 @@ pkg_pretend() {
 	fi
 
 	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
 		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
 		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
 		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
@@ -354,7 +354,7 @@ multilib_src_configure() {
 	if use gallium; then
 		emesonargs+=(
 			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
+			$(meson_use lm-sensors lmsensors)
 			$(meson_use unwind libunwind)
 		)
 
diff --git a/media-libs/mesa/mesa-19.1.4.ebuild b/media-libs/mesa/mesa-19.1.4.ebuild
index 0fd4ae716a5f..b5c1ff6540fc 100644
--- a/media-libs/mesa/mesa-19.1.4.ebuild
+++ b/media-libs/mesa/mesa-19.1.4.ebuild
@@ -37,7 +37,7 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
 	vdpau vulkan vulkan-overlay wayland xa xvmc"
 
 REQUIRED_USE="
@@ -100,7 +100,7 @@ RDEPEND="
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
 			)
 		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
 					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 					dev-libs/libclc
@@ -293,7 +293,7 @@ pkg_pretend() {
 	fi
 
 	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
 		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
 		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
 		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
@@ -354,7 +354,7 @@ multilib_src_configure() {
 	if use gallium; then
 		emesonargs+=(
 			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
+			$(meson_use lm-sensors lmsensors)
 			$(meson_use unwind libunwind)
 		)
 
diff --git a/media-libs/mesa/mesa-19.1.5.ebuild b/media-libs/mesa/mesa-19.1.5.ebuild
index 0fd4ae716a5f..b5c1ff6540fc 100644
--- a/media-libs/mesa/mesa-19.1.5.ebuild
+++ b/media-libs/mesa/mesa-19.1.5.ebuild
@@ -37,7 +37,7 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
 	vdpau vulkan vulkan-overlay wayland xa xvmc"
 
 REQUIRED_USE="
@@ -100,7 +100,7 @@ RDEPEND="
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
 			)
 		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
 					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 					dev-libs/libclc
@@ -293,7 +293,7 @@ pkg_pretend() {
 	fi
 
 	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
 		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
 		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
 		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
@@ -354,7 +354,7 @@ multilib_src_configure() {
 	if use gallium; then
 		emesonargs+=(
 			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
+			$(meson_use lm-sensors lmsensors)
 			$(meson_use unwind libunwind)
 		)
 
diff --git a/media-libs/mesa/mesa-19.1.6.ebuild b/media-libs/mesa/mesa-19.1.6.ebuild
index 0fd4ae716a5f..b5c1ff6540fc 100644
--- a/media-libs/mesa/mesa-19.1.6.ebuild
+++ b/media-libs/mesa/mesa-19.1.6.ebuild
@@ -37,7 +37,7 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
 	vdpau vulkan vulkan-overlay wayland xa xvmc"
 
 REQUIRED_USE="
@@ -100,7 +100,7 @@ RDEPEND="
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
 			)
 		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
 					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 					dev-libs/libclc
@@ -293,7 +293,7 @@ pkg_pretend() {
 	fi
 
 	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
 		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
 		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
 		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
@@ -354,7 +354,7 @@ multilib_src_configure() {
 	if use gallium; then
 		emesonargs+=(
 			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
+			$(meson_use lm-sensors lmsensors)
 			$(meson_use unwind libunwind)
 		)
 
diff --git a/media-libs/mesa/mesa-19.2.0_rc1.ebuild b/media-libs/mesa/mesa-19.2.0_rc1.ebuild
index f226c4813d78..c925dd2d5dd2 100644
--- a/media-libs/mesa/mesa-19.2.0_rc1.ebuild
+++ b/media-libs/mesa/mesa-19.2.0_rc1.ebuild
@@ -36,7 +36,7 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
+	lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
 	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
 
 REQUIRED_USE="
@@ -96,7 +96,7 @@ RDEPEND="
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
 			)
 		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
 					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 					dev-libs/libclc
@@ -299,7 +299,7 @@ pkg_pretend() {
 	fi
 
 	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
 		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
 		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
 		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
@@ -360,7 +360,7 @@ multilib_src_configure() {
 	if use gallium; then
 		emesonargs+=(
 			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
+			$(meson_use lm-sensors lmsensors)
 			$(meson_use unwind libunwind)
 		)
 
diff --git a/media-libs/mesa/mesa-19.2.0_rc2.ebuild b/media-libs/mesa/mesa-19.2.0_rc2.ebuild
index 631e1efea884..b7b3a5803880 100644
--- a/media-libs/mesa/mesa-19.2.0_rc2.ebuild
+++ b/media-libs/mesa/mesa-19.2.0_rc2.ebuild
@@ -36,7 +36,7 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
+	lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
 	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
 
 REQUIRED_USE="
@@ -96,7 +96,7 @@ RDEPEND="
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
 			)
 		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
 					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 					dev-libs/libclc
@@ -299,7 +299,7 @@ pkg_pretend() {
 	fi
 
 	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
 		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
 		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
 		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
@@ -360,7 +360,7 @@ multilib_src_configure() {
 	if use gallium; then
 		emesonargs+=(
 			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
+			$(meson_use lm-sensors lmsensors)
 			$(meson_use unwind libunwind)
 		)
 
diff --git a/media-libs/mesa/mesa-19.2.0_rc3.ebuild b/media-libs/mesa/mesa-19.2.0_rc3.ebuild
new file mode 100644
index 000000000000..b7b3a5803880
--- /dev/null
+++ b/media-libs/mesa/mesa-19.2.0_rc3.ebuild
@@ -0,0 +1,543 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+	inherit git-r3
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+	!test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vulkan? ( dri3
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
+	wayland? ( egl gbm )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
+	video_cards_lima?   ( gallium )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_panfrost? ( gallium )
+	video_cards_radeon? ( || ( classic gallium )
+						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vc4? ( gallium )
+	video_cards_virgl? ( gallium )
+	video_cards_vivante? ( gallium gbm )
+	video_cards_vmware? ( gallium )
+	xa? ( X )
+	xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99"
+RDEPEND="
+	!app-eselect/eselect-mesa
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
+	gallium? (
+		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+		llvm? (
+			video_cards_radeonsi? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_r600? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+			video_cards_radeon? (
+				virtual/libelf:0=[${MULTILIB_USEDEP}]
+			)
+		)
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+		opencl? (
+					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					dev-libs/libclc
+					virtual/libelf:0=[${MULTILIB_USEDEP}]
+				)
+		vaapi? (
+			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+		)
+		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	)
+	wayland? (
+		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.8
+	)
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+	video_cards_intel? (
+		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	)
+	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	)
+"
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+	|| (
+		sys-devel/llvm:10[${MULTILIB_USEDEP}]
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
+		sys-devel/llvm:7[${MULTILIB_USEDEP}]
+	)
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+	llvm? (
+		opencl? (
+			video_cards_r600? (
+				${CLANG_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${CLANG_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${CLANG_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${CLANG_DEPSTR}
+					)
+				)
+			)
+		)
+		!opencl? (
+			video_cards_r600? (
+				${LLVM_DEPSTR_AMDGPU}
+			)
+			!video_cards_r600? (
+				video_cards_radeonsi? (
+					${LLVM_DEPSTR_AMDGPU}
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeonsi? (
+					video_cards_radeon? (
+						${LLVM_DEPSTR_AMDGPU}
+					)
+				)
+			)
+			!video_cards_r600? (
+				!video_cards_radeon? (
+					!video_cards_radeonsi? (
+						${LLVM_DEPSTR}
+					)
+				)
+			)
+		)
+	)
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+	X? (
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-base/xorg-proto
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	opencl? (
+		>=sys-devel/gcc-4.6
+	)
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	usr/lib*/libglapi.so.0.0.0
+	usr/lib*/libGLESv1_CM.so.1.1.0
+	usr/lib*/libGLESv2.so.2.0.0
+	usr/lib*/libGL.so.1.2.0
+	usr/lib*/libOSMesa.so.8.0.0
+)"
+
+llvm_check_deps() {
+	local flags=${MULTILIB_USEDEP}
+	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+	then
+		flags+=",llvm_targets_AMDGPU(-)"
+	fi
+
+	if use opencl; then
+		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+	fi
+	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+	if use opencl; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi; then
+			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
+		fi
+	fi
+
+	if use vaapi; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use vdpau; then
+		if ! use video_cards_r300 &&
+		   ! use video_cards_r600 &&
+		   ! use video_cards_radeonsi &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+		fi
+	fi
+
+	if use xa; then
+		if ! use video_cards_freedreno &&
+		   ! use video_cards_nouveau &&
+		   ! use video_cards_vmware; then
+			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+		fi
+	fi
+
+	if use xvmc; then
+		if ! use video_cards_r600 &&
+		   ! use video_cards_nouveau; then
+			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
+		fi
+	fi
+
+	if ! use gallium; then
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
+		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
+		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
+		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
+		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
+		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
+	fi
+
+	if ! use llvm; then
+		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
+	fi
+}
+
+python_check_deps() {
+	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	if use llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=()
+
+	if use classic; then
+		# Intel code
+		dri_driver_enable video_cards_i915 i915
+		dri_driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			dri_driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		dri_driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		dri_driver_enable video_cards_r100 r100
+		dri_driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+			! use video_cards_r200; then
+			dri_driver_enable video_cards_radeon r100 r200
+		fi
+	fi
+
+	emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+	if use gallium; then
+		emesonargs+=(
+			$(meson_use llvm)
+			$(meson_use lm-sensors lmsensors)
+			$(meson_use unwind libunwind)
+		)
+
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use d3d9 gallium-nine))
+		else
+			emesonargs+=(-Dgallium-nine=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vaapi gallium-va))
+			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+		else
+			emesonargs+=(-Dgallium-va=false)
+		fi
+
+		if use video_cards_r300 ||
+		   use video_cards_r600 ||
+		   use video_cards_radeonsi ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use vdpau gallium-vdpau))
+		else
+			emesonargs+=(-Dgallium-vdpau=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_nouveau ||
+		   use video_cards_vmware; then
+			emesonargs+=($(meson_use xa gallium-xa))
+		else
+			emesonargs+=(-Dgallium-xa=false)
+		fi
+
+		if use video_cards_r600 ||
+		   use video_cards_nouveau; then
+			emesonargs+=($(meson_use xvmc gallium-xvmc))
+		else
+			emesonargs+=(-Dgallium-xvmc=false)
+		fi
+
+		if use video_cards_freedreno ||
+		   use video_cards_lima ||
+		   use video_cards_panfrost ||
+		   use video_cards_vc4 ||
+		   use video_cards_vivante; then
+			gallium_enable -- kmsro
+		fi
+
+		gallium_enable video_cards_lima lima
+		gallium_enable video_cards_panfrost panfrost
+		gallium_enable video_cards_vc4 vc4
+		gallium_enable video_cards_vivante etnaviv
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+
+		# Only one i915 driver (classic vs gallium). Default to classic.
+		if ! use classic; then
+			gallium_enable video_cards_i915 i915
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+				gallium_enable video_cards_intel i915
+			fi
+		fi
+
+		gallium_enable video_cards_iris iris
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+			! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		gallium_enable video_cards_virgl virgl
+
+		# opencl stuff
+		emesonargs+=(
+			-Dgallium-opencl="$(usex opencl icd disabled)"
+		)
+	fi
+
+	if use vulkan; then
+		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
+		vulkan_enable video_cards_radeonsi amd
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if [[ ${ABI} == x86 ]]; then
+		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+	fi
+
+	if use gallium; then
+		gallium_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+	else
+		dri_driver_enable -- swrast
+		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+	fi
+
+	driver_list() {
+		local drivers="$(sort -u <<< "${1// /$'\n'}")"
+		echo "${drivers//$'\n'/,}"
+	}
+
+	emesonargs+=(
+		$(meson_use test build-tests)
+		-Dglx=$(usex X dri disabled)
+		-Dshared-glapi=true
+		$(meson_use dri3)
+		$(meson_use egl)
+		$(meson_use gbm)
+		$(meson_use gles1)
+		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
+		$(meson_use selinux)
+		-Dvalgrind=$(usex valgrind auto false)
+		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
+
+multilib_src_test() {
+	meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		DRI_DRIVERS+=("$@")
+	fi
+}
+
+gallium_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		GALLIUM_DRIVERS+=("$@")
+	fi
+}
+
+vulkan_enable() {
+	if [[ $1 == -- ]] || use $1; then
+		shift
+		VULKAN_DRIVERS+=("$@")
+	fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 631e1efea884..b7b3a5803880 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -36,7 +36,7 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
-	lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
+	lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
 	vdpau vulkan vulkan-overlay wayland +X xa xvmc"
 
 REQUIRED_USE="
@@ -96,7 +96,7 @@ RDEPEND="
 				virtual/libelf:0=[${MULTILIB_USEDEP}]
 			)
 		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
 					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
 					dev-libs/libclc
@@ -299,7 +299,7 @@ pkg_pretend() {
 	fi
 
 	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+		use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
 		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
 		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
 		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
@@ -360,7 +360,7 @@ multilib_src_configure() {
 	if use gallium; then
 		emesonargs+=(
 			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
+			$(meson_use lm-sensors lmsensors)
 			$(meson_use unwind libunwind)
 		)
 
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 81c21d9fef22..73e827967cee 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -29,6 +29,7 @@
 		<flag name="xvmc">Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:mesa3d:mesa</remote-id>
 		<remote-id type="sourceforge">mesa3d</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 4a090f2259c3..44e699b2cc5e 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -4,4 +4,4 @@ DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c89
 DIST opencollada-1.6.63.tar.gz 12094044 BLAKE2B dbe38ab2976f72d47a38bd147e05a58555acc2b70618d4d47d2beff87ace54f7fcd2f116b9ba9908cfb38b5699e547375e902128c2f378c295308f1601a18b17 SHA512 e1b92e932d0256224b026281fb5691219c5171f57b968307288b6e5481b5d6fee39825702e18017055bd0fb0e3d4c40b6ce526d3ce4defe2994138db54220d01
 EBUILD opencollada-1.6.62.ebuild 1628 BLAKE2B a29e1f0236cc8f4abc7a486b03b6e67e04e07022ea14e93e39b8835fe40da5d8b75c683264beb8b96158b114bcf33ee7ec9ee216f74e1cbed38e4e5325c4639c SHA512 0cb788227b1eb0581239463b7ce3af50c5bb4928a8377ae2bdeb37065535da5096fa35df67a3fda9f06e48d14ef232920dcdd22a758ed2cd4a7938372f036fae
 EBUILD opencollada-1.6.63.ebuild 1657 BLAKE2B a35b086ac9651e4360df3913b31aa8ff41ba7cdbabe325c1d712c561e93002b03989c6cd5c84d7f2bf0c9b227ede1313daa8da04485f44e97f6c92abed7cc040 SHA512 6719a2a2fcedd078474304a0aa357c6d09aa090a6ca50764e5b954c1b4afdae6262fc913d544020d7836d1cc03f2fac0690a5e108d6c21166070c2438cc28a1c
-MISC metadata.xml 340 BLAKE2B c4ce9d18d941b1c878c35600ec1323b21ee1d929210a9fa4c3121bac8b191a7c648933c5d7e50e4b5bfa88c99f73ffb7f43d5d47972de9f19402f68ee7e984eb SHA512 3e362593a8e284c0eb7ac86a3d7e8b2ba6ddc4a3c88478815517b1d12f1f03f05da4e8929ecad8f78bb7b8c40bc29020124f1ef1539302e3866fb7effe60fb75
+MISC metadata.xml 256 BLAKE2B 9e83a301f9fadaeea1559fbf7774e1d353df51a19661d95134705312a6f1465807f815f733b0ba72a6e891a551891fefc05de9a37f9c8cb2c2236e6e475962c5 SHA512 4ffbc8e0ad4a1456f33e5b568166f3e6285ffd42218fbc0d9f8f04c319a341c367aec0b92a1074029cd11ededf0c110a22f3358a47e2cdce5946a6d42c82fc30
diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index 48936abbe3fb..a3be9fdab74d 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dracwyrm@gentoo.org</email>
-		<name>Jonathan Scruggs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">KhronosGroup/OpenCOLLADA</remote-id>
 	</upstream>
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index b5c029fb4152..34992ca6258f 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -26,4 +26,4 @@ DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f7
 EBUILD opencv-2.4.13-r3.ebuild 5918 BLAKE2B 3ffd92b751e983cddd74e26d48e532973110a8fcd715641ead732bf4a1ed4802ac2c0385769d061f6632e33dfc1bf26758815bf1a896d020ef628de7df28c8d2 SHA512 0fae932f9326429f7c37a698c89b9cbf4da0c2e73640992211d9a8b7a5ce8b61d5e75d30f4f376345a992285fe40395b117c968daaf9e7db9b4cc52ff621bee8
 EBUILD opencv-3.4.1-r5.ebuild 18644 BLAKE2B 51d5bdf871fb91c0b89db7dd33e52d357c26fceb575631abc63d9bbaed98a583d8731c0deb1e0e5d39745d01ab9a32a78aaa6922d231b1ec7b1cff0ec6976557 SHA512 512add3c726f89329d3fda55d541d68ca8099aa537ebed6833d0667bd8304c8f3af7d45bac23991be5b99e6559b771546a6b69e4c6a9a72a108b695d0f93ef36
 EBUILD opencv-3.4.1-r6.ebuild 18717 BLAKE2B 419a8c987559d22076ddd3154172c2ae11c4986dcded798c46da3569f46c3cc78f9a1e602ef5d91c3760ea4ba8ae6e2240bf20d007d77af7d1226794e2da77ef SHA512 510a0a6d6266961d88097c39146fe19488fad8c2539c2ae02440dee8623d17d36c010b5e6305a04e52c68c421e6d2942534d7aa1e652fe7ea09b3a5a5735089c
-MISC metadata.xml 2401 BLAKE2B 3d37ef4879324890e702119fffaaf075021fb22ee0b9393a58df46cf937a60403f0f48f90483bfc078079cb9f1177f866cfcee63d592ba93915fa96a438d064c SHA512 691287c588e60df6158ea070f61100214dc54c267f9f2c7ffbeabb75595e72641ced7cc33f119fed9bbf98df8832f977557fb4a1017eb65d9081ac1350d783b8
+MISC metadata.xml 2458 BLAKE2B 3102d768cb8308fa243ab9388110312ddf1a2adfd6aa31d8261192530bdb13e222338eb424c2102c12af129494d3025097b79e1cb34770238c8ef90d10b0a535 SHA512 e364a0811b3eab96adc83e800d6fad7ceb51d56b5c78ba1d363af19fe27c17bf644bb99a30e6235a6154971caeec389dcced8ba1cdca9586d8cfead8927617a0
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index ec3913cbbdd8..e9ef881716dc 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -29,6 +29,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
 		<flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:opencv:opencv</remote-id>
 		<remote-id type="sourceforge">opencvlibrary</remote-id>
 		<remote-id type="github">Itseez/opencv_contrib</remote-id>
 	</upstream>
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 3ec7b7d21889..6aee1b264dd6 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -3,4 +3,4 @@ AUX opensubdiv-3.3.0-fix-quotes.patch 432 BLAKE2B e2b80762392cfe6b9ddb714780adbf
 AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef
 DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d SHA512 65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81
 EBUILD opensubdiv-3.3.3.ebuild 1598 BLAKE2B c61ed763e2567b091e040097605cc646d80c48ce70842e816bccd3acfd03c9c36fbe6577229067e8a06720ce474c1ce650ce64c3b40d49a034c54c17cc231e82 SHA512 ab2e4725f77f7ef0cc804382af8616d06009c16d252c8fb9a880a8b8a8dfa87912436cc861652f31582ca374e7043dc28960cb6c6bb80fd098a382f7adf02cb2
-MISC metadata.xml 1145 BLAKE2B 21093cf63091de9706146ce01ddacd277ac425d947260ade355825eca4b0aafd0d0c487c8f85c66e3d455b766d4c566f01dac3ec0275018fba37bc30b2bafce8 SHA512 c9dc92192cf95c30f14516635a3e656a09f080aafc4404cf506e012e8d32173fdbdca63edef8f0c2769928eb62c9900ae810cfe4e64a95a735da5744c502ceeb
+MISC metadata.xml 1033 BLAKE2B 20a5a095aebccc15e85b0aadb56e9b561c667cc68c4424edc2c2c5ba31e742f3d4214bbe296bbed34be92c68efb3501b2135f9c21c5efbc451b8e03c45d159e9 SHA512 a28e16a69b38365b9d9524d0d468e9228a398cfdb85ba2fc1afb950063f3d25aaed1d48c798532fb71d2fc2ee0d83ceb80feb824af4bcab10746e945fce7dbcf
diff --git a/media-libs/opensubdiv/metadata.xml b/media-libs/opensubdiv/metadata.xml
index 6256d93f3128..62cc4a9a2116 100644
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -1,11 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dracwyrm@gentoo.org</email>
-		<name>Jonathan Scruggs</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 59ce2e52a036..0987499b6e51 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -9,4 +9,4 @@ EBUILD osl-1.10.5.ebuild 2062 BLAKE2B 167bf475ea3f3f3f3d25d434bf002b4f14335589bb
 EBUILD osl-1.8.12.ebuild 1784 BLAKE2B c01cae7aec718f704fe017dc0f3273db7e3046fa276b4b82030dafc4a59ab641b7faa20a7ce2735d52347a30b1188458a9b9f6316bd96bc406e3363018a51350 SHA512 d5148e294ac96cfd06639927af0b3d03a00193d1ffbf55b65e51e717e8ed72fc15cb81b3e418bcd9bde102ad8ede59b92aff966ae0dbb3e366f120706b119fa4
 EBUILD osl-1.9.6.ebuild 1748 BLAKE2B e6b99e1822ced26cf8d6e138f46d4c5e038f078e0b697ecd40e6cde3870efa945160af3cf83f675825fe5a878b5e5bd6a7ec8caea79d4961a0da23130d2d652b SHA512 d0ce4444dc300b869a520a7bc50ea1d95a0ac0342684495c0742a62e55a8f0cb9453ad71fa2ca0ba412970d7d0323409ae8eff99862908d80a24977ce3babaa5
 EBUILD osl-1.9.9.ebuild 1720 BLAKE2B 22d51d110a3128ece31bc2f0155e94f996ae65f2adc42690053305d4b8304737b82a991431114f48524fe5c1ab6b8643899e02a99a341ff5bf653fbff7990b91 SHA512 914cbed1d6020934a8139d8b7a553a275c09c4fa89178237c7105845e6e3cec86c5e1b163ec261a82237d0505c04b624f75294868d2ab469656b639bcefdb0c5
-MISC metadata.xml 922 BLAKE2B ccfefbc7d17c3d01264c68faac040d842870c34c8cb11850eb3cfa11590bf7944e43df40181f2cd5a277c3a811255d6e240a23c13a753df5341df2139c9a27dc SHA512 a7f73ff1ddd67a5965b4699cdba835629ca22bb48afae126ff0eebf83012363138ed01af45189c90201875ea8d2993fc3e52219f863649afdd23a751d2d5ebac
+MISC metadata.xml 810 BLAKE2B 85c4497ffc27bcf44682666135bebe083468c950618a5840fac008af4eca4dd902d371123d42f7ccfb3133e94dd2fbae22531d857e4e76bbafe10e55aa6b009b SHA512 cd69216183988e52c8224240263e162079510f264b7b277222dbc299316feb235dd51396351ca650298c4a890d8629ab38ab8ed75c198e8d60e117ed3a4a8b40
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index 390182ac0ef1..5639117c55fd 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dracwyrm@gentoo.org</email>
-		<name>Jonathan Scruggs</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index eab9ae5c9c66..d59878984d61 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -4,4 +4,4 @@ DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2
 EBUILD partio-1.1.0_p20170829.ebuild 1053 BLAKE2B 155ea504acb3b14457a34f151b190eb6b96e5ce0c4a1046fab08c0be80c6f32bf2abdda8c678c7e1010451b0c075d59ef53b48ff847cc51dd11c1b23745f08ed SHA512 9dfd4a750fa6cb158f7ebb3d010dfc1f820962aae514ffa7a91acd8b94aeda8b85c83ef809b7d958525dbe09779a9b9863714f99fd13be2a90d778fe40a853d8
 EBUILD partio-1.5.4.ebuild 867 BLAKE2B 65f9802bd80a02087bb8cadf530908a165ed4c0b984b963862684e68839994db4dad20f3e7d57d97aa56a5b77c63bb168c1fde0a38eafa3d15c5c37f8239aad2 SHA512 827505c7b1f01db93722d4e7b5034d759d3ae880afcf6671bf46bf6c097fbc272e4e38d77f2880d8b1ee33e303612d674d400fa7844e2e718ea671894e5a87c1
 EBUILD partio-9999.ebuild 869 BLAKE2B fd5b476407d8454ff3941cd60754e9d421c589a9293431b092e471c39a32d07c9f79b716b0a637e0c9a25a6e9a3604819b4d20dc1d62ea32d94ba7ddcd18b1c7 SHA512 e2ed573172e87366a20bb36c1c30a28dc659cc5a7566bc7787f66d05d1a4d94ec55cbc629879bc54449bfdf1d28a7cadcb0bbbb0b29c55b46df864c8033a21d7
-MISC metadata.xml 640 BLAKE2B 3b2c33cb14c466bd4641cc04781d1de05d01170ccc591b3caae40356f934944c4c969834bad5ccdcf9f5390d203270055863b08feb7321492a27d4d7575aced5 SHA512 7116217ccc87ab80d8cb4ee0ea20089ea1c0a5b4ea9b3f666548b37422c01a8917516a5db565fc55f779bb19613fbfb515cfae0b9f87f010f5034c14d27ed8e0
+MISC metadata.xml 528 BLAKE2B 76f098570ed5ad0be85fb87b6696903e3b111e6d2d157679a835faa6dea65633c75d18560c486750063703a9b5899747df90fdfadebab38af3688d625b5df2ad SHA512 c9f2d206bc6921c783d1d72134c3a9acd7350c80f2ecb26f45d7617dc2d352f7d84134858956569f084dd444f2a01d186c97b3a83c07b45a468d48579fa01658
diff --git a/media-libs/partio/metadata.xml b/media-libs/partio/metadata.xml
index ac8d8a3f8290..46bfe4664d5e 100644
--- a/media-libs/partio/metadata.xml
+++ b/media-libs/partio/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dracwyrm@gentoo.org</email>
-		<name>Jonathan Scruggs</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index e8250b8e9324..b31dcc42b77b 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -1,4 +1,4 @@
 AUX ptex-2.3.2-cxx11.patch 828 BLAKE2B e445858c625de0c924a412690cbf2f1bed6ee4fd7efafd60765a4f43fa204ba474cdf2944acf3eb94b061df6c39cd9016413e6c5d73da3813144fa289746ceb4 SHA512 53d6e66dd4a35dc2e16e5f227a24ec90d3f7667c5f80dc3d7321086b4efb4d63451783450a02a389c09a3faa6808cd90e89e2097390ef9881ffe313fbfd8c6d1
 DIST ptex-2.3.2.tar.gz 308550 BLAKE2B 7b3145dbf9d2c13140c3f20ed606ee911deed3c38fd30adfbb01b58c3af5794dbd4e0fa1fbab6e8ae83556a0ffec725bf077271abf752f1271ed721ca200a1ff SHA512 dbc557dc5e1761204ee3483af9bf4ff1504cbd7955e0405dc27a51f7182e2445e41db086b2792c2491aa2cbaddc74e523170a4b3d25e44d332123d5b7081f4b9
 EBUILD ptex-2.3.2.ebuild 791 BLAKE2B 503764f19394ed110997c6f3d0930b7fd75103a310277d566202b84a0b788cbd3f0dc57dddb492e21f845fc063ff6deedb1971c5ecc376e531d86ff9ad378255 SHA512 1e879f58054fff1f8eb94e4708b1e0d81be1734ea80821a0f146cbebe6f2a662d16925ef40925b8cea946cd24f21623c4518dc611e21944c5974a0478ed9f519
-MISC metadata.xml 646 BLAKE2B 443223f4b464d16d2e7b4ea692b080f49aeceb1ef4d599d5dccd5aab6223e8f3a562317f7dda0cddb79840f19270f65af948df153cb2064b903f80e00580ee8e SHA512 ec1b3e3f8b15023413723136125ad6a92b7a509532824fcc547bcfe147e63a60e072496cbfa2337bb180e9c718fbe9e49c198f469a9e41a252b1706cf6cd461f
+MISC metadata.xml 534 BLAKE2B d9d8317a223ac27c1cf5fc77bd3dcf3110c7731627386bbe1516dc0d9d045f2e0c0e87aa92ed0ed822a623b3f589b533c2abd8d02482a608ab0f8a03d1f07104 SHA512 771a753ed93fd77790488a5cfd596a8bdf5719f208b86c984fb71cafd42fae6382016597adcbaa696570d5a5124ea06cf3e28519413cf4df1bd326c543dd8b59
diff --git a/media-libs/ptex/metadata.xml b/media-libs/ptex/metadata.xml
index 343772fb0426..c312f139bc76 100644
--- a/media-libs/ptex/metadata.xml
+++ b/media-libs/ptex/metadata.xml
@@ -1,11 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dracwyrm@gentoo.org</email>
-		<name>Jonathan Scruggs</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
diff --git a/media-libs/stops/Manifest b/media-libs/stops/Manifest
index 8283b486a6d3..6b0699881453 100644
--- a/media-libs/stops/Manifest
+++ b/media-libs/stops/Manifest
@@ -1,4 +1,3 @@
 DIST stops-0.3.0.tar.bz2 24766 BLAKE2B 6a5756fa1dfde1574895f75ae6f2da6ebfded7058bf0fad1a9097bb1fcda9c072b2ecc3d251b9dc24d5602110224062cabb23bc9cc78715b9196c747749a5afe SHA512 a6572a42c6796aa08b9085bfc4cb9e252091310224a0b8867eaf5d41f399b2649744c357506ae5fb64a82018f0da702bacbdc7e96965a1116f08d0a248d28ad3
-EBUILD stops-0.3.0-r1.ebuild 484 BLAKE2B 97edc8699723cd9042ce1afb8f302100d7aef088363b8c072d190a1eb1677f01e3e4b615f276b03435003ae83cf6e99804e87650c2bb9d3b4148f1a854f289a7 SHA512 3c98462e11d673cf369b3a341ffcbbef14af19a8934b0c91e6e1b54872c03d3130d8259b63e7212aa90592a3fd99ab639face475899ef5703e0d5230a28fdb94
-EBUILD stops-0.3.0.ebuild 494 BLAKE2B ae142e3213747991d7e8cd243cefe05a882c62c8c273ca5bc59a66b02380505090a29e5bbb5cfdb4dd39962a76dc869ecb268d2398f62d9bd6ec16ec72bb737b SHA512 d89fdbfdc3595c878530b93aa810988a8449a26b483b5fce3884b592c406c7f8dfebebdd2f4e95b766f74e17748b354b6088d39c8d170d9f30573fbb2c1a2194
+EBUILD stops-0.3.0-r1.ebuild 479 BLAKE2B e7f18f964b61e13d173310caa050e9b050d5bbcb40b2e9d8cc88aa5ebfbec57150d76b443eb22204fb9a46f18bd19d9235cac3a687a3809889d412b7ca07c391 SHA512 20a0c873e4f22acb5511f6db592b2686b9b208cea05064472180e2b4da51038ea7a79dfc65dc6f8b585c4a60c85ff032127b98c1bf209341be3555dd0ce8386c
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/stops/stops-0.3.0-r1.ebuild b/media-libs/stops/stops-0.3.0-r1.ebuild
index 5025ac5c9313..cbd327d7a9bc 100644
--- a/media-libs/stops/stops-0.3.0-r1.ebuild
+++ b/media-libs/stops/stops-0.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 src_install() {
diff --git a/media-libs/stops/stops-0.3.0.ebuild b/media-libs/stops/stops-0.3.0.ebuild
deleted file mode 100644
index f33e8d657dcc..000000000000
--- a/media-libs/stops/stops-0.3.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Organ stops for aeolus by Fons Adriaensen <fons.adriaensen@skynet.be>"
-HOMEPAGE="http://www.kokkinizita.net/linuxaudio/aeolus/index.html"
-SRC_URI="http://users.skynet.be/solaris/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r *.ae0 Aeolus* waves
-}
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 0cbacf20a82b..b586b4ac9dea 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -6,6 +6,6 @@ AUX tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patc
 AUX tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch 924 BLAKE2B 03160ce33639620b1deb918d358f559b8bc6296d28530b440d0d770438453c25aecc393b8cfcc582ed2d0ec1decd557a212c91f43f7923c9e94387e235680021 SHA512 43973cc5512eb8fe2e0beab1a98ff0d3bd999ed1adbf7c08c344b3442559cc2cdc99a9f2e9c1bb2bffa4be027945b12b120fa27ec6c8006367932039b8d8dd37
 DIST tiff-4.0.10.tar.gz 2402867 BLAKE2B 0305453f22150c31d00d2de756736f58c49a288e19b2a66bdd01319ce4688742f6eab4009eaf1817125d41f53a23de17eb6265a3ebae458ec24f5dbb3d49764e SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8
 EBUILD tiff-4.0.10-r1.ebuild 2491 BLAKE2B f6be096bf9b99b9dd9626043df11d965e5282b87c6ae48098efa30a565604e16c21fa81a5723925ec8061b332b68fd0da43fb3782b59b446b739234ccfb929f1 SHA512 da78f5770d10676770ab31d8c5fe490a5ba41a49f9ba7db5da6f26f52be988125425168e8ff163692373d35df17f29ba7f1a1c16a12c0b4a750ead111eef840a
-EBUILD tiff-4.0.10-r2.ebuild 2368 BLAKE2B 0aa9495f391255146ea6834142f4030906dd33af9a5540e9eb7365f51c9207bae817cf481a009b83ca3a445d626bca1086f1f6d59e14061e3695b5b030ac0cbe SHA512 bb2735a0051540c8d69a0a0fa6ff98562732b76e8a068f4f4d7e623b5f2c939ec028b01463557b98a9db680a16d27fa6f011795f33ed3d6037d2ae7c06e5d43f
+EBUILD tiff-4.0.10-r2.ebuild 2367 BLAKE2B 5f99c463399fdd286262750d87d64cf9d389dd82b6c3c019f41741ebb479e4e997424595db5ec546cb19524d9ce3606d3181f2fc08caafcddca00d103ac36881 SHA512 84cfc58d1af5d9faf947b9a0e56282f331de6287639aff7b305448b48d4d13ea892aba6ab2cc6c3ced729ad61c13e7b3c18d8be3377ef1c8e33b7467a63b3298
 EBUILD tiff-4.0.10.ebuild 2278 BLAKE2B 590019a51d49fe8486427702957bbf51680a69fc4e4158f74fdfde44bc85d7243ff1fbc08cec658287a742f14069a3c231df5d5388b7ad1db7940c3cc3d2cf3f SHA512 3d6285a44f2744091f2e321c96934986fbdfeb81eee94f340fa969a81f462c7c4a2658821827d317f2313319de079dc08217c2f3849701fba391845b1e09b2b1
 MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-4.0.10-r2.ebuild b/media-libs/tiff/tiff-4.0.10-r2.ebuild
index 9f1174ee30f8..a8766792ced9 100644
--- a/media-libs/tiff/tiff-4.0.10-r2.ebuild
+++ b/media-libs/tiff/tiff-4.0.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
 
 LICENSE="libtiff"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
 
 RDEPEND="
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index b7bb3307cf89..57a5588df9cb 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/kodi-audiodecoder-sidplay/Manifest b/media-plugins/kodi-audiodecoder-sidplay/Manifest
index f3ad1bc403a4..91c45414caa0 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/Manifest
+++ b/media-plugins/kodi-audiodecoder-sidplay/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-sidplay-1.1.3.tar.gz 10362 BLAKE2B e34853b875b8e328d06d67986609b40f31308c4e914f332420c8ce855c1d594b0bdd112689e874a663f189c722db6811ec12bfa64eb1e9b8907045776821d515 SHA512 8d3f43746328999ea817cd52e4e8f0f1454ffb1e243de4941752cfd7ea6f48848fe7d0855e7a9207934cb61e633389fed79379d3302d58c7c9e8c53784fc2adc
+DIST kodi-audiodecoder-sidplay-1.2.0.tar.gz 25655 BLAKE2B c34ca8a4e411875ef83a87443b52d57d48ae1897b15415f982e2f9f3af654bf3f412704d3e58994e64ada1bf2d63c64508afa7682048ed9e81cb2dfd92f9c552 SHA512 28124b04c6fcbcc8df341c8c5b3da6ec57a106a806e70bf9278ed15c471063db4e04190d8886770f9f430d024f273cad16779caeff7de02eb7ef7db1d07dba2d
 EBUILD kodi-audiodecoder-sidplay-1.1.3.ebuild 748 BLAKE2B 81a7a05ea5322372334887f5487246d69d98b473fe974114575b2bbdd982f1610e60a5f5fb33a2bf3e47f3f8af9dcf3f84525c949cb3ade5278e058b633d55db SHA512 a303cc4bd142ea7214d8dd60510e2c55ee77b999eb85404b71b00589c7fa5dda1322df48ed593a0e2fab5aeac7c221dfdc047ef7ec901d3e55061241d1912957
-EBUILD kodi-audiodecoder-sidplay-9999.ebuild 750 BLAKE2B a8afdeaabb49d72b60c89cf250868999a8fff67169657a6c3df9b0f6881ab12f7b2462831dff8aeb86af2135314b686dd828f51ede62922d9ba0af9664f0575a SHA512 c2755f549fd80636e6d1ca1b6b29e66d33f63125d1a608bf4a2bc31ae110adc1747e20c812f6ac0246586c23cbf5f0141af6944fed8b343bd13b6802ad8bd64c
+EBUILD kodi-audiodecoder-sidplay-1.2.0.ebuild 799 BLAKE2B 50ff8cd52bc5b67d851282bd9e6ef23364f7e4c323f56ea19d5fac034788ccb274d881f6ca8ea747d38f0b2d5db280077d4ce62faf2deb5c88d97f91e24b6d4a SHA512 649e0337de8685920833747b95296a86ca626b47119c0ca18290efb4cde5479db1673b376354566393ab1b64e3d4dead546d9647ec3c74be3873a015d75458dd
+EBUILD kodi-audiodecoder-sidplay-9999.ebuild 800 BLAKE2B a269363f31c322b648af38b1c4241bc0999597eafd79082386b35eec7ebd6e62471c1f86afdbd010ef2a64529f0c2a208363c1e91a06d77b67430ae2456e418b SHA512 32c4e98e006b0c3d17acfd190ebf1e18b633ff9491caa6b4a8c703bf73b9dce0d5ab2473742d2b129abd516de8c3769f86b8b5ecc45dba84a15bc3330231a0e4
 MISC metadata.xml 442 BLAKE2B afc3ae3f9157185ec41cbd144cce22ddd50be0f1409ccb2c764a88a0e448d6504904522d0a18bcf089ca85bbc4a8b05f51e795ec30fb9f7614479835b1ec1185 SHA512 4046b1455fe5c4cb63127751d2fbcc21b3b124609fbe0798c9675e50a837cabf1ef8d7d48103162633a6b47b36394feb1f15d45fc92f6266760de36ea614d6ea
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild
new file mode 100644
index 000000000000..e81e5bf4b20e
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="SidPlay decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.sidplay.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.sidplay-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	media-libs/libsidplay:2"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake-utils_src_prepare
+}
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
index 3efad63660e9..ba6f78a64c2c 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
@@ -29,10 +29,13 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
-	media-libs/libsidplay:2
-	"
+	media-libs/libsidplay:2"
 
 RDEPEND="
 	${DEPEND}
 	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake-utils_src_prepare
+}
diff --git a/media-plugins/kodi-audiodecoder-snesapu/Manifest b/media-plugins/kodi-audiodecoder-snesapu/Manifest
index 04ed4a55bf5b..79d3d4458609 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/Manifest
+++ b/media-plugins/kodi-audiodecoder-snesapu/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-snesapu-2.0.0.tar.gz 39499 BLAKE2B 5185eaa4e658a443aad400403be827289807b804ba574907a14b0bf5ee3cb5877cd360a0f100f75b309c9214047236723a079b0172d916ca9c4ebea740a5628e SHA512 d1b164a063ae983c49e24a48ed7fdba10f39343e1ed5aad60e0e141f20c8f3bd8115359ccc97bf4583fac7bc1fd9b1dedc800e34cb3d9ee8749c345396696724
+DIST kodi-audiodecoder-snesapu-2.0.1.tar.gz 70042 BLAKE2B cfc0f887a19b7d9fcf579888898820692d388b914709bf551ccbe372b3cb2889a1a9044487b72d270f946ea8f1ffc13f11b59fa0ef424a80f320db74525aa108 SHA512 4dedcee8a894b138637876f630135148d7ada5212913ec5b0eb208ae4a3bf51560ae633d434a91929810c6a75b2b6c5d2144703b04f86f74fcb4770b1c2f814a
 EBUILD kodi-audiodecoder-snesapu-2.0.0.ebuild 718 BLAKE2B 7b5b99a2d25eabd68267d06716a5aa6713b8901c5ab018fc269c563c0978ef2956754f90e677f820a3b50665e359467584d83a4e8dfb29b543fd6828c74674f0 SHA512 6a31ee44c729433ac50a202d97f3865c7e0f92e0df66e6452bb6f6ba783900c453df7fae77c9cffbbda8fe08f04eab984c767d1a1e35139afde15fe873ea2fdf
-EBUILD kodi-audiodecoder-snesapu-9999.ebuild 720 BLAKE2B 87c2e57d1c3e0f56607529c8458409482f4d1470b2b7cf90358415d76ee450dd7e57ac05b9b7c219b442156627f0dba6ca36439f8f31b3ed396e996a2579e0fa SHA512 ce68dbf1877bb4e00edfb8fe8603da5a218a9c52a1198dd57f8c8899e7d818c217739693eb00221ef94baefdb36d236fdb9dbddd44906d53c246b59641ea71b3
+EBUILD kodi-audiodecoder-snesapu-2.0.1.ebuild 687 BLAKE2B 2a50abcf1748ed8b409eb3c96b58a8d2303eb493b2b2b33830ad71056f279975e474254a11c8b9fa3c0e1a17aaee835dedeae541eddc5c93272ecfbbbb450ab7 SHA512 af1698282d1cb25d70dbf2808d31c8af965a03ea5adaa446e663d93332b030ecb5b61b2c6989b0881ff302a115e6d2aadd8e8976947569513e692afe7ca33149
+EBUILD kodi-audiodecoder-snesapu-9999.ebuild 688 BLAKE2B 74307a3c0a92471f14780ba127269ee0f5e8fa428c8869ee9e2dd77dc8d8d3dd25a690091f15a157e799d53f6b55a7a4fef3b5769c498f9a2b96fc463d1be158 SHA512 31c15892cd1bae69e4113e22cf52b37e8035b56f5236e7ad89b7203c37010cc14e809e5084958e191d5fbb9d9153f8edab0fee11de2540f45e5fca4d41f34bd2
 MISC metadata.xml 438 BLAKE2B 0b8c0545fe3ec7e6ead7eea42baa9255946bf7d27762d392899356ed45e1e7182d7087c25a56b34d114e6de8b95c8a5311fe90b0d52a9e7d007851ec22ab970e SHA512 9561349a81107c52fe83cada11fb8ab55c176fa4e410556741f5259503b7d43732bcf7debfa30a7c98fc7d1e5336abef914a7c31b9663556cd10fc7daf3dab14
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.1.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.1.ebuild
new file mode 100644
index 000000000000..24aa470973c3
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="SPC decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.snesapu"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.snesapu.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.snesapu/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.snesapu-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
index 666a54134efe..7ac620590bb2 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-audiodecoder-stsound/Manifest b/media-plugins/kodi-audiodecoder-stsound/Manifest
index c32a164a50f6..475e186a9ba9 100644
--- a/media-plugins/kodi-audiodecoder-stsound/Manifest
+++ b/media-plugins/kodi-audiodecoder-stsound/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-stsound-2.0.0.tar.gz 63097 BLAKE2B c797c7fad5811aaa12217cd6c4caf4167581940e25fc2684c04578e06a04e44d683e0871d6847c6cc3367ee5f5925de4e5640b9eb2b4381a713a3ba6c5860dce SHA512 2770da6d379499fc53d013163e28aeb2c1ffdbbe1cb54f2f2a4d5bac33b68d867a8de0865fe72d283f28ded1f3bd79efee7c98fb79f04ff99459d5bcf3f0f1e9
+DIST kodi-audiodecoder-stsound-2.0.1.tar.gz 89746 BLAKE2B 4429890376ed67e10e5abe76d450731a0d05a5892cd8a5f66d49fdbd8f0743547fa7752c87bad11f2b2e49e1519a0fbdf457da91eb16a42554d5a60f2bafecad SHA512 133eee1892817b69ec34d7897316ab6e967e67968b72ad7d73199d36fe86f119ee015f703022fb850c2c8bef11d990bba3c0a5df5f24776d4861cbbcb6b466db
 EBUILD kodi-audiodecoder-stsound-2.0.0.ebuild 718 BLAKE2B 71873f38dc0906481f5f18d83fa6af3ec610f746bace3ba211957efddd902ecbb4a8d4a20f870e81bba94fce0e85e667836828d5a5f06f8136000221df056cf6 SHA512 15e356df7a512f9ed1036bb67b3e86defff69c0f077c751444ea66c847352ea9ca25aac3c61a39cd8c96b4023ae308ef7e418fb234e76fc8bd17dcf15eda393a
-EBUILD kodi-audiodecoder-stsound-9999.ebuild 720 BLAKE2B 8a6a4d1b8b2a9836586ad18006d1858fb50a4dbd4d4eea306b0ad84a76428553339d8786e29e1f3e273f39989d491d69044627edcda9fe4dc23b95b29e4b4f16 SHA512 34050281fca972539c94cc799a58caba1ad8a6ff0e5601ade2803587028966a5e59e7cb04126bd90e83bb18d5c83b0963bbe2db357670677da4a9f8e8a775b77
+EBUILD kodi-audiodecoder-stsound-2.0.1.ebuild 687 BLAKE2B 9a5740921431f986d7c7a8904fa4164a3fb1d70feb0a5a768b20b91e3b2d99c720da709678678f838af8167fce3c68c23b5526f64a2f892603e2ae156b84b93e SHA512 cad61dac4b12a322d6b9abc95161d3e88df451a145ce0582ebdf050b5ea6afc3186c050f16fcc90fb85a6bd5f6897a2e08fcb45f6063279e6a64f2d7468881fe
+EBUILD kodi-audiodecoder-stsound-9999.ebuild 688 BLAKE2B d03551509507fb3d44490d45be9fccf362f27e701552fc35e1ee300d75a5beb5efb6a0a621b2912fe8de5933474f1b884762945bcba0a670ccdc1085aa2b0bb4 SHA512 9e42c9a51d1c0bb76d0d412f06d6ab8ad70c5757796772fb0d27b35b06620e5585902ed186a5cbe4159b227eb0ad70bfb640367146e91956e1a22a2ab8fce9f8
 MISC metadata.xml 437 BLAKE2B 36e61faf2f1098a85827d6f81536b35d874e325a7094d535b742c71b30afaf671ed77cf9d84993ebe5e2407ee316d72453a3e18b3cfe55c0d5ccd9691f3cf12f SHA512 a985c629c36655238f0125134c4f64ffae47add726888adf934b8b66aeb9622a12ac256703206b98ed39f29ecd0a0f9ad9043af80160a8d545a982c9fe659504
diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.0.1.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.0.1.ebuild
new file mode 100644
index 000000000000..4ac3f0a881e7
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="SPC decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.stsound"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.stsound.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.stsound/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.stsound-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
index 3443ac784761..76e4f54dcc19 100644
--- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	~media-libs/kodi-platform-9999
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-audiodecoder-timidity/Manifest b/media-plugins/kodi-audiodecoder-timidity/Manifest
index 1de642d16f14..a0dd9f172b5f 100644
--- a/media-plugins/kodi-audiodecoder-timidity/Manifest
+++ b/media-plugins/kodi-audiodecoder-timidity/Manifest
@@ -1,5 +1,4 @@
-DIST kodi-audiodecoder-timidity-2.0.1-Leia.tar.gz 1787950 BLAKE2B d0547f80eff154f2129d91077e25b0f51d19ee66ff371c7a11d4a7d0e3f479506961ea290a9a71643fd4a707dfe1ae29de7b5ed5fc7ccfd6e1d5625cf6d7138f SHA512 91db2fa954d441901ebce35189d642931882f5b20ca815af45dce67d3dbcb201a8920fb76e0e8074038f476a1dba1192cba28de7c374c76800cc50161f6915f1
-EBUILD kodi-audiodecoder-timidity-2.0.1-r1.ebuild 734 BLAKE2B b68536d4c91317fb9ac15e22aab32e8277b21fcb8a8285c6ef20a8d032584252b9c428d7cd51b6a66cf594f07fda58267b6560e1594ee6693376938b0c303f29 SHA512 fa8e6195b67b43fb5db248aa9d63beb353ae5a06540a6aedf9e87fc3a9d5f4ef43b55962c54b3f3e372847328e7e39f2667a4a9826a4d2fe3c8388c9d5ec0d1d
-EBUILD kodi-audiodecoder-timidity-2.0.1.ebuild 708 BLAKE2B dbe849e00740a969bd20c0d281fd5599239ed989585af2fa0fc62ca2f574cbf44419b04131d3fe7cd9fa9c6e1ac7582ca20d41c74c99325baf4fb8ef842f98fc SHA512 fdada114d5c02b47f1b8827f38360ce740527e124c43f8c9cd4dafb98eb8dcfbaec5dbce238defebafa33c9361f644631cf4b48972af30047b9078fb22607703
-EBUILD kodi-audiodecoder-timidity-9999.ebuild 735 BLAKE2B 9ceeaeebaf1ffa79e1b5be963fd01efaad56ef0524c96c38e8cd99a1c57ed7e694156448f125f27afa6bbe6a8124f117594687f525b120f41c1396374af77e74 SHA512 2a2c5cd84d5b587a298f0a0c0de69eaa1674570c4a35eeae20cea512e420b4f1cf4a2e25a2c0be7c3cdeae27d266fbeb70692c4588f379d777f31280a03145e9
+DIST kodi-audiodecoder-timidity-2.0.3-Leia.tar.gz 1816069 BLAKE2B d09d51a4f838f0639aeeb3429864923453e50591dcf2ce15227dd08e8c83358ad77ec454b87f67b9f9bfe59cd07099987146e0038c757a9fdc07305f3c167c78 SHA512 8928f493120231ee21dc8e19a5aba7219e3b8fdcfdb648a15ea13577d082e89e6ccef789c4cd0547d31625a090af4a590bb96c8b72f5dc3793a5720bf96f2dc0
+EBUILD kodi-audiodecoder-timidity-2.0.3.ebuild 708 BLAKE2B d575fd18b8342f5e5ff6dc04140b178f7be935b9acf9e64577afa335e108ea10cf909be5498147e1494ccc85c27faee33b13ef50c310294dfb4e68e8d53f67c5 SHA512 65e82f5bb21296ecbb5303ddb01155f63b33cd9f11ea941e2c25bb78c64ed99b98e1a2b9da10747c4d6cd0e508e4595be5b3c63995711a73bbe83b0bb5af406d
+EBUILD kodi-audiodecoder-timidity-9999.ebuild 709 BLAKE2B ca88e9562be916185acc90021d9ead8dd01c79c72d352e8dd6c9ef5f6c48ffb551a8b2b265277362fd7d335480e9cfef96ed96aecfa94d257ee112ebb50f600b SHA512 cb98895fa7afb75cca64565db5601acdda69069f4f989e20ee6be5c5937c38cc2359a00a731c891f2aa745419689fccf23395791e471ba400a279b9bc4c3b795
 MISC metadata.xml 444 BLAKE2B a8bc29439b6fada05640522f57d0c97d905ce14abee08f1cff2ab2e1fc36c20ca4491e836b9092ca4d0c7a2b9e66e66d6882b1c5c77b4973d038b294e7d82503 SHA512 924f94fe1923314c5ab70873705dd30874bdf52c5f2f1d13282c140b0080a71a483206c7554dacf0c4dbfcec9f4f4ac340e024b32fd9286f8ce69d52caa8aaa2
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.1-r1.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.1-r1.ebuild
deleted file mode 100644
index bb7b4c8e3489..000000000000
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Timidity decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.timidity"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.timidity.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.timidity/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
-	S="${WORKDIR}/audiodecoder.timidity-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.1.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.1.ebuild
deleted file mode 100644
index 9f8206d9bf2b..000000000000
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Timidity decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.timidity"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.timidity.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.timidity/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
-	S="${WORKDIR}/audiodecoder.timidity-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.3.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.3.ebuild
new file mode 100644
index 000000000000..ecf6cb2994fa
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Timidity decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.timidity"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.timidity.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.timidity/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
+	S="${WORKDIR}/audiodecoder.timidity-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
index 2fb758e00408..59bf5e8d03d4 100644
--- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
@@ -29,7 +29,6 @@ IUSE=""
 
 DEPEND="
 	~media-tv/kodi-9999
-	=dev-libs/libplatform-2*
 	"
 RDEPEND="
 	${DEPEND}
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index 097078dbe18e..3cff2e18a8f6 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,26 +1,4 @@
-DIST kodi-pvr-vuplus-3.17.0.tar.gz 160410 BLAKE2B 0eae7616abf01713148f6ac5370ccc2de9ee47dcb4b024119c16b1417fe1c655a8f1e9d9af188ae5106399cd321303f2ceb232b037f220411b15990986a6cea9 SHA512 a9c7e46af9bc1cdc18aeacac6f219c3c4210854287e086870e64b1cf2350b69b32d8ec3e980805be00093020ff3423b1cf7eb47dabcca4b14eee1f1cbe49e9f1
-DIST kodi-pvr-vuplus-3.18.1.tar.gz 163398 BLAKE2B 30cab3bcd9e0750c116f2e95170fd5d9fdc5c1be0f8068ed58aafc265454105d70504c6bf661d0b4c2e21eb9ca9e1868ec8da8e32bd39a054feae5bf8804ab46 SHA512 eadfb01b5a9d478d03bf720133c5de163b5fc1b8789dd2f756724dd180bc00ae593c43a4e727d6f6c9646a99626cc8dd6ee72cb054db65c2a49acc08ebb00ccc
-DIST kodi-pvr-vuplus-3.19.0.tar.gz 168331 BLAKE2B 141de1df21ae4149be56be3d952edd15792567aae39b337671c8f53cf28b1208dd69993a3680deb25b006b1d92eaa1a5b151ebc394f84d041d7cf99e56c206a4 SHA512 3a59aa691b0982cfbae466a3fa148a9ab71c7daeaeff1b91fdb71da4fbb406a6fa0346551bf7da37a4ba4dd6c1f58a2a3e41b0533b69afa4e28ecdf52be0029c
-DIST kodi-pvr-vuplus-3.20.0.tar.gz 172198 BLAKE2B bb68f6de811e14e38b0a804ed1db01e64df7d9c8e2c5ad6b31e07188f571418ec1ab8289056a0480b7aeffdd39bb8668c5ea0493ac0688e665c02994da9e53d1 SHA512 e30edab00ff0396ddd4021dc5a9ac8a0199d2535449385ff130572387fc1f01e128fd1f1a9b5cacea22de4789b1220b9ad0202a9c8086618fc2e35ef053dae19
-DIST kodi-pvr-vuplus-3.21.0.tar.gz 176202 BLAKE2B c51ff08e110748757aa56204af837982744fc49189a9fab762c49722fe760e05bd77d23e876dda831a63196c27994737a0f1df97d1e00f58a9824b3c8bd54a74 SHA512 480ce345619f68bdce6402b7f0f1291c41d3b2cd1cb868fba4540f60e45cfc5e80945e2394b5fac65bddc4ee9cb6c56f95f1563bc7230efa38521aa0c35f1946
-DIST kodi-pvr-vuplus-3.22.0.tar.gz 184305 BLAKE2B 58d865950a7f24bf44293ff156a3cb481fa16946a2c9489b46969dfaaabb26fe2af4fa3eb1462bc3f34000944a0aee0ac8bd274c7da2f4b00349db31cb78695b SHA512 bc75644e0a64e68564c29b15924d6f7dd5f45eef6f72b7c6a72609e0c18d4b2773452882af39674861ac515317511b281b832522c4657537675afc6ae5531644
-DIST kodi-pvr-vuplus-3.23.0.tar.gz 185373 BLAKE2B 55b8cec3e5affa376acc5c1c7036d7a550acd00b70e80a85ec89c95f6e861fd67f6a5d4d19b9632ae3099c5353696c34874c23bd10f4614d3d60b475540e36f9 SHA512 c6feb79f91cfd9657e00e177de168389e3393cf201e9ecf0dffef79994894c5c115e1e9e65460978dd066ab1a583d1bfbffa1c4c3ddabad9143a31763f47ec05
-DIST kodi-pvr-vuplus-3.24.0.tar.gz 189303 BLAKE2B e1d1276b460d54722f80144d0e186be3956aa9a841a6e9af7854a883610ad5317a3114f21af5fbd7e3070a3f4bb81795814b4142fb03919c589ce288ba389862 SHA512 e3631a3ac1d207380f810f482697c48909d246ee8510463694fc157bd4af1d0a0539cd82f700e47f195ed7bef868d0e0d7392aa3f65418a69bc79f4e15f83761
-DIST kodi-pvr-vuplus-3.25.0.tar.gz 190314 BLAKE2B fba8e3438bc7475f0c4e4cf1afe02fc356b7cdc78c756c30cd541f71215c741fe56e436b934cc22ac0157ccf919159526f41625421995198157a1f0d8802366c SHA512 b94d6f846eb04cc241ae1a954f5d4fd07edd70b3389d9068bb9dc23083e3476bc46a17fd66e7f5d7ce04e361b1d9165672d7ada515f6251af86a5f3f18fa28b1
-DIST kodi-pvr-vuplus-3.26.0.tar.gz 192488 BLAKE2B 71909a13cc640c2509405a2ca954536b3ecf767dd607223fe0555860da270d710896fbb0e62922465dc7d22e817c39e183813c8064498e21783548aa85369744 SHA512 c0cb5e0fab716d20d7a6bbc81a8caaca5325938190742e15fc86fe475f93b915623cd3589b4990ebbd1caeb3924365d2872a598fd8e9dbe1822c37e3b2e288f8
-DIST kodi-pvr-vuplus-3.27.0.tar.gz 192727 BLAKE2B 0060d29cfae4217dd718d02836373d5829ee327a2ad6826d77fce22621758d0c48774a6a39b2907f462d4d778e9b308de7ca42f0c11fdb57381f6a3f50ac4e15 SHA512 e94a27c497e6b35a102897cccf3376bbb1e2aee056c5cef498a5db9f1a6c5e1c4d7a8c8060bfca5d5d2856067564ccabcd2cbaae1248021a9379c311bc84cb26
-DIST kodi-pvr-vuplus-3.27.1.tar.gz 193036 BLAKE2B 5c1f1422eab403748f4668e10f5ef27214857817851f1e4f14028256961927af741b211e5548d79c9a1dcaee21f4f05449dcd1835fd3688e632b0252c8cb8d13 SHA512 8efa1c00d953656ea97d9e923e0b7d380071047d138252edf14982f151c33132d3c57a0826e2e2abae82ba6beea06a8404bb79ff608ce1969f127649a1b0acc3
-EBUILD kodi-pvr-vuplus-3.17.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-3.18.1.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-3.19.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-3.20.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-3.21.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-3.22.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-3.23.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-3.24.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-3.25.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-3.26.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-3.27.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
-EBUILD kodi-pvr-vuplus-3.27.1.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
+DIST kodi-pvr-vuplus-3.28.0.tar.gz 194160 BLAKE2B b2816a456df275f31876a2e23bed3881a85b738b3e15dcedba813c9ea1bd2618eefaff0f856916e51e15af32aaa3a307cdf613d78b910e71e38e90d6f44aa85a SHA512 9d3ae8d5fb537ea32d7eb5acfed9bbdd438e09b3df70d7d7f1f86bf8b2e8455e1e9ef0b1010f8a0e96d94f869e885df1d7728da63a642b527d4488f767abe434
+EBUILD kodi-pvr-vuplus-3.28.0.ebuild 720 BLAKE2B acc156276fbc71877cc113effc6fa68e7d43e792d96c96758ffcadc5b5a134d13c57ae82896e8b436f6f61391a51cc363d354f38f5fda00bda91498270589803 SHA512 7e1fd87798d3fda0c050890b949206dcdc9da303e7b6e100cade41c1ec5cff0e49f9861912aa91a6865b0507ce15c3053982e2aa430201a7fa6fbc922957e8ef
 EBUILD kodi-pvr-vuplus-9999.ebuild 722 BLAKE2B 1723620626a0fb522a9014ebbadd1c111a789da35d744598b4cfa397ba7a6cd4391ba25210cfee1d80b4c1615384dfc7411d14cbcd81bf48d97de1fff0ec1cf9 SHA512 0feb5fea81f0bee24d99ce4333252cb068cbea17e9b77cea042ce140f1ce65063101b65f6d25b9bb199b419d8314a1421ea1ee31200499abf734c535beda3af4
 MISC metadata.xml 428 BLAKE2B ac264c6bbfc925ff772eda61b1b4069b52ed5bf12836af8d8e86a72fe42bd852be1d00f74056c1d6b925fa2a026ea7df57ee57e7434a797884741b70762ff173 SHA512 573f803447cb7a7d0095eb21caa9f55c41fa4fb68c0f40aabad63df2ee262ce168fc75f28f3a3ae6aa7bf41f258be771c6a6dd06d1f2e2486b3d557d89f28f4f
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.17.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.17.0.ebuild
deleted file mode 100644
index f77cda466527..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.17.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.18.1.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.18.1.ebuild
deleted file mode 100644
index f77cda466527..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.18.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.19.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.19.0.ebuild
deleted file mode 100644
index f77cda466527..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.19.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.20.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.20.0.ebuild
deleted file mode 100644
index f77cda466527..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.20.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.21.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.21.0.ebuild
deleted file mode 100644
index f77cda466527..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.21.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.22.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.22.0.ebuild
deleted file mode 100644
index f77cda466527..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.22.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.23.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.23.0.ebuild
deleted file mode 100644
index f77cda466527..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.23.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.24.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.24.0.ebuild
deleted file mode 100644
index f77cda466527..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.24.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.25.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.25.0.ebuild
deleted file mode 100644
index f77cda466527..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.25.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.26.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.26.0.ebuild
deleted file mode 100644
index f77cda466527..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.26.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.27.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.27.0.ebuild
deleted file mode 100644
index f77cda466527..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.27.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.27.1.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.27.1.ebuild
deleted file mode 100644
index f77cda466527..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.27.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.0.ebuild
new file mode 100644
index 000000000000..1ff57c482268
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/vdr-dvbapi/Manifest b/media-plugins/vdr-dvbapi/Manifest
index c35efd747e50..24c5d614e71e 100644
--- a/media-plugins/vdr-dvbapi/Manifest
+++ b/media-plugins/vdr-dvbapi/Manifest
@@ -5,4 +5,4 @@ DIST vdr-plugin-dvbapi-2.2.4.tar.gz 94419 BLAKE2B 326346b418ece22674aa0d84efd798
 EBUILD vdr-dvbapi-2.1.1.ebuild 2530 BLAKE2B c89a4b7a4c2c87fcf92b0e110bc6af3e9b4419a198d3f93b57aa269d3c85908e96a2f199126d49a0d1047096a071304bb158964771fdda275192eb2bffc4ee5e SHA512 7016fab9b4d196415afb2b3fe3351e968a85e7a1a45c0b32616933e21938f56567b8254cc8eda89c25e551c55ff4b8f3b6b6dbef034753b3cb8b7e7303699c44
 EBUILD vdr-dvbapi-2.2.2.ebuild 2574 BLAKE2B 9e31c575bbf54c7c2372e7f94a449e903cad6d444e49332339b627e1587e61f7bf8e6a7c70a6c5b7d9540246b584d8d9b53480af512b4a301aa177ad7de35d5b SHA512 f709f31b511f7ab778b311b6cffd43d79c80897d830fbbab3dfde52ef6bc54800b3245a4bc3e17d10b1ded000ef45ea3ce9c8f7f08600d4c11972de6dce60e39
 EBUILD vdr-dvbapi-2.2.4.ebuild 2949 BLAKE2B 395a2c3121e979d66c8a3660ac6d48eaf06dc4de971eb3a9a36633d0fca99c710d6c036303eb12b8103ffae7772ee6392e5bca87d32e285d4f16ddaea33f9bd1 SHA512 97ea158101db128c72f5a338cf3c9d2ec5d36322754c8d4672bb8abcfbcf8d2e0222f28f4d54ddffa05c5afcbc9f9f09f8d1cf4c4796728a784777f239327975
-MISC metadata.xml 707 BLAKE2B 0256470ad919b7c1ad7d09b3a4c14c66ea38902227ad1ec858e87925a759e62e9e98faeecb5db0745d4a24ad30e3c3dbf6d1a65b93689743580404f415cfe5da SHA512 7273c05a6f55b571a1f7ee46143ec3fe72eff8b1b736b76edaa83fa2ef04206bdba1d17437e00baf3832616ac47fd89d677713288d7645421ccaf7844337a43f
+MISC metadata.xml 594 BLAKE2B 2a02df5ff3859e36c760f72ba49f97b3d827677e0c789c88ced7cb4e3ae91ad0501060d20db3e4cc33d2226a5c986203f03ae25ed29a4a831e7c218b54b2235d SHA512 0e0578c9e7fd629759210d01c1442c17ad107f681d53c1be7b067a961335dfd74a0d681af56d85dfbbbf948aa7c687e15325929350cb9d475ca6a1424ccbb46a
diff --git a/media-plugins/vdr-dvbapi/metadata.xml b/media-plugins/vdr-dvbapi/metadata.xml
index e82c63acca54..83c39ba7b73f 100644
--- a/media-plugins/vdr-dvbapi/metadata.xml
+++ b/media-plugins/vdr-dvbapi/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>hd_brummy@gentoo.org</email>
-		<name>Joerg Bornkessel</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
diff --git a/media-plugins/vdr-systeminfo/Manifest b/media-plugins/vdr-systeminfo/Manifest
index a081283df2f7..fb432acf3366 100644
--- a/media-plugins/vdr-systeminfo/Manifest
+++ b/media-plugins/vdr-systeminfo/Manifest
@@ -5,7 +5,7 @@ AUX vdr-systeminfo-0.1.3_vdr-2.3.1.patch 1880 BLAKE2B 8bb4712b635b483c2f7b72f26e
 DIST vdr-systeminfo-0.1.1.tar.bz2 16816 BLAKE2B 737564274c83dce409a0694110ec03c5dc18843c35a3c521f801d639b763080b7199831ed1bb139b5766bb6a5a1f891f08395d06d5a325d70d90e677d3a1ad90 SHA512 9f107ebbf79e5ded9ee6a991c5c00236dabbce42d7588eb21b814dbaaf249ee7e681f979d7570031fd6eb1bd286afe3943ae4463dc930b7814f739fef3623e54
 DIST vdr-systeminfo-0.1.3.tar.bz2 17234 BLAKE2B 7503102dcd918d2da52edb7df10d140e8fc6838b3813028ca7bb9d40b151f5bb05703ca1ecc9325ca33796205b89355ec3a78596734fae1a63dba9546fa50954 SHA512 9dd2c32632558dd6061e1aa9b76757bf76e0e781405412791343dd7249348fdf0b65c71d8054f55f8f763a75aa17d39bed96a86e4b06a4475642eab4624954fd
 DIST vdr-systeminfo-0.1.4.tar.bz2 18064 BLAKE2B ab3e81d19882131dbed7fd96b876592395fa07d370158b4e1a9b5ea7a06a3d388bc0cbf099eebee992fcb1eaa6810943cb7577ee21f72b4c1b47896cc9f53f90 SHA512 16b53b0a9b4b4e101bbddf8b02546f04f7cdc27697cc66d0e1051fd8b57c9281e728f5aa552d8d900185e190f922f2e2ac2042ad0fe9c3b01800400bec3856ba
-EBUILD vdr-systeminfo-0.1.1.ebuild 570 BLAKE2B 1e90b354a3c7d1377a3b8e57ec090b843a054a17145695c813eaf768e0f593099bb27d85c04cab19989d2817d83a4363310c478a0f663b982ea06fdef6b60427 SHA512 2a0d83cff95c34503251936496caece8207ddcb60ed0ad42cb695e9157c48a9407131c87fde7ba19018bba0c146c790ccaa5c231ae531f64542f83b7ca8a5459
-EBUILD vdr-systeminfo-0.1.3.ebuild 826 BLAKE2B 78fca3ba76777df631c2f2bf4b47606f2b3b8659766352a0245c11c9711825555f6fcfff3fac8a40513b41e76ed9569e51f8db50a5944c5b72aad9dd930d71a0 SHA512 f2f24dfef86f6551979812a6db0f75e04c4d732274a3ff00b3cae12c035c27e3e479f0e633e85ea44a4a16b072d308ba59ec78aaf8b8afcfd4797d4b57ec999f
-EBUILD vdr-systeminfo-0.1.4.ebuild 725 BLAKE2B 69bb33201106f3282979282c8f2b8e3b5f4acc0ef222f18740a134150dff631054c5849e2686b6d553ba25394010367a2e51d14c7c4ffd4cb8fd1247afbb7de4 SHA512 a205fa609c344aa28ecedf14a9871825fd1e0e0783434741162a592ec49b6379766236611ad09f96dc7e17885db7411cb7ceb1e6683032ee2a6789014e55a0b8
+EBUILD vdr-systeminfo-0.1.1.ebuild 570 BLAKE2B ddde1f9b347fe604f0c9227e053939281d7b70e6af9265795e2bc5d322031b4f5d1fc60f5643a9e428a4484c3655c4c1877304a0d3b46a0e99ffe7cdef8af027 SHA512 c1eef8e5c31352f35ed171c1b31be10a035e4899ffe68461e259cd86e58d4a5f6fb9f5470f79e444b06f6d9edb1c26bd776d93c437c157742360438eebe3e611
+EBUILD vdr-systeminfo-0.1.3.ebuild 826 BLAKE2B e100a028ca2fe32889892b51e8a4e3cd568b18c3bfbadeb8b5c344b94143912dd667c357fd2284cbfb49f896ee85ab676f27c77126e0836f4bbbc45743529fa9 SHA512 c1d83a42f9d995d28f6ddc909e8173cba64b9ef2ac55035c948ad3bf63e3c1f12180b1999d0b7c9c5210df503c11c6e79a115365da9194a540901e6d1bace651
+EBUILD vdr-systeminfo-0.1.4.ebuild 725 BLAKE2B 8fd12ddd94cf5e8ed3c47278aca34c7929e9dbca010a94def226436a491934258c3c3e5354beb99c344955fa48fb7f38ff24a9f2960dfa799cb420c4dd5b5042 SHA512 eae4c63071e3874dcb8d7ee623202e37457fcfffa403221263829d9b5321d21d382359189b4a2984ef490aca573754f5f41b000c9e7eed99f87d2e1bf1ed8c64
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.1.ebuild b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.1.ebuild
index 66943d969fcb..1932274f9e33 100644
--- a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.1.ebuild
+++ b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.1.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.4.7"
 
-RDEPEND="sys-apps/lm_sensors
+RDEPEND="sys-apps/lm-sensors
 		app-admin/hddtemp"
 
 src_install() {
diff --git a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
index 191ef0061a3e..1380ceb13006 100644
--- a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
+++ b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.4.7"
 
-RDEPEND="sys-apps/lm_sensors
+RDEPEND="sys-apps/lm-sensors
 		app-admin/hddtemp"
 
 src_prepare() {
diff --git a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild
index f7811e2baa28..d09299bc8a3d 100644
--- a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild
+++ b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-2"
 
-RDEPEND="sys-apps/lm_sensors
+RDEPEND="sys-apps/lm-sensors
 		app-admin/hddtemp"
 
 src_prepare() {
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 5e75c42de6c5..cad7863f5265 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 243cf8f49fff..078ab0262c0f 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,3 +1,5 @@
 DIST drumstick-1.1.2.tar.bz2 1012371 BLAKE2B e60a5678d33db1831130037bb4a6df6da8de815a6a0ca33a167f85596f45a1d420ca4c689c756c1fd3f794fb2a097bc19878d78bfe0789a40f9eae1b306b769f SHA512 6e84fbf2ce717cdb3c669a477de65d2f32c277073d812546267c0a9556f7ead612e3140cbc412fcd560786ca024f201a1eb3ba9de4b037e3ba8d4db89e0e2e29
+DIST drumstick-1.1.3.tar.gz 1358468 BLAKE2B af4cc923d380a1da66c835a6302e47e31c17ff90ba9277fe6063e6029c3d4d087e85905487a4dae657cdbfb743d2ac6e6c5a30c0905c9bc736d8666105e52099 SHA512 41990c269c41dc011e14c9bf008b983cd3722ea52429ec7eabaa5689a6f69b1760fc766604378c30bb1dfab537b77f7522a13377b873308835a0e7701d24448e
 EBUILD drumstick-1.1.2.ebuild 1466 BLAKE2B 1875c3fc6df6afcda35ff243fecdde7e30558a11096976d18a9f22ef595bd32401d72a63182c3ae28a0da9905c99862338225f0d545b10bc3b1153d36db9f710 SHA512 6fadb06cd83001be43e08c5e468935333d6ad045618b407ce84133ac949b083089789f5ff366a26aeda5774ec63d74eb30bcf0553f60db9e9a75b488cc4b91d7
+EBUILD drumstick-1.1.3.ebuild 1467 BLAKE2B d0758a5ebbfd5c7fad1b65a44d66dd947aec0094da52f195b823ee2795ff4618a2afcf6699d3e5dd1aa4997ec3b5cb72b9b3beebb7a4486a665906ea2a8e024b SHA512 0a56021cd83fa80b7716d5beb9441d1ce6fc8d3b04e31a08e6cfe667b75f3f5292439302aad6fcea48d2166200d2b3487837c75cafaad17b01987e26cd0a6322
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-1.1.3.ebuild b/media-sound/drumstick/drumstick-1.1.3.ebuild
new file mode 100644
index 000000000000..fcea0b268687
--- /dev/null
+++ b/media-sound/drumstick/drumstick-1.1.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
+HOMEPAGE="http://drumstick.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fluidsynth pulseaudio"
+
+BDEPEND="
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	fluidsynth? ( media-sound/fluidsynth )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+RESTRICT="test"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use fluidsynth ; then
+		sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
+			library/rt/CMakeLists.txt \
+			library/rt-backends/CMakeLists.txt \
+			utils/vpiano/CMakeLists.txt || die
+	fi
+
+	if ! use pulseaudio ; then
+		sed -i -e "/pkg_check_modules(PULSE/d" CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		$(cmake-utils_use_find_package doc Doxygen)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doxygen
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+	fi
+}
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 2a70d89b0fb8..4d44853c4cfb 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,6 @@
-DIST mumble-1.3.0-rc1.tar.gz 8638701 BLAKE2B 6c97c528e8b598bb86a7318e997067706216436b37aabb06931e509d1c713d0104aa599a72235dd0afd46b34779205bd622a496bf14fd54aa065d9ab1d869725 SHA512 e993b18b0ecf620d3a9a89f145c18b9ecde3aaf9b7217e235b7472908c81a365323c8683dd6fc9ed14b108160f8bf5244369c2a9ee57c22595550220d158516c
 DIST mumble-1.3.0-rc2.tar.gz 8759830 BLAKE2B 4df1001a174d042221a674a21dcdb7165742cba2428f778eb6ef7fcfe8128734f4207230222971fa97622af3ea81e40b676cc089e45704be3fecf76f97f72a36 SHA512 b31a92cbe9d2d973cb06e5f3bb237de22f0fa5f242e6a8141ffaa735268ca41097bda44445a73ea5dafef6ef3ff7a5050c52c7f9b9f5600d400e57aff6f2e4c4
-EBUILD mumble-1.3.0_rc1-r1.ebuild 3740 BLAKE2B 7f25922b5de9c8165204258f7807e2d7b95459d742461e3420049b8d1964ddbc726a143da1c75266aef782c611302612dde416e5f1b8a9141a1445d4fadcf6fe SHA512 5a69d06a03be98f11447eefc44a9f6c31b5fb51f686e8afc0a89905b6e91d27295d84f1129518a4a6d62fb88ba2890754859d03e086a59edbc5298e5a0f29bc1
+DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
+EBUILD mumble-1.3.0.ebuild 3781 BLAKE2B d81a5dd96991202f1c5b2a5a6e9086ef60df87ab8f87ff33d3588c008d17f6a0f59e2d3298e5a7b74ccc2ae9eea5a47b9b96a29de622a6edf29b5efe1c08e95c SHA512 cbb20c9b5be3b36fc112631eecc9b29ae9c251fbd3e6d606a28e98ed0444f441c2fe3962e401f9689733b1ba50f76762307db16ad2209d4cdaee26406f49a64d
 EBUILD mumble-1.3.0_rc2.ebuild 3781 BLAKE2B d81a5dd96991202f1c5b2a5a6e9086ef60df87ab8f87ff33d3588c008d17f6a0f59e2d3298e5a7b74ccc2ae9eea5a47b9b96a29de622a6edf29b5efe1c08e95c SHA512 cbb20c9b5be3b36fc112631eecc9b29ae9c251fbd3e6d606a28e98ed0444f441c2fe3962e401f9689733b1ba50f76762307db16ad2209d4cdaee26406f49a64d
 EBUILD mumble-9999.ebuild 3781 BLAKE2B d81a5dd96991202f1c5b2a5a6e9086ef60df87ab8f87ff33d3588c008d17f6a0f59e2d3298e5a7b74ccc2ae9eea5a47b9b96a29de622a6edf29b5efe1c08e95c SHA512 cbb20c9b5be3b36fc112631eecc9b29ae9c251fbd3e6d606a28e98ed0444f441c2fe3962e401f9689733b1ba50f76762307db16ad2209d4cdaee26406f49a64d
 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/mumble-1.3.0.ebuild b/media-sound/mumble/mumble-1.3.0.ebuild
new file mode 100644
index 000000000000..ca1f49e6d6bd
--- /dev/null
+++ b/media-sound/mumble/mumble-1.3.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib-build qmake-utils xdg
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
+			https://dl.mumble.info/${MY_P}.tar.gz"
+		S="${WORKDIR}/${P/_*}"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=dev-libs/protobuf-2.2.0:=
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/speex-1.2.0
+	media-libs/speexdsp
+	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	g15? ( app-misc/g15daemon )
+	jack? ( virtual/jack )
+	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
+	libressl? ( dev-libs/libressl )
+	opus? ( >=media-libs/opus-1.0.1 )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+# NB: qmake does not support multilib but it's fine to configure
+# for the native ABI here
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myuse: No use option given"
+		use ${1} || echo no-${1}
+	}
+
+	local conf_add=(
+		bundled-celt
+		no-bundled-opus
+		no-bundled-speex
+		no-embed-qt-translations
+		no-server
+		no-update
+		$(myuse alsa)
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse g15)
+		$(usex jack '' no-jackaudio)
+		$(myuse opus)
+		$(myuse oss)
+		$(myuse portaudio)
+		$(myuse pulseaudio)
+		$(myuse rnnoise)
+		$(usex speech '' no-speechd)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	use pch || conf_add+=( no-pch )
+
+	eqmake5 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add[*]}" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+multilib_src_compile() {
+	local emake_args=(
+		# place libmumble* in a subdirectory
+		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
+		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
+	)
+	# build only overlay library for other ABIs
+	multilib_is_native_abi || emake_args+=( -C overlay_gl )
+	emake "${emake_args[@]}"
+	emake clean
+}
+
+src_compile() {
+	multilib_foreach_abi multilib_src_compile
+}
+
+multilib_src_install() {
+	local dir=$(usex debug debug release)
+	dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
+	if multilib_is_native_abi; then
+		dobin "${dir}"/mumble
+		dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
+	fi
+}
+
+src_install() {
+	multilib_foreach_abi multilib_src_install
+
+	newdoc README.Linux README
+	dodoc CHANGES
+	dobin scripts/mumble-overlay
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol
+
+	domenu scripts/mumble.desktop
+
+	doicon -s scalable icons/mumble.svg
+
+	doman man/mumble-overlay.1
+	doman man/mumble.1
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	echo
+	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/mumble/mumble-1.3.0_rc1-r1.ebuild b/media-sound/mumble/mumble-1.3.0_rc1-r1.ebuild
deleted file mode 100644
index 30b2055c37fb..000000000000
--- a/media-sound/mumble/mumble-1.3.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib-build qmake-utils xdg
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}"
-	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=dev-libs/protobuf-2.2.0:=
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon )
-	jack? ( virtual/jack )
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
-	libressl? ( dev-libs/libressl )
-	opus? ( >=media-libs/opus-1.0.1 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-# NB: qmake does not support multilib but it's fine to configure
-# for the native ABI here
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myuse: No use option given"
-		use ${1} || echo no-${1}
-	}
-
-	local conf_add=(
-		bundled-celt
-		no-bundled-opus
-		no-bundled-speex
-		no-embed-qt-translations
-		no-server
-		no-update
-		$(myuse alsa)
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse g15)
-		$(usex jack '' no-jackaudio)
-		$(myuse opus)
-		$(myuse oss)
-		$(myuse portaudio)
-		$(myuse pulseaudio)
-		$(myuse rnnoise)
-		$(usex speech '' no-speechd)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	use pch || conf_add+=( no-pch )
-
-	eqmake5 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add[*]}" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-multilib_src_compile() {
-	local emake_args=(
-		# place libmumble* in a subdirectory
-		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
-		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
-	)
-	# build only overlay library for other ABIs
-	multilib_is_native_abi || emake_args+=( -C overlay_gl )
-	emake "${emake_args[@]}"
-	emake clean
-}
-
-src_compile() {
-	multilib_foreach_abi multilib_src_compile
-}
-
-multilib_src_install() {
-	local dir=$(usex debug debug release)
-	dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
-	if multilib_is_native_abi; then
-		dobin "${dir}"/mumble
-		dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
-	fi
-}
-
-src_install() {
-	multilib_foreach_abi multilib_src_install
-
-	newdoc README.Linux README
-	dodoc CHANGES
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	doicon -s scalable icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index af1326c78ac3..0a2247347658 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -5,7 +5,8 @@ AUX murmurd-dbus.service 297 BLAKE2B 30ca5427de360cacab404cfff42d8e2355f14def671
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176dff9c28d06b6b2d0b4a8d0ff8ccd559c68a0fadddbc8363349d9c599c9ebd6da8e0055a680b18aa282e72875a5 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2
 DIST mumble-1.3.0-rc2.tar.gz 8759830 BLAKE2B 4df1001a174d042221a674a21dcdb7165742cba2428f778eb6ef7fcfe8128734f4207230222971fa97622af3ea81e40b676cc089e45704be3fecf76f97f72a36 SHA512 b31a92cbe9d2d973cb06e5f3bb237de22f0fa5f242e6a8141ffaa735268ca41097bda44445a73ea5dafef6ef3ff7a5050c52c7f9b9f5600d400e57aff6f2e4c4
-EBUILD murmur-1.3.0_rc2-r1.ebuild 3565 BLAKE2B 4b8282c64999cf70a51fe234d23e0737b2c710984d188c733a97a90109120af9705eb21eef2a66da118043b64b6541fe372cabe92737f0981e5a9760d6cb6833 SHA512 b6fe723f3cf2e6468a47f2ffc0102d54f6fbc7cf374e5e97eaaa7e0853162f0604cf1b0db34e0b9c009f661a09c95ff0358cfd9dbf808ce9238c94b1f7f8ded3
+DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
+EBUILD murmur-1.3.0.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95
 EBUILD murmur-1.3.0_rc2-r2.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95
 EBUILD murmur-9999.ebuild 3690 BLAKE2B 03dfc78a08930265518faaada25f6e857d39cd705e6ba3975ad7f12481efdba60b0f5b331e5ee785481ada733265f5caa0f681ba5aa0442d4cf45a1b96e742cd SHA512 9bab53e3b0282ac3adebb9055c1b57e2dbe0780a5f3e8cb2bbde227b22ebe057a85e3abf50a5106ce704ca07e2f56ede16ec03543676941d65269238488e6352
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/murmur-1.3.0.ebuild b/media-sound/murmur/murmur-1.3.0.ebuild
new file mode 100644
index 000000000000..bd399783509e
--- /dev/null
+++ b/media-sound/murmur/murmur-1.3.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils systemd readme.gentoo-r1
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' )
+else
+	MY_PN="mumble"
+	if [[ "${PV}" == *_pre* ]] ; then
+		MY_P="${MY_PN}-${PV}"
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
+		S="${WORKDIR}/${MY_P}"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${MY_PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
+			https://dl.mumble.info/${MY_P}.tar.gz"
+		S="${WORKDIR}/${MY_PN}-${PV/_*}"
+	fi
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND="
+	acct-group/murmur
+	acct-user/murmur
+	>=dev-libs/openssl-1.0.0b:0=
+	>=dev-libs/protobuf-2.2.0:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	|| (
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtsql:5[mysql]
+	)
+	dev-qt/qtxml:5
+	sys-apps/lsb-release
+	>=sys-libs/libcap-2.15
+	dbus? ( dev-qt/qtdbus:5 )
+	ice? ( dev-libs/Ice:= )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+"
+BDEPEND="
+	acct-group/murmur
+	acct-user/murmur
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="
+	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
+	Please execute:\n
+	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
+	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
+	to set the build-in 'SuperUser' password before starting murmur.
+	Please restart dbus before starting murmur, or else dbus
+	registration will fail.
+"
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == *9999 ]] ; then
+		pushd scripts &>/dev/null || die
+		./mkini.sh || die
+		popd &>/dev/null || die
+	fi
+
+	sed \
+		-e 's:mumble-server:murmur:g' \
+		-e 's:/var/run:/run:g' \
+		-i "${S}"/scripts/murmur.{conf,ini.system} || die
+
+	# Adjust systemd service file to our config location #689208
+	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+		-i scripts/${PN}.service || die
+}
+
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myconf: No use flag given."
+		use ${1} || echo "no-${1}"
+	}
+	local conf_add=(
+		no-client
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse ice)
+		$(myuse pch)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	eqmake5 main.pro -recursive \
+		CONFIG+="${conf_add[*]}"
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	docinto scripts
+	dodoc -r scripts/server
+	docompress -x /usr/share/doc/${PF}/scripts
+
+	local dir="$(usex debug debug release)"
+	dobin "${dir}"/murmurd
+
+	local etcdir="/etc/murmur"
+	insinto ${etcdir}
+	newins scripts/${PN}.ini.system ${PN}.ini
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/murmur.logrotate murmur
+
+	insinto /etc/dbus-1/system.d/
+	doins scripts/murmur.conf
+
+	insinto /usr/share/murmur/
+	doins src/murmur/Murmur.ice
+
+	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
+	newconfd "${FILESDIR}"/murmur.confd murmur
+
+	systemd_dounit scripts/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+
+	keepdir /var/lib/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/log/murmur
+	fperms 750 /var/lib/murmur /var/log/murmur
+
+	# Fix permissions on config file as it might contain passwords.
+	# (bug #559362)
+	fowners root:murmur ${etcdir}/murmur.ini
+	fperms 640 ${etcdir}/murmur.ini
+
+	doman man/murmurd.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild b/media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild
deleted file mode 100644
index 0a7f6b035c25..000000000000
--- a/media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd user readme.gentoo-r1
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' )
-else
-	MY_PN="mumble"
-	if [[ "${PV}" == *_pre* ]] ; then
-		MY_P="${MY_PN}-${PV}"
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
-		S="${WORKDIR}/${MY_P}"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${MY_PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
-			https://dl.mumble.info/${MY_P}.tar.gz"
-		S="${WORKDIR}/${MY_PN}-${PV/_*}"
-	fi
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.0b:0=
-	>=dev-libs/protobuf-2.2.0:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	|| (
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsql:5[mysql]
-	)
-	dev-qt/qtxml:5
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dbus? ( dev-qt/qtdbus:5 )
-	ice? ( dev-libs/Ice:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-"
-BDEPEND="
-	virtual/pkgconfig"
-
-DOC_CONTENTS="
-	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
-	Please execute:\n
-	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
-	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
-	to set the build-in 'SuperUser' password before starting murmur.
-	Please restart dbus before starting murmur, or else dbus
-	registration will fail.
-"
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur -1 -1 /var/lib/murmur murmur
-}
-
-src_prepare() {
-	default
-
-	if [[ "${PV}" == *9999 ]] ; then
-		pushd scripts &>/dev/null || die
-		./mkini.sh || die
-		popd &>/dev/null || die
-	fi
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini.system} || die
-
-	# Adjust systemd service file to our config location #689208
-	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
-		-i scripts/${PN}.service || die
-}
-
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myconf: No use flag given."
-		use ${1} || echo "no-${1}"
-	}
-	local conf_add=(
-		no-client
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse ice)
-		$(myuse pch)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	eqmake5 main.pro -recursive \
-		CONFIG+="${conf_add[*]}"
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	docinto scripts
-	dodoc -r scripts/server
-	docompress -x /usr/share/doc/${PF}/scripts
-
-	local dir="$(usex debug debug release)"
-	dobin "${dir}"/murmurd
-
-	local etcdir="/etc/murmur"
-	insinto ${etcdir}
-	newins scripts/${PN}.ini.system ${PN}.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	systemd_dounit scripts/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-
-	keepdir /var/lib/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/log/murmur
-
-	# Fix permissions on config file as it might contain passwords.
-	# (bug #559362)
-	fowners root:murmur ${etcdir}/murmur.ini
-	fperms 640 ${etcdir}/murmur.ini
-
-	doman man/murmurd.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index a37dc2b78801..784f33061d2c 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -8,6 +8,6 @@ AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
 EBUILD pulseaudio-12.2-r1.ebuild 11536 BLAKE2B 28892f7980092e0a314c5d69edcc88d5d9be7dd7a8845f4396f2d4a885ab69b1cb9298f3bb720beed253b5a3ed796ba8e55c94c63f7a4e1ec9b4ae7e369f69b5 SHA512 529c755ecbc2c8596cf295fc56c095dd7b987a5b7e1eea9b35ec04993ca0967e1afa52027e3a7a864d12f362f25d2cc1e2190b6d4c91a5cb730535c6bdd403b2
-EBUILD pulseaudio-12.2-r2.ebuild 11719 BLAKE2B 1ad6d74fe06e3138c497dbf0020eed28ee958f41c0048b55c882516c5116a2afa49749b670ede6db471c3782b8ba99712dfa5bf45cb606e9dbd928c530576eb8 SHA512 99af1eef5dc60f3a6494329d495fa0d446893f3de7918d816089bb7349c56c88fe49eecf52f90ec167a05c319e68b3da5f710136185736547c4136df0d277db3
+EBUILD pulseaudio-12.2-r2.ebuild 11718 BLAKE2B dcf014538084f982a90380f3bc358686bc8ddeb6fb636d9ea1bfd2203db7216a35efb728c68cdd57ebfce55365e1ddbd6c944665220dabf1a59960c8b41989b9 SHA512 b016a7fd49a61715da48737d6e8e8a2473a5c3794d133d3b410b3e917dee7cadd46630526b193c39c3cac8cdbedf9a3ffe482a6a0185fd399a1272df47ee29b9
 EBUILD pulseaudio-12.2.ebuild 11111 BLAKE2B bd002a2bf9d7c0521eed3baec7d2b602302e8cd4bd7acd6ea22abeff54ee1be8042b44bcfd64a7f4d57f2855a958235d5b16fcf018f0377cd5f5faee040c84e2 SHA512 dd20835fb783428209dcffa07b0b4c1ec9f3e42b91faf07052df5f77f3eac388ee91dfbfe2da7f07890ae3631234a8a14bfafc41875c6716c6b8b9e839ba0f21
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
index 2a4cc0e9089f..14fcb10d3ed7 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 3fd2dd5c6ff9..f701084e1f84 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,6 @@
-DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
-DIST pulseeffects-4.6.5.tar.gz 1881685 BLAKE2B 25f9fd27f2cb66ed32664aa5aaf6e6a7f0860a4addadd572be7e53c49434c8d57bf1799ccdd5e40546a918b5723a0ce8b34a8d8b337fe3b4c7a16fb8271d9d3f SHA512 4de2c29b723d2f42ed38021f9515be31eba51419833a449f531c9ad130636e8ce31f0207ff5c00d493ea59ed684ddfe236b7e2570fd9e54b005eae494e65a680
 DIST pulseeffects-4.6.6.tar.gz 1881680 BLAKE2B 9bb1048b3870824d19f72e29da2ee274ed387bea7fae0036a104694defd47f754fda3fa1668a95ddb8c2ea066c457bb469c3c32292dc7a378625c6f19d9339ff SHA512 ed6482169bb06490bbcbc57f293723089e5750279a74d6ec5ba2693cb1a71df88262e6fd7d91c852ba5a75b07c246992f619299017e856fca38ad5c619486963
-EBUILD pulseeffects-3.2.3-r1.ebuild 1542 BLAKE2B b98afac0e18f40b4d50578aaa766cf077b73157aefb380fc766e63cd6e1c43b2ea1026ca30b9fbcdf24aa3d150b6f835664668dded8e025e9b2b4b94c558aacc SHA512 14edbfdc37cebc7bd6bf0b9f1f1ac0217da3df742e52b1762d186274eca7cb05ea953c2289059836417430c0bc528f3327859a4f2c4f8d4e5ff99f2ee2d42d4b
-EBUILD pulseeffects-4.6.5.ebuild 1804 BLAKE2B 440b75afc189ccd5efa34f187de3dd83401ea5d756e8a8bf1fbe6878d1d47ddcf1e0cc910346dbbe34ea3390924d2906c8c91a2733d80b2aca2e0aed5f42aed2 SHA512 49381d15e31c49220443f35b4f31fd1bc46f1c74d4989dc8dbc8f1b635e7ef485d0ba106c1f99cd98c129f60914ede3a7820f692114e40ca4edeacbe8fb844e2
+DIST pulseeffects-4.6.7.tar.gz 1880914 BLAKE2B 919f9885c8b991782251257ba13512c5c25ae6590fd3f709b9f142f74f80f9fd15bbdc0cd57a7a7d84cc4c94c795f69db57a13b161cbbebdd2458803e36e8ccc SHA512 138ea6081e3b1751f0cd15d6ae1eb0dbc4156493b37f7c8b48878a6600ec19c8846145b7bef3bccb93b6775bd4f0b9ee998c603152c6526540eaaebcdcaa5d2e
 EBUILD pulseeffects-4.6.6.ebuild 1803 BLAKE2B 62eb4d5b56e930df0ceda31bdeebf26ae89f80108f1754c6718342468481768dd5dcf8a5b0006a77ced1a92c3d8504142b65dc558b26defb4295caf20699e9c4 SHA512 052459a1211ea7a74265723b6d4352d0c79346195aab43136b74f3be7a3cd29a4cb8b53874b9106419d7cc3dc3e194dc36c7f7b67aa53450872eaf614f305a33
+EBUILD pulseeffects-4.6.7.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 EBUILD pulseeffects-9999.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
deleted file mode 100644
index cc5be9c324fd..000000000000
--- a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit gnome2-utils meson python-r1
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3.18:3[introspection]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
-	>=media-libs/lilv-0.24.2-r1
-	>=media-plugins/calf-0.90.0[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0[introspection]
-	>=media-plugins/gst-plugins-bs2b-1.12.0:1.0
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}
-	media-sound/pulseaudio[equalizer]
-"
-
-pkg_preinst(){
-	gnome2_schemas_savelist
-}
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.5.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.5.ebuild
deleted file mode 100644
index 59759efb7e42..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.6.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.7[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	media-libs/libsamplerate
-	virtual/pkgconfig
-"
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.7.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.7.ebuild
new file mode 100644
index 000000000000..0e6624cf2428
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.6.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.7[lv2]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
+	dev-util/itstool
+	media-libs/libsamplerate
+	virtual/pkgconfig
+"
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 3d50e98629cd..2ec802edda02 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -10,4 +10,4 @@ AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0
 AUX sox-14.4.2-wavpack-chk-errors-on-init.patch 1328 BLAKE2B 0a1f6c0ef96d5508f11901b28b57feda0be79f0af6ead0af51eb97db7a3a97497aa446389904bc9457efd8dc4f9738f5482841caa096d3449d3b1ab5d77b746a SHA512 ae95d810f489efb749f808c6e46b0412f4cfd6ee60fce0289c0c1d689bb599fd2516a79fcd24ac9ddd30fab6f0437a6876dccfb61db2f6c612fe680f6eff13b5
 DIST sox-14.4.2.tar.gz 1134299 BLAKE2B 9fae987d421fc733b84746f8dc8f09ced1c3ce066643a426d7c64c4ed4ceeb18e5d00165108b39065a4ce40ff39e9d020fc6e734ff1121ee39bfeed4ad822bc5 SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
 EBUILD sox-14.4.2-r1.ebuild 2617 BLAKE2B 16de3a69ba83189cc3285b2886e2f04081fd875f8d0c85fd28986d0e5bab9afaade01fa39b02adc39f21cc92273dc55e65ec8d71f8000ec0adc96229a76e9ece SHA512 b503cec195701776966eab7ee510faf0f76b48f084bd6a2addfdefcdb8c1eb50370cd7ddcf214524da89d06e8ccd57d1859d84ce2ab2d158ac7b5c71eb6fff46
-MISC metadata.xml 579 BLAKE2B 9a129ee262f9147b903659d806b5cb7db559a3cd70adbe6cbf0faca60ae3f2d3c5898ea713813b124bdb43fac7b7e4fa9a6702892bc99dfa9fe3271403160077 SHA512 3b09529397d2d31693f701c05e4db73db553177ec6471a28612254fe3117d1b3574bdf3381a024c23c2e8c7efa02925d0c464548ed4105c573266c612595de2f
+MISC metadata.xml 653 BLAKE2B 73d6e024f7b8cf87cc0640a749af4bf3d45604e9e28cd9ff1f68fea9b7f4c05ff2e1ee676efd07d1221070492a3575c1f4397cfe7008df00403232353f22afcd SHA512 578f6db7fbe2ae3dc3a732a2cbfb8627bfcce1801b4834071040df1b9e3bf20ca9dd6e7a8d7df221d38f4e8fff22cefa6ad57fd19dc145ab4a247f688c497c71
diff --git a/media-sound/sox/metadata.xml b/media-sound/sox/metadata.xml
index 9f80c9612eac..c891b42123b6 100644
--- a/media-sound/sox/metadata.xml
+++ b/media-sound/sox/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
   </use>
   <upstream>
+    <remote-id type="cpe">cpe:/a:soundexchange:sound_exchange</remote-id>
     <remote-id type="sourceforge">sox</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 64e8c327c66d..39cfe9c58e1d 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -2,11 +2,6 @@ AUX supercollider-3.10.2-boost-1.67.patch 1521 BLAKE2B 0e63a18647b85cede59cf8dcd
 AUX supercollider-3.10.2-boost-1.70.patch 1882 BLAKE2B 48fdf58789d37a296a28f11045d3f224c29a3bdfd39d5377101d2a1bb501f8a648307b0546daadea3d46213d6847098a1128101b1bd990c6ffe203aac6bdd6fc SHA512 0a999fbd53de6c7c2fb81451c6a1f4ce909220a257eefccce1d2246238637d661757795dfc4be7dd69c0553bdf1a02db9311da6033fe7b17230800d06fd291b4
 AUX supercollider-3.10.2-no-ccache.patch 927 BLAKE2B 661610049aab5c077cbff57fa476d08ef7170440135362dafa96b4ab312d778154acdcccd93562822c7d6078d55c6c5eaf59eeadc85e61cc85f1e50a76c908e8 SHA512 5a1f6f074adcb77b9958ff47e855378f9ec180201e32cc417925320ee7fbeedd5b2a163b300286bf0344bb6bb47743598c59c95f28573f4a309696ca5e44af8d
 AUX supercollider-3.10.2-system-boost.patch 15055 BLAKE2B d6b3b2c9f13829ff5b2af037f4204fff519efe67bcb7b705090a2883d97738f0cc8b4a66fe39f88d5fe676081ed44fe3132d23e404c821353d1e9b31d1e0d764 SHA512 d9b2ef108673b11a27c63654ceacf3b7e51df11ce05fc6d9045abd219ea718c2552f5ea026a5182c272639e695a1073192013b14cae257e7e4b00dd3c303ecae
-AUX supercollider-3.8.0-no-opengl.patch 2146 BLAKE2B 0697fcad3f277072459d40675509b223e5b7e35d8ecd94e200817bceeea12e224201376c8db61b46159f8b18e3f27b28549458bdfc0793c994d17943ae4cb3b8 SHA512 33dabf5ce200b783d3c54e8ddbb1217d4d4269ae4b8f82627264737377c786fc049e6b9309b97ba06eced7e313d39a57129dea98915b4a0106a8f413b9e86fd2
-AUX supercollider-3.8.0-no-qtpositioning.patch 1840 BLAKE2B cf4ee13c08e81f3ae19d50b23f8416a5045bd60ab64f8b6c0903f40addf7701b30792f9d4de0c57f3b4f4b2b661eec19eb5b8faa520997b263215dfee6df5a8e SHA512 df86ee0e3c190283b9ed79a3bc4f1108ee0279c1d6f44bea6ffdeb7fc77b38163f2d9ab199b8124e2f06d436d68d217995b46c580740951e5e13cbd56618b635
-AUX supercollider-3.8.0-no-qtsensors.patch 2675 BLAKE2B 0fae3883eddbf2bc025e7dab0600915d3770e20c28fedc51522d1dff7e9b3fab2e4d920762b252d2af711ea4f2b010e8b532d90595c4594a757437cbc6a907ce SHA512 4574101c4c41522ebeb7a747f29734beec7a7d4eb0751d959718e0a040e1fb7fc76685d53e2cdf5e027ad91b7a0c7465714acc951bd4d4d8023145008f0b314c
 DIST SuperCollider-3.10.2-Source-linux.tar.bz2 11366481 BLAKE2B d01324ed65f7e8977c138709471e7b9000b1d05ce4c1c0ff83c9ca0ae6e3948b4933320c382b64ecd2aebc65597c963c9348dda09a8c2ec7bc2ea5a14473fe44 SHA512 f7d136cb03e32dfd0b72e36047deaa24d5edfac0f7e9eeaac35f8e991cd52b00db0701478e0daefb24bfbbc55b5cf240e3f3429fd46caa8d76daa21c7aebaf46
-DIST SuperCollider-3.9.3-Source-linux.tar.bz2 11060240 BLAKE2B 5da51bece13d2a3e4ca1ff6b79637122a46c1f590aa7e4ebf52d7a663506c6f4bae4f3d618bb7f947c73828402f329be68e435a4de2ecc092c312cb2c993742c SHA512 5b0c29941907d5ca45c1676e34184664c03891051bba0ee50d9e8311400824054de7b6daba6d29fd875ff38f42ee9654504ea2f0b5bf0a36ae9605e6a79a0841
 EBUILD supercollider-3.10.2.ebuild 3055 BLAKE2B 3569094c88762fde957ff9c979f3d6bb777b859a0f4bbb4c7a893b14acae31b32bd5a319867407488fde390c00261591bded8143ead4835866e7b64dd2599eb8 SHA512 01e2f6979578cba5736c415594e805ce36db7c797b02fe22932ad7320a11fc7242fda2b87c09021797517a20b0f8353e4b6cea877b4f8990c603f45bc8d85277
-EBUILD supercollider-3.9.3-r1.ebuild 2836 BLAKE2B 164dd68cf7178fca42bb1a650ddee93dc9ff90db43f4f4c95a09530ac02305c176a450430fa956d094a6368e6e0e81ab1d379cf10ea6e801a9e762edc61fb9c8 SHA512 25ca2d3f3a14fc11db4cb6626bbdaa43ded4e1ee2bf2a616e3c83cf34e171eff22ce831ca6d4087477140fcb92a3f2283a1dff6374a5d2d4a65226e3da23060f
 MISC metadata.xml 840 BLAKE2B 261014eccb171924a9a70a4972d9ea1cb9ad36f6ac2b7ecb40ebc2eee59d535871957109e239b90500d26073769cf58cd475cf221af0d2caf42033a2e0e56911 SHA512 a8ce15c95e8b04624301b814156ebe84195071b2ec80b223444c733e8b4de8137d4d70397f3a84d2894bdc635fff5d15ba66a9409749c02b3f3acb40d9479895
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-no-opengl.patch b/media-sound/supercollider/files/supercollider-3.8.0-no-opengl.patch
deleted file mode 100644
index 15e19d8dee60..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-no-opengl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
-index 64f275b..f88c4a7 100644
---- a/QtCollider/CMakeLists.txt
-+++ b/QtCollider/CMakeLists.txt
-@@ -8,17 +8,16 @@ find_package(Qt5Network)
- find_package(Qt5WebKit)
- find_package(Qt5WebKitWidgets)
- find_package(Qt5PrintSupport)
--find_package(Qt5OpenGL)
- find_package(Qt5Sensors)
- find_package(Qt5Quick)
- find_package(Qt5Qml)
- find_package(Qt5Sql)
- find_package(Qt5Positioning)
--mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5OpenGL_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sensors_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR)
-+mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sensors_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR)
- 
- set (QT_COLLIDER_LIBS
-   Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::WebKit Qt5::WebKitWidgets Qt5::PrintSupport
--  Qt5::OpenGL Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning
-+  Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning
-   ${MATH_LIBRARY})
- 
- if (APPLE)
-diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
-index f2347de..860d254 100644
---- a/editors/sc-ide/CMakeLists.txt
-+++ b/editors/sc-ide/CMakeLists.txt
-@@ -7,7 +7,6 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- find_package(Qt5Core)
- find_package(Qt5Concurrent)
- find_package(Qt5LinguistTools)
--find_package(Qt5OpenGL)
- find_package(Qt5Positioning)
- find_package(Qt5PrintSupport)
- find_package(Qt5Qml)
-@@ -18,7 +17,7 @@ find_package(Qt5WebKitWidgets)
- find_package(Qt5Widgets)
- 
- set(QT_IDE_LIBRARIES
--    Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::OpenGL Qt5::PrintSupport Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning)
-+    Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning)
- 
- if(${CMAKE_COMPILER_IS_GNUCXX})
-     add_definitions(-Wreorder)
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-no-qtpositioning.patch b/media-sound/supercollider/files/supercollider-3.8.0-no-qtpositioning.patch
deleted file mode 100644
index ee4bf52d010b..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-no-qtpositioning.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
-index 903d5a0..007b4f4 100644
---- a/QtCollider/CMakeLists.txt
-+++ b/QtCollider/CMakeLists.txt
-@@ -11,12 +11,11 @@ find_package(Qt5PrintSupport)
- find_package(Qt5Quick)
- find_package(Qt5Qml)
- find_package(Qt5Sql)
--find_package(Qt5Positioning)
--mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR)
-+mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR)
- 
- set (QT_COLLIDER_LIBS
-   Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::WebKit Qt5::WebKitWidgets Qt5::PrintSupport
--  Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning
-+  Qt5::Quick Qt5::Qml Qt5::Sql
-   ${MATH_LIBRARY})
- 
- if (APPLE)
-diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
-index dbe2ad7..cdbb11e 100644
---- a/editors/sc-ide/CMakeLists.txt
-+++ b/editors/sc-ide/CMakeLists.txt
-@@ -7,7 +7,6 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- find_package(Qt5Core)
- find_package(Qt5Concurrent)
- find_package(Qt5LinguistTools)
--find_package(Qt5Positioning)
- find_package(Qt5PrintSupport)
- find_package(Qt5Qml)
- find_package(Qt5Quick)
-@@ -16,7 +15,7 @@ find_package(Qt5WebKitWidgets)
- find_package(Qt5Widgets)
- 
- set(QT_IDE_LIBRARIES
--    Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning)
-+    Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Quick Qt5::Qml Qt5::Sql)
- 
- if(${CMAKE_COMPILER_IS_GNUCXX})
-     add_definitions(-Wreorder)
diff --git a/media-sound/supercollider/files/supercollider-3.8.0-no-qtsensors.patch b/media-sound/supercollider/files/supercollider-3.8.0-no-qtsensors.patch
deleted file mode 100644
index b9099b971eee..000000000000
--- a/media-sound/supercollider/files/supercollider-3.8.0-no-qtsensors.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/QtCollider/CMakeLists.txt b/QtCollider/CMakeLists.txt
-index f88c4a7..903d5a0 100644
---- a/QtCollider/CMakeLists.txt
-+++ b/QtCollider/CMakeLists.txt
-@@ -8,16 +8,15 @@ find_package(Qt5Network)
- find_package(Qt5WebKit)
- find_package(Qt5WebKitWidgets)
- find_package(Qt5PrintSupport)
--find_package(Qt5Sensors)
- find_package(Qt5Quick)
- find_package(Qt5Qml)
- find_package(Qt5Sql)
- find_package(Qt5Positioning)
--mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sensors_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR)
-+mark_as_advanced(Qt5Concurrent_DIR Qt5Core_DIR Qt5Gui_DIR Qt5LinguistTools_DIR Qt5Location_DIR Qt5Network_DIR Qt5Positioning_DIR Qt5PrintSupport_DIR Qt5Qml_DIR Qt5Quick_DIR Qt5Sql_DIR Qt5WebKitWidgets_DIR Qt5WebKit_DIR Qt5Widgets_DIR Qt5X11Extras_DIR)
- 
- set (QT_COLLIDER_LIBS
-   Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::WebKit Qt5::WebKitWidgets Qt5::PrintSupport
--  Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning
-+  Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning
-   ${MATH_LIBRARY})
- 
- if (APPLE)
-diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt
-index 860d254..dbe2ad7 100644
---- a/editors/sc-ide/CMakeLists.txt
-+++ b/editors/sc-ide/CMakeLists.txt
-@@ -11,13 +11,12 @@ find_package(Qt5Positioning)
- find_package(Qt5PrintSupport)
- find_package(Qt5Qml)
- find_package(Qt5Quick)
--find_package(Qt5Sensors)
- find_package(Qt5Sql)
- find_package(Qt5WebKitWidgets)
- find_package(Qt5Widgets)
- 
- set(QT_IDE_LIBRARIES
--    Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Sensors Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning)
-+    Qt5::Core Qt5::Concurrent Qt5::WebKitWidgets Qt5::PrintSupport Qt5::Quick Qt5::Qml Qt5::Sql Qt5::Positioning)
- 
- if(${CMAKE_COMPILER_IS_GNUCXX})
-     add_definitions(-Wreorder)
-diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
-index fe52223..427c587 100644
---- a/lang/CMakeLists.txt
-+++ b/lang/CMakeLists.txt
-@@ -389,7 +389,7 @@ elseif(WIN32)
-             SET(QT_PLUGINS_DIR "${QT_BIN_PATH}/../plugins" CACHE PATH "Location of qt plugins for windows")
-         endif()
- 
--        foreach(plugin ${Qt5Network_PLUGINS} ${Qt5Gui_PLUGINS} ${Qt5Sensors_PLUGINS} ${Qt5Sql_PLUGINS} ${Qt5PrintSupport_PLUGINS})
-+        foreach(plugin ${Qt5Network_PLUGINS} ${Qt5Gui_PLUGINS} ${Qt5Sql_PLUGINS} ${Qt5PrintSupport_PLUGINS})
-             get_target_property(_loc ${plugin} LOCATION)
-             get_filename_component(_parent_dir ${_loc} DIRECTORY)
-             get_filename_component(_name_we ${_loc} NAME_WE)
diff --git a/media-sound/supercollider/supercollider-3.9.3-r1.ebuild b/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
deleted file mode 100644
index 637cfe5bced5..000000000000
--- a/media-sound/supercollider/supercollider-3.9.3-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="https://supercollider.github.io/"
-SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source-linux.tar.bz2"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim zeroconf"
-RESTRICT="mirror"
-
-RDEPEND="
-	media-libs/alsa-lib
-	sys-libs/readline:0=
-	x11-libs/libX11
-	x11-libs/libXt
-	fftw? ( sci-libs/fftw:3.0= )
-	jack? ( virtual/jack )
-	!jack? ( media-libs/portaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsql:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-	)
-	server? ( !app-admin/supernova )
-	sndfile? ( media-libs/libsndfile )
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}
-	dev-libs/icu
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	gedit? ( app-editors/gedit )
-	qt5? (
-		dev-qt/linguist-tools:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtconcurrent:5
-	)
-	vim? ( app-editors/vim )
-"
-
-S="${WORKDIR}/SuperCollider-Source"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-no-opengl.patch
-	"${FILESDIR}"/${PN}-3.8.0-no-qtsensors.patch
-	"${FILESDIR}"/${PN}-3.8.0-no-qtpositioning.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DAUDIOAPI=$(usex jack jack portaudio)
-		-DINSTALL_HELP=ON
-		-DSYSTEM_BOOST=OFF
-		-DSYSTEM_YAMLCPP=OFF
-		-DNO_AVAHI=$(usex !zeroconf)
-		-DFFT_GREEN=$(usex !fftw)
-		-DNO_GPL3=$(usex !gpl3)
-		-DNO_LIBSNDFILE=$(usex !sndfile)
-		-DSC_QT=$(usex qt5)
-		-DSCLANG_SERVER=$(usex server)
-		-DSUPERNOVA=$(usex server)
-		-DLIBSCSYNTH=$(usex !static-libs)
-		-DSSE=$(usex cpu_flags_x86_sse)
-		-DSSE2=$(usex cpu_flags_x86_sse2)
-		-DSC_IDE=$(usex qt5)
-		-DSC_ED=$(usex gedit)
-		-DSC_VIM=$(usex vim)
-		-DSC_EL=$(usex emacs)
-	)
-
-	use debug && mycmakeargs+=(
-		-DSC_MEMORY_DEBUGGING=ON
-		-DSN_MEMORY_DEBUGGING=ON
-		-DGC_SANITYCHECK=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use vim && newdoc editors/scvim/README.md README.vim
-	use emacs && newdoc editors/scel/README.md README.emacs
-	use gedit && newdoc editors/sced/README.md README.gedit
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Notice: SuperCollider is not very intuitive to get up and running."
-	einfo "The best course of action to make sure that the installation was"
-	einfo "successful and get you started with using SuperCollider is to take"
-	einfo "a look through ${EROOT%/}/usr/share/doc/${PF}/README.md.bz2"
-	einfo
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/tuxguitar/Manifest b/media-sound/tuxguitar/Manifest
index e274e5c37431..a0ab162729c6 100644
--- a/media-sound/tuxguitar/Manifest
+++ b/media-sound/tuxguitar/Manifest
@@ -1,4 +1,4 @@
 AUX tuxguitar-fixed-ant-files.patch 10154 BLAKE2B 23f18334ce752a657f65a850c4b45eb7685b7937480977973d327c14d10ffc7e66f154d0d465dcb24ab39f7ae76fbf796e3df6571a3ff049fc116eaaee6381d8 SHA512 90b732cddf4684fb99a91e581903e64cd039ef9b9d8ec7bc9629ce8da889a6b2961f8f5dafd6cce21eb0c67e2e5501586580081f28c702de88ddd1d229769013
 DIST tuxguitar-1.3.2-src.tar.gz 82294553 BLAKE2B 74e0e4b0f2d3d63dbf8f16db43a165f77b39ad54e21091520c06228ea789161a6fb65a1a05bde0f1473afe61e2d990f646b5228b9fe19c114da21a5c32aa32b6 SHA512 fb94472df25578d94ad11cd385cfc9347bfefcdd8ebedd2e785f3645d6b2e0d6d87d3fc457af159865b3fae77ad443ac4246b3c6fbe42397f4d15908dd3b7149
 EBUILD tuxguitar-1.3.2.ebuild 3459 BLAKE2B ea0defbcfb81faf0d7566cbcc786078ea808630ebbc54e4db24343e487d0805541ea2ee6776b871e4f15d9439ab936cb6010562931d132696441d607044e93c2 SHA512 ecc329f413c6dde86fcfaef5b0f88f3934510cb72ec4de2f7f8b712be837bbee2394b983b9764c417233f4e291a80171ede7aa1f532dc7f730061710866d3926
-MISC metadata.xml 1287 BLAKE2B aa7c3b560d507756eb72d602038017dd94e3f261a2a0255ee12441ef60b4772015f332109157e28cfd29ef3784cce6061f488f23ee5b8b9e42f430facff44008 SHA512 4249950599126709e668de28b8a8a0ac4dfa8b118b34f738e6eb7b610f6ed0fb2d11a962631bffcb52d552ee950c5045394e0df89dc37b5b9c9ac4648f86e2d8
+MISC metadata.xml 1203 BLAKE2B e1a4fca2836857ac65bd45a68016aa3523f54e55e3d57334428b21db9e14d72296edd2bb2d9dc0cbead8c9b944c02716984b41953ad39fffe4f4b83a5cf9e916 SHA512 495d2189cb9e60bad807016e0eeb04ca36d6ec6b9baec1355b969707b8a321770f670eb257fb5f9b2afb58418915da003b84b632b1203a67739fc02b4ecf8f17
diff --git a/media-sound/tuxguitar/metadata.xml b/media-sound/tuxguitar/metadata.xml
index f11d4ce160eb..43ad71f5f096 100644
--- a/media-sound/tuxguitar/metadata.xml
+++ b/media-sound/tuxguitar/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dracwyrm@gentoo.org</email>
-		<name>Jonathan Scruggs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A multitrack tablature editor and player that allows you to
 		compose music using the following features:
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index ce18023f9516..d1313f9a43a7 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/ivtv-utils/Manifest b/media-tv/ivtv-utils/Manifest
index de3692ba7c8f..8ed625194f92 100644
--- a/media-tv/ivtv-utils/Manifest
+++ b/media-tv/ivtv-utils/Manifest
@@ -2,4 +2,4 @@ AUX ivtv-utils-1.4.0-gentoo.patch 2488 BLAKE2B 348f93c26a97e6f781e5258097cc72c31
 AUX ivtv-utils-1.4.1-overflow.patch 1762 BLAKE2B 260b519153d319062751fe0d597732b043c943e121c6a7bde3ca69841b83c15dfbccc00654bb9a106a457634fe8a2cd177fce0311e94b9d6af0162df94b47812 SHA512 775acf1bc8b13e811a4aad1d9f7ab3051634e8a7d521a1a594e06262cb9a0d782d55b37bdc93618390253403b5ed98af5756d24522a5f61489401f4ffc71903e
 DIST ivtv-utils-1.4.1.tar.gz 189918 BLAKE2B 7880b532ffb3a1ffa13c38b74b57f82a199486ba5bc8e310cb5447ad78d05a0380b51070a0dc67e4f1120d49c8c7d9a2b829e3922585484906efccc4f2b96fb5 SHA512 719c922fb819ba7f0ca3d4bbede571c416dc9f282bd8a7e2fbe7d9b4298541a104f8a848e113379eeec052206658b7a0a2e0eea1b7917e90f2aee37fe0010bed
 EBUILD ivtv-utils-1.4.1.ebuild 901 BLAKE2B ab0c3e482dc27fd84b981e1c74067102bb8958cffdaf641be0df42ae2bc129d5d9f22a2a074867323d8a311a6ae71977ae6872c6b7151588bd65182e77556b55 SHA512 de39ffc9d653bace3d8885159ad902f1c726dcc37d430c03a3bf83c53aa93ab6de5ac7e554eae1aaec8271e246240e778678ce91b66098bd5bc548135d5a565f
-MISC metadata.xml 387 BLAKE2B c21744a4cf1cfb7da7c82719d6c41e5e4ea9f911d1232a28070d7e55cf8b7c94ec6fab7f619c24fbadf974ac795c2b113f71e879a9d4953965b8fec0c3d63f69 SHA512 22ed4f0b1e523a49f89d2cbd0d8d760fe2b96098d2ed311d7a9fb873337730e822734085a7574e3133e993451e2980815134795f28131fc8398aa537c7d7c3db
+MISC metadata.xml 302 BLAKE2B 98fc025993a88c607187f0b8e9fe7295800fce7a4d0db4378118175be7dd9af2131130e5872b79faf415dd404d635c72524395927e8f5c4e7184d24e75e97937 SHA512 fd8133b38c4139c841e83a26e24cb2695a6f711b0f9a5495d8f9363d9ae32bc26d03e7e1b5a708d549fbe72452af853c5b326b1a2d27cd5dc630bda8a6fed9a2
diff --git a/media-tv/ivtv-utils/metadata.xml b/media-tv/ivtv-utils/metadata.xml
index c66a729df574..d2cd6812aa5c 100644
--- a/media-tv/ivtv-utils/metadata.xml
+++ b/media-tv/ivtv-utils/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>cardoe@gentoo.org</email>
-    <name>Doug Goldstein</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
     Driver for ivtv based tv tuner cards, currently supports Hauppauge 
     PVR-[23]50 cards
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 048aeb0e3869..eb9aa659da46 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -7,5 +7,5 @@ DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 EBUILD kodi-18.3-r1.ebuild 9615 BLAKE2B 9b507cab8dcf05014fa2c35af477afeca13c9c09e699da7af7d199974f603ebe900e59f25f7f7cf5443d1a8cc1d1dbc871f21509eefa826c237042d2270872cd SHA512 d53a257d5552965e26ee3e9037dbb58ec1661c8a5964160822d14fc63c736d6304e3622369378ba1888c587241c75e4fbbb7345a7082047bf59d2e315aaa1cb1
 EBUILD kodi-18.4.ebuild 9447 BLAKE2B c7b046a250efdc94f21e184cc598eae63385f7a2f9c1c6284c7f99ef35c63805dbf57cdad3868f46a32268ad185e843bf43f89e3993cc38fb2b13d90ff722af5 SHA512 90a84232549ef0fc88a4259aa75d891079d3c83c1fe82aaa645740b3922257a77721d23a8a7a70bff281d89409964dd0862abd474347944987f4a5b51e0a7330
-EBUILD kodi-9999.ebuild 9396 BLAKE2B 224a84d4c8dc2174f600400d56995ccc668a9070832d10e13eb739e3f3a1774875e6b4db4b97504bc1248bae325c8ca539739c0d20b101bd19f6ba138d6c989a SHA512 c38ca1ff3a8a059914f51c9f81ba6f5d61b1ebcb84762d54b500daadd179006c1982a1f665c55481096136264da3d0f5e22626a472e3e98fc11b4017c05f3576
+EBUILD kodi-9999.ebuild 9399 BLAKE2B 44916f93ffc75a2276996fef6b2fd375401dd6c50ff0a67f2b679f290feec1df53c68a27c8d83fc9c77c997e5794e926a8a64f2003bbb05ecb1220d37b3be5b2 SHA512 73e174629854fc2568ecbf6b53253a05109d3d300903c434f0a7d74ed4ccebb0824ad894112dcfa13eabe5328dcb3c17ab8d6a39080a96d97742785bf13fe7b9
 MISC metadata.xml 1720 BLAKE2B 3158b87065286649496de2edf821c37042cafe7e729f7ba31c571ade72cf8f9fbce218485ac721ad896fa5ef751becfd2f3b4ce1645e97b4db673ec879884834 SHA512 f8d52358276ad8c2eb23632451f025ac45f799fa392bd59fcfd4417d9e9e76cf9ce066ac50cd8ee563319d7f2248b28c45fee3059a4e069ebb862e41d230b1da
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 7435fb7face0..a894cf36c9dd 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -85,8 +85,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	libusb? ( virtual/libusb:1 )
 	virtual/ttf-fonts
 	media-fonts/roboto
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.8
+	>=media-libs/fontconfig-2.13.1
+	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
 	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
 	>=media-libs/taglib-1.11.1
diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest
index 31a17fa3a160..a1656ec02085 100644
--- a/media-tv/v4l-dvb-saa716x/Manifest
+++ b/media-tv/v4l-dvb-saa716x/Manifest
@@ -15,4 +15,4 @@ DIST v4l-dvb-saa716x-0.0.1_p20160322.tar.gz 5028181 BLAKE2B 6d0917e7c72a7c77ff37
 EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild 2360 BLAKE2B c125d676eebbebc4023c926adf261a5b065f228a3f306b785145df8f0d24feec6927f5b35380ebee114f30ada010d99f07c1a5d33db958b648a80ae8e5543bd8 SHA512 31ee224bae08d6305c8f540b6bf87cda3680f26dbb05446436ede1753cb0acc53cd0448f1784ae889ba0c126f9e2994010b434a1ae7778bdc3098fbffe7ce285
 EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild 2446 BLAKE2B e25bbb28e6ae8e7968e237e2cdd63fb6741986e1283e9f603d711d7b83ae31c51b65b1c623236090d4432aa312ebb381d77ca7020076cffe660363a583569c5d SHA512 ac919de8e2c04ca11b9b91535c5b43beaf084cccb69910dfa84dacd4ef4a04e8d25efb536d5f154a3d73d3575e2135c892d7721faf4e678f10423c2b88cfeffe
 EBUILD v4l-dvb-saa716x-0.0.1_p20170225.ebuild 2017 BLAKE2B 77b4e83a6e100fc1a07c447682defdf0e8860594e5ae344a450ef878f787a12ab3262b8e3dd96aeccc888f4c4f7ac52999c84dc1d23636202b94ec2faeacb88e SHA512 5dd9acd0e0300de379ef7f8ed21a9e5b81ae2f8f2dcd93d909aea6385ec868a26eed82fd7ee648b655e3d947ba62b302eb5e8639ad1512c281921c9e1a1aa9c8
-MISC metadata.xml 635 BLAKE2B 2c8d153d32728595bc4e69133e1794d9adec5dd76ca2de200af8b8b799d3e76bebc33df93605ce80ad6a7c079d56ed8f6b39211dd1afef0120094c9c49355a93 SHA512 2f26fc45a2f6ef5f9fe30ea530ef217db685753279c9827124f550e193d8abd0fb675f889744c018fde9a7f41dd39a6352c748605bbda372e4812a0a913a1235
+MISC metadata.xml 522 BLAKE2B 4fac71b04452341c84053cf601897155086cbe2d50bd0f04287ecae47ab06fb6b613197296ded88ebc8ac50230caa9d343449172eb73847d5ea763141bb6e3ba SHA512 651ce09fe8afac13810b4733051ccd326e8a468fae099c2a600fab0afac1071b2bba26837122fad5db235ddad25c80d56825d11b47e03eac8b0ca30dab1b3a61
diff --git a/media-tv/v4l-dvb-saa716x/metadata.xml b/media-tv/v4l-dvb-saa716x/metadata.xml
index e6068d25781a..953cd1bea14f 100644
--- a/media-tv/v4l-dvb-saa716x/metadata.xml
+++ b/media-tv/v4l-dvb-saa716x/metadata.xml
@@ -5,10 +5,6 @@
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>hd_brummy@gentoo.org</email>
-		<name>Joerg Bornkessel</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/media-tv/w_scan/Manifest b/media-tv/w_scan/Manifest
index 5ae9c4e70495..2fefca30c228 100644
--- a/media-tv/w_scan/Manifest
+++ b/media-tv/w_scan/Manifest
@@ -2,4 +2,4 @@ DIST w_scan-20141122.tar.bz2 239277 BLAKE2B eb3afd5977d39ff7c8b4b0c5d85fd57b74ca
 DIST w_scan-20170107.tar.bz2 245517 BLAKE2B 049d555f47935118be26f0bb8a8fc6baa43c273692ff6bc4c95ae912f00f1bda0e5834919c018539b1f891e436ec6556b29ad8c68d69de4a93911e5c7fb265b6 SHA512 c8e163b5e4897e2bc48596a1104974c79807432c423a3dd172e85c6ed6d4f9a4a471150ae7fe1b78fe570987e9fdee666a491700368c8499b03e9b13aa5cde6a
 EBUILD w_scan-20141122.ebuild 677 BLAKE2B 934e0f5e2affa3e77029c1c7b4fe0969e246ddbcde745f78103f2f0fd9c3334fc6a7cbf0be4ce81e03c06d98881be60602ab3cf3f6616ae585ab3b823a1e76d0 SHA512 85f5c1fd201ddee888461a6faf9439fffdd571018ee65bd00612d4f42e5a045e68112c29d9db9bf4f89cced66ed36c0f102b43eb199b910ab59a8073ff3fca7e
 EBUILD w_scan-20170107.ebuild 617 BLAKE2B 35ae1922d32bf2e6321184f1a213867de95e24cf46f38da10d57dc79b9f932def79be6563609b2da533fc0ca88345e127226c43535b7545ead41e439128ce853 SHA512 c2c626e00d57d2d2932c3034e63d67604bdf102255645d5136ad34ef5a4f9cba6ba3f726d6f6f04d3f7edbcdaa203534bab6d8039112e9d4df3590736d10d3f2
-MISC metadata.xml 220 BLAKE2B 88c59522303fd4b369825402563ba83d2c844948fb7bcaadd3bfd7b336253975b4e60e7c4fdd2c4b9f7f07912bbf6ac6ecc6d4f62bb67391851252aed4869822 SHA512 2939a4c533ffc96ee1ac98cf1d6e8c7a11814ad7db85a5abedeea86424f37385ced1339080dfd71aa5447acbc0b78244b41dbdc0f794b23104ae56a1502d34bb
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-tv/w_scan/metadata.xml b/media-tv/w_scan/metadata.xml
index 49fd40c5abac..7a38bb900964 100644
--- a/media-tv/w_scan/metadata.xml
+++ b/media-tv/w_scan/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hd_brummy@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 63f6711e78d4..207ee02eb815 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 626350eed4c3..30a50037e2b7 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -4,5 +4,5 @@ DIST movit-1.6.1.tar.gz 870278 BLAKE2B 736b34cf4d5a9d9b59e56dc994d467ffc33e86c8b
 DIST movit-1.6.2.tar.gz 878822 BLAKE2B 02b1a5d9b05c944d0b39f93e6c4ea0ced26128e9067db91b93f47fdda154cb7650217a821b077742ae555e6464579f95ad7a5976bcfea319e3dd2d515add83c4 SHA512 005e75712fcb83b0e9c0301925afe2c87a6d99856e7c6fe6468c93de5cbdd633507179c79a7536bb7acb1246c71302d98a92289a0a618b07d920b4620fd6abc7
 EBUILD movit-1.2.0.ebuild 750 BLAKE2B 73e786af169f9ef8cf00ff84e0de2a0ec9447eac79c99e609bbcd6b9636f54b6438bbef0d8e022f42c6e7765a824c64d45b21fcfd9c5a1d3536c566d469e8ba0 SHA512 9afdcef285b790f47358946e81a731e07f2e7d78dfc0824d162789fef4b8bb8f056b24cb16da3195f31a7e9a2a75a015238d9fcd0eeac05d9b5a871349ba062d
 EBUILD movit-1.6.1.ebuild 769 BLAKE2B 24408b89d61c5f1906b6984ab96c670247f5671b8825fc20609b1cd5779ed0575d5963b03c90ef896e38305e7f9c14daeb84ca52618681ecac457f1e9048e11b SHA512 373b280233db085556e2ee56a9c2ea1777023b61aaabb302b059487fbda491b602571b55369a3a0d28b100912595ce832681c4fd6885871b79ceb6c7a5ec1963
-EBUILD movit-1.6.2.ebuild 771 BLAKE2B 62d7d32042b5f4ba63edc3a6fb83aed1299fb05f2e092935d1092f87ea68d06e0ee47834d70d01e91bd98660d73c1f2e911cbd812ebf1accd670c21fa8af6e4d SHA512 8c7ac47a2e308d6d18b490d29feeb86881cfb5d245d98310a75a5d58ba1dd5c140f37b16effd2b36db258906cedeb5cf7d66aa6b1cdd5ee8e79bcc7f0d6ea5e4
+EBUILD movit-1.6.2.ebuild 770 BLAKE2B d9eae27b907bb2b461227685adffd633c4f978e507ab648d8b85e10c348c7d832782169bbf419d8fcba8d2156c92ce4fcc4c9d7049d833d1af2a92272504886c SHA512 6732ddbd8bf380e59e1d7f9e0afcc1d12ab171d7738d149761a10dac690ec8e28b835ba8ee444982b9d26385b8fc07e20194d7250d284a8977a378e69d1ece3e
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/media-video/movit/movit-1.6.2.ebuild b/media-video/movit/movit-1.6.2.ebuild
index b515ff5747a1..3e85ddf5b02e 100644
--- a/media-video/movit/movit-1.6.2.ebuild
+++ b/media-video/movit/movit-1.6.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://movit.sesse.net/${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="media-libs/mesa[X(+)]
diff --git a/media-video/photofilmstrip/Manifest b/media-video/photofilmstrip/Manifest
index 37fb4adc3b5a..54709b0e6e41 100644
--- a/media-video/photofilmstrip/Manifest
+++ b/media-video/photofilmstrip/Manifest
@@ -1,8 +1,4 @@
-AUX photofilmstrip-2.1.0-PIL_modules_imports_fix.patch 3432 BLAKE2B 05626efec54a20a1e5be19a3128a50a2e32164f36ebc3f86b74bf0dbab9d5d296a435dfc25ff5b35f5aa0817dcfd16b8a8868768073156db3cc8d267d4630e94 SHA512 d37c31f89d421014023a1b9bb7be1a78731a056a6332e2d1040e1bdc90c7e5652e53b8708e23f68e5ae289063c27e7a05d7c8369845a36d8665297babd23f68a
-AUX photofilmstrip-2.1.0-PIL_tostring_fix.patch 1479 BLAKE2B ce193bc77c20f755bfe3f8777a9371a152ff15bb8b3d0ce2f0003eb449f22bce943d4bd737d251d7e5212fd0776611620b1151ff9a7f7b07201db851273f57af SHA512 d08bfc7b77dd6a7e6ef38b74cb40bb9817fd272d22f598318a1313b08901fd042808cbfba25d3a748f8f9fba1c900b9c920db28cc95ac9d2424d5e3cb971ffaf
 AUX photofilmstrip-3.7.1-disable-docs-by-default.patch 379 BLAKE2B 8af4a4e5ab1f407ba72dad0975a5f17e2eb245a42484dcfcb996a785dc2a49c4e5c22a5136e4dc0c375dc0dc16baeb4cc4ef60b7ec21b48b6f11fadc91383e3f SHA512 92f24eac04653e2be160872a553d96d1d0c763c50879fc124ae3dd9a3f84d7988274965f122eb4ba7709ee9f65409e7d24fda36693129cf55a8d2cd26a4bc539
-DIST photofilmstrip-2.1.0.tar.gz 243163 BLAKE2B 30bc0de885a00b715377b262039b3c22425315e77c7e5ac7db377535f0dc3a7614bd83b894bcfbaf53601be140fef0e9754a3911958b9f71aec1e5d0214fe972 SHA512 e3cbf19d73d6cc16dcef23c11d84e5bfd1d0721cb72bb4d775390152be2fb20cab14912a9e0e73ef2d9dba9c041883591df2708cdeb7e7447cbcb18e750ea142
 DIST photofilmstrip-3.7.1.tar.gz 354585 BLAKE2B df1e8756677814f35a59d7f4d3585647393e37262eb80c3299805cb0811cdfb4a16c96f90aaa192469266805145db68a582671a34f2b2780b75f1e0318460bd7 SHA512 fc2284c6c52eea5d9a6415149681e26505d6e084ad31897c44cde8e2b4845584b8521b375da06fd0a59179bfa73f6aabe769caad7a8186d5f87ecacebaff24fb
-EBUILD photofilmstrip-2.1.0-r2.ebuild 1485 BLAKE2B a059225726d6d4d960411d9050a28695a4352f83121f0e504f5370fc0e1246ef58e5eac21a128d30caed0c0afe2bab9fe92ddd2d5a8c69b3ec0ecabd4d58c027 SHA512 d33f7b219a450b1f6517075420675c23b4176763171bbdf4b7baa37f350c9b4a3e80f4c04fc667b80f3aee69d797a97261f8ecf3776418b2b10868becab7c762
 EBUILD photofilmstrip-3.7.1.ebuild 2055 BLAKE2B bd3f762857a28ab28be20d1070539f6cc3fe6e63f111e4d4992a82d9b733a1df08bbd327387b6a5bc3381695d881394ab462644fe3510c0c5fa80f3bfe43941e SHA512 39cc395df0c5dc2de391e1d54d4e77656839502c4e9109e63f2d582b11b80cea54d3e0d6b2b74e1b3be6117d6f7f55627f7dfa13ffbb49938e5b5de72488b247
 MISC metadata.xml 683 BLAKE2B 517c2479c9ce8b3d78afd530cd6f97fcd6fefc73aaffc889584729035151d40fdd5cfe8efcf285aa5e6f3522af8825dab0e214cd5f252bb69da3f5c2b6f17c44 SHA512 58801972ef5326f757ce11964e47267df3b199f36290d0d81d3fecc97f59f678a110c107082d8d8bdebd54fc7268dd75a463a089aa22361157f4770f0d6b7251
diff --git a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch
deleted file mode 100644
index 989459775413..000000000000
--- a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_modules_imports_fix.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- photofilmstrip-2.1.0-orig/photofilmstrip/core/__init__.py
-+++ photofilmstrip-2.1.0/photofilmstrip/core/__init__.py
-@@ -22,47 +22,47 @@
- # WA: py2exe and PIL
- import os
- if os.name == "nt":
--    import Image
-+    import PIL.Image as Image
- 
--    import ArgImagePlugin
--    import BmpImagePlugin
--    import BufrStubImagePlugin
--    import CurImagePlugin
--    import DcxImagePlugin
--    import EpsImagePlugin
--    import FitsStubImagePlugin
--    import FliImagePlugin
--    import FpxImagePlugin
--    import GbrImagePlugin
--    import GifImagePlugin
--    import GribStubImagePlugin
--    import Hdf5StubImagePlugin
--    import IcnsImagePlugin
--    import IcoImagePlugin
--    import ImImagePlugin
--    import ImtImagePlugin
--    import IptcImagePlugin
--    import JpegImagePlugin
--    import McIdasImagePlugin
--    import MicImagePlugin
--    import MpegImagePlugin
--    import MspImagePlugin
--    import PalmImagePlugin
--    import PcdImagePlugin
--    import PcxImagePlugin
--    import PdfImagePlugin
--    import PixarImagePlugin
--    import PngImagePlugin
--    import PpmImagePlugin
--    import PsdImagePlugin
--    import SgiImagePlugin
--    import SpiderImagePlugin
--    import SunImagePlugin
--    import TgaImagePlugin
--    import TiffImagePlugin
--    import WmfImagePlugin
--    import XbmImagePlugin
--    import XpmImagePlugin
--    import XVThumbImagePlugin
-+    import PIL.ArgImagePlugin as ArgImagePlugin
-+    import PIL.BmpImagePlugin as BmpImagePlugin
-+    import PIL.BufrStubImagePlugin as BufrStubImagePlugin
-+    import PIL.CurImagePlugin as CurImagePlugin
-+    import PIL.DcxImagePlugin as DcxImagePlugin
-+    import PIL.EpsImagePlugin as EpsImagePlugin
-+    import PIL.FitsStubImagePlugin as FitsStubImagePlugin
-+    import PIL.FliImagePlugin as FliImagePlugin
-+    import PIL.FpxImagePlugin as FpxImagePlugin
-+    import PIL.GbrImagePlugin as GbrImagePlugin
-+    import PIL.GifImagePlugin as GifImagePlugin
-+    import PIL.GribStubImagePlugin as GribStubImagePlugin
-+    import PIL.Hdf5StubImagePlugin as Hdf5StubImagePlugin
-+    import PIL.IcnsImagePlugin as IcnsImagePlugin
-+    import PIL.IcoImagePlugin as IcoImagePlugin
-+    import PIL.ImImagePlugin as ImImagePlugin
-+    import PIL.ImtImagePlugin as ImtImagePlugin
-+    import PIL.IptcImagePlugin as IptcImagePlugin
-+    import PIL.JpegImagePlugin as JpegImagePlugin
-+    import PIL.McIdasImagePlugin as McIdasImagePlugin
-+    import PIL.MicImagePlugin as MicImagePlugin
-+    import PIL.MpegImagePlugin as MpegImagePlugin
-+    import PIL.MspImagePlugin as MspImagePlugin
-+    import PIL.PalmImagePlugin as PalmImagePlugin
-+    import PIL.PcdImagePlugin as PcdImagePlugin
-+    import PIL.PcxImagePlugin as PcxImagePlugin
-+    import PIL.PdfImagePlugin as PdfImagePlugin
-+    import PIL.PixarImagePlugin as PixarImagePlugin
-+    import PIL.PngImagePlugin as PngImagePlugin
-+    import PIL.PpmImagePlugin as PpmImagePlugin
-+    import PIL.PsdImagePlugin as PsdImagePlugin
-+    import PIL.SgiImagePlugin as SgiImagePlugin
-+    import PIL.SpiderImagePlugin as SpiderImagePlugin
-+    import PIL.SunImagePlugin as SunImagePlugin
-+    import PIL.TgaImagePlugin as TgaImagePlugin
-+    import PIL.TiffImagePlugin as TiffImagePlugin
-+    import PIL.WmfImagePlugin as WmfImagePlugin
-+    import PIL.XbmImagePlugin as XbmImagePlugin
-+    import PIL.XpmImagePlugin as XpmImagePlugin
-+    import PIL.XVThumbImagePlugin as XVThumbImagePlugin
-     Image._initialized=2
- # WA: end
diff --git a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch b/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch
deleted file mode 100644
index dc29c9c8e14f..000000000000
--- a/media-video/photofilmstrip/files/photofilmstrip-2.1.0-PIL_tostring_fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Gentoo-Bug: https://bugs.gentoo.org/584128
-
---- a/photofilmstrip/core/ProjectFile.py
-+++ b/photofilmstrip/core/ProjectFile.py
-@@ -196,7 +196,7 @@
-     def __ThumbToQuery(self, picId, pic):
-         pilThumb = PILBackend.GetThumbnail(pic, height=120)
-         thumbWidth, thumbHeight = pilThumb.size
--        thumbData = buffer(pilThumb.tostring())
-+        thumbData = buffer(pilThumb.tobytes())
-         
-         query = "INSERT INTO `thumbnail` (" \
-                     "picture_id, width, height, data" \
---- a/photofilmstrip/core/renderer/CairoRenderer.py
-+++ b/photofilmstrip/core/renderer/CairoRenderer.py
-@@ -121,7 +121,7 @@
-     def _PilToCairo(self, pilImg):
-         pilImg = pilImg.copy()
-         w, h = pilImg.size  
--        data = pilImg.convert('RGBA').tostring()
-+        data = pilImg.convert('RGBA').tobytes()
-         buff = array.array('B', data)
-         cairoImage = cairo.ImageSurface.create_for_data(buff, cairo.FORMAT_ARGB32, w, h)
- #        cairoImage = cairo.ImageSurface.create_for_data(buff, cairo.FORMAT_RGB24, w, h)
---- a/photofilmstrip/core/renderer/PyGameRenderer.py
-+++ b/photofilmstrip/core/renderer/PyGameRenderer.py
-@@ -100,7 +100,7 @@
-     def _PilToPyGame(self, pilImg):
-         mode = pilImg.mode
-         assert mode in "RGB", "RGBA"
--        return pygame.image.fromstring(pilImg.tostring(), pilImg.size, mode)
-+        return pygame.image.frombytes(pilImg.tobytes(), pilImg.size, mode)
- 
- 
- #    def CropAndResize(self, ctx, rect):
diff --git a/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild b/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild
deleted file mode 100644
index d20fa98d7060..000000000000
--- a/media-video/photofilmstrip/photofilmstrip-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Movie slideshow creator using Ken Burns effect"
-HOMEPAGE="http://www.photofilmstrip.org"
-SRC_URI="mirror://sourceforge/photostoryx/${PN}/${PV}/${P}.tar.gz"
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo sdl"
-
-RDEPEND="
-	dev-python/wxpython:3.0[cairo?,${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-video/mplayer[encode]
-	sdl? ( dev-python/pygame[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-# Fix bug #472774 (https://bugs.gentoo.org/show_bug.cgi?id=472774)
-PATCHES=(
-	"${FILESDIR}/${P}-PIL_modules_imports_fix.patch"
-	"${FILESDIR}/${P}-PIL_tostring_fix.patch"
-)
-
-DOCS=( CHANGES COPYING README )
-
-src_prepare() {
-	# Remove unneeded icon resources update needing running X
-	# Fix app doc/help files paths
-	sed -i \
-		-e '/self\._make_resources\(\)/d' \
-		-e "s:\(os\.path\.join(\"share\", \"doc\", \"\)photofilmstrip:\1${PF}:" \
-		setup.py || die
-
-	sed -i \
-		 -e "s:\"photofilmstrip\":\"${PF}\":" \
-		 photofilmstrip/gui/HelpViewer.py || die
-
-	# Fix desktop file entry
-	sed -i \
-		-e '/^Version.*/d' \
-		data/photofilmstrip.desktop || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doman docs/manpage/*
-
-	# Do not compress the apps help files
-	docompress -x /usr/share/doc/${PF}/${PN}.hh{c,k,p}
-
-	distutils-r1_src_install
-}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 3f359ea417d5..1e2244117582 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,5 +3,5 @@ AUX pipewire-0.2.6-fix-probing-without-starting.patch 2119 BLAKE2B f7180ad95f0f2
 AUX pipewire-0.2.6-reuse-fd-in-pipewiresrc.patch 5684 BLAKE2B 9ce85e2f15b18ef458d21a44b10c875b0cb456972a61dd1ff127ad62510604d35ea6dd70daa0191181a34d2fea613ac254ffd6fa4f0fa3bb6114191e3a62996e SHA512 ba194a678b1130a29b17f1831c1a94c24db6cb05ae1d2a0e825fd1099aa2a300200d7cbfd5e5b592c54aea33893c68e554edd4bdfd1ca6cc84739b12e33058f6
 AUX pipewire-0.2.6-revert-combine-all-perms.patch 1039 BLAKE2B 5fd1d82c92680b6097ac70367eb5f7fc8190d0589d4bb228dc93c6f673763a65a7c18a5fd3b242686ba86773d90078cc50a5d7c2277dc90edcdb341d5ecb9f23 SHA512 c9bab5e79b4a88f240d34702dfe5de2df4ab7c5158d5b95228647018cb5bb69ec124fb47405074aef91480d25d388df7cdbb7fa94396d228b6f573697b2f8333
 DIST pipewire-0.2.6.tar.gz 421137 BLAKE2B 155667d14fe5380e21f0b70accea72dc4478085916a9126185136f6d33bd7729d91b790c171dcf7b6aea2c52894462d16516f8821229ca0bf9f6cde15df524d9 SHA512 3d1db41f5beb42a0ee15ae7bc8afb89b54a37c3a6a414e88b5e33ceaf98ec6dda0d9a2d03ac47a8dfce48e9637e647291919e6670bb70589b0d1951fbcbd3ff8
-EBUILD pipewire-0.2.6.ebuild 1836 BLAKE2B c076453215c8ffb67e4e61518dac5e0eb924be63a802be4f883b701ad05d6f51fd6e090bdc4c21ff9a799e532a759a9f454c9f84219dc816c73c22411d91f8e2 SHA512 132038875b9dc8ce1e19edf36c14529d7c3e974575b6becea66abf43eaba1ec4523862a10feaace9847bfa57b141d70fce84d281540fbd455d89cae7943eec54
+EBUILD pipewire-0.2.6.ebuild 1841 BLAKE2B 53bf55660ea633db8908b6ef40adc99380ea66786f61e6facbfa18fdaa7488a747de287fb01e151a77041f3767ac8eeffb973c347f36604ed5c7549923e75598 SHA512 8f70774b235c56cba113b3c060b6412cc638c1e6bb1aaafe9d98ccccc939941daa181ca6de5b5db1e854bde845f09f3799d34b9be5b646700c9245ba9083fe12
 MISC metadata.xml 449 BLAKE2B c580fa69fbecd1046123d51f0a556bf54e7dd76a7ced768ae31289969a3fcb0c03f301a214da222201bad2cd0bcf68674807e28efcdee27edd9fa6d913cdc146 SHA512 73c4b73b417e92d1bdf802ce38939afdff2ba42bc638e0c6ba42593894755ce6f197678e8676f763bd66bb0b2bb9175c1369c173be3ab64e7323795d3b00bf0c
diff --git a/media-video/pipewire/pipewire-0.2.6.ebuild b/media-video/pipewire/pipewire-0.2.6.ebuild
index 75c4a6074d2b..37e0fe081701 100644
--- a/media-video/pipewire/pipewire-0.2.6.ebuild
+++ b/media-video/pipewire/pipewire-0.2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/tcmplex-panteltje/Manifest b/media-video/tcmplex-panteltje/Manifest
index f06a69d5ebeb..1c6cf6cf0aed 100644
--- a/media-video/tcmplex-panteltje/Manifest
+++ b/media-video/tcmplex-panteltje/Manifest
@@ -1,3 +1,3 @@
 DIST tcmplex-panteltje-0.4.7.tgz 81185 BLAKE2B 048958f4544c0f0212a740e25ce27527ebf69b1510421cbc5cb752f52f3608cd498514f0ff6c45a4430cda45abc1ca5594bb7e1e3205294c16af658a8c166a96 SHA512 d8e9d802ff9d6a9df5ae9d0c0f5392cbaddcce4dc0977ff587406dd8449903941bd60ceda6b48df812f66f51e2e8cf451f9b23a006eebc736ba64b21bd0d293c
 EBUILD tcmplex-panteltje-0.4.7-r1.ebuild 549 BLAKE2B cb160d8e88dcc331a0dd7fd771cfee755cd774e2c8ecac0730579aab187712d8421715a3d3a3d8ca5673689b7e600145804404bf4ceefb4b62ed70edade7414a SHA512 0378d5dcdd58651e42315543c42c1abe7f441d3e7c95f3eb036b06111475057c43c1158eb013076f16e9bc567e41ec4a2a73497dbd587792b5b21af81061c5e5
-MISC metadata.xml 445 BLAKE2B 1a8fb0fb52895ecb3c483a140c7be1d0d4f678ae2d6dea62f98c48be7dcd6087e2c668e791331841605ec97df7a420164bee9719a93ae5b96c9b2b0c6be7a033 SHA512 94b5e8d81a6a63427566d34974ebcfd237b360711122d18c9eae15ae82edb4a2799af75cadb71d2e70e75618e67d8ec5c456eee4ba5da31354c59cb8b3d158e1
+MISC metadata.xml 334 BLAKE2B da68c733a593f81e7a8096a93827aa43bccee5f9470fccdf66ffdc76a5bb29a9bbeaa163180559714d4c7dca2c7cdd69cd50054d36a79b725100fdaaf093df43 SHA512 ea6800418e6612cab28cc5d0fb977d8227deaef467662b6c8619b974062c47b0658ff1e621b8fb85309c0f87f04afe3903053af1c21c629018a27eeec7f6c8de
diff --git a/media-video/tcmplex-panteltje/metadata.xml b/media-video/tcmplex-panteltje/metadata.xml
index e4a826d781f5..eded805f8eed 100644
--- a/media-video/tcmplex-panteltje/metadata.xml
+++ b/media-video/tcmplex-panteltje/metadata.xml
@@ -4,10 +4,6 @@
 <maintainer type="person">
   <email>lordvan@gentoo.org</email>
 </maintainer>
-<maintainer type="person">
-  <email>hd_brummy@gentoo.org</email>
-  <name>Joerg Bornkessel</name>
-</maintainer>
 <maintainer type="project">
   <email>media-video@gentoo.org</email>
   <name>Gentoo Video project</name>
diff --git a/media-video/vdr2jpeg/Manifest b/media-video/vdr2jpeg/Manifest
index 54f436b72758..6d932c8bf86e 100644
--- a/media-video/vdr2jpeg/Manifest
+++ b/media-video/vdr2jpeg/Manifest
@@ -5,4 +5,4 @@ DIST vdr2jpeg-0.1.9.tgz 31160 BLAKE2B 6f84e82167f45b8fe3c2a00e72ed5ad660b7a895e1
 DIST vdr2jpeg-0.2.0.tgz 20027 BLAKE2B c79a84c6e7010eae762fb31bdd9771dcdae1e78761afd07c536a55e834b0271fb55dcd4bb49f87a2d28695496d37f94c90350dd70b50229bb6248026422faee0 SHA512 65f3e0acb2ecd3a5341e527c45fafd454266841f1369c89b10750fce86f2326fba76329abd17a05d67aea3b43a7b1299a49cfa9eee9a784bb99c940253ca5952
 EBUILD vdr2jpeg-0.1.9-r1.ebuild 915 BLAKE2B b480b02f7d33f693c59941a3d5774142a3b2babc253b36e9dc13608db4403e0afecc576a66e1ba267193f50ea9b7bea5dbc2eacb36c421ad4f40de884d23fa62 SHA512 5091eee9033acef859bf3e94ba8dd28b7b27f18d1261c7819c9261f4fe603c86feb674ca09195bdd9397a8a8f6a5f88794709b0da3ba36a877ac4e4842b13fa0
 EBUILD vdr2jpeg-0.2.0.ebuild 896 BLAKE2B 76e2844841070922de6582eb022cc283834a4659c00ef0534b02d391b78c66e93419bcd80982cafa656ea7a74bec3bc3c90136d40a0b430c41a2acf85ab37dfc SHA512 a14256d860e8da83960099cb1e3fae3c9f4e60673922343af2a28e4e969fd04b4797497168ca630b34e0d12130b0bfc66ce5b2300120e93acfd2c1d67638ddd1
-MISC metadata.xml 536 BLAKE2B e69422432b87ba637e2905d7bac350ed88060952a90efaa494fe9e3fc5e41b75efb805c5372dee17c16312387a811217225043401053f9c35b08f5264c029cb1 SHA512 5e6be6b01884093e88882c9e6809c2c9d09434eec99ed2b88df9b008a01539847c48db59979fe5273699c792c732361477848ab6f7a891ce2c7ae69adcc3731a
+MISC metadata.xml 419 BLAKE2B 279c38b934b85b3727cbf916d0b8b1db9bb1c8bdd483f939e4bd074a4ad0bb01afe9e7ebc5e77809b8eba4d318cbff128f09cc97657e731d3e0d44908abf8a37 SHA512 a6f8afa146ad1ab8006c82f2a6207385ecea870d45db738ae84428ad9b6ad7cc65ed4ca26b6871d69e75cfbbfb0cf525a41394e3e17aa46d14ea081917a23ca4
diff --git a/media-video/vdr2jpeg/metadata.xml b/media-video/vdr2jpeg/metadata.xml
index b7c52134a436..5e673b528cd3 100644
--- a/media-video/vdr2jpeg/metadata.xml
+++ b/media-video/vdr2jpeg/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-			<email>hd_brummy@gentoo.org</email>
-			<name>Joerg Bornkessel</name>
-		</maintainer>
-		<maintainer type="project">
+	<maintainer type="project">
 			<email>media-video@gentoo.org</email>
 			<name>Gentoo Video project</name>
 		</maintainer>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 596157306c78..3bb1811be191 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 36c3392d5556..4897696602c8 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 07 Sep 2019 23:09:04 +0000
+Fri, 13 Sep 2019 16:08:52 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index eba6cee644e5..08d0105c8a0a 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 448529 BLAKE2B 70fc5fdf3704f2b7ec0033da58e9dba173720d87011ed4a8c13796a79ab719c338f43528d1a392475f724b87e95f6e187b39a6f6e92d64f4882d0f0004bffa24 SHA512 53832aafadeff79f44632a74dc19ba49106055cc3a8017511025ef2e4ca2499a5d5154766e4957167240e37b7e0bfd956e305d79053c82988ad80b673f006f8c
-TIMESTAMP 2019-09-07T23:09:08Z
+MANIFEST Manifest.files.gz 448845 BLAKE2B 24feded351e2c02762000f35c6c58ac935b2383bf6acdd7450f974e16e15fe0935d3f657233d5cd4ab87639ad5f410b8ea36fd5c019b93bfbfc47983ef01dbdc SHA512 569d13495f7e4953afefd29435d7953d3afa1815ae86459c1f4f84726efaaedc5598835f415738d792d2d1060be50cf8ad9140b7fcf124dd7f9ea681a55957ab
+TIMESTAMP 2019-09-13T16:08:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl10OJRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl17vxdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCN8A//SkpChS4L4qFkiOHwjHf4wtUIa7szn1dux34X7fyb3W/5uXdyyRqCarK9
-X9Y8yqKkKUWBTRP195IsRMn76nJD0AwX2v5sKvOEsJJjCMD3Ka8uxKJqb1V23JXM
-LXn0/cqFJHQCfVnZvNLQUCOg5TJEtKZQJVEojFwpicB8usWdGrvk0tuxi81bLbOB
-+1ekRMfKy3Ik2sdMWKrowEoeoicOcbYTi7yGT+z8YceVIku+pDeq0Tbj8jvfOYdf
-sdo5pPJeqYFk788zYELBpUGAfM1RkMTv3uuTdQ6bIjNnjb0cp2TP62oSoEYWOWDg
-qh2Ts+j7As00AGtxjq6zv2jQj03rugy3aiz9FvEhR7aLh+acYgD66Lale9QXnHa+
-SLiA22EOXIuACTnFZr0E/IdZGU/KG3QFr2EKCmsupUVxiUINM/Ypz73bmbi6lEIW
-7/ziqcDqYBMmxTcZg5x3gyqrOU/Na/nXEJZ3dLyA7zCtkgts+W4+oh2Iwm9Vcajn
-FTHp0D0ep4hAv505JGUEKPv8tBsU4tmcdjbcpKBXaAF10OU4bkEJd3hzvcNTqrim
-0V1YIj482yNYDWuQEOrru5yBRXrZj9nr+yAkW/sqGvH5zCSAeuMxOKTvzHlO1p1p
-tEizdnKAB6hB3tFjgiF/JMZkDxx3+pMYoTnu57m0KQUjlcVTboo=
-=V6QD
+klBbNQ//a8McyvJlHI0q6HuRWu/GStp7gF6V9y8z1NvzSUNmvghVq/G1DYwohDsV
+nzYtwREuQsASAOwJ16Vuw2OJZiIQeXv7P6O1XVDSEszPZkou6bndmtPQF7wuW4bI
+43qXor8MwqLyq9i1rBmQmwqAhNX+nX+U+u82Lgs0GCdTt9rWG/MUXurha00VYvz6
+A4RJ7EqABPqL+SblgDRp8fjzohuj/GpkDLHJ8tXPdaLASp9IQfC9Uafz+qsDDgJX
+nWi1Cvd4b10SNTvURCl99RwXt6wxXfN6aFe4NI97gWdb3HOW/tqE2pH33q+1iPPI
+OBmzSg0BQ0L6LRKNqkssmpVYF0S7vVJzR+Kp6sKat/ZC2a3jUvRxacTDDeVcLILm
+kW6/Md/C/mIFpOBOoxsOOQ7ZMx8PW+Isi5oQV7DxUidzdtH51fb1dZUw1QjZjJyO
+M38kdgzWhDvq8JHFQvxY5FHREJxMiP4upobAAG6Sq4vUrRRLXepo9X22VwugW+YY
+E9XhGviSfr+9wxzgRNcGgbybwB816t47mWo25VB46A3eCR7AXkbs/XDVe1JdEDyZ
+BUFcWne0Jyc8VsztbxgDssrNZM6ALCoJuVTjp7AbNZ5rRpcJp2e8i9SoU65k6d8o
+sWMiC+UcTg8zN5QstuEMwap5pnZfeO8YApI9I3+ZM3QxeFJLXqk=
+=41fD
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 81138f54ea78..e80a943da59d 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-201909-07.xml b/metadata/glsa/glsa-201909-07.xml
new file mode 100644
index 000000000000..a91111969542
--- /dev/null
+++ b/metadata/glsa/glsa-201909-07.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201909-07">
+  <title>Simple DirectMedia Layer: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Simple DirectMedia
+    Layer, the worst of which could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild">libsdl2</product>
+  <announced>2019-09-08</announced>
+  <revised count="1">2019-09-08</revised>
+  <bug>690064</bug>
+  <bug>692392</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-libs/libsdl2" auto="yes" arch="*">
+      <unaffected range="ge">2.0.10</unaffected>
+      <vulnerable range="lt">2.0.10</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Simple DirectMedia Layer is a cross-platform development library
+      designed to provide low level access to audio, keyboard, mouse, joystick,
+      and graphics hardware via OpenGL and Direct3D.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Simple DirectMedia
+      Layer. Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to process a specially crafted
+      audio or video, possibly resulting in execution of arbitrary code with
+      the privileges of the process or a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Simple DirectMedia Layer users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-libs/libsdl2-2.0.10"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-13626">CVE-2019-13626</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-7572">CVE-2019-7572</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-7573">CVE-2019-7573</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-7574">CVE-2019-7574</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-7575">CVE-2019-7575</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-7576">CVE-2019-7576</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-7577">CVE-2019-7577</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-7578">CVE-2019-7578</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-7635">CVE-2019-7635</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-7636">CVE-2019-7636</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-7638">CVE-2019-7638</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-09-07T00:08:23Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2019-09-08T17:40:28Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201909-08.xml b/metadata/glsa/glsa-201909-08.xml
new file mode 100644
index 000000000000..7f2b35906305
--- /dev/null
+++ b/metadata/glsa/glsa-201909-08.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201909-08">
+  <title>D-Bus: Authentication bypass</title>
+  <synopsis>An authentication bypass was discovered in D-Bus.</synopsis>
+  <product type="ebuild">dbus</product>
+  <announced>2019-09-08</announced>
+  <revised count="1">2019-09-08</revised>
+  <bug>687900</bug>
+  <access>local</access>
+  <affected>
+    <package name="sys-apps/dbus" auto="yes" arch="*">
+      <unaffected range="ge">1.12.16</unaffected>
+      <vulnerable range="lt">1.12.16</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>D-Bus is a message bus system which processes can use to talk to each
+      other.
+    </p>
+  </background>
+  <description>
+    <p>It was discovered that a local attacker could manipulate symbolic links
+      in their own home directory to bypass authentication and connect to a
+      DBusServer with elevated privileges.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A local attacker can bypass authentication mechanisms and elevate
+      privileges.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All D-Bus users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=sys-apps/dbus-1.12.16"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-12749">CVE-2019-12749</uri>
+  </references>
+  <metadata tag="requester" timestamp="2019-09-07T17:12:55Z">b-man</metadata>
+  <metadata tag="submitter" timestamp="2019-09-08T17:40:45Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 36c3392d5556..4897696602c8 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 07 Sep 2019 23:09:04 +0000
+Fri, 13 Sep 2019 16:08:52 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 82f2e1957979..933a7041a478 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-68b71b2cbc79a9ef9e8701eb09586b9f2f9eb7b2 1567815781 2019-09-07T00:23:01+00:00
+0d8b041795d355b2f8da9b84725a62150a91dc13 1567964538 2019-09-08T17:42:18+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index b7d80c7d554e..664a58e0a434 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 40bed3ea6424..575e326efc9e 100644
--- a/metadata/md5-cache/acct-group/Manifest.gz
+++ b/metadata/md5-cache/acct-group/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/git-0 b/metadata/md5-cache/acct-group/git-0
new file mode 100644
index 000000000000..dfa9df4c1256
--- /dev/null
+++ b/metadata/md5-cache/acct-group/git-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: git
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=0f8adce0dd8913074e26d233a5527847
diff --git a/metadata/md5-cache/acct-group/plugdev-0 b/metadata/md5-cache/acct-group/plugdev-0
new file mode 100644
index 000000000000..09b5c24bb047
--- /dev/null
+++ b/metadata/md5-cache/acct-group/plugdev-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=Group controlling access to removable media
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=e16f6667e906ada718d427073f2812b2
diff --git a/metadata/md5-cache/acct-group/postdrop-0 b/metadata/md5-cache/acct-group/postdrop-0
new file mode 100644
index 000000000000..d5b88d3abfe8
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postdrop-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: postdrop
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=1347bec1b03a8e003ee72bb1977b03ec
diff --git a/metadata/md5-cache/acct-group/postfix-0 b/metadata/md5-cache/acct-group/postfix-0
new file mode 100644
index 000000000000..4ab0e53dec1d
--- /dev/null
+++ b/metadata/md5-cache/acct-group/postfix-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: postfix
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group	fba78ad4397b6b8cc1382496a6789cf3	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=1a82ca8b8472e1ff9e647b24a4b78d52
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index b9a4b30ee70a..57a9c06e3259 100644
--- a/metadata/md5-cache/acct-user/Manifest.gz
+++ b/metadata/md5-cache/acct-user/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/burp-0 b/metadata/md5-cache/acct-user/burp-0
index f707d204f0ce..16e19aa25fd6 100644
--- a/metadata/md5-cache/acct-user/burp-0
+++ b/metadata/md5-cache/acct-user/burp-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/burp
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=6d5ad09bfdcb80ddfad920300080b71c
diff --git a/metadata/md5-cache/acct-user/dnscrypt-proxy-0 b/metadata/md5-cache/acct-user/dnscrypt-proxy-0
index d146bf3d2d8a..2d42a6858053 100644
--- a/metadata/md5-cache/acct-user/dnscrypt-proxy-0
+++ b/metadata/md5-cache/acct-user/dnscrypt-proxy-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/dnscrypt-proxy
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=664f3ddcc9b1899890ab516f81480642
diff --git a/metadata/md5-cache/acct-user/ftp-0 b/metadata/md5-cache/acct-user/ftp-0
index d0e2aaf35d95..01ed915dd3fd 100644
--- a/metadata/md5-cache/acct-user/ftp-0
+++ b/metadata/md5-cache/acct-user/ftp-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/ftp
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=c4f7d3e9113e45d0b587307d6bfd74d0
diff --git a/metadata/md5-cache/acct-user/git-0 b/metadata/md5-cache/acct-user/git-0
new file mode 100644
index 000000000000..62791bc8dc55
--- /dev/null
+++ b/metadata/md5-cache/acct-user/git-0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst preinst prerm pretend setup
+DESCRIPTION=Git repository hosting user
+EAPI=7
+IUSE=gitea gitolite
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/git
+REQUIRED_USE=^^ ( gitea gitolite )
+SLOT=0
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=b2689a0b55698bda7d9c38bcb1e12720
diff --git a/metadata/md5-cache/acct-user/gkrellmd-0 b/metadata/md5-cache/acct-user/gkrellmd-0
index e74828ff7370..d909b2c6cdc6 100644
--- a/metadata/md5-cache/acct-user/gkrellmd-0
+++ b/metadata/md5-cache/acct-user/gkrellmd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/gkrellmd
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=95088eb9093ebb5b9a0eea9f07b01fbd
diff --git a/metadata/md5-cache/acct-user/i2pd-0 b/metadata/md5-cache/acct-user/i2pd-0
index fdce83f1a433..e95951ac119a 100644
--- a/metadata/md5-cache/acct-user/i2pd-0
+++ b/metadata/md5-cache/acct-user/i2pd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/i2pd
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=876c9cfdec60e447bf4070dd2d4b07c5
diff --git a/metadata/md5-cache/acct-user/inspircd-0 b/metadata/md5-cache/acct-user/inspircd-0
index 013e4b21cb9f..a3a8982f3736 100644
--- a/metadata/md5-cache/acct-user/inspircd-0
+++ b/metadata/md5-cache/acct-user/inspircd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/inspircd
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=e040a118122eb50acb419310a419f329
diff --git a/metadata/md5-cache/acct-user/knot-0 b/metadata/md5-cache/acct-user/knot-0
index d4a60421429c..d9657e6a6875 100644
--- a/metadata/md5-cache/acct-user/knot-0
+++ b/metadata/md5-cache/acct-user/knot-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/knot
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=19cc5d10a4269199806b14aaa3a2733b
diff --git a/metadata/md5-cache/acct-user/logstash-0 b/metadata/md5-cache/acct-user/logstash-0
index ae1304fc0bed..d095b496b0b3 100644
--- a/metadata/md5-cache/acct-user/logstash-0
+++ b/metadata/md5-cache/acct-user/logstash-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/logstash
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=6d0dd20248b7b73eba0835bdf2613f2a
diff --git a/metadata/md5-cache/acct-user/mail-0 b/metadata/md5-cache/acct-user/mail-0
index d0d4dc51a2ef..f42986d99970 100644
--- a/metadata/md5-cache/acct-user/mail-0
+++ b/metadata/md5-cache/acct-user/mail-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/mail
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=1d648f45e2af351c6b06ac91ecc6f5e6
diff --git a/metadata/md5-cache/acct-user/man-1 b/metadata/md5-cache/acct-user/man-1
index 6e2dcfc18916..ac85509d01d6 100644
--- a/metadata/md5-cache/acct-user/man-1
+++ b/metadata/md5-cache/acct-user/man-1
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/man
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=f4f877dbc66a56f26588e4322cff4b53
diff --git a/metadata/md5-cache/acct-user/messagebus-0 b/metadata/md5-cache/acct-user/messagebus-0
index ffb92171b3e8..ad3af39d45a3 100644
--- a/metadata/md5-cache/acct-user/messagebus-0
+++ b/metadata/md5-cache/acct-user/messagebus-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/messagebus
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=c6ab10cec28a405c686c8707a0441c32
diff --git a/metadata/md5-cache/acct-user/minecraft-0 b/metadata/md5-cache/acct-user/minecraft-0
index cdca48c7de75..6633ce041811 100644
--- a/metadata/md5-cache/acct-user/minecraft-0
+++ b/metadata/md5-cache/acct-user/minecraft-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/minecraft
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=c18cfc57e0d08d970e7644237883921e
diff --git a/metadata/md5-cache/acct-user/msmtpd-0 b/metadata/md5-cache/acct-user/msmtpd-0
index 9140246d8613..263de921bcbb 100644
--- a/metadata/md5-cache/acct-user/msmtpd-0
+++ b/metadata/md5-cache/acct-user/msmtpd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/msmtpd
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=1e86c8bfdb0678c2fee1fdd75c5c990b
diff --git a/metadata/md5-cache/acct-user/murmur-0 b/metadata/md5-cache/acct-user/murmur-0
index 4294f28a4919..d41e0ea0ecbd 100644
--- a/metadata/md5-cache/acct-user/murmur-0
+++ b/metadata/md5-cache/acct-user/murmur-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/murmur
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=12f204ef54bfecc67ed3baced394ea62
diff --git a/metadata/md5-cache/acct-user/mysql-0 b/metadata/md5-cache/acct-user/mysql-0
index 735adb817aea..3635f838e64b 100644
--- a/metadata/md5-cache/acct-user/mysql-0
+++ b/metadata/md5-cache/acct-user/mysql-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/mysql
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=2239e70edb93016adb4f07506c64ee6f
diff --git a/metadata/md5-cache/acct-user/nsd-0 b/metadata/md5-cache/acct-user/nsd-0
index fc1bc33d5385..d1efca6dbc6f 100644
--- a/metadata/md5-cache/acct-user/nsd-0
+++ b/metadata/md5-cache/acct-user/nsd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/nsd
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=ba4d4367098caae927e815d356790903
diff --git a/metadata/md5-cache/acct-user/ntp-0 b/metadata/md5-cache/acct-user/ntp-0
index 57a2504fb9a9..c54842985781 100644
--- a/metadata/md5-cache/acct-user/ntp-0
+++ b/metadata/md5-cache/acct-user/ntp-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/ntp
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=3004c4f4ed33c8637fec813897554580
diff --git a/metadata/md5-cache/acct-user/pdnsd-0 b/metadata/md5-cache/acct-user/pdnsd-0
index 6fcea8040501..0287091f4662 100644
--- a/metadata/md5-cache/acct-user/pdnsd-0
+++ b/metadata/md5-cache/acct-user/pdnsd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/pdnsd
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=964d062348fa7d70ba4f5b0f6c20b9f1
diff --git a/metadata/md5-cache/acct-user/polkitd-0 b/metadata/md5-cache/acct-user/polkitd-0
index a4166036fe6b..670070ba6e60 100644
--- a/metadata/md5-cache/acct-user/polkitd-0
+++ b/metadata/md5-cache/acct-user/polkitd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/polkitd
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=3463586ac30a8004b934afdd01793c63
diff --git a/metadata/md5-cache/acct-user/postfix-0 b/metadata/md5-cache/acct-user/postfix-0
new file mode 100644
index 000000000000..eb7eebf7516c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/postfix-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for postfix daemon
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/postfix acct-group/mail
+SLOT=0
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=ace42b1b52b11ce3fca4e74696128ae3
diff --git a/metadata/md5-cache/acct-user/postmaster-0 b/metadata/md5-cache/acct-user/postmaster-0
index 4d009cd42cb1..5e6dcdd13b70 100644
--- a/metadata/md5-cache/acct-user/postmaster-0
+++ b/metadata/md5-cache/acct-user/postmaster-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/mail
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=4215e7d391c4c711aba698a9da6a2d73
diff --git a/metadata/md5-cache/acct-user/qemu-0 b/metadata/md5-cache/acct-user/qemu-0
index 643afe38fd96..707018cfd20a 100644
--- a/metadata/md5-cache/acct-user/qemu-0
+++ b/metadata/md5-cache/acct-user/qemu-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/qemu acct-group/kvm
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=304c14d1dbbc88dfb27654b70a662ec8
diff --git a/metadata/md5-cache/acct-user/rtkit-0 b/metadata/md5-cache/acct-user/rtkit-0
index 9d64fb3f2793..a56bd8e4d0bd 100644
--- a/metadata/md5-cache/acct-user/rtkit-0
+++ b/metadata/md5-cache/acct-user/rtkit-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/rtkit
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=ce8e63018323dcc6970bb34d49f6ea6c
diff --git a/metadata/md5-cache/acct-user/slurm-0 b/metadata/md5-cache/acct-user/slurm-0
index 1ac763d2ce2c..7cebd8a381c7 100644
--- a/metadata/md5-cache/acct-user/slurm-0
+++ b/metadata/md5-cache/acct-user/slurm-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/slurm
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=d98d09d56f76bb3d14f24c681267e864
diff --git a/metadata/md5-cache/acct-user/spire-0 b/metadata/md5-cache/acct-user/spire-0
index d2e130e63f99..2fc45b58a065 100644
--- a/metadata/md5-cache/acct-user/spire-0
+++ b/metadata/md5-cache/acct-user/spire-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/spire
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=9f81947a940b670dab44596013c4050f
diff --git a/metadata/md5-cache/acct-user/stdiscosrv-0 b/metadata/md5-cache/acct-user/stdiscosrv-0
index b87e5eba866d..f3801363bca5 100644
--- a/metadata/md5-cache/acct-user/stdiscosrv-0
+++ b/metadata/md5-cache/acct-user/stdiscosrv-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/stdiscosrv
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=af44b8606b4a40dab02f5496afe79489
diff --git a/metadata/md5-cache/acct-user/strelaysrv-0 b/metadata/md5-cache/acct-user/strelaysrv-0
index 1564d2678b0c..a7b2228f8790 100644
--- a/metadata/md5-cache/acct-user/strelaysrv-0
+++ b/metadata/md5-cache/acct-user/strelaysrv-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/strelaysrv
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=6f884243bd1b2d10493d2442712e1830
diff --git a/metadata/md5-cache/acct-user/syncthing-0 b/metadata/md5-cache/acct-user/syncthing-0
index 1105c1839421..055816050403 100644
--- a/metadata/md5-cache/acct-user/syncthing-0
+++ b/metadata/md5-cache/acct-user/syncthing-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/syncthing
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=28de358efd6c5e041eec5a14fe5c25b3
diff --git a/metadata/md5-cache/acct-user/systemd-coredump-0 b/metadata/md5-cache/acct-user/systemd-coredump-0
index d56867d9e286..b3877c81bb03 100644
--- a/metadata/md5-cache/acct-user/systemd-coredump-0
+++ b/metadata/md5-cache/acct-user/systemd-coredump-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/systemd-coredump
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=3c1db608ce4a5189047921934cb12aab
diff --git a/metadata/md5-cache/acct-user/systemd-journal-remote-0 b/metadata/md5-cache/acct-user/systemd-journal-remote-0
index 0f2cfbf58fe1..f18e61affb78 100644
--- a/metadata/md5-cache/acct-user/systemd-journal-remote-0
+++ b/metadata/md5-cache/acct-user/systemd-journal-remote-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/systemd-journal-remote
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=2c76c24b248182149eb428205a72a917
diff --git a/metadata/md5-cache/acct-user/systemd-network-0 b/metadata/md5-cache/acct-user/systemd-network-0
index b253f47f242b..6de10392947c 100644
--- a/metadata/md5-cache/acct-user/systemd-network-0
+++ b/metadata/md5-cache/acct-user/systemd-network-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/systemd-network
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=3eab8e08499459d01f181d06e7d2950c
diff --git a/metadata/md5-cache/acct-user/systemd-resolve-0 b/metadata/md5-cache/acct-user/systemd-resolve-0
index c5548fee47bf..5736edec28b4 100644
--- a/metadata/md5-cache/acct-user/systemd-resolve-0
+++ b/metadata/md5-cache/acct-user/systemd-resolve-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/systemd-resolve
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=3f1c651b891b7a8f654b421abfe5d4e9
diff --git a/metadata/md5-cache/acct-user/systemd-timesync-0 b/metadata/md5-cache/acct-user/systemd-timesync-0
index 0228d4a26634..edd122935003 100644
--- a/metadata/md5-cache/acct-user/systemd-timesync-0
+++ b/metadata/md5-cache/acct-user/systemd-timesync-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/systemd-timesync
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=bb13fbcbb1217c0817d90f47c25a46c6
diff --git a/metadata/md5-cache/acct-user/transmission-1 b/metadata/md5-cache/acct-user/transmission-1
index 702d4bb380bd..9731fe9bf7b3 100644
--- a/metadata/md5-cache/acct-user/transmission-1
+++ b/metadata/md5-cache/acct-user/transmission-1
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/transmission
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=0b44ab1a37773fa981c764be3a1a84d7
diff --git a/metadata/md5-cache/acct-user/unrealircd-0 b/metadata/md5-cache/acct-user/unrealircd-0
index ab4e41de965e..721ef3080ae1 100644
--- a/metadata/md5-cache/acct-user/unrealircd-0
+++ b/metadata/md5-cache/acct-user/unrealircd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/unrealircd
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=b186b3ee3ae34799a7b3a365e580b64c
diff --git a/metadata/md5-cache/acct-user/uptimed-0 b/metadata/md5-cache/acct-user/uptimed-0
index 631b7fe27f67..0df9096c3000 100644
--- a/metadata/md5-cache/acct-user/uptimed-0
+++ b/metadata/md5-cache/acct-user/uptimed-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=acct-group/uptimed
 SLOT=0
-_eclasses_=acct-user	c66515e3653817bc2d8a82b5267599c5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	364ac1f48c7c2c3eb9f257f8aab9773d	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=51d9d153c86d94b7131084e6848be1f1
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index bfd833f57e61..618c9eccd8af 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/brltty-5.2-r1 b/metadata/md5-cache/app-accessibility/brltty-5.2-r1
index 2f1eea39bd19..4017b00cbfcd 100644
--- a/metadata/md5-cache/app-accessibility/brltty-5.2-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-5.2.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3cad781d971e6d22a2315c7c31550fd2
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.0-r1 b/metadata/md5-cache/app-accessibility/brltty-6.0-r1
index 204e49f42b69..06a9e53a1502 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.0-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-6.0-r1
@@ -11,5 +11,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) app-accessibility/at-spi2-core:2 dev-libs/li
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	findlib	45d6030075064a68da8d7143726a1150	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
 _md5_=d3a1289d24b4d690f4f585c8d865857e
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2 b/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
index eb679383a6ff..d3c3c675d8f1 100644
--- a/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
+++ b/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=espeak? ( app-accessibility/espeak ) >=dev-tcltk/tclx-8.4 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://emacspeak.googlecode.com/files/emacspeak-39.0.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=02876f569083daff9874034ee9576174
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-9999 b/metadata/md5-cache/app-accessibility/emacspeak-9999
index 68061de54002..215088860d96 100644
--- a/metadata/md5-cache/app-accessibility/emacspeak-9999
+++ b/metadata/md5-cache/app-accessibility/emacspeak-9999
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2
 PROPERTIES=live
 RDEPEND=espeak? ( app-accessibility/espeak ) >=dev-tcltk/tclx-8.4 >=virtual/emacs-24
 SLOT=0
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	562b380fc59ae6a8622171d0acb777d1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	562b380fc59ae6a8622171d0acb777d1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=bb5e081141fefe72f22d1d7405b36da5
diff --git a/metadata/md5-cache/app-accessibility/speechd-el-2.5 b/metadata/md5-cache/app-accessibility/speechd-el-2.5
index e6848b9f6380..9d9f7d6dfb3c 100644
--- a/metadata/md5-cache/app-accessibility/speechd-el-2.5
+++ b/metadata/md5-cache/app-accessibility/speechd-el-2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.7 brltty? ( app-accessibility/brltty ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/speechd-el/speechd-el-2.5.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=20323b1a4156951fb1c7625027308a41
diff --git a/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1 b/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
index 93b85863769f..4e19474c90d5 100644
--- a/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
+++ b/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-accessibility/sphinxbase-0.7[static-libs?,python?,python_targets_p
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/sphinx3-0.8.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d82e172cbf8da7613c07e95d2fc8026
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index ffe0ccfe7cf8..fdf0102a6a61 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-2.7.13-r1 b/metadata/md5-cache/app-admin/ansible-2.7.13-r1
new file mode 100644
index 000000000000..e972cacbfdab
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.7.13-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.7.13.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=6c19db0eb59f982d435763eaedd71b76
diff --git a/metadata/md5-cache/app-admin/ansible-2.8.4-r1 b/metadata/md5-cache/app-admin/ansible-2.8.4-r1
new file mode 100644
index 000000000000..1a44866de80d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.8.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-notfound-page[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.8.4.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5cf0ea6ac5e2ff1b6fb31cb947cae7d3
diff --git a/metadata/md5-cache/app-admin/ansible-2.8.5 b/metadata/md5-cache/app-admin/ansible-2.8.5
new file mode 100644
index 000000000000..e52016256a9a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.8.5
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-notfound-page[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.8.5.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5cf0ea6ac5e2ff1b6fb31cb947cae7d3
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index 105c284e95de..705ba7f0f7d0 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -1,15 +1,15 @@
 BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-notfound-page[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-notfound-page[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=7
 HOMEPAGE=https://ansible.com/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=241e9406be5613006ef5e6e303958028
+_md5_=0f738d8ca413dd2bf95d232bff48d9eb
diff --git a/metadata/md5-cache/app-admin/certmgr-1.6.0 b/metadata/md5-cache/app-admin/certmgr-1.6.0
deleted file mode 100644
index 4a554b833574..000000000000
--- a/metadata/md5-cache/app-admin/certmgr-1.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Automated certificate management using a CFSSL CA
-EAPI=6
-HOMEPAGE=https://github.com/cloudflare/certmgr
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/cloudflare/certmgr/archive/v1.6.0.tar.gz -> certmgr-1.6.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=78b15da68325cd1f2f8edbc7fbad766c
diff --git a/metadata/md5-cache/app-admin/diamond-4.0-r1 b/metadata/md5-cache/app-admin/diamond-4.0-r1
index b590c2a50b1d..97f7486cde62 100644
--- a/metadata/md5-cache/app-admin/diamond-4.0-r1
+++ b/metadata/md5-cache/app-admin/diamond-4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/python-diamond/Diamond/archive/v4.0.tar.gz -> python-diamond-4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79acd89829e3c52c64172fd7922d7c57
diff --git a/metadata/md5-cache/app-admin/diamond-4.0.515 b/metadata/md5-cache/app-admin/diamond-4.0.515
index 2fd3171a5501..c8bcf82de424 100644
--- a/metadata/md5-cache/app-admin/diamond-4.0.515
+++ b/metadata/md5-cache/app-admin/diamond-4.0.515
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/python-diamond/Diamond/archive/v4.0.515.tar.gz -> python-diamond-4.0.515.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d71492c338b3f67c8aa7e3de69a81a0f
diff --git a/metadata/md5-cache/app-admin/diamond-9999 b/metadata/md5-cache/app-admin/diamond-9999
index 8b0c0e4b6518..b11075cd47b7 100644
--- a/metadata/md5-cache/app-admin/diamond-9999
+++ b/metadata/md5-cache/app-admin/diamond-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) redis? ( dev-python/redis-py ) !kernel_linux? ( >=dev-python/psutil-3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c0d4c9f143353de2b8bb0ceb484ef89
diff --git a/metadata/md5-cache/app-admin/dxf-7.4.1 b/metadata/md5-cache/app-admin/dxf-7.4.1
deleted file mode 100644
index abbfc9cf843c..000000000000
--- a/metadata/md5-cache/app-admin/dxf-7.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Docker registry v2 client in Python
-EAPI=6
-HOMEPAGE=https://github.com/davedoesdev/dxf
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/jwcrypto-0.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tqdm-4.19.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/www-authenticate-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.4.1.tar.gz -> dxf-7.4.1.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=084b9670de562cfbbdb0dd368f7a88b1
diff --git a/metadata/md5-cache/app-admin/dxf-7.5.0 b/metadata/md5-cache/app-admin/dxf-7.5.0
deleted file mode 100644
index ba4f9b1aad11..000000000000
--- a/metadata/md5-cache/app-admin/dxf-7.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Docker registry v2 client in Python
-EAPI=6
-HOMEPAGE=https://github.com/davedoesdev/dxf
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/jwcrypto-0.4.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.18.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tqdm-4.19.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/www-authenticate-0.9.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.5.0.tar.gz -> dxf-7.5.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=084b9670de562cfbbdb0dd368f7a88b1
diff --git a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1 b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
index 6f3aaf4b085f..748b0eb8a298 100644
--- a/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
+++ b/metadata/md5-cache/app-admin/evtxtools-1.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/unzip dev-perl/DateTime dev-perl/Digest-CRC dev-perl/DateTime dev-perl/Carp-Assert dev-perl/Data-Hexify dev-lang/perl[-build(-)] dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://computer.forensikblog.de/files/evtx/Parse-Evtx-1.1.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=93d287488ba27c72ede2758eb27efada
diff --git a/metadata/md5-cache/app-admin/gixy-0.1.5 b/metadata/md5-cache/app-admin/gixy-0.1.5
deleted file mode 100644
index 627b08fb02cc..000000000000
--- a/metadata/md5-cache/app-admin/gixy-0.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Nginx configuration static analyzer
-EAPI=6
-HOMEPAGE=https://github.com/yandex/gixy
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gixy/gixy-0.1.5.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d2c6f22910b5bf7470a31f5d8cff987
diff --git a/metadata/md5-cache/app-admin/gixy-0.1.8 b/metadata/md5-cache/app-admin/gixy-0.1.8
deleted file mode 100644
index e3f8abdfca48..000000000000
--- a/metadata/md5-cache/app-admin/gixy-0.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Nginx configuration static analyzer
-EAPI=6
-HOMEPAGE=https://github.com/yandex/gixy
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gixy/gixy-0.1.8.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d2c6f22910b5bf7470a31f5d8cff987
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2 b/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2
index 6ba9f16dad88..1bcb07532d8e 100644
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install preinst prepare pretend setup
-DEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) nls? ( sys-devel/gettext )
+DEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) nls? ( sys-devel/gettext )
 DESCRIPTION=Single process stack of various system monitors
 EAPI=7
 HOMEPAGE=http://www.gkrellm.net/
-IUSE=gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X
+IUSE=gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
+RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
 SLOT=2
 SRC_URI=http://gkrellm.srcbox.net/gkrellm-2.3.10.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=a9cb3ca56a58af06ef9fd3333fbaf6d4
+_md5_=b3feaecfb510abf697d1fef8671cd4f8
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.11 b/metadata/md5-cache/app-admin/gkrellm-2.3.11
index 5da5d2d83da3..c3cb5e1348f3 100644
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.11
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.11
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install preinst prepare pretend setup
-DEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) nls? ( sys-devel/gettext )
+DEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) nls? ( sys-devel/gettext )
 DESCRIPTION=Single process stack of various system monitors
 EAPI=7
 HOMEPAGE=http://www.gkrellm.net/
-IUSE=gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X
+IUSE=gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
+RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
 SLOT=2
 SRC_URI=http://gkrellm.srcbox.net/gkrellm-2.3.11.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=b713da806ff258acfa27446a4b2d132d
+_md5_=b50270ffbe36d28a145098a91f26d386
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.11-r1 b/metadata/md5-cache/app-admin/gkrellm-2.3.11-r1
index 448f29a637b2..373b2ac64441 100644
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.11-r1
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.11-r1
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install prepare pretend setup
-DEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) nls? ( sys-devel/gettext )
+DEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) nls? ( sys-devel/gettext )
 DESCRIPTION=Single process stack of various system monitors
 EAPI=7
 HOMEPAGE=http://www.gkrellm.net/
-IUSE=gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X
+IUSE=gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
+RDEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
 SLOT=2
 SRC_URI=http://gkrellm.srcbox.net/gkrellm-2.3.11.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=158473a208ebb5c98ad90601002e5a59
+_md5_=15a886b7053348ff648bc9e190c3d273
diff --git a/metadata/md5-cache/app-admin/gkrellm-9999 b/metadata/md5-cache/app-admin/gkrellm-9999
index 31a73de2afa0..8eedd0f50557 100644
--- a/metadata/md5-cache/app-admin/gkrellm-9999
+++ b/metadata/md5-cache/app-admin/gkrellm-9999
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install prepare pretend setup unpack
-DEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) nls? ( sys-devel/gettext )
+DEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango ) nls? ( sys-devel/gettext )
 DESCRIPTION=Single process stack of various system monitors
 EAPI=7
 HOMEPAGE=http://www.gkrellm.net/
-IUSE=gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X
+IUSE=gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
+RDEPEND=acct-group/gkrellmd acct-user/gkrellmd dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
 SLOT=2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=158473a208ebb5c98ad90601002e5a59
+_md5_=15a886b7053348ff648bc9e190c3d273
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.3.4-r1 b/metadata/md5-cache/app-admin/keepassxc-2.3.4-r1
deleted file mode 100644
index 2dfc38b6084a..000000000000
--- a/metadata/md5-cache/app-admin/keepassxc-2.3.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers ) dev-qt/linguist-tools:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
-EAPI=7
-HOMEPAGE=https://keepassxc.org
-IUSE=autotype browser debug network test yubikey
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1 GPL-2 GPL-3
-PDEPEND=x11-misc/xsel
-RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers )
-SLOT=0
-SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.3.4/keepassxc-2.3.4-src.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f476efc4ae346f0c2caa84352f65c485
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.4.3-r1 b/metadata/md5-cache/app-admin/keepassxc-2.4.3-r1
index 6a36efca2db0..9150a7b703e1 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.4.3-r1
+++ b/metadata/md5-cache/app-admin/keepassxc-2.4.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=KeePassXC - KeePass Cross-platform Community Edition
 EAPI=7
 HOMEPAGE=https://keepassxc.org
 IUSE=autotype browser debug keeshare +network test yubikey
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1 GPL-2 GPL-3
 PDEPEND=x11-misc/xsel
 RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) browser? ( >=dev-libs/libsodium-1.0.12 ) keeshare? ( dev-libs/quazip ) yubikey? ( sys-auth/ykpers )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.4.3/keepassxc-2.4.3-src.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99b288586b1e7f443572799fa2efde41
+_md5_=447d790f7e294b63027d29d721124533
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.10.2 b/metadata/md5-cache/app-admin/ksonnet-0.10.2
deleted file mode 100644
index ae305cfecaeb..000000000000
--- a/metadata/md5-cache/app-admin/ksonnet-0.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
-EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet https://ksonnet.io/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.10.2.tar.gz -> ksonnet-0.10.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0e0d0059a599b01a09b8bf85173a80b8
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.11.0 b/metadata/md5-cache/app-admin/ksonnet-0.11.0
deleted file mode 100644
index 933f75520165..000000000000
--- a/metadata/md5-cache/app-admin/ksonnet-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
-EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet https://ksonnet.io/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.11.0.tar.gz -> ksonnet-0.11.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0e0d0059a599b01a09b8bf85173a80b8
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.8.0 b/metadata/md5-cache/app-admin/ksonnet-0.8.0
deleted file mode 100644
index 8eed8be59940..000000000000
--- a/metadata/md5-cache/app-admin/ksonnet-0.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
-EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet https://ksonnet.io/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.8.0.tar.gz -> ksonnet-0.8.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0e0d0059a599b01a09b8bf85173a80b8
diff --git a/metadata/md5-cache/app-admin/ksonnet-0.9.2 b/metadata/md5-cache/app-admin/ksonnet-0.9.2
deleted file mode 100644
index b2480a03fbbe..000000000000
--- a/metadata/md5-cache/app-admin/ksonnet-0.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=CLI-supported framework for extensible Kubernetes configurations
-EAPI=6
-HOMEPAGE=https://github.com/ksonnet/ksonnet https://ksonnet.io/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ksonnet/ksonnet/archive/v0.9.2.tar.gz -> ksonnet-0.9.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0e0d0059a599b01a09b8bf85173a80b8
diff --git a/metadata/md5-cache/app-admin/kubectx-0.5.0 b/metadata/md5-cache/app-admin/kubectx-0.5.0
deleted file mode 100644
index 550c4898a751..000000000000
--- a/metadata/md5-cache/app-admin/kubectx-0.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Fast way to switch between clusters and namespaces in kubectl
-EAPI=6
-HOMEPAGE=https://github.com/ahmetb/kubectx
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-cluster/kubectl
-SLOT=0
-SRC_URI=https://github.com/ahmetb/kubectx/archive/v0.5.0.tar.gz -> kubectx-0.5.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=7d3d6cc8bcab4613546c3f14cd9b5d37
diff --git a/metadata/md5-cache/app-admin/kubectx-0.6.1 b/metadata/md5-cache/app-admin/kubectx-0.6.1
deleted file mode 100644
index e97115ec390a..000000000000
--- a/metadata/md5-cache/app-admin/kubectx-0.6.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Fast way to switch between clusters and namespaces in kubectl
-EAPI=6
-HOMEPAGE=https://github.com/ahmetb/kubectx
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-cluster/kubectl
-SLOT=0
-SRC_URI=https://github.com/ahmetb/kubectx/archive/v0.6.1.tar.gz -> kubectx-0.6.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=7d3d6cc8bcab4613546c3f14cd9b5d37
diff --git a/metadata/md5-cache/app-admin/passook-20121001 b/metadata/md5-cache/app-admin/passook-20121001
index e9c8420bc283..f68913a6e552 100644
--- a/metadata/md5-cache/app-admin/passook-20121001
+++ b/metadata/md5-cache/app-admin/passook-20121001
@@ -7,5 +7,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl sys-apps/miscfiles
 SLOT=0
 SRC_URI=mirror://gentoo/passook-20121001.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2a4c8f4b807b9298d45d23e138e70f7f
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.25 b/metadata/md5-cache/app-admin/perl-cleaner-2.25
index 8fadd4ffb90d..79fe1015d72c 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.25
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.25
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-cleaner-2.25.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.25.tar.bz2
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=d989a35e7436f1360c3067e4bedb56be
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-2.27 b/metadata/md5-cache/app-admin/perl-cleaner-2.27
index 44de321e07fb..441a67b80952 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-2.27
+++ b/metadata/md5-cache/app-admin/perl-cleaner-2.27
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-cleaner-2.27.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/perl-cleaner-2.27.tar.bz2
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=92246c7be9cd7f852827c3f0f3c3f941
diff --git a/metadata/md5-cache/app-admin/perl-cleaner-9999 b/metadata/md5-cache/app-admin/perl-cleaner-9999
index 1f51e8dffe75..e6430778bd55 100644
--- a/metadata/md5-cache/app-admin/perl-cleaner-9999
+++ b/metadata/md5-cache/app-admin/perl-cleaner-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-shells/bash dev-lang/perl || ( ( sys-apps/portage app-portage/portage-utils ) sys-apps/pkgcore )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=26b70e92bc806f03cc44b8e037ffd09e
diff --git a/metadata/md5-cache/app-admin/psmon-1.39-r1 b/metadata/md5-cache/app-admin/psmon-1.39-r1
index 34f18ecae470..051504655269 100644
--- a/metadata/md5-cache/app-admin/psmon-1.39-r1
+++ b/metadata/md5-cache/app-admin/psmon-1.39-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://www.psmon.com/psmon-1.39.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4703bc263d86b5a65a7051dcfc997f57
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.25_p1-r1 b/metadata/md5-cache/app-admin/sudo-1.8.25_p1-r1
index e0746a8bd6ed..b40f78597863 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.25_p1-r1
+++ b/metadata/md5-cache/app-admin/sudo-1.8.25_p1-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openl
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.25p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.25p1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5895eb5b166b6d00d59ca99d0d95558a
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.27-r1 b/metadata/md5-cache/app-admin/sudo-1.8.27-r1
index 0dab046fdeb2..0180edae4b64 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.27-r1
+++ b/metadata/md5-cache/app-admin/sudo-1.8.27-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:= ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.27.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.27.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2adc035d8cbf90624198058c7d6ebbed
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.28_beta3 b/metadata/md5-cache/app-admin/sudo-1.8.28_beta3
index b594db5fcdcf..e455c616d164 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.28_beta3
+++ b/metadata/md5-cache/app-admin/sudo-1.8.28_beta3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:= ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/beta/sudo-1.8.28b3.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.8.28b3.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8254efba6226aa33a98b9ce5828404ac
diff --git a/metadata/md5-cache/app-admin/sudo-9999 b/metadata/md5-cache/app-admin/sudo-9999
index 633cd1658193..eef24fe66fcf 100644
--- a/metadata/md5-cache/app-admin/sudo-9999
+++ b/metadata/md5-cache/app-admin/sudo-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-libs/zlib:= ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) sssd? ( sys-auth/sssd[sudo] ) system-digest? ( gcrypt? ( dev-libs/libgcrypt:= ) !gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam )
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8254efba6226aa33a98b9ce5828404ac
diff --git a/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1 b/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
index d7dd9d8dae5c..e8b843c0616a 100644
--- a/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
+++ b/metadata/md5-cache/app-admin/swatchdog-3.2.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Date-Manip dev-perl/Date-Calc dev-perl/File-Tail dev-perl/TimeDate >=virtual/perl-Time-HiRes-1.12 !app-admin/swatch dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/swatch/swatchdog-3.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5342b82b6fd108fc352d4bff44b2b3a4
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.22.1 b/metadata/md5-cache/app-admin/syslog-ng-3.22.1
index f958066e93d6..c980b218b436 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.22.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.22.1
@@ -5,7 +5,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.22.1/syslog-ng-3.22.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b1abd338169fcb2c981a8a3720239f85
+_md5_=db0913bc2e35621ca6a31e919c83e944
diff --git a/metadata/md5-cache/app-admin/sysstat-12.0.5 b/metadata/md5-cache/app-admin/sysstat-12.0.5
index 683de6f82c93..8712611f0b3a 100644
--- a/metadata/md5-cache/app-admin/sysstat-12.0.5
+++ b/metadata/md5-cache/app-admin/sysstat-12.0.5
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( sys-devel/gettext )
+DEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( sys-devel/gettext )
 DESCRIPTION=System performance tools for Linux
 EAPI=7
 HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
+IUSE=debug nls lm-sensors selinux static
 KEYWORDS=alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) selinux? ( sec-policy/selinux-sysstat )
+RDEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) selinux? ( sec-policy/selinux-sysstat )
 SLOT=0
 SRC_URI=https://github.com/sysstat/sysstat/archive/v12.0.5.tar.gz -> sysstat-12.0.5.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a60485e83581b666cf885774d03ebfbe
+_md5_=16ef6d0f67952366f70880b914660dea
diff --git a/metadata/md5-cache/app-admin/sysstat-12.0.6 b/metadata/md5-cache/app-admin/sysstat-12.0.6
index 4d8ed88e9b46..eee8efbd7841 100644
--- a/metadata/md5-cache/app-admin/sysstat-12.0.6
+++ b/metadata/md5-cache/app-admin/sysstat-12.0.6
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( sys-devel/gettext )
+DEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( sys-devel/gettext )
 DESCRIPTION=System performance tools for Linux
 EAPI=7
 HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
+IUSE=debug nls lm-sensors selinux static
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) selinux? ( sec-policy/selinux-sysstat )
+RDEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) selinux? ( sec-policy/selinux-sysstat )
 SLOT=0
 SRC_URI=https://github.com/sysstat/sysstat/archive/v12.0.6.tar.gz -> sysstat-12.0.6.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6800e1bd97d33e63fbc895c666a4ee66
+_md5_=7e0b6d3920d0498833d46096d4e9f9b7
diff --git a/metadata/md5-cache/app-admin/sysstat-12.1.5 b/metadata/md5-cache/app-admin/sysstat-12.1.5
index 85bcf74fa2b0..166aa4040fce 100644
--- a/metadata/md5-cache/app-admin/sysstat-12.1.5
+++ b/metadata/md5-cache/app-admin/sysstat-12.1.5
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( sys-devel/gettext )
+DEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( sys-devel/gettext )
 DESCRIPTION=System performance tools for Linux
 EAPI=7
 HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
+IUSE=debug nls lm-sensors selinux static
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) selinux? ( sec-policy/selinux-sysstat )
+RDEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) selinux? ( sec-policy/selinux-sysstat )
 SLOT=0
 SRC_URI=https://github.com/sysstat/sysstat/archive/v12.1.5.tar.gz -> sysstat-12.1.5.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=faab786f90104c784ed41ed0809c2847
+_md5_=c6f61ae82c09bbc7148f1cca35586e81
diff --git a/metadata/md5-cache/app-admin/sysstat-12.1.6 b/metadata/md5-cache/app-admin/sysstat-12.1.6
index 2b213f107cc7..2be24097f075 100644
--- a/metadata/md5-cache/app-admin/sysstat-12.1.6
+++ b/metadata/md5-cache/app-admin/sysstat-12.1.6
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( sys-devel/gettext )
+DEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( sys-devel/gettext )
 DESCRIPTION=System performance tools for Linux
 EAPI=7
 HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
+IUSE=debug nls lm-sensors selinux static
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) selinux? ( sec-policy/selinux-sysstat )
+RDEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) selinux? ( sec-policy/selinux-sysstat )
 SLOT=0
 SRC_URI=https://github.com/sysstat/sysstat/archive/v12.1.6.tar.gz -> sysstat-12.1.6.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=51e4b88d2d7fef3585df436a88a2c279
+_md5_=bc1e81cb08932166d20c5e7ed4972b95
diff --git a/metadata/md5-cache/app-admin/sysstat-999999 b/metadata/md5-cache/app-admin/sysstat-999999
index 6838efd8a959..25ee2126f12d 100644
--- a/metadata/md5-cache/app-admin/sysstat-999999
+++ b/metadata/md5-cache/app-admin/sysstat-999999
@@ -1,13 +1,13 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) nls? ( sys-devel/gettext )
+DEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( sys-devel/gettext )
 DESCRIPTION=System performance tools for Linux
 EAPI=7
 HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
+IUSE=debug nls lm-sensors selinux static
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors:= ) selinux? ( sec-policy/selinux-sysstat )
+RDEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) selinux? ( sec-policy/selinux-sysstat )
 SLOT=0
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d9a2473385ca1592504a7f01069af146
+_md5_=2a2601793d4bdfcc0db060a32a400409
diff --git a/metadata/md5-cache/app-admin/testdisk-7.1 b/metadata/md5-cache/app-admin/testdisk-7.1
index 8a4702b0b2ba..fd2e347c18e9 100644
--- a/metadata/md5-cache/app-admin/testdisk-7.1
+++ b/metadata/md5-cache/app-admin/testdisk-7.1
@@ -5,11 +5,11 @@ DESCRIPTION=Checks and undeletes partitions + PhotoRec, signature based recovery
 EAPI=7
 HOMEPAGE=https://www.cgsecurity.org/wiki/TestDisk
 IUSE=ewf jpeg ntfs qt5 reiserfs static zlib
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=!static? ( static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[static-libs] sys-libs/ncurses:0[static-libs] jpeg? ( virtual/jpeg:0[static-libs] ) ntfs? ( sys-fs/ntfs3g:=[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) zlib? ( sys-libs/zlib[static-libs] ) !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) ) ) !static? ( sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses:0= jpeg? ( virtual/jpeg:0 ) ntfs? ( sys-fs/ntfs3g ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) zlib? ( sys-libs/zlib ) !arm? ( ewf? ( app-forensics/libewf:= ) ) ) )
 REQUIRED_USE=static? ( !qt5 )
 SLOT=0
 SRC_URI=https://www.cgsecurity.org/testdisk-7.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f510c55943c19e036e707403d92eeeb9
+_md5_=3b524c1a7756c326ee30860aa346876a
diff --git a/metadata/md5-cache/app-admin/webapp-config-1.55-r1 b/metadata/md5-cache/app-admin/webapp-config-1.55-r1
index be8ad5567e56..0b5ea2e45200 100644
--- a/metadata/md5-cache/app-admin/webapp-config-1.55-r1
+++ b/metadata/md5-cache/app-admin/webapp-config-1.55-r1
@@ -10,5 +10,5 @@ RDEPEND=portage? ( sys-apps/portage[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.55.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d581a59a27f39c14c4892f07ca8048d8
diff --git a/metadata/md5-cache/app-admin/webapp-config-9999 b/metadata/md5-cache/app-admin/webapp-config-9999
index fa6f8fc06a39..8b29d6e5995c 100644
--- a/metadata/md5-cache/app-admin/webapp-config-9999
+++ b/metadata/md5-cache/app-admin/webapp-config-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=portage? ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a7a0786ae2a69b1a769a14d0cf3aa079
diff --git a/metadata/md5-cache/app-admin/yadm-1.07 b/metadata/md5-cache/app-admin/yadm-1.07
deleted file mode 100644
index 727c6d064ee4..000000000000
--- a/metadata/md5-cache/app-admin/yadm-1.07
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-tcltk/expect dev-util/bats dev-vcs/git )
-DESCRIPTION=A dotfile manager for the config files in your home folder
-EAPI=6
-HOMEPAGE=https://github.com/TheLocehiliosan/yadm/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/TheLocehiliosan/yadm/archive/1.07.tar.gz -> yadm-1.07.tar.gz
-_md5_=0b228bd25726e3f821800fd450a0f20e
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 26ce7190d932..e12a70d33929 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/atool-0.39.0-r1 b/metadata/md5-cache/app-arch/atool-0.39.0-r1
index e0615f8e82ea..9b8425df3197 100644
--- a/metadata/md5-cache/app-arch/atool-0.39.0-r1
+++ b/metadata/md5-cache/app-arch/atool-0.39.0-r1
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Script for managing file archives of various types
 EAPI=7
 HOMEPAGE=https://www.nongnu.org/atool/
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+
 RDEPEND=dev-lang/perl !app-text/adiff
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz
-_md5_=5a9056fa1ac92323a8a76694b854d3a7
+_md5_=a0047ecdb59a7180f8e751494d64daed
diff --git a/metadata/md5-cache/app-arch/deb2targz-1-r3 b/metadata/md5-cache/app-arch/deb2targz-1-r3
index f523a5ded10e..0dc376089e07 100644
--- a/metadata/md5-cache/app-arch/deb2targz-1-r3
+++ b/metadata/md5-cache/app-arch/deb2targz-1-r3
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Convert a .deb file to a .tar.gz archive
 EAPI=7
 HOMEPAGE=http://www.miketaylor.org.uk/tech/deb/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://www.miketaylor.org.uk/tech/deb/deb2targz
-_md5_=a00cfee7ecdc769c65bc48f1fab4f2d5
+_md5_=e38c8e84a6ca8658b1580786e4c210f8
diff --git a/metadata/md5-cache/app-arch/dump-0.4.46-r1 b/metadata/md5-cache/app-arch/dump-0.4.46-r1
index 5d85ab2722ff..b44a78ff3c84 100644
--- a/metadata/md5-cache/app-arch/dump-0.4.46-r1
+++ b/metadata/md5-cache/app-arch/dump-0.4.46-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Dump/restore ext2fs backup utilities
 EAPI=7
 HOMEPAGE=http://dump.sourceforge.net/
 IUSE=bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=sys-fs/e2fsprogs-1.27:= >=sys-libs/e2fsprogs-libs-1.27:= sys-apps/util-linux bzip2? ( >=app-arch/bzip2-1.0.2:= ) zlib? ( >=sys-libs/zlib-1.1.4:= ) lzo? ( dev-libs/lzo:2= ) sqlite? ( dev-db/sqlite:3= ) ermt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) readline? ( sys-libs/readline:0= sys-libs/ncurses:= static? ( sys-libs/ncurses:=[static-libs] ) )
 REQUIRED_USE=ermt? ( ssl ) ssl? ( zlib ) test? ( sqlite? ( uuid ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/dump/dump-0.4b46.tar.gz
-_md5_=c4631cfeac56e61a2d625221f13e0d4c
+_md5_=14b3e8c5324adecfb8199c7ade7aeabd
diff --git a/metadata/md5-cache/app-arch/lz4-1.9.2 b/metadata/md5-cache/app-arch/lz4-1.9.2
index 4f4be574882c..68f99a19a495 100644
--- a/metadata/md5-cache/app-arch/lz4-1.9.2
+++ b/metadata/md5-cache/app-arch/lz4-1.9.2
@@ -4,9 +4,9 @@ DESCRIPTION=Extremely Fast Compression algorithm
 EAPI=7
 HOMEPAGE=https://github.com/lz4/lz4
 IUSE=static-libs 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 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2 GPL-2
 SLOT=0/r132
 SRC_URI=https://github.com/Cyan4973/lz4/archive/v1.9.2.tar.gz -> lz4-1.9.2.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24774fdc4d588105ef8f9bab600f1de0
+_md5_=9f9965a97fc8c037eec711dd4013710b
diff --git a/metadata/md5-cache/app-arch/xar-1.8-r2 b/metadata/md5-cache/app-arch/xar-1.8-r2
index 72d384cbb0d4..f3afb8ca17fc 100644
--- a/metadata/md5-cache/app-arch/xar-1.8-r2
+++ b/metadata/md5-cache/app-arch/xar-1.8-r2
@@ -4,10 +4,10 @@ DESCRIPTION=An easily extensible archive format
 EAPI=6
 HOMEPAGE=https://opensource.apple.com/source/xar/
 IUSE=libressl kernel_Darwin 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 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=!kernel_Darwin? ( !kernel_SunOS? ( virtual/acl ) !libressl? ( dev-libs/openssl: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(-)?] ) libressl? ( dev-libs/libressl: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(-)?] ) ) app-arch/bzip2[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-libs/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(-)?] 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(-)?]
 SLOT=0
 SRC_URI=https://opensource.apple.com/tarballs/xar/xar-400.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d07ee9e5b83ada95cca23fa6de7c084
+_md5_=3d2a66a7238afaeb2d960ddae79072bc
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index b29e6197a715..5e730a47d54d 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-4.4.1 b/metadata/md5-cache/app-benchmarks/geekbench-4.4.1
index 36d974db317b..7890bed8b890 100644
--- a/metadata/md5-cache/app-benchmarks/geekbench-4.4.1
+++ b/metadata/md5-cache/app-benchmarks/geekbench-4.4.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install nofetch postinst
 DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
 EAPI=7
 HOMEPAGE=https://www.geekbench.com
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* ~amd64 x86
 LICENSE=geekbench
 RESTRICT=bindist fetch mirror strip
 SLOT=4
 SRC_URI=https://cdn.geekbench.com/Geekbench-4.4.1-Linux.tar.gz
-_md5_=d5770c1a15a54e54927228e549d80606
+_md5_=b5f569eec2a5ef5e3200fba98436c9cb
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-5.0.0 b/metadata/md5-cache/app-benchmarks/geekbench-5.0.0
new file mode 100644
index 000000000000..3c016e5a9525
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/geekbench-5.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install nofetch postinst
+DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
+EAPI=7
+HOMEPAGE=https://www.geekbench.com
+KEYWORDS=-* ~amd64
+LICENSE=geekbench
+RESTRICT=bindist fetch mirror strip
+SLOT=5
+SRC_URI=https://cdn.geekbench.com/Geekbench-5.0.0-Linux.tar.gz
+_md5_=724192506d0da71bb3356c77d81b0146
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 4089fd208051..0fa6f6e4b940 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/bchunk-1.2.0-r4 b/metadata/md5-cache/app-cdr/bchunk-1.2.0-r4
index ea3827037900..c367c66abcee 100644
--- a/metadata/md5-cache/app-cdr/bchunk-1.2.0-r4
+++ b/metadata/md5-cache/app-cdr/bchunk-1.2.0-r4
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Convert CD images from bin/cue to iso+wav/cdr
 EAPI=6
 HOMEPAGE=http://he.fi/bchunk/
-KEYWORDS=amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=http://he.fi/bchunk/bchunk-1.2.0.tar.gz
-_md5_=729cec6383a0dcf97f6fdab5a6730656
+_md5_=431396bec19c7dc99e9cb7dcfd0c9a76
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 8bbebb39e503..0e7724370a00 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/acr38u-1.7.11-r3 b/metadata/md5-cache/app-crypt/acr38u-1.7.11-r3
index c261d0130ece..c17411f3c224 100644
--- a/metadata/md5-cache/app-crypt/acr38u-1.7.11-r3
+++ b/metadata/md5-cache/app-crypt/acr38u-1.7.11-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/pcsc-lite-1.6.4 virtual/libusb:0
 SLOT=0
 SRC_URI=https://www.linuxunderground.be/ACR38_LINUX_100711_P.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=2a4bdc4274705db13041e106920806a5
diff --git a/metadata/md5-cache/app-crypt/asekey-3.7 b/metadata/md5-cache/app-crypt/asekey-3.7
index d41e5f45d624..a6dab264bcff 100644
--- a/metadata/md5-cache/app-crypt/asekey-3.7
+++ b/metadata/md5-cache/app-crypt/asekey-3.7
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2.1
 RDEPEND=sys-apps/pcsc-lite[udev] virtual/libusb:0
 SLOT=0
 SRC_URI=http://www.athena-scs.com/docs/reader-drivers/asekey-3-7-tar.bz2 -> asekey-3.7.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=73bf059896dbddd3b13422fd602253ab
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.30 b/metadata/md5-cache/app-crypt/ccid-1.4.30
index 5afbd1bb0ad0..e9cab5cb17ee 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.4.30
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.30
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
 SLOT=0
 SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.30.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=4714430e5b4deed5724a62daf1840788
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.4-r2 b/metadata/md5-cache/app-crypt/ekeyd-1.1.4-r2
index 909eeade50b2..5042ce7271f9 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.4-r2
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.4-r2
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( dev-lang/lua usb? ( virtual/libusb:0 ) dev-lua/luasocket ker
 REQUIRED_USE=minimal? ( !munin !usb )
 SLOT=0
 SRC_URI=http://www.entropykey.co.uk/res/download/ekeyd-1.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e40ad0dd489383040576c38f1b449860
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.5 b/metadata/md5-cache/app-crypt/ekeyd-1.1.5
index 16f23ff35c4c..b35ab42383a4 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.5
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( dev-lang/lua dev-lua/luasocket kernel_linux? ( virtual/udev
 REQUIRED_USE=minimal? ( !munin )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_1.1.5.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fa6826ad0a375a1eb18214ff83571967
diff --git a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1 b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
index 854187e64f08..b78f75f15d11 100644
--- a/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
+++ b/metadata/md5-cache/app-crypt/ekeyd-1.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=!minimal? ( dev-lang/lua dev-lua/luasocket kernel_linux? ( virtual/udev
 REQUIRED_USE=minimal? ( !munin )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/e/ekeyd/ekeyd_1.1.5.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4ab23db1c80ae14668711bdc8c633f99
diff --git a/metadata/md5-cache/app-crypt/libnitrokey-3.5 b/metadata/md5-cache/app-crypt/libnitrokey-3.5
index 71b9ab5a1158..b75b7a635a26 100644
--- a/metadata/md5-cache/app-crypt/libnitrokey-3.5
+++ b/metadata/md5-cache/app-crypt/libnitrokey-3.5
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Nitrokey/libnitrokey/archive/v3.5.tar.gz -> libnitrokey-3.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b5a6fc085824c7c045d627b6b7bbf2f
diff --git a/metadata/md5-cache/app-crypt/libnitrokey-9999 b/metadata/md5-cache/app-crypt/libnitrokey-9999
index 36dc9acfb0ab..d41bf7de493f 100644
--- a/metadata/md5-cache/app-crypt/libnitrokey-9999
+++ b/metadata/md5-cache/app-crypt/libnitrokey-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/hidapi:= virtual/udev
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44a114a14616adc2d589cc17834f39f2
diff --git a/metadata/md5-cache/app-crypt/libu2f-host-1.1.10 b/metadata/md5-cache/app-crypt/libu2f-host-1.1.10
index fe8b213a88bd..654842cd60a8 100644
--- a/metadata/md5-cache/app-crypt/libu2f-host-1.1.10
+++ b/metadata/md5-cache/app-crypt/libu2f-host-1.1.10
@@ -7,8 +7,8 @@ HOMEPAGE=https://developers.yubico.com/libu2f-host/
 IUSE=kernel_linux static-libs systemd kernel_linux
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2
-RDEPEND=dev-libs/hidapi dev-libs/json-c:= systemd? ( sys-apps/systemd[acl] )
+RDEPEND=dev-libs/hidapi dev-libs/json-c:= !systemd? ( acct-group/plugdev ) systemd? ( sys-apps/systemd[acl] )
 SLOT=0
 SRC_URI=https://developers.yubico.com/libu2f-host/Releases/libu2f-host-1.1.10.tar.xz
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=2bade9d132c3b0d613a903fb44f27b4b
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=55a9504bce29d871d04a6ba3af30806e
diff --git a/metadata/md5-cache/app-crypt/libykneomgr-0.1.8 b/metadata/md5-cache/app-crypt/libykneomgr-0.1.8
index adef464eca74..6611b0f9028a 100644
--- a/metadata/md5-cache/app-crypt/libykneomgr-0.1.8
+++ b/metadata/md5-cache/app-crypt/libykneomgr-0.1.8
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-apps/pcsc-lite dev-libs/libzip >=app-crypt/ccid-1.4.18[usb]
 SLOT=0
 SRC_URI=https://developers.yubico.com/libykneomgr/Releases/libykneomgr-0.1.8.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=7b3acf8cf8a0f6801ad125b8f5c41c95
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.17-r1 b/metadata/md5-cache/app-crypt/mit-krb5-1.17-r1
index cc7dca9fcd56..4ab56293bc22 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.17-r1
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.17-r1
@@ -5,11 +5,11 @@ DESCRIPTION=MIT Kerberos V
 EAPI=7
 HOMEPAGE=https://web.mit.edu/kerberos/www/
 IUSE=cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[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/libverto-0.2.5[libev,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/libverto-0.2.5[libevent,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/libverto-0.2.5[tevent,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(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[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(-)?] ) lmdb? ( dev-db/lmdb ) 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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) pkinit? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) libressl? ( dev-libs/libressl: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(-)?] ) ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.17/krb5-1.17.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2b811773c30d8d1a6550a3f5b9fc21e0
+_md5_=3b782f6c9c5ffe44e72a5e6443759046
diff --git a/metadata/md5-cache/app-crypt/moolticute-0.30.1 b/metadata/md5-cache/app-crypt/moolticute-0.30.1
index 7297f901e19a..a41398856b97 100644
--- a/metadata/md5-cache/app-crypt/moolticute-0.30.1
+++ b/metadata/md5-cache/app-crypt/moolticute-0.30.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/libusb-1.0.20 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/mooltipass/moolticute/archive/v0.30.1.tar.gz -> moolticute-0.30.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=401dbf103679132237ecea450490d596
diff --git a/metadata/md5-cache/app-crypt/moolticute-0.30.8 b/metadata/md5-cache/app-crypt/moolticute-0.30.8
index 9d5b649b2eac..1d582182bd00 100644
--- a/metadata/md5-cache/app-crypt/moolticute-0.30.8
+++ b/metadata/md5-cache/app-crypt/moolticute-0.30.8
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/libusb-1.0.20 dev-qt/qtdbus:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/mooltipass/moolticute/archive/v0.30.8.tar.gz -> moolticute-0.30.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74d8308719dc3aabb4f9ac214901e2e0
diff --git a/metadata/md5-cache/app-crypt/moolticute-9999 b/metadata/md5-cache/app-crypt/moolticute-9999
index 23bc8ca3f94a..3fb542004a26 100644
--- a/metadata/md5-cache/app-crypt/moolticute-9999
+++ b/metadata/md5-cache/app-crypt/moolticute-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=dev-libs/libusb-1.0.20 dev-qt/qtdbus:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qttest:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74d8308719dc3aabb4f9ac214901e2e0
diff --git a/metadata/md5-cache/app-crypt/osslsigncode-1.7.1 b/metadata/md5-cache/app-crypt/osslsigncode-1.7.1
deleted file mode 100644
index 2a556c0f624b..000000000000
--- a/metadata/md5-cache/app-crypt/osslsigncode-1.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure
-DEPEND=curl? ( net-misc/curl ) !libressl? ( =dev-libs/openssl-1.0*:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Platform-independent tool for Authenticode signing of EXE/CAB files
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/osslsigncode
-IUSE=curl libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) !libressl? ( =dev-libs/openssl-1.0*:0= ) libressl? ( dev-libs/libressl:0= )
-SLOT=0
-SRC_URI=mirror://sourceforge/osslsigncode/osslsigncode-1.7.1.tar.gz
-_md5_=75067deddbd4156cbc8d64dc525aa5b3
diff --git a/metadata/md5-cache/app-crypt/pesign-0.112 b/metadata/md5-cache/app-crypt/pesign-0.112
deleted file mode 100644
index 4d938db5354b..000000000000
--- a/metadata/md5-cache/app-crypt/pesign-0.112
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/nspr dev-libs/nss dev-libs/popt !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-libs/efivar sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
-DESCRIPTION=Tools for manipulating signed PE-COFF binaries
-EAPI=6
-HOMEPAGE=https://github.com/vathpela/pesign
-IUSE=libressl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/nspr dev-libs/nss dev-libs/popt !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-libs/efivar
-SLOT=0
-SRC_URI=https://github.com/vathpela/pesign/archive/0.112.tar.gz -> pesign-0.112.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13e24bb3697a8ae2c0a4ed42c076d310
diff --git a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1 b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1
index 67f448d40a07..87dfca3eb4f3 100644
--- a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1
+++ b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:= modules? ( kernel_linux? ( virtual/modutils ) )
 SLOT=0
 SRC_URI=https://github.com/PeterHuewe/tpm-emulator/archive/v0.7.5.tar.gz -> tpm-emulator-0.7.5.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47a2448d9672ceca2ff10af54a9e705d
diff --git a/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3 b/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3
index 15511a765307..0f1f74afa54f 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-2.2.3
@@ -11,5 +11,5 @@ RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= )
 REQUIRED_USE=gcrypt? ( !openssl ) openssl? ( !gcrypt ) || ( gcrypt openssl )
 SLOT=0/0
 SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.2.3/tpm2-tss-2.2.3.tar.gz
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=e39bf6501bef9b17b71c15411ecb13fb
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1 b/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
index bbba80cd12b2..266c87534ffb 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
@@ -10,5 +10,5 @@ LICENSE=CPL-1.0 GPL-2
 RDEPEND=>=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:0= ) selinux? ( sec-policy/selinux-tcsd )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.14.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=1654edcfc7ee2d6d510c8b9ad24bdcc0
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 6f210da05fd0..c6581a9b936f 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/myspell-nl-2.10g b/metadata/md5-cache/app-dicts/myspell-nl-2.10g
deleted file mode 100644
index 81d6a2f6e6e9..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-nl-2.10g
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Dutch dictionaries for myspell/hunspell
-EAPI=6
-HOMEPAGE=https://www.opentaal.org
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=BSD-2 CC-BY-3.0
-SLOT=0
-SRC_URI=https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-210g-voor-openofficeorg-3?bid=20&agree=1 -> myspell-nl-2.10g.oxt https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> myspell-nl-2.10g_thes.oxt
-_eclasses_=myspell-r2	d7a80fcc3949917840a5c8f1a967004c
-_md5_=3d0dc659f5b0344e02fa90cc65cb2e69
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index f706273e760f..1ad37eb1ce49 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.15 b/metadata/md5-cache/app-doc/doxygen-1.8.15
index cacafe868f24..ab64fb5cb0d9 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.15
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.15
@@ -4,7 +4,7 @@ DESCRIPTION=Documentation system for most programming languages
 EAPI=6
 HOMEPAGE=https://www.stack.nl/~dimitri/doxygen/
 IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( >=sys-devel/clang-4.0.0:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( dev-libs/xapian:= ) latex? ( dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=doc? ( latex )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://doxygen.nl/files/doxygen-1.8.15.src.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2f97ede396ab50170db17b0b38e5fba
+_md5_=c90b969528c85cb32134bc631a577bf4
diff --git a/metadata/md5-cache/app-doc/eclass-manpages-20190714 b/metadata/md5-cache/app-doc/eclass-manpages-20190714
deleted file mode 100644
index e3ee4bc14f20..000000000000
--- a/metadata/md5-cache/app-doc/eclass-manpages-20190714
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/xz-utils sys-apps/gawk
-DESCRIPTION=Collection of Gentoo eclass manpages
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/eclass-to-manpage
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/eclass-manpages-20190714.tar.xz
-_md5_=5a77403096a229de874dfd18cb2ec520
diff --git a/metadata/md5-cache/app-doc/eclass-manpages-20190908 b/metadata/md5-cache/app-doc/eclass-manpages-20190908
new file mode 100644
index 000000000000..2750a1852c05
--- /dev/null
+++ b/metadata/md5-cache/app-doc/eclass-manpages-20190908
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/xz-utils sys-apps/gawk
+DESCRIPTION=Collection of Gentoo eclass manpages
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/eclass-to-manpage
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/eclass-manpages/eclass-manpages-20190908.tar.xz
+_md5_=2dfc488de1a28aa9be3547de6f7b4ab1
diff --git a/metadata/md5-cache/app-doc/linkers-and-loaders-1-r1 b/metadata/md5-cache/app-doc/linkers-and-loaders-1-r1
index 74dbc9da4bd7..800661a5879d 100644
--- a/metadata/md5-cache/app-doc/linkers-and-loaders-1-r1
+++ b/metadata/md5-cache/app-doc/linkers-and-loaders-1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=The Linkers and Loaders book
 EAPI=7
 HOMEPAGE=https://linker.iecc.com/
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=all-rights-reserved
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://wh0rd.org/books/linkers-and-loaders-1.tar.lzma
-_md5_=420a62de7d9b2eccc20dba1d4f527afd
+_md5_=023aba69a9a45bcd9beb163bb6d326a2
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 3719c1c1f081..b831221e7097 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/ghex-3.18.3 b/metadata/md5-cache/app-editors/ghex-3.18.3
deleted file mode 100644
index 095e71592eaa..000000000000
--- a/metadata/md5-cache/app-editors/ghex-3.18.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3 >=dev-util/intltool-0.41.1 >=sys-devel/gettext-0.17 app-text/yelp-tools virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME hexadecimal editor
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3
-SLOT=2
-SRC_URI=mirror://gnome/sources/ghex/3.18/ghex-3.18.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7392f17596cb5974f94700a13803a309
diff --git a/metadata/md5-cache/app-editors/ghex-3.18.4-r1 b/metadata/md5-cache/app-editors/ghex-3.18.4-r1
index 288bbe46490c..c3051794609c 100644
--- a/metadata/md5-cache/app-editors/ghex-3.18.4-r1
+++ b/metadata/md5-cache/app-editors/ghex-3.18.4-r1
@@ -4,11 +4,11 @@ DEPEND=>=dev-libs/atk-1.0.0 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3 de
 DESCRIPTION=GNOME hexadecimal editor
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/atk-1.0.0 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/ghex/3.18/ghex-3.18.4.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b06f0fa4a7a5a01903d3daead42a8388
+_md5_=6e5112527e4f550039ab0550b1626c96
diff --git a/metadata/md5-cache/app-editors/gvim-8.1.1486 b/metadata/md5-cache/app-editors/gvim-8.1.1486
index 13650aa63190..07cdbd958834 100644
--- a/metadata/md5-cache/app-editors/gvim-8.1.1486
+++ b/metadata/md5-cache/app-editors/gvim-8.1.1486
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.1486.tar.gz -> vim-8.1.1486.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87103a04dc0e0a7e628a0300bd5bc6c2
diff --git a/metadata/md5-cache/app-editors/gvim-8.1.1846 b/metadata/md5-cache/app-editors/gvim-8.1.1846
index 867ecc7fc9bc..8f6df37c3d16 100644
--- a/metadata/md5-cache/app-editors/gvim-8.1.1846
+++ b/metadata/md5-cache/app-editors/gvim-8.1.1846
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.1846.tar.gz -> vim-8.1.1846.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03aa9d7263d7caedfca3faec5ee6cb45
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index 7909c1afea02..443ea1a2e9e4 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -10,5 +10,5 @@ RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurs
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e058da113371f7718239428cdb08c7d
diff --git a/metadata/md5-cache/app-editors/vim-core-8.1.1486 b/metadata/md5-cache/app-editors/vim-core-8.1.1486
index 068fe82afdb1..1266c3584d34 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.1.1486
+++ b/metadata/md5-cache/app-editors/vim-core-8.1.1486
@@ -10,5 +10,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.1486.tar.gz -> vim-8.1.1486.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd507c644a4e3b1f04805d81c82883be
diff --git a/metadata/md5-cache/app-editors/vim-core-8.1.1846 b/metadata/md5-cache/app-editors/vim-core-8.1.1846
index 731a90ac87f1..837aca41aa9f 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.1.1846
+++ b/metadata/md5-cache/app-editors/vim-core-8.1.1846
@@ -10,5 +10,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.1846.tar.gz -> vim-8.1.1846.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4a2d4d98e7d74aa50bf316289e72c0e
diff --git a/metadata/md5-cache/app-editors/vim-core-9999 b/metadata/md5-cache/app-editors/vim-core-9999
index 8dd475590c10..837634fa8608 100644
--- a/metadata/md5-cache/app-editors/vim-core-9999
+++ b/metadata/md5-cache/app-editors/vim-core-9999
@@ -9,5 +9,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 PROPERTIES=live
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4a2d4d98e7d74aa50bf316289e72c0e
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 5e636eba8ac5..b7b4e9efb1c3 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527 b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
index c58034d20d5a..2417c060569a 100644
--- a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
+++ b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/austinhaas/actionscript-mode/archive/65abd58e198458a8e46748c5962c41d80d60c4ea.tar.gz -> actionscript-mode-7.2.2_p20180527.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=e6ea45c8f98d76fd35975669c93e9def
diff --git a/metadata/md5-cache/app-emacs/adaptive-wrap-0.5 b/metadata/md5-cache/app-emacs/adaptive-wrap-0.5
index 76614a1b3e6e..acf6756c41d9 100644
--- a/metadata/md5-cache/app-emacs/adaptive-wrap-0.5
+++ b/metadata/md5-cache/app-emacs/adaptive-wrap-0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://elpa.gnu.org/packages/adaptive-wrap-0.5.el
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=83e875035ffad89385a03e77ac48ed82
diff --git a/metadata/md5-cache/app-emacs/analog-1.9.99 b/metadata/md5-cache/app-emacs/analog-1.9.99
index 2c336960860c..fabc0253f110 100644
--- a/metadata/md5-cache/app-emacs/analog-1.9.99
+++ b/metadata/md5-cache/app-emacs/analog-1.9.99
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/analog-1.9.99.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=922905ad92a1fb4d4a4bef6c2b782c52
diff --git a/metadata/md5-cache/app-emacs/apache-mode-2.2.0 b/metadata/md5-cache/app-emacs/apache-mode-2.2.0
index 18eb9d34bca5..dc47741dbe30 100644
--- a/metadata/md5-cache/app-emacs/apache-mode-2.2.0
+++ b/metadata/md5-cache/app-emacs/apache-mode-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/emacs-php/apache-mode/archive/2.2.0.tar.gz -> apache-mode-2.2.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=9014031c259b08e4280c27eddfc7ae53
diff --git a/metadata/md5-cache/app-emacs/apel-10.8-r1 b/metadata/md5-cache/app-emacs/apel-10.8-r1
index 46f34ea0a986..efa0caccb12f 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8-r1
+++ b/metadata/md5-cache/app-emacs/apel-10.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=ftp://ftp.jpl.org/pub/elisp/apel/apel-10.8.tar.gz https://dev.gentoo.org/~gienah/2big4tree/app-emacs/apel/apel-10.8-030_Use-new-style-backquotes.patch.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=8bb31feb9598e66a21e6713b8678855f
diff --git a/metadata/md5-cache/app-emacs/apel-10.8_p20190407 b/metadata/md5-cache/app-emacs/apel-10.8_p20190407
index 0e59970fa713..4f5069ce063d 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8_p20190407
+++ b/metadata/md5-cache/app-emacs/apel-10.8_p20190407
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/wanderlust/apel/archive/d146ddbf8818e81d3577d5eee7825d377bec0c73.tar.gz -> apel-10.8_p20190407.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=38c16dbe679c1e939d0aab9a1636cd4f
diff --git a/metadata/md5-cache/app-emacs/async-1.9.3 b/metadata/md5-cache/app-emacs/async-1.9.3
index da20da96f697..e48f38fbf6d7 100644
--- a/metadata/md5-cache/app-emacs/async-1.9.3
+++ b/metadata/md5-cache/app-emacs/async-1.9.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/jwiegley/emacs-async/archive/v1.9.3.tar.gz -> emacs-async-1.9.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=2ed0daef725b93c434757e0e443f51d2
diff --git a/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0 b/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
index 21b5ea73eecb..d29473d294ac 100644
--- a/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
+++ b/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/websocket >=virtual/emacs-25
 SLOT=0
 SRC_URI=https://github.com/alpha22jp/atomic-chrome/archive/v2.0.0.tar.gz -> atomic-chrome-2.0.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=05fb60580edb6036dc0dd7411f3e627c
diff --git a/metadata/md5-cache/app-emacs/auctex-11.92 b/metadata/md5-cache/app-emacs/auctex-11.92
index 691edcd84229..2a8115c4ed09 100644
--- a/metadata/md5-cache/app-emacs/auctex-11.92
+++ b/metadata/md5-cache/app-emacs/auctex-11.92
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-11.92.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=f323736e1d87895fef3529033cf7b879
diff --git a/metadata/md5-cache/app-emacs/auctex-12.1 b/metadata/md5-cache/app-emacs/auctex-12.1
index 605b42e250e0..8031d13b66eb 100644
--- a/metadata/md5-cache/app-emacs/auctex-12.1
+++ b/metadata/md5-cache/app-emacs/auctex-12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-24
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=6f7f9171a66230a98ea8f4cca2af6dff
diff --git a/metadata/md5-cache/app-emacs/auctex-12.1-r1 b/metadata/md5-cache/app-emacs/auctex-12.1-r1
index 342bdb7c7ebf..5975592269ec 100644
--- a/metadata/md5-cache/app-emacs/auctex-12.1-r1
+++ b/metadata/md5-cache/app-emacs/auctex-12.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-24
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=cd8deb389af022223b67285533d1d800
diff --git a/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r1 b/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r1
index d7d92798c890..210d711a16af 100644
--- a/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r1
+++ b/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=app-emacs/popup >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/auto-complete/auto-complete/archive/v1.5.1.tar.gz -> auto-complete-1.5.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=b1b2b38bc7f144d4e15b3e8816ba9b89
diff --git a/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1 b/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
index c84fe7f2a92a..95d436e73e3c 100644
--- a/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
+++ b/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=9742209413a91c496eebe0fea9320c50
diff --git a/metadata/md5-cache/app-emacs/basic-toolkit-0.3 b/metadata/md5-cache/app-emacs/basic-toolkit-0.3
index 760955c32c77..ee62e5bf789e 100644
--- a/metadata/md5-cache/app-emacs/basic-toolkit-0.3
+++ b/metadata/md5-cache/app-emacs/basic-toolkit-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/windows app-emacs/cycle-buffer >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/basic-toolkit-0.3.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=0c230d096a7327451b5e32ee55203705
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.1.2-r1 b/metadata/md5-cache/app-emacs/bbdb-3.1.2-r1
index 154a5c5d6587..865982921376 100644
--- a/metadata/md5-cache/app-emacs/bbdb-3.1.2-r1
+++ b/metadata/md5-cache/app-emacs/bbdb-3.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=vm? ( app-emacs/vm ) tex? ( virtual/tex-base ) >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/bbdb/bbdb-3.1.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=27eb84331619eccf9ff3e7efaf5d5a84
diff --git a/metadata/md5-cache/app-emacs/binclock-1.11 b/metadata/md5-cache/app-emacs/binclock-1.11
index 6b84805645e2..aac4fa64e836 100644
--- a/metadata/md5-cache/app-emacs/binclock-1.11
+++ b/metadata/md5-cache/app-emacs/binclock-1.11
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/davep/binclock.el/archive/v1.11.tar.gz -> binclock-1.11.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=8f04ab3f0d8b20437db0dabded846107
diff --git a/metadata/md5-cache/app-emacs/binclock-1.7-r1 b/metadata/md5-cache/app-emacs/binclock-1.7-r1
index 919f42084cd1..cac94af0b52a 100644
--- a/metadata/md5-cache/app-emacs/binclock-1.7-r1
+++ b/metadata/md5-cache/app-emacs/binclock-1.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/binclock-1.7.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=47a8f55fcb7916a1c9f470a91e2b5093
diff --git a/metadata/md5-cache/app-emacs/bison-mode-0.3 b/metadata/md5-cache/app-emacs/bison-mode-0.3
index e5d64bd6ec39..898b1d648473 100644
--- a/metadata/md5-cache/app-emacs/bison-mode-0.3
+++ b/metadata/md5-cache/app-emacs/bison-mode-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~nicolasbock/bison-mode-0.3.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=f6114b331d83c9457c02563141761d21
diff --git a/metadata/md5-cache/app-emacs/blogmax-20110305 b/metadata/md5-cache/app-emacs/blogmax-20110305
index b7f052a6742d..ee13c2e8b3d1 100644
--- a/metadata/md5-cache/app-emacs/blogmax-20110305
+++ b/metadata/md5-cache/app-emacs/blogmax-20110305
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/blogmax-20110305.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=93a360bdc45a7fc2b8e172fdae55b86e
diff --git a/metadata/md5-cache/app-emacs/blogmax-20170321 b/metadata/md5-cache/app-emacs/blogmax-20170321
index d74ac6090d1e..64ce338b0e28 100644
--- a/metadata/md5-cache/app-emacs/blogmax-20170321
+++ b/metadata/md5-cache/app-emacs/blogmax-20170321
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/blogmax-20170321.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=171de8a465e5289d045eeb8fe7048cf0
diff --git a/metadata/md5-cache/app-emacs/bm-1.32_p20140214 b/metadata/md5-cache/app-emacs/bm-1.32_p20140214
index 2aff79a5471d..3ac3cb3e035e 100644
--- a/metadata/md5-cache/app-emacs/bm-1.32_p20140214
+++ b/metadata/md5-cache/app-emacs/bm-1.32_p20140214
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/bm-1.32_p20140214.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=39cfb1c5c731e0ea351657989a4e4737
diff --git a/metadata/md5-cache/app-emacs/bongo-1.1 b/metadata/md5-cache/app-emacs/bongo-1.1
index 8319f2d1498c..c90bf14756ed 100644
--- a/metadata/md5-cache/app-emacs/bongo-1.1
+++ b/metadata/md5-cache/app-emacs/bongo-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=app-emacs/volume >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/dbrock/bongo/archive/1.1.tar.gz -> bongo-1.1.tar.gz mplayer? ( mirror://gentoo/bongo-mplayer-20070204.tar.bz2 )
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=71c654d9d1d75d8b68daa86b08e67684
diff --git a/metadata/md5-cache/app-emacs/boxquote-1.23 b/metadata/md5-cache/app-emacs/boxquote-1.23
index 7048d656f5f6..69ba39199140 100644
--- a/metadata/md5-cache/app-emacs/boxquote-1.23
+++ b/metadata/md5-cache/app-emacs/boxquote-1.23
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/boxquote-1.23.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=5685256c9b4473f8248fa8c83a380f38
diff --git a/metadata/md5-cache/app-emacs/boxquote-2.1 b/metadata/md5-cache/app-emacs/boxquote-2.1
index 54661ff56d67..ea976cf45bbf 100644
--- a/metadata/md5-cache/app-emacs/boxquote-2.1
+++ b/metadata/md5-cache/app-emacs/boxquote-2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/davep/boxquote.el/archive/v2.1.tar.gz -> boxquote-2.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=3a0f6eb409d8a6c708f0e225e1aa525b
diff --git a/metadata/md5-cache/app-emacs/browse-kill-ring-1.3c b/metadata/md5-cache/app-emacs/browse-kill-ring-1.3c
index 94ba66df427f..1e5f63de6208 100644
--- a/metadata/md5-cache/app-emacs/browse-kill-ring-1.3c
+++ b/metadata/md5-cache/app-emacs/browse-kill-ring-1.3c
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/browse-kill-ring-1.3c.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=217c8dd94c2f1d2549821ac5f889acbd
diff --git a/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0 b/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
index e55073e9ae23..7d5a94c472dc 100644
--- a/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
+++ b/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/browse-kill-ring/browse-kill-ring/archive/2.0.0.tar.gz -> browse-kill-ring-2.0.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=e8cce377e266a6ecc29a5ea15aa18920
diff --git a/metadata/md5-cache/app-emacs/bubblet-0.74-r1 b/metadata/md5-cache/app-emacs/bubblet-0.74-r1
index c5fafdb2406a..60bf55380a60 100644
--- a/metadata/md5-cache/app-emacs/bubblet-0.74-r1
+++ b/metadata/md5-cache/app-emacs/bubblet-0.74-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/bubblet-0.74.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=9d7df46d5874f4b531cd6b46ff4fc67f
diff --git a/metadata/md5-cache/app-emacs/buffer-extension-0.1 b/metadata/md5-cache/app-emacs/buffer-extension-0.1
index 69fbf05e4e30..8d3d39810060 100644
--- a/metadata/md5-cache/app-emacs/buffer-extension-0.1
+++ b/metadata/md5-cache/app-emacs/buffer-extension-0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/basic-toolkit >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/buffer-extension-0.1.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=1125e52ab92d346c6b0d7d932387d58b
diff --git a/metadata/md5-cache/app-emacs/calfw-1.3 b/metadata/md5-cache/app-emacs/calfw-1.3
index 54718030c9c5..46ae3b3bbe25 100644
--- a/metadata/md5-cache/app-emacs/calfw-1.3
+++ b/metadata/md5-cache/app-emacs/calfw-1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=howm? ( app-emacs/howm ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/kiwanami/emacs-calfw/tarball/v1.3 -> calfw-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=807579a59bc02455c0ad316b0470bad0
diff --git a/metadata/md5-cache/app-emacs/calfw-1.6 b/metadata/md5-cache/app-emacs/calfw-1.6
index 585678d4972e..9b7e31668cb5 100644
--- a/metadata/md5-cache/app-emacs/calfw-1.6
+++ b/metadata/md5-cache/app-emacs/calfw-1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=howm? ( app-emacs/howm ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/kiwanami/emacs-calfw/archive/v1.6.tar.gz -> calfw-1.6.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=39c928de96cdb0ec10e4c0aa9b786aa2
diff --git a/metadata/md5-cache/app-emacs/chess-2.0.4 b/metadata/md5-cache/app-emacs/chess-2.0.4
index 6492c355119c..f4bf1906d7e7 100644
--- a/metadata/md5-cache/app-emacs/chess-2.0.4
+++ b/metadata/md5-cache/app-emacs/chess-2.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=|| ( games-board/stockfish games-board/fruit games-board/gnuchess games-board/phalanx games-board/sjeng games-board/crafty ) >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/chess-2.0.4.tar.xz mirror://gentoo/emacs-chess-sounds-2.0.tar.bz2 mirror://gentoo/emacs-chess-pieces-2.0.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=2194ac6c05f7510540879af6ef8162af
diff --git a/metadata/md5-cache/app-emacs/circe-1.3 b/metadata/md5-cache/app-emacs/circe-1.3
index f670f0adfffe..30ae93a6d8b4 100644
--- a/metadata/md5-cache/app-emacs/circe-1.3
+++ b/metadata/md5-cache/app-emacs/circe-1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/circe/archive/circe-1.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=e53068bd0c5540275cec98e010046420
diff --git a/metadata/md5-cache/app-emacs/circe-2.11 b/metadata/md5-cache/app-emacs/circe-2.11
new file mode 100644
index 000000000000..e6fc082ce939
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/circe-2.11
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-24
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=A great IRC client for Emacs
+EAPI=7
+HOMEPAGE=https://github.com/jorgenschaefer/circe https://www.emacswiki.org/emacs/Circe
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-24
+SLOT=0
+SRC_URI=https://github.com/jorgenschaefer/circe/archive/v2.11.tar.gz -> circe-2.11.tar.gz
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=de85da218c8d06149de9eb89af4cb03f
diff --git a/metadata/md5-cache/app-emacs/circe-2.7 b/metadata/md5-cache/app-emacs/circe-2.7
index 4c54cdc5c831..ed99bd5944f0 100644
--- a/metadata/md5-cache/app-emacs/circe-2.7
+++ b/metadata/md5-cache/app-emacs/circe-2.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/circe/archive/v2.7.tar.gz -> circe-2.7.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=622a1229176cfeb5e2ba5ce0c3339a14
diff --git a/metadata/md5-cache/app-emacs/cldoc-1.16 b/metadata/md5-cache/app-emacs/cldoc-1.16
index 93103d727b02..fea833685871 100644
--- a/metadata/md5-cache/app-emacs/cldoc-1.16
+++ b/metadata/md5-cache/app-emacs/cldoc-1.16
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/slime >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/cldoc-1.16.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=5649f4938b9311309d03cd39327db3fa
diff --git a/metadata/md5-cache/app-emacs/color-browser-0.3-r1 b/metadata/md5-cache/app-emacs/color-browser-0.3-r1
index 75a251e274c8..3a2315bf5b4a 100644
--- a/metadata/md5-cache/app-emacs/color-browser-0.3-r1
+++ b/metadata/md5-cache/app-emacs/color-browser-0.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/color-theme >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/color-browser-0.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=84f683ae4d80a8f1c9b7806d08654798
diff --git a/metadata/md5-cache/app-emacs/color-moccur-2.73 b/metadata/md5-cache/app-emacs/color-moccur-2.73
index 2a7c9e73f6a1..6cd155a93388 100644
--- a/metadata/md5-cache/app-emacs/color-moccur-2.73
+++ b/metadata/md5-cache/app-emacs/color-moccur-2.73
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/color-moccur-2.73.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=88523ed9159a2dd28b347df8139b690c
diff --git a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r1 b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r1
index 986113b28d48..8cabe11961eb 100644
--- a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r1
+++ b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/color-theme/color-theme-6.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1f178526650674e4162eefcbf31c3bd1
diff --git a/metadata/md5-cache/app-emacs/company-mode-0.6.14 b/metadata/md5-cache/app-emacs/company-mode-0.6.14
index b2198c41b842..835a1ea5ff22 100644
--- a/metadata/md5-cache/app-emacs/company-mode-0.6.14
+++ b/metadata/md5-cache/app-emacs/company-mode-0.6.14
@@ -10,5 +10,5 @@ RDEPEND=ropemacs? ( app-emacs/pymacs ) ropemacs? ( dev-python/ropemacs ) >=virtu
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-mode/archive/0.6.14.tar.gz -> company-mode-0.6.14.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=67897dab04be20a955654811f546d4a3
diff --git a/metadata/md5-cache/app-emacs/company-mode-0.7 b/metadata/md5-cache/app-emacs/company-mode-0.7
index 5d607b6bb746..144a19188be9 100644
--- a/metadata/md5-cache/app-emacs/company-mode-0.7
+++ b/metadata/md5-cache/app-emacs/company-mode-0.7
@@ -10,5 +10,5 @@ RDEPEND=ropemacs? ( app-emacs/pymacs ) ropemacs? ( dev-python/ropemacs ) >=virtu
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-mode/archive/0.7.tar.gz -> company-mode-0.7.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=67897dab04be20a955654811f546d4a3
diff --git a/metadata/md5-cache/app-emacs/crontab-mode-1.20 b/metadata/md5-cache/app-emacs/crontab-mode-1.20
index cc201357b8e3..067c4f9c1b05 100644
--- a/metadata/md5-cache/app-emacs/crontab-mode-1.20
+++ b/metadata/md5-cache/app-emacs/crontab-mode-1.20
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/crontab-mode-1.20.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=20eed63c32d49e35eff076b103006f65
diff --git a/metadata/md5-cache/app-emacs/crypt++-2.92 b/metadata/md5-cache/app-emacs/crypt++-2.92
index c6d869beb07a..998e34ded950 100644
--- a/metadata/md5-cache/app-emacs/crypt++-2.92
+++ b/metadata/md5-cache/app-emacs/crypt++-2.92
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/crypt++el/crypt++el_2.92.orig.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=4aed8484b69e882ca00d5dea4bd9a32f
diff --git a/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430 b/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
index d8c0c819fe8f..5316f039d976 100644
--- a/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
+++ b/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/crypt++-2.94_pre20080430.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=f58e55ff624a1d04965eea2ef384ec98
diff --git a/metadata/md5-cache/app-emacs/csharp-mode-0.7.0-r1 b/metadata/md5-cache/app-emacs/csharp-mode-0.7.0-r1
index 1f2a67296571..e8bee2f60f3f 100644
--- a/metadata/md5-cache/app-emacs/csharp-mode-0.7.0-r1
+++ b/metadata/md5-cache/app-emacs/csharp-mode-0.7.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://mfgames.com/releases/csharp-mode/csharp-mode-0.7.0.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=9ba3dd4c977e2bc9859b7af896b5c651
diff --git a/metadata/md5-cache/app-emacs/csharp-mode-0.9.0 b/metadata/md5-cache/app-emacs/csharp-mode-0.9.0
index 2715dce140cd..a4898abcab4a 100644
--- a/metadata/md5-cache/app-emacs/csharp-mode-0.9.0
+++ b/metadata/md5-cache/app-emacs/csharp-mode-0.9.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/josteink/csharp-mode/archive/v0.9.0.tar.gz -> csharp-mode-0.9.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=6866f35edbe30391a54f6474bd9c79ed
diff --git a/metadata/md5-cache/app-emacs/css-mode-0.11-r1 b/metadata/md5-cache/app-emacs/css-mode-0.11-r1
index 2a06fcd3a5e0..ff15c3b7f3fe 100644
--- a/metadata/md5-cache/app-emacs/css-mode-0.11-r1
+++ b/metadata/md5-cache/app-emacs/css-mode-0.11-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/css-mode-0.11.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=f7443342a076810d5d14663373a0bae1
diff --git a/metadata/md5-cache/app-emacs/csv-mode-1.50 b/metadata/md5-cache/app-emacs/csv-mode-1.50
index fc37351af217..57317c88af99 100644
--- a/metadata/md5-cache/app-emacs/csv-mode-1.50
+++ b/metadata/md5-cache/app-emacs/csv-mode-1.50
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/csv-mode-1.50.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=7389fadcab84aae669fa7a7694f5cd0e
diff --git a/metadata/md5-cache/app-emacs/cycle-buffer-2.16 b/metadata/md5-cache/app-emacs/cycle-buffer-2.16
index 207244258b51..5b31b0a567bf 100644
--- a/metadata/md5-cache/app-emacs/cycle-buffer-2.16
+++ b/metadata/md5-cache/app-emacs/cycle-buffer-2.16
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/cycle-buffer-2.16.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=4be7ed4e297b2ed839d87a67103beca2
diff --git a/metadata/md5-cache/app-emacs/d-mode-2.0.6 b/metadata/md5-cache/app-emacs/d-mode-2.0.6
index 8b2a1ee63ce7..20a218bdabfe 100644
--- a/metadata/md5-cache/app-emacs/d-mode-2.0.6
+++ b/metadata/md5-cache/app-emacs/d-mode-2.0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/2.0.6.tar.gz -> d-mode-2.0.6.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=6f6ea9e0f8d0f499f9b6e42023b4f3cc
diff --git a/metadata/md5-cache/app-emacs/dash-2.13.0 b/metadata/md5-cache/app-emacs/dash-2.13.0
index 2d5e05982c4e..6ef998407a01 100644
--- a/metadata/md5-cache/app-emacs/dash-2.13.0
+++ b/metadata/md5-cache/app-emacs/dash-2.13.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.13.0.tar.gz -> dash-2.13.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=ec6f430e0dbf9ddd86bd15258dc71305
diff --git a/metadata/md5-cache/app-emacs/dash-2.14.1 b/metadata/md5-cache/app-emacs/dash-2.14.1
index e04418f2eb50..96c5a135aa56 100644
--- a/metadata/md5-cache/app-emacs/dash-2.14.1
+++ b/metadata/md5-cache/app-emacs/dash-2.14.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.14.1.tar.gz -> dash-2.14.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=f775e581389901d9e3137fc4b9c9a1ba
diff --git a/metadata/md5-cache/app-emacs/dash-2.16.0 b/metadata/md5-cache/app-emacs/dash-2.16.0
index 074370d52b22..5672aebf828b 100644
--- a/metadata/md5-cache/app-emacs/dash-2.16.0
+++ b/metadata/md5-cache/app-emacs/dash-2.16.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.16.0.tar.gz -> dash-2.16.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=69aeb093d65c20c8e077f327fdab45af
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.2 b/metadata/md5-cache/app-emacs/ddskk-16.2
index 1e39412f2c6f..5e0aec02ec1a 100644
--- a/metadata/md5-cache/app-emacs/ddskk-16.2
+++ b/metadata/md5-cache/app-emacs/ddskk-16.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) >=virtual/emacs-24
 SLOT=0
 SRC_URI=http://openlab.ring.gr.jp/skk/maintrunk/ddskk-16.2.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37
 _md5_=54eca1b48341505e20fe20f3250219e0
diff --git a/metadata/md5-cache/app-emacs/desktop+-0.2 b/metadata/md5-cache/app-emacs/desktop+-0.2
index 1ed758ada1b8..7634af4fefb3 100644
--- a/metadata/md5-cache/app-emacs/desktop+-0.2
+++ b/metadata/md5-cache/app-emacs/desktop+-0.2
@@ -9,5 +9,5 @@ RDEPEND=app-emacs/dash app-emacs/f >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ffevotte/desktop-plus/archive/v0.2.tar.gz -> desktop+-0.2.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=a5c7a45fc1dfda3ece1bc0cd4fdd77ba
diff --git a/metadata/md5-cache/app-emacs/develock-0.45 b/metadata/md5-cache/app-emacs/develock-0.45
index 2e0aa35e28fd..1936535db9a7 100644
--- a/metadata/md5-cache/app-emacs/develock-0.45
+++ b/metadata/md5-cache/app-emacs/develock-0.45
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/develock-0.45.el.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=fa3d1f5bdb01fed056e6718980ce8ff2
diff --git a/metadata/md5-cache/app-emacs/df-mode-20050509-r1 b/metadata/md5-cache/app-emacs/df-mode-20050509-r1
index b475f99164c3..b43fe19533b7 100644
--- a/metadata/md5-cache/app-emacs/df-mode-20050509-r1
+++ b/metadata/md5-cache/app-emacs/df-mode-20050509-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/df-mode-20050509.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=9d0cfa22df387422eb3c3b3c23065f41
diff --git a/metadata/md5-cache/app-emacs/dictionary-1.10 b/metadata/md5-cache/app-emacs/dictionary-1.10
index 67ef22fcc00c..c6a825adcf8c 100644
--- a/metadata/md5-cache/app-emacs/dictionary-1.10
+++ b/metadata/md5-cache/app-emacs/dictionary-1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.myrkr.in-berlin.de/dictionary/dictionary-1.10.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=654aab74f3e37cd0b430041f780f3458
diff --git a/metadata/md5-cache/app-emacs/dircolors-1.0-r2 b/metadata/md5-cache/app-emacs/dircolors-1.0-r2
index 4e4533a4fec5..dd408284da12 100644
--- a/metadata/md5-cache/app-emacs/dircolors-1.0-r2
+++ b/metadata/md5-cache/app-emacs/dircolors-1.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/dircolors-1.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=2de18fcb85da42b9fb3efca31f87f378
diff --git a/metadata/md5-cache/app-emacs/dired-sort-menu-1.26 b/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
index 6c33edbdf2a8..bb32c3335020 100644
--- a/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
+++ b/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/dired-sort-menu-1.26.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=d253ae322ac667913331ea69c50b19aa
diff --git a/metadata/md5-cache/app-emacs/distel-4.0.6 b/metadata/md5-cache/app-emacs/distel-4.0.6
index 9072feaca0f3..aa24d24b93fa 100644
--- a/metadata/md5-cache/app-emacs/distel-4.0.6
+++ b/metadata/md5-cache/app-emacs/distel-4.0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/erlang-11.2.5[emacs] >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/massemanet/distel/archive/4.0.6.tar.gz -> distel-4.0.6.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=6913ad83c31042a7cf02fd581afd91c9
diff --git a/metadata/md5-cache/app-emacs/distel-4.1.1 b/metadata/md5-cache/app-emacs/distel-4.1.1
index 2da2ece7965b..bd3f4eee7872 100644
--- a/metadata/md5-cache/app-emacs/distel-4.1.1
+++ b/metadata/md5-cache/app-emacs/distel-4.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD MIT
 RDEPEND=>=dev-lang/erlang-11.2.5[emacs] >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/massemanet/distel/archive/4.1.1.tar.gz -> distel-4.1.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=8bbad2669cec464d5be5b9ed3114bc73
diff --git a/metadata/md5-cache/app-emacs/doctest-mode-0.4 b/metadata/md5-cache/app-emacs/doctest-mode-0.4
index 6b48ef8287be..e5a73c809cc0 100644
--- a/metadata/md5-cache/app-emacs/doctest-mode-0.4
+++ b/metadata/md5-cache/app-emacs/doctest-mode-0.4
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=!<app-emacs/python-mode-5.1.0 >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://python-mode.svn.sourceforge.net/viewvc/*checkout*/python-mode/trunk/python-mode/doctest-mode.el?revision=460 -> doctest-mode.el
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=ff9e441c0e2d9b64c687b19e39554b79
diff --git a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3 b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
index 31c44aaa9844..b9f0375f2ffa 100644
--- a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
+++ b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libxml2-2.6.13 >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/doxymacs/doxymacs-1.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5a343760d9dc6d77e002778fda24e094
diff --git a/metadata/md5-cache/app-emacs/dropdown-list-20120329 b/metadata/md5-cache/app-emacs/dropdown-list-20120329
index fe46ad261c5a..d9f0aa10df05 100644
--- a/metadata/md5-cache/app-emacs/dropdown-list-20120329
+++ b/metadata/md5-cache/app-emacs/dropdown-list-20120329
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/dropdown-list-20120329.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=0402d6ca62dc7d6393838b65203682bb
diff --git a/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20141014 b/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20141014
index 281e1c225a6a..740fa63bd36f 100644
--- a/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20141014
+++ b/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20141014
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/dts-mode-0.1.0_pre20141014.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=85b972ed67c33605e4b244ebb3371317
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.46 b/metadata/md5-cache/app-emacs/ebuild-mode-1.46
index b80da03b5624..b6541f11ec65 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.46
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.46
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.46.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=aea09ca73e7b70d3e0c84b3aefa0bd54
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.47 b/metadata/md5-cache/app-emacs/ebuild-mode-1.47
index 7d945f1ec77d..36a9d5131b86 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.47
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.47
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.47.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=9a0d8ebb7868dba1079b3782cdcbf268
diff --git a/metadata/md5-cache/app-emacs/ecb-2.41_pre20140215-r1 b/metadata/md5-cache/app-emacs/ecb-2.41_pre20140215-r1
index 1cb611bc0a52..e2aecda9acd9 100644
--- a/metadata/md5-cache/app-emacs/ecb-2.41_pre20140215-r1
+++ b/metadata/md5-cache/app-emacs/ecb-2.41_pre20140215-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=!!<app-emacs/cedet-2.0 java? ( app-emacs/jde ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ecb-2.41_pre20140215.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=abe352e66741b4c385c2c8c751a849cd
diff --git a/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728 b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
index fea02cfd127a..f7e981659556 100644
--- a/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
+++ b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=java? ( app-emacs/jde ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ecb-2.50_pre20170728.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=b1043286115f9c52bc14b28009a706a8
diff --git a/metadata/md5-cache/app-emacs/edb-1.31 b/metadata/md5-cache/app-emacs/edb-1.31
index ce11a026c261..a2b1511d1864 100644
--- a/metadata/md5-cache/app-emacs/edb-1.31
+++ b/metadata/md5-cache/app-emacs/edb-1.31
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.gnuvola.org/software/edb/edb-1.31.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=3cbae0835a6c0f2d3c5132285b4fac23
diff --git a/metadata/md5-cache/app-emacs/edb-1.32 b/metadata/md5-cache/app-emacs/edb-1.32
index 98d2beb26a33..f2bc36bf0571 100644
--- a/metadata/md5-cache/app-emacs/edb-1.32
+++ b/metadata/md5-cache/app-emacs/edb-1.32
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.gnuvola.org/software/edb/edb-1.32.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=5685dde303cd36eb202869f846564224
diff --git a/metadata/md5-cache/app-emacs/edit-list-0.3 b/metadata/md5-cache/app-emacs/edit-list-0.3
index c02ed39a2166..e89fc8faaaa0 100644
--- a/metadata/md5-cache/app-emacs/edit-list-0.3
+++ b/metadata/md5-cache/app-emacs/edit-list-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/edit-list-0.3.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=5d539a6ee458ce78acfc32033f419aba
diff --git a/metadata/md5-cache/app-emacs/edit-server-1.15 b/metadata/md5-cache/app-emacs/edit-server-1.15
index 9237ac8ada08..708dfe9c2eec 100644
--- a/metadata/md5-cache/app-emacs/edit-server-1.15
+++ b/metadata/md5-cache/app-emacs/edit-server-1.15
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/stsquad/emacs_chrome/archive/v1.15.tar.gz -> emacs_chrome-1.15.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=c4ba721291f40f8820688ec4f7d711c4
diff --git a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1 b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
index 3e721a5f5121..5ccf533a22ac 100644
--- a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
+++ b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.7.8.tar.gz -> editorconfig-emacs-0.7.8.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=ab4acc1125badd8a54276903d4f6b1a4
diff --git a/metadata/md5-cache/app-emacs/elib-1.0-r1 b/metadata/md5-cache/app-emacs/elib-1.0-r1
index 6b6fd74306f8..c3bfa3b536a1 100644
--- a/metadata/md5-cache/app-emacs/elib-1.0-r1
+++ b/metadata/md5-cache/app-emacs/elib-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://jdee.sunsite.dk/elib-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ee149b06afa1d9783e88a157d730cccb
diff --git a/metadata/md5-cache/app-emacs/elscreen-1.4.6-r1 b/metadata/md5-cache/app-emacs/elscreen-1.4.6-r1
index f4abe1865954..aa065d908fc1 100644
--- a/metadata/md5-cache/app-emacs/elscreen-1.4.6-r1
+++ b/metadata/md5-cache/app-emacs/elscreen-1.4.6-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-emacs/apel-10.8-r1 >=virtual/emacs-23
 SLOT=0
 SRC_URI=ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/elscreen-1.4.6.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=092911457242e00291bd3dae970ee3bd
diff --git a/metadata/md5-cache/app-emacs/elscreen-20180321 b/metadata/md5-cache/app-emacs/elscreen-20180321
index c23e3fef1181..b420feae67db 100644
--- a/metadata/md5-cache/app-emacs/elscreen-20180321
+++ b/metadata/md5-cache/app-emacs/elscreen-20180321
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=wanderlust? ( app-emacs/wanderlust ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/knu/elscreen/archive/20180321.tar.gz -> elscreen-20180321.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=6c74efa88945c09264057a8ce6acc1f4
diff --git a/metadata/md5-cache/app-emacs/emacs-daemon-0.22 b/metadata/md5-cache/app-emacs/emacs-daemon-0.22
index b091c18faba2..edca9f841928 100644
--- a/metadata/md5-cache/app-emacs/emacs-daemon-0.22
+++ b/metadata/md5-cache/app-emacs/emacs-daemon-0.22
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23 >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-daemon-0.22.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=2f82ffa99ce2064372db7516804a488f
diff --git a/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92 b/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
index ba658afbcfa7..b36ee358855b 100644
--- a/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
+++ b/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/hexrgb >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-jabber/emacs-jabber-0.8.92.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=245c6dc4f9563e577abbe8fa01a8d4e9
diff --git a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518 b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518
index ca9fbaaba4dc..388e19a81a88 100644
--- a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518
+++ b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/w3m >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.625_pre20180518.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=75b43078b19c6756e51110852963886d
diff --git a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112 b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
index 828f85eb079f..ec1d361d56a9 100644
--- a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
+++ b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/w3m >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.632_pre20181112.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=bb29eb789e50daec73b475684b35cdbb
diff --git a/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1 b/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
index 8f263f3e58e8..cf1c98484f85 100644
--- a/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
+++ b/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=net-misc/wget-1.8.2 >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/emacs-wget-0.5.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=e533c6f8a6d782fba5620aabf31a5c3f
diff --git a/metadata/md5-cache/app-emacs/emhacks-20070920-r1 b/metadata/md5-cache/app-emacs/emhacks-20070920-r1
index 48c6f665cf7d..cedb1f824178 100644
--- a/metadata/md5-cache/app-emacs/emhacks-20070920-r1
+++ b/metadata/md5-cache/app-emacs/emhacks-20070920-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emhacks-20070920.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=2865aeb84bbd72d2a7ca214d2e7fd99c
diff --git a/metadata/md5-cache/app-emacs/emms-3.0-r1 b/metadata/md5-cache/app-emacs/emms-3.0-r1
index edf1ede139cd..e0ade6b9f294 100644
--- a/metadata/md5-cache/app-emacs/emms-3.0-r1
+++ b/metadata/md5-cache/app-emacs/emms-3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://www.gnu.org/software/emms/download/emms-3.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=0ebaba582add43d378c974bc1e74d2d4
diff --git a/metadata/md5-cache/app-emacs/emms-4.1 b/metadata/md5-cache/app-emacs/emms-4.1
index 929c887d1d47..47beb8153e92 100644
--- a/metadata/md5-cache/app-emacs/emms-4.1
+++ b/metadata/md5-cache/app-emacs/emms-4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-4.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=e609db7ea9023fbbaa8be7a10968a5b6
diff --git a/metadata/md5-cache/app-emacs/emms-4.3 b/metadata/md5-cache/app-emacs/emms-4.3
index 89493fca785a..8402d12f2659 100644
--- a/metadata/md5-cache/app-emacs/emms-4.3
+++ b/metadata/md5-cache/app-emacs/emms-4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-4.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=54092665f9aa757d6ebcc23c74c88c5d
diff --git a/metadata/md5-cache/app-emacs/emms-4.4 b/metadata/md5-cache/app-emacs/emms-4.4
index 2e23c0b2295f..bd32226b6dad 100644
--- a/metadata/md5-cache/app-emacs/emms-4.4
+++ b/metadata/md5-cache/app-emacs/emms-4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-4.4.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=54092665f9aa757d6ebcc23c74c88c5d
diff --git a/metadata/md5-cache/app-emacs/erobot-2.1.0-r1 b/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
index f4f0c872041e..9c41ec1ed838 100644
--- a/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
+++ b/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/erobot-2.1.0.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=bd274dd6ad0e51c0cb0e24f9bc36b80c
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.14 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.14
index 52188dffcb1d..05ec9e32e11b 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.14
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.14.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=50315360392b848200488e08dda2786a
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.15 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.15
index 3d9a96c936ab..58b7a544c120 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.15
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.15.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=a0e2f8c2c900a15d68eeccb41818f323
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-9999 b/metadata/md5-cache/app-emacs/eselect-mode-9999
index 11f0e4adf285..23a3f1712d19 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-9999
+++ b/metadata/md5-cache/app-emacs/eselect-mode-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=>=virtual/emacs-23
 SLOT=0
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	562b380fc59ae6a8622171d0acb777d1
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	git-r3	562b380fc59ae6a8622171d0acb777d1
 _md5_=56b653dc070aca53252610b5c684f5fa
diff --git a/metadata/md5-cache/app-emacs/ess-17.11 b/metadata/md5-cache/app-emacs/ess-17.11
index 76c50fe3e70d..2f7ae0a1040e 100644
--- a/metadata/md5-cache/app-emacs/ess-17.11
+++ b/metadata/md5-cache/app-emacs/ess-17.11
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-17.11.tgz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=90a00ed9d667eb27c9683562aec0fbbf
diff --git a/metadata/md5-cache/app-emacs/ess-18.10.2-r1 b/metadata/md5-cache/app-emacs/ess-18.10.2-r1
index 316d16075c4e..51d4b8cb0e0d 100644
--- a/metadata/md5-cache/app-emacs/ess-18.10.2-r1
+++ b/metadata/md5-cache/app-emacs/ess-18.10.2-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-18.10.2.tgz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=8a4efa3f0119154d9bdb99117a01e91b
diff --git a/metadata/md5-cache/app-emacs/evil-1.0.8 b/metadata/md5-cache/app-emacs/evil-1.0.8
index 76a083095a58..c77b9ed2489b 100644
--- a/metadata/md5-cache/app-emacs/evil-1.0.8
+++ b/metadata/md5-cache/app-emacs/evil-1.0.8
@@ -9,5 +9,5 @@ RDEPEND=>=app-emacs/undo-tree-0.6.3 >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/evil-1.0.8.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=93f1a7384a166e5a1c1a795131e7520e
diff --git a/metadata/md5-cache/app-emacs/evil-1.2.13 b/metadata/md5-cache/app-emacs/evil-1.2.13
index d13ed738fb80..bc944f37b5a4 100644
--- a/metadata/md5-cache/app-emacs/evil-1.2.13
+++ b/metadata/md5-cache/app-emacs/evil-1.2.13
@@ -9,5 +9,5 @@ RDEPEND=>=app-emacs/undo-tree-0.6.3 >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-evil/evil/archive/1.2.13.tar.gz -> evil-1.2.13.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=cf4fe8499d75f5ee43402a425835058f
diff --git a/metadata/md5-cache/app-emacs/evil-1.2.14 b/metadata/md5-cache/app-emacs/evil-1.2.14
index eb7a85e8aed7..779521e05eef 100644
--- a/metadata/md5-cache/app-emacs/evil-1.2.14
+++ b/metadata/md5-cache/app-emacs/evil-1.2.14
@@ -9,5 +9,5 @@ RDEPEND=>=app-emacs/undo-tree-0.6.3 >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-evil/evil/archive/1.2.14.tar.gz -> evil-1.2.14.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=3c29f2eba7e6e408dcd99d800da5b9ca
diff --git a/metadata/md5-cache/app-emacs/expand-region-0.11.0 b/metadata/md5-cache/app-emacs/expand-region-0.11.0
index 657aee799538..1e275947d47e 100644
--- a/metadata/md5-cache/app-emacs/expand-region-0.11.0
+++ b/metadata/md5-cache/app-emacs/expand-region-0.11.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/magnars/expand-region.el/archive/0.11.0.tar.gz -> expand-region-0.11.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=f202b3e8272591c85d33aeb45faf7bb1
diff --git a/metadata/md5-cache/app-emacs/f-0.18.2 b/metadata/md5-cache/app-emacs/f-0.18.2
index af4b81eac6ef..3bb6ef81a630 100644
--- a/metadata/md5-cache/app-emacs/f-0.18.2
+++ b/metadata/md5-cache/app-emacs/f-0.18.2
@@ -9,5 +9,5 @@ RDEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.18.2.tar.gz -> f-0.18.2.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=7a9da92b807a341d6ba095067abdb864
diff --git a/metadata/md5-cache/app-emacs/f-0.19.0 b/metadata/md5-cache/app-emacs/f-0.19.0
index 1362ea48c7e7..f45e62e387a0 100644
--- a/metadata/md5-cache/app-emacs/f-0.19.0
+++ b/metadata/md5-cache/app-emacs/f-0.19.0
@@ -9,5 +9,5 @@ RDEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.19.0.tar.gz -> f-0.19.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=a82585d652930b74b5bbb53c08fdb962
diff --git a/metadata/md5-cache/app-emacs/f-0.20.0 b/metadata/md5-cache/app-emacs/f-0.20.0
index 4df9a9295cc5..b31e293cf405 100644
--- a/metadata/md5-cache/app-emacs/f-0.20.0
+++ b/metadata/md5-cache/app-emacs/f-0.20.0
@@ -9,5 +9,5 @@ RDEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.20.0.tar.gz -> f-0.20.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=b9c7ed8db5119f0fddfe9464e523e19f
diff --git a/metadata/md5-cache/app-emacs/fff-20050517 b/metadata/md5-cache/app-emacs/fff-20050517
index baa6fdb20396..a4f90c6d1ba8 100644
--- a/metadata/md5-cache/app-emacs/fff-20050517
+++ b/metadata/md5-cache/app-emacs/fff-20050517
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-apps/mlocate >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/fff-20050517.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=12b1675b84a5227ea8320a27133f2636
diff --git a/metadata/md5-cache/app-emacs/filladapt-2.12-r1 b/metadata/md5-cache/app-emacs/filladapt-2.12-r1
index c508a2de7aab..6ddb8e9c6c07 100644
--- a/metadata/md5-cache/app-emacs/filladapt-2.12-r1
+++ b/metadata/md5-cache/app-emacs/filladapt-2.12-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/filladapt-2.12.el.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3e584814ec6d6ce5d55baa51e8c0d862
diff --git a/metadata/md5-cache/app-emacs/flashcard-2.3.3 b/metadata/md5-cache/app-emacs/flashcard-2.3.3
index b1ee9b32d1b6..299d9eb5804f 100644
--- a/metadata/md5-cache/app-emacs/flashcard-2.3.3
+++ b/metadata/md5-cache/app-emacs/flashcard-2.3.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/flashcard-2.3.3.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=cf43d3d1026844c736a52a42505b7d97
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9-r2 b/metadata/md5-cache/app-emacs/flim-1.14.9-r2
index 59cb1355afe5..4320d7d21cfe 100644
--- a/metadata/md5-cache/app-emacs/flim-1.14.9-r2
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.3 !app-emacs/limit >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://git.chise.org/elisp/dist/flim/flim-1.14/flim-1.14.9.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=9b3835a95753d7271eb65319fd74a24f
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526 b/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
index e58d5a701fc3..2464c5532146 100644
--- a/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 !app-emacs/limit >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/wanderlust/flim/archive/e4bd54fd7d335215b54f7ef27ed974c8cd68d472.tar.gz -> flim-1.14.9_p20190526.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=afa62858b3f7815c7b8e2e11b83c3512
diff --git a/metadata/md5-cache/app-emacs/folding-2012.0226.1623 b/metadata/md5-cache/app-emacs/folding-2012.0226.1623
index 28429b81e869..5eed3093e687 100644
--- a/metadata/md5-cache/app-emacs/folding-2012.0226.1623
+++ b/metadata/md5-cache/app-emacs/folding-2012.0226.1623
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/folding-2012.0226.1623.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=3693122b6b300e800bd0c8755df59d70
diff --git a/metadata/md5-cache/app-emacs/folding-2013.0613.1821 b/metadata/md5-cache/app-emacs/folding-2013.0613.1821
index cf749585c550..ad5072594d67 100644
--- a/metadata/md5-cache/app-emacs/folding-2013.0613.1821
+++ b/metadata/md5-cache/app-emacs/folding-2013.0613.1821
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/folding-2013.0613.1821.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=7335d31607b34621f3b5ef9915f2a43c
diff --git a/metadata/md5-cache/app-emacs/ghub-2.0.0 b/metadata/md5-cache/app-emacs/ghub-2.0.0
index e322b02ddcf2..54fee90041b6 100644
--- a/metadata/md5-cache/app-emacs/ghub-2.0.0
+++ b/metadata/md5-cache/app-emacs/ghub-2.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-25
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v2.0.0.tar.gz -> ghub-2.0.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=8568f9c9a6a1f2b8b96039ccbe68f290
diff --git a/metadata/md5-cache/app-emacs/ghub-2.0.1 b/metadata/md5-cache/app-emacs/ghub-2.0.1
index 7acf8c8033f9..3b907a9ea16f 100644
--- a/metadata/md5-cache/app-emacs/ghub-2.0.1
+++ b/metadata/md5-cache/app-emacs/ghub-2.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-25
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v2.0.1.tar.gz -> ghub-2.0.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=dcf8dbc5739909598d59416156485890
diff --git a/metadata/md5-cache/app-emacs/ghub-3.0.0 b/metadata/md5-cache/app-emacs/ghub-3.0.0
index 5e819c47e7d6..8a070628fef9 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.0.0
+++ b/metadata/md5-cache/app-emacs/ghub-3.0.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/graphql-0.1.1 >=app-emacs/treepy-0.0.1 >=virtual/emacs-25
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.0.0.tar.gz -> ghub-3.0.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=58eb719711c4867332a04700f2029a56
diff --git a/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0 b/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
index 351b24ceacf1..70e26775d4a3 100644
--- a/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
+++ b/metadata/md5-cache/app-emacs/gnuplot-mode-0.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=sci-visualization/gnuplot[-emacs(-)] >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/bruceravel/gnuplot-mode/archive/0.7.0.tar.gz -> gnuplot-mode-0.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2190ff50741af619a6fb4892a293dd93
diff --git a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r4 b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r4
index 645a6fd3cda8..3ce7401a7ba8 100644
--- a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r4
+++ b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-eselect/eselect-emacs-1.15 X? ( x11-libs/libXau ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://meltin.net/hacks/emacs/src/gnuserv-3.12.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b278294180524d8d7f52ed42e664960
diff --git a/metadata/md5-cache/app-emacs/go-mode-1.4.0 b/metadata/md5-cache/app-emacs/go-mode-1.4.0
index 6a44c4605c1d..0e551093a0b7 100644
--- a/metadata/md5-cache/app-emacs/go-mode-1.4.0
+++ b/metadata/md5-cache/app-emacs/go-mode-1.4.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/dominikh/go-mode.el/archive/v1.4.0.tar.gz -> go-mode-1.4.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=247235d1f8ad0bf07c308ffb4e5faa7b
diff --git a/metadata/md5-cache/app-emacs/go-mode-1.5.0 b/metadata/md5-cache/app-emacs/go-mode-1.5.0
index b9cc791438f0..6cfb48de59f1 100644
--- a/metadata/md5-cache/app-emacs/go-mode-1.5.0
+++ b/metadata/md5-cache/app-emacs/go-mode-1.5.0
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/dominikh/go-mode.el/archive/v1.5.0.tar.gz -> go-mode-1.5.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=1db9b6722e79d0fb313dd9baeddba9a9
diff --git a/metadata/md5-cache/app-emacs/google-c-style-20091009-r1 b/metadata/md5-cache/app-emacs/google-c-style-20091009-r1
index ca24f933993e..99d3e829bbd6 100644
--- a/metadata/md5-cache/app-emacs/google-c-style-20091009-r1
+++ b/metadata/md5-cache/app-emacs/google-c-style-20091009-r1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/google-c-style-20091009.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=f5f4df922a23cdcab3cfcafa622f5b94
diff --git a/metadata/md5-cache/app-emacs/google-c-style-20140929 b/metadata/md5-cache/app-emacs/google-c-style-20140929
index 100a90d40f71..895263cdee86 100644
--- a/metadata/md5-cache/app-emacs/google-c-style-20140929
+++ b/metadata/md5-cache/app-emacs/google-c-style-20140929
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/google-c-style-20140929.el.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=1226815b2749b18e28de71123a7118b5
diff --git a/metadata/md5-cache/app-emacs/graphql-0.1.1 b/metadata/md5-cache/app-emacs/graphql-0.1.1
index 78d85162d497..ceef3ac63284 100644
--- a/metadata/md5-cache/app-emacs/graphql-0.1.1
+++ b/metadata/md5-cache/app-emacs/graphql-0.1.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/emacs-25
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vermiculus/graphql.el/archive/0.1.1.tar.gz -> graphql-0.1.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=eab6894466897f2de93be308931b193e
diff --git a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.3.7 b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.3.7
index 69034d3ea6c4..991719e09b5a 100644
--- a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.3.7
+++ b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.3.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/graphviz-dot-mode-0.3.7.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=0a9b1697986ed99989f7bfaa86170977
diff --git a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4 b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4
index 04a17403dfe1..177d77e83e39 100644
--- a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4
+++ b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ppareit/graphviz-dot-mode/archive/v0.4.tar.gz -> graphviz-dot-mode-0.4.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=8e217d0845077a72ae41c77dfa1ca0cb
diff --git a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20171103 b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20171103
index d51909ecb2c3..8b07584a7c96 100644
--- a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20171103
+++ b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20171103
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ppareit/graphviz-dot-mode/archive/c456a2b65c734089e6c44e87209a5a432a741b1a.tar.gz -> graphviz-dot-mode-0.4.20171103.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=d3dfc4fbb680f55807b9e426bcdb1cde
diff --git a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118 b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118
index ee9d54d43b55..7cc7684c3d4d 100644
--- a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118
+++ b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ppareit/graphviz-dot-mode/archive/243de72e09ddd5cdc4863613af8b749827a5e1cd.tar.gz -> graphviz-dot-mode-0.4.20181118.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=49d4b72a95131522d9102f64ef91ef8b
diff --git a/metadata/md5-cache/app-emacs/h4x0r-0.13-r1 b/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
index 67f9739bec28..6eefe248f619 100644
--- a/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
+++ b/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/h4x0r-0.13.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=154d6ed2afbea3ca7ec1a1582157717c
diff --git a/metadata/md5-cache/app-emacs/haskell-mode-13.07 b/metadata/md5-cache/app-emacs/haskell-mode-13.07
index 8dba43e552fc..fb8b942df48b 100644
--- a/metadata/md5-cache/app-emacs/haskell-mode-13.07
+++ b/metadata/md5-cache/app-emacs/haskell-mode-13.07
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/haskell/haskell-mode/archive/v13.07.tar.gz -> haskell-mode-13.07.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=5738abedf9ccb8b1b1d16ba6ac9ccb7b
diff --git a/metadata/md5-cache/app-emacs/haskell-mode-16.1 b/metadata/md5-cache/app-emacs/haskell-mode-16.1
index 339c23ca6d59..4e5e38f130f5 100644
--- a/metadata/md5-cache/app-emacs/haskell-mode-16.1
+++ b/metadata/md5-cache/app-emacs/haskell-mode-16.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/haskell/haskell-mode/archive/v16.1.tar.gz -> haskell-mode-16.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=77407a1384a072e0008dc66d51dc3cd0
diff --git a/metadata/md5-cache/app-emacs/haskell-mode-2.9.1 b/metadata/md5-cache/app-emacs/haskell-mode-2.9.1
index f8d774ccfff0..dfdf6df89bc8 100644
--- a/metadata/md5-cache/app-emacs/haskell-mode-2.9.1
+++ b/metadata/md5-cache/app-emacs/haskell-mode-2.9.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/haskell/haskell-mode/archive/2_9_1.tar.gz -> haskell-mode-2.9.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=134513d548b478ca3623d777b809e483
diff --git a/metadata/md5-cache/app-emacs/helm-3.2 b/metadata/md5-cache/app-emacs/helm-3.2
index da692daa66d5..6e1592bf06d9 100644
--- a/metadata/md5-cache/app-emacs/helm-3.2
+++ b/metadata/md5-cache/app-emacs/helm-3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/async app-emacs/popup >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.2.tar.gz -> helm-3.2.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=069fa9b9a48ec7137d162fd2debcbedb
diff --git a/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1 b/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
index 213862735ec0..cbd54260bd41 100644
--- a/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
+++ b/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/helm >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm-system-packages/archive/v1.10.1.tar.gz -> helm-system-packages-1.10.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=6f546d7e5e02da8bd885b0f6d354c7fe
diff --git a/metadata/md5-cache/app-emacs/hexrgb-0_p957 b/metadata/md5-cache/app-emacs/hexrgb-0_p957
index 689a1bd9717c..1b0f384ea231 100644
--- a/metadata/md5-cache/app-emacs/hexrgb-0_p957
+++ b/metadata/md5-cache/app-emacs/hexrgb-0_p957
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/hexrgb-0_p957.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=77adb975f12d919fdcf4ea8d326be6a8
diff --git a/metadata/md5-cache/app-emacs/highline-7.2.2 b/metadata/md5-cache/app-emacs/highline-7.2.2
index 2f08cff60487..1de328d34373 100644
--- a/metadata/md5-cache/app-emacs/highline-7.2.2
+++ b/metadata/md5-cache/app-emacs/highline-7.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/highline-7.2.2.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=434a1916e32a755710525e4c42dea979
diff --git a/metadata/md5-cache/app-emacs/howm-1.4.3 b/metadata/md5-cache/app-emacs/howm-1.4.3
index 8e5b4e6359e4..1288ed1d2c78 100644
--- a/metadata/md5-cache/app-emacs/howm-1.4.3
+++ b/metadata/md5-cache/app-emacs/howm-1.4.3
@@ -8,5 +8,5 @@ LICENSE=GPL-1+ GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://howm.sourceforge.jp/a/howm-1.4.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=04d46ed151d4abf45fe98af177f47e8e
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.47 b/metadata/md5-cache/app-emacs/htmlize-1.47
index 66c3f9b6c41b..30b147b20463 100644
--- a/metadata/md5-cache/app-emacs/htmlize-1.47
+++ b/metadata/md5-cache/app-emacs/htmlize-1.47
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/htmlize-1.47.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=6ec1ed3b0e5da0b2f515f7445171eed4
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.54 b/metadata/md5-cache/app-emacs/htmlize-1.54
index af27515a60cb..55b935cb0541 100644
--- a/metadata/md5-cache/app-emacs/htmlize-1.54
+++ b/metadata/md5-cache/app-emacs/htmlize-1.54
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/hniksic/emacs-htmlize/archive/release/1.54.tar.gz -> htmlize-1.54.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=f1416b665bda247f0fadb9f5031bb399
diff --git a/metadata/md5-cache/app-emacs/httpd-1.1 b/metadata/md5-cache/app-emacs/httpd-1.1
index 3c660a670b69..64b26260837f 100644
--- a/metadata/md5-cache/app-emacs/httpd-1.1
+++ b/metadata/md5-cache/app-emacs/httpd-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/httpd-1.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=aaf120d14a436b709ffe81a3c3e7806b
diff --git a/metadata/md5-cache/app-emacs/icicles-2013.04.23.23400 b/metadata/md5-cache/app-emacs/icicles-2013.04.23.23400
index 0dbe94b52bac..74e2e309e1fa 100644
--- a/metadata/md5-cache/app-emacs/icicles-2013.04.23.23400
+++ b/metadata/md5-cache/app-emacs/icicles-2013.04.23.23400
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/emacsmirror/icicles/archive/2013.04.23.23400.tar.gz -> icicles-2013.04.23.23400.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=d5fca20b6cd88db9dd843d5d0e157442
diff --git a/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733 b/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
index 52c91651224f..d8dfa5c99980 100644
--- a/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
+++ b/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/icicles-2018.02.13.23733.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=2d73a2a1b120177c8ca359abc399f902
diff --git a/metadata/md5-cache/app-emacs/identica-mode-1.1-r1 b/metadata/md5-cache/app-emacs/identica-mode-1.1-r1
index af3ed2eaf09b..64dfd8e1ed92 100644
--- a/metadata/md5-cache/app-emacs/identica-mode-1.1-r1
+++ b/metadata/md5-cache/app-emacs/identica-mode-1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/identica-mode-1.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=9f493811f73c2ca8c9a52129836ba2df
diff --git a/metadata/md5-cache/app-emacs/igrep-2.113 b/metadata/md5-cache/app-emacs/igrep-2.113
index a1edfec18a2e..272a05e973bf 100644
--- a/metadata/md5-cache/app-emacs/igrep-2.113
+++ b/metadata/md5-cache/app-emacs/igrep-2.113
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/igrep-2.113.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=2b6be75021c3acb0ce6c42aac099a505
diff --git a/metadata/md5-cache/app-emacs/inform-mode-1.5.8 b/metadata/md5-cache/app-emacs/inform-mode-1.5.8
index 3d4abc8efb2e..363696b49bbe 100644
--- a/metadata/md5-cache/app-emacs/inform-mode-1.5.8
+++ b/metadata/md5-cache/app-emacs/inform-mode-1.5.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/inform-mode-1.5.8.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=a045f24f1cbc21e6f787c7bd312c30e6
diff --git a/metadata/md5-cache/app-emacs/inform-mode-1.6.2 b/metadata/md5-cache/app-emacs/inform-mode-1.6.2
index f890ab987ab3..365f6721293b 100644
--- a/metadata/md5-cache/app-emacs/inform-mode-1.6.2
+++ b/metadata/md5-cache/app-emacs/inform-mode-1.6.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://rupert-lane.org/inform-mode/releases/inform-mode-1.6.2.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=be7a165f2831b3f2c45a191c88d8ce06
diff --git a/metadata/md5-cache/app-emacs/initsplit-1.7_pre20140203 b/metadata/md5-cache/app-emacs/initsplit-1.7_pre20140203
index 7559a2a00cd9..f220e33ea15d 100644
--- a/metadata/md5-cache/app-emacs/initsplit-1.7_pre20140203
+++ b/metadata/md5-cache/app-emacs/initsplit-1.7_pre20140203
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/initsplit-1.7_pre20140203.el.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=39bc0b72bb5d1f177ef5d2f39a831f93
diff --git a/metadata/md5-cache/app-emacs/jam-mode-0.3 b/metadata/md5-cache/app-emacs/jam-mode-0.3
index 07996420d3fb..7d54207847e2 100644
--- a/metadata/md5-cache/app-emacs/jam-mode-0.3
+++ b/metadata/md5-cache/app-emacs/jam-mode-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/jam-mode-0.3.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=7f003f9c0bf4cfc216bdaa8892280813
diff --git a/metadata/md5-cache/app-emacs/jasmin-1.2-r2 b/metadata/md5-cache/app-emacs/jasmin-1.2-r2
index fe14442b6cc1..b360291406bd 100644
--- a/metadata/md5-cache/app-emacs/jasmin-1.2-r2
+++ b/metadata/md5-cache/app-emacs/jasmin-1.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/jasmin-1.2.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=55ee0f378d2394e57dc540ef76d8c14f
diff --git a/metadata/md5-cache/app-emacs/jde-2.4.1 b/metadata/md5-cache/app-emacs/jde-2.4.1
index e42244f3ba35..74d75bcfdca2 100644
--- a/metadata/md5-cache/app-emacs/jde-2.4.1
+++ b/metadata/md5-cache/app-emacs/jde-2.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/jdk-1.3 app-emacs/elib dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/jdee-2.4.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c9da711d9544abd501f08ca0b643ee4e
diff --git a/metadata/md5-cache/app-emacs/keywiz-1.4 b/metadata/md5-cache/app-emacs/keywiz-1.4
index c02c1a9d9091..74bd6c38158c 100644
--- a/metadata/md5-cache/app-emacs/keywiz-1.4
+++ b/metadata/md5-cache/app-emacs/keywiz-1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/keywiz-1.4.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=4da1db7778a8decef98ca926f9c9fc7a
diff --git a/metadata/md5-cache/app-emacs/ledger-mode-3.1.1 b/metadata/md5-cache/app-emacs/ledger-mode-3.1.1
index f06e85a34f5a..d9fab0245272 100644
--- a/metadata/md5-cache/app-emacs/ledger-mode-3.1.1
+++ b/metadata/md5-cache/app-emacs/ledger-mode-3.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ BSD
 RDEPEND=!<app-office/ledger-3.1.2[emacs(-)] >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger-mode/archive/v3.1.1.tar.gz -> ledger-mode-3.1.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=ed80baa66e1aac1716bf72854d6e0bca
diff --git a/metadata/md5-cache/app-emacs/lookup-1.4.1 b/metadata/md5-cache/app-emacs/lookup-1.4.1
index 99a632d58e7b..2f2808a5f9bb 100644
--- a/metadata/md5-cache/app-emacs/lookup-1.4.1
+++ b/metadata/md5-cache/app-emacs/lookup-1.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://openlab.jp/edict/lookup/dist/lookup-1.4.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=138414fe428b9584a9e019f2d9beb70d
diff --git a/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209 b/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
index 3cd1dfabd837..f042653324a6 100644
--- a/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
+++ b/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/lookup2/lookup2/archive/c4f4986aac6c339e03b9e56a5dfc7c8f5c0bb5e0.tar.gz -> lookup-1.99.96_pre20180209.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=84ad96d2ad8edc2c753b5688061fc94b
diff --git a/metadata/md5-cache/app-emacs/lua-mode-20130419 b/metadata/md5-cache/app-emacs/lua-mode-20130419
index bdd7d84b4e03..1aa463a8ab18 100644
--- a/metadata/md5-cache/app-emacs/lua-mode-20130419
+++ b/metadata/md5-cache/app-emacs/lua-mode-20130419
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/immerrr/lua-mode/archive/rel-20130419.tar.gz -> lua-mode-20130419.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=fb45cb0f490706b4d0394abec24955a4
diff --git a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410 b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
index 93dd37c5bf5e..f684a29d240c 100644
--- a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
+++ b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20180410.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=97854fe50c3d057a2498b86c1ada7c20
diff --git a/metadata/md5-cache/app-emacs/magit-2.11.0 b/metadata/md5-cache/app-emacs/magit-2.11.0
index 4cc14aed00b7..45a197a214be 100644
--- a/metadata/md5-cache/app-emacs/magit-2.11.0
+++ b/metadata/md5-cache/app-emacs/magit-2.11.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.6.0 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/2.11.0.tar.gz -> magit-2.11.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=d7b232295cabdb038b52aace0aa4a4df
diff --git a/metadata/md5-cache/app-emacs/magit-2.12.1 b/metadata/md5-cache/app-emacs/magit-2.12.1
index 6758e380e22c..f507a08b534e 100644
--- a/metadata/md5-cache/app-emacs/magit-2.12.1
+++ b/metadata/md5-cache/app-emacs/magit-2.12.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/ghub-2.0.0 >=app-emacs/magit-popup-2.12.3 >=app-emacs/with-editor-2.7.2 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/2.12.1.tar.gz -> magit-2.12.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=ff69ab48044599e15a8b5f19ff2cb828
diff --git a/metadata/md5-cache/app-emacs/magit-2.13.1 b/metadata/md5-cache/app-emacs/magit-2.13.1
index 820ece1db802..20af6a215773 100644
--- a/metadata/md5-cache/app-emacs/magit-2.13.1
+++ b/metadata/md5-cache/app-emacs/magit-2.13.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-2.0.1 >=app-emacs/magit-popup-2.12.3 >=app-emacs/with-editor-2.7.3 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/2.13.1.tar.gz -> magit-2.13.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=026fb69525df745b6e7c38a104561eae
diff --git a/metadata/md5-cache/app-emacs/magit-2.90.1 b/metadata/md5-cache/app-emacs/magit-2.90.1
index 683733859324..71a9580a128c 100644
--- a/metadata/md5-cache/app-emacs/magit-2.90.1
+++ b/metadata/md5-cache/app-emacs/magit-2.90.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-3.0.0 >=app-emacs/magit-popup-2.12.4 >=app-emacs/with-editor-2.8.0 >=dev-vcs/git-2.0.0 >=virtual/emacs-25
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/v2.90.1.tar.gz -> magit-2.90.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=8b8a0bc9a0bc1a50ce552a886de8565b
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.12.3 b/metadata/md5-cache/app-emacs/magit-popup-2.12.3
index 2e9263fa41bc..35e2c113c543 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.12.3
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.12.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.12.3.tar.gz -> magit-popup-2.12.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=e15638e635397d241590b5c40e48a642
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.12.4 b/metadata/md5-cache/app-emacs/magit-popup-2.12.4
index 78262088d240..b7372cee49f3 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.12.4
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.12.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.12.4.tar.gz -> magit-popup-2.12.4.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=d947adf27f6360b2ec6830a474d730e0
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.0 b/metadata/md5-cache/app-emacs/magit-popup-2.13.0
index 5a19d61b3fbd..02ac04695fd3 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.13.0
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.0.tar.gz -> magit-popup-2.13.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=4c52fe16f033475f09adc248a2eedf60
diff --git a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r1 b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r1
index 288a1f73a823..509dc934cc7d 100644
--- a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r1
+++ b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r1
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/mailcrypt/mailcrypt-3.5.9.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=080640b282f2c3a81f615bd07e47c005
diff --git a/metadata/md5-cache/app-emacs/markdown-mode-2.1 b/metadata/md5-cache/app-emacs/markdown-mode-2.1
index 76e161ee5f65..fa7429d090f5 100644
--- a/metadata/md5-cache/app-emacs/markdown-mode-2.1
+++ b/metadata/md5-cache/app-emacs/markdown-mode-2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=|| ( dev-python/markdown2 dev-python/markdown ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/markdown-mode-2.1.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=2c412ebe9b12f0451a09838d2db1488f
diff --git a/metadata/md5-cache/app-emacs/markdown-mode-2.3 b/metadata/md5-cache/app-emacs/markdown-mode-2.3
index 4714ae20e278..d8f4bca7bceb 100644
--- a/metadata/md5-cache/app-emacs/markdown-mode-2.3
+++ b/metadata/md5-cache/app-emacs/markdown-mode-2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=|| ( dev-python/markdown2 dev-python/markdown ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://stable.melpa.org/packages/markdown-mode-2.3.el
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=96d0d55530ff13324b9c7f17e18a4047
diff --git a/metadata/md5-cache/app-emacs/matlab-3.3.2_pre20130829 b/metadata/md5-cache/app-emacs/matlab-3.3.2_pre20130829
index f61cf46e6305..856ccee00687 100644
--- a/metadata/md5-cache/app-emacs/matlab-3.3.2_pre20130829
+++ b/metadata/md5-cache/app-emacs/matlab-3.3.2_pre20130829
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/matlab-3.3.2_pre20130829.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=990e213706cfb26162892e73264b024c
diff --git a/metadata/md5-cache/app-emacs/mediawiki-2.2.4.1 b/metadata/md5-cache/app-emacs/mediawiki-2.2.4.1
index 517fc5491d4f..b71769c18181 100644
--- a/metadata/md5-cache/app-emacs/mediawiki-2.2.4.1
+++ b/metadata/md5-cache/app-emacs/mediawiki-2.2.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mediawiki-2.2.4.1.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=0a9d1448f80a21e985009120da25b65c
diff --git a/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1 b/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1
index b54ddcd04c39..c9ab17f5097d 100644
--- a/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1
+++ b/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/hexmode/mediawiki-el/archive/2.2.9.tar.gz -> mediawiki-2.2.9.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=46a2f5056f47c4217b4f197fe05133f8
diff --git a/metadata/md5-cache/app-emacs/mew-6.6 b/metadata/md5-cache/app-emacs/mew-6.6
index e1202457506d..d79f23c4488a 100644
--- a/metadata/md5-cache/app-emacs/mew-6.6
+++ b/metadata/md5-cache/app-emacs/mew-6.6
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib ssl? ( net-misc/stunnel ) >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mew.org/Release/mew-6.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8efc070b8386571104b0b33e90d9973
diff --git a/metadata/md5-cache/app-emacs/mew-6.8 b/metadata/md5-cache/app-emacs/mew-6.8
index 51259c7c1e10..04723c1b532d 100644
--- a/metadata/md5-cache/app-emacs/mew-6.8
+++ b/metadata/md5-cache/app-emacs/mew-6.8
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib ssl? ( net-misc/stunnel ) >=virtual/emacs-24
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mew.org/Release/mew-6.8.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=4e00a32d212b3f703bb8db3dab5d504c
diff --git a/metadata/md5-cache/app-emacs/mic-paren-3.11 b/metadata/md5-cache/app-emacs/mic-paren-3.11
index fee5915aff26..ad5891c49d0b 100644
--- a/metadata/md5-cache/app-emacs/mic-paren-3.11
+++ b/metadata/md5-cache/app-emacs/mic-paren-3.11
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/mic-paren-3.11.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=6502c441b1513c0ce29e69f2fa12da11
diff --git a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1 b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1
index cbe1fe02328d..125e431a2186 100644
--- a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1
+++ b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/mldonkey-el-0.0.4b.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=5e49c2278d2327f7559448aa9f713b2b
diff --git a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2 b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
index e8f906fdf4bc..889b49ab86fa 100644
--- a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
+++ b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/mldonkey-el-0.0.4b.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=6e4fd8a0ad385fbc6e1b55bf2783a5dc
diff --git a/metadata/md5-cache/app-emacs/mmm-mode-0.5.4 b/metadata/md5-cache/app-emacs/mmm-mode-0.5.4
index 20ed5d198e1d..e389913c24d0 100644
--- a/metadata/md5-cache/app-emacs/mmm-mode-0.5.4
+++ b/metadata/md5-cache/app-emacs/mmm-mode-0.5.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/purcell/mmm-mode/archive/0.5.4.tar.gz -> mmm-mode-0.5.4.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=c73a1344ec261dfde8f17b9c4ca4a185
diff --git a/metadata/md5-cache/app-emacs/mmm-mode-0.5.7 b/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
index 450897e867e7..d2749658d730 100644
--- a/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
+++ b/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/purcell/mmm-mode/archive/0.5.7.tar.gz -> mmm-mode-0.5.7.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=29cda52d9d89e9fb6bee09bc6e9f0f5f
diff --git a/metadata/md5-cache/app-emacs/moccur-edit-2.16 b/metadata/md5-cache/app-emacs/moccur-edit-2.16
index 4c125d61b010..7afebfd2a735 100644
--- a/metadata/md5-cache/app-emacs/moccur-edit-2.16
+++ b/metadata/md5-cache/app-emacs/moccur-edit-2.16
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/color-moccur >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/moccur-edit-2.16.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=04a639edb97b622a0a18b219bd50febe
diff --git a/metadata/md5-cache/app-emacs/mode-compile-2.29.1 b/metadata/md5-cache/app-emacs/mode-compile-2.29.1
index ac58cc50de47..c3916766ccea 100644
--- a/metadata/md5-cache/app-emacs/mode-compile-2.29.1
+++ b/metadata/md5-cache/app-emacs/mode-compile-2.29.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/emacsmirror/mode-compile/archive/2.29.1.tar.gz -> mode-compile-2.29.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=15119779a3800ff257e955dc527f5615
diff --git a/metadata/md5-cache/app-emacs/mpg123-el-1.59 b/metadata/md5-cache/app-emacs/mpg123-el-1.59
index cd7214e3a11a..18fde0882ad8 100644
--- a/metadata/md5-cache/app-emacs/mpg123-el-1.59
+++ b/metadata/md5-cache/app-emacs/mpg123-el-1.59
@@ -8,5 +8,5 @@ LICENSE=mpg123-el
 RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.59.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=6ebd2629c67964303e7956f52b973098
diff --git a/metadata/md5-cache/app-emacs/mpg123-el-1.60 b/metadata/md5-cache/app-emacs/mpg123-el-1.60
index effc2c1e9eea..8d5def90f099 100644
--- a/metadata/md5-cache/app-emacs/mpg123-el-1.60
+++ b/metadata/md5-cache/app-emacs/mpg123-el-1.60
@@ -8,5 +8,5 @@ LICENSE=mpg123-el
 RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.60.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=e6099f87b5a6fe83efa5ab70f6c7802c
diff --git a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201202272330 b/metadata/md5-cache/app-emacs/mu-cite-8.1_p201202272330
index 2af6fbe8ca35..5a425ce10633 100644
--- a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201202272330
+++ b/metadata/md5-cache/app-emacs/mu-cite-8.1_p201202272330
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/apel app-emacs/flim >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.jpl.org/elips/mu/snapshots/mu-cite-201202272330.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=87bf6329e0ad574e5bb7860a6c474e41
diff --git a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348 b/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
index 4ec9099684ff..309d1e8f6f66 100644
--- a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
+++ b/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/apel app-emacs/flim bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://www.jpl.org/elips/mu/snapshots/mu-cite-201808232348.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=50589a3d4fa464af68770f11e71966df
diff --git a/metadata/md5-cache/app-emacs/multi-term-1.4 b/metadata/md5-cache/app-emacs/multi-term-1.4
index e2e476f0b2d8..a95dffb59876 100644
--- a/metadata/md5-cache/app-emacs/multi-term-1.4
+++ b/metadata/md5-cache/app-emacs/multi-term-1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/multi-term-1.4.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=e0636cae5b688bed903cf4e016f717c1
diff --git a/metadata/md5-cache/app-emacs/multiple-cursors-1.3.0 b/metadata/md5-cache/app-emacs/multiple-cursors-1.3.0
index 6632ba03a9d6..1e7dd9e80d11 100644
--- a/metadata/md5-cache/app-emacs/multiple-cursors-1.3.0
+++ b/metadata/md5-cache/app-emacs/multiple-cursors-1.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/magnars/multiple-cursors.el/archive/1.3.0.tar.gz -> multiple-cursors-1.3.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=539232a5b28df0e146473b41ec4fd010
diff --git a/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0 b/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
new file mode 100644
index 000000000000..10a3958e155b
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
@@ -0,0 +1,12 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Multiple cursors for Emacs
+EAPI=7
+HOMEPAGE=https://github.com/magnars/multiple-cursors.el
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/magnars/multiple-cursors.el/archive/1.4.0.tar.gz -> multiple-cursors-1.4.0.tar.gz
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=19934ddda2983416e762476782a23ddd
diff --git a/metadata/md5-cache/app-emacs/muse-3.20 b/metadata/md5-cache/app-emacs/muse-3.20
index 381211e11818..79ff0ef7e22a 100644
--- a/metadata/md5-cache/app-emacs/muse-3.20
+++ b/metadata/md5-cache/app-emacs/muse-3.20
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.gna.org/muse-el/muse-3.20.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=d5895126e7f2ac923f8e71a386723fff
diff --git a/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1 b/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
index f403e61f62ea..c57d1f77bd43 100644
--- a/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
+++ b/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/nagios-mode-0.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=10eeec30800214c86bebbee3b1700ccb
diff --git a/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1 b/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1
index 3e2879270a4d..ebd6e75739bd 100644
--- a/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1
+++ b/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/navi2ch/navi2ch-1.8.4.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=359774a25ee966f5690be38cc758152a
diff --git a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0 b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
index c48fcf3a8518..61294cb4a73c 100644
--- a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
+++ b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://docbook.org/xml/5.0/rng/docbookxi.rnc -> docbookxi-5.0.rnc
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=719e1af9bd0b431db9e5af672913bd04
diff --git a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1 b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
index a35e1a4cfe3e..c818c5a25cca 100644
--- a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
+++ b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://docbook.org/xml/5.1/rng/docbookxi.rnc -> docbookxi-5.1.rnc
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=de247933d3787de21aab71a9ea272606
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20170302 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20170302
index 9ff8f40b32b9..15cd4fb8063e 100644
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20170302
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20170302
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20170302.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=95da40e82ccf2e7f44697bb4af120db8
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20180611 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20180611
index 9aaaf9d96cf1..123916df3369 100644
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20180611
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20180611
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20180611.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=cf324e107eb80e512fb846accccb6d18
diff --git a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-1.2.1 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-1.2.1
index 1c670e6f39c3..62db8a5947ef 100644
--- a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-1.2.1
+++ b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-1.2.1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=abb77aa0bb782b9e9bf745f77fb6e2ef
diff --git a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123 b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123
index 29434df3bd24..4b65115447a3 100644
--- a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123
+++ b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/emacs-23
 SLOT=1.1
 SRC_URI=http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-1.1.20081123.zip
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=ae44e986a887ae91347b7cd55fe3b8d2
diff --git a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1 b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1
index 8137908f99a9..75fbd6e888b7 100644
--- a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1
+++ b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/emacs-23
 SLOT=1.1
 SRC_URI=http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-1.1.20081123.zip
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=21c0b59902c1f49448691d10e2813f62
diff --git a/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1-r1 b/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1-r1
index 6e66056dc2c7..9b8f02d031ff 100644
--- a/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1-r1
+++ b/metadata/md5-cache/app-emacs/ocaml-mode-3.12.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://caml.inria.fr/distrib/ocaml-3.12/ocaml-3.12.1.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=5319ba0b45260f84dd7125c1ccd6400c
diff --git a/metadata/md5-cache/app-emacs/ocaml-mode-4.00.1 b/metadata/md5-cache/app-emacs/ocaml-mode-4.00.1
index 99e61b386e33..ffa78e9db718 100644
--- a/metadata/md5-cache/app-emacs/ocaml-mode-4.00.1
+++ b/metadata/md5-cache/app-emacs/ocaml-mode-4.00.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://caml.inria.fr/distrib/ocaml-4.00/ocaml-4.00.1.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=c19d87be9d5c4554516fc1c6a59eeba9
diff --git a/metadata/md5-cache/app-emacs/org-mode-8.3.2-r1 b/metadata/md5-cache/app-emacs/org-mode-8.3.2-r1
index e65e16bd1527..36abeb343835 100644
--- a/metadata/md5-cache/app-emacs/org-mode-8.3.2-r1
+++ b/metadata/md5-cache/app-emacs/org-mode-8.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://orgmode.org/org-8.3.2.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=9fb4c436babce6a6ed8400299d8a9dda
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.1.13 b/metadata/md5-cache/app-emacs/org-mode-9.1.13
index c96c8bc47d8f..f09c6e331fea 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.1.13
+++ b/metadata/md5-cache/app-emacs/org-mode-9.1.13
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-24
 RESTRICT=test
 SLOT=0
 SRC_URI=http://orgmode.org/org-9.1.13.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=5b7397f1b2c2970d4861a32b8a8d683f
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.2.6 b/metadata/md5-cache/app-emacs/org-mode-9.2.6
index 89679eadb8f2..1c5ba2033c05 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.2.6
+++ b/metadata/md5-cache/app-emacs/org-mode-9.2.6
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-24
 RESTRICT=test
 SLOT=0
 SRC_URI=http://orgmode.org/org-9.2.6.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=ecb4290edca58d4d9e3738ff2b57bd5f
diff --git a/metadata/md5-cache/app-emacs/outline-magic-0.9 b/metadata/md5-cache/app-emacs/outline-magic-0.9
index 4a4dd0d4f6dd..cea55a2e6a3b 100644
--- a/metadata/md5-cache/app-emacs/outline-magic-0.9
+++ b/metadata/md5-cache/app-emacs/outline-magic-0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/outline-magic-0.9.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=aac2f3da7eb68b1e579c68132b4e8e3d
diff --git a/metadata/md5-cache/app-emacs/paredit-23-r1 b/metadata/md5-cache/app-emacs/paredit-23-r1
index fb267c9053c0..b116187ff66f 100644
--- a/metadata/md5-cache/app-emacs/paredit-23-r1
+++ b/metadata/md5-cache/app-emacs/paredit-23-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/paredit-23.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=cc59a57ffcb8673f6fcbedc308687d55
diff --git a/metadata/md5-cache/app-emacs/pariemacs-3.14 b/metadata/md5-cache/app-emacs/pariemacs-3.14
index 49aaa482a1f6..ebcb82dede0b 100644
--- a/metadata/md5-cache/app-emacs/pariemacs-3.14
+++ b/metadata/md5-cache/app-emacs/pariemacs-3.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sci-mathematics/pari >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/latest-pari-distrib/pariemacs-3.14.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=8ee143a7579375bbf2417a32b2dce359
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.19.1 b/metadata/md5-cache/app-emacs/php-mode-1.19.1
index 0a25abd23561..f0a9811e45a7 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.19.1
+++ b/metadata/md5-cache/app-emacs/php-mode-1.19.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/ejmr/php-mode/archive/v1.19.1.tar.gz -> php-mode-1.19.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=3ff20f03184ce7ab28f97c9b6fcea86d
diff --git a/metadata/md5-cache/app-emacs/planner-3.42 b/metadata/md5-cache/app-emacs/planner-3.42
index 4b24fdbe1853..873571cae334 100644
--- a/metadata/md5-cache/app-emacs/planner-3.42
+++ b/metadata/md5-cache/app-emacs/planner-3.42
@@ -10,5 +10,5 @@ RDEPEND=>=app-emacs/muse-3.02.6a app-emacs/bbdb app-emacs/emacs-w3m >=virtual/em
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.gna.org/planner-el/planner-3.42.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=fdbd25d48761fcec7cbe9f27a12f6267
diff --git a/metadata/md5-cache/app-emacs/po-mode-0.19.3 b/metadata/md5-cache/app-emacs/po-mode-0.19.3
index 860ee0472f95..bfc74a779822 100644
--- a/metadata/md5-cache/app-emacs/po-mode-0.19.3
+++ b/metadata/md5-cache/app-emacs/po-mode-0.19.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=1d8c385e79c24b94924b00ee8f971653
diff --git a/metadata/md5-cache/app-emacs/po-mode-0.19.4 b/metadata/md5-cache/app-emacs/po-mode-0.19.4
index bbefad1f528e..90d09eca0909 100644
--- a/metadata/md5-cache/app-emacs/po-mode-0.19.4
+++ b/metadata/md5-cache/app-emacs/po-mode-0.19.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.4.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=d287ab343631ddff0ae2f17848f28495
diff --git a/metadata/md5-cache/app-emacs/po-mode-0.19.8.1 b/metadata/md5-cache/app-emacs/po-mode-0.19.8.1
index a6608cba6038..68e1bf531a92 100644
--- a/metadata/md5-cache/app-emacs/po-mode-0.19.8.1
+++ b/metadata/md5-cache/app-emacs/po-mode-0.19.8.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.8.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=868f67ac75d796721e89e066a3cee0fb
diff --git a/metadata/md5-cache/app-emacs/popup-0.5.3 b/metadata/md5-cache/app-emacs/popup-0.5.3
index 3186eb3983f7..ab21b7c3201e 100644
--- a/metadata/md5-cache/app-emacs/popup-0.5.3
+++ b/metadata/md5-cache/app-emacs/popup-0.5.3
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/auto-complete/popup-el/archive/v0.5.3.tar.gz -> popup-el-0.5.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=494bee3e7a380d10dbffc5138ec94939
diff --git a/metadata/md5-cache/app-emacs/popwin-1.0.0 b/metadata/md5-cache/app-emacs/popwin-1.0.0
index 4d2f0781e87a..d14b1bf5900b 100644
--- a/metadata/md5-cache/app-emacs/popwin-1.0.0
+++ b/metadata/md5-cache/app-emacs/popwin-1.0.0
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/m2ym/popwin-el/archive/v1.0.0.tar.gz -> popwin-1.0.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=5c43cabeca2c46d5ddc270e090a292aa
diff --git a/metadata/md5-cache/app-emacs/pov-mode-3.3-r1 b/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
index f5c007327d54..017451759de0 100644
--- a/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
+++ b/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+ FDL-1.2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/emacsmirror/pov-mode/archive/v3.3.tar.gz -> pov-mode-3.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=312448465a6b35031145ec99e081ed8e
diff --git a/metadata/md5-cache/app-emacs/proofgeneral-4.2 b/metadata/md5-cache/app-emacs/proofgeneral-4.2
index 2bb4143a1806..5fff7dd7c639 100644
--- a/metadata/md5-cache/app-emacs/proofgeneral-4.2
+++ b/metadata/md5-cache/app-emacs/proofgeneral-4.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-emacs/mmm-mode-0.4.8-r2 >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.2.tgz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=6c2ea7ea38869e682388bf70048f2a3d
diff --git a/metadata/md5-cache/app-emacs/proofgeneral-4.4 b/metadata/md5-cache/app-emacs/proofgeneral-4.4
index b6ded0f510ab..ac6cc61cb235 100644
--- a/metadata/md5-cache/app-emacs/proofgeneral-4.4
+++ b/metadata/md5-cache/app-emacs/proofgeneral-4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0
 RDEPEND=>=app-emacs/mmm-mode-0.4.8-r2 >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ProofGeneral/PG/archive/v4.4.tar.gz -> proofgeneral-4.4.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=afd8dd96beeb45171cc7da245daa00d5
diff --git a/metadata/md5-cache/app-emacs/protbuf-1.7-r1 b/metadata/md5-cache/app-emacs/protbuf-1.7-r1
index 571a8464c175..43736d462246 100644
--- a/metadata/md5-cache/app-emacs/protbuf-1.7-r1
+++ b/metadata/md5-cache/app-emacs/protbuf-1.7-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/protbuf-1.7.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=33a7bc541106ab1268d2d4a72591c33d
diff --git a/metadata/md5-cache/app-emacs/psgml-1.4.0 b/metadata/md5-cache/app-emacs/psgml-1.4.0
index b7966bc83cab..1f9b5c469254 100644
--- a/metadata/md5-cache/app-emacs/psgml-1.4.0
+++ b/metadata/md5-cache/app-emacs/psgml-1.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=app-text/openjade >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.fsavigny.de/gpled-software/psgml-1.4.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=ffe97c67a6abff87b1163e7eb678217a
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.3-r1 b/metadata/md5-cache/app-emacs/puppet-mode-0.3-r1
index 8f7b50441642..df34d412e1fa 100644
--- a/metadata/md5-cache/app-emacs/puppet-mode-0.3-r1
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.3-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/0.3.tar.gz -> puppet-mode-0.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=e4a9dbfd4450767946ea207b47218536
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.3.20171221 b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20171221
index f2c8ea9bbef6..abcb194f29ef 100644
--- a/metadata/md5-cache/app-emacs/puppet-mode-0.3.20171221
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20171221
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/b3ed5057166a4f49dfa9be638523a348b55a2fd2.tar.gz -> puppet-mode-0.3.20171221.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=bbb591e196ab9e0f8ab1527b583ec63e
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813 b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813
index c5eb174726ff..8576967a54cb 100644
--- a/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.3.20180813
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/7dee1b5a5debac6e56f9107492a413b6c0edb94d.tar.gz -> puppet-mode-0.3.20180813.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=ba46d7426b2765ae50a06e6a33fb7f3d
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.25-r2 b/metadata/md5-cache/app-emacs/pymacs-0.25-r2
index dc14692db0b0..f80831dd7cb4 100644
--- a/metadata/md5-cache/app-emacs/pymacs-0.25-r2
+++ b/metadata/md5-cache/app-emacs/pymacs-0.25-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pinard/Pymacs/tarball/v0.25 -> pymacs-0.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2dc7dfbb6ec391fd234ee03f63d509d3
diff --git a/metadata/md5-cache/app-emacs/python-mode-6.1.2 b/metadata/md5-cache/app-emacs/python-mode-6.1.2
index d6eae8a52097..e77a84a9eb12 100644
--- a/metadata/md5-cache/app-emacs/python-mode-6.1.2
+++ b/metadata/md5-cache/app-emacs/python-mode-6.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://launchpad.net/python-mode/trunk/6.1.2/+download/python-mode.el-6.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd16f700e6799d0c3a1e033d343b7bea
diff --git a/metadata/md5-cache/app-emacs/python-mode-6.2.0 b/metadata/md5-cache/app-emacs/python-mode-6.2.0
index ac9cf1664e8c..59c0f888f99f 100644
--- a/metadata/md5-cache/app-emacs/python-mode-6.2.0
+++ b/metadata/md5-cache/app-emacs/python-mode-6.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://launchpad.net/python-mode/trunk/6.2.0/+download/python-mode.el-6.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8aef7350405f30f41fa84b7664655084
diff --git a/metadata/md5-cache/app-emacs/python-mode-6.2.3 b/metadata/md5-cache/app-emacs/python-mode-6.2.3
index 50c1460f70a0..0c2286145c98 100644
--- a/metadata/md5-cache/app-emacs/python-mode-6.2.3
+++ b/metadata/md5-cache/app-emacs/python-mode-6.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://launchpad.net/python-mode/trunk/6.2.3/+download/python-mode.el-6.2.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=5ed12d6f060ca1949442f72b58913668
diff --git a/metadata/md5-cache/app-emacs/quack-0.47 b/metadata/md5-cache/app-emacs/quack-0.47
index 974aa49fa3d7..4c7969b9fd97 100644
--- a/metadata/md5-cache/app-emacs/quack-0.47
+++ b/metadata/md5-cache/app-emacs/quack-0.47
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/quack-0.47.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=85e99630f660b1f2cf6368fe718b404b
diff --git a/metadata/md5-cache/app-emacs/quilt-el-0.48.0 b/metadata/md5-cache/app-emacs/quilt-el-0.48.0
index 35a95624cbeb..ae4349cbbc1b 100644
--- a/metadata/md5-cache/app-emacs/quilt-el-0.48.0
+++ b/metadata/md5-cache/app-emacs/quilt-el-0.48.0
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=dev-util/quilt >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://satoru-takeuchi.org/dev/quilt-el/download/quilt-el-0.48.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=782ff3365f43f511c6dda3a57eaba466
diff --git a/metadata/md5-cache/app-emacs/quilt-el-0.66 b/metadata/md5-cache/app-emacs/quilt-el-0.66
index edfea6220c67..4c6462c86dea 100644
--- a/metadata/md5-cache/app-emacs/quilt-el-0.66
+++ b/metadata/md5-cache/app-emacs/quilt-el-0.66
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=dev-util/quilt >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://nongnu/quilt/quilt-0.66.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=ac6a82bc6824ada4f8bcc6704d552ea8
diff --git a/metadata/md5-cache/app-emacs/qwerty-1.1 b/metadata/md5-cache/app-emacs/qwerty-1.1
index 520ad9ee996e..305ba094ce60 100644
--- a/metadata/md5-cache/app-emacs/qwerty-1.1
+++ b/metadata/md5-cache/app-emacs/qwerty-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/qwerty-1.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=cf1594a28e7122d83a56e40de3a71b7e
diff --git a/metadata/md5-cache/app-emacs/redo+-1.19 b/metadata/md5-cache/app-emacs/redo+-1.19
index fea4c4dae154..e4cc09d85faf 100644
--- a/metadata/md5-cache/app-emacs/redo+-1.19
+++ b/metadata/md5-cache/app-emacs/redo+-1.19
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/redo+-1.19.el.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4607c67d0fb787a12a6812c76da2aa7a
diff --git a/metadata/md5-cache/app-emacs/regress-1.5.1 b/metadata/md5-cache/app-emacs/regress-1.5.1
index 601c5109bf2a..bfcda2d753e9 100644
--- a/metadata/md5-cache/app-emacs/regress-1.5.1
+++ b/metadata/md5-cache/app-emacs/regress-1.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-1+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/regress-1.5.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=d889dd47b1a8158484c80b2393b0af51
diff --git a/metadata/md5-cache/app-emacs/remember-2.0 b/metadata/md5-cache/app-emacs/remember-2.0
index f64da7b35fc9..27d40d899c16 100644
--- a/metadata/md5-cache/app-emacs/remember-2.0
+++ b/metadata/md5-cache/app-emacs/remember-2.0
@@ -10,5 +10,5 @@ RDEPEND=bbdb? ( app-emacs/bbdb ) planner? ( app-emacs/planner ) >=virtual/emacs-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.gna.org/remember-el/remember-2.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=65e6a3d8d3467b646ddd8e0f83464b42
diff --git a/metadata/md5-cache/app-emacs/revive-2.23 b/metadata/md5-cache/app-emacs/revive-2.23
index 42b9a0ac4f16..3b21f9649d87 100644
--- a/metadata/md5-cache/app-emacs/revive-2.23
+++ b/metadata/md5-cache/app-emacs/revive-2.23
@@ -8,5 +8,5 @@ LICENSE=yuuji
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/revive-2.23.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=98b19388c02e94f02e99f204863785b8
diff --git a/metadata/md5-cache/app-emacs/rfcview-0.13 b/metadata/md5-cache/app-emacs/rfcview-0.13
index 344a17ea660b..bd9673af4e5c 100644
--- a/metadata/md5-cache/app-emacs/rfcview-0.13
+++ b/metadata/md5-cache/app-emacs/rfcview-0.13
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rfcview-0.13.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=cb897fba3f1eda6e19a81cb4dcf3ae15
diff --git a/metadata/md5-cache/app-emacs/riece-9.0.0 b/metadata/md5-cache/app-emacs/riece-9.0.0
index 40437b6d0621..3e8e5107cafa 100644
--- a/metadata/md5-cache/app-emacs/riece-9.0.0
+++ b/metadata/md5-cache/app-emacs/riece-9.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/riece/riece-9.0.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=160f9d8694ab1b3354d7c45461d1771a
diff --git a/metadata/md5-cache/app-emacs/rnc-mode-1.0.6 b/metadata/md5-cache/app-emacs/rnc-mode-1.0.6
index 8817ad487ecb..73dd9b6de62c 100644
--- a/metadata/md5-cache/app-emacs/rnc-mode-1.0.6
+++ b/metadata/md5-cache/app-emacs/rnc-mode-1.0.6
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/TreeRex/rnc-mode/archive/1.0.6.tar.gz -> rnc-mode-1.0.6.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=a88ec621d79879fd7772914c6f6f2545
diff --git a/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15 b/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
index 4480d02f9251..8a71d6fdd334 100644
--- a/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
+++ b/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rpm-spec-mode-0.15.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=c2e58e28a9eb5afcfb8279229609d7a2
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.4.1 b/metadata/md5-cache/app-emacs/ruby-mode-2.4.1
index d1a72eb366bf..c1b83af72e4b 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.4.1
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://ruby/ruby-2.4.1.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=5b90d05a551cff8902b6646aa64be2ef
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.5.3 b/metadata/md5-cache/app-emacs/ruby-mode-2.5.3
index 538f6e72badb..75bc89e1e541 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.5.3
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.5.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://ruby/ruby-2.5.3.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=bce0fbc8b9ddf49dbf2fb8ee40a177f7
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.5.5 b/metadata/md5-cache/app-emacs/ruby-mode-2.5.5
index 9833f4f98f6b..01b05a550d83 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.5.5
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.5.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://ruby/ruby-2.5.5.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=bce0fbc8b9ddf49dbf2fb8ee40a177f7
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.6.0 b/metadata/md5-cache/app-emacs/ruby-mode-2.6.0
index 43d5036a0457..ebaab306fe43 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.6.0
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/75bccbb384e6907df47ab69acdccb4536806c890.tar.gz -> ruby-mode-2.6.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=318f806f2cb0a2422797bfa1ec4d2ccc
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.6.3 b/metadata/md5-cache/app-emacs/ruby-mode-2.6.3
index 6956eac5a98c..d7bb1bb4c982 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.6.3
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.6.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/75bccbb384e6907df47ab69acdccb4536806c890.tar.gz -> ruby-mode-2.6.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=318f806f2cb0a2422797bfa1ec4d2ccc
diff --git a/metadata/md5-cache/app-emacs/rudel-0.3.1 b/metadata/md5-cache/app-emacs/rudel-0.3.1
index baacdcad04eb..0937e46872d9 100644
--- a/metadata/md5-cache/app-emacs/rudel-0.3.1
+++ b/metadata/md5-cache/app-emacs/rudel-0.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rudel-0.3.1.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=c1a209918a690f26dede24b956ebd6d8
diff --git a/metadata/md5-cache/app-emacs/rudel-0.3_pre20110721-r1 b/metadata/md5-cache/app-emacs/rudel-0.3_pre20110721-r1
index 521006676b06..9afc7ca1660c 100644
--- a/metadata/md5-cache/app-emacs/rudel-0.3_pre20110721-r1
+++ b/metadata/md5-cache/app-emacs/rudel-0.3_pre20110721-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rudel-0.3_pre20110721.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=85263b1b75dbbc1c717d2b0d2d6345e9
diff --git a/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20180221 b/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20180221
index a49db40c5eda..c2f70e72f304 100644
--- a/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20180221
+++ b/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20180221
@@ -8,5 +8,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rust-mode-0.3.0_p20180221.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=072f698d4157029219fc8b6f466d3e77
diff --git a/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125 b/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125
index 554760406e24..742feceebd62 100644
--- a/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125
+++ b/metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125
@@ -8,5 +8,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rust-mode-0.3.0_p20190125.tar.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=6e27e9c8ca0593c7a0c5117a654480ed
diff --git a/metadata/md5-cache/app-emacs/s-1.11.0 b/metadata/md5-cache/app-emacs/s-1.11.0
index 6ce905b74708..12c76ed57301 100644
--- a/metadata/md5-cache/app-emacs/s-1.11.0
+++ b/metadata/md5-cache/app-emacs/s-1.11.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/magnars/s.el/archive/1.11.0.tar.gz -> s-1.11.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=5973a823a15ca80de223c9ee8e21bf09
diff --git a/metadata/md5-cache/app-emacs/s-1.12.0 b/metadata/md5-cache/app-emacs/s-1.12.0
index 561c7a7c21c2..0b213a20d6f5 100644
--- a/metadata/md5-cache/app-emacs/s-1.12.0
+++ b/metadata/md5-cache/app-emacs/s-1.12.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/magnars/s.el/archive/1.12.0.tar.gz -> s-1.12.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=26b7b91b1ce43a1548726e13a0386190
diff --git a/metadata/md5-cache/app-emacs/scala-mode-2.10.3 b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
index 263f98e1a9a0..225a48767e2e 100644
--- a/metadata/md5-cache/app-emacs/scala-mode-2.10.3
+++ b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/scala >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://www.scala-lang.org/files/archive/scala-tool-support-2.10.3.tgz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=c166f8e1187eae832175edd2b5f13e37
diff --git a/metadata/md5-cache/app-emacs/scheme-complete-0.8.11 b/metadata/md5-cache/app-emacs/scheme-complete-0.8.11
index 10ea54587e06..aae7e17435e3 100644
--- a/metadata/md5-cache/app-emacs/scheme-complete-0.8.11
+++ b/metadata/md5-cache/app-emacs/scheme-complete-0.8.11
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://synthcode.com/emacs/scheme-complete-0.8.11.el.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=5aa9661dc7a8a9be71c72bab07eaccd7
diff --git a/metadata/md5-cache/app-emacs/scheme-complete-0.9.8 b/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
index d0d89386f2fd..3adf73751478 100644
--- a/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
+++ b/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://synthcode.com/emacs/scheme-complete-0.9.8.el.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=a4238fbf61393fde1f7420a692b0b6fb
diff --git a/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2 b/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2
index 03bd59de3582..79ebd9b7130e 100644
--- a/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2
+++ b/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-i18n/scim >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://launchpad.net/scim-bridge.el/0.8/0.8.2/+download/scim-bridge-el-0.8.2.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f746a632cae4d4b75d36768825daf800
diff --git a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107 b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107
index 8cb2b56cf7a7..b624912d8fed 100644
--- a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107
+++ b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20150107
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-ruby/sass >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/antonj/scss-mode/archive/b010d134f499c4b4ad33fe8a669a81e9a531b0b2.tar.gz -> scss-mode-0.5.0_p20150107.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=8b3f623a618bf25d264112a35f2b6433
diff --git a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1 b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
index de48b37af596..b512cc500566 100644
--- a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
+++ b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-ruby/sass >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/antonj/scss-mode/archive/cf58dbec5394280503eb5502938f3b5445d1b53d.tar.gz -> scss-mode-0.5.0_p20180123.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=f21b6da45eb524b1fa5e5a33f95afd56
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.6-r2 b/metadata/md5-cache/app-emacs/semi-1.14.6-r2
index 7a836f739629..c3ba55f9d2b2 100644
--- a/metadata/md5-cache/app-emacs/semi-1.14.6-r2
+++ b/metadata/md5-cache/app-emacs/semi-1.14.6-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.6 app-emacs/flim >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/semi-1.14.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7d28ccd67c642bcee2d381672cf60502
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517 b/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
index cb4f9733d8de..137782568429 100644
--- a/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
+++ b/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/wanderlust/semi/archive/4cf114c95fb49ad75eb6916f678b45b04bad8122.tar.gz -> semi-1.14.7_p20190517.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=b62f0b3e5b56ee3fd5063e89620eb163
diff --git a/metadata/md5-cache/app-emacs/session-2.3a b/metadata/md5-cache/app-emacs/session-2.3a
index a5c13e683232..6fcf5b5f57d8 100644
--- a/metadata/md5-cache/app-emacs/session-2.3a
+++ b/metadata/md5-cache/app-emacs/session-2.3a
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-session/session-2.3a.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=88c23321f526464402bec92e8090401a
diff --git a/metadata/md5-cache/app-emacs/setnu-1.06 b/metadata/md5-cache/app-emacs/setnu-1.06
index 3332cfb8373c..dfac70f7908b 100644
--- a/metadata/md5-cache/app-emacs/setnu-1.06
+++ b/metadata/md5-cache/app-emacs/setnu-1.06
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/setnu-1.06.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=98e5281c80d21620565645931af2c3c3
diff --git a/metadata/md5-cache/app-emacs/slime-2.15 b/metadata/md5-cache/app-emacs/slime-2.15
index ea1e331ce5cd..05b18689b0a3 100644
--- a/metadata/md5-cache/app-emacs/slime-2.15
+++ b/metadata/md5-cache/app-emacs/slime-2.15
@@ -11,5 +11,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.15.tar.gz -> slime-2.15.tar.gz
-_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98c79f3f2a6acba7af7899fb46c6e6ec
diff --git a/metadata/md5-cache/app-emacs/slime-2.20 b/metadata/md5-cache/app-emacs/slime-2.20
index 82e3771fc54f..b440d94fb8fe 100644
--- a/metadata/md5-cache/app-emacs/slime-2.20
+++ b/metadata/md5-cache/app-emacs/slime-2.20
@@ -10,5 +10,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.20.tar.gz -> slime-2.20.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=71fab08a56bba930e1b4c43108ccda3b
diff --git a/metadata/md5-cache/app-emacs/slime-2.20-r1 b/metadata/md5-cache/app-emacs/slime-2.20-r1
index 64737d820801..ab69db09759e 100644
--- a/metadata/md5-cache/app-emacs/slime-2.20-r1
+++ b/metadata/md5-cache/app-emacs/slime-2.20-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.20.tar.gz -> slime-2.20.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=0f0983bcef5b74f09cde1319baf3ed0c
diff --git a/metadata/md5-cache/app-emacs/slime-2.21 b/metadata/md5-cache/app-emacs/slime-2.21
index 5a509431894e..59c4edc18c12 100644
--- a/metadata/md5-cache/app-emacs/slime-2.21
+++ b/metadata/md5-cache/app-emacs/slime-2.21
@@ -10,5 +10,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.21.tar.gz -> slime-2.21.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=cfa0ecee09b801e6edc00e600cac08e1
diff --git a/metadata/md5-cache/app-emacs/sml-mode-6.4 b/metadata/md5-cache/app-emacs/sml-mode-6.4
index cb9845f0b9a1..ee92ec2b562a 100644
--- a/metadata/md5-cache/app-emacs/sml-mode-6.4
+++ b/metadata/md5-cache/app-emacs/sml-mode-6.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=mirror://gentoo/sml-mode-6.4.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=efa5606badc441fd5eb4b3efe4240a4e
diff --git a/metadata/md5-cache/app-emacs/sokoban-1.4 b/metadata/md5-cache/app-emacs/sokoban-1.4
index 20722829076b..4a70f0ceb7e6 100644
--- a/metadata/md5-cache/app-emacs/sokoban-1.4
+++ b/metadata/md5-cache/app-emacs/sokoban-1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://elpa.gnu.org/packages/sokoban-1.4.tar
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=8326b11b7282fc2081463a76e1ea434e
diff --git a/metadata/md5-cache/app-emacs/ssh-20120709 b/metadata/md5-cache/app-emacs/ssh-20120709
index 8883fdc1e927..537fe36e579d 100644
--- a/metadata/md5-cache/app-emacs/ssh-20120709
+++ b/metadata/md5-cache/app-emacs/ssh-20120709
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ssh-20120709.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=6a02d9ef2357593fecc321e4831db3cb
diff --git a/metadata/md5-cache/app-emacs/stripes-0.2-r2 b/metadata/md5-cache/app-emacs/stripes-0.2-r2
index c4192a0a76f4..9259dc90a525 100644
--- a/metadata/md5-cache/app-emacs/stripes-0.2-r2
+++ b/metadata/md5-cache/app-emacs/stripes-0.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/stripes-0.2.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=7eb82bdc4f260373724eb10f41d8b7d1
diff --git a/metadata/md5-cache/app-emacs/sumibi-0.7.4 b/metadata/md5-cache/app-emacs/sumibi-0.7.4
index 7b00ebea20a4..4d76fd7cd9d4 100644
--- a/metadata/md5-cache/app-emacs/sumibi-0.7.4
+++ b/metadata/md5-cache/app-emacs/sumibi-0.7.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/sumibi/26504/sumibi-0.7.4.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=c03ed682ab3cf377d43ebdaf661d4b0d
diff --git a/metadata/md5-cache/app-emacs/teco-7-r1 b/metadata/md5-cache/app-emacs/teco-7-r1
index 8507d2d228b3..33fc75f207d9 100644
--- a/metadata/md5-cache/app-emacs/teco-7-r1
+++ b/metadata/md5-cache/app-emacs/teco-7-r1
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/teco-7.el.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d215180cb6c6da72dd796d079310908
diff --git a/metadata/md5-cache/app-emacs/template-3.1c-r1 b/metadata/md5-cache/app-emacs/template-3.1c-r1
index eea1898b244b..442d0e4a107f 100644
--- a/metadata/md5-cache/app-emacs/template-3.1c-r1
+++ b/metadata/md5-cache/app-emacs/template-3.1c-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-template/template-3.1c.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=b640653dd9ae778d130218a172fa782f
diff --git a/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5 b/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
index 7faf7770e563..870e7d91642a 100644
--- a/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
+++ b/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/tempo-snippets-0.1.5.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=a0ad0574231c6a1a06a1b7db2832b23e
diff --git a/metadata/md5-cache/app-emacs/thinks-1.9 b/metadata/md5-cache/app-emacs/thinks-1.9
index 068599b9c981..ea50e591adda 100644
--- a/metadata/md5-cache/app-emacs/thinks-1.9
+++ b/metadata/md5-cache/app-emacs/thinks-1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/thinks-1.9.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=3187dc02b666ec3c67d53769f239f9af
diff --git a/metadata/md5-cache/app-emacs/thumbs-2.0-r1 b/metadata/md5-cache/app-emacs/thumbs-2.0-r1
index f24c08617470..ff4e11402f76 100644
--- a/metadata/md5-cache/app-emacs/thumbs-2.0-r1
+++ b/metadata/md5-cache/app-emacs/thumbs-2.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/imagemagick-tools >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/thumbs-2.0.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=59ed0a3153f789077c1ad81dfc262b5c
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.1 b/metadata/md5-cache/app-emacs/treepy-0.1.1
index 534ba9884fb4..fc72724a8195 100644
--- a/metadata/md5-cache/app-emacs/treepy-0.1.1
+++ b/metadata/md5-cache/app-emacs/treepy-0.1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/volrath/treepy.el/archive/0.1.1.tar.gz -> treepy-0.1.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=9fc5d7d371895f92b0c1732d69ddf4f1
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.10 b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.10
index 089411c85fbb..74cf344f0ef9 100644
--- a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.10
+++ b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ocaml/tuareg/archive/2.0.10.tar.gz -> tuareg-mode-2.0.10.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=6cb95f0709d0f461d48fa7852a05db25
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.7 b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.7
index 630588f1e3db..ca19e84a5717 100644
--- a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.7
+++ b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1304/tuareg-2.0.7.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=afdf53769bda7c55d8abf03dba8f93ce
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0 b/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
index db409b50d538..63709e6d1a44 100644
--- a/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
+++ b/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ GPL-3+ ISC
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/ocaml/tuareg/archive/2.2.0.tar.gz -> tuareg-mode-2.2.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=cc3901a5b658ac4fd7501d0a1cea8669
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-2.0.0 b/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
index 637ddb62f9cb..3b4a5cf69fb4 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
+++ b/metadata/md5-cache/app-emacs/twittering-mode-2.0.0
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=627ba6b052ce20c6d7f16036f942469f
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-3.0.0 b/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
index 99ba81e53590..d6bc8dea7ff7 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
+++ b/metadata/md5-cache/app-emacs/twittering-mode-3.0.0
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg >=virtual/emacs-23
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=627ba6b052ce20c6d7f16036f942469f
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-9999 b/metadata/md5-cache/app-emacs/twittering-mode-9999
index 86b6ec6f0474..0b65a61ae960 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-9999
+++ b/metadata/md5-cache/app-emacs/twittering-mode-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-crypt/gnupg >=virtual/emacs-23
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=627ba6b052ce20c6d7f16036f942469f
diff --git a/metadata/md5-cache/app-emacs/typing-1.1.4 b/metadata/md5-cache/app-emacs/typing-1.1.4
index 68864504384c..865c50cfc55f 100644
--- a/metadata/md5-cache/app-emacs/typing-1.1.4
+++ b/metadata/md5-cache/app-emacs/typing-1.1.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/typing-1.1.4.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=ef3e908bcaa24c775e4791f433218148
diff --git a/metadata/md5-cache/app-emacs/uboat-1.2 b/metadata/md5-cache/app-emacs/uboat-1.2
index ef149ea25937..2d19f4b96df2 100644
--- a/metadata/md5-cache/app-emacs/uboat-1.2
+++ b/metadata/md5-cache/app-emacs/uboat-1.2
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/uboat-1.2.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=a4edd7440c098542e65aafc1df3ffef6
diff --git a/metadata/md5-cache/app-emacs/undo-tree-0.6.6 b/metadata/md5-cache/app-emacs/undo-tree-0.6.6
index 0ee5ccbe2bac..1be17b940deb 100644
--- a/metadata/md5-cache/app-emacs/undo-tree-0.6.6
+++ b/metadata/md5-cache/app-emacs/undo-tree-0.6.6
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/undo-tree-0.6.6.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=1ab3ccd61c2c1ac84c0473a469b00aca
diff --git a/metadata/md5-cache/app-emacs/uptimes-2.3-r2 b/metadata/md5-cache/app-emacs/uptimes-2.3-r2
index bf6b9eef40b8..4e715d80c246 100644
--- a/metadata/md5-cache/app-emacs/uptimes-2.3-r2
+++ b/metadata/md5-cache/app-emacs/uptimes-2.3-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/uptimes-2.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1011ae0c1861069d51b9571421a282bf
diff --git a/metadata/md5-cache/app-emacs/uptimes-3.7 b/metadata/md5-cache/app-emacs/uptimes-3.7
index 753bd2b819e6..abb0c4793776 100644
--- a/metadata/md5-cache/app-emacs/uptimes-3.7
+++ b/metadata/md5-cache/app-emacs/uptimes-3.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/davep/uptimes.el/archive/v3.7.tar.gz -> uptimes-3.7.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=f18f07ed2af71f79fa0c30e65895cdd0
diff --git a/metadata/md5-cache/app-emacs/vhdl-mode-3.35.1 b/metadata/md5-cache/app-emacs/vhdl-mode-3.35.1
deleted file mode 100644
index 72afe85ef10e..000000000000
--- a/metadata/md5-cache/app-emacs/vhdl-mode-3.35.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=VHDL-mode for Emacs
-EAPI=5
-HOMEPAGE=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.35.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=f9943ae7c250413f2b77bc5a3eff212a
diff --git a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1 b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
index 0035fa6d5466..2d5ea8bd8dfd 100644
--- a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
+++ b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DEPEND=>=virtual/emacs-23
 DESCRIPTION=VHDL-mode for Emacs
 EAPI=5
-HOMEPAGE=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html
-KEYWORDS=~amd64 ~ppc ~x86
+HOMEPAGE=https://iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
-SRC_URI=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.38.1.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
-_md5_=62c3b163113cb5ecc9fe2848a0e99766
+SRC_URI=https://iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.38.1.tar.gz
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_md5_=78612be4d30c7fe18534686eddc589df
diff --git a/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12 b/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
index a4a44bd4470b..ef98bced2d00 100644
--- a/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
+++ b/metadata/md5-cache/app-emacs/visual-basic-mode-1.4.12
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/visual-basic-mode-1.4.12.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=0645a45d338aa208d72d3425f151710b
diff --git a/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1 b/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
index 69086111cd6a..d46a4ef0161b 100644
--- a/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
+++ b/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://launchpad.net/vm/8.2.x/8.2.0b/+download/vm-8.2.0b.tgz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=d2de21c69870a3cc1f3bc33896ca824b
diff --git a/metadata/md5-cache/app-emacs/volume-1.0-r1 b/metadata/md5-cache/app-emacs/volume-1.0-r1
index e28923c3f3f9..0b12d6c130df 100644
--- a/metadata/md5-cache/app-emacs/volume-1.0-r1
+++ b/metadata/md5-cache/app-emacs/volume-1.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/volume-1.0.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=0f855b888df369f97e1284f12ab69058
diff --git a/metadata/md5-cache/app-emacs/w3mnav-0.5-r3 b/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
index 8880e78a388c..f3dd1bf69d5c 100644
--- a/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
+++ b/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/emacs-w3m >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/w3mnav-0.5.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=336c697e2cbbeba2bbc165d2f5a0d46d
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
index cb4166e6dc3e..02948dc34749 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.6 app-emacs/flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/wanderlust/wanderlust/archive/395826e99b84051396d503392f52462b6cb683a5.tar.gz -> wanderlust-2.15.9_p20180814-git.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=53d1699af8d77de085d5e7eac3257e2d
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
index 945879fb2e41..0bb2f109aaa7 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-emacs/semi-1.14.7 bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/wanderlust/wanderlust/archive/b9a529a54b9e7eafa4ed230ad28efffe0d25a20e.tar.gz -> wanderlust-2.15.9_p20190623.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=7490372a61eea0fc18608be25b0564f9
diff --git a/metadata/md5-cache/app-emacs/websocket-1.10 b/metadata/md5-cache/app-emacs/websocket-1.10
index 80930acaa8f5..87b7c23b0f3c 100644
--- a/metadata/md5-cache/app-emacs/websocket-1.10
+++ b/metadata/md5-cache/app-emacs/websocket-1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.10.tar.gz -> websocket-1.10.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=67b7c84697fc173cc3a45d1aa4b19e12
diff --git a/metadata/md5-cache/app-emacs/websocket-1.9 b/metadata/md5-cache/app-emacs/websocket-1.9
index fa18f3ab838a..b928df91e3c3 100644
--- a/metadata/md5-cache/app-emacs/websocket-1.9
+++ b/metadata/md5-cache/app-emacs/websocket-1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.9.tar.gz -> websocket-1.9.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=26faabf678902bfaab8e819b75d7a17f
diff --git a/metadata/md5-cache/app-emacs/wgrep-2.1.10 b/metadata/md5-cache/app-emacs/wgrep-2.1.10
index b703db7601c0..b82f2243adb6 100644
--- a/metadata/md5-cache/app-emacs/wgrep-2.1.10
+++ b/metadata/md5-cache/app-emacs/wgrep-2.1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/wgrep-2.1.10.el.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c3071d842cb38c7f5ae3c8e369d498c
diff --git a/metadata/md5-cache/app-emacs/whine-20091222 b/metadata/md5-cache/app-emacs/whine-20091222
index dfbfe57c9409..d9875485982e 100644
--- a/metadata/md5-cache/app-emacs/whine-20091222
+++ b/metadata/md5-cache/app-emacs/whine-20091222
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/whine-20091222.tar.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=fdf86ad9c0d6595994973414d7ffb60a
diff --git a/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r1 b/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r1
index 5b92a53f4a49..826b19f281ae 100644
--- a/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r1
+++ b/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=outline-magic? ( app-emacs/outline-magic ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/wikipedia-mode-0.5.el.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=08d9ac28756db02a2c36ff1fa3910d6e
diff --git a/metadata/md5-cache/app-emacs/windows-2.49 b/metadata/md5-cache/app-emacs/windows-2.49
index 0211ab1f8203..f63a6d31fc3b 100644
--- a/metadata/md5-cache/app-emacs/windows-2.49
+++ b/metadata/md5-cache/app-emacs/windows-2.49
@@ -8,5 +8,5 @@ LICENSE=yuuji
 RDEPEND=app-emacs/revive >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/windows-2.49.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=9c6a2d43c06f511f5d9069322a3e25b9
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.7.2 b/metadata/md5-cache/app-emacs/with-editor-2.7.2
index a4feca81f39b..cc41be2b8ea6 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.7.2
+++ b/metadata/md5-cache/app-emacs/with-editor-2.7.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.5.0 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.7.2.tar.gz -> with-editor-2.7.2.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=dc3c2676a35393f51aaf7231721280f6
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.7.4 b/metadata/md5-cache/app-emacs/with-editor-2.7.4
index e5016ae20d56..f8988d5257fe 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.7.4
+++ b/metadata/md5-cache/app-emacs/with-editor-2.7.4
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.5.0 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.7.4.tar.gz -> with-editor-2.7.4.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=cc3c78a4e036b977344846e8ef7fa967
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.8.0 b/metadata/md5-cache/app-emacs/with-editor-2.8.0
index c3a7691f42cb..f56c9baf02a4 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.8.0
+++ b/metadata/md5-cache/app-emacs/with-editor-2.8.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.5.0 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.8.0.tar.gz -> with-editor-2.8.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=42c5462dd5f0b70697eb79dcd329303d
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.8.3 b/metadata/md5-cache/app-emacs/with-editor-2.8.3
index 66df926fa173..f9ec6d7c6dbb 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.8.3
+++ b/metadata/md5-cache/app-emacs/with-editor-2.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.5.0 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.8.3.tar.gz -> with-editor-2.8.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=c18c94bc0bd6d8fc4df4fbb9fb46d739
diff --git a/metadata/md5-cache/app-emacs/xclip-1.3 b/metadata/md5-cache/app-emacs/xclip-1.3
index 774818db614d..565e6f0af5ca 100644
--- a/metadata/md5-cache/app-emacs/xclip-1.3
+++ b/metadata/md5-cache/app-emacs/xclip-1.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-misc/xclip >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xclip-1.3.el.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8da3c8200ce64b7fa2322c2b70402420
diff --git a/metadata/md5-cache/app-emacs/xclip-1.9 b/metadata/md5-cache/app-emacs/xclip-1.9
index 7899307bf4da..64498ceda7fd 100644
--- a/metadata/md5-cache/app-emacs/xclip-1.9
+++ b/metadata/md5-cache/app-emacs/xclip-1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-misc/xclip >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xclip-1.9.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=57b70a562ce082462abc1dc0139f38f1
diff --git a/metadata/md5-cache/app-emacs/xrdb-mode-3.0 b/metadata/md5-cache/app-emacs/xrdb-mode-3.0
index aadddb241ef3..69ee4de9f184 100644
--- a/metadata/md5-cache/app-emacs/xrdb-mode-3.0
+++ b/metadata/md5-cache/app-emacs/xrdb-mode-3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xrdb-mode-3.0.el.xz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=541145a3b5eb70361e5e41b30fe467c7
diff --git a/metadata/md5-cache/app-emacs/xslide-0.2.2 b/metadata/md5-cache/app-emacs/xslide-0.2.2
index 3fa3c7bf6220..64f1d4556d19 100644
--- a/metadata/md5-cache/app-emacs/xslide-0.2.2
+++ b/metadata/md5-cache/app-emacs/xslide-0.2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/xslide/xslide-0.2.2.zip
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=a3ebcd4d5cbb38412e32052f6098683a
diff --git a/metadata/md5-cache/app-emacs/xslide-0.2.2-r1 b/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
index 498bf642ebc4..1c53f9908324 100644
--- a/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
+++ b/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/xslide/xslide-0.2.2.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=ee9e3488b1194abd77a4d6025bd7f0ba
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.13 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
index 1d34b6dd8d34..0f7558819a03 100644
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/v0.0.13.tar.gz -> yaml-mode-0.0.13.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=029b1ca777a1da09d6ec863765f4f768
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.14 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.14
index 3ddd2fe51bf4..ebcd1a1c8f1b 100644
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.14
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/0.0.14.tar.gz -> yaml-mode-0.0.14.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=b537b8a5f7a6b955104ba49d1def4dc4
diff --git a/metadata/md5-cache/app-emacs/yasnippet-0.13.0 b/metadata/md5-cache/app-emacs/yasnippet-0.13.0
index c371985c6ee3..802e12e643f4 100644
--- a/metadata/md5-cache/app-emacs/yasnippet-0.13.0
+++ b/metadata/md5-cache/app-emacs/yasnippet-0.13.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/joaotavora/yasnippet/archive/0.13.0.tar.gz -> yasnippet-0.13.0.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=bd888dc018b439f9ef025d6d6d9c8afa
diff --git a/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3 b/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3
index bf99e3401f23..dcfb5ba8bfe9 100644
--- a/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3
+++ b/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/yasnippet >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/AndreaCrotti/yasnippet-snippets/archive/0.3.tar.gz -> yasnippet-snippets-0.3.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=aa9a65c265773043b88e1e4239cd3d42
diff --git a/metadata/md5-cache/app-emacs/yatex-1.77 b/metadata/md5-cache/app-emacs/yatex-1.77
index abe60e83f9e4..2aad19d69f79 100644
--- a/metadata/md5-cache/app-emacs/yatex-1.77
+++ b/metadata/md5-cache/app-emacs/yatex-1.77
@@ -9,5 +9,5 @@ LICENSE=YaTeX
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.yatex.org/yatex1.77.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=0a017d44ad43de339becebe423198e85
diff --git a/metadata/md5-cache/app-emacs/yatex-1.80 b/metadata/md5-cache/app-emacs/yatex-1.80
index c304bc91896a..ba2073c7b3ac 100644
--- a/metadata/md5-cache/app-emacs/yatex-1.80
+++ b/metadata/md5-cache/app-emacs/yatex-1.80
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.yatex.org/yatex1.80.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=f4c92cd4841c0e0990b37d94fc57fc9c
diff --git a/metadata/md5-cache/app-emacs/yc-4.0.13 b/metadata/md5-cache/app-emacs/yc-4.0.13
index 23a251d3ef62..d05ca26938f2 100644
--- a/metadata/md5-cache/app-emacs/yc-4.0.13
+++ b/metadata/md5-cache/app-emacs/yc-4.0.13
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/canna >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.ceres.dti.ne.jp/~knak/yc-4.0.13.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=446ae9aa76456fa7f49fe9beeb11b86d
diff --git a/metadata/md5-cache/app-emacs/yc-5.2.1 b/metadata/md5-cache/app-emacs/yc-5.2.1
index 2650ed7894b6..aaf4e32226b4 100644
--- a/metadata/md5-cache/app-emacs/yc-5.2.1
+++ b/metadata/md5-cache/app-emacs/yc-5.2.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/canna >=virtual/emacs-23
 SLOT=0
 SRC_URI=http://www.ceres.dti.ne.jp/~knak/yc-5.2.1.el.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738
 _md5_=3f3e22fba959d3df0c008b9bee62491a
diff --git a/metadata/md5-cache/app-emacs/zenburn-20110907 b/metadata/md5-cache/app-emacs/zenburn-20110907
index fdcbc95b0f24..b16fb8f032e2 100644
--- a/metadata/md5-cache/app-emacs/zenburn-20110907
+++ b/metadata/md5-cache/app-emacs/zenburn-20110907
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-emacs/color-theme >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/zenburn-20110907.el.bz2
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54
 _md5_=0444710e08f7861c49dbaf7e31af60dc
diff --git a/metadata/md5-cache/app-emacs/zenburn-20110907-r1 b/metadata/md5-cache/app-emacs/zenburn-20110907-r1
index 9a73ce719945..37eae6823157 100644
--- a/metadata/md5-cache/app-emacs/zenburn-20110907-r1
+++ b/metadata/md5-cache/app-emacs/zenburn-20110907-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/color-theme >=virtual/emacs-23
 SLOT=0
 SRC_URI=https://github.com/dbrock/zenburn-el/archive/2b0672b04ef3e95c25f849dceb10d669296a188b.tar.gz -> zenburn-20110907.tar.gz
-_eclasses_=elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=963e4f4a9bb96baefd406ce2cb3ab734
diff --git a/metadata/md5-cache/app-emacs/zenirc-2.112-r1 b/metadata/md5-cache/app-emacs/zenirc-2.112-r1
index 2832b44b46aa..444403c5cfee 100644
--- a/metadata/md5-cache/app-emacs/zenirc-2.112-r1
+++ b/metadata/md5-cache/app-emacs/zenirc-2.112-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/emacs-23
 SLOT=0
 SRC_URI=ftp://ftp.zenirc.org/pub/zenirc/zenirc-2.112.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	f8026e46da659669c11e50c306d1aeb8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp	11f1230b542918f2de1aef02bfbb3539	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=73190e220769f4edb81899bc83450855
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 55d5f9a8cbc0..0a6a2e91248f 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/buildah-1.11.1 b/metadata/md5-cache/app-emulation/buildah-1.11.1
new file mode 100644
index 000000000000..fa4d57d716ed
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/buildah-1.11.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+DESCRIPTION=A tool that facilitates building OCI images
+EAPI=7
+HOMEPAGE=https://github.com/containers/buildah
+IUSE=ostree selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+REQUIRED_USE=!selinux? ( !ostree )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/buildah/archive/v1.11.1.tar.gz -> buildah-1.11.1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b7ad4286bc571bfaa28af0d7cdae8af6
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.25.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.25.0
deleted file mode 100644
index 5e20f5b47584..000000000000
--- a/metadata/md5-cache/app-emulation/diskimage-builder-2.25.0
+++ /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 ) >=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(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[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(-)] !~dev-python/pbr-2.1.0[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(-)] dev-python/setuptools[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(-)]
-DESCRIPTION=Golden Disk Image builder.
-EAPI=7
-HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[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(-)] !~dev-python/pbr-2.1.0[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(-)] >=dev-python/Babel-2.3.4[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(-)] !~dev-python/Babel-2.4.0[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(-)] >=dev-python/networkx-1.10[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(-)] <dev-python/networkx-2.3[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(-)] >=dev-python/pyyaml-3.12[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(-)] >=dev-python/flake8-2.5.4[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(-)] <dev-python/flake8-2.6.0[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(-)] >=dev-python/six-1.10.0[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(-)] >=dev-python/stevedore-1.20.0[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(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[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(-)] 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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.25.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c3f001ad332dd37f000934422628cc88
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.26.1 b/metadata/md5-cache/app-emulation/diskimage-builder-2.26.1
index f137288dc05a..48a0aff18b1d 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-2.26.1
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.26.1
@@ -5,11 +5,11 @@ DESCRIPTION=Golden Disk Image builder.
 EAPI=7
 HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
 IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[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(-)] !~dev-python/pbr-2.1.0[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(-)] >=dev-python/Babel-2.3.4[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(-)] !~dev-python/Babel-2.4.0[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(-)] >=dev-python/networkx-1.10[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(-)] <dev-python/networkx-2.3[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(-)] >=dev-python/pyyaml-3.12[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(-)] >=dev-python/flake8-2.5.4[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(-)] <dev-python/flake8-2.6.0[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(-)] >=dev-python/six-1.10.0[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(-)] >=dev-python/stevedore-1.20.0[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(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[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(-)] 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.26.1.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=289d8821949768cc2f10aedf84e6d6bc
+_md5_=c3f001ad332dd37f000934422628cc88
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.27.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.27.0
new file mode 100644
index 000000000000..34740410869c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.27.0
@@ -0,0 +1,15 @@
+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 ) >=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pbr-2.0.0[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(-)] !~dev-python/pbr-2.1.0[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(-)] dev-python/setuptools[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(-)]
+DESCRIPTION=Golden Disk Image builder.
+EAPI=7
+HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[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(-)] !~dev-python/pbr-2.1.0[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(-)] >=dev-python/Babel-2.3.4[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(-)] !~dev-python/Babel-2.4.0[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(-)] >=dev-python/networkx-1.10[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(-)] <dev-python/networkx-2.3[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(-)] >=dev-python/pyyaml-3.12[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(-)] >=dev-python/flake8-2.5.4[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(-)] <dev-python/flake8-2.6.0[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(-)] >=dev-python/six-1.10.0[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(-)] >=dev-python/stevedore-1.20.0[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(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[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(-)] 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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.27.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=289d8821949768cc2f10aedf84e6d6bc
diff --git a/metadata/md5-cache/app-emulation/docker-18.09.8 b/metadata/md5-cache/app-emulation/docker-18.09.8
index 65fb01c15b31..0adde3ecccec 100644
--- a/metadata/md5-cache/app-emulation/docker-18.09.8
+++ b/metadata/md5-cache/app-emulation/docker-18.09.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v18.09.8.tar.gz -> docker-18.09.8.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=aa7865e444756f95c1ffb8e7c4ee4e9c
diff --git a/metadata/md5-cache/app-emulation/docker-18.09.9 b/metadata/md5-cache/app-emulation/docker-18.09.9
index 986df1018e54..33984ac97f3b 100644
--- a/metadata/md5-cache/app-emulation/docker-18.09.9
+++ b/metadata/md5-cache/app-emulation/docker-18.09.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v18.09.9.tar.gz -> docker-18.09.9.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=84649449b43a02bde56528c10910e243
diff --git a/metadata/md5-cache/app-emulation/docker-19.03.1 b/metadata/md5-cache/app-emulation/docker-19.03.1
index 9e296ecb464a..4474b478b1e1 100644
--- a/metadata/md5-cache/app-emulation/docker-19.03.1
+++ b/metadata/md5-cache/app-emulation/docker-19.03.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.1.tar.gz -> docker-19.03.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=2977435d6cb7721affd11b4bf2924a58
diff --git a/metadata/md5-cache/app-emulation/docker-19.03.2 b/metadata/md5-cache/app-emulation/docker-19.03.2
index a0c740800e70..725bf2b8c893 100644
--- a/metadata/md5-cache/app-emulation/docker-19.03.2
+++ b/metadata/md5-cache/app-emulation/docker-19.03.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.2.tar.gz -> docker-19.03.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=b97742ba524778fddf06e68bc99e4c87
diff --git a/metadata/md5-cache/app-emulation/ganeti-instance-image-0.6-r1 b/metadata/md5-cache/app-emulation/ganeti-instance-image-0.6-r1
deleted file mode 100644
index d40753b8ca9d..000000000000
--- a/metadata/md5-cache/app-emulation/ganeti-instance-image-0.6-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Scripts to build out CD or image based VMs using Ganeti
-EAPI=7
-HOMEPAGE=http://code.osuosl.org/projects/ganeti-image
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/dump >=app-emulation/ganeti-2.15.2-r7 app-emulation/qemu sys-apps/util-linux sys-fs/multipath-tools sys-fs/e2fsprogs
-SLOT=0
-SRC_URI=http://ftp.osuosl.org/pub/osl/ganeti-instance-image/ganeti-instance-image-0.6.tar.gz
-_md5_=22aac4db005212c70381da44b2b192c3
diff --git a/metadata/md5-cache/app-emulation/img-0.5.6 b/metadata/md5-cache/app-emulation/img-0.5.6
deleted file mode 100644
index 7099c70444ef..000000000000
--- a/metadata/md5-cache/app-emulation/img-0.5.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Standalone daemon-less unprivileged Dockerfile and OCI container image builder
-EAPI=6
-HOMEPAGE=https://github.com/genuinetools/img
-IUSE=seccomp
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/genuinetools/img/archive/v0.5.6.tar.gz -> img-0.5.6.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=c4fcbeb9d66b2ec1d41a16cf257cd6df
diff --git a/metadata/md5-cache/app-emulation/lxd-3.12 b/metadata/md5-cache/app-emulation/lxd-3.12
deleted file mode 100644
index 5e2ac60bf5c2..000000000000
--- a/metadata/md5-cache/app-emulation/lxd-3.12
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install postinst prepare setup test
-DEPEND=dev-lang/tcl >=dev-lang/go-1.9.4 dev-libs/libuv dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq net-misc/curl sys-devel/gettext )
-DESCRIPTION=Fast, dense and secure container management
-EAPI=7
-HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
-IUSE=+daemon +ipv6 +dnsmasq nls test tools kernel_linux
-KEYWORDS=amd64
-LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
-RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dev-libs/libuv dev-libs/lzo dev-util/xdelta:3 dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-firewall/ebtables net-firewall/iptables[ipv6?] net-libs/libnfnetlink net-libs/libnsl:0= net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/fuse sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl )
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-3.12.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=84116ec8465f4877b4e0d5c6375c82b7
diff --git a/metadata/md5-cache/app-emulation/lxd-3.14 b/metadata/md5-cache/app-emulation/lxd-3.14
index d5a615c6aed0..625f475974e0 100644
--- a/metadata/md5-cache/app-emulation/lxd-3.14
+++ b/metadata/md5-cache/app-emulation/lxd-3.14
@@ -5,10 +5,10 @@ DESCRIPTION=Fast, dense and secure container management
 EAPI=7
 HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
 IUSE=+daemon +ipv6 +dnsmasq nls test tools kernel_linux
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
 RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dev-libs/libuv dev-libs/lzo dev-util/xdelta:3 dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-firewall/ebtables net-firewall/iptables[ipv6?] net-libs/libnfnetlink net-libs/libnsl:0= net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/fuse sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-3.14.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=07aa339a4202b51aac34cf2641ea3a52
+_md5_=e484789f2deb6084ac35cebd4374eda6
diff --git a/metadata/md5-cache/app-emulation/lxd-3.16 b/metadata/md5-cache/app-emulation/lxd-3.16
new file mode 100644
index 000000000000..ca93735a9482
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxd-3.16
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install postinst prepare setup test
+DEPEND=dev-lang/tcl >=dev-lang/go-1.9.4 dev-libs/libuv dev-libs/protobuf nls? ( sys-devel/gettext ) test? ( app-misc/jq net-misc/curl sys-devel/gettext )
+DESCRIPTION=Fast, dense and secure container management
+EAPI=7
+HOMEPAGE=https://linuxcontainers.org/lxd/introduction/
+IUSE=+daemon +ipv6 +dnsmasq nls test tools kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
+RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dev-libs/libuv dev-libs/lzo dev-util/xdelta:3 dnsmasq? ( net-dns/dnsmasq[dhcp,ipv6?] ) net-firewall/ebtables net-firewall/iptables[ipv6?] net-libs/libnfnetlink net-libs/libnsl:0= net-misc/rsync[xattr] sys-apps/iproute2[ipv6?] sys-fs/fuse sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl )
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-3.16.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=2a289ad072711ecb5898c90f2c8fa092
diff --git a/metadata/md5-cache/app-emulation/qemu-4.0.0-r50 b/metadata/md5-cache/app-emulation/qemu-4.0.0-r50
index 39a20b2edbc5..d5a4aaf5f262 100644
--- a/metadata/md5-cache/app-emulation/qemu-4.0.0-r50
+++ b/metadata/md5-cache/app-emulation/qemu-4.0.0-r50
@@ -11,5 +11,5 @@ RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
 SRC_URI=http://wiki.qemu-project.org/download/qemu-4.0.0.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2265e283ed94ba3ff44ead1a15abc37
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index 4b7c9060b4d0..fdd82bfac3a5 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.5.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl2[X] media-libs/libsdl2 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh-0.8.6 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
 SLOT=0
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	562b380fc59ae6a8622171d0acb777d1	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	562b380fc59ae6a8622171d0acb777d1	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1e2e171fa003a8fc890b050bf9c0a2f
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0
index 7c0edbc82190..3fc2bfbefa68 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD-2
 RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-3.1.0.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=b1df1cd62e727016623e1401312cddf7
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-4.0.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-4.0.0
index 26a0b3121003..aad0cae46037 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-4.0.0
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-4.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD-2
 RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-4.0.0.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=b1df1cd62e727016623e1401312cddf7
diff --git a/metadata/md5-cache/app-emulation/virtio-win-0.1.117 b/metadata/md5-cache/app-emulation/virtio-win-0.1.117
deleted file mode 100644
index 22c711c4054b..000000000000
--- a/metadata/md5-cache/app-emulation/virtio-win-0.1.117
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=VirtIO drivers for Windows virtual machines running on KVM
-EAPI=6
-HOMEPAGE=https://fedoraproject.org/wiki/Windows_Virtio_Drivers
-KEYWORDS=~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.117-1/virtio-win-0.1.117.iso
-_md5_=73298ea1756521f2272040a60b7eb17e
diff --git a/metadata/md5-cache/app-emulation/virtio-win-0.1.118 b/metadata/md5-cache/app-emulation/virtio-win-0.1.118
deleted file mode 100644
index 5bea23235b80..000000000000
--- a/metadata/md5-cache/app-emulation/virtio-win-0.1.118
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=VirtIO drivers for Windows virtual machines running on KVM
-EAPI=6
-HOMEPAGE=https://fedoraproject.org/wiki/Windows_Virtio_Drivers
-KEYWORDS=~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.118-2/virtio-win-0.1.118.iso
-_md5_=97d0d95558b71417c31e4d703c03e468
diff --git a/metadata/md5-cache/app-emulation/virtio-win-0.1.126 b/metadata/md5-cache/app-emulation/virtio-win-0.1.126
deleted file mode 100644
index c089bbf8e630..000000000000
--- a/metadata/md5-cache/app-emulation/virtio-win-0.1.126
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=VirtIO drivers for Windows virtual machines running on KVM
-EAPI=6
-HOMEPAGE=https://fedoraproject.org/wiki/Windows_Virtio_Drivers
-KEYWORDS=~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.126-2/virtio-win-0.1.126.iso
-_md5_=97d0d95558b71417c31e4d703c03e468
diff --git a/metadata/md5-cache/app-emulation/virtio-win-0.1.141 b/metadata/md5-cache/app-emulation/virtio-win-0.1.141
deleted file mode 100644
index 856b6d7c92ae..000000000000
--- a/metadata/md5-cache/app-emulation/virtio-win-0.1.141
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=VirtIO drivers for Windows virtual machines running on KVM
-EAPI=6
-HOMEPAGE=https://fedoraproject.org/wiki/Windows_Virtio_Drivers
-KEYWORDS=~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.141-1/virtio-win-0.1.141.iso
-_md5_=910dde8294dd8ab77586f95b2ae5492a
diff --git a/metadata/md5-cache/app-emulation/virtio-win-0.1.96 b/metadata/md5-cache/app-emulation/virtio-win-0.1.96
deleted file mode 100644
index 75e1636d970d..000000000000
--- a/metadata/md5-cache/app-emulation/virtio-win-0.1.96
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=VirtIO drivers for Windows virtual machines running on KVM
-EAPI=6
-HOMEPAGE=https://fedoraproject.org/wiki/Windows_Virtio_Drivers
-KEYWORDS=~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.96/virtio-win-0.1.96.iso
-_md5_=9bd784e5ccddcf6709428cb169fb6cd5
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.26-r1 b/metadata/md5-cache/app-emulation/virtualbox-5.2.26-r1
index fbf607c0968b..ff88fe3b80ff 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.26-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.26-r1
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.26 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.26/VirtualBox-5.2.26.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16df60c8d8c0f5611c476eb29e90ecfa
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.32 b/metadata/md5-cache/app-emulation/virtualbox-5.2.32
index 0c6f1d522091..90f31fce05db 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.32
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.32
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.32 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.32/VirtualBox-5.2.32.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8692155f2a6fd5dbd0aafd6b1f9781d4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.10-r2 b/metadata/md5-cache/app-emulation/virtualbox-6.0.10-r2
index 2afde224dbe8..115f9451562c 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.0.10-r2
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.0.10-r2
@@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.10 d
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.0.10/VirtualBox-6.0.10.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b394308c92c5864f842ddd52cd827012
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.12 b/metadata/md5-cache/app-emulation/virtualbox-6.0.12
index e8b8618c2f6b..677c80c977c9 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.0.12
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.0.12
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.0.12/VirtualBox-6.0.12.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aac7b6db1f56ca64dc781979707cb974
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.26.128414 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.26.128414
index 07a4133ecee0..ce85237463e3 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.26.128414
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.26.128414
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.26/VirtualBox-5.2.26-128414-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.26/VirtualBox-5.2.26-128414-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.26/Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.26/VirtualBoxSDK-5.2.26-128414.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8aa42b5af0969cb237c8c38fd8953fe1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.32.132073 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.32.132073
index 0365762e7d77..ddb2a407eb0f 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.32.132073
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.32.132073
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/5.2.32/VirtualBox-5.2.32-132073-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.32/VirtualBox-5.2.32-132073-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.32/Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.32/VirtualBoxSDK-5.2.32-132073.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=add035897216fed267cc0a161529b906
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.10.132072 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.10.132072
deleted file mode 100644
index 0981100526cf..000000000000
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.10.132072
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
-EAPI=6
-HOMEPAGE=https://www.virtualbox.org/
-IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2 PUEL
-RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-6.0.10 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/6.0.10/VirtualBox-6.0.10-132072-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.0.10/Oracle_VM_VirtualBox_Extension_Pack-6.0.10-132072.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.10-132072.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.0.10/VirtualBoxSDK-6.0.10-132072.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a5868a443cebca912511404e10eeae8
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.12.133076 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.12.133076
index 5d9d80bf94de..7d502a1034d5 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.12.133076
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.12.133076
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( https://download.virtualbox.org/virtualbox/6.0.12/VirtualBox-6.0.12-133076-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.0.12/Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.0.12/VirtualBoxSDK-6.0.12-133076.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a5868a443cebca912511404e10eeae8
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index aaf550226ef3..1f1a396402e8 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-6 b/metadata/md5-cache/app-eselect/eselect-repository-6
deleted file mode 100644
index 47425929035b..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-repository-6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DESCRIPTION=Manage repos.conf via eselect
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/eselect-repository
-IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-admin/eselect dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-misc/wget
-REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/eselect-repository/archive/v6.tar.gz -> eselect-repository-6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=5c73478003300cb53aa050ce7d0e64cf
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 76b4182c0c4f..e99e759e70c1 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/cstools-3.42 b/metadata/md5-cache/app-i18n/cstools-3.42
index 4d4c554a6f46..1bac7506be38 100644
--- a/metadata/md5-cache/app-i18n/cstools-3.42
+++ b/metadata/md5-cache/app-i18n/cstools-3.42
@@ -8,5 +8,5 @@ LICENSE=Artistic
 RDEPEND=dev-perl/MIME-tools dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=https://www.adelton.com/perl/Cstools/Cstools-3.42.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=21872550f3204c7aeb709f22a4917233
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.20 b/metadata/md5-cache/app-i18n/ibus-1.5.20
index 058ff0005ea9..80d8faeadf94 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.20
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.20
@@ -4,11 +4,11 @@ DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=6
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 IUSE=+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
 REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) introspection ) test? ( gtk ) vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.20/ibus-1.5.20.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89f9387e583de312255747b7888df8ad
+_md5_=4bf697c7737bbf90d53eb081cf3c1f84
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1
index 9c5ea39a55ab..6df8e9e4e385 100644
--- a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1
+++ b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Korean Hangul engine for IBus
 EAPI=6
 HOMEPAGE=https://github.com/libhangul/ibus-hangul/wiki
 IUSE=nls python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libhangul-0.1 nls? ( virtual/libintl )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/libhangul/ibus-hangul/releases/download/1.5.1/ibus-hangul-1.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=64502ff86f93e5b19e0ca816c888c127
+_md5_=e19d412dfd577866ad1b5876d905e30c
diff --git a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r2 b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r2
index 3d6a4229abf3..ec979bd67852 100644
--- a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r2
+++ b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/freewnn x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-freewnn-0.0.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ece45dc0b4cb95e3b042b0aa511a4bdc
diff --git a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3 b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3
index 64777a650d89..7715c6a6522d 100644
--- a/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3
+++ b/metadata/md5-cache/app-i18n/im-freewnn-0.0.2-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/freewnn x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://bonobo.gnome.gr.jp/~nakai/immodule/im-freewnn-0.0.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d5e529589872daf698c52071f8dd167
diff --git a/metadata/md5-cache/app-i18n/man-pages-fr-3.70-r1 b/metadata/md5-cache/app-i18n/man-pages-fr-3.70-r1
index c1bc5e151eb1..b583981c9768 100644
--- a/metadata/md5-cache/app-i18n/man-pages-fr-3.70-r1
+++ b/metadata/md5-cache/app-i18n/man-pages-fr-3.70-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=A somewhat comprehensive collection of French Linux man pages
 EAPI=7
 HOMEPAGE=https://traduc.org/perkamon
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2+ man-pages
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=https://gitlab.com/perkamon/man-pages-fr/-/archive/3.70-1/man-pages-fr-3.70-1.tar.gz -> man-pages-fr-3.70-1-r1.tar.gz https://gitlab.com/perkamon/man-pages/-/archive/3.70/man-pages-3.70.tar.gz -> perkamon-man-pages-3.70.tar.gz https://mirrors.edge.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-3.70.tar.xz
-_md5_=6ba86ca08ca5aabcfab23cf21b9a5397
+_md5_=bddcbc03f960844abfcc4cde35446736
diff --git a/metadata/md5-cache/app-i18n/man-pages-it-2.80-r1 b/metadata/md5-cache/app-i18n/man-pages-it-2.80-r1
deleted file mode 100644
index d9e2d301b2fe..000000000000
--- a/metadata/md5-cache/app-i18n/man-pages-it-2.80-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A somewhat comprehensive collection of Italian Linux man pages
-EAPI=5
-HOMEPAGE=http://it.tldp.org/man/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=ftp://ftp.pluto.it/pub/pluto/ildp/man/man-pages-it-2.80.tar.gz
-_md5_=7a964ad5233c978c8a18ae0e057bcbf5
diff --git a/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.5 b/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.5
deleted file mode 100644
index f02d4dc8f810..000000000000
--- a/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=A somewhat comprehensive collection of Chinese Linux man pages
-EAPI=5
-HOMEPAGE=http://cmpp.linuxforum.net/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=FDL-1.2
-RDEPEND=virtual/man
-SLOT=0
-SRC_URI=http://download.sf.linuxforum.net/cmpp/man-pages-zh_CN-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9660ee27e7c3f6b49c2ed18971e1edc
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 14ef940a744a..ba3febbd1c58 100644
--- a/metadata/md5-cache/app-laptop/Manifest.gz
+++ b/metadata/md5-cache/app-laptop/Manifest.gz
diff --git a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r1 b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r1
index c169a670c901..d3fe1594809b 100644
--- a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r1
+++ b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/iproute2 sys-apps/ethtool sys-apps/which || ( sys-apps/sdparm sys-apps/hdparm ) acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( net-wireless/bluez:= )
 SLOT=0
 SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.72.2/laptop-mode-tools_1.72.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=2b0cc06063457d823b122e40f557e035
diff --git a/metadata/md5-cache/app-laptop/msi-keyboard-1.0 b/metadata/md5-cache/app-laptop/msi-keyboard-1.0
index 374a17e2aaaf..56db2d6c45aa 100644
--- a/metadata/md5-cache/app-laptop/msi-keyboard-1.0
+++ b/metadata/md5-cache/app-laptop/msi-keyboard-1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/hidapi
 SLOT=0
 SRC_URI=https://github.com/makkarpov/msi-keyboard/archive/v1.0.tar.gz -> msi-keyboard-1.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=33a1217ab9ce1c71f6822f2712b6f052
diff --git a/metadata/md5-cache/app-leechcraft/Manifest.gz b/metadata/md5-cache/app-leechcraft/Manifest.gz
index 6be4bc280dfc..4adb62b5495d 100644
--- a/metadata/md5-cache/app-leechcraft/Manifest.gz
+++ b/metadata/md5-cache/app-leechcraft/Manifest.gz
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999 b/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
index e040eab14e90..59f7ac7c3dcf 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~app-leechcraft/lc-core-9999[qwt] sys-apps/lm_sensors dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtdeclarative:5[widgets] sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~app-leechcraft/lc-core-9999[qwt] sys-apps/lm-sensors dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtdeclarative:5[widgets] sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Temperature sensors monitor plugin for LeechCraft
 EAPI=6
 HOMEPAGE=https://leechcraft.org/
 IUSE=debug
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=~app-leechcraft/lc-core-9999[qwt] sys-apps/lm_sensors dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtdeclarative:5[widgets] ~virtual/leechcraft-quark-sideprovider-9999
+RDEPEND=~app-leechcraft/lc-core-9999[qwt] sys-apps/lm-sensors dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtdeclarative:5[widgets] ~virtual/leechcraft-quark-sideprovider-9999
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	leechcraft	6f3ba10062450940e43118f0dc08622b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2264fc2a5a2f8086f6093d5f1cb13ca
+_md5_=0f4dfcc8208574601dc3c190736ce959
diff --git a/metadata/md5-cache/app-leechcraft/liblaretz-0.1.0 b/metadata/md5-cache/app-leechcraft/liblaretz-0.1.0
deleted file mode 100644
index c789d6c0d5b2..000000000000
--- a/metadata/md5-cache/app-leechcraft/liblaretz-0.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Shared library to be used by the Laretz sync server and its clients
-EAPI=6
-HOMEPAGE=https://leechcraft.org
-KEYWORDS=amd64 x86
-LICENSE=Boost-1.0
-RDEPEND=dev-libs/boost
-SLOT=0
-SRC_URI=https://github.com/0xd34df00d/laretz/archive/0.1.0.tar.gz -> liblaretz-0.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0bb8a795738b3b0e024b56486d5631cc
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 408f4075fbf2..119af8833ddf 100644
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
diff --git a/metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20180307 b/metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20180307
deleted file mode 100644
index dbf6a0198f29..000000000000
--- a/metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20180307
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.10
-DESCRIPTION=Prometheus exporter for BIND
-EAPI=6
-HOMEPAGE=https://github.com/digitalocean/bind_exporter
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/digitalocean/bind_exporter/archive/38ef3a6caa68e8c42a08e72d51e90b00333e6894.tar.gz -> bind_exporter-0.2.0_p20180307.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7517c6be43747e992eed4b6bdca14c5f
diff --git a/metadata/md5-cache/app-metrics/collectd-5.8.1-r1 b/metadata/md5-cache/app-metrics/collectd-5.8.1-r1
index 2f0c94d06db4..f0f068271f02 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.8.1-r1
+++ b/metadata/md5-cache/app-metrics/collectd-5.8.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors:= ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=Collects system statistics and provides mechanisms to store the values
 EAPI=6
 HOMEPAGE=https://collectd.org/
 IUSE=contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_chrony collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_log_logstash collectd_plugins_lvm collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_mcelog collectd_plugins_md collectd_plugins_memcachec collectd_plugins_memcached collectd_plugins_memory collectd_plugins_modbus collectd_plugins_mqtt collectd_plugins_multimeter collectd_plugins_mysql collectd_plugins_netlink collectd_plugins_network collectd_plugins_network collectd_plugins_nfs collectd_plugins_nginx collectd_plugins_notify_desktop collectd_plugins_notify_email collectd_plugins_notify_nagios collectd_plugins_ntpd collectd_plugins_numa collectd_plugins_nut collectd_plugins_olsrd collectd_plugins_onewire collectd_plugins_openldap collectd_plugins_openvpn collectd_plugins_oracle collectd_plugins_ovs_events collectd_plugins_ovs_stats collectd_plugins_perl collectd_plugins_ping collectd_plugins_postgresql collectd_plugins_powerdns collectd_plugins_processes collectd_plugins_protocols collectd_plugins_python collectd_plugins_python collectd_plugins_redis collectd_plugins_routeros collectd_plugins_rrdcached collectd_plugins_rrdtool collectd_plugins_sensors collectd_plugins_serial collectd_plugins_sigrok collectd_plugins_smart collectd_plugins_snmp collectd_plugins_snmp_agent collectd_plugins_statsd collectd_plugins_swap collectd_plugins_syslog collectd_plugins_table collectd_plugins_tail collectd_plugins_tail_csv collectd_plugins_target_notification collectd_plugins_target_replace collectd_plugins_target_scale collectd_plugins_target_set collectd_plugins_tcpconns collectd_plugins_teamspeak2 collectd_plugins_ted collectd_plugins_thermal collectd_plugins_threshold collectd_plugins_tokyotyrant collectd_plugins_turbostat collectd_plugins_unixsock collectd_plugins_uptime collectd_plugins_users collectd_plugins_uuid collectd_plugins_varnish collectd_plugins_virt collectd_plugins_vmem collectd_plugins_vserver collectd_plugins_wireless collectd_plugins_write_graphite collectd_plugins_write_http collectd_plugins_write_kafka collectd_plugins_write_log collectd_plugins_write_mongodb collectd_plugins_write_prometheus collectd_plugins_write_redis collectd_plugins_write_sensu collectd_plugins_write_tsdb collectd_plugins_xencpu collectd_plugins_zfs_arc collectd_plugins_zookeeper +filecaps elibc_FreeBSD collectd_plugins_java kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=alpha amd64 arm x86
 LICENSE=MIT GPL-2 GPL-2+ GPL-3 GPL-3+
-RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors:= ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_java? ( >=virtual/jre-1.6 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) !<sys-apps/openrc-0.18.2 collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_java? ( >=virtual/jre-1.6 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) !<sys-apps/openrc-0.18.2 collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=collectd_plugins_python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) collectd_plugins_smart? ( udev )
 SLOT=0
 SRC_URI=https://collectd.org/files/collectd-5.8.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9d13dd071b915e1b5dc94973fd239949
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=bd63c3133be612ea401765ee23d9ac70
diff --git a/metadata/md5-cache/app-metrics/collectd-5.9.1-r2 b/metadata/md5-cache/app-metrics/collectd-5.9.1-r2
index d1bf5cd21999..5383834f22ad 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.9.1-r2
+++ b/metadata/md5-cache/app-metrics/collectd-5.9.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors:= ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_iptables? ( || ( <=sys-kernel/linux-headers-4.4 >=sys-kernel/linux-headers-4.6 ) ) collectd_plugins_java? ( >=virtual/jdk-1.6 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 filecaps? ( sys-libs/libcap ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=Collects system statistics and provides mechanisms to store the values
 EAPI=6
 HOMEPAGE=https://collectd.org/
 IUSE=contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs collectd_plugins_aggregation collectd_plugins_amqp collectd_plugins_apache collectd_plugins_apcups collectd_plugins_ascent collectd_plugins_battery collectd_plugins_bind collectd_plugins_ceph collectd_plugins_cgroups collectd_plugins_chrony collectd_plugins_conntrack collectd_plugins_contextswitch collectd_plugins_cpu collectd_plugins_cpufreq collectd_plugins_cpusleep collectd_plugins_csv collectd_plugins_curl collectd_plugins_curl_json collectd_plugins_curl_xml collectd_plugins_dbi collectd_plugins_df collectd_plugins_disk collectd_plugins_dns collectd_plugins_drbd collectd_plugins_email collectd_plugins_entropy collectd_plugins_ethstat collectd_plugins_exec collectd_plugins_fhcount collectd_plugins_filecount collectd_plugins_fscache collectd_plugins_gmond collectd_plugins_gps collectd_plugins_hddtemp collectd_plugins_hugepages collectd_plugins_interface collectd_plugins_ipc collectd_plugins_ipmi collectd_plugins_iptables collectd_plugins_ipvs collectd_plugins_irq collectd_plugins_java collectd_plugins_lua collectd_plugins_load collectd_plugins_logfile collectd_plugins_log_logstash collectd_plugins_lvm collectd_plugins_madwifi collectd_plugins_match_empty_counter collectd_plugins_match_hashed collectd_plugins_match_regex collectd_plugins_match_timediff collectd_plugins_match_value collectd_plugins_mbmon collectd_plugins_mcelog collectd_plugins_md collectd_plugins_memcachec collectd_plugins_memcached collectd_plugins_memory collectd_plugins_modbus collectd_plugins_mqtt collectd_plugins_multimeter collectd_plugins_mysql collectd_plugins_netlink collectd_plugins_network collectd_plugins_network collectd_plugins_nfs collectd_plugins_nginx collectd_plugins_notify_desktop collectd_plugins_notify_email collectd_plugins_notify_nagios collectd_plugins_ntpd collectd_plugins_numa collectd_plugins_nut collectd_plugins_olsrd collectd_plugins_onewire collectd_plugins_openldap collectd_plugins_openvpn collectd_plugins_oracle collectd_plugins_ovs_events collectd_plugins_ovs_stats collectd_plugins_perl collectd_plugins_ping collectd_plugins_postgresql collectd_plugins_powerdns collectd_plugins_processes collectd_plugins_protocols collectd_plugins_python collectd_plugins_python collectd_plugins_redis collectd_plugins_routeros collectd_plugins_rrdcached collectd_plugins_rrdtool collectd_plugins_sensors collectd_plugins_serial collectd_plugins_sigrok collectd_plugins_smart collectd_plugins_snmp collectd_plugins_snmp_agent collectd_plugins_statsd collectd_plugins_swap collectd_plugins_syslog collectd_plugins_table collectd_plugins_tail collectd_plugins_tail_csv collectd_plugins_target_notification collectd_plugins_target_replace collectd_plugins_target_scale collectd_plugins_target_set collectd_plugins_tcpconns collectd_plugins_teamspeak2 collectd_plugins_ted collectd_plugins_thermal collectd_plugins_threshold collectd_plugins_tokyotyrant collectd_plugins_turbostat collectd_plugins_unixsock collectd_plugins_uptime collectd_plugins_users collectd_plugins_uuid collectd_plugins_varnish collectd_plugins_virt collectd_plugins_vmem collectd_plugins_vserver collectd_plugins_wireless collectd_plugins_write_graphite collectd_plugins_write_http collectd_plugins_write_kafka collectd_plugins_write_log collectd_plugins_write_mongodb collectd_plugins_write_prometheus collectd_plugins_write_redis collectd_plugins_write_sensu collectd_plugins_write_tsdb collectd_plugins_xencpu collectd_plugins_zfs_arc collectd_plugins_zookeeper +filecaps elibc_FreeBSD collectd_plugins_java kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~x86
 LICENSE=MIT GPL-2 GPL-2+ GPL-3 GPL-3+
-RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm_sensors:= ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_java? ( >=virtual/jre-1.6 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) !<sys-apps/openrc-0.18.2 collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+RDEPEND=dev-libs/libgcrypt:= dev-libs/libltdl:0= perl? ( dev-lang/perl:=[ithreads] ) udev? ( virtual/udev ) xfs? ( sys-fs/xfsprogs ) collectd_plugins_amqp? ( net-libs/rabbitmq-c ) collectd_plugins_apache? ( net-misc/curl:0= ) collectd_plugins_ascent? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_bind? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_ceph? ( dev-libs/yajl:= ) collectd_plugins_curl? ( net-misc/curl:0= ) collectd_plugins_curl_json? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_curl_xml? ( net-misc/curl:0= dev-libs/libxml2:2= ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_gps? ( sci-geosciences/gpsd:= ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= ) collectd_plugins_log_logstash? ( dev-libs/yajl:= ) collectd_plugins_lua? ( dev-lang/lua:0= ) collectd_plugins_lvm? ( sys-fs/lvm2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_modbus? ( dev-libs/libmodbus ) collectd_plugins_mqtt? ( app-misc/mosquitto ) collectd_plugins_mysql? ( dev-db/mysql-connector-c:= ) collectd_plugins_netlink? ( net-libs/libmnl ) collectd_plugins_nginx? ( net-misc/curl:0= ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( net-libs/libesmtp ) collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 ) collectd_plugins_openldap? ( net-nds/openldap ) collectd_plugins_onewire? ( >=sys-fs/owfs-3.1:= ) collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic ) collectd_plugins_ovs_events? ( dev-libs/yajl:= ) collectd_plugins_ovs_stats? ( dev-libs/yajl:= ) collectd_plugins_perl? ( dev-lang/perl:=[ithreads] ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( dev-db/postgresql:= ) collectd_plugins_python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) collectd_plugins_redis? ( dev-libs/hiredis:= ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) collectd_plugins_sigrok? ( <sci-libs/libsigrok-0.4:= dev-libs/glib:2 ) collectd_plugins_smart? ( dev-libs/libatasmart ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_snmp_agent? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish:= ) collectd_plugins_virt? ( app-emulation/libvirt:= dev-libs/libxml2:2= ) collectd_plugins_write_http? ( net-misc/curl:0= dev-libs/yajl:= ) collectd_plugins_write_kafka? ( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= ) collectd_plugins_write_mongodb? ( >=dev-libs/mongo-c-driver-1.8.2:= ) collectd_plugins_write_prometheus? ( >=dev-libs/protobuf-c-1.2.1-r1:= net-libs/libmicrohttpd:= ) collectd_plugins_write_redis? ( dev-libs/hiredis:= ) collectd_plugins_xencpu? ( app-emulation/xen-tools:= ) kernel_FreeBSD? ( collectd_plugins_disk? ( sys-libs/libstatgrab:= ) collectd_plugins_interface? ( sys-libs/libstatgrab:= ) collectd_plugins_load? ( sys-libs/libstatgrab:= ) collectd_plugins_memory? ( sys-libs/libstatgrab:= ) collectd_plugins_swap? ( sys-libs/libstatgrab:= ) collectd_plugins_users? ( sys-libs/libstatgrab:= ) ) collectd_plugins_java? ( >=virtual/jre-1.6 ) collectd_plugins_syslog? ( virtual/logger ) selinux? ( sec-policy/selinux-collectd ) !<sys-apps/openrc-0.18.2 collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=collectd_plugins_python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) collectd_plugins_smart? ( udev )
 SLOT=0
 SRC_URI=https://github.com/collectd/collectd/archive/collectd-5.9.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bf0de220a0a26b690ca1dfcdceddc1c2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=ad17f1bcf634957be4c6b6c054ebcb88
diff --git a/metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0 b/metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0
deleted file mode 100644
index ea064b6e4027..000000000000
--- a/metadata/md5-cache/app-metrics/mongodb_exporter-0.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.10
-DESCRIPTION=Prometheus exporter for MongoDB
-EAPI=6
-HOMEPAGE=https://github.com/percona/mongodb_exporter
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/percona/mongodb_exporter/archive/v0.4.0.tar.gz -> mongodb_exporter-0.4.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=255ff6ff2149b786bcf46ca14784f5eb
diff --git a/metadata/md5-cache/app-metrics/mongodb_exporter-0.6.0 b/metadata/md5-cache/app-metrics/mongodb_exporter-0.6.0
deleted file mode 100644
index 20bf2aaa5392..000000000000
--- a/metadata/md5-cache/app-metrics/mongodb_exporter-0.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu
-DESCRIPTION=Prometheus exporter for MongoDB
-EAPI=7
-HOMEPAGE=https://github.com/percona/mongodb_exporter
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/percona/mongodb_exporter/archive/v0.6.0.tar.gz -> mongodb_exporter-0.6.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=27188d4d713f6c137dcba0ff9c86428b
diff --git a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.0 b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.0
deleted file mode 100644
index a133e1efee5b..000000000000
--- a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.10
-DESCRIPTION=Nginx virtual host traffic stats exporter for Prometheus
-EAPI=6
-HOMEPAGE=https://github.com/hnlq715/nginx-vts-exporter
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/hnlq715/nginx-vts-exporter/archive/v0.10.0.tar.gz -> nginx-vts-exporter-0.10.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=6b2167245cac20507b830f4f5f6de00f
diff --git a/metadata/md5-cache/app-metrics/postgres_exporter-0.4.6 b/metadata/md5-cache/app-metrics/postgres_exporter-0.4.6
deleted file mode 100644
index 6ab85dc45990..000000000000
--- a/metadata/md5-cache/app-metrics/postgres_exporter-0.4.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=PostgreSQL stats exporter for Prometheus
-EAPI=6
-HOMEPAGE=https://github.com/wrouesnel/postgres_exporter
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/wrouesnel/postgres_exporter/archive/v0.4.6.tar.gz -> postgres_exporter-0.4.6.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=76fc337e3f431b54e67a1b233e09a269
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index b5025d9eaa98..bdbc6db8ddec 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/colordiff-1.0.18 b/metadata/md5-cache/app-misc/colordiff-1.0.18
index b1eefac334f3..5172052085c8 100644
--- a/metadata/md5-cache/app-misc/colordiff-1.0.18
+++ b/metadata/md5-cache/app-misc/colordiff-1.0.18
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl sys-apps/diffutils
 SLOT=0
 SRC_URI=https://www.colordiff.org/colordiff-1.0.18.tar.gz
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=f834c327224f1669ec6e57fd4ae5aaba
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.9.1 b/metadata/md5-cache/app-misc/ddcutil-0.9.1
index bcb030d41b5a..023a4b8709af 100644
--- a/metadata/md5-cache/app-misc/ddcutil-0.9.1
+++ b/metadata/md5-cache/app-misc/ddcutil-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm )
 REQUIRED_USE=drm? ( X )
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.9.1.tar.gz -> ddcutil-0.9.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c2b02524e6e44d883e260a425993b1c
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.9.5 b/metadata/md5-cache/app-misc/ddcutil-0.9.5
index ffdd91e7a2fd..16b50da161fc 100644
--- a/metadata/md5-cache/app-misc/ddcutil-0.9.5
+++ b/metadata/md5-cache/app-misc/ddcutil-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm )
 REQUIRED_USE=drm? ( X )
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.9.5.tar.gz -> ddcutil-0.9.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8d716e1ab6965b7bcea2edccd584abfa
diff --git a/metadata/md5-cache/app-misc/dfshow-0.8.0_beta b/metadata/md5-cache/app-misc/dfshow-0.8.0_beta
new file mode 100644
index 000000000000..9de1299f3a04
--- /dev/null
+++ b/metadata/md5-cache/app-misc/dfshow-0.8.0_beta
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=prepare
+DEPEND=dev-libs/libconfig sys-libs/ncurses:0=
+DESCRIPTION=DF-SHOW is a Unix-like rewrite of some of the applications from DF-EDIT
+EAPI=7
+HOMEPAGE=https://github.com/roberthawdon/dfshow
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libconfig sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://github.com/roberthawdon/dfshow/archive/v0.8.0-beta.tar.gz -> dfshow-0.8.0_beta.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f9a59b80d892cd38ddcf90332c0eeba8
diff --git a/metadata/md5-cache/app-misc/faq-0.0.1 b/metadata/md5-cache/app-misc/faq-0.0.1
deleted file mode 100644
index 7030cbe2b0f4..000000000000
--- a/metadata/md5-cache/app-misc/faq-0.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Format agnostic jQ
-EAPI=6
-HOMEPAGE=https://github.com/jzelinskie/faq
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/jzelinskie/faq/archive/0.0.1.tar.gz -> faq-0.0.1.tar.gz https://github.com/Azure/draft/archive/53924464463d2474f410415f1310d2b95fb8965f.tar.gz -> github.com-Azure-draft-53924464463d2474f410415f1310d2b95fb8965f.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/ashb/jqrepl/archive/70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz -> github.com-ashb-jqrepl-70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz https://github.com/clbanning/mxj/archive/eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz -> github.com-clbanning-mxj-eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/globalsign/mgo/archive/baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz -> github.com-globalsign-mgo-baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jbrukh/bayesian/archive/bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz -> github.com-jbrukh-bayesian-bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz https://github.com/sirupsen/logrus/archive/c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz -> github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/zeebo/bencode/archive/d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz -> github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz https://github.com/golang/crypto/archive/88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz -> github.com-golang-crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz https://github.com/golang/sys/archive/13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz -> github.com-golang-sys-13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz https://github.com/go-yaml/yaml/archive/86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz -> github.com-go-yaml-yaml-86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=aaa523415aefd0443dac19764dd64aee
diff --git a/metadata/md5-cache/app-misc/flirc-3.22.4 b/metadata/md5-cache/app-misc/flirc-3.22.4
index ccf2586503d8..4a1830fff08a 100644
--- a/metadata/md5-cache/app-misc/flirc-3.22.4
+++ b/metadata/md5-cache/app-misc/flirc-3.22.4
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 dev-libs/hidapi qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 d
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://apt.fury.io/flirc/flirc-3.22.4-amd64 -> flirc-3.22.4_amd64.deb ) arm? ( https://apt.fury.io/flirc/flirc-3.22.4-armhf -> flirc-3.22.4_arm.deb ) x86? ( https://apt.fury.io/flirc/flirc-3.22.4-i386 -> flirc-3.22.4_x86.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=ed49e31e0b4b1be2ca0a1aa7c0b018eb
diff --git a/metadata/md5-cache/app-misc/g810-led-0.3.6 b/metadata/md5-cache/app-misc/g810-led-0.3.6
index ea26a7454d58..ef41c39b93bf 100644
--- a/metadata/md5-cache/app-misc/g810-led-0.3.6
+++ b/metadata/md5-cache/app-misc/g810-led-0.3.6
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=hidapi? ( dev-libs/hidapi:= ) !hidapi? ( virtual/libusb:= )
 SLOT=0
 SRC_URI=https://github.com/MatMoul/g810-led/archive/v0.3.6.tar.gz -> g810-led-0.3.6.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=caf7824f10571b8c0a2c8222e8df5686
diff --git a/metadata/md5-cache/app-misc/graphlcd-base-1.0.2 b/metadata/md5-cache/app-misc/graphlcd-base-1.0.2
index 726f9ff69a60..c924a2fd62df 100644
--- a/metadata/md5-cache/app-misc/graphlcd-base-1.0.2
+++ b/metadata/md5-cache/app-misc/graphlcd-base-1.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2=
 REQUIRED_USE=?? ( graphicsmagick imagemagick )
 SLOT=0
 SRC_URI=https://projects.vdr-developer.org/git/graphlcd-base.git/snapshot/graphlcd-base-1.0.2.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=a2661a5397c402a4f130de6d1b3b741d
diff --git a/metadata/md5-cache/app-misc/kryoflux-dtc-2.6 b/metadata/md5-cache/app-misc/kryoflux-dtc-2.6
index fda9047b7f12..b849a568987b 100644
--- a/metadata/md5-cache/app-misc/kryoflux-dtc-2.6
+++ b/metadata/md5-cache/app-misc/kryoflux-dtc-2.6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/spsdeclib virtual/libusb:1 virtual/udev gui? ( virtual/jre )
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=https://www.kryoflux.com/download/kryoflux_2.6_linux.tar.bz2 gui? ( https://www.kryoflux.com/kryoflux-ui.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87b159ec8045bc4797b8cd26ed304609
diff --git a/metadata/md5-cache/app-misc/ltunify-0.2-r1 b/metadata/md5-cache/app-misc/ltunify-0.2-r1
index 9dd966dcac23..bc3bd1bfe3a9 100644
--- a/metadata/md5-cache/app-misc/ltunify-0.2-r1
+++ b/metadata/md5-cache/app-misc/ltunify-0.2-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://git.lekensteyn.nl/ltunify/snapshot/ltunify-0.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=17df96437174feeb249047a216f1633c
diff --git a/metadata/md5-cache/app-misc/mc-4.8.23-r1 b/metadata/md5-cache/app-misc/mc-4.8.23-r1
index 2e449e41750e..5695aab8f7f8 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.23-r1
+++ b/metadata/md5-cache/app-misc/mc-4.8.23-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Midnight Commander is a text based file manager
 EAPI=7
 HOMEPAGE=https://www.midnight-commander.org
 IUSE=+edit gpm nls samba sftp +slang spell test unicode X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
 REQUIRED_USE=spell? ( edit )
 SLOT=0
 SRC_URI=http://ftp.midnight-commander.org/mc-4.8.23.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=ccb66ea5b173c41d8e9713d908c05ffb
+_md5_=c418345feddad1e3cdeea507bc0a4b09
diff --git a/metadata/md5-cache/app-misc/mkcert-1.1.2 b/metadata/md5-cache/app-misc/mkcert-1.1.2
deleted file mode 100644
index acb52fd2366a..000000000000
--- a/metadata/md5-cache/app-misc/mkcert-1.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=A zero-config tool to make locally trusted development certificates
-EAPI=6
-HOMEPAGE=https://github.com/FiloSottile/mkcert
-KEYWORDS=~amd64
-LICENSE=BSD
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/FiloSottile/mkcert/archive/v1.1.2.tar.gz -> mkcert-1.1.2.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=42b0d5d182d8da81e06fb7b8e821a4c2
diff --git a/metadata/md5-cache/app-misc/pal-0.4.3-r2 b/metadata/md5-cache/app-misc/pal-0.4.3-r2
index facf21b65bc5..c57f512f9ce6 100644
--- a/metadata/md5-cache/app-misc/pal-0.4.3-r2
+++ b/metadata/md5-cache/app-misc/pal-0.4.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.0 nls? ( virtual/libintl ) sys-libs/ncurses:0 sys-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/palcal/pal-0.4.3.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=a2d7f4c0f1571122fbb124cced8d86f8
diff --git a/metadata/md5-cache/app-misc/pfm-2.12.3 b/metadata/md5-cache/app-misc/pfm-2.12.3
index 759f98808212..c1327df322b4 100644
--- a/metadata/md5-cache/app-misc/pfm-2.12.3
+++ b/metadata/md5-cache/app-misc/pfm-2.12.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.8 >=dev-perl/File-Stat-Bits-1.10.0 >=dev-perl/HTML-Parser-3.59 >=dev-perl/libwww-perl-5.827 >=dev-perl/Term-ReadLine-Gnu-1.09 >=dev-perl/Term-Screen-1.30.0 >=dev-perl/Term-ScreenColor-1.130.0 sys-libs/ncurses sys-libs/readline >=virtual/perl-File-Temp-0.22 >=virtual/perl-Module-Load-0.16 dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/p-f-m/pfm-2.12.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f51feda7b5015e456a0e6d62367e13d2
diff --git a/metadata/md5-cache/app-misc/pip-1.2-r2 b/metadata/md5-cache/app-misc/pip-1.2-r2
index 894a9a283dc6..64371caaf8f8 100644
--- a/metadata/md5-cache/app-misc/pip-1.2-r2
+++ b/metadata/md5-cache/app-misc/pip-1.2-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://membled.com/work/apps/pip/pip-1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b486b89a9a8b7761d179fed6af838eb2
diff --git a/metadata/md5-cache/app-misc/prog-express-3.7.8-r1 b/metadata/md5-cache/app-misc/prog-express-3.7.8-r1
index 02653cef3073..a1b1e98a21f5 100644
--- a/metadata/md5-cache/app-misc/prog-express-3.7.8-r1
+++ b/metadata/md5-cache/app-misc/prog-express-3.7.8-r1
@@ -8,5 +8,5 @@ LICENSE=prog-express
 RDEPEND=dev-db/sqlite:3 dev-dotnet/gtk-sharp:2 dev-dotnet/libgdiplus dev-lang/mono dev-lang/mono-basic virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.7.8-1.amd64.deb ) x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/prog-express-3.7.8-1.i386.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=bf0db38477940ebeac7cd95293073873
diff --git a/metadata/md5-cache/app-misc/qlcplus-4.11.1 b/metadata/md5-cache/app-misc/qlcplus-4.11.1
index 2aa74f487a05..4f346b840052 100644
--- a/metadata/md5-cache/app-misc/qlcplus-4.11.1
+++ b/metadata/md5-cache/app-misc/qlcplus-4.11.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 ) dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/libmad media-libs/libsndfile sci-libs/fftw:3.0 virtual/libusb:0 virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=https://github.com/mcallegari/qlcplus/archive/QLC+_4.11.1.tar.gz -> qlcplus-4.11.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f738cf23c76c84fe4a5ef2db842c8ea
diff --git a/metadata/md5-cache/app-misc/realpath-1.17 b/metadata/md5-cache/app-misc/realpath-1.17
index c3fa82780b13..cc6957fa933a 100644
--- a/metadata/md5-cache/app-misc/realpath-1.17
+++ b/metadata/md5-cache/app-misc/realpath-1.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-freebsd/freebsd-bin nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/r/realpath/realpath_1.17.tar.gz nls? ( mirror://debian/pool/main/r/realpath/realpath_1.17_i386.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bbab2458c4de15e52a28d14270843ba5
diff --git a/metadata/md5-cache/app-misc/realpath-1.18 b/metadata/md5-cache/app-misc/realpath-1.18
index 42922cde51e8..62d1b77ae7f5 100644
--- a/metadata/md5-cache/app-misc/realpath-1.18
+++ b/metadata/md5-cache/app-misc/realpath-1.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-freebsd/freebsd-bin nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/r/realpath/realpath_1.18.tar.gz nls? ( mirror://debian/pool/main/r/realpath/realpath_1.18_i386.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d60d0901c38ed15fd71e7467a5860948
diff --git a/metadata/md5-cache/app-misc/regionset-0.1-r1 b/metadata/md5-cache/app-misc/regionset-0.1-r1
deleted file mode 100644
index 745a46cdbf6c..000000000000
--- a/metadata/md5-cache/app-misc/regionset-0.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Sets the region on DVD drives
-EAPI=4
-HOMEPAGE=http://linvdr.org/projects/regionset/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://linvdr.org/download/regionset/regionset-0.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b1bffd506b6967fb1d0aba72e2ec346d
diff --git a/metadata/md5-cache/app-misc/screen-4.6.2-r1 b/metadata/md5-cache/app-misc/screen-4.6.2-r1
index cc6864a22697..48eb249e904c 100644
--- a/metadata/md5-cache/app-misc/screen-4.6.2-r1
+++ b/metadata/md5-cache/app-misc/screen-4.6.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.6.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=685264d6bd6416605986e637455a7809
diff --git a/metadata/md5-cache/app-misc/screen-9999 b/metadata/md5-cache/app-misc/screen-9999
index 425eb99ed1af..1125f455689a 100644
--- a/metadata/md5-cache/app-misc/screen-9999
+++ b/metadata/md5-cache/app-misc/screen-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) utmp? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) virtual/tmpfiles
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e7f79fbd935f147136d786ca3bcabf8
diff --git a/metadata/md5-cache/app-misc/solaar-0.9.2-r3 b/metadata/md5-cache/app-misc/solaar-0.9.2-r3
index cc8d120c03c5..1c44c4204cf2 100644
--- a/metadata/md5-cache/app-misc/solaar-0.9.2-r3
+++ b/metadata/md5-cache/app-misc/solaar-0.9.2-r3
@@ -6,9 +6,9 @@ HOMEPAGE=https://pwr.github.com/Solaar/
 IUSE=doc python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 kernel_linux
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=dev-python/pyudev-0.13[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=acct-group/plugdev >=dev-python/pyudev-0.13[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pwr/Solaar/archive/0.9.2.tar.gz -> solaar-0.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15a216fa639c5b7cadd5e21d7f427235
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6cec4e3af79dd727e58a34b4a31670f1
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.5-r5 b/metadata/md5-cache/app-misc/spacenavd-0.5-r5
index a90be46bec2f..5ffba115f33e 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.5-r5
+++ b/metadata/md5-cache/app-misc/spacenavd-0.5-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.5/spacenavd-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=13321087eb56f24ea9b07719f4171a13
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.5-r6 b/metadata/md5-cache/app-misc/spacenavd-0.5-r6
index b02f866244a5..49d0a4cb5216 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.5-r6
+++ b/metadata/md5-cache/app-misc/spacenavd-0.5-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.5/spacenavd-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=287314a7a951831a4b076abbd81bfd9e
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.6 b/metadata/md5-cache/app-misc/spacenavd-0.6
index c6f62e0a04af..ce259fa46854 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.6
+++ b/metadata/md5-cache/app-misc/spacenavd-0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/spacenav/spacenav%20daemon/spacenavd%200.6/spacenavd-0.6.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=acd4fce33880461ffc6a6000f75c54c5
diff --git a/metadata/md5-cache/app-misc/spire-0.8.1 b/metadata/md5-cache/app-misc/spire-0.8.1
index 1445928d7737..98c8967735a6 100644
--- a/metadata/md5-cache/app-misc/spire-0.8.1
+++ b/metadata/md5-cache/app-misc/spire-0.8.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/spire acct-user/spire
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/spiffe/spire/archive/0.8.1.tar.gz -> spire-0.8.1.tar.gz https://dev.gentoo.org/~whubbs/dist/spire-0.8.1-vendor.tar.gz
-_md5_=fbeea40212ae520e37ca3731892714e4
+SRC_URI=https://github.com/spiffe/spire/archive/0.8.1.tar.gz -> spire-0.8.1.tar.gz https://dev.gentoo.org/~williamh/dist/spire-0.8.1-vendor.tar.gz
+_md5_=2648e73f339ac8dd63c5ad43a61d21fb
diff --git a/metadata/md5-cache/app-misc/tails-installer-4.4.8 b/metadata/md5-cache/app-misc/tails-installer-4.4.8
deleted file mode 100644
index 6fd98017ae43..000000000000
--- a/metadata/md5-cache/app-misc/tails-installer-4.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/python-distutils-extra[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=A graphical tool to install or upgrade Tails on a USB stick from an ISO image
-EAPI=6
-HOMEPAGE=https://tails.boum.org https://git.tails.boum.org/liveusb-creator
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/p7zip dev-libs/glib:2 dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-apps/gptfdisk sys-auth/polkit sys-boot/syslinux sys-fs/dosfstools sys-fs/mtools sys-fs/udisks:2[introspection] virtual/cdrtools x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://deb.tails.boum.org/pool/main/t/tails-installer/tails-installer_4.4.8+dfsg.orig.tar.gz -> tails-installer-4.4.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f96660eb3bfcbac91f7824a8c8850230
diff --git a/metadata/md5-cache/app-misc/tdfsb-0.0.10 b/metadata/md5-cache/app-misc/tdfsb-0.0.10
deleted file mode 100644
index df08238ccaa4..000000000000
--- a/metadata/md5-cache/app-misc/tdfsb-0.0.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/smpeg media-libs/sdl-image media-libs/freeglut virtual/glu x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu
-DESCRIPTION=SDL based graphical file browser
-EAPI=4
-HOMEPAGE=http://www.determinate.net/webdata/seg/tdfsb.html
-KEYWORDS=alpha amd64 ppc -sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/smpeg media-libs/sdl-image media-libs/freeglut virtual/glu x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu
-SLOT=0
-SRC_URI=http://www.determinate.net/webdata/data/tdfsb-0.0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3fbb5c2c744684e96ad1961b472d5464
diff --git a/metadata/md5-cache/app-misc/tek-1.3.0 b/metadata/md5-cache/app-misc/tek-1.3.0
index 3856b6c8dc19..907e4be8da59 100644
--- a/metadata/md5-cache/app-misc/tek-1.3.0
+++ b/metadata/md5-cache/app-misc/tek-1.3.0
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/wxGTK:3.0=[X] virtual/libusb:1 virtual/udev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/m-ou-se/tek/archive/v1.3.0.tar.gz -> tek-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=1bc1e7a9846ac66cf79d57e2ab9fc0ff
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.5.1 b/metadata/md5-cache/app-misc/tmuxp-1.5.1
deleted file mode 100644
index 7f0e2e61ed32..000000000000
--- a/metadata/md5-cache/app-misc/tmuxp-1.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/pytest-4.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-rerunfailures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=tmux session manager. built on libtmux
-EAPI=7
-HOMEPAGE=https://tmuxp.git-pull.com
-IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/kaptan[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/libtmux[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/colorama-0.3.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/t/tmuxp/tmuxp-1.5.1.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d8785b69f9f8590f2aa1e96c0602d9a3
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.5.3 b/metadata/md5-cache/app-misc/tmuxp-1.5.3
new file mode 100644
index 000000000000..2f6c4e9fd820
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tmuxp-1.5.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/pytest-4.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-rerunfailures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=tmux session manager. built on libtmux
+EAPI=7
+HOMEPAGE=https://tmuxp.git-pull.com
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/kaptan[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/libtmux[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/colorama-0.3.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/t/tmuxp/tmuxp-1.5.3.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=d8785b69f9f8590f2aa1e96c0602d9a3
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 8e10e0b1b49b..9008c0958b1a 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/heimdall-1.4.2 b/metadata/md5-cache/app-mobilephone/heimdall-1.4.2
index c8c5dd433b06..df5d73147e99 100644
--- a/metadata/md5-cache/app-mobilephone/heimdall-1.4.2
+++ b/metadata/md5-cache/app-mobilephone/heimdall-1.4.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libusb-1.0.18:1= qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sys-libs/zlib
 SLOT=0
 SRC_URI=https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v1.4.2/Heimdall-v1.4.2.tar.bz2 -> heimdall-1.4.2.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef96dcc981556a1d6fb6497bbd5a2904
diff --git a/metadata/md5-cache/app-mobilephone/heimdall-9999 b/metadata/md5-cache/app-mobilephone/heimdall-9999
index 136e13e45b6b..4a06f929086a 100644
--- a/metadata/md5-cache/app-mobilephone/heimdall-9999
+++ b/metadata/md5-cache/app-mobilephone/heimdall-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/libusb-1.0.18:1= qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sys-libs/zlib
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef96dcc981556a1d6fb6497bbd5a2904
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 16bebe0e3457..a4b744f228f0 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-6.2.5.2 b/metadata/md5-cache/app-office/libreoffice-bin-6.2.5.2
index 3a228e7dddec..b33332a7072c 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-6.2.5.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-6.2.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) python_targets_python3_6
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-6.2.5.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-6.2.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-6.2.5.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-6.2.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-6.2.5.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-java-6.2.5.2.xd3 ) ) ) ) x86? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-6.2.5.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-6.2.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-java-6.2.5.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-6.2.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-6.2.5.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-java-6.2.5.2.xd3 ) ) ) )
-_eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c00ae318e388790cead7a21e7f423b3
diff --git a/metadata/md5-cache/app-office/libreoffice-voikko-5.0 b/metadata/md5-cache/app-office/libreoffice-voikko-5.0
new file mode 100644
index 000000000000..883f58cc17fd
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-voikko-5.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst prerm
+DEPEND=app-office/libreoffice[odk] dev-libs/voikko-fi
+DESCRIPTION=Free Finnish spell checking and hyphenation for LibreOffice
+EAPI=7
+HOMEPAGE=https://voikko.puimula.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-office/libreoffice[odk] dev-libs/voikko-fi dev-libs/libvoikko
+SLOT=0
+SRC_URI=https://www.puimula.org/voikko-sources/libreoffice-voikko/libreoffice-voikko-5.0.tar.gz
+_md5_=dd9f5c78cb83c6668c1a406a7b067256
diff --git a/metadata/md5-cache/app-office/openoffice-bin-4.1.6 b/metadata/md5-cache/app-office/openoffice-bin-4.1.6
index 1288686d4160..09871b08e7a9 100644
--- a/metadata/md5-cache/app-office/openoffice-bin-4.1.6
+++ b/metadata/md5-cache/app-office/openoffice-bin-4.1.6
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_install-rpm_en-US.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_install-rpm_en-US.tar.gz ) l10n_ast? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ast.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ast.tar.gz ) ) l10n_eu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_eu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_eu.tar.gz ) ) l10n_bg? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_bg.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_bg.tar.gz ) ) l10n_ca? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ca.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ca.tar.gz ) ) l10n_ca-valencia? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ca-XV.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ca-XV.tar.gz ) ) l10n_zh-CN? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_zh-CN.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_zh-CN.tar.gz ) ) l10n_zh-TW? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_zh-TW.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_zh-TW.tar.gz ) ) l10n_cs? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_cs.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_cs.tar.gz ) ) l10n_da? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_da.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_da.tar.gz ) ) l10n_nl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_nl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_nl.tar.gz ) ) l10n_en-GB? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_en-GB.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_en-GB.tar.gz ) ) l10n_fi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_fi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_fi.tar.gz ) ) l10n_fr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_fr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_fr.tar.gz ) ) l10n_gd? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_gd.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_gd.tar.gz ) ) l10n_gl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_gl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_gl.tar.gz ) ) l10n_de? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_de.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_de.tar.gz ) ) l10n_el? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_el.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_el.tar.gz ) ) l10n_he? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_he.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_he.tar.gz ) ) l10n_hi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_hi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_hi.tar.gz ) ) l10n_hu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_hu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_hu.tar.gz ) ) l10n_it? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_it.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_it.tar.gz ) ) l10n_ja? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ja.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ja.tar.gz ) ) l10n_km? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_km.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_km.tar.gz ) ) l10n_ko? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ko.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ko.tar.gz ) ) l10n_lt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_lt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_lt.tar.gz ) ) l10n_nb? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_nb.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_nb.tar.gz ) ) l10n_pl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_pl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_pl.tar.gz ) ) l10n_pt-BR? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_pt-BR.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_pt-BR.tar.gz ) ) l10n_pt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_pt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_pt.tar.gz ) ) l10n_ru? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ru.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ru.tar.gz ) ) l10n_sr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_sr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_sr.tar.gz ) ) l10n_sk? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_sk.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_sk.tar.gz ) ) l10n_sl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_sl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_sl.tar.gz ) ) l10n_es? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_es.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_es.tar.gz ) ) l10n_sv? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_sv.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_sv.tar.gz ) ) l10n_ta? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_ta.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_ta.tar.gz ) ) l10n_th? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_th.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_th.tar.gz ) ) l10n_tr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_tr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_tr.tar.gz ) ) l10n_vi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86-64_langpack-rpm_vi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.6_Linux_x86_langpack-rpm_vi.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=beaa41ac3ed31e9e106e6c8d17aaaae3
diff --git a/metadata/md5-cache/app-office/texstudio-2.11.2-r2 b/metadata/md5-cache/app-office/texstudio-2.11.2-r2
index 425b6749a124..778dc5fc0005 100644
--- a/metadata/md5-cache/app-office/texstudio-2.11.2-r2
+++ b/metadata/md5-cache/app-office/texstudio-2.11.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/texstudio/texstudio/TeXstudio%202.11.2/texstudio-2.11.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=505a608ea3d7694fc73d2314f589215e
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.10 b/metadata/md5-cache/app-office/texstudio-2.12.10
index d6e7075fbcd4..6f95e9e03cb1 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.10
+++ b/metadata/md5-cache/app-office/texstudio-2.12.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/texstudio-org/texstudio/archive/2.12.10.tar.gz -> texstudio-2.12.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b50d7ccf0bc4f0adcc7a42e6a8fe6c42
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.14 b/metadata/md5-cache/app-office/texstudio-2.12.14
index f11f5b7755d9..8c75d3652220 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.14
+++ b/metadata/md5-cache/app-office/texstudio-2.12.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/texstudio-org/texstudio/archive/2.12.14.tar.gz -> texstudio-2.12.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c227d76e303e40d863fc85bde4106bc
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.16 b/metadata/md5-cache/app-office/texstudio-2.12.16
index 48133ef6f1da..c4589e271bd0 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.16
+++ b/metadata/md5-cache/app-office/texstudio-2.12.16
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/texstudio-org/texstudio/archive/2.12.16.tar.gz -> texstudio-2.12.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1274a0b48809c1032477d8bf752165bd
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.16_beta2-r1 b/metadata/md5-cache/app-office/texstudio-2.12.16_beta2-r1
index 2185854572f2..e953f9b52144 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.16_beta2-r1
+++ b/metadata/md5-cache/app-office/texstudio-2.12.16_beta2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/texstudio-org/texstudio/archive/2.12.16beta2.tar.gz -> texstudio-2.12.16_beta2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6b4dbf8753b594d83753b506d7aa09f
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.2-r1 b/metadata/md5-cache/app-office/texstudio-2.12.2-r1
index f339a46584c5..a2982d68bb04 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.2-r1
+++ b/metadata/md5-cache/app-office/texstudio-2.12.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/texstudio/texstudio/TeXstudio%202.12.2/texstudio-2.12.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3767e420d583108f3e83db4ef2aaf9f9
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.4-r1 b/metadata/md5-cache/app-office/texstudio-2.12.4-r1
index e75a6762341f..102a83bc678c 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.4-r1
+++ b/metadata/md5-cache/app-office/texstudio-2.12.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/texstudio/texstudio/TeXstudio%202.12.4/texstudio-2.12.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3767e420d583108f3e83db4ef2aaf9f9
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.6-r1 b/metadata/md5-cache/app-office/texstudio-2.12.6-r1
index 67e40b1d1305..49cb6e696538 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.6-r1
+++ b/metadata/md5-cache/app-office/texstudio-2.12.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/texstudio-2.12.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7f290dd9c584fcb8fd6a00de696138cd
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.8-r1 b/metadata/md5-cache/app-office/texstudio-2.12.8-r1
index 7c9e403abfd7..965452fbbaaf 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.8-r1
+++ b/metadata/md5-cache/app-office/texstudio-2.12.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/texstudio-org/texstudio/archive/2.12.8.tar.gz -> texstudio-2.12.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6cfde06d32159dec2439cfdfe2743220
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index 201828d10437..7da19b5bb8e7 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/barry-0.18.3 b/metadata/md5-cache/app-pda/barry-0.18.3
index 454247cb9ccf..7e9a7e8f1df4 100644
--- a/metadata/md5-cache/app-pda/barry-0.18.3
+++ b/metadata/md5-cache/app-pda/barry-0.18.3
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 GPL-2
 RDEPEND=>=dev-cpp/libxmlpp-2.6:2.6 dev-libs/glib:2 >=dev-libs/libtar-1.2.11-r2 >=media-libs/libsdl-1.2 >=sys-fs/fuse-2.5:= sys-libs/zlib virtual/libusb:1 boost? ( >=dev-libs/boost-1.33 ) gui? ( dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libglademm:2.4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/barry/barry-0.18.3.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e685e5c3ab37849b5e9a74076f9a1db8
diff --git a/metadata/md5-cache/app-pda/usbmuxd-1.0.8_p20140530 b/metadata/md5-cache/app-pda/usbmuxd-1.0.8_p20140530
index 85d67b226d72..34f853ccbd13 100644
--- a/metadata/md5-cache/app-pda/usbmuxd-1.0.8_p20140530
+++ b/metadata/md5-cache/app-pda/usbmuxd-1.0.8_p20140530
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=app-pda/libimobiledevice-1.1.6 >=app-pda/libplist-1.11 virtual/libusb:1 virtual/os-headers virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
+DEPEND=acct-group/plugdev >=app-pda/libimobiledevice-1.1.6 >=app-pda/libplist-1.11 virtual/libusb:1 virtual/os-headers virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
 DESCRIPTION=USB multiplex daemon for use with Apple iPhone/iPod Touch devices
 EAPI=5
 HOMEPAGE=http://www.libimobiledevice.org/
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-2 GPL-3 LGPL-2.1+
-RDEPEND=>=app-pda/libimobiledevice-1.1.6 >=app-pda/libplist-1.11 virtual/libusb:1
+RDEPEND=acct-group/plugdev >=app-pda/libimobiledevice-1.1.6 >=app-pda/libplist-1.11 virtual/libusb:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/usbmuxd-1.0.8_p20140530.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=30e44ef4f89a3e160982750e70a2c0b6
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4b69e4f5d4ba65c649938aeb09a9292d
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 7521ce5a490f..10a430cff2b0 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/cpuid2cpuflags-6 b/metadata/md5-cache/app-portage/cpuid2cpuflags-6
index f42f84bd051d..6d93229cbe30 100644
--- a/metadata/md5-cache/app-portage/cpuid2cpuflags-6
+++ b/metadata/md5-cache/app-portage/cpuid2cpuflags-6
@@ -2,8 +2,8 @@ DEFINED_PHASES=postinst
 DESCRIPTION=Tool to guess CPU_FLAGS_* flags for the host
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v6/cpuid2cpuflags-6.tar.bz2
-_md5_=fb6607def39d8988c9926b2c70ba0e89
+_md5_=49ac18735157afd9e1eda7083d115b55
diff --git a/metadata/md5-cache/app-portage/cpuid2cpuflags-7 b/metadata/md5-cache/app-portage/cpuid2cpuflags-7
new file mode 100644
index 000000000000..19c170191ba0
--- /dev/null
+++ b/metadata/md5-cache/app-portage/cpuid2cpuflags-7
@@ -0,0 +1,9 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Tool to guess CPU_FLAGS_* flags for the host
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v7/cpuid2cpuflags-7.tar.bz2
+_md5_=1394b9a14ab4c3a704dfd9b43d4fa2c7
diff --git a/metadata/md5-cache/app-portage/eix-0.33.8 b/metadata/md5-cache/app-portage/eix-0.33.8
index 5fec44c5e341..8fe7f1b605e3 100644
--- a/metadata/md5-cache/app-portage/eix-0.33.8
+++ b/metadata/md5-cache/app-portage/eix-0.33.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3:= ) >=app-shells/push-2.0-r1 >=app-shells/quoter-3.0_p2-r1 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/vaeth/eix/releases/download/v0.33.8/eix-0.33.8.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6bb7a257556ab44f989100c878cc8a46
diff --git a/metadata/md5-cache/app-portage/elicense-1.0.2 b/metadata/md5-cache/app-portage/elicense-1.0.2
new file mode 100644
index 000000000000..cbbbe296030c
--- /dev/null
+++ b/metadata/md5-cache/app-portage/elicense-1.0.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tool to find installed packages in Gentoo with non-accepted license(s)
+EAPI=7
+HOMEPAGE=https://github.com/Whissi/elicense
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/Whissi/elicense/archive/v1.0.2.tar.gz -> elicense-1.0.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=436839d9454fd25e60b442a762afb5c7
diff --git a/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1 b/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
index cc2e1f22b776..ce8a573e3ffe 100644
--- a/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
+++ b/metadata/md5-cache/app-portage/g-sorcery-0.2.1-r1
@@ -11,5 +11,5 @@ RDEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/jauhien/g-sorcery/archive/0.2.1.tar.gz -> g-sorcery-0.2.1.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ca6b1386d4b0927e9223a270407e53e
diff --git a/metadata/md5-cache/app-portage/gemato-14.0 b/metadata/md5-cache/app-portage/gemato-14.0
deleted file mode 100644
index a71a13892580..000000000000
--- a/metadata/md5-cache/app-portage/gemato-14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/gemato
-IUSE=+blake2 bzip2 +gpg lzma sha3 test tools python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd
-LICENSE=BSD-2
-RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/gemato/gemato-14.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=678a66702560bf5323a9aa5892b93bd7
diff --git a/metadata/md5-cache/app-portage/gemato-14.0m b/metadata/md5-cache/app-portage/gemato-14.0m
deleted file mode 100644
index e41bf1dd0139..000000000000
--- a/metadata/md5-cache/app-portage/gemato-14.0m
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/setuptools-34[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/gemato
-IUSE=+blake2 bzip2 +gpg lzma sha3 test tools python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd
-LICENSE=BSD-2
-RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/gemato/archive/v14.0+multiprocessing.tar.gz -> gemato-14.0-multiprocessing.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33287d9842370d68bee609aebe26b8c4
diff --git a/metadata/md5-cache/app-portage/gemato-14.1 b/metadata/md5-cache/app-portage/gemato-14.1
index 3210432a67ae..7f735a61ca26 100644
--- a/metadata/md5-cache/app-portage/gemato-14.1
+++ b/metadata/md5-cache/app-portage/gemato-14.1
@@ -8,7 +8,8 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh spa
 LICENSE=BSD-2
 RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-14.1.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9af6a5281a033a3daa8d2628a4bb11d
+_md5_=e0231fff67c76ebfc149b9165a255323
diff --git a/metadata/md5-cache/app-portage/gemato-14.1m b/metadata/md5-cache/app-portage/gemato-14.1m
index 02f60f5d1927..2d5ce523afcf 100644
--- a/metadata/md5-cache/app-portage/gemato-14.1m
+++ b/metadata/md5-cache/app-portage/gemato-14.1m
@@ -8,7 +8,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 LICENSE=BSD-2
 RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gemato/archive/v14.1+multiprocessing.tar.gz -> gemato-14.1-multiprocessing.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de9abb032b6c484f4f19ebff290fabd6
+_md5_=bad93f9d3bcb0dc96815355f591f1f8b
diff --git a/metadata/md5-cache/app-portage/gemato-9999 b/metadata/md5-cache/app-portage/gemato-9999
index 3a4b8c012744..ea12f984fb74 100644
--- a/metadata/md5-cache/app-portage/gemato-9999
+++ b/metadata/md5-cache/app-portage/gemato-9999
@@ -8,6 +8,7 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b667c56571ce50f69ba1b39d8902d36
+_md5_=297a6860817af00531a83e656d6e0aa3
diff --git a/metadata/md5-cache/app-portage/gemato-9999m b/metadata/md5-cache/app-portage/gemato-9999m
index 2aa1b14ce6b8..04aa67093e4a 100644
--- a/metadata/md5-cache/app-portage/gemato-9999m
+++ b/metadata/md5-cache/app-portage/gemato-9999m
@@ -8,6 +8,7 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=blake2? ( python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_pypy? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/bz2file[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_pypy? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_pypy? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8d065ccb30bdbf6932d3840c3d7c092
+_md5_=e6a33c4ce62f0e5ace1e272688e795d4
diff --git a/metadata/md5-cache/app-portage/golop-0.0.1-r1 b/metadata/md5-cache/app-portage/golop-0.0.1-r1
index 62840b5fb338..d158e33a2960 100644
--- a/metadata/md5-cache/app-portage/golop-0.0.1-r1
+++ b/metadata/md5-cache/app-portage/golop-0.0.1-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/klausman/golop/archive/v0.0.1.tar.gz -> golop-0.0.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=b6bd001be12f9e6e4c265569ed25443a
diff --git a/metadata/md5-cache/app-portage/golop-9999 b/metadata/md5-cache/app-portage/golop-9999
index bfaf3150cc90..f442025a934d 100644
--- a/metadata/md5-cache/app-portage/golop-9999
+++ b/metadata/md5-cache/app-portage/golop-9999
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RESTRICT=strip
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs	87f98f69344c1cc36c538f6388ebebb9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs	87f98f69344c1cc36c538f6388ebebb9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b6bd001be12f9e6e4c265569ed25443a
diff --git a/metadata/md5-cache/app-portage/java-ebuilder-0.1 b/metadata/md5-cache/app-portage/java-ebuilder-0.1
index 5423618081cb..9ca53fef3be0 100644
--- a/metadata/md5-cache/app-portage/java-ebuilder-0.1
+++ b/metadata/md5-cache/app-portage/java-ebuilder-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8 sys-process/parallel >=dev-java/maven-bin-3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/gentoo/java-ebuilder/archive/0.1.tar.gz -> java-ebuilder-0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=40a819c86c37ec154d4de39d9417c1c5
diff --git a/metadata/md5-cache/app-portage/java-ebuilder-0.2 b/metadata/md5-cache/app-portage/java-ebuilder-0.2
index e9a99efa9087..9904dabd9f23 100644
--- a/metadata/md5-cache/app-portage/java-ebuilder-0.2
+++ b/metadata/md5-cache/app-portage/java-ebuilder-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.8 sys-process/parallel >=dev-java/maven-bin-3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/gentoo/java-ebuilder/archive/0.2.tar.gz -> java-ebuilder-0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0fa03e58d8b1182fec3668f18c246887
diff --git a/metadata/md5-cache/app-portage/java-ebuilder-9999 b/metadata/md5-cache/app-portage/java-ebuilder-9999
index aed115ba7c7b..f7a771acd983 100644
--- a/metadata/md5-cache/app-portage/java-ebuilder-9999
+++ b/metadata/md5-cache/app-portage/java-ebuilder-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=virtual/jre-1.8 sys-process/parallel >=dev-java/maven-bin-3 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3fd8e7c1d2af2cea6f987bbe63fdf962
diff --git a/metadata/md5-cache/app-portage/layman-2.0.0-r1 b/metadata/md5-cache/app-portage/layman-2.0.0-r1
index 7031212af334..27eaa5b884c1 100644
--- a/metadata/md5-cache/app-portage/layman-2.0.0-r1
+++ b/metadata/md5-cache/app-portage/layman-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) gi
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae2db2fcdd97eec8e3113c3d4ade569c
diff --git a/metadata/md5-cache/app-portage/layman-2.0.0-r3 b/metadata/md5-cache/app-portage/layman-2.0.0-r3
index 1c3510ba03cb..64f93e6dafa8 100644
--- a/metadata/md5-cache/app-portage/layman-2.0.0-r3
+++ b/metadata/md5-cache/app-portage/layman-2.0.0-r3
@@ -10,5 +10,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) gi
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6356b0d115d2b1d28c723454f05cda74
diff --git a/metadata/md5-cache/app-portage/layman-2.2.0-r7 b/metadata/md5-cache/app-portage/layman-2.2.0-r7
index adf9e635df15..252e36b7b51e 100644
--- a/metadata/md5-cache/app-portage/layman-2.2.0-r7
+++ b/metadata/md5-cache/app-portage/layman-2.2.0-r7
@@ -10,5 +10,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) gi
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ca6aef3871eaca2595b0064b150b3f00
diff --git a/metadata/md5-cache/app-portage/layman-2.4.1-r1 b/metadata/md5-cache/app-portage/layman-2.4.1-r1
index 6aae522ba500..9bee0ce30b42 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.1-r1
+++ b/metadata/md5-cache/app-portage/layman-2.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) gi
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b03de2d88b5917f009e5c6b84b975b36
diff --git a/metadata/md5-cache/app-portage/layman-2.4.2-r1 b/metadata/md5-cache/app-portage/layman-2.4.2-r1
index 69d65e0be1e4..520cf206006a 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.2-r1
+++ b/metadata/md5-cache/app-portage/layman-2.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) gi
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8514e57e5a0acebac39a53b49fae3b9d
diff --git a/metadata/md5-cache/app-portage/layman-2.4.2-r2 b/metadata/md5-cache/app-portage/layman-2.4.2-r2
index 8585efd01cd5..4da581faec52 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.2-r2
+++ b/metadata/md5-cache/app-portage/layman-2.4.2-r2
@@ -11,5 +11,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) gi
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.2.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=3f4ab61bfe38be04fca2cfa035a11ce8
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index a9f5903ed920..067923ec573a 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) g-sorcery? ( app-portage/g-sorcery ) subversion? ( || ( >=dev-vcs/subversion-1.5.4[http] >=dev-vcs/subversion-1.5.4[webdav-neon] >=dev-vcs/subversion-1.5.4[webdav-serf] ) ) gpg? ( >=dev-python/pyGPG-0.2 ) sync-plugin-portage? ( >=sys-apps/portage-2.2.16[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) !sync-plugin-portage? ( sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/ssl-fetch-0.4[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+),sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=3f4ab61bfe38be04fca2cfa035a11ce8
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.3 b/metadata/md5-cache/app-portage/mirrorselect-2.2.3
index ed17283b0978..8cde7b35998a 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.3
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-2.2.3.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42f19380869876e8d01011245d2697dd
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
index c28d4c6879a1..4026fed8a700 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.4.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=608cba1eb62cabc89ed1f9c9f2cb5b92
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.5 b/metadata/md5-cache/app-portage/mirrorselect-2.2.5
index a6a4eba2c2cc..1c157c3f9c34 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.5
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)] >=dev-python/ssl-f
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.5.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=3cef92f6e189afc2f88d2f58bf93b3ef
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.6 b/metadata/md5-cache/app-portage/mirrorselect-2.2.6
index 4292038ed298..560a8d66c592 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.6
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.6
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)?] >=dev-python/ssl-
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.6.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=0d666804a74b79e36f1fc9d44b6d0be8
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index 7dcfe0ddf973..d048cab92fa6 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)] =dev-python/ssl-fetch-9999[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=866ae2fbaf4e5578ddee9e7740655b3e
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.16 b/metadata/md5-cache/app-portage/repoman-2.3.16
index 346a0f2ea9bc..f8d60a595301 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.16
+++ b/metadata/md5-cache/app-portage/repoman-2.3.16
@@ -4,11 +4,11 @@ DESCRIPTION=Repoman is a Quality Assurance tool for Gentoo ebuilds
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-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
+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
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.3.43[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.16.tar.bz2
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e706a0b9124e5a252c9f4d6643bc856d
+_md5_=68f66aae4f1eb39c57f88ae0d388c280
diff --git a/metadata/md5-cache/app-portage/splat-0.08-r1 b/metadata/md5-cache/app-portage/splat-0.08-r1
index 9c449bfd8526..e9c170fd3e1d 100644
--- a/metadata/md5-cache/app-portage/splat-0.08-r1
+++ b/metadata/md5-cache/app-portage/splat-0.08-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.l8nite.net/projects/splat/downloads/splat-0.08.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1056df4348b72e386218b4355e574193
diff --git a/metadata/md5-cache/app-portage/unsymlink-lib-16 b/metadata/md5-cache/app-portage/unsymlink-lib-16
deleted file mode 100644
index b988d806d0ea..000000000000
--- a/metadata/md5-cache/app-portage/unsymlink-lib-16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup test
-DESCRIPTION=Convert your system to SYMLINK_LIB=no
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/unsymlink-lib
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64
-LICENSE=BSD-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/unsymlink-lib/archive/v16.tar.gz -> unsymlink-lib-16.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=ed8bc8fc6e15d6584301e9a98b24be1a
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 25ad87ebf639..54d28c3992e8 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/autojump-22.5.3 b/metadata/md5-cache/app-shells/autojump-22.5.3
index 7ccb7a5855de..536b233f0041 100644
--- a/metadata/md5-cache/app-shells/autojump-22.5.3
+++ b/metadata/md5-cache/app-shells/autojump-22.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=ipython? ( || ( python_targets_python2_7 python_targets_python3_5 p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wting/autojump/archive/release-v22.5.3.tar.gz -> autojump-22.5.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=28b713dce2184a9644b9e777aac91e2e
diff --git a/metadata/md5-cache/app-shells/bash-4.4_p23-r1 b/metadata/md5-cache/app-shells/bash-4.4_p23-r1
index 0b984ce57331..6fbafef5411f 100644
--- a/metadata/md5-cache/app-shells/bash-4.4_p23-r1
+++ b/metadata/md5-cache/app-shells/bash-4.4_p23-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-7.0:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-4.4.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-001 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-002 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-003 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-004 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-005 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-006 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-007 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-008 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-009 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-010 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-011 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-012 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-013 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-014 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-015 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-016 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-017 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-018 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-019 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-020 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-021 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-022 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-023 mirror://gnu/bash/bash-4.4-patches/bash44-001 mirror://gnu/bash/bash-4.4-patches/bash44-002 mirror://gnu/bash/bash-4.4-patches/bash44-003 mirror://gnu/bash/bash-4.4-patches/bash44-004 mirror://gnu/bash/bash-4.4-patches/bash44-005 mirror://gnu/bash/bash-4.4-patches/bash44-006 mirror://gnu/bash/bash-4.4-patches/bash44-007 mirror://gnu/bash/bash-4.4-patches/bash44-008 mirror://gnu/bash/bash-4.4-patches/bash44-009 mirror://gnu/bash/bash-4.4-patches/bash44-010 mirror://gnu/bash/bash-4.4-patches/bash44-011 mirror://gnu/bash/bash-4.4-patches/bash44-012 mirror://gnu/bash/bash-4.4-patches/bash44-013 mirror://gnu/bash/bash-4.4-patches/bash44-014 mirror://gnu/bash/bash-4.4-patches/bash44-015 mirror://gnu/bash/bash-4.4-patches/bash44-016 mirror://gnu/bash/bash-4.4-patches/bash44-017 mirror://gnu/bash/bash-4.4-patches/bash44-018 mirror://gnu/bash/bash-4.4-patches/bash44-019 mirror://gnu/bash/bash-4.4-patches/bash44-020 mirror://gnu/bash/bash-4.4-patches/bash44-021 mirror://gnu/bash/bash-4.4-patches/bash44-022 mirror://gnu/bash/bash-4.4-patches/bash44-023
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6266f1bf24ae3d25e1da34bb15e77110
diff --git a/metadata/md5-cache/app-shells/bash-5.0_p11 b/metadata/md5-cache/app-shells/bash-5.0_p11
index 94b5ad687b49..6b1a778bf947 100644
--- a/metadata/md5-cache/app-shells/bash-5.0_p11
+++ b/metadata/md5-cache/app-shells/bash-5.0_p11
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= ) !<sys-apps/portage-2.1.6.7_p1
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-001 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-002 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-003 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-004 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-005 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-006 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-007 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-008 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-009 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-010 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-011 mirror://gnu/bash/bash-5.0-patches/bash50-001 mirror://gnu/bash/bash-5.0-patches/bash50-002 mirror://gnu/bash/bash-5.0-patches/bash50-003 mirror://gnu/bash/bash-5.0-patches/bash50-004 mirror://gnu/bash/bash-5.0-patches/bash50-005 mirror://gnu/bash/bash-5.0-patches/bash50-006 mirror://gnu/bash/bash-5.0-patches/bash50-007 mirror://gnu/bash/bash-5.0-patches/bash50-008 mirror://gnu/bash/bash-5.0-patches/bash50-009 mirror://gnu/bash/bash-5.0-patches/bash50-010 mirror://gnu/bash/bash-5.0-patches/bash50-011
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=3d7445cdbf344709cb398d42f0a0f505
diff --git a/metadata/md5-cache/app-shells/bash-5.0_p9 b/metadata/md5-cache/app-shells/bash-5.0_p9
index 610e7b7bcb3b..837e264f4f95 100644
--- a/metadata/md5-cache/app-shells/bash-5.0_p9
+++ b/metadata/md5-cache/app-shells/bash-5.0_p9
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= ) !<sys-apps/portage-2.1.6.7_p1
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-001 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-002 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-003 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-004 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-005 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-006 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-007 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-008 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-009 mirror://gnu/bash/bash-5.0-patches/bash50-001 mirror://gnu/bash/bash-5.0-patches/bash50-002 mirror://gnu/bash/bash-5.0-patches/bash50-003 mirror://gnu/bash/bash-5.0-patches/bash50-004 mirror://gnu/bash/bash-5.0-patches/bash50-005 mirror://gnu/bash/bash-5.0-patches/bash50-006 mirror://gnu/bash/bash-5.0-patches/bash50-007 mirror://gnu/bash/bash-5.0-patches/bash50-008 mirror://gnu/bash/bash-5.0-patches/bash50-009
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=cfa86434499ae4c1fd830359eb91c120
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.7-r3 b/metadata/md5-cache/app-shells/bash-completion-2.7-r3
deleted file mode 100644
index 506507d51550..000000000000
--- a/metadata/md5-cache/app-shells/bash-completion-2.7-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prepare test
-DEPEND=app-arch/xz-utils test? ( >=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc app-misc/dtach dev-util/dejagnu dev-tcltk/tcllib )
-DESCRIPTION=Programmable Completion for bash
-EAPI=6
-HOMEPAGE=https://github.com/scop/bash-completion
-IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
-LICENSE=GPL-2
-PDEPEND=>=app-shells/gentoo-bashcomp-20140911
-RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/scop/bash-completion/releases/download/2.7/bash-completion-2.7.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3194bf9b85016798a42faab69e8a4344
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.8 b/metadata/md5-cache/app-shells/bash-completion-2.8
deleted file mode 100644
index 99eb51af2945..000000000000
--- a/metadata/md5-cache/app-shells/bash-completion-2.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prepare test
-DEPEND=app-arch/xz-utils test? ( >=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc app-misc/dtach dev-util/dejagnu dev-tcltk/tcllib )
-DESCRIPTION=Programmable Completion for bash
-EAPI=6
-HOMEPAGE=https://github.com/scop/bash-completion
-IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
-LICENSE=GPL-2
-PDEPEND=>=app-shells/gentoo-bashcomp-20140911
-RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/scop/bash-completion/releases/download/2.8/bash-completion-2.8.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446
-_md5_=6e612be4761f74a219c13c164cb37c6a
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.9-r1 b/metadata/md5-cache/app-shells/bash-completion-2.9-r1
index 1610a261ea3d..4cb0ae1cfd5e 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.9-r1
+++ b/metadata/md5-cache/app-shells/bash-completion-2.9-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Programmable Completion for bash
 EAPI=7
 HOMEPAGE=https://github.com/scop/bash-completion
 IUSE=+eselect test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2+
 PDEPEND=>=app-shells/gentoo-bashcomp-20140911
 RDEPEND=>=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/scop/bash-completion/releases/download/2.9/bash-completion-2.9.tar.xz eselect? ( https://github.com/mgorny/bashcomp2/releases/download/v2.0.3/bashcomp-2.0.3.tar.gz )
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=17e22ae91cd4cffadc218fe124cbf09b
+_md5_=b0c6816bb00f96b084a7be206dc5a240
diff --git a/metadata/md5-cache/app-shells/tcsh-6.20.00 b/metadata/md5-cache/app-shells/tcsh-6.20.00
index cc1a3f2ca674..2eea395a6b98 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.20.00
+++ b/metadata/md5-cache/app-shells/tcsh-6.20.00
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/ncurses-5.1:0= virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/tcsh/tcsh-6.20.00.tar.gz https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d4c71ad6b565d1f5619490b8dc09cab
diff --git a/metadata/md5-cache/app-shells/tcsh-6.21.00 b/metadata/md5-cache/app-shells/tcsh-6.21.00
index 7dc53a62ece9..802099c697de 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.21.00
+++ b/metadata/md5-cache/app-shells/tcsh-6.21.00
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/ncurses-5.1:0= virtual/libiconv
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/tcsh/tcsh-6.21.00.tar.gz https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8dfe0fb968c9dfca24bfeee53776bc5a
diff --git a/metadata/md5-cache/app-shells/zsh-5.6.2 b/metadata/md5-cache/app-shells/zsh-5.6.2
index 36c21fd45523..a2415b8c8867 100644
--- a/metadata/md5-cache/app-shells/zsh-5.6.2
+++ b/metadata/md5-cache/app-shells/zsh-5.6.2
@@ -10,5 +10,5 @@ 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.6.2.tar.xz https://www.zsh.org/pub/old/zsh-5.6.2.tar.xz doc? ( https://www.zsh.org/pub/zsh-5.6.2-doc.tar.xz )
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=83ffee5ad606ba3677603dd2bdb336fc
diff --git a/metadata/md5-cache/app-shells/zsh-5.7-r1 b/metadata/md5-cache/app-shells/zsh-5.7-r1
index 8f8ac9c341c6..884793a6ef93 100644
--- a/metadata/md5-cache/app-shells/zsh-5.7-r1
+++ b/metadata/md5-cache/app-shells/zsh-5.7-r1
@@ -10,5 +10,5 @@ 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.tar.xz https://www.zsh.org/pub/old/zsh-5.7.tar.xz mirror://sourceforge/zsh/zsh-5.7.tar.xz doc? ( https://www.zsh.org/pub/zsh-5.7-doc.tar.xz mirror://sourceforge/zsh/zsh-5.7-doc.tar.xz )
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=d2bf05cb1e64b3bde0f422cf38953d17
diff --git a/metadata/md5-cache/app-shells/zsh-5.7.1 b/metadata/md5-cache/app-shells/zsh-5.7.1
index b41339122fd1..bd8705d4c938 100644
--- a/metadata/md5-cache/app-shells/zsh-5.7.1
+++ b/metadata/md5-cache/app-shells/zsh-5.7.1
@@ -11,5 +11,5 @@ 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	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=4e3fa25800089607b87971e1fa8037ce
diff --git a/metadata/md5-cache/app-shells/zsh-9999 b/metadata/md5-cache/app-shells/zsh-9999
index d601e15a5003..dc083fe33761 100644
--- a/metadata/md5-cache/app-shells/zsh-9999
+++ b/metadata/md5-cache/app-shells/zsh-9999
@@ -10,5 +10,5 @@ PDEPEND=examples? ( app-doc/zsh-lovers )
 PROPERTIES=live
 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
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=54d84097957ff901cbf18d0579890cb6
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index a888307a796f..e8132f2f68da 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/aspell-0.60.7_rc2 b/metadata/md5-cache/app-text/aspell-0.60.7_rc2
deleted file mode 100644
index 7a6ead89675f..000000000000
--- a/metadata/md5-cache/app-text/aspell-0.60.7_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
-DESCRIPTION=A spell checker replacement for ispell
-EAPI=7
-HOMEPAGE=http://aspell.net/
-IUSE=nls unicode l10n_af l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fi l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_hy l10n_is l10n_it l10n_la l10n_lt l10n_nl l10n_no l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_uk l10n_vi
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2
-PDEPEND=app-dicts/aspell-en l10n_af? ( app-dicts/aspell-af ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gl? ( app-dicts/aspell-gl ) l10n_he? ( app-dicts/aspell-he ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hy? ( app-dicts/aspell-hy ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_nl? ( app-dicts/aspell-nl ) l10n_no? ( app-dicts/aspell-no ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_uk? ( app-dicts/aspell-uk ) l10n_vi? ( app-dicts/aspell-vi )
-RDEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
-SLOT=0
-SRC_URI=mirror://gnu-alpha/aspell/aspell-0.60.7-rc2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=366d3e2b30690f085fa1a78226583305
diff --git a/metadata/md5-cache/app-text/blogc-0.17.0 b/metadata/md5-cache/app-text/blogc-0.17.0
deleted file mode 100644
index 99605330f795..000000000000
--- a/metadata/md5-cache/app-text/blogc-0.17.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=virtual/pkgconfig test? ( git? ( dev-vcs/git ) dev-util/cmocka )
-DESCRIPTION=A blog compiler
-EAPI=6
-HOMEPAGE=https://blogc.rgm.io/
-IUSE=git httpd make test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=git? ( dev-vcs/git ) !dev-vcs/blogc-git-receiver !www-servers/blogc-runserver
-SLOT=0
-SRC_URI=https://github.com/blogc/blogc/releases/download/v0.17.0/blogc-0.17.0.tar.xz
-_md5_=728a43cf652b4ac908a08e5cb5e9b991
diff --git a/metadata/md5-cache/app-text/blogc-0.18.0 b/metadata/md5-cache/app-text/blogc-0.18.0
new file mode 100644
index 000000000000..3221b45c953c
--- /dev/null
+++ b/metadata/md5-cache/app-text/blogc-0.18.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=virtual/pkgconfig test? ( git? ( dev-vcs/git ) dev-util/cmocka )
+DESCRIPTION=A blog compiler
+EAPI=6
+HOMEPAGE=https://blogc.rgm.io/
+IUSE=git httpd make test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=git? ( dev-vcs/git ) !dev-vcs/blogc-git-receiver !www-servers/blogc-runserver
+SLOT=0
+SRC_URI=https://github.com/blogc/blogc/releases/download/v0.18.0/blogc-0.18.0.tar.xz
+_md5_=728a43cf652b4ac908a08e5cb5e9b991
diff --git a/metadata/md5-cache/app-text/calibre-3.44.0 b/metadata/md5-cache/app-text/calibre-3.44.0
deleted file mode 100644
index bb36318a77ca..000000000000
--- a/metadata/md5-cache/app-text/calibre-3.44.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/3.44.0/calibre-3.44.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62a0f605fe87e08323c9be30abd41fd2
diff --git a/metadata/md5-cache/app-text/calibre-3.46.0-r1 b/metadata/md5-cache/app-text/calibre-3.46.0-r1
deleted file mode 100644
index 372e7a6c4424..000000000000
--- a/metadata/md5-cache/app-text/calibre-3.46.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/3.46.0/calibre-3.46.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62a0f605fe87e08323c9be30abd41fd2
diff --git a/metadata/md5-cache/app-text/calibre-3.47.0 b/metadata/md5-cache/app-text/calibre-3.47.0
deleted file mode 100644
index c98ade178da8..000000000000
--- a/metadata/md5-cache/app-text/calibre-3.47.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/3.47.0/calibre-3.47.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62a0f605fe87e08323c9be30abd41fd2
diff --git a/metadata/md5-cache/app-text/calibre-3.48.0 b/metadata/md5-cache/app-text/calibre-3.48.0
new file mode 100644
index 000000000000..7faf62fbf9d4
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-3.48.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=7
+HOMEPAGE=https://calibre-ebook.com/
+IUSE=ios +udisks python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/html5-parser-0.4.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/3.48.0/calibre-3.48.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=62a0f605fe87e08323c9be30abd41fd2
diff --git a/metadata/md5-cache/app-text/code2html-0.9.1-r2 b/metadata/md5-cache/app-text/code2html-0.9.1-r2
index 0238aa7f22d7..12e321210fda 100644
--- a/metadata/md5-cache/app-text/code2html-0.9.1-r2
+++ b/metadata/md5-cache/app-text/code2html-0.9.1-r2
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/perl-5
 SLOT=0
 SRC_URI=http://www.palfrader.org/code2html/all/code2html-0.9.1.tar.gz mirror://gentoo/code2html-0.9.1-gentoo_patches.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3926a7668d90b6baa32b069fe3290b32
diff --git a/metadata/md5-cache/app-text/diff-pdf-0.3 b/metadata/md5-cache/app-text/diff-pdf-0.3
index 1d3b6f3e6c9f..59c39c12e92b 100644
--- a/metadata/md5-cache/app-text/diff-pdf-0.3
+++ b/metadata/md5-cache/app-text/diff-pdf-0.3
@@ -3,10 +3,10 @@ DEPEND=app-text/poppler[cairo] dev-libs/glib x11-libs/cairo x11-libs/wxGTK:3.0[X
 DESCRIPTION=A simple tool for visually comparing two PDF files
 EAPI=6
 HOMEPAGE=http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/poppler[cairo] dev-libs/glib x11-libs/cairo x11-libs/wxGTK:3.0[X]
 SLOT=0
 SRC_URI=https://github.com/vslavik/diff-pdf/releases/download/v0.3/diff-pdf-0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=df93fa936e784cc9715b9385a1f23dfc
+_md5_=098281bf25edb7ff8547a4316639a36f
diff --git a/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4 b/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4
new file mode 100644
index 000000000000..c5ab2a586ef4
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=DSSSL Stylesheets for DocBook
+EAPI=7
+HOMEPAGE=https://github.com/docbook/wiki/wiki
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=MIT
+RDEPEND=app-text/docbook-sgml-dtd:3.0 >=app-text/sgml-common-0.6.3-r7
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/docbook/docbook-dsssl/1.79/docbook-dsssl-1.79.tar.bz2
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=b3db7e4bb0b91c1d810ca9e1e51e4970
diff --git a/metadata/md5-cache/app-text/docbook-sgml-1.0-r1 b/metadata/md5-cache/app-text/docbook-sgml-1.0-r1
index 0afbbc14af68..0bdeeb5f2aeb 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-1.0-r1
+++ b/metadata/md5-cache/app-text/docbook-sgml-1.0-r1
@@ -3,7 +3,7 @@ DESCRIPTION=A helper package for sgml docbook
 EAPI=7
 HOMEPAGE=https://www.docbook.org/sgml/
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=app-text/sgml-common app-text/openjade >=app-text/docbook-dsssl-stylesheets-1.64 >=app-text/docbook-sgml-utils-0.6.6 ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1
+LICENSE=metapackage
+RDEPEND=>=app-text/docbook-dsssl-stylesheets-1.64 ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 >=app-text/docbook-sgml-utils-0.6.6 app-text/openjade app-text/sgml-common
 SLOT=0
-_md5_=1202666e0eb2db5d3a2b3e73dd1802fd
+_md5_=4e443f4c04b6aa3d83666d6a92e9a894
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r4 b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r4
new file mode 100644
index 000000000000..2a5e4d7e7ed1
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.0-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook SGML DTD 3.0
+EAPI=7
+HOMEPAGE=https://docbook.org/sgml/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/sgml-common-0.6.3-r7
+SLOT=3.0
+SRC_URI=https://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=a8f6f2df3236c1a3c5dc93ec13c6c8ce
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r4 b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r4
new file mode 100644
index 000000000000..a3a04fb8bdb3
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook SGML DTD 3.1
+EAPI=7
+HOMEPAGE=https://docbook.org/sgml/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/sgml-common-0.6.3-r7
+SLOT=3.1
+SRC_URI=https://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=a8f6f2df3236c1a3c5dc93ec13c6c8ce
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r4 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r4
new file mode 100644
index 000000000000..8d8894970247
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.0-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook SGML DTD 4.0
+EAPI=7
+HOMEPAGE=https://docbook.org/sgml/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/sgml-common-0.6.3-r7
+SLOT=4.0
+SRC_URI=https://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=a8f6f2df3236c1a3c5dc93ec13c6c8ce
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4
new file mode 100644
index 000000000000..255669c92942
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.1-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook SGML DTD 4.1
+EAPI=7
+HOMEPAGE=https://docbook.org/sgml/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/sgml-common-0.6.3-r7
+SLOT=4.1
+SRC_URI=https://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=a8f6f2df3236c1a3c5dc93ec13c6c8ce
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.2-r3 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.2-r3
new file mode 100644
index 000000000000..0c25df2aa6ce
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.2-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook SGML DTD 4.2
+EAPI=7
+HOMEPAGE=https://docbook.org/sgml/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/sgml-common-0.6.3-r7
+SLOT=4.2
+SRC_URI=https://www.oasis-open.org/docbook/sgml/4.2/docbook-4.2.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=194a0a8178d14885df2451f946e46c15
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.3-r3 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.3-r3
new file mode 100644
index 000000000000..d93baa5071fb
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.3-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook SGML DTD 4.3
+EAPI=7
+HOMEPAGE=https://docbook.org/sgml/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/sgml-common-0.6.3-r7
+SLOT=4.3
+SRC_URI=https://docbook.org/sgml/4.3/docbook-4.3.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=e5144c70fa04a75b07bf52c2a33244dd
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.4-r1 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.4-r1
new file mode 100644
index 000000000000..fd8afc026586
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook SGML DTD 4.4
+EAPI=7
+HOMEPAGE=https://docbook.org/sgml/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/sgml-common-0.6.3-r7
+SLOT=4.4
+SRC_URI=https://docbook.org/sgml/4.4/docbook-4.4.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=edfd01b896165c56eec692575481f186
diff --git a/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1 b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1
new file mode 100644
index 000000000000..2df6fdb4623d
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-sgml-dtd-4.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook SGML DTD 4.5
+EAPI=7
+HOMEPAGE=https://docbook.org/sgml/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/sgml-common-0.6.3-r7
+SLOT=4.5
+SRC_URI=https://docbook.org/sgml/4.5/docbook-4.5.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=a11fce0ae4c4d088257b60611e8d03ed
diff --git a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
index 245200bedb20..295d1f1a311c 100644
--- a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
+++ b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1643e3a027f12e8b828cdf56bc3f22fe
diff --git a/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r3 b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r3
new file mode 100644
index 000000000000..d8e35b4f7797
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r3
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=install prepare
+DEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
+DESCRIPTION=Shell scripts to manage DocBook documents
+EAPI=7
+HOMEPAGE=https://sourceware.org/docbook-tools/
+IUSE=jadetex
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
+SLOT=0
+SRC_URI=https://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8c67e1e91aa8f866ec63f58621028356
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r7 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r7
new file mode 100644
index 000000000000..84038fa2a01f
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook DTD for XML
+EAPI=7
+HOMEPAGE=https://docbook.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
+SLOT=4.1.2
+SRC_URI=https://docbook.org/xml/4.1.2/docbkx412.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=6ad2cc8856ecc33e3d31b0f9d1b1b3b0
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3
new file mode 100644
index 000000000000..416d78d67a66
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.2-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook DTD for XML
+EAPI=7
+HOMEPAGE=https://docbook.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
+SLOT=4.2
+SRC_URI=https://docbook.org/xml/4.2/docbook-xml-4.2.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=32f0abbbf000c9a483271070f50ed8cd
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r2 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r2
new file mode 100644
index 000000000000..3163b5c084b6
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.3-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook DTD for XML
+EAPI=7
+HOMEPAGE=https://docbook.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
+SLOT=4.3
+SRC_URI=https://docbook.org/xml/4.3/docbook-xml-4.3.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=32f0abbbf000c9a483271070f50ed8cd
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r3 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r3
new file mode 100644
index 000000000000..11859d24296c
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.4-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook DTD for XML
+EAPI=7
+HOMEPAGE=https://docbook.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
+SLOT=4.4
+SRC_URI=https://docbook.org/xml/4.4/docbook-xml-4.4.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=fed416f439a20e0704525662f02e4ac0
diff --git a/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r2 b/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r2
new file mode 100644
index 000000000000..763eab2cbadf
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-xml-dtd-4.5-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Docbook DTD for XML
+EAPI=7
+HOMEPAGE=https://docbook.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r7
+SLOT=4.5
+SRC_URI=https://docbook.org/xml/4.5/docbook-xml-4.5.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=fed416f439a20e0704525662f02e4ac0
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r3 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r3
new file mode 100644
index 000000000000..2a4f2f224586
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Simplified Docbook DTD for XML
+EAPI=7
+HOMEPAGE=https://www.oasis-open.org/docbook/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/build-docbook-catalog-1.6 >=app-text/sgml-common-0.6.3-r7
+SLOT=1.0
+SRC_URI=https://www.oasis-open.org/docbook/xml/simple/1.0/docbook-simple-1.0.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=473b344e44e49a854c70fa5ca946289e
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r3 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r3
index 9bd8922f6642..6c4a1d62444e 100644
--- a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r3
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r3
@@ -6,7 +6,7 @@ HOMEPAGE=http://www.oasis-open.org/docbook/
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=docbook
 RDEPEND=>=app-text/build-docbook-catalog-1.6
-SLOT=0
+SLOT=4.1.2.4
 SRC_URI=mirror://gentoo/sdb4124.zip
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	a1731744d7cca1d14638e0e054ceea6e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8d0f185c99e62e14b50ba46a6e563627
+_md5_=47237fa4251753523f2e80345862f68d
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r4 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r4
new file mode 100644
index 000000000000..b4a0dcd05e34
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Simplified Docbook DTD for XML
+EAPI=7
+HOMEPAGE=https://www.oasis-open.org/docbook/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/build-docbook-catalog-1.6 >=app-text/sgml-common-0.6.3-r7
+SLOT=4.1.2.4
+SRC_URI=mirror://gentoo/sdb4124.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=f3b65ed69904659db01f612c61ad9396
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.5-r3 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.5-r3
new file mode 100644
index 000000000000..7376d7334a56
--- /dev/null
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.5-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=app-arch/unzip-5.41
+DESCRIPTION=Simplified Docbook DTD for XML
+EAPI=7
+HOMEPAGE=http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
+LICENSE=docbook
+RDEPEND=>=app-text/build-docbook-catalog-1.6 >=app-text/sgml-common-0.6.3-r7
+SLOT=4.1.2.5
+SRC_URI=https://www.oasis-open.org/docbook/xml/simple/4.1.2.5/simple4125.zip
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=781aa2417f4a7b8c4b4607380a97f6cb
diff --git a/metadata/md5-cache/app-text/grutatxt-2.0.16-r1 b/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
index 172bbac874b2..f1c8f9e4622b 100644
--- a/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
+++ b/metadata/md5-cache/app-text/grutatxt-2.0.16-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.triptico.com/download/Grutatxt-2.0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2715d1ffbc4e4ab33841d81923078fdc
diff --git a/metadata/md5-cache/app-text/html401-19991224-r4 b/metadata/md5-cache/app-text/html401-19991224-r4
new file mode 100644
index 000000000000..328a114e4b81
--- /dev/null
+++ b/metadata/md5-cache/app-text/html401-19991224-r4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst
+DESCRIPTION=DTDs for the HyperText Markup Language 4.01
+EAPI=7
+HOMEPAGE=http://www.w3.org/TR/html401/
+KEYWORDS=~amd64 ~ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=W3C
+RDEPEND=>=app-text/sgml-common-0.6.3-r7
+SLOT=0
+SRC_URI=http://www.w3.org/TR/html401/html40.tgz
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=f68c3042fceda1347908fdc501881a0c
diff --git a/metadata/md5-cache/app-text/libabw-0.1.3 b/metadata/md5-cache/app-text/libabw-0.1.3
new file mode 100644
index 000000000000..7f54b6bf30df
--- /dev/null
+++ b/metadata/md5-cache/app-text/libabw-0.1.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 sys-devel/libtool
+DESCRIPTION=Library parsing abiword documents
+EAPI=7
+HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libabw
+IUSE=doc static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
+SLOT=0
+SRC_URI=https://dev-www.libreoffice.org/src/libabw/libabw-0.1.3.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8fbb1b631d4570a91b3d9d46e99eaadb
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.9 b/metadata/md5-cache/app-text/libetonyek-0.1.9
index cfc14a1d4b29..eb0b0bcc0aec 100644
--- a/metadata/md5-cache/app-text/libetonyek-0.1.9
+++ b/metadata/md5-cache/app-text/libetonyek-0.1.9
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-1.3.1:1= sys-libs/zlib dev-libs/boost media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
+DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 =dev-util/mdds-1.4*:1= sys-libs/zlib dev-libs/boost media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
 DESCRIPTION=Library parsing Apple Keynote presentations
 EAPI=7
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
 IUSE=doc static-libs test
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
-RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-1.3.1:1= sys-libs/zlib
+RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 =dev-util/mdds-1.4*:1= sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.9.tar.xz
-_md5_=19481697bbfb8e2003a67b3a574980b2
+_md5_=7bbd10ca9423943638671c6b5f33235a
diff --git a/metadata/md5-cache/app-text/libetonyek-9999 b/metadata/md5-cache/app-text/libetonyek-9999
index 149ca543e07e..e7451161bba6 100644
--- a/metadata/md5-cache/app-text/libetonyek-9999
+++ b/metadata/md5-cache/app-text/libetonyek-9999
@@ -1,13 +1,13 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 install prepare unpack
-DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-1.3.1:1= sys-libs/zlib dev-libs/boost media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
+DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-1.4.3:1= sys-libs/zlib dev-libs/boost media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
 DESCRIPTION=Library parsing Apple Keynote presentations
 EAPI=7
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
 IUSE=doc static-libs test
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 PROPERTIES=live
-RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-1.3.1:1= sys-libs/zlib
+RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 >=dev-util/mdds-1.4.3:1= sys-libs/zlib
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d5719be0df4b3ef42adc1fc3ed120123
+_md5_=96322a176e8cb76fa17bf54a9a8f9d86
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
new file mode 100644
index 000000000000..680d4a819c82
--- /dev/null
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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/latex-base >=sys-apps/texinfo-4.2-r5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff sys-devel/flex virtual/awk doc? ( dev-texlive/texlive-fontsrecommended virtual/latex-base )
+DESCRIPTION=A toolset for processing LinuxDoc DTD SGML files
+EAPI=7
+HOMEPAGE=https://gitlab.com/agmartin/linuxdoc-tools
+IUSE=doc
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-3+ MIT SGMLUG
+RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff virtual/latex-base >=app-text/sgml-common-0.6.3-r7
+SLOT=0
+SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/-/archive/0.9.73/linuxdoc-tools-0.9.73.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	latex-package	17f13abe0de88340745e52e6b627aee7	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=dbe131b10e90f680e21bd0a2177b2da3
diff --git a/metadata/md5-cache/app-text/mupdf-1.14.0-r2 b/metadata/md5-cache/app-text/mupdf-1.14.0-r2
deleted file mode 100644
index d9d318f03d8a..000000000000
--- a/metadata/md5-cache/app-text/mupdf-1.14.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=>=dev-lang/mujs-1.0.4 media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] virtual/jpeg[static-libs?] curl? ( net-misc/curl[static-libs?] ) opengl? ( >=media-libs/freeglut-3.0.0:= ) ssl? ( libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) ) X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
-EAPI=6
-HOMEPAGE=https://mupdf.com/
-IUSE=X curl +javascript libressl opengl +ssl static-libs +vanilla
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=AGPL-3
-RDEPEND=>=dev-lang/mujs-1.0.4 media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] virtual/jpeg[static-libs?] curl? ( net-misc/curl[static-libs?] ) opengl? ( >=media-libs/freeglut-3.0.0:= ) ssl? ( libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) ) X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] )
-REQUIRED_USE=opengl? ( !static-libs ) curl? ( X )
-SLOT=0/1.14.0
-SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.14.0-source.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=945a4c586947f0fe3c69c00d6c1fc308
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r9 b/metadata/md5-cache/app-text/openjade-1.3.2-r9
new file mode 100644
index 000000000000..a13538e9f601
--- /dev/null
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r9
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/sgml-common >=app-text/opensp-1.5.1 dev-lang/perl
+DESCRIPTION=Jade is an implementation of DSSSL for formatting SGML and XML documents
+EAPI=7
+HOMEPAGE=http://openjade.sourceforge.net
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1 >=app-text/sgml-common-0.6.3-r7
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/openjade/openjade/1.3.2/openjade-1.3.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f5d35c8bbf6a2c0c4350467826b72c6d
diff --git a/metadata/md5-cache/app-text/sgml-common-0.6.3-r6 b/metadata/md5-cache/app-text/sgml-common-0.6.3-r6
index dda8bb695912..7f737a6c72af 100644
--- a/metadata/md5-cache/app-text/sgml-common-0.6.3-r6
+++ b/metadata/md5-cache/app-text/sgml-common-0.6.3-r6
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh spa
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/sgml-common/sgml-common-0.6.3-gentoo.tar.gz
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=f463c59084c0231485f59d39db004173
diff --git a/metadata/md5-cache/app-text/sgml-common-0.6.3-r7 b/metadata/md5-cache/app-text/sgml-common-0.6.3-r7
new file mode 100644
index 000000000000..0826336edbcb
--- /dev/null
+++ b/metadata/md5-cache/app-text/sgml-common-0.6.3-r7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DESCRIPTION=Base ISO character entities and utilities for SGML
+EAPI=7
+HOMEPAGE=https://www.iso.org/standard/16387.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=FDL-1.1+ GPL-2
+RDEPEND=>=app-text/sgml-common-0.6.3-r7
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~floppym/dist/sgml-common/sgml-common-0.6.3-gentoo.tar.gz
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501	sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=7333e3b5287ee1980abf8493390f79d7
diff --git a/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r15 b/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r15
new file mode 100644
index 000000000000..706d03699f02
--- /dev/null
+++ b/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/sgml-common app-text/docbook-sgml-dtd:3.1 app-text/docbook-dsssl-stylesheets app-text/openjade jadetex? ( app-text/jadetex ) || ( www-client/w3m www-client/lynx )
+DESCRIPTION=Python interface to SGML software in a DocBook/OpenJade env
+EAPI=7
+HOMEPAGE=http://sgmltools-lite.sourceforge.net/
+IUSE=jadetex python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/sgml-common app-text/docbook-sgml-dtd:3.1 app-text/docbook-dsssl-stylesheets app-text/openjade jadetex? ( app-text/jadetex ) || ( www-client/w3m www-client/lynx ) >=app-text/sgml-common-0.6.3-r7
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/sgmltools-lite/sgmltools-lite/3.0.3/sgmltools-lite-3.0.3.tar.gz https://downloads.sourceforge.net/project/sgmltools-lite/support%20files/0.0.1-1/nw-eps-icons-0.0.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=95b9379564af47997a31f24120d0caa5
diff --git a/metadata/md5-cache/app-text/texi2html-5.0-r1 b/metadata/md5-cache/app-text/texi2html-5.0-r1
index 61f2d4484867..08c732e581f4 100644
--- a/metadata/md5-cache/app-text/texi2html-5.0-r1
+++ b/metadata/md5-cache/app-text/texi2html-5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/libintl-perl-1.200 unicode? ( dev-perl
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://nongnu/texi2html/texi2html-5.0.tar.bz2
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=546ec46a53a3fc26dbadc4dfd798db63
diff --git a/metadata/md5-cache/app-text/xhtml1-20020801-r6 b/metadata/md5-cache/app-text/xhtml1-20020801-r6
new file mode 100644
index 000000000000..6b194ac4200f
--- /dev/null
+++ b/metadata/md5-cache/app-text/xhtml1-20020801-r6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=app-text/sgml-common dev-libs/libxml2
+DESCRIPTION=DTDs for the eXtensible HyperText Markup Language 1.0
+EAPI=7
+HOMEPAGE=http://www.w3.org/TR/xhtml1/
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=W3C
+RDEPEND=>=app-text/sgml-common-0.6.3-r7
+SLOT=0
+SRC_URI=mirror://gentoo/xhtml1.tgz -> xhtml1-20020801.tgz
+_eclasses_=sgml-catalog-r1	6fa52026c20ad1253e53cc4b19fe5dab
+_md5_=6a32717b32a58575dc9ba5b7ab272bbd
diff --git a/metadata/md5-cache/app-text/xmldiff-0.6.10-r2 b/metadata/md5-cache/app-text/xmldiff-0.6.10-r2
deleted file mode 100644
index 608e9199bac1..000000000000
--- a/metadata/md5-cache/app-text/xmldiff-0.6.10-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A tool that figures out the differences between two similar XML files
-EAPI=5
-HOMEPAGE=https://github.com/Shoobx/xmldiff https://www.logilab.org/project/xmldiff
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=ftp://ftp.logilab.fr/pub/xmldiff/xmldiff-0.6.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2299a4d580e98ff9b7166459897534cf
diff --git a/metadata/md5-cache/app-text/zathura-0.4.4 b/metadata/md5-cache/app-text/zathura-0.4.4
new file mode 100644
index 000000000000..a1dcc43e776b
--- /dev/null
+++ b/metadata/md5-cache/app-text/zathura-0.4.4
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx ) test? ( dev-libs/appstream-glib dev-libs/check ) virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
+DESCRIPTION=A highly customizable and functional document viewer
+EAPI=7
+HOMEPAGE=http://pwmt.org/projects/zathura/
+IUSE=doc +magic seccomp sqlite synctex test test
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=ZLIB
+RDEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pwmt/zathura/archive/0.4.4.tar.gz -> zathura-0.4.4.tar.gz
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=85992c70d257639a522132ffd319245b
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index 1aa9dc25ae20..dcd9748df24a 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -1,12 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm test unpack
-DEPEND=>=dev-libs/girara-0.3.1 >=dev-libs/glib-2.50:2 dev-python/sphinx >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core ) test? ( dev-libs/check ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=doc? ( dev-python/sphinx ) test? ( dev-libs/appstream-glib dev-libs/check ) virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
 DESCRIPTION=A highly customizable and functional document viewer
-EAPI=6
+EAPI=7
 HOMEPAGE=http://pwmt.org/projects/zathura/
-IUSE=+magic seccomp sqlite synctex test test
+IUSE=doc +magic seccomp sqlite synctex test test
 LICENSE=ZLIB
 PROPERTIES=live
-RDEPEND=>=dev-libs/girara-0.3.1 >=dev-libs/glib-2.50:2 dev-python/sphinx >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
+RDEPEND=>=dev-libs/girara-0.3.3 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
+RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=656a70a34b53fc0317e44750307d7c3a
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=85992c70d257639a522132ffd319245b
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
index 13a16519147d..4f9eb3c73825 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=app-text/mupdf >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f912bd89fd597846894ff65ee351cb32
+_md5_=f4ae4244c165df8fcf99ebe6718194eb
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 4d374bd63423..e5b77f2ef134 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20181023 b/metadata/md5-cache/app-vim/gentoo-syntax-20181023
deleted file mode 100644
index 8e16d034f713..000000000000
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20181023
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
-EAPI=6
-HOMEPAGE=https://github.com/gentoo/gentoo-syntax
-IUSE=ignore-glep31
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/gentoo-syntax-20181023.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=edeb133f01b3c63c9f7db68a57991320
diff --git a/metadata/md5-cache/app-vim/pydiction-1.2.3 b/metadata/md5-cache/app-vim/pydiction-1.2.3
deleted file mode 100644
index baf5a04999b3..000000000000
--- a/metadata/md5-cache/app-vim/pydiction-1.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Tab-complete your Python code
-EAPI=6
-HOMEPAGE=https://rkulla.github.io/pydiction/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=vim
-RDEPEND=dev-lang/python:* || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/pydiction-1.2.3.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=7f51bfb0df96cc750bcee482d6af490b
diff --git a/metadata/md5-cache/app-vim/pydiction-1.2.3-r1 b/metadata/md5-cache/app-vim/pydiction-1.2.3-r1
deleted file mode 100644
index 1812a70f3ff1..000000000000
--- a/metadata/md5-cache/app-vim/pydiction-1.2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: tab-complete your Python code
-EAPI=6
-HOMEPAGE=https://rkulla.github.io/pydiction/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=vim
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/pydiction-1.2.3.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=8c26b7f604b7067a15c3592bfd776539
diff --git a/metadata/md5-cache/app-vim/pydiction-1.2.3-r2 b/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
index 480e96cfe150..f8a0915aee7f 100644
--- a/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
+++ b/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=vim plugin: tab-complete your Python code
 EAPI=6
 HOMEPAGE=https://rkulla.github.io/pydiction/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=vim
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/pydiction-1.2.3.zip
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=3023325d6e3db32abd2b1c0f67425db1
+_md5_=e005562b8b3bef2d2aba8a6eeb398553
diff --git a/metadata/md5-cache/app-vim/vimpython-1.13-r2 b/metadata/md5-cache/app-vim/vimpython-1.13-r2
index 56ed1633e64e..5d8f8291c072 100644
--- a/metadata/md5-cache/app-vim/vimpython-1.13-r2
+++ b/metadata/md5-cache/app-vim/vimpython-1.13-r2
@@ -4,11 +4,11 @@ DESCRIPTION=vim plugin: A set of menus/shortcuts to work with Python files
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=30
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ia64 ppc sparc x86
 LICENSE=vim
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gentoo/vimpython-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpython-1.13.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=fd7b886a478a5a3519f368a7d74663fa
+_md5_=cc3e1863f078d504e4d21d56ae854e64
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 59c36ed9a6a3..6f87cc39ad50 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2017-r2 b/metadata/md5-cache/dev-ada/gprbuild-2017-r2
new file mode 100644
index 000000000000..344e63250171
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gprbuild-2017-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+DESCRIPTION=Multi-Language Management
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/
+IUSE=ada_target_gnat_2016 ada_target_gnat_2017 -ada_target_gnat_2018 -ada_target_gnat_2019
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
+REQUIRED_USE=^^ ( ada_target_gnat_2016 ada_target_gnat_2017 )
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 -> gprbuild-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 -> xmlada-gpl-2017-src.tar.gz
+_eclasses_=ada	031fbc921d4043cc6a81adada956b77d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=35bb336d56da0215574308721e009f71
diff --git a/metadata/md5-cache/dev-ada/gprbuild-2019-r1 b/metadata/md5-cache/dev-ada/gprbuild-2019-r1
new file mode 100644
index 000000000000..4c61bf47df04
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gprbuild-2019-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+DESCRIPTION=Multi-Language Management
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/
+IUSE=ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 -> gprbuild-2019-20190517-194D8-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5 -> xmlada-2019-20190429-19B9D-src.tar.gz
+_eclasses_=ada	031fbc921d4043cc6a81adada956b77d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b9c27b1b905ffa622f29900ddeb05b02
diff --git a/metadata/md5-cache/dev-ada/xmlada-2019-r1 b/metadata/md5-cache/dev-ada/xmlada-2019-r1
new file mode 100644
index 000000000000..7029adaa1a81
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/xmlada-2019-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup test
+DEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gprbuild[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?]
+DESCRIPTION=Set of modules that provide a simple manipulation of XML streams
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/
+IUSE=+shared static-libs static-pic ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )
+REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5 -> xmlada-2019-20190429-19B9D-src.tar.gz
+_eclasses_=ada	031fbc921d4043cc6a81adada956b77d	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=5af0358f6bbdaa7612331cdd37ce92e2
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index d63dbc7f0d55..664e5b569e68 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/glog-0.3.5 b/metadata/md5-cache/dev-cpp/glog-0.3.5
deleted file mode 100644
index 69638f11f217..000000000000
--- a/metadata/md5-cache/dev-cpp/glog-0.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=gflags? ( >=dev-cpp/gflags-2.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(-)?] ) unwind? ( sys-libs/libunwind[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? ( >=dev-cpp/gtest-1.8.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(-)?] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Google's C++ logging library
-EAPI=6
-HOMEPAGE=https://github.com/google/glog
-IUSE=gflags static-libs test unwind 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 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=gflags? ( >=dev-cpp/gflags-2.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(-)?] ) unwind? ( sys-libs/libunwind[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
-SLOT=0
-SRC_URI=https://github.com/google/glog/archive/v0.3.5.tar.gz -> glog-0.3.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=fe2ffdd71931ecf19789fd794532bbac
diff --git a/metadata/md5-cache/dev-cpp/sparsehash-1.10 b/metadata/md5-cache/dev-cpp/sparsehash-1.10
deleted file mode 100644
index 5230eeb94844..000000000000
--- a/metadata/md5-cache/dev-cpp/sparsehash-1.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=An extremely memory-efficient hash_map implementation
-EAPI=4
-HOMEPAGE=https://github.com/google/sparsehash
-KEYWORDS=amd64 x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://google-sparsehash.googlecode.com/files/sparsehash-1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=701d8c2f443755e7e2438b5337595b66
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 6c5e93e41920..ae80a4e12ad0 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.38-r1 b/metadata/md5-cache/dev-db/mariadb-10.1.38-r1
index 1e25d01c466c..051c26907b07 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.38-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.38-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.38/source/mariadb-10.1.38.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=92b419dba5f392d86c387bc3cd28574b
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.41-r1 b/metadata/md5-cache/dev-db/mariadb-10.1.41-r1
index cac658cc0205..f2cd8f80acc6 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.41-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.41-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.41/source/mariadb-10.1.41.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05132407cc4da7632ee00d20ab965198
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.22-r1 b/metadata/md5-cache/dev-db/mariadb-10.2.22-r1
index d460e0bd9708..207091d4a2d5 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.22-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.22-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.22/source/mariadb-10.2.22.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea569863122b84417e84cdde5a0aa3d5
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.26-r1 b/metadata/md5-cache/dev-db/mariadb-10.2.26-r1
index cdee1c987891..e246ee92d9b8 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.26-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.26-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.26/source/mariadb-10.2.26.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7cde58cc49dc10b65e72e6d4f475c9c0
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.17-r1 b/metadata/md5-cache/dev-db/mariadb-10.3.17-r1
index 9bdb129d9899..06c27bc77f7d 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.17-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.17-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.17/source/mariadb-10.3.17.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=756d64414281389719bdb88d81b4f869
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.7-r1 b/metadata/md5-cache/dev-db/mariadb-10.4.7-r1
index b1b22ac0a97e..a083096b4b14 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.7-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.7/source/mariadb-10.4.7.tar.gz mirror://gentoo/mysql-extras-20190731-2258Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190731-2258Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190731-2258Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190731-2258Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190731-2258Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f49d46365f8d41f95d810cdd51a48836
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.65 b/metadata/md5-cache/dev-db/mariadb-5.5.65
index 613aa9917e42..42975ca15e69 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.5.65
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.65
@@ -12,5 +12,5 @@ REQUIRED_USE=server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc )
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-5.5.65/source/mariadb-5.5.65.tar.gz mirror://gentoo/mysql-extras-20180809-1700Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180809-1700Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11c2eda1f8ab9cab77f887287b824fbf
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.44-r1 b/metadata/md5-cache/dev-db/mysql-5.6.44-r1
index d818460a763a..d9246a992f44 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.44-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.6.44-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.44.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.44.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.44.tar.gz mirror://gentoo/mysql-extras-20190817-0024Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190817-0024Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190817-0024Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190817-0024Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190817-0024Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=675afda089f8ab52eea6f29264198146
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.45-r2 b/metadata/md5-cache/dev-db/mysql-5.6.45-r2
index 637a4715a216..d2075765423d 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.45-r2
+++ b/metadata/md5-cache/dev-db/mysql-5.6.45-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=6
 HOMEPAGE=https://www.mysql.com/
 IUSE=client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux +server static static-libs systemtap tcmalloc test yassl 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts ) ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) net-misc/curl >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( =dev-libs/libressl-2.6.5*:0= ) ) >=sys-libs/zlib-1.2.3:0= sys-libs/ncurses:0= server? ( numa? ( sys-process/numactl ) ) !client-libs? ( dev-db/mysql-connector-c[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(-)?,static-libs?] )
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.45.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.45.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.45.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190822-1908Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91a147bb66e2a249b2841ef0d38ef1e9
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8666deea2a48eaf69a9d0ded4a4332ff
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.26-r1 b/metadata/md5-cache/dev-db/mysql-5.7.26-r1
index d5b2e9fad106..9e6b91b0451c 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.26-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.7.26-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.26.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.26.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.26.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0321dec52b25347fff7dfdbbe166681b
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.27-r1 b/metadata/md5-cache/dev-db/mysql-5.7.27-r1
index a59c66d69a67..01cc88281c9a 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.27-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.7.27-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=6
 HOMEPAGE=https://www.mysql.com/
 IUSE=cjk client-libs cracklib debug experimental jemalloc latin1 libressl numa +perl profiling selinux +server static static-libs systemtap tcmalloc test yassl kernel_linux 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 )
 RDEPEND=net-misc/curl:= >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= client-libs? ( >=sys-libs/zlib-1.2.3: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(-)?,static-libs?] ) !client-libs? ( dev-db/mysql-connector-c[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(-)?,static-libs?] >=sys-libs/zlib-1.2.3:0= ) jemalloc? ( dev-libs/jemalloc:0= ) kernel_linux? ( dev-libs/libaio:0= sys-process/procps:0= ) server? ( >=app-arch/lz4-0_p131:= cjk? ( app-text/mecab:= ) experimental? ( dev-libs/libevent:= dev-libs/protobuf:= net-libs/libtirpc:= ) numa? ( sys-process/numactl ) ) systemtap? ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) !yassl? ( client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.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(-)?,static-libs?] ) libressl? ( dev-libs/libressl: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(-)?,static-libs?] ) ) !client-libs? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= ) selinux? ( sec-policy/selinux-mysql ) server? ( !prefix? ( acct-group/mysql acct-user/mysql dev-db/mysql-init-scripts ) )
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.27.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.27.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.27.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2bc6c2007bb7a7880ba61500b0483a44
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e1daf450d3fb060a2132ea7c086119e7
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.17 b/metadata/md5-cache/dev-db/mysql-8.0.17
index c7608f596ca4..9dccdbb8659b 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.17
+++ b/metadata/md5-cache/dev-db/mysql-8.0.17
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=libressl? ( test )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.17.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.17.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.17.tar.gz mirror://gentoo/mysql-extras-20190817-0024Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190817-0024Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ebf1aa7cea897e54001cdeda4a3e602
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.2.34 b/metadata/md5-cache/dev-db/mysql-cluster-7.2.34
index 925ff761091e..15b3db760e2b 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.2.34
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.2.34
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=!bindist? ( bindist ) libressl? ( test )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-Cluster-7.2/mysql-cluster-gpl-7.2.34.tar.gz https://downloads.mysql.com/archives/MySQL-Cluster-7.2/mysql-cluster-gpl-7.2.34.tar.gz mirror://gentoo/mysql-extras-20190121-0015Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190121-0015Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=552c9f6d7cece097d3fe8e1934c1b740
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.3.22 b/metadata/md5-cache/dev-db/mysql-cluster-7.3.22
index 6fbb4914ea46..33d8e650a887 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.3.22
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.3.22
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-Cluster-7.3/mysql-cluster-gpl-7.3.22.tar.gz https://downloads.mysql.com/archives/MySQL-Cluster-7.3/mysql-cluster-gpl-7.3.22.tar.gz mirror://gentoo/mysql-extras-20190121-0015Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190121-0015Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2c3a611fe79353e925e48178ac6943d
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.4.21 b/metadata/md5-cache/dev-db/mysql-cluster-7.4.21
index f852d242d243..e86070eda229 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.4.21
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.4.21
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-Cluster-7.4/mysql-cluster-gpl-7.4.21.tar.gz https://downloads.mysql.com/archives/MySQL-Cluster-7.4/mysql-cluster-gpl-7.4.21.tar.gz mirror://gentoo/mysql-extras-20190121-0015Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190121-0015Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67f5354400abd6c36cdd40db6afd8eb2
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.17 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.17
new file mode 100644
index 000000000000..e7a012f136f4
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.17
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
+EAPI=7
+HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
+IUSE=+legacy libressl
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Artistic GPL-2
+RDEPEND=dev-libs/protobuf:= legacy? ( dev-libs/boost:= >=dev-db/mysql-connector-c-6.1.8:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-8.0.17-src.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ab174d2ab7993414d5f7acbbd6f9bfd6
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3
index 91f8cc8d69dc..d32be6daf4df 100644
--- a/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3
+++ b/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x8
 LICENSE=GPL-2
 RDEPEND=!<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2 dev-db/mysql-connector-c !prefix? ( acct-group/mysql acct-user/mysql ) virtual/tmpfiles
 SLOT=0
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	s6	77dc4ae04ca4f45f43b492f80a8fa2ea	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=1b12f8a9c5e67b16b87877785071131a
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-19.3.0.0-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-19.3.0.0-r1
new file mode 100644
index 000000000000..9a1ff59fbfdc
--- /dev/null
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-19.3.0.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare test unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Oracle 18c Instant Client with SDK
+EAPI=7
+HOMEPAGE=https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html
+IUSE=jdbc odbc precomp +sdk +sqlplus tools 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 ~x86
+LICENSE=OTN
+RDEPEND=>=dev-libs/libaio-0.3.109-r5[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-db/oracle-instantclient-basic-12 !<dev-db/oracle-instantclient-odbc-12 !<dev-db/oracle-instantclient-jdbc-12 !<dev-db/oracle-instantclient-sqlplus-12
+REQUIRED_USE=precomp? ( sdk )
+RESTRICT=fetch splitdebug
+SLOT=0/18.1
+SRC_URI=abi_x86_32? ( instantclient-basic-linux-19.3.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux-19.3.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux-19.3.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux-19.3.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( instantclient-sdk-linux-19.3.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux-19.3.0.0.0dbru.zip ) tools? ( instantclient-tools-linux-19.3.0.0.0dbru.zip ) ) ) abi_x86_64? ( instantclient-basic-linux.x64-19.3.0.0.0dbru.zip jdbc? ( instantclient-jdbc-linux.x64-19.3.0.0.0dbru.zip ) odbc? ( instantclient-odbc-linux.x64-19.3.0.0.0dbru.zip ) precomp? ( instantclient-precomp-linux.x64-19.3.0.0.0dbru.zip ) sdk? ( instantclient-sdk-linux.x64-19.3.0.0.0dbru.zip ) sqlplus? ( instantclient-sqlplus-linux.x64-19.3.0.0.0dbru.zip ) tools? ( instantclient-tools-linux.x64-19.3.0.0.0dbru.zip ) )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	db85a3c508cf82c45f24b2723791cc93	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=2aa59491298e0ab0d6ad4b9cf66af60b
diff --git a/metadata/md5-cache/dev-db/percona-server-5.7.26.29-r1 b/metadata/md5-cache/dev-db/percona-server-5.7.26.29-r1
index a249010596c4..bc11c84d7e7f 100644
--- a/metadata/md5-cache/dev-db/percona-server-5.7.26.29-r1
+++ b/metadata/md5-cache/dev-db/percona-server-5.7.26.29-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.26-29/source/tarball/percona-server-5.7.26-29.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9289a8c960de01a05f0d3111ff9f77b9
diff --git a/metadata/md5-cache/dev-db/percona-server-5.7.27.30 b/metadata/md5-cache/dev-db/percona-server-5.7.27.30
index 2d2b07413933..259cf9e7b72a 100644
--- a/metadata/md5-cache/dev-db/percona-server-5.7.27.30
+++ b/metadata/md5-cache/dev-db/percona-server-5.7.27.30
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.27-30/source/tarball/percona-server-5.7.27-30.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0262a30eeeb09a5cbbfd6b78a6f1e65
diff --git a/metadata/md5-cache/dev-db/percona-toolkit-2.2.11 b/metadata/md5-cache/dev-db/percona-toolkit-2.2.11
index 1114887e627b..4129073a5c95 100644
--- a/metadata/md5-cache/dev-db/percona-toolkit-2.2.11
+++ b/metadata/md5-cache/dev-db/percona-toolkit-2.2.11
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 Artistic )
 RDEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes dev-perl/JSON dev-perl/libwww-perl dev-perl/Role-Tiny virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Time-Local virtual/perl-Digest-MD5 virtual/perl-IO-Compress virtual/perl-File-Temp virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-perl/TermReadKey dev-lang/perl[-build(-)] dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://www.percona.com/downloads/percona-toolkit/2.2.11/percona-toolkit-2.2.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=335a28d1380bfeb07d3d3d2c1ecbb53b
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.12 b/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.12
deleted file mode 100644
index f879c0bfb5c1..000000000000
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-bin-2.4.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases
-EAPI=7
-HOMEPAGE=https://www.percona.com/software/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio dev-libs/libgcrypt:0/20 dev-libs/libgpg-error dev-perl/DBD-mysql sys-libs/zlib sys-process/numactl !dev-db/percona-xtrabackup
-SLOT=0
-SRC_URI=amd64? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.12/binary/tarball/percona-xtrabackup-2.4.12-Linux-x86_64.libgcrypt20.tar.gz ) x86? ( https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.12/binary/tarball/percona-xtrabackup-2.4.12-Linux-i686.libgcrypt20.tar.gz )
-_md5_=61f76bc6c9e7cc68ff403fd21f5a2142
diff --git a/metadata/md5-cache/dev-db/postgresql-10.10 b/metadata/md5-cache/dev-db/postgresql-10.10
index f77e5f5cc504..228f5c22cf33 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.10
+++ b/metadata/md5-cache/dev-db/postgresql-10.10
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu?
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=10
 SRC_URI=mirror://postgresql/source/v10.10/postgresql-10.10.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=895feec5bf861145632e2d61d850bdea
diff --git a/metadata/md5-cache/dev-db/postgresql-10.9 b/metadata/md5-cache/dev-db/postgresql-10.9
index 94d036c6d898..5af82d212730 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.9
+++ b/metadata/md5-cache/dev-db/postgresql-10.9
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu?
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=10
 SRC_URI=mirror://postgresql/source/v10.9/postgresql-10.9.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=2fa642e6ab0079f22064b58a3201d1da
diff --git a/metadata/md5-cache/dev-db/postgresql-11.4 b/metadata/md5-cache/dev-db/postgresql-11.4
index bc091143c9ee..1e853c504457 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.4
+++ b/metadata/md5-cache/dev-db/postgresql-11.4
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu?
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=11
 SRC_URI=mirror://postgresql/source/v11.4/postgresql-11.4.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=fee16a772a8a8298a3034d266b2360a7
diff --git a/metadata/md5-cache/dev-db/postgresql-11.5 b/metadata/md5-cache/dev-db/postgresql-11.5
index 6a3460310adc..96b80c1e6f6d 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.5
+++ b/metadata/md5-cache/dev-db/postgresql-11.5
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu?
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=11
 SRC_URI=mirror://postgresql/source/v11.5/postgresql-11.5.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=8bcb0c8ef91a7fc8faaebe210a4af512
diff --git a/metadata/md5-cache/dev-db/postgresql-12_beta2 b/metadata/md5-cache/dev-db/postgresql-12_beta2
index 6f18f4049371..92696160a249 100644
--- a/metadata/md5-cache/dev-db/postgresql-12_beta2
+++ b/metadata/md5-cache/dev-db/postgresql-12_beta2
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu?
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=12
 SRC_URI=mirror://postgresql/source/v12/postgresql-12beta2.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=7b9aed67deda54c44c4f8b52d68b7ab7
diff --git a/metadata/md5-cache/dev-db/postgresql-12_beta3 b/metadata/md5-cache/dev-db/postgresql-12_beta3
index d20e96556e72..b8aca362df2d 100644
--- a/metadata/md5-cache/dev-db/postgresql-12_beta3
+++ b/metadata/md5-cache/dev-db/postgresql-12_beta3
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu?
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=12
 SRC_URI=mirror://postgresql/source/v12beta3/postgresql-12beta3.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=fda5fda098001cfd894a8941f97812d7
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.22 b/metadata/md5-cache/dev-db/postgresql-9.4.22
index 65c79fcf1ae7..0c6e3121c5b0 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.22
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.22
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.22/postgresql-9.4.22.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5ecbe7cb6f84b47802c95302882d36c5
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.22-r1 b/metadata/md5-cache/dev-db/postgresql-9.4.22-r1
index 50944b3da9ea..5041643e997f 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.22-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.22-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.22/postgresql-9.4.22.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=d60ce672cf1940edf30472ca895b5dbf
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.23 b/metadata/md5-cache/dev-db/postgresql-9.4.23
index ff41a66f88ab..cc56a95c00b4 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.23
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.23
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.23/postgresql-9.4.23.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=d01230e45551ad1db1de7b6e5d95695c
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.24 b/metadata/md5-cache/dev-db/postgresql-9.4.24
index f99a5b11ee9f..4690f5d2eb46 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.24
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.24
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=9.4
 SRC_URI=mirror://postgresql/source/v9.4.24/postgresql-9.4.24.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=d60ce672cf1940edf30472ca895b5dbf
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.17 b/metadata/md5-cache/dev-db/postgresql-9.5.17
index 85a5721e5389..3affd55e6f15 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.17
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.17
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.5
 SRC_URI=mirror://postgresql/source/v9.5.17/postgresql-9.5.17.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=06b62e601ece74adc53052f8ba6d0c90
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.17-r1 b/metadata/md5-cache/dev-db/postgresql-9.5.17-r1
index 4476b19b5beb..e08d8fc4fc54 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.17-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.17-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=9.5
 SRC_URI=mirror://postgresql/source/v9.5.17/postgresql-9.5.17.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=9e40fcec5437ba31f6c63765c75dbcbb
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.18 b/metadata/md5-cache/dev-db/postgresql-9.5.18
index 71a0a407e6d5..584e7fa74535 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.18
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.18
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=9.5
 SRC_URI=mirror://postgresql/source/v9.5.18/postgresql-9.5.18.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=fb14c69f7a431cbb362c2aa85f1b22ee
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.19 b/metadata/md5-cache/dev-db/postgresql-9.5.19
index 7ff76bcbd53a..8c8c7b7988cc 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.19
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.19
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=9.5
 SRC_URI=mirror://postgresql/source/v9.5.19/postgresql-9.5.19.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=9e40fcec5437ba31f6c63765c75dbcbb
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.13 b/metadata/md5-cache/dev-db/postgresql-9.6.13
index 546e98018f99..1573d69ed928 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.13
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.13
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=9.6
 SRC_URI=mirror://postgresql/source/v9.6.13/postgresql-9.6.13.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=96d35856c32c66ccf18e7e79cfa259f1
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.13-r1 b/metadata/md5-cache/dev-db/postgresql-9.6.13-r1
index c68ae89490af..28aa8dfb0b8c 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.13-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.13-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=9.6
 SRC_URI=mirror://postgresql/source/v9.6.13/postgresql-9.6.13.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=6cb250af8ffac2e40733c81acf18c987
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.14 b/metadata/md5-cache/dev-db/postgresql-9.6.14
index 99eb81fc49c8..2c548efa220c 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.14
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.14
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=9.6
 SRC_URI=mirror://postgresql/source/v9.6.14/postgresql-9.6.14.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=5ca629351f9fb0e9128451dec7b307aa
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.15 b/metadata/md5-cache/dev-db/postgresql-9.6.15
index 98ac11c6c99b..ef66b0ce9499 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.15
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.15
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerbe
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=9.6
 SRC_URI=mirror://postgresql/source/v9.6.15/postgresql-9.6.15.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=6cb250af8ffac2e40733c81acf18c987
diff --git a/metadata/md5-cache/dev-db/postgresql-9999 b/metadata/md5-cache/dev-db/postgresql-9999
index 8fb4cdbe6c44..172d13e0d0c3 100644
--- a/metadata/md5-cache/dev-db/postgresql-9999
+++ b/metadata/md5-cache/dev-db/postgresql-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:13 !dev-db/postgresql-base:13 !dev-db/postgresql-server:13 selinux? ( sec-policy/selinux-postgresql )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=13
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=5cd0486cca9cd4cc2d3184a67ec94baf
diff --git a/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1-r1 b/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1-r1
deleted file mode 100644
index 76b8fced355f..000000000000
--- a/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-editors/qhexedit2 dev-cpp/antlr-cpp:2 dev-db/sqlite:3 >=dev-libs/qcustomplot-2.0.0[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.10.1:=[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=SQLite Database Browser
-EAPI=7
-HOMEPAGE=https://sqlitebrowser.org
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 MPL-2.0
-RDEPEND=app-editors/qhexedit2 dev-cpp/antlr-cpp:2 dev-db/sqlite:3 >=dev-libs/qcustomplot-2.0.0[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.10.1:=[qt5(+)] dev-qt/qtsvg:5
-SLOT=0
-SRC_URI=https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.10.1.tar.gz -> sqlitebrowser-3.10.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5938948885c68d18a3725205f3d3ad6
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.6 b/metadata/md5-cache/dev-db/unixODBC-2.3.6
deleted file mode 100644
index 88ca7e2e07ff..000000000000
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=|| ( dev-libs/libltdl: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(-)?] >=sys-devel/libtool-2.4.2-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(-)?] ) >=sys-libs/readline-6.2_p5-r1: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(-)?] >=sys-libs/ncurses-5.9-r3: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(-)?] >=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(-)?] sys-devel/flex >=app-portage/elt-patches-20170815
-DESCRIPTION=A complete ODBC driver manager
-EAPI=6
-HOMEPAGE=http://www.unixodbc.org/
-IUSE=+minimal odbcmanual static-libs unicode 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=|| ( dev-libs/libltdl: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(-)?] >=sys-devel/libtool-2.4.2-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(-)?] ) >=sys-libs/readline-6.2_p5-r1: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(-)?] >=sys-libs/ncurses-5.9-r3: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(-)?] >=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(-)?]
-SLOT=0
-SRC_URI=ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.6.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=550b7f7fdc361ae27a399101722c5de1
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 2e9fffd1f2bd..1962fbb049c5 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1 b/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
index 4e0618ca53d4..820e95c8864c 100644
--- a/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
+++ b/metadata/md5-cache/dev-embedded/dfu-programmer-0.7.2-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=virtual/libusb:1 virtual/udev virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DEPEND=acct-group/plugdev virtual/libusb:1 virtual/udev virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=A Device Firmware Update based USB programmer for Atmel chips
 EAPI=6
 HOMEPAGE=http://dfu-programmer.sourceforge.net
 KEYWORDS=amd64 arm
 LICENSE=GPL-2
-RDEPEND=virtual/libusb:1 virtual/udev
+RDEPEND=acct-group/plugdev virtual/libusb:1 virtual/udev
 SLOT=0
 SRC_URI=mirror://sourceforge/dfu-programmer/dfu-programmer-0.7.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=57f597ddbbbc1ebce59476187c48a590
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=d4b0c87cda1a140dea002aa84a9ae73a
diff --git a/metadata/md5-cache/dev-embedded/esptool-2.2 b/metadata/md5-cache/dev-embedded/esptool-2.2
deleted file mode 100644
index 916e541f578e..000000000000
--- a/metadata/md5-cache/dev-embedded/esptool-2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
-EAPI=6
-HOMEPAGE=https://github.com/espressif/esptool
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyserial-2.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/e/esptool/esptool-2.2.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a3e36e85625b1d3945692bdad6cf4e0b
diff --git a/metadata/md5-cache/dev-embedded/esptool-2.3.1 b/metadata/md5-cache/dev-embedded/esptool-2.3.1
deleted file mode 100644
index 2c22fa8bc125..000000000000
--- a/metadata/md5-cache/dev-embedded/esptool-2.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
-EAPI=6
-HOMEPAGE=https://github.com/espressif/esptool
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyserial-2.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/e/esptool/esptool-2.3.1.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=781eb1f149ee14b3f94384fad299689b
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.10.0 b/metadata/md5-cache/dev-embedded/openocd-0.10.0
index 8fe501baff36..5754b3d4f626 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.10.0
+++ b/metadata/md5-cache/dev-embedded/openocd-0.10.0
@@ -1,14 +1,14 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=OpenOCD - Open On-Chip Debugger
 EAPI=5
 HOMEPAGE=http://openocd.sourceforge.net
 IUSE=+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
+RDEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.10.0/openocd-0.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0a913e2dbaee7136db4db9536dfda075
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1db913c8576ba4ff40c2d0aca9fc38c9
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.10.0-r1 b/metadata/md5-cache/dev-embedded/openocd-0.10.0-r1
index d5ca2ae236ac..8b6d33f867a6 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.10.0-r1
+++ b/metadata/md5-cache/dev-embedded/openocd-0.10.0-r1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig
 DESCRIPTION=OpenOCD - Open On-Chip Debugger
 EAPI=7
 HOMEPAGE=http://openocd.sourceforge.net
 IUSE=+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
+RDEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.10.0/openocd-0.10.0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c4bd2d93efced62e2950b58c4598743b
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=14e50baeced687614f9cf405e07d35a8
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.9.0 b/metadata/md5-cache/dev-embedded/openocd-0.9.0
index 627e1c2ba26d..d8e8472f91e6 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.9.0
+++ b/metadata/md5-cache/dev-embedded/openocd-0.9.0
@@ -1,14 +1,14 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=OpenOCD - Open On-Chip Debugger
 EAPI=5
 HOMEPAGE=http://openocd.sourceforge.net
 IUSE=cmsis-dap dummy ftdi parport +usb verbose-io
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
+RDEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.9.0/openocd-0.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=33bbe05f9e1396f74b23f57fcfb7acc5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2e7571982e935605ebf7848209b639f5
diff --git a/metadata/md5-cache/dev-embedded/openocd-9999 b/metadata/md5-cache/dev-embedded/openocd-9999
index 4e2b408fdc1c..c2a0f8cdf318 100644
--- a/metadata/md5-cache/dev-embedded/openocd-9999
+++ b/metadata/md5-cache/dev-embedded/openocd-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 install postinst prepare setup unpack
-DEPEND=>=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig >=sys-apps/texinfo-5
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig >=sys-apps/texinfo-5
 DESCRIPTION=OpenOCD - Open On-Chip Debugger
 EAPI=7
 HOMEPAGE=http://openocd.sourceforge.net
 IUSE=+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=>=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
+RDEPEND=acct-group/plugdev >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
 RESTRICT=strip
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c4bd2d93efced62e2950b58c4598743b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=14e50baeced687614f9cf405e07d35a8
diff --git a/metadata/md5-cache/dev-embedded/stlink-1.5.1 b/metadata/md5-cache/dev-embedded/stlink-1.5.1
index 8a0f969c4b5d..f181129a64e1 100644
--- a/metadata/md5-cache/dev-embedded/stlink-1.5.1
+++ b/metadata/md5-cache/dev-embedded/stlink-1.5.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/texane/stlink/archive/v1.5.1.tar.gz -> stlink-1.5.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=401e5671d270f8a7328f008f5779fefa
diff --git a/metadata/md5-cache/dev-embedded/stlink-9999 b/metadata/md5-cache/dev-embedded/stlink-9999
index 2ed0fcde6e84..7703bc08d135 100644
--- a/metadata/md5-cache/dev-embedded/stlink-9999
+++ b/metadata/md5-cache/dev-embedded/stlink-9999
@@ -7,5 +7,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=75fe97e13f6219c742448206d9d6c87e
diff --git a/metadata/md5-cache/dev-embedded/zmac-1.3 b/metadata/md5-cache/dev-embedded/zmac-1.3
deleted file mode 100644
index 61b8a930e553..000000000000
--- a/metadata/md5-cache/dev-embedded/zmac-1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=app-arch/unzip
-DESCRIPTION=Z80 macro cross-assembler
-EAPI=0
-HOMEPAGE=http://www.tim-mann.org/trs80resources.html
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-SLOT=0
-SRC_URI=http://www.tim-mann.org/trs80/zmac13.zip
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=104b3e4ecc2bd32929e6a445fd8d65ed
diff --git a/metadata/md5-cache/dev-embedded/zmac-1.3-r1 b/metadata/md5-cache/dev-embedded/zmac-1.3-r1
new file mode 100644
index 000000000000..afb3c0c77c3a
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/zmac-1.3-r1
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install
+DESCRIPTION=Z80 macro cross-assembler
+EAPI=7
+HOMEPAGE=http://www.tim-mann.org/trs80resources.html
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=http://www.tim-mann.org/trs80/zmac13.zip
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f8d2be30b84c0d868b13a3c0567e1562
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index 1321e7d008b8..7aa842c83087 100644
--- a/metadata/md5-cache/dev-erlang/Manifest.gz
+++ b/metadata/md5-cache/dev-erlang/Manifest.gz
diff --git a/metadata/md5-cache/dev-erlang/base64url-1.0 b/metadata/md5-cache/dev-erlang/base64url-1.0
deleted file mode 100644
index 342d0f5d9792..000000000000
--- a/metadata/md5-cache/dev-erlang/base64url-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=URL safe base64-compatible codec
-EAPI=6
-HOMEPAGE=https://github.com/dvv/base64url
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/dvv/base64url/archive/v1.0.tar.gz -> base64url-1.0.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=e817fa061f44d23e1cde8c5bc0d201a1
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.16 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.16
deleted file mode 100644
index 232e44f0f324..000000000000
--- a/metadata/md5-cache/dev-erlang/cache_tab-1.0.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=In-memory cache Erlang and Elixir library
-EAPI=6
-HOMEPAGE=https://github.com/processone/cache_tab
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/cache_tab/archive/1.0.16.tar.gz -> cache_tab-1.0.16.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=aaa521e701941d1ddf312b9182103dd2
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.2 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.2
deleted file mode 100644
index 12c58d70f2e3..000000000000
--- a/metadata/md5-cache/dev-erlang/cache_tab-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.1 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=In-memory cache Erlang and Elixir library
-EAPI=6
-HOMEPAGE=https://github.com/processone/cache_tab
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.1 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/cache_tab/archive/1.0.2.tar.gz -> cache_tab-1.0.2.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=0b9532e9d533ce5e5d2199d1301b4508
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.3 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.3
deleted file mode 100644
index 260e54eaf4c2..000000000000
--- a/metadata/md5-cache/dev-erlang/cache_tab-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=In-memory cache Erlang and Elixir library
-EAPI=6
-HOMEPAGE=https://github.com/processone/cache_tab
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/cache_tab/archive/1.0.3.tar.gz -> cache_tab-1.0.3.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=f1a230c46bf4ef66071b4a5119478c0d
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.4 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.4
deleted file mode 100644
index 925c74a653bd..000000000000
--- a/metadata/md5-cache/dev-erlang/cache_tab-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=In-memory cache Erlang and Elixir library
-EAPI=6
-HOMEPAGE=https://github.com/processone/cache_tab
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/cache_tab/archive/1.0.4.tar.gz -> cache_tab-1.0.4.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=20852084f60caafe38178481c5470287
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.5 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.5
deleted file mode 100644
index 392608caaabd..000000000000
--- a/metadata/md5-cache/dev-erlang/cache_tab-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.6 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=In-memory cache Erlang and Elixir library
-EAPI=6
-HOMEPAGE=https://github.com/processone/cache_tab
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.6 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/cache_tab/archive/1.0.5.tar.gz -> cache_tab-1.0.5.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=d148f5d73410c623fb88bdb72c2a5293
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.0 b/metadata/md5-cache/dev-erlang/epam-1.0.0
deleted file mode 100644
index 29f6eba11059..000000000000
--- a/metadata/md5-cache/dev-erlang/epam-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=epam for ejabberd to help with PAM authentication support
-EAPI=6
-HOMEPAGE=https://github.com/processone/epam
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/epam/archive/1.0.0.tar.gz -> epam-1.0.0.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=1b23b4a109566910f64bb6362717f397
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.0-r1 b/metadata/md5-cache/dev-erlang/epam-1.0.0-r1
deleted file mode 100644
index 76c81c6c14fd..000000000000
--- a/metadata/md5-cache/dev-erlang/epam-1.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=epam for ejabberd to help with PAM authentication support
-EAPI=6
-HOMEPAGE=https://github.com/processone/epam
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/epam/archive/1.0.0.tar.gz -> epam-1.0.0.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=50eff1df7f36ec104a3527afc8eb1e7b
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.4 b/metadata/md5-cache/dev-erlang/epam-1.0.4
deleted file mode 100644
index 064cb151af82..000000000000
--- a/metadata/md5-cache/dev-erlang/epam-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=epam for ejabberd to help with PAM authentication support
-EAPI=6
-HOMEPAGE=https://github.com/processone/epam
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/epam/archive/1.0.4.tar.gz -> epam-1.0.4.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=8fcb4b9f71de8a340645b0e0e2171c8b
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.10 b/metadata/md5-cache/dev-erlang/esip-1.0.10
deleted file mode 100644
index 4d6ddcbf59be..000000000000
--- a/metadata/md5-cache/dev-erlang/esip-1.0.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/fast_tls-1.0.9 >=dev-erlang/stun-1.0.9 >=dev-erlang/p1_utils-1.0.6 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=ProcessOne SIP server component
-EAPI=6
-HOMEPAGE=https://github.com/processone/esip
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/fast_tls-1.0.9 >=dev-erlang/stun-1.0.9 >=dev-erlang/p1_utils-1.0.6 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/esip/archive/1.0.10.tar.gz -> esip-1.0.10.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=af1ec82f716fc44285c80594f6304cef
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.26 b/metadata/md5-cache/dev-erlang/esip-1.0.26
index 4018f6e298b2..dc4b0d130542 100644
--- a/metadata/md5-cache/dev-erlang/esip-1.0.26
+++ b/metadata/md5-cache/dev-erlang/esip-1.0.26
@@ -3,10 +3,10 @@ DEPEND=>=dev-erlang/fast_tls-1.0.25 >=dev-erlang/stun-1.0.25 >=dev-erlang/p1_uti
 DESCRIPTION=ProcessOne SIP server component
 EAPI=6
 HOMEPAGE=https://github.com/processone/esip
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/fast_tls-1.0.25 >=dev-erlang/stun-1.0.25 >=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/esip/archive/1.0.26.tar.gz -> esip-1.0.26.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=3f05060321cc9dc6a3516d0751138342
+_md5_=315bac62fed1d1720c544566f1f08860
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.4 b/metadata/md5-cache/dev-erlang/esip-1.0.4
deleted file mode 100644
index cd8792b1fc80..000000000000
--- a/metadata/md5-cache/dev-erlang/esip-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/fast_tls-1.0.0 >=dev-erlang/stun-1.0.0 >=dev-erlang/p1_utils-1.0.2 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=ProcessOne SIP server component
-EAPI=6
-HOMEPAGE=https://github.com/processone/esip
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/fast_tls-1.0.0 >=dev-erlang/stun-1.0.0 >=dev-erlang/p1_utils-1.0.2 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/esip/archive/1.0.4.tar.gz -> esip-1.0.4.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=6d67c9e090fdb000e485c2b157ef1316
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.7 b/metadata/md5-cache/dev-erlang/esip-1.0.7
deleted file mode 100644
index e68e5e53ff2e..000000000000
--- a/metadata/md5-cache/dev-erlang/esip-1.0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/fast_tls-1.0.6 >=dev-erlang/stun-1.0.6 >=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=ProcessOne SIP server component
-EAPI=6
-HOMEPAGE=https://github.com/processone/esip
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/fast_tls-1.0.6 >=dev-erlang/stun-1.0.6 >=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/esip/archive/1.0.7.tar.gz -> esip-1.0.7.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=49c20e257d0d6c09e72d7ab6cdfbe7fa
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.8 b/metadata/md5-cache/dev-erlang/esip-1.0.8
deleted file mode 100644
index 3b1f8296b965..000000000000
--- a/metadata/md5-cache/dev-erlang/esip-1.0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/fast_tls-1.0.7 >=dev-erlang/stun-1.0.7 >=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=ProcessOne SIP server component
-EAPI=6
-HOMEPAGE=https://github.com/processone/esip
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/fast_tls-1.0.7 >=dev-erlang/stun-1.0.7 >=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/esip/archive/1.0.8.tar.gz -> esip-1.0.8.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=618b7d68a7d1620b1d2edca1e7e1b446
diff --git a/metadata/md5-cache/dev-erlang/ezlib-1.0.1 b/metadata/md5-cache/dev-erlang/ezlib-1.0.1
deleted file mode 100644
index a1dc7fc41c07..000000000000
--- a/metadata/md5-cache/dev-erlang/ezlib-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 sys-libs/zlib dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Native zlib driver for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/ezlib
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.1 sys-libs/zlib dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/ezlib/archive/1.0.1.tar.gz -> ezlib-1.0.1.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=5b31a88635ad212b03d368cbfbf7a9dd
diff --git a/metadata/md5-cache/dev-erlang/ezlib-1.0.4 b/metadata/md5-cache/dev-erlang/ezlib-1.0.4
deleted file mode 100644
index b353f6921e6c..000000000000
--- a/metadata/md5-cache/dev-erlang/ezlib-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 sys-libs/zlib dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Native zlib driver for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/ezlib
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.1 sys-libs/zlib dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/ezlib/archive/1.0.4.tar.gz -> ezlib-1.0.4.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=47a69b1426ddd5444a836c64d93c1805
diff --git a/metadata/md5-cache/dev-erlang/fast_xml-1.1.34 b/metadata/md5-cache/dev-erlang/fast_xml-1.1.34
index f9ceaecebc43..d961d0abbf2c 100644
--- a/metadata/md5-cache/dev-erlang/fast_xml-1.1.34
+++ b/metadata/md5-cache/dev-erlang/fast_xml-1.1.34
@@ -4,10 +4,10 @@ DESCRIPTION=Fast Expat based Erlang XML parsing library
 EAPI=6
 HOMEPAGE=https://github.com/processone/fast_xml
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-libs/expat dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/fast_xml/archive/1.1.34.tar.gz -> fast_xml-1.1.34.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=60a34c270a95b8a778f4dc44e9cd45e5
+_md5_=a378081f933d1a69a241e6ebde3ede11
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.17 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.17
deleted file mode 100644
index 3c1347002f99..000000000000
--- a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast Yaml native library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/fast_yaml
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/fast_yaml/archive/1.0.17.tar.gz -> fast_yaml-1.0.17.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=b326b841067d69356e159e118bd5b525
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.3 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.3
deleted file mode 100644
index 9d505ffca6d8..000000000000
--- a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.2 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast Yaml native library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/fast_yaml
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.2 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/fast_yaml/archive/1.0.3.tar.gz -> fast_yaml-1.0.3.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=0c3c73e9b0e7a1cf3aae523380cc1bd4
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.5 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.5
deleted file mode 100644
index 32452ce4cd5d..000000000000
--- a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast Yaml native library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/fast_yaml
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/fast_yaml/archive/1.0.5.tar.gz -> fast_yaml-1.0.5.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=3b73b6176b7c9e6f0fc703feb4a87334
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.6 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.6
deleted file mode 100644
index 597c1434b35f..000000000000
--- a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast Yaml native library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/fast_yaml
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/fast_yaml/archive/1.0.6.tar.gz -> fast_yaml-1.0.6.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=ed46e410c5722e8cdebbbe5a9a4d28ff
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.7 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.7
deleted file mode 100644
index 89dc0e844592..000000000000
--- a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.6 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast Yaml native library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/fast_yaml
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.6 >=dev-lang/erlang-17.1 dev-libs/libyaml dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/fast_yaml/archive/1.0.7.tar.gz -> fast_yaml-1.0.7.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=c4e1e9bbc8182e6617c87cfac98af9a0
diff --git a/metadata/md5-cache/dev-erlang/goldrush-0.1.8.1 b/metadata/md5-cache/dev-erlang/goldrush-0.1.8.1
deleted file mode 100644
index 88e0243d9a31..000000000000
--- a/metadata/md5-cache/dev-erlang/goldrush-0.1.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Small Erlang app that provides fast event stream processing
-EAPI=6
-HOMEPAGE=https://github.com/DeadZen/goldrush
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=ISC
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/DeadZen/goldrush/archive/0.1.8-1.tar.gz -> goldrush-0.1.8.1.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=0518951d7f00729cfb9eafe9b4bf6884
diff --git a/metadata/md5-cache/dev-erlang/iconv-1.0.0 b/metadata/md5-cache/dev-erlang/iconv-1.0.0
deleted file mode 100644
index b743a689a071..000000000000
--- a/metadata/md5-cache/dev-erlang/iconv-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast encoding conversion library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/iconv
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/iconv/archive/1.0.0.tar.gz -> iconv-1.0.0.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=724af23dab7be08b815951edadf54e8b
diff --git a/metadata/md5-cache/dev-erlang/iconv-1.0.1 b/metadata/md5-cache/dev-erlang/iconv-1.0.1
deleted file mode 100644
index eeefc16e2880..000000000000
--- a/metadata/md5-cache/dev-erlang/iconv-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast encoding conversion library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/iconv
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/iconv/archive/1.0.1.tar.gz -> iconv-1.0.1.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=5bf3f51c9e1133f220e6ef41968873af
diff --git a/metadata/md5-cache/dev-erlang/iconv-1.0.10 b/metadata/md5-cache/dev-erlang/iconv-1.0.10
index a1983170f938..375e0f2166d1 100644
--- a/metadata/md5-cache/dev-erlang/iconv-1.0.10
+++ b/metadata/md5-cache/dev-erlang/iconv-1.0.10
@@ -3,10 +3,10 @@ DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 virtual/libiconv dev-
 DESCRIPTION=Fast encoding conversion library for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/iconv
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/iconv/archive/1.0.10.tar.gz -> iconv-1.0.10.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=2cebfd8717b9777fd6ddd807c318382f
+_md5_=41940311d446e67e87ad446c56858139
diff --git a/metadata/md5-cache/dev-erlang/iconv-1.0.2 b/metadata/md5-cache/dev-erlang/iconv-1.0.2
deleted file mode 100644
index c88debb772e3..000000000000
--- a/metadata/md5-cache/dev-erlang/iconv-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast encoding conversion library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/iconv
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/iconv/archive/1.0.2.tar.gz -> iconv-1.0.2.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=cf543a7da7b80cad0484bfa0768a270f
diff --git a/metadata/md5-cache/dev-erlang/iconv-1.0.3 b/metadata/md5-cache/dev-erlang/iconv-1.0.3
deleted file mode 100644
index 1cacec576365..000000000000
--- a/metadata/md5-cache/dev-erlang/iconv-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.6 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast encoding conversion library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/iconv
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.6 >=dev-lang/erlang-17.1 virtual/libiconv dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/iconv/archive/1.0.3.tar.gz -> iconv-1.0.3.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=a6463a041d8e3db1297f43317df6721c
diff --git a/metadata/md5-cache/dev-erlang/jiffy-0.14.11 b/metadata/md5-cache/dev-erlang/jiffy-0.14.11
index a8878d2ef3cf..9c3108a609ba 100644
--- a/metadata/md5-cache/dev-erlang/jiffy-0.14.11
+++ b/metadata/md5-cache/dev-erlang/jiffy-0.14.11
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=JSON NIFs for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/davisp/jiffy
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=MIT BSD
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/davisp/jiffy/archive/0.14.11.tar.gz -> jiffy-0.14.11.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=586010ad9b0a0dfca6a7c710a46e248f
+_md5_=3de3864acef19ffcf2aa896c3ad336e9
diff --git a/metadata/md5-cache/dev-erlang/jiffy-0.14.7 b/metadata/md5-cache/dev-erlang/jiffy-0.14.7
deleted file mode 100644
index d6a52945b098..000000000000
--- a/metadata/md5-cache/dev-erlang/jiffy-0.14.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=JSON NIFs for Erlang
-EAPI=6
-HOMEPAGE=https://github.com/davisp/jiffy
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=MIT BSD
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/davisp/jiffy/archive/0.14.7.tar.gz -> jiffy-0.14.7.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=fb538deb6272824597e9f81d59d6fe9b
diff --git a/metadata/md5-cache/dev-erlang/jiffy-0.14.8 b/metadata/md5-cache/dev-erlang/jiffy-0.14.8
deleted file mode 100644
index 6972b42b0092..000000000000
--- a/metadata/md5-cache/dev-erlang/jiffy-0.14.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=JSON NIFs for Erlang
-EAPI=6
-HOMEPAGE=https://github.com/davisp/jiffy
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=MIT BSD
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/davisp/jiffy/archive/0.14.8.tar.gz -> jiffy-0.14.8.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=0dbd9e4acb9c162757fbe2a962cf08a8
diff --git a/metadata/md5-cache/dev-erlang/jose-1.8.4 b/metadata/md5-cache/dev-erlang/jose-1.8.4
deleted file mode 100644
index d3a9ddf1fe26..000000000000
--- a/metadata/md5-cache/dev-erlang/jose-1.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/base64url-0.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=JSON Object Signing and Encryption (JOSE) for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/potatosalad/erlang-jose
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/base64url-0.1 dev-lang/erlang
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/potatosalad/erlang-jose/archive/1.8.4.tar.gz -> erlang-jose-1.8.4.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=d859315693e7c9a0ade1d7b4f8bc6ae6
diff --git a/metadata/md5-cache/dev-erlang/lager-3.2.0 b/metadata/md5-cache/dev-erlang/lager-3.2.0
deleted file mode 100644
index 91cb2bedec49..000000000000
--- a/metadata/md5-cache/dev-erlang/lager-3.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/goldrush-0.1.7 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Logging framework for Erlang/OTP
-EAPI=6
-HOMEPAGE=https://github.com/basho/lager
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/goldrush-0.1.7 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/basho/lager/archive/3.2.0.tar.gz -> lager-3.2.0.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=1f9dc0bf4724c25a0e8edc8b91c2b62c
diff --git a/metadata/md5-cache/dev-erlang/lager-3.2.1 b/metadata/md5-cache/dev-erlang/lager-3.2.1
deleted file mode 100644
index fee1c55435f0..000000000000
--- a/metadata/md5-cache/dev-erlang/lager-3.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/goldrush-0.1.8 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Logging framework for Erlang/OTP
-EAPI=6
-HOMEPAGE=https://github.com/basho/lager
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/goldrush-0.1.8 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/basho/lager/archive/3.2.1.tar.gz -> lager-3.2.1.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=59d91984bc830b800276de7a4e422b27
diff --git a/metadata/md5-cache/dev-erlang/lager-3.2.2 b/metadata/md5-cache/dev-erlang/lager-3.2.2
deleted file mode 100644
index b2d333c4e7e1..000000000000
--- a/metadata/md5-cache/dev-erlang/lager-3.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/goldrush-0.1.8 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Logging framework for Erlang/OTP
-EAPI=6
-HOMEPAGE=https://github.com/basho/lager
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/goldrush-0.1.8 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/basho/lager/archive/3.2.2.tar.gz -> lager-3.2.2.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=8ba81112f6d719a132a5b866f1382ebc
diff --git a/metadata/md5-cache/dev-erlang/lager-3.6.7 b/metadata/md5-cache/dev-erlang/lager-3.6.7
deleted file mode 100644
index d668a28e8b62..000000000000
--- a/metadata/md5-cache/dev-erlang/lager-3.6.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/goldrush-0.1.9 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Logging framework for Erlang/OTP
-EAPI=6
-HOMEPAGE=https://github.com/erlang-lager/lager
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/goldrush-0.1.9 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/erlang-lager/lager/archive/3.6.7.tar.gz -> lager-3.6.7.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=443da1367e3e5c6cd95ff700ce1a22d1
diff --git a/metadata/md5-cache/dev-erlang/luerl-0.3 b/metadata/md5-cache/dev-erlang/luerl-0.3
index c6ea889c8863..7bdb0b402196 100644
--- a/metadata/md5-cache/dev-erlang/luerl-0.3
+++ b/metadata/md5-cache/dev-erlang/luerl-0.3
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=Lua in Erlang
 EAPI=6
 HOMEPAGE=https://github.com/rvirding/luerl
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/rvirding/luerl/archive/v0.3.tar.gz -> luerl-0.3.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=cb23f147b3557b623b21bfd18dabc25f
+_md5_=69453131fee61863c5baa82929529a2a
diff --git a/metadata/md5-cache/dev-erlang/meck-0.8.12 b/metadata/md5-cache/dev-erlang/meck-0.8.12
index 3855079e58b9..9bdb62c803c8 100644
--- a/metadata/md5-cache/dev-erlang/meck-0.8.12
+++ b/metadata/md5-cache/dev-erlang/meck-0.8.12
@@ -4,11 +4,11 @@ DESCRIPTION=Mocking library for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/eproxus/meck
 IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/eproxus/meck/archive/0.8.12.tar.gz -> meck-0.8.12.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=4090ba0cf1cbb927aba69509719a8b13
+_md5_=25ac68a069723230fee4fa9a54ef5136
diff --git a/metadata/md5-cache/dev-erlang/meck-0.8.3 b/metadata/md5-cache/dev-erlang/meck-0.8.3
deleted file mode 100644
index 55b2b216ddee..000000000000
--- a/metadata/md5-cache/dev-erlang/meck-0.8.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/hamcrest-0.1.0_p20150103 ) dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Mocking library for Erlang
-EAPI=6
-HOMEPAGE=https://github.com/eproxus/meck
-IUSE=test
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/eproxus/meck/archive/0.8.3.tar.gz -> meck-0.8.3.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=08eb80d7b5207a06c885671048e5d8f4
diff --git a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.1 b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.1
deleted file mode 100644
index 7460137171a7..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Pure Erlang MySQL driver
-EAPI=6
-HOMEPAGE=https://github.com/processone/p1_mysql
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/p1_mysql/archive/1.0.1.tar.gz -> p1_mysql-1.0.1.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=c99782097851c2ac421a950cc183a8a6
diff --git a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.8 b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.8
deleted file mode 100644
index c875165b59b8..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Pure Erlang MySQL driver
-EAPI=6
-HOMEPAGE=https://github.com/processone/p1_mysql
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/p1_mysql/archive/1.0.8.tar.gz -> p1_mysql-1.0.8.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=0fbfe0d4b0d053924f3f9c09ca511309
diff --git a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.3 b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.3
deleted file mode 100644
index 3b70aff0e47d..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/meck-0.8.7 >=dev-erlang/proper-1.1_p20150814 ) dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Erlang OAuth 2.0 implementation
-EAPI=6
-HOMEPAGE=https://github.com/processone/p1_oauth2
-IUSE=test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/p1_oauth2/archive/0.6.3.tar.gz -> p1_oauth2-0.6.3.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=cd0295e625977ca4c8f024893e915488
diff --git a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.0 b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.0
deleted file mode 100644
index 445a564f3197..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Pure Erlang PostgreSQL driver
-EAPI=6
-HOMEPAGE=https://github.com/processone/p1_pgsql
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=ErlPL-1.1
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/p1_pgsql/archive/1.1.0.tar.gz -> p1_pgsql-1.1.0.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=68162d36ec2aae586990a36df62b4c79
diff --git a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.1 b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.1
deleted file mode 100644
index b442c2e62f7e..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Pure Erlang PostgreSQL driver
-EAPI=6
-HOMEPAGE=https://github.com/processone/p1_pgsql
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=ErlPL-1.1
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/p1_pgsql/archive/1.1.1.tar.gz -> p1_pgsql-1.1.1.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=bd57cfb4d849b04afe8f17639b9242e4
diff --git a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.6 b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.6
index 7b2014f304fc..8a438f553a63 100644
--- a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.6
+++ b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.6
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=Pure Erlang PostgreSQL driver
 EAPI=6
 HOMEPAGE=https://github.com/processone/p1_pgsql
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=ErlPL-1.1
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/p1_pgsql/archive/1.1.6.tar.gz -> p1_pgsql-1.1.6.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=6354392a61f8098be768ce3ebca43752
+_md5_=a818ceb54394ebd7ee46434cf749dd2b
diff --git a/metadata/md5-cache/dev-erlang/proper-1.3 b/metadata/md5-cache/dev-erlang/proper-1.3
index 4bfd328df210..4577443b7dee 100644
--- a/metadata/md5-cache/dev-erlang/proper-1.3
+++ b/metadata/md5-cache/dev-erlang/proper-1.3
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
 DESCRIPTION=QuickCheck-inspired property-based testing tool for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/manopapad/proper
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=GPL-3
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/manopapad/proper/archive/v1.3.tar.gz -> proper-1.3.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=5bca9eb70d099c8c8c3e87d96b7b2fee
+_md5_=be8aa024e2aacc6b5fd1f3e387866066
diff --git a/metadata/md5-cache/dev-erlang/protobuffs-0.8.2 b/metadata/md5-cache/dev-erlang/protobuffs-0.8.2
deleted file mode 100644
index f9cf46ece0e2..000000000000
--- a/metadata/md5-cache/dev-erlang/protobuffs-0.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/meck-0.8.2 >=dev-erlang/proper-1.1 ) dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Google's Protocol Buffers for Erlang
-EAPI=6
-HOMEPAGE=https://github.com/basho/erlang_protobuffs
-IUSE=test
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/basho/erlang_protobuffs/archive/0.8.2.tar.gz -> protobuffs-0.8.2.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=62188c3adf8850a8f39072d610b997cf
diff --git a/metadata/md5-cache/dev-erlang/riak_pb-2.1.0.7 b/metadata/md5-cache/dev-erlang/riak_pb-2.1.0.7
deleted file mode 100644
index 6da2ab372ac4..000000000000
--- a/metadata/md5-cache/dev-erlang/riak_pb-2.1.0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/protobuffs-0.8.2 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Riak Protocol Buffers messages
-EAPI=6
-HOMEPAGE=https://github.com/basho/riak_pb
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/protobuffs-0.8.2 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/basho/riak_pb/archive/2.1.0.7.tar.gz -> riak_pb-2.1.0.7.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=4a8664427010c933ab8dd56d69c80145
diff --git a/metadata/md5-cache/dev-erlang/riak_pb-2.1.4.2 b/metadata/md5-cache/dev-erlang/riak_pb-2.1.4.2
deleted file mode 100644
index 1712e1d64c13..000000000000
--- a/metadata/md5-cache/dev-erlang/riak_pb-2.1.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Riak Protocol Buffers messages
-EAPI=6
-HOMEPAGE=https://github.com/basho/riak_pb
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/basho/riak_pb/archive/2.1.4.2.tar.gz -> riak_pb-2.1.4.2.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=abd185e08735ea360db4262f56ec8613
diff --git a/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.0 b/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.0
deleted file mode 100644
index ae3cb018fd3c..000000000000
--- a/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Riak Protocol Buffers messages
-EAPI=6
-HOMEPAGE=https://github.com/basho/riak_pb
-KEYWORDS=~amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/basho/riak_pb/archive/2.2.0.0.tar.gz -> riak_pb-2.2.0.0.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=7c866a05f089cb2e0299bea12309b0f3
diff --git a/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.1 b/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.1
deleted file mode 100644
index e50a8070211c..000000000000
--- a/metadata/md5-cache/dev-erlang/riak_pb-2.2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Riak Protocol Buffers messages
-EAPI=6
-HOMEPAGE=https://github.com/basho/riak_pb
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/protobuffs-0.9.0 >=dev-erlang/hamcrest-0.1.0_p20160709 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/basho/riak_pb/archive/2.2.0.1.tar.gz -> riak_pb-2.2.0.1.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=04e8290002228c9c31e22c144273f5cc
diff --git a/metadata/md5-cache/dev-erlang/sqlite3-1.1.6 b/metadata/md5-cache/dev-erlang/sqlite3-1.1.6
index 39002ee4a96c..c5174b07c78c 100644
--- a/metadata/md5-cache/dev-erlang/sqlite3-1.1.6
+++ b/metadata/md5-cache/dev-erlang/sqlite3-1.1.6
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-db/sqlite:3 dev-lang/erlang dev-util/rebar >=s
 DESCRIPTION=SQLite gen_server port for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/processone/erlang-sqlite3
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=ErlPL-1.1
 RDEPEND=>=dev-lang/erlang-17.1 dev-db/sqlite:3 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/erlang-sqlite3/archive/1.1.6.tar.gz -> sqlite3-1.1.6.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=2839ee286dbec889d6cf4c44b9b3c5dc
+_md5_=0c8e6d411edd333d8a3bc3923a58a777
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.14 b/metadata/md5-cache/dev-erlang/stringprep-1.0.14
deleted file mode 100644
index 4a617ba6729b..000000000000
--- a/metadata/md5-cache/dev-erlang/stringprep-1.0.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/stringprep
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0 tcltk
-RDEPEND=>=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/stringprep/archive/1.0.14.tar.gz -> stringprep-1.0.14.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=dab286f03d079e812bb75d95ab9dfbd9
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.3 b/metadata/md5-cache/dev-erlang/stringprep-1.0.3
deleted file mode 100644
index 9b8e5efcf24a..000000000000
--- a/metadata/md5-cache/dev-erlang/stringprep-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.3 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/stringprep
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0 tcltk
-RDEPEND=>=dev-erlang/p1_utils-1.0.3 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/stringprep/archive/1.0.3.tar.gz -> stringprep-1.0.3.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=2aa86ec83df09dfff2ec25a2606f8ac3
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.5 b/metadata/md5-cache/dev-erlang/stringprep-1.0.5
deleted file mode 100644
index 49ce9d2247d6..000000000000
--- a/metadata/md5-cache/dev-erlang/stringprep-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/stringprep
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0 tcltk
-RDEPEND=>=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/stringprep/archive/1.0.5.tar.gz -> stringprep-1.0.5.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=4b210c216d37a1b178858dc31b675654
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.6 b/metadata/md5-cache/dev-erlang/stringprep-1.0.6
deleted file mode 100644
index ef9ae3c945aa..000000000000
--- a/metadata/md5-cache/dev-erlang/stringprep-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/stringprep
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0 tcltk
-RDEPEND=>=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/stringprep/archive/1.0.6.tar.gz -> stringprep-1.0.6.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=725520407b5f9b8a27c134ce696a5abe
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.7 b/metadata/md5-cache/dev-erlang/stringprep-1.0.7
deleted file mode 100644
index fa84b6adc947..000000000000
--- a/metadata/md5-cache/dev-erlang/stringprep-1.0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.6 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/stringprep
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0 tcltk
-RDEPEND=>=dev-erlang/p1_utils-1.0.6 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/stringprep/archive/1.0.7.tar.gz -> stringprep-1.0.7.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=729dcb71f682c6fbd78cc9b4f3f61b05
diff --git a/metadata/md5-cache/dev-erlang/stun-1.0.25 b/metadata/md5-cache/dev-erlang/stun-1.0.25
index b2d98307b229..56d555d1d47b 100644
--- a/metadata/md5-cache/dev-erlang/stun-1.0.25
+++ b/metadata/md5-cache/dev-erlang/stun-1.0.25
@@ -3,10 +3,10 @@ DEPEND=>=dev-erlang/fast_tls-1.0.25 >=dev-erlang/p1_utils-1.0.13 >=dev-lang/erla
 DESCRIPTION=STUN and TURN library for Erlang and Elixir
 EAPI=6
 HOMEPAGE=https://github.com/processone/stun
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-erlang/fast_tls-1.0.25 >=dev-erlang/p1_utils-1.0.13 >=dev-lang/erlang-17.1 dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/stun/archive/1.0.25.tar.gz -> stun-1.0.25.tar.gz
 _eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=e5ef89301c4a81918aa76e181f07fa0b
+_md5_=58de9bc2b4ba992f443882effa6de172
diff --git a/metadata/md5-cache/dev-erlang/stun-1.0.3 b/metadata/md5-cache/dev-erlang/stun-1.0.3
deleted file mode 100644
index 06ed16fbcf8f..000000000000
--- a/metadata/md5-cache/dev-erlang/stun-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/fast_tls-1.0.0 >=dev-erlang/p1_utils-1.0.2 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=STUN and TURN library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/stun
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-erlang/fast_tls-1.0.0 >=dev-erlang/p1_utils-1.0.2 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/stun/archive/1.0.3.tar.gz -> stun-1.0.3.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=2d9df81439eb5a7382e661d48dfb0100
diff --git a/metadata/md5-cache/dev-erlang/stun-1.0.6 b/metadata/md5-cache/dev-erlang/stun-1.0.6
deleted file mode 100644
index cce770e35e5f..000000000000
--- a/metadata/md5-cache/dev-erlang/stun-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/fast_tls-1.0.6 >=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=STUN and TURN library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/stun
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-erlang/fast_tls-1.0.6 >=dev-erlang/p1_utils-1.0.4 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/stun/archive/1.0.6.tar.gz -> stun-1.0.6.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=7151ceadd6cd5e026606c16df511adf2
diff --git a/metadata/md5-cache/dev-erlang/stun-1.0.7 b/metadata/md5-cache/dev-erlang/stun-1.0.7
deleted file mode 100644
index d009d66fbf12..000000000000
--- a/metadata/md5-cache/dev-erlang/stun-1.0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/fast_tls-1.0.7 >=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=STUN and TURN library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/stun
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-erlang/fast_tls-1.0.7 >=dev-erlang/p1_utils-1.0.5 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/stun/archive/1.0.7.tar.gz -> stun-1.0.7.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=b73d66d58a33d1da4970228ea97fc06d
diff --git a/metadata/md5-cache/dev-erlang/stun-1.0.9 b/metadata/md5-cache/dev-erlang/stun-1.0.9
deleted file mode 100644
index a79e133d8738..000000000000
--- a/metadata/md5-cache/dev-erlang/stun-1.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/fast_tls-1.0.9 >=dev-erlang/p1_utils-1.0.6 >=dev-lang/erlang-17.1 dev-lang/erlang dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=STUN and TURN library for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/stun
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-erlang/fast_tls-1.0.9 >=dev-erlang/p1_utils-1.0.6 >=dev-lang/erlang-17.1 dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/processone/stun/archive/1.0.9.tar.gz -> stun-1.0.9.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267
-_md5_=93bc287d78d26cf890dbd5f31c46bb70
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index d52ff8f916ed..cb7b13a42f0d 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/freecell-solver-5.6.0-r1 b/metadata/md5-cache/dev-games/freecell-solver-5.6.0-r1
deleted file mode 100644
index 05e7323af89f..000000000000
--- a/metadata/md5-cache/dev-games/freecell-solver-5.6.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pysol_cards[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/random2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-perl/Path-Tiny dev-perl/Template-Toolkit
-DESCRIPTION=C library for automatically solving Freecell and some other solitaire variants
-EAPI=7
-HOMEPAGE=https://fc-solve.shlomifish.org/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pysol_cards[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/random2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-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 )
-SLOT=0
-SRC_URI=https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-5.6.0.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c2fba97d90a8dbee866655740754501b
diff --git a/metadata/md5-cache/dev-games/freecell-solver-5.6.0-r2 b/metadata/md5-cache/dev-games/freecell-solver-5.6.0-r2
new file mode 100644
index 000000000000..ebe8eb7244ec
--- /dev/null
+++ b/metadata/md5-cache/dev-games/freecell-solver-5.6.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pysol_cards[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/random2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] tcmalloc? ( dev-util/google-perftools ) dev-perl/Path-Tiny dev-perl/Template-Toolkit
+DESCRIPTION=C library for automatically solving Freecell and some other solitaire variants
+EAPI=7
+HOMEPAGE=https://fc-solve.shlomifish.org/
+IUSE=tcmalloc python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pysol_cards[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/random2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] tcmalloc? ( dev-util/google-perftools )
+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 )
+SLOT=0
+SRC_URI=https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-5.6.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d33318814f76eb1ffa89a23f8c217176
diff --git a/metadata/md5-cache/dev-go/Manifest.gz b/metadata/md5-cache/dev-go/Manifest.gz
index 50c60e0ba5d3..be09c2e162b9 100644
--- a/metadata/md5-cache/dev-go/Manifest.gz
+++ b/metadata/md5-cache/dev-go/Manifest.gz
diff --git a/metadata/md5-cache/dev-go/go-bindata-0_pre20151023 b/metadata/md5-cache/dev-go/go-bindata-0_pre20151023
deleted file mode 100644
index c3357561ed42..000000000000
--- a/metadata/md5-cache/dev-go/go-bindata-0_pre20151023
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=A small utility which generates Go code from any file
-EAPI=5
-HOMEPAGE=https://github.com/jteeuwen/go-bindata
-KEYWORDS=amd64 ~arm ~arm64
-LICENSE=CC-PD
-RESTRICT=strip
-SLOT=0/0_pre20151023
-SRC_URI=https://github.com/jteeuwen/go-bindata/archive/a0ff2567cfb70903282db057e799fd826784d41d.tar.gz -> go-bindata-0_pre20151023.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=cbf3f6d3d18839b4d7349e70de090486
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 7a0ac6b31d48..d51944674691 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/language-docker-6.0.1 b/metadata/md5-cache/dev-haskell/language-docker-6.0.1
deleted file mode 100644
index 6e3c808199ae..000000000000
--- a/metadata/md5-cache/dev-haskell/language-docker-6.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/free:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/prettyprinter:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/glob dev-haskell/hspec >=dev-haskell/hunit-1.2 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Dockerfile parser, pretty-printer and embedded DSL
-EAPI=6
-HOMEPAGE=https://github.com/hadolint/language-docker#readme
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-haskell/free:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/prettyprinter:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:=
-SLOT=0/6.0.1
-SRC_URI=mirror://hackage/packages/archive/language-docker/6.0.1/language-docker-6.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50f787553510cf831c5f3096d9c83e6b
diff --git a/metadata/md5-cache/dev-haskell/language-docker-6.0.3 b/metadata/md5-cache/dev-haskell/language-docker-6.0.3
deleted file mode 100644
index 2fba76edd56e..000000000000
--- a/metadata/md5-cache/dev-haskell/language-docker-6.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/free:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/prettyprinter:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/glob dev-haskell/hspec >=dev-haskell/hunit-1.2 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Dockerfile parser, pretty-printer and embedded DSL
-EAPI=6
-HOMEPAGE=https://github.com/hadolint/language-docker#readme
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-haskell/free:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/prettyprinter:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:=
-SLOT=0/6.0.3
-SRC_URI=mirror://hackage/packages/archive/language-docker/6.0.3/language-docker-6.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50f787553510cf831c5f3096d9c83e6b
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 10ed1bc392ad..80acc0d22f53 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/ant-core-1.10.5-r2 b/metadata/md5-cache/dev-java/ant-core-1.10.5-r2
index d61a64ec95c2..21399448f398 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.10.5-r2
+++ b/metadata/md5-cache/dev-java/ant-core-1.10.5-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8:* !dev-java/ant-tasks !dev-java/ant-optional >=dev-jav
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.10.5-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.10.5-r1-gentoo.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=759f5157f7be186266981142d5101dcf
diff --git a/metadata/md5-cache/dev-java/ant-core-1.9.13-r2 b/metadata/md5-cache/dev-java/ant-core-1.9.13-r2
index b70b4b227765..b183526e9975 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.9.13-r2
+++ b/metadata/md5-cache/dev-java/ant-core-1.9.13-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8:* !dev-java/ant-tasks !dev-java/ant-optional >=dev-jav
 RESTRICT=test
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/ant/source/apache-ant-1.9.13-src.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/ant-1.9.13-r1-gentoo.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0327884be01fa12d8a0d29f7bb87dab1
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10
index 7be4c6504eae..4f231287220d 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.10
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.10:4.10 >=dev-java/ant-core-1.7 >=virtual/jre-11 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.10
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/ecjsrc-4.10.jar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c70f765c0ab5683e7b6af4d4d26e2cb5
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
index 8920f9285411..e9d7c35239f9 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.4.2:4.4 >=dev-java/ant-core-1.7 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=afe7211dcd0054d80f6d2704edcc2444
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
index 90c1135ae2cd..591ec1916ab3 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.5.1:4.5 >=dev-java/ant-core-1.7 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.5
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3ba13ec75d567154997fbe542f7b59aa
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-4.4.2 b/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
index 40fa8b47f6aa..d9b7cd84031a 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
+++ b/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=06b63e52ae353e4b166fd07062f2d594
diff --git a/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1 b/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
index 547d049ab5ad..b819a41f9065 100644
--- a/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
+++ b/metadata/md5-cache/dev-java/gcj-jdk-5.4.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-java/ecj-gcj:* dev-lang/perl ~sys-devel/gcc-5.4.0[awt?,gcj] >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=0
-_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f46d2f52bd5860c1666574872420e4b3
diff --git a/metadata/md5-cache/dev-java/icedtea-3.13.0 b/metadata/md5-cache/dev-java/icedtea-3.13.0
index aeba3233b3d1..4d34b99de379 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.13.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.13.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0
 REQUIRED_USE=gtk? ( !headless-awt )
 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	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=04c70ea37970d3cfd1bcfd87fbdd880b
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.13.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.13.0
index 240289249d68..c51fa7805859 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.13.0
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.13.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.13.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-x86.tar.xz ) ) ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.13.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.13.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.13.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.13.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.13.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.13.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.13.0-x86.tar.xz ) )
-_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ae5d9697806e25d9d312805c88c2b07
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
index 294f104392ed..58ec8da1728d 100644
--- a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
+++ b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jdk-1.6.0 >=media-sound/pulseaudio-0.9.11:= >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fcb9663ed28dfd70abc63c2f0f8904c2
diff --git a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1 b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
index fca02d7b5c1a..80a8c9d9f3ef 100644
--- a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
+++ b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* ) libffi? ( virtual/libffi ) ppc64? ( virtual/libffi ) sparc? ( virtual/libffi ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jamvm/jamvm-2.0.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da533340fee43eee318c7b76810c59e6
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9 b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
index a3fd5351a3f2..fbf0f244bde1 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.3.0-r9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/javatoolkit-0.3.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b271bc6eae91d16bc750eb480560bde2
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.0 b/metadata/md5-cache/dev-java/javatoolkit-0.6.0
index 35880f9d1bbd..425835573bde 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.0
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.0.tar.bz2
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c5ac43352166a327ca6b4d326e9e03a3
diff --git a/metadata/md5-cache/dev-java/javatoolkit-9999 b/metadata/md5-cache/dev-java/javatoolkit-9999
index b0ea6fa9c380..5cbcbd68278e 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-9999
+++ b/metadata/md5-cache/dev-java/javatoolkit-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7bdcdbd8495d742ab0a0e6f63bf991c
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
index 8d16aade21e0..4f6914450085 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.3_p7-r4
@@ -11,5 +11,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-
 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	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b98401d405619a0001e7ab87532e357a
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.4_p11 b/metadata/md5-cache/dev-java/openjdk-11.0.4_p11
index 6fd4abb05e38..d0f974d856dc 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.4_p11
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.4_p11
@@ -11,5 +11,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-
 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	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5d16edf24330bc638ee2488d27bf895
diff --git a/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3 b/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3
index db701d8f1855..bbbd6e5cca39 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3
+++ b/metadata/md5-cache/dev-java/openjdk-8.212_p03-r3
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/iced
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=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
 SLOT=8
 SRC_URI=https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u212-b03.tar.bz2 -> openjdk-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u212-b03.tar.bz2 -> openjdk-corba-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u212-b03.tar.bz2 -> openjdk-hotspot-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u212-b03.tar.bz2 -> openjdk-jaxp-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u212-b03.tar.bz2 -> openjdk-jaxws-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u212-b03.tar.bz2 -> openjdk-jdk-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u212-b03.tar.bz2 -> openjdk-langtools-8.212_p03.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u212-b03.tar.bz2 -> openjdk-nashorn-8.212_p03.tar.bz2
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80bad89b35f460248e65b95562f69aed
diff --git a/metadata/md5-cache/dev-java/openjdk-8.222_p10 b/metadata/md5-cache/dev-java/openjdk-8.222_p10
index 5825d74f75fb..623803ee43e1 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.222_p10
+++ b/metadata/md5-cache/dev-java/openjdk-8.222_p10
@@ -10,5 +10,5 @@ PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/iced
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=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
 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	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66de0df8a6b61392094e56d30f1a4237
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.3_p7-r1 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.3_p7-r1
index 2f81efb59f46..3761016d9289 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.3_p7-r1
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.3_p7-r1
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-ja
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=arm? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3+7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3+7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3+7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.3_7.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3+7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz )
-_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0d9562bc84cf2c5a086ce3464af5193
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
index 63d9cc7f9a8a..166529e5a2e5 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.4_p11
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.4_p11
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-ja
 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	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0af7bc7695709cd0d6eb2391969c98c
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.191_p12-r1 b/metadata/md5-cache/dev-java/openjdk-bin-8.191_p12-r1
index e3c24771fd1f..f5e6312df203 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.191_p12-r1
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.191_p12-r1
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-libs/glibc-2.2.5:*
 RESTRICT=preserve-libs splitdebug
 SLOT=8
 SRC_URI=arm64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u191-b12/OpenJDK8U-jdk_aarch64_linux_hotspot_8u191b12.tar.gz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb0728c1a6aaa3723eb51109a6da320c
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.212_p03-r3 b/metadata/md5-cache/dev-java/openjdk-bin-8.212_p03-r3
index aee5bc287649..1ba822f42d86 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.212_p03-r3
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.212_p03-r3
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-ja
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u212-b03/OpenJDK8U-jdk_x64_linux_hotspot_8u212b03.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u212-b03/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u212b03.tar.gz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=568be942e5965c2f2c6bd42b5b0a169a
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.222_p10 b/metadata/md5-cache/dev-java/openjdk-bin-8.222_p10
index fcc26fadbc13..e1d7dc83e21c 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.222_p10
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.222_p10
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-ja
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=arm64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u222b10.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52cd76501d99f21c6deb4a21d5414749
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.3_p7-r2 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.3_p7-r2
index debe44e1ff9d..a531bf9b14a8 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.3_p7-r2
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.3_p7-r2
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3+7/OpenJDK11U-jre_x64_linux_hotspot_11.0.3_7.tar.gz )
-_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b0a45293b961809995dfcb346264c66
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.4_p11 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.4_p11
index 994047c9b088..44fb9b3d0f66 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.4_p11
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.4_p11
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4+11/OpenJDK11U-jre_x64_linux_hotspot_11.0.4_11.tar.gz )
-_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cbf8ec24f9733d0965bf1bb304c551f1
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.212_p03-r1 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.212_p03-r1
index e900c341575b..d40b1f783c71 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.212_p03-r1
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.212_p03-r1
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=8
 SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u212-b03/OpenJDK8U-jre_x64_linux_hotspot_8u212b03.tar.gz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9efb36608e5058ba14c17a91a2db8b8
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.222_p10 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.222_p10
index 0a969654ad2a..08387e52a50b 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.222_p10
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.222_p10
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=8
 SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_x64_linux_hotspot_8u222b10.tar.gz )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=429bf271219f660daef38a8a7f19fc83
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.202 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.202
index 256bf6a45d51..f13c749c8367 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.202
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.202
@@ -11,5 +11,5 @@ REQUIRED_USE=javafx? ( alsa fontconfig )
 RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jdk-8u202-linux-x64.tar.gz examples? ( jdk-8u202-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u202-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u202-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u202-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u202-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u202-linux-i586.tar.gz examples? ( jdk-8u202-linux-i586-demos.tar.gz ) ) x64-macos? ( jdk-8u202-macosx-x64.dmg examples? ( jdk-8u202-macosx-x86_64-demos.zip ) ) sparc64-solaris? ( jdk-8u202-solaris-sparcv9.tar.gz examples? ( jdk-8u202-solaris-sparcv9-demos.tar.gz ) ) x64-solaris? ( jdk-8u202-solaris-x64.tar.gz examples? ( jdk-8u202-solaris-x64-demos.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16c4ae1a64b28c5feea6e42f1d0460bd
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-11.0.2 b/metadata/md5-cache/dev-java/oracle-jdk-bin-11.0.2
index 32da67fefb7c..304b1e230fee 100644
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-11.0.2
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-11.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )
 RESTRICT=fetch preserve-libs strip
 SLOT=11
 SRC_URI=amd64? ( jdk-11.0.2_linux-x64_bin.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a477bd85fad5940a1c5fc1d498b3401
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.202 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.202
index 92c2bd39d25b..a01c6d86da40 100644
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.202
+++ b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.202
@@ -10,5 +10,5 @@ RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs
 RESTRICT=fetch preserve-libs strip
 SLOT=1.8
 SRC_URI=amd64? ( jre-8u202-linux-x64.tar.gz ) x86? ( jre-8u202-linux-i586.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0aaba28a76645ac7cc852f34fb8b94d
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 3680d9739667..77920a5b95bc 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/erlang-19.1 b/metadata/md5-cache/dev-lang/erlang-19.1
deleted file mode 100644
index 65a20baf27a2..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-19.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=5
-HOMEPAGE=https://www.erlang.org/
-IUSE=compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://erlang.org/download/otp_src_19.1.tar.gz http://erlang.org/download/otp_doc_man_19.1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_19.1.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=7e149ac23684a39f99142c2e50ec9ebe
diff --git a/metadata/md5-cache/dev-lang/erlang-20.3 b/metadata/md5-cache/dev-lang/erlang-20.3
deleted file mode 100644
index e04eb979ab22..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-20.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=6
-HOMEPAGE=https://www.erlang.org/
-IUSE=compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=dirty-schedulers? ( smp )
-SLOT=0
-SRC_URI=http://erlang.org/download/otp_src_20.3.tar.gz http://erlang.org/download/otp_doc_man_20.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_20.3.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=c6bb74769042deb288764547d527401c
diff --git a/metadata/md5-cache/dev-lang/erlang-20.3.8.10 b/metadata/md5-cache/dev-lang/erlang-20.3.8.10
deleted file mode 100644
index fc73229d0da2..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-20.3.8.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) dev-lang/perl sctp? ( net-misc/lksctp-tools ) sys-libs/zlib tk? ( dev-lang/tk ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=6
-HOMEPAGE=https://www.erlang.org/
-IUSE=dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=dirty-schedulers? ( smp )
-SLOT=0
-SRC_URI=https://github.com/erlang/otp/archive/OTP-20.3.8.10.tar.gz -> erlang-20.3.8.10.tar.gz http://erlang.org/download/otp_doc_man_20.3.tar.gz -> erlang_doc_man_20.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_20.3.tar.gz -> erlang_doc_html_20.3.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=30a5bc8dc566c1ab558dcd13957f9068
diff --git a/metadata/md5-cache/dev-lang/erlang-20.3.8.20 b/metadata/md5-cache/dev-lang/erlang-20.3.8.20
deleted file mode 100644
index ee411cfd4fb5..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-20.3.8.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) dev-lang/perl sctp? ( net-misc/lksctp-tools ) sys-libs/zlib tk? ( dev-lang/tk ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=6
-HOMEPAGE=https://www.erlang.org/
-IUSE=dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=dirty-schedulers? ( smp )
-SLOT=0
-SRC_URI=https://github.com/erlang/otp/archive/OTP-20.3.8.20.tar.gz -> erlang-20.3.8.20.tar.gz http://erlang.org/download/otp_doc_man_20.3.tar.gz -> erlang_doc_man_20.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_20.3.tar.gz -> erlang_doc_html_20.3.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=50b4ad74800ab622e2288ac836981683
diff --git a/metadata/md5-cache/dev-lang/erlang-21.2.6 b/metadata/md5-cache/dev-lang/erlang-21.2.6
deleted file mode 100644
index b8cc946e811f..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-21.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=6
-HOMEPAGE=https://www.erlang.org/
-IUSE=doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=https://github.com/erlang/otp/archive/OTP-21.2.6.tar.gz -> erlang-21.2.6.tar.gz http://erlang.org/download/otp_doc_man_21.2.tar.gz -> erlang_doc_man_21.2.tar.gz doc? ( http://erlang.org/download/otp_doc_html_21.2.tar.gz -> erlang_doc_html_21.2.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=e9d16a1537821d7c59620271342f2f6d
diff --git a/metadata/md5-cache/dev-lang/erlang-21.2.7 b/metadata/md5-cache/dev-lang/erlang-21.2.7
deleted file mode 100644
index 330d7b3bdc5b..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-21.2.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=6
-HOMEPAGE=https://www.erlang.org/
-IUSE=doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=https://github.com/erlang/otp/archive/OTP-21.2.7.tar.gz -> erlang-21.2.7.tar.gz http://erlang.org/download/otp_doc_man_21.2.tar.gz -> erlang_doc_man_21.2.tar.gz doc? ( http://erlang.org/download/otp_doc_html_21.2.tar.gz -> erlang_doc_html_21.2.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=e9d16a1537821d7c59620271342f2f6d
diff --git a/metadata/md5-cache/dev-lang/erlang-21.3 b/metadata/md5-cache/dev-lang/erlang-21.3
deleted file mode 100644
index 5cd905bb351f..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-21.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=6
-HOMEPAGE=https://www.erlang.org/
-IUSE=doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=https://github.com/erlang/otp/archive/OTP-21.3.tar.gz -> erlang-21.3.tar.gz http://erlang.org/download/otp_doc_man_21.3.tar.gz -> erlang_doc_man_21.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_21.3.tar.gz -> erlang_doc_html_21.3.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=e9d16a1537821d7c59620271342f2f6d
diff --git a/metadata/md5-cache/dev-lang/erlang-21.3-r1 b/metadata/md5-cache/dev-lang/erlang-21.3-r1
deleted file mode 100644
index cfea95b424af..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-21.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=6
-HOMEPAGE=https://www.erlang.org/
-IUSE=doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=https://github.com/erlang/otp/archive/OTP-21.3.tar.gz -> erlang-21.3.tar.gz http://erlang.org/download/otp_doc_man_21.3.tar.gz -> erlang_doc_man_21.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_21.3.tar.gz -> erlang_doc_html_21.3.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=20109eac313379bad3185105f294d9ef
diff --git a/metadata/md5-cache/dev-lang/erlang-22.0.2 b/metadata/md5-cache/dev-lang/erlang-22.0.2
deleted file mode 100644
index 93a5eb87e6b6..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-22.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=6
-HOMEPAGE=https://www.erlang.org/
-IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/ncurses:0 sys-libs/zlib emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) tk? ( dev-lang/tk:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=https://github.com/erlang/otp/archive/OTP-22.0.2.tar.gz -> erlang-22.0.2.tar.gz http://erlang.org/download/otp_doc_man_22.0.tar.gz -> erlang_doc_man_22.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.0.tar.gz -> erlang_doc_html_22.0.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=0cae03576991cb69be090e29c8afd6e1
diff --git a/metadata/md5-cache/dev-lang/f2c-20060507 b/metadata/md5-cache/dev-lang/f2c-20060507
deleted file mode 100644
index 8780c2e967af..000000000000
--- a/metadata/md5-cache/dev-lang/f2c-20060507
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libf2c
-DESCRIPTION=Fortran to C converter
-EAPI=0
-HOMEPAGE=http://www.netlib.org/f2c
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=HPND
-RDEPEND=dev-libs/libf2c
-SLOT=0
-SRC_URI=mirror://gentoo/f2c-20060507.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ed7b22c5a9a45d58b5bb099c4b4fad7
diff --git a/metadata/md5-cache/dev-lang/f2c-20100827 b/metadata/md5-cache/dev-lang/f2c-20100827
deleted file mode 100644
index b55e01b59ba1..000000000000
--- a/metadata/md5-cache/dev-lang/f2c-20100827
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Fortran to C converter
-EAPI=4
-HOMEPAGE=http://www.netlib.org/f2c
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=HPND
-RDEPEND=dev-libs/libf2c
-SLOT=0
-SRC_URI=mirror://debian/pool/main/f/f2c/f2c_20100827.orig.tar.gz mirror://debian/pool/main/f/f2c/f2c_20100827-1.debian.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9537693f486437e22d48a66a36fe2a68
diff --git a/metadata/md5-cache/dev-lang/f2c-20100827-r1 b/metadata/md5-cache/dev-lang/f2c-20100827-r1
index b0010b54c7f0..4be9e41acdad 100644
--- a/metadata/md5-cache/dev-lang/f2c-20100827-r1
+++ b/metadata/md5-cache/dev-lang/f2c-20100827-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Fortran to C converter
 EAPI=7
 HOMEPAGE=http://www.netlib.org/f2c
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=>=dev-libs/libf2c-20130927-r1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/f/f2c/f2c_20100827.orig.tar.gz mirror://debian/pool/main/f/f2c/f2c_20100827-1.debian.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e3bc898eef6b3ff27d23e611a7b3ec75
+_md5_=0863d8fe2a2d3b617a0da150f0b210ce
diff --git a/metadata/md5-cache/dev-lang/fpc-3.0.2-r1 b/metadata/md5-cache/dev-lang/fpc-3.0.2-r1
index 67ca918d2054..543975232373 100644
--- a/metadata/md5-cache/dev-lang/fpc-3.0.2-r1
+++ b/metadata/md5-cache/dev-lang/fpc-3.0.2-r1
@@ -9,5 +9,5 @@ RDEPEND=ide? ( !dev-lang/fpc-ide )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/freepascal/fpcbuild-3.0.2.tar.gz mirror://sourceforge/freepascal/fpc-3.0.2.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-3.0.2.x86_64-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-3.0.2.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/3.0.2/doc-html.tar.gz -> fpc-3.0.2-doc-html.tar.gz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=3629ef6c52b6e2ce3b958c62b9cb14f2
diff --git a/metadata/md5-cache/dev-lang/fpc-3.0.4 b/metadata/md5-cache/dev-lang/fpc-3.0.4
index e1e065a3719f..26d4a61b15f6 100644
--- a/metadata/md5-cache/dev-lang/fpc-3.0.4
+++ b/metadata/md5-cache/dev-lang/fpc-3.0.4
@@ -9,5 +9,5 @@ RDEPEND=ide? ( !dev-lang/fpc-ide )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/freepascal/fpcbuild-3.0.4.tar.gz mirror://sourceforge/freepascal/fpc-3.0.4.source.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-3.0.4.x86_64-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-3.0.4.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/3.0.4/doc-html.tar.gz -> fpc-3.0.4-doc-html.tar.gz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=265389bc51312ef8041b2d3ed71a296d
diff --git a/metadata/md5-cache/dev-lang/ghc-7.10.3 b/metadata/md5-cache/dev-lang/ghc-7.10.3
index 4930bebbc726..ad9f8839b8bc 100644
--- a/metadata/md5-cache/dev-lang/ghc-7.10.3
+++ b/metadata/md5-cache/dev-lang/ghc-7.10.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 >=dev-libs/gmp-5:= sys-libs/ncurses:0=[unicode] !g
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/7.10.3
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-alpha.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-amd64.tbz2 ) ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-ia64.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-ppc64.tbz2 ) sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-sparc.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-7.10.3-x86.tbz2 ) ) mirror://hackage/package/binary/binary-0.7.6.1.tar.gz mirror://hackage/package/hoopl/hoopl-3.10.2.0.tar.gz mirror://hackage/package/transformers/transformers-0.4.3.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=87dc538a2f60c924065ff54499460b98
diff --git a/metadata/md5-cache/dev-lang/ghc-8.0.2 b/metadata/md5-cache/dev-lang/ghc-8.0.2
index 0fe277b98318..022eec76efbc 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.0.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.0.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.0.2/ghc-8.0.2-src.tar.xz ) !ghcbootstrap? ( alpha? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-alpha.tbz2 ) arm64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-arm64.tbz2 ) amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-x86_64-pc-linux-gnu.tbz2 ) ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ia64-unknown-linux-gnu.tbz2 ) ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ppc.tbz2 ) ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-ppc64.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.0.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6cbe1e9c9dbe7ad4d422ff52f8913f3f
diff --git a/metadata/md5-cache/dev-lang/ghc-8.2.1 b/metadata/md5-cache/dev-lang/ghc-8.2.1
index 25acce30b9f3..69ade54cd78e 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.2.1
+++ b/metadata/md5-cache/dev-lang/ghc-8.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.2.1
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.2.1/ghc-8.2.1-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e70e31eb35104195802dfb783b8457f9
diff --git a/metadata/md5-cache/dev-lang/ghc-8.2.2 b/metadata/md5-cache/dev-lang/ghc-8.2.2
index 76943b2a3764..827d61198117 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.2.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.2.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.2.2/ghc-8.2.2-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.2.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=af30fc285821b5160788e8be56ad6829
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.1 b/metadata/md5-cache/dev-lang/ghc-8.4.1
index a44b0ca3aff8..fd7893824967 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.4.1
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.4.1
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.1/ghc-8.4.1-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.1-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.1-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6a73b2c94375d9bb29aad201c59a213a
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.2 b/metadata/md5-cache/dev-lang/ghc-8.4.2
index 7d1eaa70dcf0..69d7b3c76988 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.4.2
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.4.2
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.2/ghc-8.4.2-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.2-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.2-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d01224da03d360b81dccfa6a8eb74148
diff --git a/metadata/md5-cache/dev-lang/ghc-8.4.3 b/metadata/md5-cache/dev-lang/ghc-8.4.3
index 074be764932c..75718feb16b1 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.4.3
+++ b/metadata/md5-cache/dev-lang/ghc-8.4.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.4.3
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-src.tar.xz ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.3-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.4.3-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b29c3d5fce15a1cdccbe23dfad78ecaf
diff --git a/metadata/md5-cache/dev-lang/ghc-8.6.4 b/metadata/md5-cache/dev-lang/ghc-8.6.4
index a8391b95a69a..6e0ad456d8df 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.6.4
+++ b/metadata/md5-cache/dev-lang/ghc-8.6.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.6.4
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-src.tar.xz test? ( http://downloads.haskell.org/~ghc/8.6.4/ghc-8.6.4-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.4-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.4-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dce05597ad2ace227bf5f0bec0a00ab1
diff --git a/metadata/md5-cache/dev-lang/ghc-8.6.5 b/metadata/md5-cache/dev-lang/ghc-8.6.5
index aab54e01ffc5..3877fd305666 100644
--- a/metadata/md5-cache/dev-lang/ghc-8.6.5
+++ b/metadata/md5-cache/dev-lang/ghc-8.6.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] !ghcm
 REQUIRED_USE=?? ( ghcbootstrap binary )
 SLOT=0/8.6.5
 SRC_URI=!binary? ( http://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-src.tar.xz test? ( http://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-testsuite.tar.xz ) ) !ghcbootstrap? ( amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.5-x86_64-pc-linux-gnu.tbz2 ) x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-8.6.5-i686-pc-linux-gnu.tbz2 ) )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=1cd6dc5d22ab46dded7a4bf4dab13bd3
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3
index 7bc4fc3bdc02..1d22736b68ac 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r3
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f -> gnat-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db -> gcc-4.9-gpl-2016-src.tar.gz http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d -> gcc-interface-4.9-gpl-2016-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=45183572c51e158467a6161304134d93
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017 b/metadata/md5-cache/dev-lang/gnat-gpl-2017
index 6b9d773509c5..1cb919aee8e1 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=6.3.0
 SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3 -> gnat-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adb65c7a4473fcbb153ac -> gcc-6-gpl-2017-src.tar.gz http://mirrors.cdn.adacore.com/art/591adbc5c7a4473fcbb153ae -> gcc-interface-6-gpl-2017-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46eb2db9f037d2010b3b227fef795fdd
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2
index 88b53b3365dc..42ca50b64221 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r2
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=7.3.1
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5 -> gnat-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7 -> gcc-7-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6 -> gcc-interface-7-gpl-2018-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=58f1045786d345e6bba40cebaff1afb3
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2019 b/metadata/md5-cache/dev-lang/gnat-gpl-2019
index 9c504de9f1ba..33ba5294a9a5 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2019
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2019
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:8.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=strip
 SLOT=8.3.1
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.1.tar.bz2 http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49 -> gnat-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049 -> gcc-8-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50 -> gcc-interface-8-2019-20190510-18F59-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0df7746e240f3f517173fff5dc9a631f
diff --git a/metadata/md5-cache/dev-lang/go-1.12.9 b/metadata/md5-cache/dev-lang/go-1.12.9
index 8ae00cdd5465..17150117b7f8 100644
--- a/metadata/md5-cache/dev-lang/go-1.12.9
+++ b/metadata/md5-cache/dev-lang/go-1.12.9
@@ -4,11 +4,11 @@ DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=7
 HOMEPAGE=https://golang.org
 IUSE=gccgo system-bootstrap
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 RESTRICT=test strip
 SLOT=0/1.12.9
 SRC_URI=https://storage.googleapis.com/golang/go1.12.9.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 ) )
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b8e527abfa6a79987ca58ac1e0dcf7a3
+_md5_=f7b512d961655f72b7181782491b490f
diff --git a/metadata/md5-cache/dev-lang/jimtcl-0.78-r1 b/metadata/md5-cache/dev-lang/jimtcl-0.78-r1
deleted file mode 100644
index dc35035282ea..000000000000
--- a/metadata/md5-cache/dev-lang/jimtcl-0.78-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=doc? ( app-text/asciidoc ) app-arch/unzip
-DESCRIPTION=Small footprint implementation of Tcl programming language
-EAPI=7
-HOMEPAGE=http://jim.tcl.tk/
-IUSE=doc static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86
-LICENSE=LGPL-2
-SLOT=0/78
-SRC_URI=https://github.com/msteveb/jimtcl/archive/0.78.tar.gz -> jimtcl-0.78.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8
-_md5_=1f84bbec3b55c8af6efbefbb31e0fc0b
diff --git a/metadata/md5-cache/dev-lang/perl-5.28.2-r1 b/metadata/md5-cache/dev-lang/perl-5.28.2-r1
index 937d86a0c6e0..cf1eea2b74c3 100644
--- a/metadata/md5-cache/dev-lang/perl-5.28.2-r1
+++ b/metadata/md5-cache/dev-lang/perl-5.28.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Larry Wall's Practical Extraction and Report Language
 EAPI=6
 HOMEPAGE=https://www.perl.org/
 IUSE=berkdb debug doc gdbm ithreads
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.28
 SRC_URI=mirror://cpan/src/5.0/perl-5.28.2.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.28.2.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.28.2-patches-4/perl-5.28.2-patches-4.tar.xz mirror://gentoo/perl-5.28.2-patches-4.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.28.2-patches-4.tar.xz https://github.com/arsv/perl-cross/releases/download/1.2.3/perl-cross-1.2.3.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=05d7d8d644c2f60045227897db089378
+_md5_=2902b23ff56f8892bfff3d8cc668c2d3
diff --git a/metadata/md5-cache/dev-lang/perl-5.28.9999 b/metadata/md5-cache/dev-lang/perl-5.28.9999
index c09bf5bd1e12..dce8505d741c 100644
--- a/metadata/md5-cache/dev-lang/perl-5.28.9999
+++ b/metadata/md5-cache/dev-lang/perl-5.28.9999
@@ -10,4 +10,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzi
 SLOT=0/5.28
 SRC_URI=mirror://cpan/src/5.0/perl-5.28.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.28.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.28.0-patches-1/perl-5.28.0-patches-1.tar.xz mirror://gentoo/perl-5.28.0-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.28.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.2.2/perl-cross-1.2.2.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8af9b285e5a1ab316b8486b82a9ae9eb
+_md5_=3ed6aef55ac7aa97eb92cb8251187f69
diff --git a/metadata/md5-cache/dev-lang/perl-5.30.0 b/metadata/md5-cache/dev-lang/perl-5.30.0
index 074c7aed53e5..213aa40522f5 100644
--- a/metadata/md5-cache/dev-lang/perl-5.30.0
+++ b/metadata/md5-cache/dev-lang/perl-5.30.0
@@ -11,4 +11,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzi
 SLOT=0/5.30
 SRC_URI=mirror://cpan/src/5.0/perl-5.30.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.30.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.30.0-patches-1/perl-5.30.0-patches-1.tar.xz mirror://gentoo/perl-5.30.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.30.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.2.2/perl-cross-1.2.2.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=06e7c0a65d74e659b42a1ef7f0c34faa
+_md5_=1e18162f5253e2dd07231b0ec5b6c66e
diff --git a/metadata/md5-cache/dev-lang/php-7.1.32 b/metadata/md5-cache/dev-lang/php-7.1.32
new file mode 100644
index 000000000000..05a5fd10d0fc
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.1.32
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash )
+SLOT=7.1
+SRC_URI=https://php.net/distributions/php-7.1.32.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e6bc34962938ba9281851cedfddb368a
diff --git a/metadata/md5-cache/dev-lang/php-7.2.22 b/metadata/md5-cache/dev-lang/php-7.2.22
index 2707bfb0f4b8..826055f05bc0 100644
--- a/metadata/md5-cache/dev-lang/php-7.2.22
+++ b/metadata/md5-cache/dev-lang/php-7.2.22
@@ -5,7 +5,7 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( hash || ( mysqli pdo ) ) mysqli? ( hash ) zip-encryption? ( zip )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=7.2
 SRC_URI=https://php.net/distributions/php-7.2.22.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d189ff0a82f3d6e4cf2d6af112860cc4
+_md5_=d6ab9926d812aa2e5ec2fb3046de2145
diff --git a/metadata/md5-cache/dev-lang/php-7.3.9 b/metadata/md5-cache/dev-lang/php-7.3.9
index fe1966d59b9f..f100ec29f4c2 100644
--- a/metadata/md5-cache/dev-lang/php-7.3.9
+++ b/metadata/md5-cache/dev-lang/php-7.3.9
@@ -5,11 +5,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=7
 HOMEPAGE=https://php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( >=sys-libs/zlib-1.2.0.4:0= ) zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) zip-encryption? ( zip )
 SLOT=7.3
 SRC_URI=https://php.net/distributions/php-7.3.9.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=54513d62aa5957eed7dbfb44f1416950
+_md5_=03c46fded12e68e5542961d947b23936
diff --git a/metadata/md5-cache/dev-lang/php-7.4.0_rc1 b/metadata/md5-cache/dev-lang/php-7.4.0_rc1
new file mode 100644
index 000000000000..d207632f012a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.4.0_rc1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=virtual/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=virtual/libffi-3.0.11 ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:= ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+SLOT=7.4
+SRC_URI=https://downloads.php.net/~derick/php-7.4.0RC1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5ab28f455933948c62151c40a0338959
diff --git a/metadata/md5-cache/dev-lang/python-exec-2.4.6-r1 b/metadata/md5-cache/dev-lang/python-exec-2.4.6-r1
index 1d3be6eda871..bbb4f42dae3f 100644
--- a/metadata/md5-cache/dev-lang/python-exec-2.4.6-r1
+++ b/metadata/md5-cache/dev-lang/python-exec-2.4.6-r1
@@ -9,4 +9,4 @@ RDEPEND=!<app-eselect/eselect-python-20160206 !<dev-lang/python-2.7.10-r4:2.7 !<
 SLOT=2
 SRC_URI=https://github.com/mgorny/python-exec/releases/download/v2.4.6/python-exec-2.4.6.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=cd96b3ab3104a4dd65c46ae972665f7b
+_md5_=36c6784eb0c088776d5bdf961f5e7f37
diff --git a/metadata/md5-cache/dev-lang/python-exec-9999 b/metadata/md5-cache/dev-lang/python-exec-9999
index e9754af3fa12..d75c08809ab5 100644
--- a/metadata/md5-cache/dev-lang/python-exec-9999
+++ b/metadata/md5-cache/dev-lang/python-exec-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=!<app-eselect/eselect-python-20160206 !<dev-lang/python-2.7.10-r4:2.7 !<dev-lang/python-3.3.5-r4:3.3 !<dev-lang/python-3.4.3-r4:3.4 !<dev-lang/python-3.5.0-r3:3.5
 SLOT=2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6b11e9f99aea87f48587668c45335032
+_md5_=50495c094a555a5ffc46d214ff620f08
diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.7 b/metadata/md5-cache/dev-lang/ruby-2.4.7
index 6341d61f20bd..c01de2736f69 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.4.7
+++ b/metadata/md5-cache/dev-lang/ruby-2.4.7
@@ -5,11 +5,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] virtual/rubygems[ruby_targets_ruby24] >=dev-ruby/json-2.0.2[ruby_targets_ruby24] rdoc? ( >=dev-ruby/rdoc-5.1.0-r1[ruby_targets_ruby24] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.4
 SRC_URI=mirror://ruby/2.4/ruby-2.4.7.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=af38e0b530263abedc0f7a778768505d
+_md5_=8e599620f8a648038a13f2dd0c8c4837
diff --git a/metadata/md5-cache/dev-lang/ruby-2.5.6 b/metadata/md5-cache/dev-lang/ruby-2.5.6
index db1335c7aa7a..d9a1ad864d81 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.5.6
+++ b/metadata/md5-cache/dev-lang/ruby-2.5.6
@@ -5,11 +5,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=7
 HOMEPAGE=https://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25] >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25] >=dev-ruby/rake-12.3.0[ruby_targets_ruby25] >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25] virtual/rubygems[ruby_targets_ruby25] >=dev-ruby/json-2.0.2[ruby_targets_ruby25] rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby25] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi:= sys-libs/readline:0= sys-libs/zlib >=app-eselect/eselect-ruby-20171225
 SLOT=2.5
 SRC_URI=mirror://ruby/2.5/ruby-2.5.6.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=933e34d1b5eb73670424a4bb1bee200c
+_md5_=f4ff6b7676cafa277376aa56bd079125
diff --git a/metadata/md5-cache/dev-lang/tk-8.5.17-r1 b/metadata/md5-cache/dev-lang/tk-8.5.17-r1
index 299f92eea25e..7b1c791bdca3 100644
--- a/metadata/md5-cache/dev-lang/tk-8.5.17-r1
+++ b/metadata/md5-cache/dev-lang/tk-8.5.17-r1
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=!aqua? ( media-libs/fontconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.17:0=
 SLOT=0/8.5
 SRC_URI=mirror://sourceforge/tcl/tk8.5.17-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=8d5660780f7978afd6733ce49db95f81
diff --git a/metadata/md5-cache/dev-lang/tk-8.5.17-r100 b/metadata/md5-cache/dev-lang/tk-8.5.17-r100
index fced6aba8891..b16f09fb875a 100644
--- a/metadata/md5-cache/dev-lang/tk-8.5.17-r100
+++ b/metadata/md5-cache/dev-lang/tk-8.5.17-r100
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=!aqua? ( media-libs/fontconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.17:8.5= !=dev-lang/tk-8.5:0
 SLOT=8.5
 SRC_URI=mirror://sourceforge/tcl/tk8.5.17-src.tar.gz mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=94630957f31b4248658fb0eada81bb15
diff --git a/metadata/md5-cache/dev-lang/tk-8.5.17-r101 b/metadata/md5-cache/dev-lang/tk-8.5.17-r101
index f8c1ddcec006..ed302ba450ea 100644
--- a/metadata/md5-cache/dev-lang/tk-8.5.17-r101
+++ b/metadata/md5-cache/dev-lang/tk-8.5.17-r101
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=!aqua? ( media-libs/fontconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.17:8.5= !=dev-lang/tk-8.5:0
 SLOT=8.5
 SRC_URI=mirror://sourceforge/tcl/tk8.5.17-src.tar.gz mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=1dde756f7b6c64d0fbabcd37fee4a0bb
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.8 b/metadata/md5-cache/dev-lang/tk-8.6.8
index 3e2d2fe99bbb..c5763d6a29b5 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.8
+++ b/metadata/md5-cache/dev-lang/tk-8.6.8
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[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/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/libXt-1.1.4[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? ( >=x11-libs/libXft-2.3.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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-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(-)?] ) ) ~dev-lang/tcl-8.6.8: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(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.8-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=7197eab77e3538200c544775c34eeca6
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.9 b/metadata/md5-cache/dev-lang/tk-8.6.9
index 092256a95a40..183cbc10d40f 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.9
+++ b/metadata/md5-cache/dev-lang/tk-8.6.9
@@ -10,5 +10,5 @@ LICENSE=tcltk
 RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[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/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/libXt-1.1.4[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? ( >=x11-libs/libXft-2.3.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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-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(-)?] ) ) ~dev-lang/tcl-8.6.9: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(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.9-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=8a2efeb021148301f5687d3ebc332164
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.9.1 b/metadata/md5-cache/dev-lang/tk-8.6.9.1
index afec9d121724..9ca5a5a50ae1 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.9.1
+++ b/metadata/md5-cache/dev-lang/tk-8.6.9.1
@@ -10,5 +10,5 @@ LICENSE=tcltk
 RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[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/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/libXt-1.1.4[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? ( >=x11-libs/libXft-2.3.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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-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(-)?] ) ) ~dev-lang/tcl-8.6.9: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(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.9.1-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=67e96e83c039841f2ec1e0633ecc90eb
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.20 b/metadata/md5-cache/dev-lang/vala-0.36.20
index 3210e0afc617..d218ef2fc709 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.20
+++ b/metadata/md5-cache/dev-lang/vala-0.36.20
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.20
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.20.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a19b94a7de2c3c09ec3a4226ba9bf728
+_md5_=1b5f80f53c3d1307f42c4ac26c7d17e2
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.16 b/metadata/md5-cache/dev-lang/vala-0.40.16
index 0af3208551d9..706b36667e8a 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.16
+++ b/metadata/md5-cache/dev-lang/vala-0.40.16
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test valadoc
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.16 valadoc? ( >=media-gfx/graphviz-2.16 )
 SLOT=0.40
 SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.16.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=974e66f7fba315dfc4c9c463df1a7144
+_md5_=2a4305f9c2aa54d179cccd947716d751
diff --git a/metadata/md5-cache/dev-lang/vala-0.45.91 b/metadata/md5-cache/dev-lang/vala-0.45.91
deleted file mode 100644
index 3bf9c5985d1a..000000000000
--- a/metadata/md5-cache/dev-lang/vala-0.45.91
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.45.91 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Compiler for the GObject type system
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-IUSE=test valadoc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.45.91 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
-SLOT=0.46
-SRC_URI=mirror://gnome/sources/vala/0.45/vala-0.45.91.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9bbc70b2f1e12e2c1b9b695580e58264
diff --git a/metadata/md5-cache/dev-lang/vala-0.46.0 b/metadata/md5-cache/dev-lang/vala-0.46.0
new file mode 100644
index 000000000000..8e99b38ce73b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.46.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.46.0 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala] dev-libs/libxslt sys-devel/flex virtual/pkgconfig virtual/yacc test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Compiler for the GObject type system
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+IUSE=test valadoc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.46.0 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
+SLOT=0.46
+SRC_URI=mirror://gnome/sources/vala/0.46/vala-0.46.0.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9bbc70b2f1e12e2c1b9b695580e58264
diff --git a/metadata/md5-cache/dev-lang/zig-9999 b/metadata/md5-cache/dev-lang/zig-9999
new file mode 100644
index 000000000000..6ca3e26b3578
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/zig-9999
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-devel/llvm:8 !experimental? ( sys-devel/llvm:8[llvm_targets_AArch64,llvm_targets_AMDGPU,llvm_targets_ARM,llvm_targets_BPF,llvm_targets_Hexagon,llvm_targets_Lanai,llvm_targets_Mips,llvm_targets_MSP430,llvm_targets_NVPTX,llvm_targets_PowerPC,llvm_targets_Sparc,llvm_targets_SystemZ,llvm_targets_WebAssembly,llvm_targets_X86,llvm_targets_XCore] ) sys-devel/clang:8
+DESCRIPTION=A robust, optimal, and maintainable programming language
+EAPI=7
+HOMEPAGE=https://ziglang.org/
+IUSE=+experimental
+LICENSE=MIT
+PROPERTIES=live
+RDEPEND=sys-devel/llvm:8 !experimental? ( sys-devel/llvm:8[llvm_targets_AArch64,llvm_targets_AMDGPU,llvm_targets_ARM,llvm_targets_BPF,llvm_targets_Hexagon,llvm_targets_Lanai,llvm_targets_Mips,llvm_targets_MSP430,llvm_targets_NVPTX,llvm_targets_PowerPC,llvm_targets_Sparc,llvm_targets_SystemZ,llvm_targets_WebAssembly,llvm_targets_X86,llvm_targets_XCore] ) sys-devel/clang:8
+SLOT=0
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4061c62687482c6b9c7cd7d8fca314e
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index f99cf773632b..3a68b801f945 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/actor-framework-0.13.2 b/metadata/md5-cache/dev-libs/actor-framework-0.13.2
deleted file mode 100644
index d7e50da69dca..000000000000
--- a/metadata/md5-cache/dev-libs/actor-framework-0.13.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-tex/hevea ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=The C++ Actor Framework (CAF)
-EAPI=6
-HOMEPAGE=https://actor-framework.org/
-IUSE=boost benchmarks cash debug doc examples +mem_management nexus opencl riac static test 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 ~x86
-LICENSE=|| ( Boost-1.0 BSD )
-RDEPEND=boost? ( dev-libs/boost[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(-)?] ) net-misc/curl[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(-)?] )
-REQUIRED_USE=cash? ( riac )
-SLOT=0/13.2
-SRC_URI=https://github.com/actor-framework/actor-framework/archive/0.13.2.tar.gz -> actor-framework-0.13.2.tar.gz benchmarks? ( https://github.com/actor-framework/benchmarks/archive/78c746269bb53ff0b2026e7b1a8fe11fabc69e64.tar.gz -> CAF_0.13.2-benchmarks.tar.gz ) cash? ( https://github.com/actor-framework/cash/archive/847edfb18afa6b755a91a203872bcd66bbeb5868.tar.gz -> CAF_0.13.2-cash.tar.gz https://github.com/Neverlord/sash/archive/9da5a40793d77e7f6d3afb504cf02c0acb59d35c.tar.gz -> CAF_0.13.2-sash_cash.tar.gz ) nexus? ( https://github.com/actor-framework/nexus/archive/90d42335ff3a2fe67ac4ae41a844f0b245bb123c.tar.gz -> CAF_0.13.2-nexus.tar.gz ) opencl? ( https://github.com/actor-framework/opencl/archive/91ebbda2986f3f32a873d02ca5eb550f26c6b70d.tar.gz -> CAF_0.13.2-opencl.tar.gz ) riac? ( https://github.com/actor-framework/riac/archive/855e725739b7688290f66f592f858149c92375c5.tar.gz -> CAF_0.13.2-riac.tar.gz )
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95ce4375d04d40d3a96f881899e08a5d
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-8.0.4 b/metadata/md5-cache/dev-libs/boehm-gc-8.0.4
index a84adfcff232..18169df77a64 100644
--- a/metadata/md5-cache/dev-libs/boehm-gc-8.0.4
+++ b/metadata/md5-cache/dev-libs/boehm-gc-8.0.4
@@ -5,9 +5,9 @@ DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
 EAPI=7
 HOMEPAGE=http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/
 IUSE=cxx static-libs +threads 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=boehm-gc
 SLOT=0
 SRC_URI=https://github.com/ivmai/bdwgc/releases/download/v8.0.4/gc-8.0.4.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f9b37dce7ce513b86411114b41ad1074
+_md5_=91dc50f9bc3d00f606f10b48bdbebd0e
diff --git a/metadata/md5-cache/dev-libs/cgicc-3.2.9 b/metadata/md5-cache/dev-libs/cgicc-3.2.9
deleted file mode 100644
index 53614c71fe36..000000000000
--- a/metadata/md5-cache/dev-libs/cgicc-3.2.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=A C++ class library for writing CGI applications
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/cgicc/
-IUSE=doc
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3 doc? ( FDL-1.2 )
-SLOT=0
-SRC_URI=mirror://gnu/cgicc/cgicc-3.2.9.tar.gz
-_md5_=4e6e87118dd41b4299570714c51d9f61
diff --git a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13 b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13
index 8fab5a3b31ad..ddd9e6c2ad19 100644
--- a/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13
+++ b/metadata/md5-cache/dev-libs/cyberjack-3.99.5_p13
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=sys-apps/pcsc-lite usb? ( virtual/libusb:1 ) udev? ( virtual/udev ) xml? ( dev-libs/libxml2:2= )
 SLOT=0
 SRC_URI=https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP13/pcsc-cyberjack_3.99.5final.SP13.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=08a2864d42150d50c59d3b527390be46
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
deleted file mode 100644
index 12ee975f2391..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) libressl? ( dev-libs/libressl:=[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(-)?] ) ) java? ( >=virtual/jdk-1.4:= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
-EAPI=5
-HOMEPAGE=https://www.cyrusimap.org/sasl/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom 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 elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) libressl? ( dev-libs/libressl:=[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(-)?] ) ) java? ( >=virtual/jdk-1.4:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=2
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4ef2be671f830d62b6b8c5ff9d6225b1
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r12 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r12
deleted file mode 100644
index c0d57560fc0a..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) libressl? ( dev-libs/libressl:=[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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
-EAPI=6
-HOMEPAGE=https://www.cyrusimap.org/sasl/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom 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 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) libressl? ( dev-libs/libressl:=[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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=2
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=34995816e744c74cf66dfa830e40f19f
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r13 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r13
deleted file mode 100644
index 48262982d97f..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( dev-db/mysql-connector-c: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(-)?] ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) libressl? ( dev-libs/libressl:=[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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
-EAPI=6
-HOMEPAGE=https://www.cyrusimap.org/sasl/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom 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 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( dev-db/mysql-connector-c: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(-)?] ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) libressl? ( dev-libs/libressl:=[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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=2
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7487b1f484cb6e9fcf8d560f64b100b8
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
deleted file mode 100644
index 6c3c900d93b5..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) java? ( >=virtual/jdk-1.4:= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
-EAPI=5
-HOMEPAGE=https://www.cyrusimap.org/sasl/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom 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 elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) java? ( >=virtual/jdk-1.4:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=2
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1697fae2fd66f6632891a58a4ab4cb4d
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r1 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r1
deleted file mode 100644
index c2ca09ee74ca..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) libressl? ( dev-libs/libressl:=[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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
-EAPI=6
-HOMEPAGE=https://www.cyrusimap.org/sasl/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom 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 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.2: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(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) libressl? ( dev-libs/libressl:=[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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=2
-SRC_URI=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e9229aee780aaaefef687dd2013fb37c
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.177 b/metadata/md5-cache/dev-libs/elfutils-0.177
index ac875a3f7c58..e76a4a9740c3 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.177
+++ b/metadata/md5-cache/dev-libs/elfutils-0.177
@@ -1,5 +1,6 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf nls? ( sys-devel/gettext ) >=sys-devel/flex-2.5.4a sys-devel/m4
+DEPEND=>=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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf
 DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for libelf)
 EAPI=7
 HOMEPAGE=http://elfutils.org/
@@ -10,4 +11,4 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.177/elfutils-0.177.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2ba769a1758fd028776168c1f9ec9fb0
+_md5_=f4b87540beb8d2ffba4e8be1af9c9389
diff --git a/metadata/md5-cache/dev-libs/foma-0.9.18 b/metadata/md5-cache/dev-libs/foma-0.9.18
new file mode 100644
index 000000000000..757207e45ecb
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/foma-0.9.18
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/readline:* sys-libs/zlib
+DESCRIPTION=A set of utilities for constructing finite-state automata and transducers
+EAPI=7
+HOMEPAGE=https://github.com/mhulden/foma
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/readline:* sys-libs/zlib
+SLOT=0
+SRC_URI=https://bitbucket.org/mhulden/foma/downloads/foma-0.9.18.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b3d813f36e047325996a570b982f3ba8
diff --git a/metadata/md5-cache/dev-libs/girara-0.3.3 b/metadata/md5-cache/dev-libs/girara-0.3.3
new file mode 100644
index 000000000000..8cae84293f03
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/girara-0.3.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/glib:2 dev-libs/json-c >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify ) doc? ( app-doc/doxygen ) test? ( dev-libs/check )
+DESCRIPTION=UI library that focuses on simplicity and minimalism
+EAPI=7
+HOMEPAGE=https://pwmt.org/projects/girara/
+IUSE=doc libnotify test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ZLIB
+RDEPEND=dev-libs/glib:2 dev-libs/json-c >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify )
+SLOT=0
+SRC_URI=https://github.com/pwmt/girara/archive/0.3.3.tar.gz -> girara-0.3.3.tar.gz
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=b2bd2314d91a13c7496e7c0a568b3f8c
diff --git a/metadata/md5-cache/dev-libs/girara-9999 b/metadata/md5-cache/dev-libs/girara-9999
index 4c518b988e1c..9c4d6fa060f9 100644
--- a/metadata/md5-cache/dev-libs/girara-9999
+++ b/metadata/md5-cache/dev-libs/girara-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-libs/json-c >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.14 libnotify? ( x11-libs/libnotify )
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=8f6aa51bbc5c6103abb0f4ccb50cc43e
+_md5_=b2bd2314d91a13c7496e7c0a568b3f8c
diff --git a/metadata/md5-cache/dev-libs/glib-2.60.6 b/metadata/md5-cache/dev-libs/glib-2.60.6
index 5d0614e93071..efff8fca13f0 100644
--- a/metadata/md5-cache/dev-libs/glib-2.60.6
+++ b/metadata/md5-cache/dev-libs/glib-2.60.6
@@ -5,11 +5,11 @@ DESCRIPTION=The GLib library of C routines
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr kernel_linux 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.60.6 >=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(-)?] >=dev-libs/libpcre-8.31: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(-)?,static-libs?] >=virtual/libffi-3.0.13-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(-)?] >=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(-)?] >=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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[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(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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/libelf:0= fam? ( >=virtual/fam-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(-)?] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.60/glib-2.60.6.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75714e1f7fc63a16b54414af590c8eee
+_md5_=4d629be85fd056040fd33fc981dc3d0b
diff --git a/metadata/md5-cache/dev-libs/gmp-6.1.2-r1 b/metadata/md5-cache/dev-libs/gmp-6.1.2-r1
index ba9c3eb13884..fdfea31b997e 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.1.2-r1
+++ b/metadata/md5-cache/dev-libs/gmp-6.1.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numb
 EAPI=6
 HOMEPAGE=https://gmplib.org/
 IUSE=+asm doc cxx static-libs 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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3+ GPL-2+ )
 SLOT=0/10.4
 SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.1.2/gmp-6.1.2.tar.xz mirror://gnu/gmp/gmp-6.1.2.tar.xz doc? ( https://gmplib.org/gmp-man-6.1.2.pdf )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b2168d050511bcdfcf6436304fc87fc7
+_md5_=37279984f1980dfff2fe5e2c3beccfc2
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2 b/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2
index 137cf0b2790b..cab209c910c6 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2
@@ -4,7 +4,7 @@ DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=cairo doctool test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 PDEPEND=cairo? ( x11-libs/cairo[glib] )
 RDEPEND=>=dev-libs/gobject-introspection-common-1.60.2 >=dev-libs/glib-2.58.0:2 doctool? ( dev-python/mako[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/markdown[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.60/gobject-introspection-1.60.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61c5cfcfbe411f4153d7d6705c6d8127
+_md5_=207724cb7d73c6de1323fb8d2c1cf5ac
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.60.2 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.60.2
index f357f7057cb3..5d379e96b340 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.60.2
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.60.2
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.60.2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.60/gobject-introspection-1.60.2.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8147f2dd1edf4f3555c5c42825600585
+_md5_=002673524e364bf12545f6933f3fbcc8
diff --git a/metadata/md5-cache/dev-libs/isl-0.21 b/metadata/md5-cache/dev-libs/isl-0.21
index a88eaca8c11e..f5a8ae91e3cc 100644
--- a/metadata/md5-cache/dev-libs/isl-0.21
+++ b/metadata/md5-cache/dev-libs/isl-0.21
@@ -4,10 +4,10 @@ DESCRIPTION=A library for manipulating integer points bounded by linear constrai
 EAPI=6
 HOMEPAGE=http://isl.gforge.inria.fr/
 IUSE=static-libs 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 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-5.1.3-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(-)?]
 SLOT=0/21
 SRC_URI=http://isl.gforge.inria.fr/isl-0.21.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=84f79b1994cfd0906249923d6ecc7168
+_md5_=acddd452a8c8f89365cfaa296e1f6be9
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.4 b/metadata/md5-cache/dev-libs/ivykis-0.42.4
index 87988d23b4eb..ae081ca32c5b 100644
--- a/metadata/md5-cache/dev-libs/ivykis-0.42.4
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.4
@@ -4,9 +4,9 @@ DESCRIPTION=Library for asynchronous I/O readiness notification
 EAPI=7
 HOMEPAGE=https://github.com/buytenh/ivykis
 IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.4.tar.gz -> ivykis-0.42.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7d6b5c362e5822753cad6861f36fc8c0
+_md5_=931ca6961e6cbae0111fd6ef86142f0b
diff --git a/metadata/md5-cache/dev-libs/kpathsea-6.2.2_p20160523 b/metadata/md5-cache/dev-libs/kpathsea-6.2.2_p20160523
index 512ed1576b64..546c90749164 100644
--- a/metadata/md5-cache/dev-libs/kpathsea-6.2.2_p20160523
+++ b/metadata/md5-cache/dev-libs/kpathsea-6.2.2_p20160523
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<app-text/texlive-core-2013 !app-text/ptex
 SLOT=0/6.2.2
 SRC_URI=mirror://gentoo/texlive-20160523-source.tar.xz mirror://gentoo/kpathsea-texmf.d-8.tar.xz mirror://gentoo/texlive-module-kpathsea-2016.tar.xz doc? ( mirror://gentoo/texlive-module-kpathsea.doc-2016.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	9e2ec6f6212b1eed3c02777654057d2b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	9e2ec6f6212b1eed3c02777654057d2b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=04257b6c319a1659bda00a7c90369ae0
diff --git a/metadata/md5-cache/dev-libs/kpathsea-6.2.3_p20170524 b/metadata/md5-cache/dev-libs/kpathsea-6.2.3_p20170524
index 822752c7924b..da37a9b152a9 100644
--- a/metadata/md5-cache/dev-libs/kpathsea-6.2.3_p20170524
+++ b/metadata/md5-cache/dev-libs/kpathsea-6.2.3_p20170524
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<app-text/texlive-core-2013 !app-text/ptex
 SLOT=0/6.2.3
 SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/kpathsea-texmf.d-8.tar.xz mirror://gentoo/texlive-module-kpathsea-2017.tar.xz doc? ( mirror://gentoo/texlive-module-kpathsea.doc-2017.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	9e2ec6f6212b1eed3c02777654057d2b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	9e2ec6f6212b1eed3c02777654057d2b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=85d41be98a59c95247cacc9709239997
diff --git a/metadata/md5-cache/dev-libs/kpathsea-6.3.1_p20190410 b/metadata/md5-cache/dev-libs/kpathsea-6.3.1_p20190410
index 849d033f15d9..a468511ba33e 100644
--- a/metadata/md5-cache/dev-libs/kpathsea-6.3.1_p20190410
+++ b/metadata/md5-cache/dev-libs/kpathsea-6.3.1_p20190410
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=GPL-2
 SLOT=0/6.3.1
 SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz mirror://gentoo/kpathsea-texmf.d-9.tar.xz mirror://gentoo/texlive-module-kpathsea-2019.tar.xz doc? ( mirror://gentoo/texlive-module-kpathsea.doc-2019.tar.xz )
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	texlive-common	9e2ec6f6212b1eed3c02777654057d2b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	texlive-common	9e2ec6f6212b1eed3c02777654057d2b	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8cfd4739ebe12af70d7712f0b265f09d
diff --git a/metadata/md5-cache/dev-libs/legousbtower-0.5.4-r1 b/metadata/md5-cache/dev-libs/legousbtower-0.5.4-r1
index 4a20bc3726f9..abfb26108c52 100644
--- a/metadata/md5-cache/dev-libs/legousbtower-0.5.4-r1
+++ b/metadata/md5-cache/dev-libs/legousbtower-0.5.4-r1
@@ -4,8 +4,9 @@ DESCRIPTION=The lego mindstorms usb tower headers and/or modules
 EAPI=6
 HOMEPAGE=http://legousb.sourceforge.net/
 KEYWORDS=amd64 ppc x86
-LICENSE=MPL-1.0
+LICENSE=all-rights-reserved
+RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/legousb/legousbtower-0.5.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=e92a99341038a7857aace614775d1bae
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=4ffbee9a87b2e0edbb649962bf002e37
diff --git a/metadata/md5-cache/dev-libs/libatomic_ops-7.6.10 b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.10
index 0c39cfd2f4df..b2e673089b81 100644
--- a/metadata/md5-cache/dev-libs/libatomic_ops-7.6.10
+++ b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.10
@@ -3,9 +3,9 @@ DESCRIPTION=Implementation for atomic memory update operations
 EAPI=7
 HOMEPAGE=https://github.com/ivmai/libatomic_ops/
 IUSE=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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT boehm-gc GPL-2+
 SLOT=0
 SRC_URI=https://github.com/ivmai/libatomic_ops/releases/download/v7.6.10/libatomic_ops-7.6.10.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7c03995178285ce1533d777b44fed415
+_md5_=9931ee4bac7f2b6076960b4ad883f5a8
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1-r1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1-r1
deleted file mode 100644
index f48af1f40b00..000000000000
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.90-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/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(-)?] sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=an advanced CDDA reader with error correction
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libcdio/
-IUSE=+cxx static-libs test 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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3+ GPL-2+ LGPL-2.1
-RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.90-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/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(-)?]
-SLOT=0
-SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.90+1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=00707bfa62dbfb048a9625718685379a
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1
deleted file mode 100644
index 9d4c6fce233f..000000000000
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.93[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/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(-)?] sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=an advanced CDDA reader with error correction
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libcdio/
-IUSE=+cxx static-libs test 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 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3+ GPL-2+ LGPL-2.1
-RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.93[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/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(-)?]
-SLOT=0
-SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.93+1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3aedcce38efee79ce9727d8a9abf9415
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1
new file mode 100644
index 000000000000..2a939606c477
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.93[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/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(-)?] sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=an advanced CDDA reader with error correction
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libcdio/
+IUSE=+cxx static-libs test 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 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3+ GPL-2+ LGPL-2.1
+RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.93[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/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(-)?]
+SLOT=0
+SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.93+1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a8d7f09b84c9f32a15b960f0cfda88b6
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2
deleted file mode 100644
index f1224fcf2932..000000000000
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94: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(-)?] >=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(-)?] sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=an advanced CDDA reader with error correction
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libcdio/
-IUSE=+cxx static-libs test 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 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3+ GPL-2+ LGPL-2.1
-RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94: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(-)?] >=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(-)?]
-SLOT=0
-SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.94+2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=626e9afa94a10d5854cb85f340f32f9d
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r1
deleted file mode 100644
index 2e8dcbcc4fc8..000000000000
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94: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(-)?] >=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(-)?] sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=an advanced CDDA reader with error correction
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libcdio/
-IUSE=+cxx static-libs test 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3+ GPL-2+ LGPL-2.1
-RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94: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(-)?] >=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(-)?]
-SLOT=0/2
-SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.94+2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5c468a7805ffe6920e4eb250a3af17e
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r2 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r2
new file mode 100644
index 000000000000..5485006f1ad9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.94_p2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94: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(-)?] >=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(-)?] sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=an advanced CDDA reader with error correction
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libcdio/
+IUSE=+cxx static-libs test 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 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3+ GPL-2+ LGPL-2.1
+RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94: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(-)?] >=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(-)?]
+SLOT=0
+SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.94+2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=40859ccc4e0b5033c309c0fb1af3a552
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.0 b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.0
deleted file mode 100644
index b1653bd4a13f..000000000000
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install postinst postrm prepare test
-DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94: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(-)?] >=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(-)?]
-DESCRIPTION=an advanced CDDA reader with error correction
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/libcdio/
-IUSE=+cxx static-libs test 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3+ GPL-2+ LGPL-2.1
-RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94: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(-)?] >=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(-)?]
-SLOT=0/2
-SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+2.0.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b91e05454baa0fce72536fca0df8cc14
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.0-r1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.0-r1
new file mode 100644
index 000000000000..a22f1f1cfa2f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-2.0.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install postinst postrm prepare test
+DEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94: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(-)?] >=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(-)?]
+DESCRIPTION=an advanced CDDA reader with error correction
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libcdio/
+IUSE=+cxx static-libs test 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3+ GPL-2+ LGPL-2.1
+RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.94: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(-)?] >=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(-)?]
+SLOT=0/2
+SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+2.0.0.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=123285a329042f254519503a282e6492
diff --git a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20190313 b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20190313
index a01d8c7d0238..9f6f83f79a74 100644
--- a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20190313
+++ b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20190313
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://github.com/llvm-mirror/libclc/archive/45017385361603d6328997a2272d140e50786686.tar.gz -> libclc-0.2.0_pre20190313.tar.gz
-_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=32b806c5931d7bd4b0604621e8aa9278
diff --git a/metadata/md5-cache/dev-libs/libf2c-20110801-r4 b/metadata/md5-cache/dev-libs/libf2c-20110801-r4
deleted file mode 100644
index ae34ed804178..000000000000
--- a/metadata/md5-cache/dev-libs/libf2c-20110801-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=Library that converts FORTRAN to C source
-EAPI=5
-HOMEPAGE=http://www.netlib.org/f2c/
-IUSE=static-libs
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=HPND
-SLOT=0
-SRC_URI=http://www.netlib.org/f2c//libf2c.zip -> libf2c-20110801.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8c3c1861b3e4a67c96d5b639efcd207e
diff --git a/metadata/md5-cache/dev-libs/libf2c-20130927 b/metadata/md5-cache/dev-libs/libf2c-20130927
deleted file mode 100644
index de25c1b26510..000000000000
--- a/metadata/md5-cache/dev-libs/libf2c-20130927
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=Library that converts FORTRAN to C source
-EAPI=5
-HOMEPAGE=http://www.netlib.org/f2c/
-IUSE=static-libs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=HPND
-SLOT=0
-SRC_URI=http://www.netlib.org/f2c//libf2c.zip -> libf2c-20130927.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=124cdc189c87c46db1edb8f89bfa139c
diff --git a/metadata/md5-cache/dev-libs/libf2c-20130927-r1 b/metadata/md5-cache/dev-libs/libf2c-20130927-r1
index a39560dbf863..b01cb6dc0c2c 100644
--- a/metadata/md5-cache/dev-libs/libf2c-20130927-r1
+++ b/metadata/md5-cache/dev-libs/libf2c-20130927-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Library that converts FORTRAN to C source
 EAPI=7
 HOMEPAGE=http://www.netlib.org/f2c/
 IUSE=static-libs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=HPND
 SLOT=0
 SRC_URI=http://www.netlib.org/f2c/libf2c.zip -> libf2c-20130927.zip
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d6388722c060508a6899db1f001513f9
+_md5_=2965ba72674695e0ad7a62069bed6141
diff --git a/metadata/md5-cache/dev-libs/libgee-0.20.2 b/metadata/md5-cache/dev-libs/libgee-0.20.2
index 393ebf189e5f..a872cdfc224f 100644
--- a/metadata/md5-cache/dev-libs/libgee-0.20.2
+++ b/metadata/md5-cache/dev-libs/libgee-0.20.2
@@ -4,10 +4,10 @@ DESCRIPTION=GObject-based interfaces and classes for commonly used data structur
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgee
 IUSE=+introspection
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 SLOT=0.8/2
 SRC_URI=mirror://gnome/sources/libgee/0.20/libgee-0.20.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d43920d74d243198fa2d3a198f19d74f
+_md5_=2588b74d40dcc515c224aae751239dda
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.36 b/metadata/md5-cache/dev-libs/libgpg-error-1.36
index 09ed723ee610..b58d2d53a19a 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.36
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.36
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-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(-)?] )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.36.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=67de49c00c3e6a1d63bb3d8c4da95689
diff --git a/metadata/md5-cache/dev-libs/libgudev-233 b/metadata/md5-cache/dev-libs/libgudev-233
index 7c5cdf38b1e1..38c39924d3f6 100644
--- a/metadata/md5-cache/dev-libs/libgudev-233
+++ b/metadata/md5-cache/dev-libs/libgudev-233
@@ -4,11 +4,11 @@ DESCRIPTION=GObject bindings for libudev
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libgudev
 IUSE=introspection static-libs 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 ~mips ppc ppc64 s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38.0: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(-)?,static-libs?] >=virtual/libudev-199:=[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(-)?,static-libs?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) !sys-fs/eudev[gudev(-)] !sys-fs/udev[gudev(-)] !sys-apps/systemd[gudev(-)]
 RESTRICT=test
 SLOT=0/0
 SRC_URI=mirror://gnome/sources/libgudev/233/libgudev-233.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2821308de644bdbd2719d48f5403362f
+_md5_=9642a927b7104858ed3cc32b6ad768e1
diff --git a/metadata/md5-cache/dev-libs/libinput-1.13.4 b/metadata/md5-cache/dev-libs/libinput-1.13.4
index 5bd035a78f8c..d784aac03c25 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.13.4
+++ b/metadata/md5-cache/dev-libs/libinput-1.13.4
@@ -11,5 +11,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.13.4.tar.xz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=a52c284601391693240190ec73306f40
diff --git a/metadata/md5-cache/dev-libs/libinput-1.14.0 b/metadata/md5-cache/dev-libs/libinput-1.14.0
index fb33cbc35edc..59ecc7c83cd2 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.14.0
+++ b/metadata/md5-cache/dev-libs/libinput-1.14.0
@@ -11,5 +11,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.14.0.tar.xz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=9ddcaa01fb5d70ce3e95d68510702186
diff --git a/metadata/md5-cache/dev-libs/libinput-1.14.1 b/metadata/md5-cache/dev-libs/libinput-1.14.1
index d88bae20854f..a92a15fc58d2 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.14.1
+++ b/metadata/md5-cache/dev-libs/libinput-1.14.1
@@ -11,5 +11,5 @@ RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.14.1.tar.xz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=9ddcaa01fb5d70ce3e95d68510702186
diff --git a/metadata/md5-cache/dev-libs/libixion-0.13.0 b/metadata/md5-cache/dev-libs/libixion-0.13.0
deleted file mode 100644
index c03c9e925e13..000000000000
--- a/metadata/md5-cache/dev-libs/libixion-0.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/boost:= python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) =dev-util/mdds-1.3*:1=
-DESCRIPTION=General purpose formula parser & interpreter
-EAPI=6
-HOMEPAGE=https://gitlab.com/ixion/ixion
-IUSE=debug python static-libs +threads python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/boost:= python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0/0.13
-SRC_URI=https://kohei.us/files/ixion/src/libixion-0.13.0.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e0f20546c8a8698097d8278b77cb671c
diff --git a/metadata/md5-cache/dev-libs/libofx-0.9.14 b/metadata/md5-cache/dev-libs/libofx-0.9.14
deleted file mode 100644
index 8fabbc9c4daa..000000000000
--- a/metadata/md5-cache/dev-libs/libofx-0.9.14
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=>=net-misc/curl-7.9.7 virtual/libiconv >app-text/opensp-1.5 >=dev-cpp/libxmlpp-2.40.1:2.6 dev-util/gengetopt sys-apps/help2man virtual/pkgconfig test? ( app-crypt/gnupg )
-DESCRIPTION=A library to support the Open Financial eXchange XML format
-EAPI=7
-HOMEPAGE=https://github.com/libofx/libofx
-IUSE=static-libs test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-misc/curl-7.9.7 virtual/libiconv
-SLOT=0/7
-SRC_URI=https://github.com/libofx/libofx/archive/0.9.14.tar.gz -> libofx-0.9.14.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b044587d835ade5a614d3041bd659ef9
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.13.4 b/metadata/md5-cache/dev-libs/liborcus-0.13.4
deleted file mode 100644
index 5de325343d54..000000000000
--- a/metadata/md5-cache/dev-libs/liborcus-0.13.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/boost:= sys-libs/zlib python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( =dev-libs/libixion-0.13*:= ) =dev-util/mdds-1.3*:1
-DESCRIPTION=Standalone file import filter library for spreadsheet documents
-EAPI=6
-HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
-IUSE=python +spreadsheet-model static-libs tools python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/boost:= sys-libs/zlib python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( =dev-libs/libixion-0.13*:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0/0.13
-SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.13.4.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=50bd1a445a862c03b2ddafe2bbed639d
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.3.1 b/metadata/md5-cache/dev-libs/libqtxdg-3.3.1
index 7e48072f9b9d..6f9c09275b80 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.3.1
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.3.1
@@ -5,10 +5,10 @@ DESCRIPTION=A Qt implementation of XDG standards
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=test test
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/libqtxdg/3.3.1/libqtxdg-3.3.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ee349a5a653be40fef0a5eb232ac72aa
+_md5_=1d8db7296e46f8a32fe3e3af2e99e259
diff --git a/metadata/md5-cache/dev-libs/libratbag-0.9 b/metadata/md5-cache/dev-libs/libratbag-0.9
index beb883875de2..0f9dca9deec1 100644
--- a/metadata/md5-cache/dev-libs/libratbag-0.9
+++ b/metadata/md5-cache/dev-libs/libratbag-0.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevdev virtual/libudev
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.9.tar.gz -> libratbag-0.9.tar.gz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=44850f6152995a59cceb90d025aaa2c5
diff --git a/metadata/md5-cache/dev-libs/libsass-3.6.0 b/metadata/md5-cache/dev-libs/libsass-3.6.0
deleted file mode 100644
index b5238c809803..000000000000
--- a/metadata/md5-cache/dev-libs/libsass-3.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install prepare test
-DESCRIPTION=A C/C++ implementation of a Sass CSS compiler
-EAPI=7
-HOMEPAGE=https://github.com/sass/libsass
-IUSE=static-libs 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 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-SLOT=0/1
-SRC_URI=https://github.com/sass/libsass/archive/3.6.0.tar.gz -> libsass-3.6.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=dee64203a728fd5c11a68203367c402c
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.17 b/metadata/md5-cache/dev-libs/libsodium-1.0.17
deleted file mode 100644
index 38caadba1b30..000000000000
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.17
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install prepare test
-DESCRIPTION=A portable fork of NaCl, a higher-level cryptographic library
-EAPI=7
-HOMEPAGE=https://github.com/jedisct1/libsodium
-IUSE=+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
-LICENSE=ISC
-SLOT=0/23
-SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.17.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2aa211cb455b5d1aed74da21a168d7a7
diff --git a/metadata/md5-cache/dev-libs/libuv-1.32.0 b/metadata/md5-cache/dev-libs/libuv-1.32.0
new file mode 100644
index 000000000000..18fbea929271
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuv-1.32.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install prepare test
+DEPEND=sys-devel/libtool virtual/pkgconfig[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(-)?]
+DESCRIPTION=Cross-platform asychronous I/O
+EAPI=7
+HOMEPAGE=https://github.com/libuv/libuv
+IUSE=static-libs 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD BSD-2 ISC MIT
+RESTRICT=test
+SLOT=0/1
+SRC_URI=https://github.com/libuv/libuv/archive/v1.32.0.tar.gz -> libuv-1.32.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9b58b47cd560042d0fbce17a2e26ee70
diff --git a/metadata/md5-cache/dev-libs/libvoikko-4.2 b/metadata/md5-cache/dev-libs/libvoikko-4.2
new file mode 100644
index 000000000000..719298c31b44
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libvoikko-4.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] hfst? ( >=dev-util/hfstospell-0.5.0 )
+DESCRIPTION=Spell checking, hyphenation and morphological analysis tool for Finnish language
+EAPI=7
+HOMEPAGE=https://voikko.puimula.org/
+IUSE=+expvfst +hfst python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] hfst? ( >=dev-util/hfstospell-0.5.0 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.2.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=a04b1712bfe109d2dc32a07a1546c1d5
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.30 b/metadata/md5-cache/dev-libs/libwacom-0.30
index 3a293c38fe9d..f42389778c19 100644
--- a/metadata/md5-cache/dev-libs/libwacom-0.30
+++ b/metadata/md5-cache/dev-libs/libwacom-0.30
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2 virtual/libgudev:=
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/libwacom/archive/libwacom-0.30.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=27aaeb3025103c6134e32df9b69c819d
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.33 b/metadata/md5-cache/dev-libs/libwacom-0.33
index b40d1ab8bac7..dba26686fcfd 100644
--- a/metadata/md5-cache/dev-libs/libwacom-0.33
+++ b/metadata/md5-cache/dev-libs/libwacom-0.33
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2 virtual/libgudev:=
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-0.33/libwacom-0.33.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=4ed07f98341cd2b8d20b6333f18a4a3c
diff --git a/metadata/md5-cache/dev-libs/libwacom-1.0 b/metadata/md5-cache/dev-libs/libwacom-1.0
index bedc5bba98c8..614f6da760e2 100644
--- a/metadata/md5-cache/dev-libs/libwacom-1.0
+++ b/metadata/md5-cache/dev-libs/libwacom-1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/glib:2 virtual/libgudev:=
 SLOT=0
 SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.0/libwacom-1.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=d4a3b0bd28e830208cf3f5824eedfc78
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.9 b/metadata/md5-cache/dev-libs/libxml2-2.9.9
index cfebcec6217d..e331e1f62a2a 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.9
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.9
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.9.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=939af08848d4ce06794dfa212d90efbf
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.9-r1 b/metadata/md5-cache/dev-libs/libxml2-2.9.9-r1
index 03df056ebb16..7a70f5dab9aa 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.9-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.9-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.9.tar.gz https://dev.gentoo.org/~leio/distfiles/libxml2-2.9.9-patchset.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=55006daf502ccda0d8f0520c0ea2decf
diff --git a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r2 b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r2
deleted file mode 100644
index dff9ebb20c7b..000000000000
--- a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Library for locking devices
-EAPI=5
-HOMEPAGE=http://packages.debian.org/source/sid/lockdev
-IUSE=perl
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://debian/pool/main/l/lockdev/lockdev_1.0.3.orig.tar.gz mirror://debian/pool/main/l/lockdev/lockdev_1.0.3-1.2.diff.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=20574493cb02cb620bfe9c7c7dff981c
diff --git a/metadata/md5-cache/dev-libs/nspr-4.22 b/metadata/md5-cache/dev-libs/nspr-4.22
index e4c976468bc1..25fc0341c1fe 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.22
+++ b/metadata/md5-cache/dev-libs/nspr-4.22
@@ -4,9 +4,9 @@ DESCRIPTION=Netscape Portable Runtime
 EAPI=7
 HOMEPAGE=http://www.mozilla.org/projects/nspr/
 IUSE=debug elibc_musl 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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.22/src/nspr-4.22.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0f8481694f6faf07406c72066e3b8a4f
+_md5_=ff39ab3efcba477d1b8b21b9e6926c72
diff --git a/metadata/md5-cache/dev-libs/nss-3.46 b/metadata/md5-cache/dev-libs/nss-3.46
index 0a04044c8070..21bd6ab01147 100644
--- a/metadata/md5-cache/dev-libs/nss-3.46
+++ b/metadata/md5-cache/dev-libs/nss-3.46
@@ -4,11 +4,11 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=7
 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
 IUSE=cacert +nss-pem utils 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.22[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-db/sqlite-3.8.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(-)?] >=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
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_46_RTM/src/nss-3.46.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6a6f2b948494614caf25f5d608e67761
+_md5_=5434fe58fb88c73ccbaafb6ebedb76e4
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.9.1 b/metadata/md5-cache/dev-libs/oniguruma-6.9.1
deleted file mode 100644
index 3ef11c863023..000000000000
--- a/metadata/md5-cache/dev-libs/oniguruma-6.9.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=Regular expression library for different character encodings
-EAPI=7
-HOMEPAGE=https://github.com/kkos/oniguruma
-IUSE=crnl-as-line-terminator static-libs 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 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=BSD-2
-SLOT=0/5
-SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.1/onig-6.9.1.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d9bad01e2f08ca7397a35a75ab25c22b
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.9.2 b/metadata/md5-cache/dev-libs/oniguruma-6.9.2
deleted file mode 100644
index 0178e6c6ae80..000000000000
--- a/metadata/md5-cache/dev-libs/oniguruma-6.9.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=Regular expression library for different character encodings
-EAPI=7
-HOMEPAGE=https://github.com/kkos/oniguruma
-IUSE=crnl-as-line-terminator static-libs 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 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=BSD-2
-SLOT=0/5
-SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.9.2/onig-6.9.2.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b282c1f6798dda4e001d96d5201c57eb
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r4 b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
index 43f5c5a4379d..96982b4540ac 100644
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r4
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 ) dev-libs/libltdl:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/opensc/openct/openct-0.6.20.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=e7d8541ec86635fa7312dcf6fa508a3b
diff --git a/metadata/md5-cache/dev-libs/openobex-1.7.2-r1 b/metadata/md5-cache/dev-libs/openobex-1.7.2-r1
index 9ef7c7effc77..fe8a8e4287aa 100644
--- a/metadata/md5-cache/dev-libs/openobex-1.7.2-r1
+++ b/metadata/md5-cache/dev-libs/openobex-1.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/openobex/1.7.2/openobex-1.7.2-Source.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e17d910158e8410b5b9e17d0e84e0acc
diff --git a/metadata/md5-cache/dev-libs/openobex-1.7.2-r2 b/metadata/md5-cache/dev-libs/openobex-1.7.2-r2
index 140121d782af..7f634d6ba5cd 100644
--- a/metadata/md5-cache/dev-libs/openobex-1.7.2-r2
+++ b/metadata/md5-cache/dev-libs/openobex-1.7.2-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bluetooth? ( net-wireless/bluez:= ) usb? ( virtual/libusb:= )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/openobex/1.7.2/openobex-1.7.2-Source.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d29c3771deed310e81edf612a76311d7
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2t b/metadata/md5-cache/dev-libs/openssl-1.0.2t
new file mode 100644
index 000000000000..480aa3d08ef5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2t
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,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? ( >=app-crypt/mit-krb5-1.11.4[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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(-)?] )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla 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 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,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? ( >=app-crypt/mit-krb5-1.11.4[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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=!bindist? ( bindist )
+SLOT=0
+SRC_URI=mirror://openssl/source/openssl-1.0.2t.tar.gz bindist? ( mirror://gentoo/openssl-1.0.2t-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2t-bindist-1.0.tar.xz ) !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ecdc847d63fc3c0ff9411ad1fd11a2d6
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.0l b/metadata/md5-cache/dev-libs/openssl-1.1.0l
new file mode 100644
index 000000000000..19a6646a3a4b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.0l
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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(-)?] )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla 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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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=!bindist? ( bindist )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.0l.tar.gz bindist? ( mirror://gentoo/openssl-1.1.0l-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.0l-bindist-1.0.tar.xz )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=df1223daff214b6510f1dba7b3eb0882
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1d b/metadata/md5-cache/dev-libs/openssl-1.1.1d
new file mode 100644
index 000000000000..44e457a15515
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1d
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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(-)?] )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla 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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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=!bindist? ( bindist )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.1d.tar.gz bindist? ( mirror://gentoo/openssl-1.1.1d-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.1d-bindist-1.0.tar.xz )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b81de9079e9a0c919812fc73e82b86a1
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-1.0.2t b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2t
new file mode 100644
index 000000000000..1d3d775334b1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-compat-1.0.2t
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,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? ( >=app-crypt/mit-krb5-1.11.4[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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/openssl-1.0.2*:0
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla 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 ~riscv ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=openssl
+RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,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? ( >=app-crypt/mit-krb5-1.11.4[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,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/openssl-1.0.2*:0
+RESTRICT=test
+SLOT=1.0.0
+SRC_URI=mirror://openssl/source/openssl-1.0.2t.tar.gz bindist? ( mirror://gentoo/openssl-1.0.2t-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2t-bindist-1.0.tar.xz ) !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz )
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=be29d0f3c807aad4dfd5c46b2af4601a
diff --git a/metadata/md5-cache/dev-libs/serdisplib-2.01 b/metadata/md5-cache/dev-libs/serdisplib-2.01
index b274e0bcd6ed..ddcf9100ced9 100644
--- a/metadata/md5-cache/dev-libs/serdisplib-2.01
+++ b/metadata/md5-cache/dev-libs/serdisplib-2.01
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gd[jpeg,png,tiff] lcd_devices_acoolsdcm? ( virtual/libusb:1=
 REQUIRED_USE=|| ( lcd_devices_acoolsdcm lcd_devices_ddusbt lcd_devices_directgfx lcd_devices_displaylink lcd_devices_framebuffer lcd_devices_glcd2usb lcd_devices_goldelox lcd_devices_i2c lcd_devices_ks0108 lcd_devices_l4m lcd_devices_lc7981 lcd_devices_lh155 lcd_devices_nokcol lcd_devices_pcd8544 lcd_devices_remote lcd_devices_rs232 lcd_devices_sed133x lcd_devices_sed153x lcd_devices_sed156x lcd_devices_ssdoled lcd_devices_stv8105 lcd_devices_t6963 )
 SLOT=0
 SRC_URI=mirror://sourceforge/serdisplib/serdisplib-2.01.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=16077575d1c651728acca8d33e5afc8a
diff --git a/metadata/md5-cache/dev-libs/serdisplib-2.01-r1 b/metadata/md5-cache/dev-libs/serdisplib-2.01-r1
index 582f24d31ce4..2920ef5ad905 100644
--- a/metadata/md5-cache/dev-libs/serdisplib-2.01-r1
+++ b/metadata/md5-cache/dev-libs/serdisplib-2.01-r1
@@ -11,5 +11,5 @@ RDEPEND=media-libs/gd[jpeg,png,tiff] lcd_devices_acoolsdcm? ( virtual/libusb:1=
 REQUIRED_USE=|| ( lcd_devices_acoolsdcm lcd_devices_ddusbt lcd_devices_directgfx lcd_devices_displaylink lcd_devices_framebuffer lcd_devices_glcd2usb lcd_devices_goldelox lcd_devices_i2c lcd_devices_ks0108 lcd_devices_l4m lcd_devices_lc7981 lcd_devices_lh155 lcd_devices_nokcol lcd_devices_pcd8544 lcd_devices_remote lcd_devices_rs232 lcd_devices_sed133x lcd_devices_sed153x lcd_devices_sed156x lcd_devices_ssdoled lcd_devices_stv8105 lcd_devices_t6963 ) lcd_devices_framebuffer? ( threads )
 SLOT=0
 SRC_URI=mirror://sourceforge/serdisplib/serdisplib-2.01.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=13e787a33020d051768e688fd5a94f3a
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.3.1 b/metadata/md5-cache/dev-libs/spdlog-1.3.1
index 5399f7558e3b..405479ea9c05 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.3.1
+++ b/metadata/md5-cache/dev-libs/spdlog-1.3.1
@@ -5,10 +5,10 @@ DESCRIPTION=Very fast, header only, C++ logging library
 EAPI=7
 HOMEPAGE=https://github.com/gabime/spdlog
 IUSE=test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=dev-libs/libfmt-5.0.0
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.3.1.tar.gz -> spdlog-1.3.1.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a6bb52be2bd0c1f013a81d56a5444be1
+_md5_=078e096a3ada504e114907e5b1d0883c
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.45.91 b/metadata/md5-cache/dev-libs/vala-common-0.45.91
deleted file mode 100644
index 27f7ae156f4a..000000000000
--- a/metadata/md5-cache/dev-libs/vala-common-0.45.91
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Build infrastructure for packages that use Vala
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=LGPL-2.1+
-SLOT=0
-SRC_URI=mirror://gnome/sources/vala/0.45/vala-0.45.91.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=7c082ee016416faa8e0120ec0219081d
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.46.0 b/metadata/md5-cache/dev-libs/vala-common-0.46.0
new file mode 100644
index 000000000000..98224bfd599c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/vala-common-0.46.0
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Build infrastructure for packages that use Vala
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnome/sources/vala/0.46/vala-0.46.0.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
+_md5_=7c082ee016416faa8e0120ec0219081d
diff --git a/metadata/md5-cache/dev-libs/voikko-fi-2.3 b/metadata/md5-cache/dev-libs/voikko-fi-2.3
new file mode 100644
index 000000000000..4e7dd9d7055b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/voikko-fi-2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install
+DEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/foma || ( ( dev-lang/python:3.7 >=dev-libs/libvoikko-4.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-libs/libvoikko-4.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-libs/libvoikko-4.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) )
+DESCRIPTION=Finnish dictionary for libvoikko based spell checkers (vvfst format)
+EAPI=7
+HOMEPAGE=https://voikko.puimula.org/
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/foma || ( ( dev-lang/python:3.7 >=dev-libs/libvoikko-4.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-libs/libvoikko-4.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-libs/libvoikko-4.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) )
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.3.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5ff4f53ccd784b55a4cf8a9e0c422e2f
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.1.4-r1 b/metadata/md5-cache/dev-libs/xerces-c-3.1.4-r1
deleted file mode 100644
index 4200558e95bd..000000000000
--- a/metadata/md5-cache/dev-libs/xerces-c-3.1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv doc? ( app-doc/doxygen ) test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=A validating XML parser written in a portable subset of C++
-EAPI=6
-HOMEPAGE=https://xerces.apache.org/xerces-c/
-IUSE=cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv
-SLOT=0
-SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.1.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=35dc416244886d87a23ac18f36f24184
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.2 b/metadata/md5-cache/dev-libs/xerces-c-3.2.2
deleted file mode 100644
index d9619e243acf..000000000000
--- a/metadata/md5-cache/dev-libs/xerces-c-3.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv doc? ( app-doc/doxygen ) test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A validating XML parser written in a portable subset of C++
-EAPI=6
-HOMEPAGE=https://xerces.apache.org/xerces-c/
-IUSE=cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv
-SLOT=0
-SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=01e15a5cd126c6980cd6cf85024af9ff
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1 b/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
index 9a063dad58c8..38b97035f19e 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
+++ b/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv
 SLOT=0
 SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08b1df9a17f50858807c7e9f248df0c8
diff --git a/metadata/md5-cache/dev-libs/xerces-c-9999 b/metadata/md5-cache/dev-libs/xerces-c-9999
index 16a83140686a..1d119798a867 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-9999
+++ b/metadata/md5-cache/dev-libs/xerces-c-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	76e4ab6ae9cda8407c34d0b9a086f81c	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	76e4ab6ae9cda8407c34d0b9a086f81c	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e36e9cb665fcdecb5dddd7314bf8c5d
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 7b2e8542c3b2..6524624d8b90 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.1.5 b/metadata/md5-cache/dev-lisp/asdf-3.1.5
index 68cabcb1b0b7..c3e1b2b780a2 100644
--- a/metadata/md5-cache/dev-lisp/asdf-3.1.5
+++ b/metadata/md5-cache/dev-lisp/asdf-3.1.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 PDEPEND=~dev-lisp/uiop-3.1.5
 SLOT=0/3.1.5
 SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=833e25a8c6fe6830c3f9433d227f690d
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.3.1 b/metadata/md5-cache/dev-lisp/asdf-3.3.1
index 1df9065705d2..3d2a4a85cc6b 100644
--- a/metadata/md5-cache/dev-lisp/asdf-3.3.1
+++ b/metadata/md5-cache/dev-lisp/asdf-3.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 PDEPEND=virtual/commonlisp ~dev-lisp/uiop-3.3.1 virtual/commonlisp
 SLOT=0/3.3.1
 SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.3.1.tar.gz
-_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a70320bef3947dc0da446b6eead58947
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.3.2 b/metadata/md5-cache/dev-lisp/asdf-3.3.2
index 470372456149..c5d24f42fe6a 100644
--- a/metadata/md5-cache/dev-lisp/asdf-3.3.2
+++ b/metadata/md5-cache/dev-lisp/asdf-3.3.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 PDEPEND=virtual/commonlisp ~dev-lisp/uiop-3.3.2 virtual/commonlisp
 SLOT=0/3.3.2
 SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.3.2.tar.gz
-_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fe93764c4c8f715206940d579450ac9d
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1 b/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1
index 175bd52aef7e..5294f40cd200 100644
--- a/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1
+++ b/metadata/md5-cache/dev-lisp/asdf-3.3.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 PDEPEND=virtual/commonlisp ~dev-lisp/uiop-3.3.2 virtual/commonlisp
 SLOT=0/3.3.2-r1
 SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.3.2.tar.gz
-_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0b5dbcfb281c3a853d1ba3fafdc82575
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 3237aa0c856d..d7cc5f2fbd0e 100644
--- a/metadata/md5-cache/dev-lua/Manifest.gz
+++ b/metadata/md5-cache/dev-lua/Manifest.gz
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r3 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r3
deleted file mode 100644
index 1f19a00e542e..000000000000
--- a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,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/pkgconfig-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(-)?]
-DESCRIPTION=Networking support library for the Lua language
-EAPI=5
-HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
-IUSE=debug 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 arm ~arm64 hppa ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,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
-SLOT=0
-SRC_URI=https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz -> luasocket-3.0_rc1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0567c9c5ac99fbe9ee25fb012b7be326
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index ad354d39607a..11de8b78d7ee 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.2 b/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.2
deleted file mode 100644
index 1bfaff47ba99..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-5.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-5.0.2:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-5.0.2:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
-SLOT=0/5.0.2
-SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc8fd02f97bcca5fd1498e04c50864ce
diff --git a/metadata/md5-cache/dev-perl/Alien-Build-1.790.0 b/metadata/md5-cache/dev-perl/Alien-Build-1.790.0
index ce11e68b9f9c..2c8fe6e68bda 100644
--- a/metadata/md5-cache/dev-perl/Alien-Build-1.790.0
+++ b/metadata/md5-cache/dev-perl/Alien-Build-1.790.0
@@ -4,10 +4,10 @@ DESCRIPTION=Build external dependencies for use in CPAN
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Alien-Build
 IUSE=test zip examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=zip? ( dev-perl/Archive-Zip ) >=dev-perl/Capture-Tiny-0.170.0 virtual/perl-ExtUtils-CBuilder >=virtual/perl-ExtUtils-MakeMaker-6.640.0 >=virtual/perl-ExtUtils-ParseXS-3.300.0 >=dev-perl/FFI-CheckLib-0.110.0 >=dev-perl/File-Which-1.100.0 dev-perl/File-chdir virtual/perl-JSON-PP virtual/perl-Module-Load >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Test-Simple-1.302.15 >=virtual/perl-Text-ParseWords-3.260.0 virtual/pkgconfig dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.79.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
-_md5_=647e409cab35a1b4d76d688a197d6ec5
+_md5_=af1ae5898d50937a0210d73b516438b1
diff --git a/metadata/md5-cache/dev-perl/Alien-Libxml2-0.90.0 b/metadata/md5-cache/dev-perl/Alien-Libxml2-0.90.0
index 2649d0346357..82d933120d73 100644
--- a/metadata/md5-cache/dev-perl/Alien-Libxml2-0.90.0
+++ b/metadata/md5-cache/dev-perl/Alien-Libxml2-0.90.0
@@ -4,10 +4,10 @@ DESCRIPTION=Install the C libxml2 library on your system
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Alien-Libxml2
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-Build-0.730.0 dev-libs/libxml2:2= dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
-_md5_=4c5a2805d39df42310b3fc3f0e0b1bfe
+_md5_=c1fbb2d6a596f43e7f7b8184bbb718be
diff --git a/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900 b/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
index a1696452cb33..78d77738a48d 100644
--- a/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
+++ b/metadata/md5-cache/dev-perl/Devel-Hide-0.0.900
@@ -4,10 +4,10 @@ DESCRIPTION=Forces the unavailability of specified Perl modules (for testing)
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Devel-Hide
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv ~s390 ~sh x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv ~s390 ~sh ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0009.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c84bcec7c747e9034c37e29f4f56c86
+_md5_=6ed89980375b4163cfec6c458207622f
diff --git a/metadata/md5-cache/dev-perl/Devel-SmallProf-2.20.0-r4 b/metadata/md5-cache/dev-perl/Devel-SmallProf-2.20.0-r4
index 2b171e3d135a..936363600610 100644
--- a/metadata/md5-cache/dev-perl/Devel-SmallProf-2.20.0-r4
+++ b/metadata/md5-cache/dev-perl/Devel-SmallProf-2.20.0-r4
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Per-line Perl profiler
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Devel-SmallProf
-KEYWORDS=amd64 ~sparc ~x86
+KEYWORDS=amd64 sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Devel-SmallProf-2.02.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
-_md5_=8e4c86ee69f678e14655c00581be9ec6
+_md5_=3b5762fa361c36b403cd14ed084d345d
diff --git a/metadata/md5-cache/dev-perl/FFI-CheckLib-0.250.0 b/metadata/md5-cache/dev-perl/FFI-CheckLib-0.250.0
index 5265e68fbdf0..59372ddd7da8 100644
--- a/metadata/md5-cache/dev-perl/FFI-CheckLib-0.250.0
+++ b/metadata/md5-cache/dev-perl/FFI-CheckLib-0.250.0
@@ -4,10 +4,10 @@ DESCRIPTION=Check that a library is available for FFI
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/FFI-CheckLib
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Module-Load dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.25.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
-_md5_=1165ccdbcc4ab60f3df21d3fcea77837
+_md5_=f7115c9774950281b43dd730e6013d0d
diff --git a/metadata/md5-cache/dev-perl/File-chdir-0.101.100 b/metadata/md5-cache/dev-perl/File-chdir-0.101.100
index af1ccd78524b..ed57312e1159 100644
--- a/metadata/md5-cache/dev-perl/File-chdir-0.101.100
+++ b/metadata/md5-cache/dev-perl/File-chdir-0.101.100
@@ -4,10 +4,10 @@ DESCRIPTION=An alternative to File::Spec and CWD
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/File-chdir
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~riscv ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-File-Spec-3.27 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1011.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
-_md5_=e6811312a83dbf98acb5599756234cc3
+_md5_=84976ef69ee73f4efc66d3cc9350a1b7
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index bed6067f102f..6f3f7bc5eb18 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4 b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
index 7a929a17fe25..52a306a6df55 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8f04b333ba9e68d8ab69bf7eafe60636
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5 b/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
index 346e2d84371a..bba1e7118503 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-perl/IO-Socket-SSL virtual/perl-Sys-Syslog ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e54bd22077e5b77496227de6715af6f
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1 b/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
index 683eadcf5dee..f2e766f29ddb 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/PortageXS-0.2.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dee26e709bd74987cedde1c67994bca5
diff --git a/metadata/md5-cache/dev-perl/XML-LibXML-2.20.100 b/metadata/md5-cache/dev-perl/XML-LibXML-2.20.100
index 79351d96f7c6..849b90090414 100644
--- a/metadata/md5-cache/dev-perl/XML-LibXML-2.20.100
+++ b/metadata/md5-cache/dev-perl/XML-LibXML-2.20.100
@@ -4,10 +4,10 @@ DESCRIPTION=Perl binding for libxml2
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/XML-LibXML
 IUSE=test minimal examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode >=virtual/perl-Exporter-5.570.0 virtual/perl-IO virtual/perl-Scalar-List-Utils >=dev-perl/XML-SAX-0.120.0 >=dev-libs/libxml2-2.6.21:2= dev-perl/XML-SAX-Base >=dev-perl/XML-NamespaceSupport-1.70.0 virtual/perl-XSLoader virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0201.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb
-_md5_=35cbd303d9ed86afec8bd83abfd3575f
+_md5_=2497503a6ae0f36cee1650b4118d9549
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index b387f3ae9f91..1fe1ad6d29b2 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/PyGithub-1.39 b/metadata/md5-cache/dev-python/PyGithub-1.39
deleted file mode 100644
index 00edbb01e97b..000000000000
--- a/metadata/md5-cache/dev-python/PyGithub-1.39
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python library to access the Github API v3
-EAPI=6
-HOMEPAGE=https://github.com/PyGithub/PyGithub/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3+
-RDEPEND=dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.39.tar.gz -> PyGithub-1.39.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b60cf3f724d6ab486b7dd4a236031186
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.43.7 b/metadata/md5-cache/dev-python/PyGithub-1.43.7
deleted file mode 100644
index 8255d3a43bc2..000000000000
--- a/metadata/md5-cache/dev-python/PyGithub-1.43.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/deprecated[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httpretty[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Python library to access the Github API v3
-EAPI=7
-HOMEPAGE=https://github.com/PyGithub/PyGithub/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3+
-RDEPEND=dev-python/deprecated[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.43.7.tar.gz -> PyGithub-1.43.7.gh.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f729192b8c72dcb842f62b00d7fa2e8d
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.43.8 b/metadata/md5-cache/dev-python/PyGithub-1.43.8
index 806c4be015a6..a5b4f8cc6a96 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.43.8
+++ b/metadata/md5-cache/dev-python/PyGithub-1.43.8
@@ -5,7 +5,7 @@ DESCRIPTION=Python library to access the Github API v3
 EAPI=7
 HOMEPAGE=https://github.com/PyGithub/PyGithub/
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/deprecated[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyjwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.43.8.tar.gz -> PyGithub-1.43.8.gh.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d6e5851c9d85b1067aa2aaa23c68c9df
+_md5_=f729192b8c72dcb842f62b00d7fa2e8d
diff --git a/metadata/md5-cache/dev-python/PySensors-0.0.3 b/metadata/md5-cache/dev-python/PySensors-0.0.3
index 84d2d5914fcc..9867b011e997 100644
--- a/metadata/md5-cache/dev-python/PySensors-0.0.3
+++ b/metadata/md5-cache/dev-python/PySensors-0.0.3
@@ -6,9 +6,9 @@ HOMEPAGE=https://pypi.org/project/PySensors/
 IUSE=python_targets_pypy python_targets_python2_7
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
-RDEPEND=>=sys-apps/lm_sensors-3 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
+RDEPEND=>=sys-apps/lm-sensors-3 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySensors/PySensors-0.0.3.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c3be4fedcdfae8f746fd52450588c20
+_md5_=9ec6cf2ed824f7a6811cf4e23cb240cf
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3 b/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3
deleted file mode 100644
index d1140c61854a..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-pylint[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/selenium[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Implements CORS support for aiohttp asyncio-powered asynchronous HTTP server
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/aiohttp-cors
-IUSE=test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.5.3.tar.gz -> aiohttp-cors-0.5.3.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54a109e9d9e75b9bfee63ce9496ccbe0
diff --git a/metadata/md5-cache/dev-python/aiorpcX-0.18.3 b/metadata/md5-cache/dev-python/aiorpcX-0.18.3
index d1f18028335b..54c67172b212 100644
--- a/metadata/md5-cache/dev-python/aiorpcX-0.18.3
+++ b/metadata/md5-cache/dev-python/aiorpcX-0.18.3
@@ -5,11 +5,11 @@ DESCRIPTION=Generic async RPC implementation, including JSON-RPC
 EAPI=7
 HOMEPAGE=https://pypi.org/project/aiorpcX/
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-17.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiorpcX/aiorpcX-0.18.3.tar.gz -> aiorpcX-0.18.3.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b11df0ee0d74d61b118cb3bb06ff0790
+_md5_=aabd3e970a4b2429372693d377479eeb
diff --git a/metadata/md5-cache/dev-python/certifi-2018.10.15 b/metadata/md5-cache/dev-python/certifi-2018.10.15
deleted file mode 100644
index 30ade81ad238..000000000000
--- a/metadata/md5-cache/dev-python/certifi-2018.10.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Python package for providing Mozilla's CA Bundle
-EAPI=7
-HOMEPAGE=http://certifi.io/ https://pypi.org/project/certifi
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MPL-2.0
-RDEPEND=app-misc/ca-certificates python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/c/certifi/certifi-2018.10.15.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7a1caf595dc24df114b58acf60e84ac7
diff --git a/metadata/md5-cache/dev-python/certifi-2018.11.29 b/metadata/md5-cache/dev-python/certifi-2018.11.29
deleted file mode 100644
index 95037de428d0..000000000000
--- a/metadata/md5-cache/dev-python/certifi-2018.11.29
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Python package for providing Mozilla's CA Bundle
-EAPI=7
-HOMEPAGE=http://certifi.io/ https://pypi.org/project/certifi
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MPL-2.0
-RDEPEND=app-misc/ca-certificates python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/c/certifi/certifi-2018.11.29.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e685e03f201b507297bca9953cde4bde
diff --git a/metadata/md5-cache/dev-python/certifi-2018.4.16 b/metadata/md5-cache/dev-python/certifi-2018.4.16
index d8dfe03b7fea..b55da147cede 100644
--- a/metadata/md5-cache/dev-python/certifi-2018.4.16
+++ b/metadata/md5-cache/dev-python/certifi-2018.4.16
@@ -10,5 +10,5 @@ RDEPEND=app-misc/ca-certificates python_targets_pypy? ( >=virtual/pypy-5:0= ) py
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2018.4.16.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=86c573ab7b991e7240613feb998d130f
diff --git a/metadata/md5-cache/dev-python/certifi-2018.8.24 b/metadata/md5-cache/dev-python/certifi-2018.8.24
deleted file mode 100644
index 50eeed02867a..000000000000
--- a/metadata/md5-cache/dev-python/certifi-2018.8.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Python package for providing Mozilla's CA Bundle
-EAPI=6
-HOMEPAGE=http://certifi.io/ https://pypi.org/project/certifi
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MPL-2.0
-RDEPEND=app-misc/ca-certificates python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/c/certifi/certifi-2018.8.24.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8603721443d713a794037c46ad7dc28
diff --git a/metadata/md5-cache/dev-python/certifi-2019.6.16 b/metadata/md5-cache/dev-python/certifi-2019.6.16
index 572046cce3c0..95b8f21b2ecf 100644
--- a/metadata/md5-cache/dev-python/certifi-2019.6.16
+++ b/metadata/md5-cache/dev-python/certifi-2019.6.16
@@ -5,11 +5,11 @@ DESCRIPTION=Python package for providing Mozilla's CA Bundle
 EAPI=7
 HOMEPAGE=http://certifi.io/ https://pypi.org/project/certifi
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MPL-2.0
 RDEPEND=app-misc/ca-certificates python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2019.6.16.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1e5f2734dc8b8e2eccecc91180fad5b1
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e73cbf6db3a60333971dcb028fa22ef0
diff --git a/metadata/md5-cache/dev-python/certifi-2019.9.11 b/metadata/md5-cache/dev-python/certifi-2019.9.11
new file mode 100644
index 000000000000..36bb2ff24af4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/certifi-2019.9.11
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Python package for providing Mozilla's CA Bundle
+EAPI=7
+HOMEPAGE=http://certifi.io/ https://pypi.org/project/certifi
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MPL-2.0
+RDEPEND=app-misc/ca-certificates python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/c/certifi/certifi-2019.9.11.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f51561adfe57af25ba3c4e9deed465d1
diff --git a/metadata/md5-cache/dev-python/clang-python-5.0.2 b/metadata/md5-cache/dev-python/clang-python-5.0.2
deleted file mode 100644
index ef20f486f21c..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-5.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install test unpack
-DEPEND=>=sys-devel/clang-5.0.2:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-DESCRIPTION=Python bindings for sys-devel/clang
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=UoI-NCSA
-RDEPEND=>=sys-devel/clang-5.0.2:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://releases.llvm.org/5.0.2/cfe-5.0.2.src.tar.xz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a23e3133baadf7e162c46101843a19ae
diff --git a/metadata/md5-cache/dev-python/cloudpickle-1.2.2 b/metadata/md5-cache/dev-python/cloudpickle-1.2.2
new file mode 100644
index 000000000000..74398488658c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cloudpickle-1.2.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Extended pickling support for Python objects
+EAPI=7
+HOMEPAGE=https://pypi.org/project/cloudpickle/
+IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-1.2.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=65ea987a7779fa6c9f20ae7d612d9c2d
diff --git a/metadata/md5-cache/dev-python/confuse-1.0.0 b/metadata/md5-cache/dev-python/confuse-1.0.0
new file mode 100644
index 000000000000..b04649b76aac
--- /dev/null
+++ b/metadata/md5-cache/dev-python/confuse-1.0.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx ) test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Confuse is a configuration library for Python that uses YAML
+EAPI=7
+HOMEPAGE=https://github.com/beetbox/confuse
+IUSE=doc test python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/beetbox/confuse/archive/v1.0.0.tar.gz -> confuse-1.0.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=11780954caf47d07b54f9f861d9fa2a8
diff --git a/metadata/md5-cache/dev-python/doit-0.23.0-r1 b/metadata/md5-cache/dev-python/doit-0.23.0-r1
deleted file mode 100644
index fca252cb3911..000000000000
--- a/metadata/md5-cache/dev-python/doit-0.23.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pyinotify[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Automation tool
-EAPI=5
-HOMEPAGE=http://python-doit.sourceforge.net/ https://pypi.org/project/doit/
-IUSE=test python_targets_pypy python_targets_python2_7
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-python/pyinotify[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/d/doit/doit-0.23.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b18886d232ffb5461178986ccde07128
diff --git a/metadata/md5-cache/dev-python/httpretty-0.9.6 b/metadata/md5-cache/dev-python/httpretty-0.9.6
index 8a329e925cc5..f762aa19ebfb 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.9.6
+++ b/metadata/md5-cache/dev-python/httpretty-0.9.6
@@ -5,7 +5,7 @@ DESCRIPTION=HTTP client mock for Python
 EAPI=7
 HOMEPAGE=https://github.com/gabrielfalcao/httpretty
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.9.6.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9392334aef9f665c1e2c3c19a84739b8
+_md5_=f1a02b64d5bb73eccc9f1e54ce177441
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-0.19 b/metadata/md5-cache/dev-python/importlib_metadata-0.19
deleted file mode 100644
index 83284bc3399c..000000000000
--- a/metadata/md5-cache/dev-python/importlib_metadata-0.19
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/zipp[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) doc? ( >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read metadata from Python packages
-EAPI=7
-HOMEPAGE=https://importlib-metadata.readthedocs.io/
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/zipp[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-0.19.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=02b5b5979d69368fe8ac9d5492425c23
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-0.20 b/metadata/md5-cache/dev-python/importlib_metadata-0.20
deleted file mode 100644
index 8a99a5d254ae..000000000000
--- a/metadata/md5-cache/dev-python/importlib_metadata-0.20
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/zipp[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) doc? ( >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read metadata from Python packages
-EAPI=7
-HOMEPAGE=https://importlib-metadata.readthedocs.io/
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/zipp[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-0.20.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=02b5b5979d69368fe8ac9d5492425c23
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-0.21 b/metadata/md5-cache/dev-python/importlib_metadata-0.21
new file mode 100644
index 000000000000..09b7057cccf4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_metadata-0.21
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/zipp[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/packaging[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read metadata from Python packages
+EAPI=7
+HOMEPAGE=https://importlib-metadata.readthedocs.io/
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/zipp[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-0.21.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=bb8d95f809747c1020fd9b9eceb3b50b
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-0.22 b/metadata/md5-cache/dev-python/importlib_metadata-0.22
new file mode 100644
index 000000000000..c7346e4963a3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/importlib_metadata-0.22
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/zipp[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/importlib_resources[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/packaging[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Read metadata from Python packages
+EAPI=7
+HOMEPAGE=https://importlib-metadata.readthedocs.io/
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/zipp[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-0.22.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=bb8d95f809747c1020fd9b9eceb3b50b
diff --git a/metadata/md5-cache/dev-python/larch-1.20131130 b/metadata/md5-cache/dev-python/larch-1.20131130
deleted file mode 100644
index 04645d860e38..000000000000
--- a/metadata/md5-cache/dev-python/larch-1.20131130
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/coverage-test-runner dev-util/cmdtest ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Copy-on-write B-tree data structure
-EAPI=5
-HOMEPAGE=http://liw.fi/larch/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/cliapp dev-python/tracing dev-python/ttystatus python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20131130.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9178e655fc8eb6616c2959db202bc917
diff --git a/metadata/md5-cache/dev-python/libtmux-0.8.1 b/metadata/md5-cache/dev-python/libtmux-0.8.1
deleted file mode 100644
index 258e972e2787..000000000000
--- a/metadata/md5-cache/dev-python/libtmux-0.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools[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(-)] 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(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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(-)] test? ( >=dev-python/pytest-4.3.1[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(-)] dev-python/hypothesis[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(-)] )
-DESCRIPTION=python api for tmux
-EAPI=7
-HOMEPAGE=https://libtmux.git-pull.com/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=app-misc/tmux 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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/l/libtmux/libtmux-0.8.1.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=de21a7e977ef502b1a9dc032c384a27a
diff --git a/metadata/md5-cache/dev-python/libtmux-0.8.2 b/metadata/md5-cache/dev-python/libtmux-0.8.2
new file mode 100644
index 000000000000..55a89293895c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libtmux-0.8.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[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(-)] 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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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(-)] test? ( >=dev-python/pytest-4.5.0[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(-)] dev-python/hypothesis[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(-)] )
+DESCRIPTION=python api for tmux
+EAPI=7
+HOMEPAGE=https://libtmux.git-pull.com/
+IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-misc/tmux 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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/l/libtmux/libtmux-0.8.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=bd02019e9d4b90698f9029962d918d60
diff --git a/metadata/md5-cache/dev-python/lit-5.0.2 b/metadata/md5-cache/dev-python/lit-5.0.2
deleted file mode 100644
index 6480f5ea7239..000000000000
--- a/metadata/md5-cache/dev-python/lit-5.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/llvm ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A stand-alone install of the LLVM suite testing tool
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd
-LICENSE=UoI-NCSA
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=258182a23e3b9debf1dfdcfff0ae4390
diff --git a/metadata/md5-cache/dev-python/lit-8.0.1 b/metadata/md5-cache/dev-python/lit-8.0.1
index 220de7ab8839..557b03e589fc 100644
--- a/metadata/md5-cache/dev-python/lit-8.0.1
+++ b/metadata/md5-cache/dev-python/lit-8.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd
 LICENSE=UoI-NCSA
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a39e9736b075ca3a1457dbf369ee250
+_md5_=d18d8c113575a5eef55a9249457e742f
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.22.0 b/metadata/md5-cache/dev-python/llvmlite-0.22.0
deleted file mode 100644
index 0c5263942de6..000000000000
--- a/metadata/md5-cache/dev-python/llvmlite-0.22.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/llvm:5 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python wrapper around the llvm C++ library
-EAPI=6
-HOMEPAGE=http://llvmlite.pydata.org/
-IUSE=examples python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/llvm:5 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/numba/llvmlite/archive/v0.22.0.tar.gz -> llvmlite-0.22.0.gh.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de6bbc5a8a18c63a0c97bf95ba78c93e
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.29.0 b/metadata/md5-cache/dev-python/llvmlite-0.29.0
index dd2dd38e2d86..8bce6c0aeb0a 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.29.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.29.0
@@ -5,11 +5,11 @@ DESCRIPTION=Python wrapper around the llvm C++ library
 EAPI=7
 HOMEPAGE=http://llvmlite.pydata.org/
 IUSE=examples python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-devel/llvm:8 sys-libs/zlib:0= virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.29.0.tar.gz -> llvmlite-0.29.0.gh.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c74eca4e78e6086e4e93b19f09cb9b6a
+_md5_=4f93879ced103386cf4144c67e9722e2
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1 b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
index 45751b8bb3b7..c0f8ddea6f7d 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_5(
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efd46bbe84238eaf82fa89eaf26d9897
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.4 b/metadata/md5-cache/dev-python/matplotlib-2.2.4
index fb638d32bb80..9069b5b1a62e 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.4
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_5(
 REQUIRED_USE=gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93200491416bfaf18dfb57136db74697
diff --git a/metadata/md5-cache/dev-python/mediafile-0.2.0 b/metadata/md5-cache/dev-python/mediafile-0.2.0
new file mode 100644
index 000000000000..099056333e51
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mediafile-0.2.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx ) test? ( dev-python/nose[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/six-1.9.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=media-libs/mutagen-1.33.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Read and write audio files' tags in Python
+EAPI=7
+HOMEPAGE=https://github.com/beetbox/mediafile
+IUSE=doc test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=media-libs/mutagen-1.33.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/beetbox/mediafile/archive/v0.2.0.tar.gz -> mediafile-0.2.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=730a8e51326b26befa4bdab1fa80fdaf
diff --git a/metadata/md5-cache/dev-python/mkdocs-0.17.4 b/metadata/md5-cache/dev-python/mkdocs-0.17.4
deleted file mode 100644
index 742da8ed3f05..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-0.17.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Project documentation with Markdown.
-EAPI=6
-HOMEPAGE=https://www.mkdocs.org
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-3.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/livereload-2.5.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/markdown-2.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mkdocs-bootstrap-0.1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mkdocs-bootswatch-0.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=www-servers/tornado-4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/tomchristie/mkdocs/archive/0.17.4.tar.gz -> mkdocs-0.17.4.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aed1c1cd783b5385e24f4c3ddfa6f69c
diff --git a/metadata/md5-cache/dev-python/monotonic-1.3 b/metadata/md5-cache/dev-python/monotonic-1.3
deleted file mode 100644
index 109d44f5e094..000000000000
--- a/metadata/md5-cache/dev-python/monotonic-1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=An implementation of time.monotonic() for Python 2 & < 3.3
-EAPI=5
-HOMEPAGE=https://github.com/atdt/monotonic
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/m/monotonic/monotonic-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e69d32876cfc9136fccff2b5cd37644
diff --git a/metadata/md5-cache/dev-python/opt-einsum-3.0.1 b/metadata/md5-cache/dev-python/opt-einsum-3.0.1
new file mode 100644
index 000000000000..cd9bf05c17db
--- /dev/null
+++ b/metadata/md5-cache/dev-python/opt-einsum-3.0.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Optimized Einsum: A tensor contraction order optimizer
+EAPI=7
+HOMEPAGE=https://pypi.org/project/opt-einsum/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/o/opt-einsum/opt_einsum-3.0.1.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=63d7b2559b628043586f292fc9a2f66e
diff --git a/metadata/md5-cache/dev-python/polib-1.1.0 b/metadata/md5-cache/dev-python/polib-1.1.0
deleted file mode 100644
index e432a72a0393..000000000000
--- a/metadata/md5-cache/dev-python/polib-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A library to manipulate gettext files (.po and .mo files)
-EAPI=6
-HOMEPAGE=https://bitbucket.org/izi/polib/wiki/Home
-IUSE=doc python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/polib/polib-1.1.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e20da3958faf6c546aafd959663c2fb3
diff --git a/metadata/md5-cache/dev-python/pynacl-1.1.2 b/metadata/md5-cache/dev-python/pynacl-1.1.2
deleted file mode 100644
index 9db3783e1307..000000000000
--- a/metadata/md5-cache/dev-python/pynacl-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/18 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-2.6.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python binding to the Networking and Cryptography (NaCl) library
-EAPI=6
-HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/18 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/pyca/pynacl/archive/1.1.2.tar.gz -> pynacl-1.1.2.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd545ebba29dca42b1db56aa3b23c44f
diff --git a/metadata/md5-cache/dev-python/pynacl-1.2.0 b/metadata/md5-cache/dev-python/pynacl-1.2.0
deleted file mode 100644
index 9c5d07b6ba45..000000000000
--- a/metadata/md5-cache/dev-python/pynacl-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/23 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-2.6.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python binding to the Networking and Cryptography (NaCl) library
-EAPI=6
-HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.org/project/PyNaCl/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/pyca/pynacl/archive/1.2.0.tar.gz -> pynacl-1.2.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=658a80a81866c1ed2b68abca0511f131
diff --git a/metadata/md5-cache/dev-python/python-gammu-2.5 b/metadata/md5-cache/dev-python/python-gammu-2.5
deleted file mode 100644
index 568cecdbd5d9..000000000000
--- a/metadata/md5-cache/dev-python/python-gammu-2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-mobilephone/gammu-1.34.0 virtual/pkgconfig test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) app-mobilephone/gammu[dbi] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python bindings for Gammu
-EAPI=5
-HOMEPAGE=https://wammu.eu/python-gammu/
-IUSE=examples test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-mobilephone/gammu-1.34.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-gammu/python-gammu-2.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3111cbb3d756c8b8e219743da38946fd
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.08-r1 b/metadata/md5-cache/dev-python/python-lzo-1.08-r1
index da5d10c0c8c4..4276e3a35f5f 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.08-r1
+++ b/metadata/md5-cache/dev-python/python-lzo-1.08-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://www.oberhumer.com/opensource/lzo/download/LZO-v1/python-lzo-1.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5c538401cc7374aeb40e550c3e88857
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.11 b/metadata/md5-cache/dev-python/python-lzo-1.11
index 814ed21e2e14..7422dda8d0be 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.11
+++ b/metadata/md5-cache/dev-python/python-lzo-1.11
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lzo/python-lzo-1.11.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=108cec0bbf3433fcd4d2d4f1e538e6d0
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.12 b/metadata/md5-cache/dev-python/python-lzo-1.12
index 579b014c21e3..9eb17ee3ad93 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.12
+++ b/metadata/md5-cache/dev-python/python-lzo-1.12
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lzo/python-lzo-1.12.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8c323aa17dee71728ba325d4d1a63c7
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.12-r1 b/metadata/md5-cache/dev-python/python-lzo-1.12-r1
index e1201b4ba76c..f96626bc93b7 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.12-r1
+++ b/metadata/md5-cache/dev-python/python-lzo-1.12-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lzo/python-lzo-1.12.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=4375575f359d9d1c912749cc905fbb41
diff --git a/metadata/md5-cache/dev-python/pyxenstore-9999 b/metadata/md5-cache/dev-python/pyxenstore-9999
index a7ab63e75568..24eb72f00d4a 100644
--- a/metadata/md5-cache/dev-python/pyxenstore-9999
+++ b/metadata/md5-cache/dev-python/pyxenstore-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=app-emulation/xen-tools python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=bzr	3f634cedcaaefcc3cb718af555283204	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bzr	f97eb9136cdd4b8cfccb3e033fd36db5	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=017d08b9e53d8791a81fddd7fe86470f
diff --git a/metadata/md5-cache/dev-python/reportlab-3.3.0-r2 b/metadata/md5-cache/dev-python/reportlab-3.3.0-r2
index caec2127a419..1a23af48928e 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.3.0-r2
+++ b/metadata/md5-cache/dev-python/reportlab-3.3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=<dev-python/pillow-6[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reportlab/reportlab-3.3.0.tar.gz http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=895433cb479f1285819aabe1202acde2
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5 b/metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5
new file mode 100644
index 000000000000..582961fbc833
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/sphinx-testing[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/recommonmark[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/docutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Decently styled search results for sphinx-doc projects
+EAPI=7
+HOMEPAGE=https://github.com/sphinx-contrib/sphinx-pretty-searchresults
+IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/docutils[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sphinx-contrib/sphinx-pretty-searchresults/archive/v0.3.5.tar.gz -> sphinxcontrib-pretty-searchresults-0.3.5.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0a44e6445956d8c115fc4bffd8f35bda
diff --git a/metadata/md5-cache/dev-python/sure-1.4.11 b/metadata/md5-cache/dev-python/sure-1.4.11
index 7d8146f727c9..59a8d814d64c 100644
--- a/metadata/md5-cache/dev-python/sure-1.4.11
+++ b/metadata/md5-cache/dev-python/sure-1.4.11
@@ -4,7 +4,7 @@ DESCRIPTION=idiomatic assertion toolkit with human-friendly failure messages
 EAPI=7
 HOMEPAGE=https://github.com/gabrielfalcao/sure
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nose-1.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sure/sure-1.4.11.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8a7ebcf81a84c5dbb9d84b6d1089fc42
+_md5_=4dee6def5dfd34da30b1362b8e81b0aa
diff --git a/metadata/md5-cache/dev-python/tvdb_api-2.0 b/metadata/md5-cache/dev-python/tvdb_api-2.0
new file mode 100644
index 000000000000..7ba56c2a071a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tvdb_api-2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python interface to thetvdb.com API
+EAPI=6
+HOMEPAGE=https://github.com/dbr/tvdb_api
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=dev-python/requests-cache[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/t/tvdb_api/tvdb_api-2.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1e5f3402e24937673cb73006232c40a1
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index ae307ccc2725..1b35e997a4ae 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/assistant-5.12.5 b/metadata/md5-cache/dev-qt/assistant-5.12.5
new file mode 100644
index 000000000000..b923afc67b9d
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/assistant-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qthelp-5.12.5 ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qtprintsupport-5.12.5 ~dev-qt/qtsql-5.12.5[sqlite] ~dev-qt/qtwidgets-5.12.5 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=webkit debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qthelp-5.12.5 ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qtprintsupport-5.12.5 ~dev-qt/qtsql-5.12.5[sqlite] ~dev-qt/qtwidgets-5.12.5 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=47bb728637bc29a26254c37b72f3ea39
diff --git a/metadata/md5-cache/dev-qt/designer-5.12.5 b/metadata/md5-cache/dev-qt/designer-5.12.5
new file mode 100644
index 000000000000..acad2f7a0a4b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/designer-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qtprintsupport-5.12.5 ~dev-qt/qtwidgets-5.12.5 ~dev-qt/qtxml-5.12.5 declarative? ( ~dev-qt/qtdeclarative-5.12.5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=declarative webkit debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qtprintsupport-5.12.5 ~dev-qt/qtwidgets-5.12.5 ~dev-qt/qtxml-5.12.5 declarative? ( ~dev-qt/qtdeclarative-5.12.5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=69f0efa708d28f8259b756cbdd94b089
diff --git a/metadata/md5-cache/dev-qt/linguist-5.12.5 b/metadata/md5-cache/dev-qt/linguist-5.12.5
new file mode 100644
index 000000000000..1fe778f43044
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/linguist-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/designer-5.12.5 ~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtprintsupport-5.12.5 ~dev-qt/qtwidgets-5.12.5 ~dev-qt/qtxml-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Graphical tool for translating Qt applications
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/designer-5.12.5 ~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtprintsupport-5.12.5 ~dev-qt/qtwidgets-5.12.5 ~dev-qt/qtxml-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=73aa936594975e5e7bbff6418628c8d1
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.12.5 b/metadata/md5-cache/dev-qt/linguist-tools-5.12.5
new file mode 100644
index 000000000000..32af3ebd56b6
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtxml-5.12.5 qml? ( ~dev-qt/qtdeclarative-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Tools for working with Qt translation data files
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtxml-5.12.5 qml? ( ~dev-qt/qtdeclarative-5.12.5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=ed6e7bc891d741e3d33e29c5cb583440
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.12.5 b/metadata/md5-cache/dev-qt/pixeltool-5.12.5
new file mode 100644
index 000000000000..ee4ed526bd71
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtwidgets-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Qt screen magnifier
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtwidgets-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=ecc659d4e1b2a64d37d661afb1c65272
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.12.5 b/metadata/md5-cache/dev-qt/qdbus-5.12.5
new file mode 100644
index 000000000000..60a59766a188
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdbus-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdbus-5.12.5 ~dev-qt/qtxml-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Interface to Qt applications communicating over D-Bus
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdbus-5.12.5 ~dev-qt/qtxml-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=76813490d4061e23a40d33b5b49b60ad
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.12.5 b/metadata/md5-cache/dev-qt/qdbusviewer-5.12.5
new file mode 100644
index 000000000000..784a5c4a34d1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdbus-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtwidgets-5.12.5 ~dev-qt/qtxml-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdbus-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtwidgets-5.12.5 ~dev-qt/qtxml-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fb4c5c18f36f4d7fcdcb4a5f541fd598
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.12.5 b/metadata/md5-cache/dev-qt/qdoc-5.12.5
new file mode 100644
index 000000000000..e7a5a113f695
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qdoc-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Qt documentation generator
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.12.5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=1a000ed797380b83e6ef3d43c511d69c
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.12.5_p201908230013 b/metadata/md5-cache/dev-qt/qt-docs-5.12.5_p201908230013
new file mode 100644
index 000000000000..ea1a28f34086
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.12.5_p201908230013
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/p7zip
+DEFINED_PHASES=install
+DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
+EAPI=7
+HOMEPAGE=https://doc.qt.io/
+IUSE=charts datavis +html networkauth +qch script virtualkeyboard webengine +sql +x11extras +declarative +svg +linguist +printsupport +imageformats +gui +webview +dbus +assistant +help +network +bluetooth +3d +xml +core +quickcontrols +qdoc +location +scxml +speech +webchannel +quickcontrols2 +graphicaleffects +concurrent +sensors +multimedia +websockets +serialport +xmlpatterns +wayland +serialbus +test +opengl +gamepad +positioning +designer +widgets
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=FDL-1.3
+REQUIRED_USE=|| ( html qch )
+SLOT=5
+SRC_URI=charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc.qtcharts/5.12.5-0-201908230013qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc.qtdatavis3d/5.12.5-0-201908230013qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc.qtnetworkauth/5.12.5-0-201908230013qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc.qtscript/5.12.5-0-201908230013qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc.qtscript/5.12.5-0-201908230013qtscripttools-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc.qtvirtualkeyboard/5.12.5-0-201908230013qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc.qtwebengine/5.12.5-0-201908230013qtwebengine-documentation.7z ) sql? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtsql-documentation.7z ) x11extras? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtx11extras-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtqml-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtqmltest-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtquick-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtquickdialogs-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtquickextras-documentation.7z ) svg? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtsvg-documentation.7z ) linguist? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtlinguist-documentation.7z ) printsupport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtprintsupport-documentation.7z ) imageformats? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtimageformats-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtgui-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtplatformheaders-documentation.7z ) webview? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtwebview-documentation.7z ) dbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtdbus-documentation.7z ) assistant? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtassistant-documentation.7z ) help? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qthelp-documentation.7z ) network? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtnetwork-documentation.7z ) bluetooth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtbluetooth-documentation.7z ) 3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qt3d-documentation.7z ) xml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtxml-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtcore-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qmake-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtdoc-documentation.7z ) quickcontrols? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtquickcontrols1-documentation.7z ) qdoc? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qdoc-documentation.7z ) location? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtlocation-documentation.7z ) scxml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtscxml-documentation.7z ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtspeech-documentation.7z ) webchannel? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtwebchannel-documentation.7z ) quickcontrols2? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtquickcontrols-documentation.7z ) graphicaleffects? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtgraphicaleffects-documentation.7z ) concurrent? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtconcurrent-documentation.7z ) sensors? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtsensors-documentation.7z ) multimedia? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtmultimedia-documentation.7z ) websockets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtwebsockets-documentation.7z ) serialport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtserialport-documentation.7z ) xmlpatterns? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtxmlpatterns-documentation.7z ) wayland? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtwaylandcompositor-documentation.7z ) serialbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtserialbus-documentation.7z ) test? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qttestlib-documentation.7z ) opengl? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtopengl-documentation.7z ) gamepad? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtgamepad-documentation.7z ) positioning? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtpositioning-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtdesigner-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtuitools-documentation.7z ) widgets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5125_src_doc_examples/qt.qt5.5125.doc/5.12.5-0-201908230013qtwidgets-documentation.7z )
+_md5_=e900af52a9a78308803da1a67e42a728
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.12.5 b/metadata/md5-cache/dev-qt/qt3d-5.12.5
new file mode 100644
index 000000000000..a61cfdb0ddef
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt3d-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtconcurrent-5.12.5 ~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtnetwork-5.12.5 >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-5.12.5 ) qml? ( ~dev-qt/qtdeclarative-5.12.5[gles2=] ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=3D rendering module for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=gamepad gles2 qml debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtconcurrent-5.12.5 ~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtnetwork-5.12.5 >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-5.12.5 ) qml? ( ~dev-qt/qtdeclarative-5.12.5[gles2=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qt3d-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=4cf26f810da3177cca8979597c41ff99
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.12.5 b/metadata/md5-cache/dev-qt/qtbluetooth-5.12.5
new file mode 100644
index 000000000000..00ed8eda15ab
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtconcurrent-5.12.5 ~dev-qt/qtcore-5.12.5 ~dev-qt/qtdbus-5.12.5 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.12.5 ) ~dev-qt/qtnetwork-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Bluetooth support library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtconcurrent-5.12.5 ~dev-qt/qtcore-5.12.5 ~dev-qt/qtdbus-5.12.5 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.12.5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtconnectivity-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=fea4563110e903cb8df80c079ec8c692
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.12.5 b/metadata/md5-cache/dev-qt/qtcharts-5.12.5
new file mode 100644
index 000000000000..31f6f679a7b6
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtwidgets-5.12.5 qml? ( ~dev-qt/qtdeclarative-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Chart component library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtwidgets-5.12.5 qml? ( ~dev-qt/qtdeclarative-5.12.5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtcharts-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=644db67f5db7abef31566f84d70ad837
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.12.5 b/metadata/md5-cache/dev-qt/qtconcurrent-5.12.5
new file mode 100644
index 000000000000..ecad4432deab
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=74b079b54635dc6cd8dd4fb5926e5f3d
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.12.5 b/metadata/md5-cache/dev-qt/qtcore-5.12.5
new file mode 100644
index 000000000000..96571d986339
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcore-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Cross-platform application development framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=icu systemd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=381af2eeb238cd7cc192d1bb3ef85619
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.12.5 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.12.5
new file mode 100644
index 000000000000..52b67bfcc249
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[gles2=] qml? ( ~dev-qt/qtdeclarative-5.12.5[gles2=] ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=3D data visualization library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 qml debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[gles2=] qml? ( ~dev-qt/qtdeclarative-5.12.5[gles2=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtdatavis3d-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=c7765b108cc05c1587a6aa6eb3276f22
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.12.5 b/metadata/md5-cache/dev-qt/qtdbus-5.12.5
new file mode 100644
index 000000000000..cf96717b3db1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 >=sys-apps/dbus-1.4.20 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=7c400047a603493ba1c3ad0d92f19063
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.12.5 b/metadata/md5-cache/dev-qt/qtdeclarative-5.12.5
new file mode 100644
index 000000000000..d821819bfdd1
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[gles2=] ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qttest-5.12.5 localstorage? ( ~dev-qt/qtsql-5.12.5 ) widgets? ( ~dev-qt/qtwidgets-5.12.5[gles2=] ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=The QML and Quick modules for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 +jit localstorage +widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[gles2=] ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qttest-5.12.5 localstorage? ( ~dev-qt/qtsql-5.12.5 ) widgets? ( ~dev-qt/qtwidgets-5.12.5[gles2=] ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtdeclarative-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=3797a5cf86334895f05dc8023dad6d1d
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.12.5 b/metadata/md5-cache/dev-qt/qtdiag-5.12.5
new file mode 100644
index 000000000000..2003f3808daa
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 network? ( ~dev-qt/qtnetwork-5.12.5[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=+network +widgets debug test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 network? ( ~dev-qt/qtnetwork-5.12.5[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.12.5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=f1a417db5f29359a8ad9b37141eca269
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.12.5 b/metadata/md5-cache/dev-qt/qtgamepad-5.12.5
new file mode 100644
index 000000000000..9bacac0b248f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgamepad-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[evdev?] evdev? ( virtual/libudev:= ) qml? ( ~dev-qt/qtdeclarative-5.12.5 ) sdl? ( media-libs/libsdl ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Qt module to support gamepad hardware
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=evdev qml sdl debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[evdev?] evdev? ( virtual/libudev:= ) qml? ( ~dev-qt/qtdeclarative-5.12.5 ) sdl? ( media-libs/libsdl ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtgamepad-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=a6625106dcae9f9e0672cd9caccfa087
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.5 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.5
new file mode 100644
index 000000000000..f73abcb8b52b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Set of QML types for adding visual effects to user interfaces
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtgraphicaleffects-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=1b60d56c836cb5bf1def8501390876c5
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.12.5 b/metadata/md5-cache/dev-qt/qtgui-5.12.5
new file mode 100644
index 000000000000..aa986c9553fd
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgui-5.12.5
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.12.5 dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= virtual/opengl dbus? ( ~dev-qt/qtdbus-5.12.5 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.12.5 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.12.5 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc wayland +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( ~dev-qt/qtwayland-5.12.5 )
+RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.12.5 dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= virtual/opengl dbus? ( ~dev-qt/qtdbus-5.12.5 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.12.5 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.12.5 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
+REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) xcb? ( gles2? ( egl ) )
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=aa3005a35e307df9bf5e3b02d03f4abf
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.12.5 b/metadata/md5-cache/dev-qt/qthelp-5.12.5
new file mode 100644
index 000000000000..ea14e155918d
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qthelp-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qtsql-5.12.5[sqlite] ~dev-qt/qtwidgets-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Qt5 module for integrating online documentation into applications
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qtsql-5.12.5[sqlite] ~dev-qt/qtwidgets-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=3e67292eb43da4e4c03b69a851ae439d
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.12.5 b/metadata/md5-cache/dev-qt/qtimageformats-5.12.5
new file mode 100644
index 000000000000..3e8194e4272d
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Additional format plugins for the Qt image I/O system
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=mng debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtimageformats-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=bf4977c17e0c0f9b0fc6d988dda6dfc6
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.12.5 b/metadata/md5-cache/dev-qt/qtlocation-5.12.5
new file mode 100644
index 000000000000..3783f762a621
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qtpositioning-5.12.5[qml] ~dev-qt/qtsql-5.12.5 sys-libs/zlib ~dev-qt/qtconcurrent-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Location (places, maps, navigation) library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qtpositioning-5.12.5[qml] ~dev-qt/qtsql-5.12.5 sys-libs/zlib dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtlocation-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=9b653887a8f537c6650e80a55bc2a64c
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.12.5 b/metadata/md5-cache/dev-qt/qtmultimedia-5.12.5
new file mode 100644
index 000000000000..65710f605c4a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[gles2=] ~dev-qt/qtnetwork-5.12.5 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio[glib] ) qml? ( ~dev-qt/qtdeclarative-5.12.5 gles2? ( ~dev-qt/qtgui-5.12.5[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.12.5 ~dev-qt/qtwidgets-5.12.5[gles2=] ) gstreamer? ( x11-base/xorg-proto ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[gles2=] ~dev-qt/qtnetwork-5.12.5 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio[glib] ) qml? ( ~dev-qt/qtdeclarative-5.12.5 gles2? ( ~dev-qt/qtgui-5.12.5[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.12.5 ~dev-qt/qtwidgets-5.12.5[gles2=] ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtmultimedia-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=48c40685408d01e4e1a350902d60b340
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.12.5 b/metadata/md5-cache/dev-qt/qtnetwork-5.12.5
new file mode 100644
index 000000000000..b45e336bcb1e
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.12.5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.12.5 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( dev-libs/openssl:0=[bindist=] ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Network abstraction library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=bindist connman libproxy networkmanager sctp +ssl debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.12.5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.12.5 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( dev-libs/openssl:0=[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=37ea45e84f8555639b01fc9cccc6791e
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.12.5 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.12.5
new file mode 100644
index 000000000000..6d1fd19c4d59
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtnetwork-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Network authorization library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtnetwork-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtnetworkauth-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=486cdf111ddafa1cff2e300044af8998
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.12.5 b/metadata/md5-cache/dev-qt/qtopengl-5.12.5
new file mode 100644
index 000000000000..43469db6a05b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[gles2=] ~dev-qt/qtwidgets-5.12.5[gles2=] virtual/opengl test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[gles2=] ~dev-qt/qtwidgets-5.12.5[gles2=] virtual/opengl dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=645d09acf17ed87815907452a0d74c73
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.12.5 b/metadata/md5-cache/dev-qt/qtpaths-5.12.5
new file mode 100644
index 000000000000..27ba8536fb05
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Command line client to QStandardPaths
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=19e275e55af7bc82d86241244e85d7b0
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.12.5 b/metadata/md5-cache/dev-qt/qtplugininfo-5.12.5
new file mode 100644
index 000000000000..df8ae41e4c12
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Qt5 plugin metadata dumper
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=53973b664ed2dba6fd257b72d16f8e9a
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.12.5 b/metadata/md5-cache/dev-qt/qtpositioning-5.12.5
new file mode 100644
index 000000000000..aaf15a5e60e3
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.12.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 geoclue? ( ~dev-qt/qtdbus-5.12.5 ) qml? ( ~dev-qt/qtdeclarative-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Physical position determination library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=geoclue +qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=geoclue? ( app-misc/geoclue:2.0 )
+RDEPEND=~dev-qt/qtcore-5.12.5 geoclue? ( ~dev-qt/qtdbus-5.12.5 ) qml? ( ~dev-qt/qtdeclarative-5.12.5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtlocation-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=35727c4d2f22aaad51cb1aa92e6e17a6
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.12.5 b/metadata/md5-cache/dev-qt/qtprintsupport-5.12.5
new file mode 100644
index 000000000000..412d58ee857c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[gles2=] ~dev-qt/qtwidgets-5.12.5[gles2=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Printing support library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=cups gles2 test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[gles2=] ~dev-qt/qtwidgets-5.12.5[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=0dbed694798a094ae6794aaac8d4f24d
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.5 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.5
new file mode 100644
index 000000000000..93540e24c27c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 widgets? ( ~dev-qt/qtwidgets-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Set of Qt Quick controls to create complete user interfaces (deprecated)
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=+widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 widgets? ( ~dev-qt/qtwidgets-5.12.5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtquickcontrols-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=716ff016b393338f06b22b63a47cd7e4
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.5 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.5
new file mode 100644
index 000000000000..6a7b99d0f535
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 widgets? ( ~dev-qt/qtwidgets-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 widgets? ( ~dev-qt/qtwidgets-5.12.5 ) ~dev-qt/qtgraphicaleffects-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtquickcontrols2-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=48243200c7554f9d4d12ea11f0c8055f
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.12.5 b/metadata/md5-cache/dev-qt/qtscript-5.12.5
new file mode 100644
index 000000000000..cc5a0fef113b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtscript-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 scripttools? ( ~dev-qt/qtgui-5.12.5 ~dev-qt/qtwidgets-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=+jit scripttools debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 scripttools? ( ~dev-qt/qtgui-5.12.5 ~dev-qt/qtwidgets-5.12.5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtscript-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=66f78783b47e6f571caae49465b77db4
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.12.5 b/metadata/md5-cache/dev-qt/qtscxml-5.12.5
new file mode 100644
index 000000000000..cf7ed5c0e87a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtscxml-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=471f06216d168ebf43cb28c617d6d2ad
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.12.5 b/metadata/md5-cache/dev-qt/qtsensors-5.12.5
new file mode 100644
index 000000000000..a71afa2ce88c
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdbus-5.12.5 qml? ( ~dev-qt/qtdeclarative-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Hardware sensor access library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdbus-5.12.5 qml? ( ~dev-qt/qtdeclarative-5.12.5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtsensors-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=ab9ec668266f1fa69525fd1a2f78725e
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.12.5 b/metadata/md5-cache/dev-qt/qtserialbus-5.12.5
new file mode 100644
index 000000000000..bc6c9cc421e3
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qtserialport-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Qt module to access CAN, ModBus, and other industrial serial buses and protocols
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qtserialport-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtserialbus-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=bc5c9141db85156750c2b961033e7f93
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.12.5 b/metadata/md5-cache/dev-qt/qtserialport-5.12.5
new file mode 100644
index 000000000000..33e0c22683f9
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 virtual/libudev:= test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Serial port abstraction library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 virtual/libudev:= dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtserialport-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=d2b3da30a6372e379b7adb4795982b3e
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.12.5 b/metadata/md5-cache/dev-qt/qtspeech-5.12.5
new file mode 100644
index 000000000000..8c589975bf91
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Text-to-speech library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtspeech-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=aa89e9444bb33fc8c5b2bf08c2db18ff
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.12.5 b/metadata/md5-cache/dev-qt/qtsql-5.12.5
new file mode 100644
index 000000000000..7583f3b37318
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsql-5.12.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=SQL abstraction library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) dev-qt/qtchooser
+REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
+RESTRICT=test
+SLOT=5/5.12.5
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=268a4bc08cc7f3b86fda81ab2a5cc084
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.12.5 b/metadata/md5-cache/dev-qt/qtsvg-5.12.5
new file mode 100644
index 000000000000..eca37d9cf25a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtwidgets-5.12.5 sys-libs/zlib:= test? ( ~dev-qt/qtxml-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=SVG rendering library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtwidgets-5.12.5 sys-libs/zlib:= dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtsvg-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=febbe10e25c19bd620fff165c38ab1a7
diff --git a/metadata/md5-cache/dev-qt/qttest-5.12.5 b/metadata/md5-cache/dev-qt/qttest-5.12.5
new file mode 100644
index 000000000000..249b9a81cbbd
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttest-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 test? ( ~dev-qt/qtgui-5.12.5 ~dev-qt/qtxml-5.12.5 )
+DESCRIPTION=Unit testing library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=1c3cc0868bd42e0db1f41c8aea2c7a4e
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.12.5 b/metadata/md5-cache/dev-qt/qttranslations-5.12.5
new file mode 100644
index 000000000000..f59c60a31d20
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/linguist-tools-5.12.5 ~dev-qt/qtcore-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Translation files for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qttranslations-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=1369f7c47a073c1a658a558d98681f96
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.5 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.5
new file mode 100644
index 000000000000..f8dc21420b15
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtsvg-5.12.5 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Customizable input framework and virtual keyboard for Qt
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=handwriting +spell +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtsvg-5.12.5 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtvirtualkeyboard-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=4c478a5b018b2365e5815d3a0fef6af4
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.12.5 b/metadata/md5-cache/dev-qt/qtwayland-5.12.5
new file mode 100644
index 000000000000..ffe01aa4052a
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5[egl,libinput=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Wayland platform plugin for Qt
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=+libinput xcomposite debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5[egl,libinput=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtwayland-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=bc621300c91defa811578fff13b0d4f9
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.12.5 b/metadata/md5-cache/dev-qt/qtwebchannel-5.12.5
new file mode 100644
index 000000000000..be3ce8d7a093
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 qml? ( ~dev-qt/qtdeclarative-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 qml? ( ~dev-qt/qtdeclarative-5.12.5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtwebchannel-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=3a936c1f5ba11a93d949232fa1ea0fc7
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.12.5 b/metadata/md5-cache/dev-qt/qtwebengine-5.12.5
new file mode 100644
index 000000000000..e150706f8651
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.12.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qtpositioning-5.12.5 ~dev-qt/qtprintsupport-5.12.5 ~dev-qt/qtwebchannel-5.12.5[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.12.5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.12.5[widgets] ~dev-qt/qtwidgets-5.12.5 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=alsa bindist designer jumbo-build pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtnetwork-5.12.5 ~dev-qt/qtpositioning-5.12.5 ~dev-qt/qtprintsupport-5.12.5 ~dev-qt/qtwebchannel-5.12.5[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.12.5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.12.5[widgets] ~dev-qt/qtwidgets-5.12.5 ) dev-qt/qtchooser
+REQUIRED_USE=designer? ( widgets )
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtwebengine-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=61d772c15c7ca2b5b7ff8e7a3c689790
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20190629 b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20190629
new file mode 100644
index 000000000000..f3779716360b
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20190629
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.4 dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems dev-lang/perl dev-util/gperf >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5= media-libs/libpng:0= virtual/jpeg:0 geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[widgets] ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtopengl-5.9.1:5[gles2=] ) orientation? ( >=dev-qt/qtsensors-5.9.1:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.1:5 ) qml? ( >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtwebchannel-5.9.1:5[qml] ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender )
+DESCRIPTION=WebKit rendering library for the Qt5 framework (deprecated)
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD LGPL-2+
+RDEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5= media-libs/libpng:0= virtual/jpeg:0 geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[widgets] ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtopengl-5.9.1:5[gles2=] ) orientation? ( >=dev-qt/qtsensors-5.9.1:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.1:5 ) qml? ( >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtwebchannel-5.9.1:5[qml] ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender )
+REQUIRED_USE=nsplugin? ( X ) qml? ( opengl ) ?? ( gstreamer multimedia )
+SLOT=5/5.212
+SRC_URI=https://github.com/annulen/webkit/releases/download/qtwebkit-5.212.0-alpha3/qtwebkit-5.212.0-alpha3.tar.xz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=906f6020d19bad2438b12f12f20dee4e
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.12.5 b/metadata/md5-cache/dev-qt/qtwebsockets-5.12.5
new file mode 100644
index 000000000000..9783d21965df
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtnetwork-5.12.5[ssl=] qml? ( ~dev-qt/qtdeclarative-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=qml +ssl debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtnetwork-5.12.5[ssl=] qml? ( ~dev-qt/qtdeclarative-5.12.5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtwebsockets-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=1a1514c691289d0a69705c98e8392191
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.12.5 b/metadata/md5-cache/dev-qt/qtwebview-5.12.5
new file mode 100644
index 000000000000..2136e6b2e823
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtwebengine-5.12.5 test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Module for displaying web content in a QML application using the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtdeclarative-5.12.5 ~dev-qt/qtgui-5.12.5 ~dev-qt/qtwebengine-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtwebview-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=b410eb98b041aeb9f6cd17463121d4f8
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.12.5 b/metadata/md5-cache/dev-qt/qtwidgets-5.12.5
new file mode 100644
index 000000000000..642ec92c5add
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.12.5[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=gles2 gtk +png +xcb debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.12.5[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=835b8b8fee12b41efce8ffe8bcc28639
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.12.5 b/metadata/md5-cache/dev-qt/qtx11extras-5.12.5
new file mode 100644
index 000000000000..5c0609da3d63
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[xcb] test? ( ~dev-qt/qtwidgets-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtgui-5.12.5[xcb] dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtx11extras-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=3964e897b78c00cafb545b1a961e5467
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.12.5 b/metadata/md5-cache/dev-qt/qtxml-5.12.5
new file mode 100644
index 000000000000..56519fe454c5
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtxml-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 test? ( ~dev-qt/qtnetwork-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=4b442a578d6919d8224239d01f844c37
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.5 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.5
new file mode 100644
index 000000000000..0a1bb106ecdf
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtnetwork-5.12.5 qml? ( ~dev-qt/qtdeclarative-5.12.5 ) test? ( ~dev-qt/qttest-5.12.5 )
+DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=qml debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.12.5 ~dev-qt/qtnetwork-5.12.5 qml? ( ~dev-qt/qtdeclarative-5.12.5 ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.12
+SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/qtxmlpatterns-everywhere-src-5.12.5.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	32c6b92cbc940aea3252cc6d7ee6adde	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=761abf70a0ab6e1bdaeecdaf4af262df
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index b53c2b5fcfca..0f8a2c3ea3e8 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/actioncable-6.0.0 b/metadata/md5-cache/dev-ruby/actioncable-6.0.0
index 035886764e85..034451b5df5e 100644
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.0
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Integrated WebSockets for Rails
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0:*[ruby_targets_ruby25] dev-ruby/nio4r:2[ruby_targets_ruby25] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0:*[ruby_targets_ruby26] dev-ruby/nio4r:2[ruby_targets_ruby26] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4d67739e2f3c3a00c9651ae600ee9157
+_md5_=145ba499e86d39ce5764fc89f74a2998
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.0 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.0
index ff564238b60d..b2444a75e373 100644
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.0
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for designing email-service layers
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby25] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby25] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby25] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby26] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby26] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby26] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=20ccddd390c81309916e00b45cd82c56
+_md5_=9e08713f0339f3e071738f7f121d5e74
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.0 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.0
index 2847dee206e3..c0c71b48aae4 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.0
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Framework for designing email-service layers
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby25] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby25] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby25] =dev-ruby/mail-2*:*[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby26] ~dev-ruby/activejob-6.0.0[ruby_targets_ruby26] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26] =dev-ruby/mail-2*:*[ruby_targets_ruby26] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d19c00cdfef4543c239e599503598d13
+_md5_=942520d66f08e8099eac4fbf04573bf1
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.0 b/metadata/md5-cache/dev-ruby/actionpack-6.0.0
index 3cf8dc67e60e..7c9fc5b40c8e 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.0
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Eases web-request routing, handling, and response
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby25] dev-ruby/rack:2.0[ruby_targets_ruby25] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby25] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionview-6.0.0[ruby_targets_ruby26] dev-ruby/rack:2.0[ruby_targets_ruby26] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0e613e6fef31c9229c18494f7fc11725
+_md5_=9d9dc89e7cd9f0ac07b492edb42ccb6e
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.0 b/metadata/md5-cache/dev-ruby/actiontext-6.0.0
index 6bc73dc34ba7..829e356bdb5d 100644
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.0
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Edit and display rich text in Rails applications
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby25] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby25] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] ~dev-ruby/activerecord-6.0.0[ruby_targets_ruby26] ~dev-ruby/activestorage-6.0.0[ruby_targets_ruby26] ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=247fe676ac64d76a65330c5c4f99c8f5
+_md5_=b2e0cbe497e5eb1342d09914b644d975
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.0 b/metadata/md5-cache/dev-ruby/actionview-6.0.0
index 3509598a3df1..9c74fd5918a5 100644
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.0
+++ b/metadata/md5-cache/dev-ruby/actionview-6.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] >=dev-ruby/builder-3.1:*[ruby_targets_ruby25] =dev-ruby/builder-3*:*[ruby_targets_ruby25] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby25] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby25] dev-ruby/rails-dom-testing:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26] =dev-ruby/builder-3*:*[ruby_targets_ruby26] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4f4d42e480572318a26559db180b86f5
+_md5_=5e0c540fbd476fb33aa5b19d3349154f
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.0 b/metadata/md5-cache/dev-ruby/activejob-6.0.0
index e7bba987f873..98023e6e0969 100644
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.0
+++ b/metadata/md5-cache/dev-ruby/activejob-6.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Job framework with pluggable queues
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=65d93f2671bcb28c46ceca110232b9a6
+_md5_=a322eff40587aaff77782b78928d2dc4
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.0 b/metadata/md5-cache/dev-ruby/activemodel-6.0.0
index 7b0f94d10bca..c3b832bb7606 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.0
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Acti
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0:*[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=49996a5c47bdd747ec7de8cf23563a7d
+_md5_=44677c9c5b7930cdaeadb52fb54a90c5
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.0 b/metadata/md5-cache/dev-ruby/activerecord-6.0.0
index 153895b7d38e..6e03149092cb 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.0
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails/
 IUSE=mysql postgres sqlite test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby25] dev-ruby/arel:9.0[ruby_targets_ruby25] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby25] ) mysql? ( || ( dev-ruby/mysql2:0.5[ruby_targets_ruby25] >=dev-ruby/mysql2-0.4.4:0.4[ruby_targets_ruby25] ) ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby25] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby25] ) ) ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] ~dev-ruby/activemodel-6.0.0[ruby_targets_ruby26] dev-ruby/arel:9.0[ruby_targets_ruby26] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26] ) mysql? ( || ( dev-ruby/mysql2:0.5[ruby_targets_ruby26] >=dev-ruby/mysql2-0.4.4:0.4[ruby_targets_ruby26] ) ) postgres? ( || ( dev-ruby/pg:1[ruby_targets_ruby26] >=dev-ruby/pg-0.18.0:0[ruby_targets_ruby26] ) ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=51bf987ecf9b903ae4d3ed047e2b939b
+_md5_=db7764faab7653de4d77254cce9aedb4
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.0 b/metadata/md5-cache/dev-ruby/activestorage-6.0.0
index db986d8c4b86..c6c58a44414e 100644
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.0
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Attach cloud and local files in Rails applications
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/actionpack-6.0.0:*[ruby_targets_ruby25] ~dev-ruby/activerecord-6.0.0:*[ruby_targets_ruby25] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25] =dev-ruby/marcel-0.3*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.0:*[ruby_targets_ruby26] ~dev-ruby/activerecord-6.0.0:*[ruby_targets_ruby26] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby26] =dev-ruby/marcel-0.3*[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2bb30f8571aed9b29ba98aa4c5ec5675
+_md5_=f8c90b066594903f6611328b19cc45b5
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.0 b/metadata/md5-cache/dev-ruby/activesupport-6.0.0
index b8efd883c8c4..9b9b51758703 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.0
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby25] dev-ruby/i18n:1[ruby_targets_ruby25] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby25] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby25] >=dev-ruby/zeitwerk-2.1.8:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26] dev-ruby/i18n:1[ruby_targets_ruby26] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26] >=dev-ruby/zeitwerk-2.1.8:2[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=0153658cb97156f06f924cb1be02c602
+_md5_=0b1ede2fef378d8009e6964e6a8381a2
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.2.4 b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
index e3aff4ee19a5..72350b8d81bb 100644
--- a/metadata/md5-cache/dev-ruby/ed25519-1.2.4
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library for the Ed25519 public-key signature system
 EAPI=6
 HOMEPAGE=https://github.com/crypto-rb/ed25519
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ppc ppc64 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 )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/ed25519/archive/v1.2.4.tar.gz -> ed25519-1.2.4.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2e9e7aeacee55e183ca2df6f37d99bcf
+_md5_=fba72fa73247690deff61616644c7f57
diff --git a/metadata/md5-cache/dev-ruby/image_processing-1.9.3 b/metadata/md5-cache/dev-ruby/image_processing-1.9.3
index 79f6284a52d6..27d9f38308e4 100644
--- a/metadata/md5-cache/dev-ruby/image_processing-1.9.3
+++ b/metadata/md5-cache/dev-ruby/image_processing-1.9.3
@@ -5,11 +5,11 @@ DESCRIPTION=High-level image processing helper methods with libvips and ImageMag
 EAPI=7
 HOMEPAGE=https://github.com/janko/image_processing
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/mini_magick-4.9.5:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/mini_magick-4.9.5:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/mini_magick-4.9.5:0[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? ( 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 )
 SLOT=0
 SRC_URI=https://github.com/janko/image_processing/archive/v1.9.3.tar.gz -> image_processing-1.9.3.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=430c2f31a8baae600ef0239ca84b1969
+_md5_=d93c105d31dc477b60a184a5417565ef
diff --git a/metadata/md5-cache/dev-ruby/maxitest-2.8.0 b/metadata/md5-cache/dev-ruby/maxitest-2.8.0
deleted file mode 100644
index fac55f733a25..000000000000
--- a/metadata/md5-cache/dev-ruby/maxitest-2.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Minitest + all the features you always wanted
-EAPI=6
-HOMEPAGE=https://github.com/grosser/maxitest
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=1
-SRC_URI=https://github.com/grosser/maxitest/archive/v2.8.0.tar.gz -> maxitest-2.8.0.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=01fb4fc1e617fbdc95c4c1820c807fb0
diff --git a/metadata/md5-cache/dev-ruby/maxitest-3.0.1 b/metadata/md5-cache/dev-ruby/maxitest-3.0.1
deleted file mode 100644
index fc4aa09eb8d5..000000000000
--- a/metadata/md5-cache/dev-ruby/maxitest-3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Minitest + all the features you always wanted
-EAPI=6
-HOMEPAGE=https://github.com/grosser/maxitest
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=1
-SRC_URI=https://github.com/grosser/maxitest/archive/v3.0.1.tar.gz -> maxitest-3.0.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=bc62c7dc762278e8d291f59a7912d15a
diff --git a/metadata/md5-cache/dev-ruby/maxitest-3.2.0 b/metadata/md5-cache/dev-ruby/maxitest-3.2.0
index d7ae039d5896..204cdc9d600b 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-3.2.0
+++ b/metadata/md5-cache/dev-ruby/maxitest-3.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Minitest + all the features you always wanted
 EAPI=6
 HOMEPAGE=https://github.com/grosser/maxitest
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ruby_targets_ruby26? ( <dev-ruby/minitest-5.12:5[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? ( 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 )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v3.2.0.tar.gz -> maxitest-3.2.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d6b371480355c718f55dab8be5b85066
+_md5_=b6544ec0d82c656222c1baccd3fc0c59
diff --git a/metadata/md5-cache/dev-ruby/maxitest-3.3.0 b/metadata/md5-cache/dev-ruby/maxitest-3.3.0
new file mode 100644
index 000000000000..3770cd0d178c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/maxitest-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ruby_targets_ruby26? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[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/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/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[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] ) )
+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] )
+DESCRIPTION=Minitest + all the features you always wanted
+EAPI=7
+HOMEPAGE=https://github.com/grosser/maxitest
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ruby_targets_ruby26? ( <dev-ruby/minitest-5.12:5[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? ( 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 )
+SLOT=1
+SRC_URI=https://github.com/grosser/maxitest/archive/v3.3.0.tar.gz -> maxitest-3.3.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8558cb70ae5ce077b36d4b3d8d973a5f
diff --git a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.0 b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.0
index 60ad1bb6b490..81f81f3c8aab 100644
--- a/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.0
+++ b/metadata/md5-cache/dev-ruby/minitest-power_assert-0.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Power Assert for Minitest
 EAPI=6
 HOMEPAGE=https://github.com/hsbt/minitest-power_assert
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/minitest:*[ruby_targets_ruby24] >=dev-ruby/power_assert-1.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/minitest:*[ruby_targets_ruby25] >=dev-ruby/power_assert-1.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/minitest:*[ruby_targets_ruby26] >=dev-ruby/power_assert-1.1[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? ( 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 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-power_assert-0.3.0.gem
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=bfc029ce8523618938f3a3e067eea739
+_md5_=c54d79835342be4d8118236645a84355
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-5.0.2 b/metadata/md5-cache/dev-ruby/net-ssh-5.0.2
deleted file mode 100644
index e1d8d9f328ac..000000000000
--- a/metadata/md5-cache/dev-ruby/net-ssh-5.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby25] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby25] ) ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25] >=dev-ruby/mocha-0.13[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Non-interactive SSH processing in pure Ruby
-EAPI=6
-HOMEPAGE=https://github.com/net-ssh/net-ssh
-IUSE=ed25519 test test ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby25] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=5
-SRC_URI=https://github.com/net-ssh/net-ssh/archive/v5.0.2.tar.gz -> net-ssh-git-5.0.2.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3e8dc26ac6bb3afe9177f59fc15ed92f
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-5.1.0 b/metadata/md5-cache/dev-ruby/net-ssh-5.1.0
deleted file mode 100644
index 125bc728ec83..000000000000
--- a/metadata/md5-cache/dev-ruby/net-ssh-5.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby25] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby26] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby26] ) ) ) ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25] >=dev-ruby/mocha-0.13[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby26] >=dev-ruby/mocha-0.13[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] ) )
-DESCRIPTION=Non-interactive SSH processing in pure Ruby
-EAPI=6
-HOMEPAGE=https://github.com/net-ssh/net-ssh
-IUSE=ed25519 test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby25] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby26] dev-ruby/bcrypt_pbkdf[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? ( 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 )
-SLOT=5
-SRC_URI=https://github.com/net-ssh/net-ssh/archive/v5.1.0.tar.gz -> net-ssh-git-5.1.0.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=fb0442d7e6710c79009ccade951c3d27
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-5.2.0 b/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
index 1f446592342d..85760ec1acd2 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-5.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Non-interactive SSH processing in pure Ruby
 EAPI=6
 HOMEPAGE=https://github.com/net-ssh/net-ssh
 IUSE=ed25519 test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby25] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26] ed25519? ( dev-ruby/ed25519[ruby_targets_ruby26] dev-ruby/bcrypt_pbkdf[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? ( 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 )
 SLOT=5
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v5.2.0.tar.gz -> net-ssh-git-5.2.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=fb0442d7e6710c79009ccade951c3d27
+_md5_=86fd0de64f8167d1cb83edb3bd04345e
diff --git a/metadata/md5-cache/dev-ruby/parser-2.6.4.1 b/metadata/md5-cache/dev-ruby/parser-2.6.4.1
new file mode 100644
index 000000000000..ae5db20309aa
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/parser-2.6.4.1
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/racc[ruby_targets_ruby24] dev-ruby/cliver[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] dev-ruby/racc[ruby_targets_ruby25] dev-ruby/cliver[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26] dev-ruby/racc[ruby_targets_ruby26] dev-ruby/cliver[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[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/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[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] ) )
+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] )
+DESCRIPTION=A production-ready Ruby parser written in pure Ruby
+EAPI=7
+HOMEPAGE=https://github.com/whitequark/parser
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( =dev-ruby/ast-2.4*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://rubygems/parser-2.6.4.1.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b4648868880df051dde09327f3162cf7
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.0 b/metadata/md5-cache/dev-ruby/railties-6.0.0
index 69b1518592f6..5de5cc40042d 100644
--- a/metadata/md5-cache/dev-ruby/railties-6.0.0
+++ b/metadata/md5-cache/dev-ruby/railties-6.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Tools for creating, working with, and running Rails applications
 EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby25? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby25] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby25] >=dev-ruby/thor-0.20.3[ruby_targets_ruby25] >=dev-ruby/rake-0.8.7[ruby_targets_ruby25] dev-ruby/method_source[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.0[ruby_targets_ruby26] ~dev-ruby/actionpack-6.0.0[ruby_targets_ruby26] >=dev-ruby/thor-0.20.3[ruby_targets_ruby26] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26] dev-ruby/method_source[ruby_targets_ruby26] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.0.tar.gz -> rails-6.0.0.tgz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=bcba744dd6fa8da1885285720d5f2de8
+_md5_=3866529c5e0fe4a68620dd7f8095fd3f
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-7.1.0 b/metadata/md5-cache/dev-ruby/rbnacl-7.1.0
new file mode 100644
index 000000000000..97d09231e718
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbnacl-7.1.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ffi[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/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/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[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] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-libs/libsodium ) 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] )
+DESCRIPTION=Provides a high-level toolkit for building cryptographic systems and protocols
+EAPI=7
+HOMEPAGE=https://github.com/cryptosphere/rbnacl
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libsodium ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ffi[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? ( 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 )
+SLOT=6
+SRC_URI=mirror://rubygems/rbnacl-7.1.0.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=96e9384723f604a1939f7f2da41d4180
diff --git a/metadata/md5-cache/dev-ruby/rdoc-5.1.0-r1 b/metadata/md5-cache/dev-ruby/rdoc-5.1.0-r1
index 0f16959f3993..a190046439a4 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-5.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/rdoc-5.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
 EAPI=5
 HOMEPAGE=https://github.com/rdoc/rdoc/
 IUSE=test ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby MIT
 RDEPEND=>=app-eselect/eselect-ruby-20161226 ruby_targets_ruby24? ( dev-ruby/json:2[ruby_targets_ruby24] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/rdoc/rdoc/archive/v5.1.0.tar.gz -> rdoc-5.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eee306f2830050d60db05cd66e2a1571
+_md5_=ced75b808f25d17e05eb95d4cd37eeac
diff --git a/metadata/md5-cache/dev-ruby/rdoc-6.1.2 b/metadata/md5-cache/dev-ruby/rdoc-6.1.2
index 85d9e7045a5e..529db22d802f 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-6.1.2
+++ b/metadata/md5-cache/dev-ruby/rdoc-6.1.2
@@ -5,11 +5,11 @@ DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
 EAPI=7
 HOMEPAGE=https://github.com/ruby/rdoc/
 IUSE=doc ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby MIT
 RDEPEND=>=app-eselect/eselect-ruby-20181225 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 )
 SLOT=0
 SRC_URI=https://github.com/ruby/rdoc/archive/v6.1.2.tar.gz -> rdoc-6.1.2.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=cd5b54852d0133cc38824f82f00d4df3
+_md5_=e6df407b2a03773a4869eec70f945b19
diff --git a/metadata/md5-cache/dev-ruby/rex-socket-0.1.15 b/metadata/md5-cache/dev-ruby/rex-socket-0.1.15
deleted file mode 100644
index ffe73debbc21..000000000000
--- a/metadata/md5-cache/dev-ruby/rex-socket-0.1.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-ruby/rex-core[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-core[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-core[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? ( 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] ) )
-DESCRIPTION=Ruby Exploitation (Rex) Socket Abstraction Library
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/rex-socket
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-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 )
-SLOT=0
-SRC_URI=mirror://rubygems/rex-socket-0.1.15.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=fe308f06be72ec5a89af63c9f48a84f6
diff --git a/metadata/md5-cache/dev-ruby/rex-socket-0.1.16 b/metadata/md5-cache/dev-ruby/rex-socket-0.1.16
deleted file mode 100644
index c83ed8666079..000000000000
--- a/metadata/md5-cache/dev-ruby/rex-socket-0.1.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-ruby/rex-core[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-core[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-core[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? ( 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] ) )
-DESCRIPTION=Ruby Exploitation (Rex) Socket Abstraction Library
-EAPI=6
-HOMEPAGE=https://rubygems.org/gems/rex-socket
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-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 )
-SLOT=0
-SRC_URI=mirror://rubygems/rex-socket-0.1.16.gem
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=fe308f06be72ec5a89af63c9f48a84f6
diff --git a/metadata/md5-cache/dev-ruby/rex-socket-0.1.20 b/metadata/md5-cache/dev-ruby/rex-socket-0.1.20
new file mode 100644
index 000000000000..bd964719241c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rex-socket-0.1.20
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( dev-ruby/rex-core[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-core[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-core[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/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? ( 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] ) )
+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] )
+DESCRIPTION=Ruby Exploitation (Rex) Socket Abstraction Library
+EAPI=7
+HOMEPAGE=https://rubygems.org/gems/rex-socket
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+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 )
+SLOT=0
+SRC_URI=mirror://rubygems/rex-socket-0.1.20.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=15fe0eab116e90df173e49c377685ccd
diff --git a/metadata/md5-cache/dev-ruby/rex-text-0.2.23 b/metadata/md5-cache/dev-ruby/rex-text-0.2.23
new file mode 100644
index 000000000000..a97b3bcf5d17
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rex-text-0.2.23
@@ -0,0 +1,15 @@
+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? ( 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] ) )
+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] )
+DESCRIPTION=Rex library for text generation and manipulation
+EAPI=7
+HOMEPAGE=https://github.com/rapid7/rex-text
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+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 )
+SLOT=0
+SRC_URI=mirror://rubygems/rex-text-0.2.23.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ac7ca98c80aeeaf0b05f801fed07fb1f
diff --git a/metadata/md5-cache/dev-ruby/rouge-3.9.0 b/metadata/md5-cache/dev-ruby/rouge-3.9.0
index 821cb29887bb..7a7ca994c217 100644
--- a/metadata/md5-cache/dev-ruby/rouge-3.9.0
+++ b/metadata/md5-cache/dev-ruby/rouge-3.9.0
@@ -5,11 +5,11 @@ DESCRIPTION=Yet-another-markdown-parser using a strict syntax definition in pure
 EAPI=7
 HOMEPAGE=https://github.com/jneen/rouge
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/redcarpet[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/redcarpet[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? ( 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 )
 SLOT=2
 SRC_URI=https://github.com/jneen/rouge/archive/v3.9.0.tar.gz -> rouge-3.9.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=19e55ba811a2b5d84b7010101c172f80
+_md5_=5a3b45d2ffdb28f062ad654e91c13f55
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.7
new file mode 100644
index 000000000000..f10481b8937f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=media-libs/clutter ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Clutter bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=media-libs/clutter ruby_targets_ruby24? ( >=dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.7[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=affa2b790d06eb8afae6262c1854847c
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.7
new file mode 100644
index 000000000000..0c26c16156ea
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gdk3-3.3.7[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? ( 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] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby binding of GDK specific API of Clutter
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=media-libs/clutter[gtk] ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gdk3-3.3.7[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=065dd9c0bd8c985f786fe56064a63888
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.7
new file mode 100644
index 000000000000..2d77b328c709
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=media-libs/clutter-gst test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Clutter bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=media-libs/clutter-gst:* ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gstreamer-3.3.7[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=0b8dbe49b7eb8e99d5a9a7435d0c1076
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.7
new file mode 100644
index 000000000000..2a5efc62bd2a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Clutter bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gtk3-3.3.7[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=bcbd32b04c53d5c78cbf86a68f36fd5b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.7
new file mode 100644
index 000000000000..722e8d095cd2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.3.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gstreamer-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gtk-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview3-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-poppler-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-rsvg-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-vte-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-vte3-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-webkit2-gtk-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gstreamer-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gtk-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gtksourceview-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gtksourceview3-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-poppler-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-rsvg-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-vte-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-vte3-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-webkit2-gtk-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gstreamer-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gtk-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gtksourceview-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gtksourceview3-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-poppler-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-rsvg-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-vte-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-vte3-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-webkit2-gtk-3.3.7[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 )
+DESCRIPTION=Ruby Gnome2 bindings
+EAPI=6
+HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gstreamer-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gtk-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview3-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-poppler-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-rsvg-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-vte-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-vte3-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-webkit2-gtk-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gstreamer-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-clutter-gtk-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gtksourceview-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gtksourceview3-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-poppler-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-rsvg-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-vte-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-vte3-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-webkit2-gtk-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gstreamer-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gdk-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-clutter-gtk-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gstreamer-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gtksourceview-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gtksourceview3-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-poppler-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-rsvg-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-vte-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-vte3-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-webkit2-gtk-3.3.7[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 )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=67cbf401ef8f0071c61dc01f3a3e01cc
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.7
new file mode 100644
index 000000000000..0456027f6981
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/gobject-introspection media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby GStreamer bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25] ~dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26] ~dev-ruby/ruby-gobject-introspection-3.3.7[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=c2b2afe78f359166eac40d7608c48cd8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.7
new file mode 100644
index 000000000000..f90e9c12e465
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/gtk+:2 x11-themes/hicolor-icon-theme test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Gtk2 bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.7[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=3069288dbe8f500e1db4ed9dc915cca5
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.7
new file mode 100644
index 000000000000..fdb7543a2ffc
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/gtk+:3 ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Gtk3 bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-pango-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-atk-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gdk3-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gdkpixbuf2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-pango-3.3.7[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=50a570bfe9d61d22b23f1cb86274cbc7
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.7
new file mode 100644
index 000000000000..b297dd9c243d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/gtksourceview:2.0 test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby bindings for gtksourceview
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk2-3.3.7[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=df972630181dea9328825eb3f75bd0bf
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.7
new file mode 100644
index 000000000000..f836adf841b0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby Gtk3 bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk3-3.3.7[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=91ef8bd67649ca6fd2a12cfd6863a7fa
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-vte-3.3.7
new file mode 100644
index 000000000000..5b5f5f5c1e47
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=x11-libs/vte-0.12.1:0 test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk2-3.3.7[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? ( 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] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby vte bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk2-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk2-3.3.7[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=9ed45f41db6f8ce16d60891502781b10
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.7
new file mode 100644
index 000000000000..cdb20058e57c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/vte:2.91 ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby VTE bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/vte:2.91 ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gtk3-3.3.7[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=e2d2a68880e582608f31d023cfb13318
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.7
new file mode 100644
index 000000000000..72d4c6fcad11
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=net-libs/webkit-gtk:4 test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby26] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) 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] ) 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] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26] )
+DESCRIPTION=Ruby WebKitGtk+ for Gtk 3.0 bindings
+EAPI=6
+HOMEPAGE=https://ruby-gnome2.osdn.jp/
+IUSE=test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=net-libs/webkit-gtk:4 ruby_targets_ruby24? ( >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25] >=dev-ruby/ruby-gtk3-3.3.7[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26] >=dev-ruby/ruby-gtk3-3.3.7[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=9f374416def7c4b4f6578d338ac4be90
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.7.10 b/metadata/md5-cache/dev-ruby/rubygems-2.7.10
index ce08c70f987d..f066997643a9 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.7.10
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.7.10
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.7.10.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=97f8df1e3f904843063237b8078004af
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.7.9 b/metadata/md5-cache/dev-ruby/rubygems-2.7.9
index 3a25ca99bde2..a6680ea7e6ec 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.7.9
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.7.9
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.7.9.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=1035e719793eb33f4e18144cf558f304
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.0.3 b/metadata/md5-cache/dev-ruby/rubygems-3.0.3
index 9e1345f838fd..8e83c4770664 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.0.3
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.0.3
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.0.3.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=4e3800daa0136460a85b594ae1f307a7
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.0.4-r1 b/metadata/md5-cache/dev-ruby/rubygems-3.0.4-r1
index 82cdfb77feb8..088815f578b9 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.0.4-r1
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.0.4.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=fe032a2990b7dea491e3a2da7cacb978
diff --git a/metadata/md5-cache/dev-ruby/rubygems-3.0.6 b/metadata/md5-cache/dev-ruby/rubygems-3.0.6
index 36ffcb2824d9..6132cb5383e0 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-3.0.6
+++ b/metadata/md5-cache/dev-ruby/rubygems-3.0.6
@@ -12,5 +12,5 @@ RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-3.0.6.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=9ef93d7a27c0ee3bdf0e8109fcd59cf3
diff --git a/metadata/md5-cache/dev-ruby/temple-0.8.2 b/metadata/md5-cache/dev-ruby/temple-0.8.2
new file mode 100644
index 000000000000..b926bf8da197
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/temple-0.8.2
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/bacon[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bacon[ruby_targets_ruby25] dev-ruby/erubis[ruby_targets_ruby25] >=dev-ruby/tilt-2.0.1[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bacon[ruby_targets_ruby26] dev-ruby/erubis[ruby_targets_ruby26] >=dev-ruby/tilt-2.0.1[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/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? ( 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] ) )
+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] )
+DESCRIPTION=An abstraction and a framework for compiling templates to pure Ruby
+EAPI=7
+HOMEPAGE=https://github.com/judofyr/temple
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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 )
+SLOT=0.7
+SRC_URI=mirror://rubygems/temple-0.8.2.gem
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=550dd95230b18d5e5f95d227f2c838ce
diff --git a/metadata/md5-cache/dev-ruby/zeitwerk-2.1.9 b/metadata/md5-cache/dev-ruby/zeitwerk-2.1.9
index 1e2c7378ef71..c500fd5f4a1c 100644
--- a/metadata/md5-cache/dev-ruby/zeitwerk-2.1.9
+++ b/metadata/md5-cache/dev-ruby/zeitwerk-2.1.9
@@ -4,11 +4,11 @@ DESCRIPTION=Efficient and thread-safe code loader for Ruby
 EAPI=6
 HOMEPAGE=https://github.com/fxn/zeitwerk
 IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~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 )
 SLOT=2
 SRC_URI=https://github.com/fxn/zeitwerk/archive/v2.1.9.tar.gz -> zeitwerk-2.1.9.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6886703a75620ebb6d62b932d05c3f36
+_md5_=6591d2ae0ee863d492352e4a0c664f1a
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 187259aaa97a..ab46cca0badb 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/gambit-4.9.3 b/metadata/md5-cache/dev-scheme/gambit-4.9.3
index fc8cce816333..83a87d0d597e 100644
--- a/metadata/md5-cache/dev-scheme/gambit-4.9.3
+++ b/metadata/md5-cache/dev-scheme/gambit-4.9.3
@@ -5,10 +5,10 @@ DESCRIPTION=Gambit-C is a native Scheme to C compiler and interpreter
 EAPI=7
 HOMEPAGE=http://www.iro.umontreal.ca/~gambit/
 IUSE=emacs libressl ssl static
-KEYWORDS=~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz
 _eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	eutils	6e6c2737b59a4b982de6fb3ecefd87f8
-_md5_=ce1438f6aba8b74a1d0aba603f39c68a
+_md5_=53ee347fe3b005d0ea450f20e96e8dc0
diff --git a/metadata/md5-cache/dev-scheme/gauche-0.9.5 b/metadata/md5-cache/dev-scheme/gauche-0.9.5
index cc9945963a60..540273984036 100644
--- a/metadata/md5-cache/dev-scheme/gauche-0.9.5
+++ b/metadata/md5-cache/dev-scheme/gauche-0.9.5
@@ -7,7 +7,7 @@ IUSE=ipv6 libressl test
 KEYWORDS=~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=sys-libs/gdbm
-SLOT=0
+SLOT=0/0.9
 SRC_URI=mirror://sourceforge/gauche/Gauche-0.9.5.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=38c03abb06b889349f206c7e87610adb
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=36499c912da74aeb06fb80ecbd4da960
diff --git a/metadata/md5-cache/dev-scheme/gauche-0.9.6-r1 b/metadata/md5-cache/dev-scheme/gauche-0.9.6-r1
index bbf35dd3d87e..956f9f1632f9 100644
--- a/metadata/md5-cache/dev-scheme/gauche-0.9.6-r1
+++ b/metadata/md5-cache/dev-scheme/gauche-0.9.6-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/gdbm mbedtls? ( net-libs/mbedtls ) test? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=sys-libs/gdbm mbedtls? ( net-libs/mbedtls:= ) test? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=A Unix system friendly Scheme Interpreter
 EAPI=6
 HOMEPAGE=http://practical-scheme.net/gauche/
 IUSE=ipv6 libressl mbedtls test
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
-RDEPEND=sys-libs/gdbm mbedtls? ( net-libs/mbedtls )
-SLOT=0
+RDEPEND=sys-libs/gdbm mbedtls? ( net-libs/mbedtls:= )
+SLOT=0/0.9
 SRC_URI=mirror://sourceforge/gauche/Gauche-0.9.6.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a5415910ff00cf8d3c796a72fbd1e8db
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9aa834855774bc6b3e203a2060307ea7
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 6deb5fd11a34..1a753c64b197 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/bwidget-1.9.12 b/metadata/md5-cache/dev-tcltk/bwidget-1.9.12
index ca7dea362357..bfe57ac8d74e 100644
--- a/metadata/md5-cache/dev-tcltk/bwidget-1.9.12
+++ b/metadata/md5-cache/dev-tcltk/bwidget-1.9.12
@@ -4,10 +4,10 @@ DESCRIPTION=High-level widget set for Tcl/Tk
 EAPI=6
 HOMEPAGE=http://tcllib.sourceforge.net/
 IUSE=doc test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=tcltk
 RDEPEND=dev-lang/tk:0
 SLOT=0
 SRC_URI=mirror://sourceforge/tcllib/BWidget/1.9.12/bwidget-1.9.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
-_md5_=fe569aaa8a0f62da109528ed3f643585
+_md5_=432508fbce960f7eac81f9e168540b7c
diff --git a/metadata/md5-cache/dev-tcltk/tcl3d-0.4.0 b/metadata/md5-cache/dev-tcltk/tcl3d-0.4.0
deleted file mode 100644
index e31326c486f4..000000000000
--- a/metadata/md5-cache/dev-tcltk/tcl3d-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-games/ode dev-lang/tk:0= dev-lang/tcl:0= media-libs/libsdl media-libs/ftgl virtual/opengl x11-libs/libXmu >=dev-lang/swig-1.3.19
-DESCRIPTION=Tcl bindings to OpenGL and other 3D libraries
-EAPI=5
-HOMEPAGE=http://www.tcl3d.org
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-games/ode dev-lang/tk:0= dev-lang/tcl:0= media-libs/libsdl media-libs/ftgl virtual/opengl x11-libs/libXmu
-SLOT=0
-SRC_URI=http://www.tcl3d.org/download/tcl3d-0.4.0.distrib/tcl3d-src-0.4.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=87b549d9c9b4158df1e28162273b585d
diff --git a/metadata/md5-cache/dev-tcltk/tcl3d-0.4.0-r1 b/metadata/md5-cache/dev-tcltk/tcl3d-0.4.0-r1
deleted file mode 100644
index f67a1348fcbb..000000000000
--- a/metadata/md5-cache/dev-tcltk/tcl3d-0.4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-games/ode dev-lang/tk:0= dev-lang/tcl:0= media-libs/libsdl media-libs/ftgl virtual/opengl x11-libs/libXmu >=dev-lang/swig-1.3.19
-DESCRIPTION=Tcl bindings to OpenGL and other 3D libraries
-EAPI=5
-HOMEPAGE=http://www.tcl3d.org
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-games/ode dev-lang/tk:0= dev-lang/tcl:0= media-libs/libsdl media-libs/ftgl virtual/opengl x11-libs/libXmu
-SLOT=0
-SRC_URI=http://www.tcl3d.org/download/tcl3d-0.4.0.distrib/tcl3d-src-0.4.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9407932200ea3b975fa6fafb8cbd001b
diff --git a/metadata/md5-cache/dev-tcltk/tcl3d-0.5.0 b/metadata/md5-cache/dev-tcltk/tcl3d-0.5.0
index f0c5b9125182..44165d32a57b 100644
--- a/metadata/md5-cache/dev-tcltk/tcl3d-0.5.0
+++ b/metadata/md5-cache/dev-tcltk/tcl3d-0.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-lang/tcl:0= dev-lang/tk:0= x11-libs/libXi x11-libs/libXmu virtual/opengl virtual/glu ode? ( dev-games/ode ) osg? ( dev-games/openscenegraph ) truetype? ( media-libs/ftgl ) sdl? ( media-libs/libsdl ) >=dev-lang/swig-1.3.38:0=
+DEPEND=dev-lang/tcl:0= dev-lang/tk:0= x11-libs/libXi x11-libs/libXmu virtual/opengl virtual/glu ode? ( dev-games/ode ) osg? ( dev-games/openscenegraph ) truetype? ( media-libs/ftgl ) sdl? ( media-libs/libsdl ) >=dev-lang/swig-1.3.38:0= app-arch/unzip
 DESCRIPTION=Tcl bindings to OpenGL and other 3D libraries
 EAPI=6
 HOMEPAGE=http://www.tcl3d.org
 IUSE=debug ode osg sdl truetype
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= x11-libs/libXi x11-libs/libXmu virtual/opengl virtual/glu ode? ( dev-games/ode ) osg? ( dev-games/openscenegraph ) truetype? ( media-libs/ftgl ) sdl? ( media-libs/libsdl )
 SLOT=0
 SRC_URI=http://www.tcl3d.org/download/tcl3d-0.5.0.distrib/tcl3d-src-0.5.0.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b7daf05b1c1f06605ed8dc26360e3e11
+_md5_=e8eacf93ec6856c5dea7f4456481fa72
diff --git a/metadata/md5-cache/dev-tcltk/tkdnd-2.2 b/metadata/md5-cache/dev-tcltk/tkdnd-2.2
deleted file mode 100644
index 6e649bc5d263..000000000000
--- a/metadata/md5-cache/dev-tcltk/tkdnd-2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tk >=app-portage/elt-patches-20170815
-DESCRIPTION=Extension that adds native drag & drop capabilities to the tk toolkit
-EAPI=4
-HOMEPAGE=http://www.ellogon.org/petasis/tcltk-projects/tkdnd/
-IUSE=debug threads X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-lang/tk
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tkdnd/TkDND/TkDND%202.2/tkdnd2.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=232b9d66a5569dbb1c35be250cd14d9f
diff --git a/metadata/md5-cache/dev-tcltk/tkdnd-2.6 b/metadata/md5-cache/dev-tcltk/tkdnd-2.6
deleted file mode 100644
index 3ddf77b88cdd..000000000000
--- a/metadata/md5-cache/dev-tcltk/tkdnd-2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tk >=app-portage/elt-patches-20170815
-DESCRIPTION=Extension that adds native drag & drop capabilities to the tk toolkit
-EAPI=5
-HOMEPAGE=http://www.ellogon.org/petasis/tcltk-projects/tkdnd/
-IUSE=debug threads X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-lang/tk
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tkdnd/TkDND/TkDND%202.6/tkdnd2.6-src.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a9972ff270cd2d8d4532c2666c0d42ca
diff --git a/metadata/md5-cache/dev-tcltk/tkdnd-2.8 b/metadata/md5-cache/dev-tcltk/tkdnd-2.8
index 9bc3098cc7fe..8e738c913721 100644
--- a/metadata/md5-cache/dev-tcltk/tkdnd-2.8
+++ b/metadata/md5-cache/dev-tcltk/tkdnd-2.8
@@ -4,11 +4,11 @@ DESCRIPTION=Extension that adds native drag & drop capabilities to the tk toolki
 EAPI=5
 HOMEPAGE=http://www.ellogon.org/petasis/tcltk-projects/tkdnd/
 IUSE=debug threads X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-lang/tk:=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tkdnd/TkDND/TkDND%202.8/tkdnd2.8-src.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a69c5a1f132b2ab3c4e003382817e6df
+_md5_=fdc50474d76f4ff29f1a0a2cf1178993
diff --git a/metadata/md5-cache/dev-tcltk/tkimg-1.4-r9 b/metadata/md5-cache/dev-tcltk/tkimg-1.4-r9
index 8bd2d211f97a..683606b204a8 100644
--- a/metadata/md5-cache/dev-tcltk/tkimg-1.4-r9
+++ b/metadata/md5-cache/dev-tcltk/tkimg-1.4-r9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/libpng-1.6:0= >=sys-libs/zlib-1.2.7:= x11-libs/libX11 virtual/jpeg:=
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/tkimg-1.4-patchset-1.tar.xz mirror://sourceforge/tkimg/1.4/tkimg1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=7e233f7b1f88697eee2ed74925469530
diff --git a/metadata/md5-cache/dev-tcltk/tkimg-1.4.7 b/metadata/md5-cache/dev-tcltk/tkimg-1.4.7
index 76e414e4304c..84a03a36bdea 100644
--- a/metadata/md5-cache/dev-tcltk/tkimg-1.4.7
+++ b/metadata/md5-cache/dev-tcltk/tkimg-1.4.7
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/li
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/tkimg/tkimg/1.4/tkimg%201.4.7/Img-Source-1.4.7.tar.gz https://dev.gentoo.org/~tupone/distfiles/tkimg-1.4.7-patchset-1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=7268c5060c0f92899b700b48e1175901
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index b7b85a576cee..900122b93a37 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/catdvi-0.14-r1 b/metadata/md5-cache/dev-tex/catdvi-0.14-r1
deleted file mode 100644
index 891b04339253..000000000000
--- a/metadata/md5-cache/dev-tex/catdvi-0.14-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/tex-base dev-libs/kpathsea virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=DVI to plain text translator
-EAPI=4
-HOMEPAGE=http://catdvi.sourceforge.net
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=virtual/tex-base dev-libs/kpathsea
-SLOT=0
-SRC_URI=mirror://sourceforge/catdvi/catdvi-0.14.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b545a67de2b4f9af89283f144f35c18a
diff --git a/metadata/md5-cache/dev-tex/catdvi-0.14-r2 b/metadata/md5-cache/dev-tex/catdvi-0.14-r2
new file mode 100644
index 000000000000..237672ba5716
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/catdvi-0.14-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile install prepare
+DEPEND=virtual/tex-base dev-libs/kpathsea
+DESCRIPTION=DVI to plain text translator
+EAPI=7
+HOMEPAGE=http://catdvi.sourceforge.net
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=virtual/tex-base dev-libs/kpathsea
+SLOT=0
+SRC_URI=mirror://sourceforge/catdvi/catdvi-0.14.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f654d75acea48dde418418bf73bab11e
diff --git a/metadata/md5-cache/dev-tex/frakturx-20070103 b/metadata/md5-cache/dev-tex/frakturx-20070103
deleted file mode 100644
index e05f883a521b..000000000000
--- a/metadata/md5-cache/dev-tex/frakturx-20070103
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=Collection of blackletter fonts for LaTeX
-EAPI=4
-HOMEPAGE=http://www.gaehrken.de/fraktur/
-KEYWORDS=amd64 x86
-LICENSE=LPPL-1.2 free-noncomm
-RDEPEND=virtual/latex-base
-SLOT=0
-SRC_URI=mirror://gentoo/frakturx-20070103-base.zip mirror://gentoo/frakturx-20070103-tfrak.zip mirror://gentoo/frakturx-20070103-obibel.zip mirror://gentoo/frakturx-20070103-odedruck.zip mirror://gentoo/frakturx-20070103-odeschmk.zip mirror://gentoo/frakturx-20070103-oweissfr.zip mirror://gentoo/frakturx-20070103-oweissgo.zip mirror://gentoo/frakturx-20070103-talteswab.zip mirror://gentoo/frakturx-20070103-tbrtkpf.zip mirror://gentoo/frakturx-20070103-tkngsbg.zip mirror://gentoo/frakturx-20070103-twieynk.zip mirror://gentoo/frakturx-20070103-twieyvig.zip mirror://gentoo/frakturx-20070103-tzentenar.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=06668fa7e693c2f6cb81efc840aa67b5
diff --git a/metadata/md5-cache/dev-tex/frakturx-20070103-r1 b/metadata/md5-cache/dev-tex/frakturx-20070103-r1
new file mode 100644
index 000000000000..a27512473425
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/frakturx-20070103-r1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEFINED_PHASES=compile install postinst postrm prepare
+DESCRIPTION=Collection of blackletter fonts for LaTeX
+EAPI=7
+HOMEPAGE=http://www.gaehrken.de/fraktur/
+KEYWORDS=amd64 x86
+LICENSE=LPPL-1.2 free-noncomm
+RDEPEND=virtual/latex-base
+SLOT=0
+SRC_URI=mirror://gentoo/frakturx-20070103-base.zip mirror://gentoo/frakturx-20070103-tfrak.zip mirror://gentoo/frakturx-20070103-obibel.zip mirror://gentoo/frakturx-20070103-odedruck.zip mirror://gentoo/frakturx-20070103-odeschmk.zip mirror://gentoo/frakturx-20070103-oweissfr.zip mirror://gentoo/frakturx-20070103-oweissgo.zip mirror://gentoo/frakturx-20070103-talteswab.zip mirror://gentoo/frakturx-20070103-tbrtkpf.zip mirror://gentoo/frakturx-20070103-tkngsbg.zip mirror://gentoo/frakturx-20070103-twieynk.zip mirror://gentoo/frakturx-20070103-twieyvig.zip mirror://gentoo/frakturx-20070103-tzentenar.zip
+_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_md5_=9312b3cb1914119837e75aabae3f67ab
diff --git a/metadata/md5-cache/dev-tex/hyphen_show-20000425 b/metadata/md5-cache/dev-tex/hyphen_show-20000425
deleted file mode 100644
index 63244ae9fd73..000000000000
--- a/metadata/md5-cache/dev-tex/hyphen_show-20000425
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Show hyphenations in DVI files
-EAPI=0
-HOMEPAGE=http://packages.debian.org/stable/tex/hyphen-show
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/h/hyphen-show/hyphen-show_20000425.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88d892db0da013004e5d2ae4d39b2f92
diff --git a/metadata/md5-cache/dev-tex/hyphen_show-20000425-r1 b/metadata/md5-cache/dev-tex/hyphen_show-20000425-r1
new file mode 100644
index 000000000000..e04e55913262
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/hyphen_show-20000425-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Show hyphenations in DVI files
+EAPI=7
+HOMEPAGE=https://packages.debian.org/stable/tex/hyphen-show
+KEYWORDS=amd64 ~ppc64 x86
+LICENSE=GPL-1+
+SLOT=0
+SRC_URI=mirror://debian/pool/main/h/hyphen-show/hyphen-show_20000425.orig.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=aec0373f779ac0701c6be3f5a1eef5f7
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8
index 08d5fcc106b8..abf2506c2a03 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8
@@ -5,10 +5,10 @@ DESCRIPTION=Converts (La)TeX to (X)HTML, XML and OO.org
 EAPI=7
 HOMEPAGE=http://www.cse.ohio-state.edu/~gurari/TeX4ht/ http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html
 IUSE=java elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick dev-libs/kpathsea java? ( >=virtual/jre-1.5 ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz mirror://gentoo/tex4ht-texlive-2019-03-22.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	latex-package	17f13abe0de88340745e52e6b627aee7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=70ea22d3187896ff8c1a9425ad4ab260
+_md5_=9e3b5a2fbf7a8436bc7a27e3627808aa
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 06b473cb5a43..186d3313d899 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/android-sdk-update-manager-22.3 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
index 7dce77818155..853a47e00a53 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x1
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.3-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b64d4ce8691e198b8cb1c020e11f362a
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
index f20e3e31d20d..e23efa3b104c 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x1
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.6-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b64d4ce8691e198b8cb1c020e11f362a
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
index 085cbdc213a8..82dc7844f22e 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x1
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.6.1-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b64d4ce8691e198b8cb1c020e11f362a
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-23 b/metadata/md5-cache/dev-util/android-sdk-update-manager-23
index f626f2c85cc9..90b080dd1d83 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-23
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-23
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] sys-
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r23-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d34453b5cd0ed5dcc24078f83161efba
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1
index 8435d0f14d42..59f16818abdc 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] sys-
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r23-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f8d6476b3c2442607eb761e4af7b6594
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1
index f854983570a4..85f854b6c828 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] sys-
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f8d6476b3c2442607eb761e4af7b6594
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-4.16.0-r1 b/metadata/md5-cache/dev-util/artifactory-bin-4.16.0-r1
deleted file mode 100644
index 743a92ad49a5..000000000000
--- a/metadata/md5-cache/dev-util/artifactory-bin-4.16.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip
-DESCRIPTION=The world's most advanced repository manager for maven
-EAPI=6
-HOMEPAGE=http://www.jfrog.org/products.php
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-4.16.0.zip -> artifactory-4.16.0.zip
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=bbb8325ab79209449630d95c83c06da0
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-4.16.1 b/metadata/md5-cache/dev-util/artifactory-bin-4.16.1
deleted file mode 100644
index c0f8310661fb..000000000000
--- a/metadata/md5-cache/dev-util/artifactory-bin-4.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip
-DESCRIPTION=The world's most advanced repository manager for maven
-EAPI=6
-HOMEPAGE=http://www.jfrog.org/products.php
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-4.16.1.zip -> artifactory-4.16.1.zip
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=bbb8325ab79209449630d95c83c06da0
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.11.2 b/metadata/md5-cache/dev-util/artifactory-bin-5.11.2
deleted file mode 100644
index e960876671ed..000000000000
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.11.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip
-DESCRIPTION=The world's most advanced repository manager for maven
-EAPI=6
-HOMEPAGE=http://www.jfrog.org/products.php
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.11.2.zip -> artifactory-5.11.2.zip
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.3.2 b/metadata/md5-cache/dev-util/artifactory-bin-5.3.2
deleted file mode 100644
index 36107049eba4..000000000000
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip
-DESCRIPTION=The world's most advanced repository manager for maven
-EAPI=6
-HOMEPAGE=http://www.jfrog.org/products.php
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.3.2.zip -> artifactory-5.3.2.zip
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.4.4 b/metadata/md5-cache/dev-util/artifactory-bin-5.4.4
deleted file mode 100644
index 6693cddcd97f..000000000000
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip
-DESCRIPTION=The world's most advanced repository manager for maven
-EAPI=6
-HOMEPAGE=http://www.jfrog.org/products.php
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.4.4.zip -> artifactory-5.4.4.zip
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.4.6 b/metadata/md5-cache/dev-util/artifactory-bin-5.4.6
deleted file mode 100644
index cd251d0be371..000000000000
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip
-DESCRIPTION=The world's most advanced repository manager for maven
-EAPI=6
-HOMEPAGE=http://www.jfrog.org/products.php
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.4.6.zip -> artifactory-5.4.6.zip
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.5.1 b/metadata/md5-cache/dev-util/artifactory-bin-5.5.1
deleted file mode 100644
index 7d82f9ce687c..000000000000
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip
-DESCRIPTION=The world's most advanced repository manager for maven
-EAPI=6
-HOMEPAGE=http://www.jfrog.org/products.php
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.5.1.zip -> artifactory-5.5.1.zip
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.5.2 b/metadata/md5-cache/dev-util/artifactory-bin-5.5.2
deleted file mode 100644
index aae94b65afe6..000000000000
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip
-DESCRIPTION=The world's most advanced repository manager for maven
-EAPI=6
-HOMEPAGE=http://www.jfrog.org/products.php
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.5.2.zip -> artifactory-5.5.2.zip
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.6.2 b/metadata/md5-cache/dev-util/artifactory-bin-5.6.2
deleted file mode 100644
index a9474dd4b539..000000000000
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip
-DESCRIPTION=The world's most advanced repository manager for maven
-EAPI=6
-HOMEPAGE=http://www.jfrog.org/products.php
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.6.2.zip -> artifactory-5.6.2.zip
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.6.3 b/metadata/md5-cache/dev-util/artifactory-bin-5.6.3
deleted file mode 100644
index 80da31bba697..000000000000
--- a/metadata/md5-cache/dev-util/artifactory-bin-5.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip
-DESCRIPTION=The world's most advanced repository manager for maven
-EAPI=6
-HOMEPAGE=http://www.jfrog.org/products.php
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3+
-RDEPEND=>=virtual/jre-1.8
-SLOT=0
-SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.6.3.zip -> artifactory-5.6.3.zip
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/autodia-2.140.0-r1 b/metadata/md5-cache/dev-util/autodia-2.140.0-r1
index b9098860b1e4..79b3447b3b55 100644
--- a/metadata/md5-cache/dev-util/autodia-2.140.0-r1
+++ b/metadata/md5-cache/dev-util/autodia-2.140.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/Template-Toolkit dev-perl/XML-Simple graphviz? ( dev-perl/GraphViz ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TE/TEEJAY/Autodia-2.14.tar.gz mirror://gentoo/Autodia-2.14-dbi.patch.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3a0426f7d162028958aa6ff6cb6f768a
diff --git a/metadata/md5-cache/dev-util/bazel-0.29.1 b/metadata/md5-cache/dev-util/bazel-0.29.1
new file mode 100644
index 000000000000..a020574139ac
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bazel-0.29.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=7
+HOMEPAGE=https://bazel.build/
+IUSE=examples tools elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/0.29.1/bazel-0.29.1-dist.zip
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9305c71693a782c3585c6363f0767513
diff --git a/metadata/md5-cache/dev-util/boost-build-1.65.0 b/metadata/md5-cache/dev-util/boost-build-1.65.0
index ffb7ab7d0087..fe04445096f7 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.65.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.65.0
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( python_targets_python2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.65.0/boost_1_65_0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=804bf07a529d5a92990f1ce1894c3c19
diff --git a/metadata/md5-cache/dev-util/boost-build-1.70.0 b/metadata/md5-cache/dev-util/boost-build-1.70.0
index 298e618a6525..ad46066af339 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.70.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.70.0
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) test? ( python_targets_python2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=51498492e6b80ebd132fe67ced17edf0
diff --git a/metadata/md5-cache/dev-util/catfish-1.4.10 b/metadata/md5-cache/dev-util/catfish-1.4.10
new file mode 100644
index 000000000000..ae749cd6579d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/catfish-1.4.10
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-python/python-distutils-extra[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-devel/gettext
+DESCRIPTION=A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot
+EAPI=7
+HOMEPAGE=https://docs.xfce.org/apps/catfish/start
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] virtual/freedesktop-icon-theme python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/catfish/1.4/catfish-1.4.10.tar.bz2
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=191538ed3b86f509e1d19cf6c187cf55
diff --git a/metadata/md5-cache/dev-util/ccache-3.7.2 b/metadata/md5-cache/dev-util/ccache-3.7.2
index 5a374cc42f69..d8399fbb8151 100644
--- a/metadata/md5-cache/dev-util/ccache-3.7.2
+++ b/metadata/md5-cache/dev-util/ccache-3.7.2
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils sys-libs/zlib
 DESCRIPTION=fast compiler cache
 EAPI=7
 HOMEPAGE=https://ccache.dev/
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd
 LICENSE=GPL-3
 RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v3.7.2/ccache-3.7.2.tar.xz
 _eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=36d925341b194b5003dc52e71eef20be
+_md5_=91d27420f3ef48d22c1c7ed92bdbc110
diff --git a/metadata/md5-cache/dev-util/ccache-3.7.4 b/metadata/md5-cache/dev-util/ccache-3.7.4
new file mode 100644
index 000000000000..427d1c28a59e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ccache-3.7.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare prerm test
+DEPEND=app-arch/xz-utils sys-libs/zlib test? ( dev-libs/elfutils )
+DESCRIPTION=fast compiler cache
+EAPI=7
+HOMEPAGE=https://ccache.dev/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-3
+RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ccache/ccache/releases/download/v3.7.4/ccache-3.7.4.tar.xz
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=117f8d5343acbfebe2af758c665fc488
diff --git a/metadata/md5-cache/dev-util/clair-2.0.6 b/metadata/md5-cache/dev-util/clair-2.0.6
deleted file mode 100644
index 43f4bbe467a6..000000000000
--- a/metadata/md5-cache/dev-util/clair-2.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Vulnerability Static Analysis for Containers
-EAPI=6
-HOMEPAGE=https://github.com/coreos/clair
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/git !!sci-visualization/xd3d
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/coreos/clair/archive/v2.0.6.tar.gz -> clair-2.0.6.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7a548338ce1a7512c5dd5e87e3be5469
diff --git a/metadata/md5-cache/dev-util/cppunit-1.13.1 b/metadata/md5-cache/dev-util/cppunit-1.13.1
deleted file mode 100644
index 4b3962dcb3a1..000000000000
--- a/metadata/md5-cache/dev-util/cppunit-1.13.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=doc? ( app-doc/doxygen[dot] media-gfx/graphviz )
-DESCRIPTION=C++ port of the famous JUnit framework for unit testing
-EAPI=4
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/cppunit
-IUSE=doc examples static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://dev-www.libreoffice.org/src/cppunit-1.13.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e4614dce2c6f2cb8327cf83918accad0
diff --git a/metadata/md5-cache/dev-util/cppunit-1.13.2-r2 b/metadata/md5-cache/dev-util/cppunit-1.13.2-r2
deleted file mode 100644
index 303b6574be3e..000000000000
--- a/metadata/md5-cache/dev-util/cppunit-1.13.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen[dot] media-gfx/graphviz )
-DESCRIPTION=C++ port of the famous JUnit framework for unit testing
-EAPI=5
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/cppunit
-IUSE=doc examples static-libs 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 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d90230173e75414f91af8ddbd57097e3
diff --git a/metadata/md5-cache/dev-util/crash-6.1.4 b/metadata/md5-cache/dev-util/crash-6.1.4
deleted file mode 100644
index e64e93aefe83..000000000000
--- a/metadata/md5-cache/dev-util/crash-6.1.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Red Hat crash utility. Used for analyzing kernel core dumps
-EAPI=5
-HOMEPAGE=https://people.redhat.com/anderson/
-KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://people.redhat.com/anderson/crash-6.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=75cc542c2b3bd26eb83a460dbbf80f74
diff --git a/metadata/md5-cache/dev-util/crash-7.0.0 b/metadata/md5-cache/dev-util/crash-7.0.0
deleted file mode 100644
index a3183df1c942..000000000000
--- a/metadata/md5-cache/dev-util/crash-7.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Red Hat crash utility. Used for analyzing kernel core dumps
-EAPI=5
-HOMEPAGE=https://people.redhat.com/anderson/
-KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://people.redhat.com/anderson/crash-7.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=75cc542c2b3bd26eb83a460dbbf80f74
diff --git a/metadata/md5-cache/dev-util/crash-7.0.3 b/metadata/md5-cache/dev-util/crash-7.0.3
deleted file mode 100644
index f7592aff18a0..000000000000
--- a/metadata/md5-cache/dev-util/crash-7.0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Red Hat crash utility. Used for analyzing kernel core dumps
-EAPI=5
-HOMEPAGE=https://people.redhat.com/anderson/
-KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://people.redhat.com/anderson/crash-7.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=75cc542c2b3bd26eb83a460dbbf80f74
diff --git a/metadata/md5-cache/dev-util/crash-7.0.7 b/metadata/md5-cache/dev-util/crash-7.0.7
deleted file mode 100644
index 7e78197ba2d6..000000000000
--- a/metadata/md5-cache/dev-util/crash-7.0.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Red Hat crash utility. Used for analyzing kernel core dumps
-EAPI=5
-HOMEPAGE=https://people.redhat.com/anderson/
-KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://people.redhat.com/anderson/crash-7.0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8083c7c38c9bada1d6b07f1a054e12cd
diff --git a/metadata/md5-cache/dev-util/crash-7.1.4 b/metadata/md5-cache/dev-util/crash-7.1.4
deleted file mode 100644
index bc114b52f8dd..000000000000
--- a/metadata/md5-cache/dev-util/crash-7.1.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Red Hat crash utility; used for analyzing kernel core dumps
-EAPI=5
-HOMEPAGE=https://people.redhat.com/anderson/
-KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://people.redhat.com/anderson/crash-7.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c17bb0abc6381e0fd035966d9df2084e
diff --git a/metadata/md5-cache/dev-util/crash-7.1.8 b/metadata/md5-cache/dev-util/crash-7.1.8
deleted file mode 100644
index 8ff6a8a529b9..000000000000
--- a/metadata/md5-cache/dev-util/crash-7.1.8
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Red Hat crash utility; used for analyzing kernel core dumps
-EAPI=5
-HOMEPAGE=https://people.redhat.com/anderson/
-KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://people.redhat.com/anderson/crash-7.1.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b5d1217cfe0147c2f30cd6ca3c4b0d58
diff --git a/metadata/md5-cache/dev-util/crash-7.1.9 b/metadata/md5-cache/dev-util/crash-7.1.9
deleted file mode 100644
index 2fabafea566f..000000000000
--- a/metadata/md5-cache/dev-util/crash-7.1.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Red Hat crash utility; used for analyzing kernel core dumps
-EAPI=5
-HOMEPAGE=https://people.redhat.com/anderson/
-KEYWORDS=-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://people.redhat.com/anderson/crash-7.1.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b5d1217cfe0147c2f30cd6ca3c4b0d58
diff --git a/metadata/md5-cache/dev-util/creduce-2.7.0-r1 b/metadata/md5-cache/dev-util/creduce-2.7.0-r1
deleted file mode 100644
index a38b03c6b220..000000000000
--- a/metadata/md5-cache/dev-util/creduce-2.7.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:5 sys-devel/flex dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=C-Reduce - a plugin-based C program reducer
-EAPI=6
-HOMEPAGE=https://embed.cs.utah.edu/creduce/
-KEYWORDS=~amd64 ~x86
-LICENSE=UoI-NCSA
-RDEPEND=>=dev-lang/perl-5.10.0 sys-devel/clang:5 dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common dev-perl/Sys-CPU
-SLOT=0
-SRC_URI=https://embed.cs.utah.edu/creduce/creduce-2.7.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0340f4ff0ee0c0efd29272210b10a1a
diff --git a/metadata/md5-cache/dev-util/debugedit-4.14.2-r1 b/metadata/md5-cache/dev-util/debugedit-4.14.2-r1
deleted file mode 100644
index 0e9091591e02..000000000000
--- a/metadata/md5-cache/dev-util/debugedit-4.14.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib:= >=dev-libs/popt-1.7 dev-libs/elfutils dev-libs/nss virtual/pkgconfig
-DESCRIPTION=Stand-alone debugedit from RPM
-EAPI=7
-HOMEPAGE=http://www.rpm.org https://github.com/rpm-software-management/rpm
-KEYWORDS=amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=sys-libs/zlib:= >=dev-libs/popt-1.7 dev-libs/elfutils dev-libs/nss
-SLOT=0
-SRC_URI=http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.2.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1566f34ef435533abdf09d8c0853a977
diff --git a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r1 b/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r1
deleted file mode 100644
index 0d4a26cee772..000000000000
--- a/metadata/md5-cache/dev-util/ftjam-2.5.3_rc2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=!dev-util/jam sys-devel/bison
-DESCRIPTION=FTJam is a 100% compatible, enhanced implementation of the make alternative Jam
-EAPI=0
-HOMEPAGE=http://freetype.sourceforge.net/jam/index.html
-KEYWORDS=amd64 arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=perforce GPL-2
-RDEPEND=!dev-util/jam
-SLOT=0
-SRC_URI=http://david.freetype.org/jam/ftjam-2.5.3rc2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=56d32cc73c28ad9cd18ebbd0464449df
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.60.6 b/metadata/md5-cache/dev-util/gdbus-codegen-2.60.6
index 60935d4ceceb..63d800022408 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.60.6
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.60.6
@@ -5,11 +5,11 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.60/glib-2.60.6.tar.xz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=452250a19e61cd8e1d002172234ba547
+_md5_=db51d96b41df1faf70b2f372256c0e7c
diff --git a/metadata/md5-cache/dev-util/glade-3.22.1 b/metadata/md5-cache/dev-util/glade-3.22.1
index 36f92857dd62..e78dc838fe62 100644
--- a/metadata/md5-cache/dev-util/glade-3.22.1
+++ b/metadata/md5-cache/dev-util/glade-3.22.1
@@ -4,7 +4,7 @@ DESCRIPTION=A user interface designer for GTK+ and GNOME
 EAPI=6
 HOMEPAGE=https://glade.gnome.org/
 IUSE=debug +introspection python webkit python_targets_python2_7 test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.53.2:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
 REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=3.10/6
 SRC_URI=mirror://gnome/sources/glade/3.22/glade-3.22.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=611e742892c9ccb8c08938f224feb8cd
+_md5_=2cffbe9c4458d0ace24b03562a193a78
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.60.6 b/metadata/md5-cache/dev-util/glib-utils-2.60.6
index 4cdb1affb1d9..32ccdb65916c 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.60.6
+++ b/metadata/md5-cache/dev-util/glib-utils-2.60.6
@@ -5,11 +5,11 @@ DESCRIPTION=Build utilities for GLib using projects
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] !<dev-libs/glib-2.56.2:2
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.60/glib-2.60.6.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e7856795ed60b91619a07e0bf8611ed8
+_md5_=baee35697beee8e74a7507a6731d99f1
diff --git a/metadata/md5-cache/dev-util/goland-2019.1.2 b/metadata/md5-cache/dev-util/goland-2019.1.2
index fb15cab1a062..317c47c8141b 100644
--- a/metadata/md5-cache/dev-util/goland-2019.1.2
+++ b/metadata/md5-cache/dev-util/goland-2019.1.2
@@ -5,7 +5,8 @@ HOMEPAGE=http://www.jetbrains.com/go
 KEYWORDS=~amd64
 LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
 RDEPEND=dev-lang/go
+RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://download.jetbrains.com/go/goland-2019.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a122af185225baf212543870eb10707
+_md5_=918b8f7561f0f0d317992ff5f2946d41
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.4 b/metadata/md5-cache/dev-util/google-perftools-2.4
deleted file mode 100644
index 86ff3f58785a..000000000000
--- a/metadata/md5-cache/dev-util/google-perftools-2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-libs/libunwind >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Fast, multi-threaded malloc() and nifty performance analysis tools
-EAPI=6
-HOMEPAGE=https://github.com/gperftools/gperftools
-IUSE=largepages +debug minimal optimisememory test static-libs 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 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=sys-libs/libunwind
-SLOT=0/4
-SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.4 -> gperftools-2.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=b0ae0c7e5de6a4bc7b714cbe799eeb28
diff --git a/metadata/md5-cache/dev-util/hadolint-1.10.4 b/metadata/md5-cache/dev-util/hadolint-1.10.4
deleted file mode 100644
index 004417f9e534..000000000000
--- a/metadata/md5-cache/dev-util/hadolint-1.10.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-6.0.4:=[profile?] <dev-haskell/language-docker-7:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.14.0:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.5.0:=[profile?] >=dev-haskell/cabal-1.24.2.0 test? ( dev-haskell/hspec >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Dockerfile Linter JavaScript API
-EAPI=6
-HOMEPAGE=https://github.com/hadolint/hadolint
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/gitrev-1.3.1:=[profile?] >=dev-haskell/language-docker-6.0.4:=[profile?] <dev-haskell/language-docker-7:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/optparse-applicative-0.14.0:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/void:=[profile?] dev-haskell/yaml:=[profile?] >=dev-lang/ghc-8.0.2:= >=dev-util/shellcheck-0.5.0:=[profile?]
-SLOT=0/1.10.4
-SRC_URI=mirror://hackage/packages/archive/hadolint/1.10.4/hadolint-1.10.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a1a519286f9d8e16e35e659b0f653916
diff --git a/metadata/md5-cache/dev-util/hfstospell-0.5.1 b/metadata/md5-cache/dev-util/hfstospell-0.5.1
new file mode 100644
index 000000000000..357c55b480c9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/hfstospell-0.5.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=prepare
+DEPEND=app-arch/libarchive dev-cpp/libxmlpp:2.6 dev-libs/icu:= dev-libs/tinyxml2
+DESCRIPTION=HFST spell checker library and command line tool
+EAPI=7
+HOMEPAGE=https://github.com/hfst/hfst-ospell
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-arch/libarchive dev-cpp/libxmlpp:2.6 dev-libs/icu:= dev-libs/tinyxml2
+SLOT=0
+SRC_URI=https://github.com/hfst/hfst-ospell/archive/v0.5.1.tar.gz -> hfstospell-0.5.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5d992eb1acdf1d5867b22c42481c67d3
diff --git a/metadata/md5-cache/dev-util/idea-ultimate-2017.3.1.173.3942.27 b/metadata/md5-cache/dev-util/idea-ultimate-2017.3.1.173.3942.27
index 4964cb821abf..bdf6a1542ae2 100644
--- a/metadata/md5-cache/dev-util/idea-ultimate-2017.3.1.173.3942.27
+++ b/metadata/md5-cache/dev-util/idea-ultimate-2017.3.1.173.3942.27
@@ -7,7 +7,8 @@ IUSE=-custom-jdk
 KEYWORDS=~amd64 ~x86
 LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
 RDEPEND=!dev-util/idea-ultimate:14 !dev-util/idea-ultimate:15 >=virtual/jdk-1.7:*
+RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=!custom-jdk? ( https://download-cf.jetbrains.com/idea/ideaIU-2017.3.1-no-jdk.tar.gz -> ideaIU-173.3942.27-no-jdk.tar.gz ) custom-jdk? ( https://download-cf.jetbrains.com/idea/ideaIU-2017.3.1.tar.gz -> ideaIU-173.3942.27.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=718931f01440950eac849127b2f55d99
+_md5_=62a1588edd817f5e8171a03cfe8b8193
diff --git a/metadata/md5-cache/dev-util/idea-ultimate-2017.3.2.173.4127.17_pre b/metadata/md5-cache/dev-util/idea-ultimate-2017.3.2.173.4127.17_pre
deleted file mode 100644
index 55fe00beef47..000000000000
--- a/metadata/md5-cache/dev-util/idea-ultimate-2017.3.2.173.4127.17_pre
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!dev-util/idea-ultimate:14 !dev-util/idea-ultimate:15
-DESCRIPTION=A complete toolset for web, mobile and enterprise development
-EAPI=6
-HOMEPAGE=https://www.jetbrains.com/idea
-IUSE=-custom-jdk
-LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-RDEPEND=!dev-util/idea-ultimate:14 !dev-util/idea-ultimate:15 >=virtual/jdk-1.7:*
-SLOT=0
-SRC_URI=!custom-jdk? ( https://download-cf.jetbrains.com/idea/ideaIU-173.4127.17-no-jdk.tar.gz ) custom-jdk? ( https://download-cf.jetbrains.com/idea/ideaIU-173.4127.17.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=718931f01440950eac849127b2f55d99
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-5.0 b/metadata/md5-cache/dev-util/include-what-you-use-5.0
deleted file mode 100644
index 19f7c7a7574d..000000000000
--- a/metadata/md5-cache/dev-util/include-what-you-use-5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/llvm:5 sys-devel/clang:5 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Find unused include directives in C/C++ programs
-EAPI=6
-HOMEPAGE=https://include-what-you-use.org/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-devel/llvm:5 sys-devel/clang:5 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_5.0.tar.gz -> include-what-you-use-5.0.src.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ba91e2fe5dba8c5e1c31d3036579c29
diff --git a/metadata/md5-cache/dev-util/kcov-33 b/metadata/md5-cache/dev-util/kcov-33
deleted file mode 100644
index 9adcbb166189..000000000000
--- a/metadata/md5-cache/dev-util/kcov-33
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/elfutils net-misc/curl sys-devel/binutils:* sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kcov is a code coverage tester for compiled languages, Python and Bash
-EAPI=6
-HOMEPAGE=https://github.com/SimonKagstrom/kcov
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/elfutils net-misc/curl sys-devel/binutils:* sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/SimonKagstrom/kcov/archive/v33.tar.gz -> kcov-33.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29e968dc11671ec1328a5142b238bff9
diff --git a/metadata/md5-cache/dev-util/lcov-1.13-r2 b/metadata/md5-cache/dev-util/lcov-1.13-r2
index ca2e835282f7..e327d722e2fa 100644
--- a/metadata/md5-cache/dev-util/lcov-1.13-r2
+++ b/metadata/md5-cache/dev-util/lcov-1.13-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-lang/perl png? ( dev-perl/GD[png] )
 SLOT=0
 SRC_URI=mirror://sourceforge/ltp/lcov-1.13.tar.gz
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=b1d3bbeb6e971ee529a71721b8f857f9
diff --git a/metadata/md5-cache/dev-util/lcov-1.14 b/metadata/md5-cache/dev-util/lcov-1.14
index 0e804dcded3c..202de1773f9b 100644
--- a/metadata/md5-cache/dev-util/lcov-1.14
+++ b/metadata/md5-cache/dev-util/lcov-1.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-lang/perl png? ( dev-perl/GD[png] )
 SLOT=0
 SRC_URI=mirror://sourceforge/ltp/lcov-1.14.tar.gz
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=148304154ceaa6d7c055737426ea2561
diff --git a/metadata/md5-cache/dev-util/lcov-9999 b/metadata/md5-cache/dev-util/lcov-9999
index 7d933a89486a..53853891622f 100644
--- a/metadata/md5-cache/dev-util/lcov-9999
+++ b/metadata/md5-cache/dev-util/lcov-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=dev-lang/perl dev-perl/JSON dev-perl/PerlIO-gzip png? ( dev-perl/GD[png] )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=58584d0bf3c7574b7364e780f028ea91
diff --git a/metadata/md5-cache/dev-util/lldb-8.0.1 b/metadata/md5-cache/dev-util/lldb-8.0.1
index 32f87906e8e9..e92f5a2a7079 100644
--- a/metadata/md5-cache/dev-util/lldb-8.0.1
+++ b/metadata/md5-cache/dev-util/lldb-8.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=The LLVM debugger
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=libedit ncurses +python test python_targets_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=UoI-NCSA
 RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-8.0.1[xml] ~sys-devel/llvm-8.0.1 !<sys-devel/llvm-4.0
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/lldb-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz )
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7469feaeeb24efb1bc38f3579431b174
+_md5_=d2ad1cfa0e7b192bccdbed8fbacc1e42
diff --git a/metadata/md5-cache/dev-util/mdds-1.3.1 b/metadata/md5-cache/dev-util/mdds-1.3.1
deleted file mode 100644
index 62011f6aee50..000000000000
--- a/metadata/md5-cache/dev-util/mdds-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure prepare test
-DEPEND=dev-libs/boost:= valgrind? ( dev-util/valgrind ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=A collection of multi-dimensional data structure and indexing algorithm
-EAPI=6
-HOMEPAGE=https://gitlab.com/mdds/mdds
-IUSE=valgrind
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/boost:=
-SLOT=1/1.2
-SRC_URI=https://kohei.us/files/mdds/src/mdds-1.3.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2b0b723ae63bdf24b752ceb95b4f97ba
diff --git a/metadata/md5-cache/dev-util/meson-0.51.1 b/metadata/md5-cache/dev-util/meson-0.51.1
index 0009bdbfa360..96a4c4f5e534 100644
--- a/metadata/md5-cache/dev-util/meson-0.51.1
+++ b/metadata/md5-cache/dev-util/meson-0.51.1
@@ -5,7 +5,7 @@ DESCRIPTION=Open source build system
 EAPI=7
 HOMEPAGE=http://mesonbuild.com/
 IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.51.1.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1dce7d70bf89b777f19a6daf3bed5e3f
+_md5_=1a7dbb85282d9b6651ca15dbd1769a29
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.6.3 b/metadata/md5-cache/dev-util/pkgconf-1.6.3
index c515e5e809bc..5c3835119393 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.6.3
+++ b/metadata/md5-cache/dev-util/pkgconf-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
 EAPI=7
 HOMEPAGE=https://git.dereferenced.org/pkgconf/pkgconf/
 IUSE=+pkg-config test 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=ISC
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=http://distfiles.dereferenced.org/pkgconf/pkgconf-1.6.3.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b624667d84e4461344a5b6108548d7e5
+_md5_=0f40d81b4418a0131063db7c47b80aad
diff --git a/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1 b/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1
deleted file mode 100644
index d86c1634085b..000000000000
--- a/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=A perl based version of pkg-config from OpenBSD
-EAPI=5
-HOMEPAGE=http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/
-IUSE=+pkg-config 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 ~x86
-LICENSE=ISC
-RDEPEND=virtual/perl-Getopt-Long pkg-config? ( !dev-util/pkgconfig !dev-util/pkgconf[pkg-config] ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ssuominen/pkgconfig-openbsd-20130507.tar.xz pkg-config? ( https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=058d0191e54f3bd1020ef8aa4e16e8ef
diff --git a/metadata/md5-cache/dev-util/qstlink2-1.2.3 b/metadata/md5-cache/dev-util/qstlink2-1.2.3
index 1f41f7110822..8afb453591f1 100644
--- a/metadata/md5-cache/dev-util/qstlink2-1.2.3
+++ b/metadata/md5-cache/dev-util/qstlink2-1.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/fpoussin/QStlink2/archive/v1.2.3.tar.gz -> qstlink2-1.2.3.tar.gz https://github.com/fpoussin/QtUsb/archive/v0.2.1.tar.gz -> qtusb-0.2.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=82f8c613bd2089d019449e825431dd83
diff --git a/metadata/md5-cache/dev-util/rebar-2.6.1 b/metadata/md5-cache/dev-util/rebar-2.6.1
deleted file mode 100644
index ffc6fb94d85b..000000000000
--- a/metadata/md5-cache/dev-util/rebar-2.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=dev-lang/erlang
-DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
-EAPI=5
-HOMEPAGE=https://github.com/rebar/rebar
-KEYWORDS=alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/rebar/rebar/archive/2.6.1.tar.gz -> rebar-2.6.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b96d7cb2204dd2ded8c2f144e302ebd3
diff --git a/metadata/md5-cache/dev-util/scanmem-0.16.1 b/metadata/md5-cache/dev-util/scanmem-0.16.1
deleted file mode 100644
index be7ac122a470..000000000000
--- a/metadata/md5-cache/dev-util/scanmem-0.16.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-libs/readline:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Locate and modify variables in executing processes
-EAPI=6
-HOMEPAGE=https://github.com/scanmem/scanmem
-IUSE=gui python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/readline:= gui? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3 sys-auth/polkit )
-REQUIRED_USE=gui? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://github.com/scanmem/scanmem/archive/v0.16.1.tar.gz -> scanmem-0.16.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2922ce2f3e0de4a5a6fb6656a89ed49
diff --git a/metadata/md5-cache/dev-util/scons-2.5.1 b/metadata/md5-cache/dev-util/scons-2.5.1
deleted file mode 100644
index f4f1c02c42a5..000000000000
--- a/metadata/md5-cache/dev-util/scons-2.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Extensible Python-based build utility
-EAPI=6
-HOMEPAGE=http://www.scons.org/
-IUSE=doc python_targets_pypy python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/scons/scons-2.5.1.tar.gz doc? ( http://www.scons.org/doc/2.5.1/PDF/scons-user.pdf -> scons-2.5.1-user.pdf http://www.scons.org/doc/2.5.1/HTML/scons-user.html -> scons-2.5.1-user.html )
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2af875b8aae21be3ab0cf595125d28c6
diff --git a/metadata/md5-cache/dev-util/scons-3.0.4 b/metadata/md5-cache/dev-util/scons-3.0.4
deleted file mode 100644
index c26ec713183b..000000000000
--- a/metadata/md5-cache/dev-util/scons-3.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Extensible Python-based build utility
-EAPI=6
-HOMEPAGE=http://www.scons.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/scons/scons-3.0.4.tar.gz doc? ( http://www.scons.org/doc/3.0.4/PDF/scons-user.pdf -> scons-3.0.4-user.pdf http://www.scons.org/doc/3.0.4/HTML/scons-user.html -> scons-3.0.4-user.html ) test? ( https://github.com/scons/scons/archive/3.0.4.tar.gz -> scons-3.0.4.gh.tar.gz )
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c526eef97760f8d5b892b011d7701026
diff --git a/metadata/md5-cache/dev-util/scons-3.1.1 b/metadata/md5-cache/dev-util/scons-3.1.1
index e2b458f8d569..3d2bc34beeb3 100644
--- a/metadata/md5-cache/dev-util/scons-3.1.1
+++ b/metadata/md5-cache/dev-util/scons-3.1.1
@@ -5,7 +5,7 @@ DESCRIPTION=Extensible Python-based build utility
 EAPI=7
 HOMEPAGE=http://www.scons.org/
 IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-3.1.1.tar.gz doc? ( http://www.scons.org/doc/3.1.1/PDF/scons-user.pdf -> scons-3.1.1-user.pdf http://www.scons.org/doc/3.1.1/HTML/scons-user.html -> scons-3.1.1-user.html ) test? ( https://github.com/scons/scons/archive/3.1.1.tar.gz -> scons-3.1.1.gh.tar.gz )
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4f5d692cee9478cb8400fbead70c6657
+_md5_=f61b19b37deca71f68c75cb88020a6c3
diff --git a/metadata/md5-cache/dev-util/shellcheck-0.7.0 b/metadata/md5-cache/dev-util/shellcheck-0.7.0
index 65c90b46620b..4e3bbf1fda33 100644
--- a/metadata/md5-cache/dev-util/shellcheck-0.7.0
+++ b/metadata/md5-cache/dev-util/shellcheck-0.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=Shell script analysis tool
 EAPI=7
 HOMEPAGE=https://www.shellcheck.net/
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-haskell/aeson:=[profile?] >=dev-haskell/diff-0.2.0:=[profile?] >=dev-haskell/mtl-2.2.1:=[profile?] >=dev-haskell/parsec-3.0:=[profile?] >=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?] dev-haskell/regex-tdfa:=[profile?] >=dev-lang/ghc-8.0.1:=
 SLOT=0/0.7.0
 SRC_URI=mirror://hackage/packages/archive/ShellCheck/0.7.0/ShellCheck-0.7.0.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e3a89a2d40be251271e0ea52bb4311ea
+_md5_=7f3d7aab9b43810023588d584d6b7747
diff --git a/metadata/md5-cache/dev-util/shellcheck-bin-0.7.0 b/metadata/md5-cache/dev-util/shellcheck-bin-0.7.0
index 1b59fe2f25ec..c68abd62da92 100644
--- a/metadata/md5-cache/dev-util/shellcheck-bin-0.7.0
+++ b/metadata/md5-cache/dev-util/shellcheck-bin-0.7.0
@@ -3,9 +3,9 @@ DEPEND=!dev-util/shellcheck
 DESCRIPTION=Shell script analysis tool (binary package)
 EAPI=7
 HOMEPAGE=https://www.shellcheck.net/
-KEYWORDS=~amd64 ~arm
+KEYWORDS=amd64 ~arm
 LICENSE=GPL-3+
 RDEPEND=!dev-util/shellcheck
 SLOT=0
 SRC_URI=amd64? ( https://storage.googleapis.com/shellcheck/shellcheck-v0.7.0.linux.x86_64.tar.xz ) arm? ( https://storage.googleapis.com/shellcheck/shellcheck-v0.7.0.linux.armv6hf.tar.xz )
-_md5_=39780b9eb74b0a73985bcdd1a9ec9973
+_md5_=726535e54afec2b62186124cda7ccaa7
diff --git a/metadata/md5-cache/dev-util/sysdig-0.26.3 b/metadata/md5-cache/dev-util/sysdig-0.26.3
deleted file mode 100644
index 8da29ca07280..000000000000
--- a/metadata/md5-cache/dev-util/sysdig-0.26.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/grpc:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= app-arch/xz-utils virtual/os-headers modules? ( kernel_linux? ( virtual/modutils ) ) modules? ( sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) )
-DESCRIPTION=A system exploration and troubleshooting tool
-EAPI=7
-HOMEPAGE=https://www.sysdig.org/
-IUSE=libressl +modules kernel_linux kernel_linux modules
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 modules? ( || ( MIT GPL-2 ) )
-RDEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_pre:0= dev-libs/libb64:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/grpc:0= sys-libs/ncurses:0= sys-libs/zlib:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-misc/curl:0= modules? ( kernel_linux? ( virtual/modutils ) )
-SLOT=0
-SRC_URI=https://github.com/draios/sysdig/archive/0.26.3.tar.gz -> sysdig-0.26.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0285c1ee6cb6f7ec6841065c8a58ca41
diff --git a/metadata/md5-cache/dev-util/webstorm-2017.2.4.172.4155.35 b/metadata/md5-cache/dev-util/webstorm-2017.2.4.172.4155.35
index ae0cc4f2f9d5..88b4219c636f 100644
--- a/metadata/md5-cache/dev-util/webstorm-2017.2.4.172.4155.35
+++ b/metadata/md5-cache/dev-util/webstorm-2017.2.4.172.4155.35
@@ -5,8 +5,8 @@ HOMEPAGE=http://www.jetbrains.com/webstorm
 KEYWORDS=~amd64 ~x86
 LICENSE=WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal
 RDEPEND=>=virtual/jdk-1.7
-RESTRICT=splitdebug
+RESTRICT=bindist mirror splitdebug
 SLOT=2017
 SRC_URI=http://download.jetbrains.com/webstorm/WebStorm-2017.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=92004403e72e361f21b66fd1faf3b601
+_md5_=9a89fb90ace4f529cfbe5ecc4ade714e
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index db03f87572f1..672eb524ebe9 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/colorcvs-1.4-r2 b/metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
index 4ab2ed8948ad..4707216cc61c 100644
--- a/metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
+++ b/metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-vcs/cvs
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/colorcvs-1.4.tar.bz2
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=4b6e886bb0c901873c200669918a877b
diff --git a/metadata/md5-cache/dev-vcs/git-deploy-6.0.1_p20131024 b/metadata/md5-cache/dev-vcs/git-deploy-6.0.1_p20131024
index 19f3cdd29090..9a0754704f14 100644
--- a/metadata/md5-cache/dev-vcs/git-deploy-6.0.1_p20131024
+++ b/metadata/md5-cache/dev-vcs/git-deploy-6.0.1_p20131024
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl dev-vcs/git virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes virtual/perl-Memoize virtual/perl-Data-Dumper dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/git-deploy/git-deploy/archive/e9ef93debd12d85e70676dd79b4bd78ac2b05271.tar.gz -> git-deploy-6.0.1_p20131024.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2595ebf2113dcc247d9db84fb4dbb708
diff --git a/metadata/md5-cache/dev-vcs/git-mailz-0.12 b/metadata/md5-cache/dev-vcs/git-mailz-0.12
deleted file mode 100644
index f4d1ee117d49..000000000000
--- a/metadata/md5-cache/dev-vcs/git-mailz-0.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Send a collection of patches as emails
-EAPI=5
-HOMEPAGE=https://github.com/roman-neuhauser/git-mailz/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=virtual/mta dev-vcs/git app-shells/zsh
-SLOT=0
-SRC_URI=http://codex.sigpipe.cz/git-mailz/git-mailz-0.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=81deac4483b1d2f0c6dc3284debd51ce
diff --git a/metadata/md5-cache/dev-vcs/git-merge-changelog-20140223 b/metadata/md5-cache/dev-vcs/git-merge-changelog-20140223
deleted file mode 100644
index f1fad315e853..000000000000
--- a/metadata/md5-cache/dev-vcs/git-merge-changelog-20140223
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Git merge driver for GNU style ChangeLog files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gnulib/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/git-merge-changelog-20140223.tar.xz
-_md5_=730609538ab3bd754c6134cce1ab3f79
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 01a2b3ae0e3a..eddb66a29df0 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/odamex-0.8.1 b/metadata/md5-cache/games-engines/odamex-0.8.1
deleted file mode 100644
index 38fc70b0b347..000000000000
--- a/metadata/md5-cache/games-engines/odamex-0.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=games-util/deutex dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer odalaunch? ( x11-libs/wxGTK:3.0-gtk3[X] ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) server? ( upnp? ( net-libs/miniupnpc:= ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Online multiplayer free software engine for DOOM
-EAPI=7
-HOMEPAGE=https://odamex.net/
-IUSE=+client master +odalaunch portmidi server upnp X
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ MIT
-RDEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer odalaunch? ( x11-libs/wxGTK:3.0-gtk3[X] ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) server? ( upnp? ( net-libs/miniupnpc:= ) )
-REQUIRED_USE=|| ( client master server )
-SLOT=0
-SRC_URI=mirror://sourceforge/odamex/Odamex/0.8.1/odamex-src-0.8.1.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40bcd3547cf9609a2b39e8506d84395f
diff --git a/metadata/md5-cache/games-engines/odamex-0.8.1-r1 b/metadata/md5-cache/games-engines/odamex-0.8.1-r1
new file mode 100644
index 000000000000..da00ec9eaf81
--- /dev/null
+++ b/metadata/md5-cache/games-engines/odamex-0.8.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=games-util/deutex dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer odalaunch? ( x11-libs/wxGTK:3.0-gtk3[X] ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) server? ( upnp? ( net-libs/miniupnpc:= ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Online multiplayer free software engine for DOOM
+EAPI=7
+HOMEPAGE=https://odamex.net/
+IUSE=+client master +odalaunch portmidi server upnp X
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+ MIT
+RDEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer odalaunch? ( x11-libs/wxGTK:3.0-gtk3[X] ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) server? ( upnp? ( net-libs/miniupnpc:= ) )
+REQUIRED_USE=|| ( client master server )
+SLOT=0
+SRC_URI=mirror://sourceforge/odamex/Odamex/0.8.1/odamex-src-0.8.1.tar.bz2
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01c87c10ce7be3d0cb9aeb64fa5bd476
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 3f624bc98a20..ba3094bc22f0 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/freedm-data-0.11.3-r2 b/metadata/md5-cache/games-fps/freedm-data-0.11.3-r2
index c1a40d48c48e..34e6abc0e9b3 100644
--- a/metadata/md5-cache/games-fps/freedm-data-0.11.3-r2
+++ b/metadata/md5-cache/games-fps/freedm-data-0.11.3-r2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/freedoom/freedoom/archive/v0.11.3.tar.gz -> freedoom-0.11.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=857993840b1d0aaf5f6fda786096e963
diff --git a/metadata/md5-cache/games-fps/freedoom-data-0.11.3-r2 b/metadata/md5-cache/games-fps/freedoom-data-0.11.3-r2
index 8f7da25d7a91..fc5ecbe1fd66 100644
--- a/metadata/md5-cache/games-fps/freedoom-data-0.11.3-r2
+++ b/metadata/md5-cache/games-fps/freedoom-data-0.11.3-r2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/freedoom/freedoom/archive/v0.11.3.tar.gz -> freedoom-0.11.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=987a661caf9ba3ce0ef15b64d7965332
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 8cccee618ae5..944f645093b7 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/wtf-20090924 b/metadata/md5-cache/games-misc/wtf-20090924
index e6d7e906b265..f251cf2e6d92 100644
--- a/metadata/md5-cache/games-misc/wtf-20090924
+++ b/metadata/md5-cache/games-misc/wtf-20090924
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=!games-misc/bsd-games
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~darkside/distfiles/wtf/wtf-20090924.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6b010f07667647169652a3db432871cc
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 8a477d76f064..e0db29305a6d 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-roguelike/moria-5.7.10 b/metadata/md5-cache/games-roguelike/moria-5.7.10
index 485fcf70a823..a45095224cde 100644
--- a/metadata/md5-cache/games-roguelike/moria-5.7.10
+++ b/metadata/md5-cache/games-roguelike/moria-5.7.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/gamestat >=sys-libs/ncurses-6.0:0=
 SLOT=0
 SRC_URI=https://github.com/dungeons-of-moria/umoria/archive/v5.7.10.tar.gz -> moria-5.7.10.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f5134eac422214f9e22490670132615
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 7fb0edb6a549..0b30303655de 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/deutex-5.2.0 b/metadata/md5-cache/games-util/deutex-5.2.0
index a6a14333832c..449741ae114b 100644
--- a/metadata/md5-cache/games-util/deutex-5.2.0
+++ b/metadata/md5-cache/games-util/deutex-5.2.0
@@ -5,9 +5,9 @@ DESCRIPTION=WAD composer for Doom, Heretic, Hexen, and Strife
 EAPI=7
 HOMEPAGE=https://github.com/Doom-Utils/deutex
 IUSE=man png
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+ LGPL-2+ HPND
 RDEPEND=png? ( media-libs/libpng:0= )
 SLOT=0
 SRC_URI=https://github.com/Doom-Utils/deutex/releases/download/v5.2.0/deutex-5.2.0.tar.xz
-_md5_=bb53e8057d75f273097133ede5d1602e
+_md5_=a333c658412f8253cd79a4aef1c34f84
diff --git a/metadata/md5-cache/games-util/lutris-0.5.3 b/metadata/md5-cache/games-util/lutris-0.5.3
new file mode 100644
index 000000000000..63570b39da31
--- /dev/null
+++ b/metadata/md5-cache/games-util/lutris-0.5.3
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/nose[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An open source gaming platform for GNU/Linux
+EAPI=7
+HOMEPAGE=https://lutris.net/
+IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unrar app-arch/unzip dev-python/pillow[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-evdev[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] gnome-base/gnome-desktop[introspection] media-sound/fluid-soundfont net-libs/libsoup net-libs/webkit-gtk:4[introspection] x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr x11-libs/gtk+:3[introspection] x11-libs/libnotify python_targets_python3_5? ( dev-lang/python:3.5[sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://lutris.net/releases/lutris_0.5.3.tar.xz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=40e5c5c38e974dbc34439ab7baa6e50a
diff --git a/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118 b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118
index a5f3c6b6ce7b..3506bc57caf9 100644
--- a/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118
+++ b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libudev:= virtual/libusb:1 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/chewi/xboxdrv/archive/6e5e8a57628095d8d0c8bbb38187afb0f3a42112.tar.gz -> xboxdrv-0.8.8_p20190118.tar.gz
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=f0c21c3f17b90d086a9718221d61a150
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 2597180faae1..e003a6257406 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/dconf-0.32.0-r1 b/metadata/md5-cache/gnome-base/dconf-0.32.0-r1
new file mode 100644
index 000000000000..179535ee3553
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/dconf-0.32.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gdbus-codegen gtk-doc? ( >=dev-util/gtk-doc-1.15 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple low-level configuration system
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/dconf
+IUSE=gtk-doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/dconf/0.32/dconf-0.32.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3b8c9c4095042ec29c8c9a5e12fc79ab
diff --git a/metadata/md5-cache/gnome-base/gdm-3.30.3-r3 b/metadata/md5-cache/gnome-base/gdm-3.30.3-r3
index 7cf8aac8b9bd..1ed0cbbc8849 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.30.3-r3
+++ b/metadata/md5-cache/gnome-base/gdm-3.30.3-r3
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44:2 dev-libs/libgudev >=x11-libs/g
 REQUIRED_USE=^^ ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.30/gdm-3.30.3.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37d69459244a7d7c9c61225b32f25255
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.30.2-r1 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.30.2-r1
index d68c0c7495e0..269221d7e934 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.30.2-r1
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.30.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sci-geosciences/geocode-glib-3.10 >=dev-libs/glib-2.53.0:2 >=gnome-bas
 REQUIRED_USE=^^ ( elogind systemd ) input_devices_wacom? ( udev ) wayland? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.30/gnome-settings-daemon-3.30.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-settings-daemon-3.30.2-patchset.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00e77efba0b949e1ac3693a6ef198d6b
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.32.1 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.32.1
new file mode 100644
index 000000000000..e5be84f38fa9
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.32.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=sci-geosciences/geocode-glib-3.10 >=dev-libs/glib-2.56:2 >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.27.90 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-3.9.5:2= colord? ( >=x11-misc/colord-1.0.2:= >=media-libs/lcms-2.2:2 ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99:= x11-libs/libX11 udev? ( virtual/libgudev:= ) wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig sys-kernel/linux-headers dev-util/glib-utils dev-util/gdbus-codegen x11-base/xorg-proto || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) test? ( || ( ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) || ( ( dev-lang/python:3.7 dev-python/dbusmock[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbusmock[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/dbusmock[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) gnome-base/gnome-session ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Gnome Settings Daemon
+EAPI=6
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-settings-daemon
+IUSE=+colord +cups debug elogind input_devices_wacom networkmanager smartcard systemd test +udev wayland test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=sci-geosciences/geocode-glib-3.10 >=dev-libs/glib-2.56:2 >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.27.90 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-3.9.5:2= colord? ( >=x11-misc/colord-1.0.2:= >=media-libs/lcms-2.2:2 ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99:= x11-libs/libX11 udev? ( virtual/libgudev:= ) wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig gnome-base/dconf elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) !<gnome-base/gnome-session-3.27.90 !<gnome-base/gdm-3.27.90
+REQUIRED_USE=^^ ( elogind systemd ) input_devices_wacom? ( udev ) wayland? ( udev )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.32/gnome-settings-daemon-3.32.1.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-settings-daemon-3.32.1-patchset.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4a8ebce0164480fed9c588c41b8aeb31
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.40.2 b/metadata/md5-cache/gnome-base/gvfs-1.40.2
index 66eb8bc84a16..ab104738958b 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.40.2
+++ b/metadata/md5-cache/gnome-base/gvfs-1.40.2
@@ -5,11 +5,11 @@ DESCRIPTION=Virtual filesystem implementation for GIO
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
 IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.57.2:2 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-2.58.0:2.4 ) zeroconf? ( >=net-dns/avahi-0.6 ) udev? ( >=virtual/libgudev-147:= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8 ) net-misc/openssh
 REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.40/gvfs-1.40.2.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cce33ae0f3e46ceb7a742088f5893902
+_md5_=a78363cbb3bd61c95adbb904f54e063b
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index d9c5c3096539..e46dff32cdcd 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.45 b/metadata/md5-cache/gnome-extra/libgsf-1.14.45
index 33f4b364e5f1..371697cd1f0b 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.45
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.45
@@ -4,10 +4,10 @@ DESCRIPTION=The GNOME Structured File Library
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/gsf/
 IUSE=bzip2 gtk +introspection
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.45.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a31d9f366d03d3127d91c14a3037e7df
+_md5_=d6e80d7500edc75892a00a0f13b487bf
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.8.20 b/metadata/md5-cache/gnome-extra/nm-applet-1.8.20
deleted file mode 100644
index 7c2c8c6e6672..000000000000
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.8.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info ayatana? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) >=dev-util/gtk-doc-am-1.0 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME applet for NetworkManager
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=ayatana +introspection +gcr +modemmanager selinux teamd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-PDEPEND=virtual/notification-daemon
-RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info ayatana? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.20.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b0f96c406ff7aa49bda427049ff6fe04
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.8.22 b/metadata/md5-cache/gnome-extra/nm-applet-1.8.22
index 9ee76d577852..51313cdebc6d 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.8.22
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.8.22
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME applet for NetworkManager
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=ayatana +introspection +gcr +modemmanager selinux teamd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 PDEPEND=virtual/notification-daemon
 RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info ayatana? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.22.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a775fcef89939f04565e33c18707be68
+_md5_=61eea7d84dde6b3ea30686175639ba17
diff --git a/metadata/md5-cache/gnustep-base/Manifest.gz b/metadata/md5-cache/gnustep-base/Manifest.gz
index 93d332fe390e..0b216c8ae95e 100644
--- a/metadata/md5-cache/gnustep-base/Manifest.gz
+++ b/metadata/md5-cache/gnustep-base/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.8 b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.8
index bb995100fcd7..19f28eff3502 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.6.8
+++ b/metadata/md5-cache/gnustep-base/gnustep-make-2.6.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 sys-devel/clang ) !libobjc2? ( !!gnustep-base/libobjc2 || ( >=sys-devel/gcc-3.3[objc] sys-devel/clang ) )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50cc2b54fb8d1063c2aa5ecd59f1692f
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.7.0 b/metadata/md5-cache/gnustep-base/gnustep-make-2.7.0
index 53ec9bce22e9..667889121105 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.7.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-make-2.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 sys-devel/clang ) !libobjc2? ( !!gnustep-base/libobjc2 || ( >=sys-devel/gcc-3.3[objc] sys-devel/clang ) )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=466a28387d2642a7b76e6aad39b0fcfe
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 199fd92d6a09..aed71e9c524a 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/waybar-0.7.2-r1 b/metadata/md5-cache/gui-apps/waybar-0.7.2-r1
deleted file mode 100644
index 16b63ae26b0f..000000000000
--- a/metadata/md5-cache/gui-apps/waybar-0.7.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:0/5 >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
-DESCRIPTION=Highly customizable Wayland bar for Sway and Wlroots based compositors.
-EAPI=7
-HOMEPAGE=https://github.com/Alexays/Waybar
-IUSE=libcxx mpd network pulseaudio tray +udev
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:0/5 >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
-SLOT=0
-SRC_URI=https://github.com/Alexays/Waybar/archive/0.7.2.tar.gz -> waybar-0.7.2.tar.gz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3c105445f78721826d7b3d28d8cc2078
diff --git a/metadata/md5-cache/gui-apps/waybar-0.8.0 b/metadata/md5-cache/gui-apps/waybar-0.8.0
new file mode 100644
index 000000000000..01baac6e798e
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/waybar-0.8.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-text/scdoc-1.9.2 virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
+DESCRIPTION=Highly customizable Wayland bar for Sway and Wlroots based compositors.
+EAPI=7
+HOMEPAGE=https://github.com/Alexays/Waybar
+IUSE=mpd network pulseaudio tray +udev
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
+SLOT=0
+SRC_URI=https://github.com/Alexays/Waybar/archive/0.8.0.tar.gz -> waybar-0.8.0.tar.gz
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=aa349df36534b99d8fbf45fddef90e28
diff --git a/metadata/md5-cache/gui-apps/waybar-9999 b/metadata/md5-cache/gui-apps/waybar-9999
index 107882385622..84a8acce018d 100644
--- a/metadata/md5-cache/gui-apps/waybar-9999
+++ b/metadata/md5-cache/gui-apps/waybar-9999
@@ -1,13 +1,13 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=app-text/scdoc-1.9.2 virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:0/5 >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
+DEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
 DESCRIPTION=Highly customizable Wayland bar for Sway and Wlroots based compositors.
 EAPI=7
 HOMEPAGE=https://github.com/Alexays/Waybar
-IUSE=libcxx mpd network pulseaudio tray +udev
+IUSE=mpd network pulseaudio tray +udev
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:0/5 >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots libcxx? ( sys-libs/libcxx ) mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
+RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/jsoncpp:= dev-libs/libinput:= dev-libs/libsigc++:2 >=dev-libs/libfmt-5.3.0:= >=dev-libs/spdlog-1.3.1:= dev-libs/wayland dev-libs/wayland-protocols gui-libs/wlroots mpd? ( media-libs/libmpdclient ) network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) tray? ( dev-libs/libdbusmenu[gtk3] ) udev? ( virtual/libudev:= )
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3c105445f78721826d7b3d28d8cc2078
+_md5_=aa349df36534b99d8fbf45fddef90e28
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 74f33487767b..ca11cdde1feb 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/libhandy-0.0.9 b/metadata/md5-cache/gui-libs/libhandy-0.0.9
index 237c1d31279b..10a85117ec9e 100644
--- a/metadata/md5-cache/gui-libs/libhandy-0.0.9
+++ b/metadata/md5-cache/gui-libs/libhandy-0.0.9
@@ -5,7 +5,7 @@ DESCRIPTION=Library with GTK widgets for mobile phones
 EAPI=7
 HOMEPAGE=https://source.puri.sm/Librem5/libhandy/
 IUSE=examples glade gtk-doc +introspection test +vala test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0.0/0
 SRC_URI=https://source.puri.sm/Librem5/libhandy/-/archive/v0.0.9/libhandy-v0.0.9.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95b38343806c54cf5359cc2bf714d810
+_md5_=5596cc9bc2f720345bd9efd69776c81b
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 93af22ae827e..334423ba08c4 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-19.08.1 b/metadata/md5-cache/kde-apps/akonadi-calendar-19.08.1
deleted file mode 100644
index e20b8033e3e9..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-19.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-mime-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcalutils-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Library for akonadi calendar integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-mime-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcalutils-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/19.08.1/src/akonadi-calendar-19.08.1.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3fdb1a087a81ed010c71e84bfc041bba
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-19.08.1-r1 b/metadata/md5-cache/kde-apps/akonadi-calendar-19.08.1-r1
new file mode 100644
index 000000000000..7be274ef27df
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-19.08.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/akonadi-mime-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcalutils-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Library for akonadi calendar integration
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/akonadi-mime-19.08.1:5 >=kde-apps/kcalcore-19.08.1:5 >=kde-apps/kcalutils-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/19.08.1/src/akonadi-calendar-19.08.1.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cc1392facca84c38dcaf09ec15a15123
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-19.08.1 b/metadata/md5-cache/kde-apps/kdepim-addons-19.08.1
deleted file mode 100644
index 681ed9fa33fd..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-19.08.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/prison-5.60.0:5 >=kde-frameworks/syntax-highlighting-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/akonadi-notes-19.08.1:5 >=kde-apps/calendarsupport-19.08.1:5 >=kde-apps/eventviews-19.08.1:5 >=kde-apps/grantleetheme-19.08.1:5 >=kde-apps/incidenceeditor-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kdepim-apps-libs-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kimap-19.08.1:5 >=kde-apps/kitinerary-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/kpkpass-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/libkleo-19.08.1:5 >=kde-apps/libksieve-19.08.1:5 >=kde-apps/libktnef-19.08.1:5 >=kde-apps/mailcommon-19.08.1:5 >=kde-apps/messagelib-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 importwizard? ( >=kde-apps/akonadi-import-wizard-19.08.1:5 ) markdown? ( app-text/discount ) >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Plugins for KDE Personal Information Management Suite
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/kontact/
-IUSE=importwizard markdown test debug examples test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/khtml-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/prison-5.60.0:5 >=kde-frameworks/syntax-highlighting-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/akonadi-notes-19.08.1:5 >=kde-apps/calendarsupport-19.08.1:5 >=kde-apps/eventviews-19.08.1:5 >=kde-apps/grantleetheme-19.08.1:5 >=kde-apps/incidenceeditor-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kdepim-apps-libs-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kimap-19.08.1:5 >=kde-apps/kitinerary-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/kpkpass-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/libkleo-19.08.1:5 >=kde-apps/libksieve-19.08.1:5 >=kde-apps/libktnef-19.08.1:5 >=kde-apps/mailcommon-19.08.1:5 >=kde-apps/messagelib-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 importwizard? ( >=kde-apps/akonadi-import-wizard-19.08.1:5 ) markdown? ( app-text/discount ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdepim-addons-19.08.1.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=92b5054ca5fec7298d5951f85848cd42
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-19.08.1-r1 b/metadata/md5-cache/kde-apps/kdepim-addons-19.08.1-r1
new file mode 100644
index 000000000000..fdbbd6fa95af
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-19.08.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/prison-5.60.0:5 >=kde-frameworks/syntax-highlighting-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/akonadi-notes-19.08.1:5 >=kde-apps/calendarsupport-19.08.1:5 >=kde-apps/eventviews-19.08.1:5 >=kde-apps/grantleetheme-19.08.1:5 >=kde-apps/incidenceeditor-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kdepim-apps-libs-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kimap-19.08.1:5 >=kde-apps/kitinerary-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/kpkpass-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/libkleo-19.08.1:5 >=kde-apps/libksieve-19.08.1:5 >=kde-apps/libktnef-19.08.1:5 >=kde-apps/mailcommon-19.08.1:5 >=kde-apps/messagelib-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 importwizard? ( >=kde-apps/akonadi-import-wizard-19.08.1:5 ) markdown? ( app-text/discount ) >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Plugins for KDE Personal Information Management Suite
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/kontact/
+IUSE=importwizard markdown test debug examples test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/prison-5.60.0:5 >=kde-frameworks/syntax-highlighting-5.60.0:5 >=kde-apps/akonadi-19.08.1:5 >=kde-apps/akonadi-contacts-19.08.1:5 >=kde-apps/akonadi-notes-19.08.1:5 >=kde-apps/calendarsupport-19.08.1:5 >=kde-apps/eventviews-19.08.1:5 >=kde-apps/grantleetheme-19.08.1:5 >=kde-apps/incidenceeditor-19.08.1:5 >=kde-apps/kcontacts-19.08.1:5 >=kde-apps/kdepim-apps-libs-19.08.1:5 >=kde-apps/kidentitymanagement-19.08.1:5 >=kde-apps/kimap-19.08.1:5 >=kde-apps/kitinerary-19.08.1:5 >=kde-apps/kmailtransport-19.08.1:5 >=kde-apps/kmime-19.08.1:5 >=kde-apps/kpkpass-19.08.1:5 >=kde-apps/libkdepim-19.08.1:5 >=kde-apps/libkleo-19.08.1:5 >=kde-apps/libksieve-19.08.1:5 >=kde-apps/libktnef-19.08.1:5 >=kde-apps/mailcommon-19.08.1:5 >=kde-apps/messagelib-19.08.1:5 >=kde-apps/pimcommon-19.08.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 importwizard? ( >=kde-apps/akonadi-import-wizard-19.08.1:5 ) markdown? ( app-text/discount ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/19.08.1/src/kdepim-addons-19.08.1.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5856de8d44b5a3bd27b46e2b4427c158
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index d4d7e98667ef..1b1783928f28 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.60.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.60.0
index e41bb0944bed..a919e60fdd61 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.60.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.60.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.60
 SRC_URI=mirror://kde/stable/frameworks/5.60/bluez-qt-5.60.0.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af0f3808d23351a9c52bcc1abdedd346
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.61.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.61.0
index 591f7eeb89a7..eed957cda542 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.61.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.61.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.61:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.61
 SRC_URI=mirror://kde/stable/frameworks/5.61/bluez-qt-5.61.0.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=059b8cd0f770a446f49421236cdea4d5
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.61.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.61.0
index d2bef1ccc5b0..a7b2d379742b 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.61.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.61.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/kwayland.git
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-libs/wayland-1.15.0 media-libs/mesa[egl] >=dev-libs/wayland-protocols-1.15 >=dev-qt/qtwayland-5.12.3:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.61:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 RESTRICT=test
 SLOT=5/5.61
 SRC_URI=mirror://kde/stable/frameworks/5.61/kwayland-5.61.0.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4581aa9b5459a5a6c7a1393263454e39
+_md5_=15e8d1603c49921c5eb24313bd894bed
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.61.0 b/metadata/md5-cache/kde-frameworks/solid-5.61.0
index ec426f6c645a..d13451ec9f9b 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.61.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.61.0
@@ -5,10 +5,10 @@ DESCRIPTION=Provider for platform independent hardware discovery, abstraction an
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.61:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 SLOT=5/5.61
 SRC_URI=mirror://kde/stable/frameworks/5.61/solid-5.61.0.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5df27e39bcb49e8e7f427dcb0284ea41
+_md5_=0a24da3af6306a572aeb9165973269c1
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 4c92a008f4c5..629e2feefdbf 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-1.3.4 b/metadata/md5-cache/kde-misc/kdeconnect-1.3.4
deleted file mode 100644
index ab1f3f9c9c20..000000000000
--- a/metadata/md5-cache/kde-misc/kdeconnect-1.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] app? ( >=kde-frameworks/kdeclarative-5.60.0:5 ) bluetooth? ( >=dev-qt/qtbluetooth-5.12.3:5 ) mousepad? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Adds communication between KDE Plasma and your smartphone
-EAPI=7
-HOMEPAGE=https://kde.org/ https://community.kde.org/KDEConnect
-IUSE=app bluetooth mousepad wayland debug +handbook test selinux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] app? ( >=kde-frameworks/kdeclarative-5.60.0:5 ) bluetooth? ( >=dev-qt/qtbluetooth-5.12.3:5 ) mousepad? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) net-fs/sshfs app? ( >=kde-frameworks/kirigami-5.60.0:5 ) !kde-misc/kdeconnect:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-kdeconnect ) >=dev-qt/qtcore-5.12.3:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/kdeconnect/1.3.4/kdeconnect-kde-1.3.4.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d12573ab3bb932fbe5ee230a366c71a2
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-1.3.5 b/metadata/md5-cache/kde-misc/kdeconnect-1.3.5
index bb69d92811c9..0027cb723026 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-1.3.5
+++ b/metadata/md5-cache/kde-misc/kdeconnect-1.3.5
@@ -5,11 +5,11 @@ DESCRIPTION=Adds communication between KDE Plasma and your smartphone
 EAPI=7
 HOMEPAGE=https://kde.org/ https://community.kde.org/KDEConnect
 IUSE=app bluetooth mousepad wayland debug +handbook test selinux
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=app-crypt/qca-2.1.0:2[qt5(+),ssl] app? ( >=kde-frameworks/kdeclarative-5.60.0:5 ) bluetooth? ( >=dev-qt/qtbluetooth-5.12.3:5 ) mousepad? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) net-fs/sshfs app? ( >=kde-frameworks/kirigami-5.60.0:5 ) !kde-misc/kdeconnect:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-kdeconnect ) >=dev-qt/qtcore-5.12.3:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdeconnect/1.3.5/kdeconnect-kde-1.3.5.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91eb8820f0b9b2fdaca6293f4f710135
+_md5_=df84abbedbd1feadcf64d206dc099353
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index fcb6f0042355..e7f1e42cdc8f 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.15.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.15.5
index d20a738ded1a..6e64b3bfb837 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.15.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.15.5
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.57.0:5 handbook? ( >=kde-frameworks/kdoctools-5.57.0:5 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kinit-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-plasma/libksysguard-5.15.5:5[-minimal(-)] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.11.1:5
+DEPEND=>=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kinit-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-plasma/libksysguard-5.15.5:5[-minimal(-)] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm-sensors? ( sys-apps/lm-sensors:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.11.1:5
 DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=7
 HOMEPAGE=https://kde.org/
-IUSE=lm_sensors debug +handbook
+IUSE=lm-sensors debug +handbook
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kinit-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-plasma/libksysguard-5.15.5:5[-minimal(-)] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.57.0:5 >=kde-frameworks/kconfig-5.57.0:5 >=kde-frameworks/kconfigwidgets-5.57.0:5 >=kde-frameworks/kcoreaddons-5.57.0:5 >=kde-frameworks/kdbusaddons-5.57.0:5 >=kde-frameworks/ki18n-5.57.0:5 >=kde-frameworks/kiconthemes-5.57.0:5 >=kde-frameworks/kinit-5.57.0:5 >=kde-frameworks/kio-5.57.0:5 >=kde-frameworks/kitemviews-5.57.0:5 >=kde-frameworks/knewstuff-5.57.0:5 >=kde-frameworks/knotifications-5.57.0:5 >=kde-frameworks/kwidgetsaddons-5.57.0:5 >=kde-frameworks/kwindowsystem-5.57.0:5 >=kde-frameworks/kxmlgui-5.57.0:5 >=kde-plasma/libksysguard-5.15.5:5[-minimal(-)] >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm-sensors? ( sys-apps/lm-sensors:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.57.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.15.5/ksysguard-5.15.5.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=422577308b3b8a733456bc1aaa0af2f4
+_md5_=830ded4cac54b9a7d9e005f1d8493434
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.16.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.16.5
index b263c9182579..d47d71a201d2 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.16.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.16.5
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libksysguard-5.16.5:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm_sensors? ( sys-apps/lm_sensors:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libksysguard-5.16.5:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm-sensors? ( sys-apps/lm-sensors:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=7
 HOMEPAGE=https://kde.org/
-IUSE=lm_sensors debug +handbook
+IUSE=lm-sensors debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libksysguard-5.16.5:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm_sensors? ( sys-apps/lm_sensors:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libksysguard-5.16.5:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm-sensors? ( sys-apps/lm-sensors:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.16.5/ksysguard-5.16.5.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40e3968294808b72b8a2ac450a213bf4
+_md5_=1439d512969afd69f977ad275e4e3395
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.16.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.16.5
index 95d36a5fe7f9..798016b24425 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.16.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.16.5
@@ -5,11 +5,11 @@ DESCRIPTION=Plasma screen management library
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kwayland-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 RESTRICT=test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.16.5/libkscreen-5.16.5.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8f0fc93f3156992d134e0844c745986
+_md5_=224e11b82023115bdfb6acbb01240d9c
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.16.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.16.5
index 97cc7d9de886..065e755ce1b9 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.16.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.16.5
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 classic? ( >=kde-frameworks/khtml-5.60.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=System settings utility
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Control Center to configure KDE Plasma desktop
 EAPI=7
 HOMEPAGE=https://kde.org/
-IUSE=classic gtk debug +handbook
+IUSE=debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 classic? ( >=kde-frameworks/khtml-5.60.0:5 ) >=kde-frameworks/kirigami-5.60.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.16.5:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.16.5/systemsettings-5.16.5.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=416319dbc832d681c1cb88e9eea10efd
+_md5_=fe6d116197faae97a8778ba6302d48a9
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index 289060a4e0e4..3c7e3b0cab30 100644
--- a/metadata/md5-cache/lxde-base/Manifest.gz
+++ b/metadata/md5-cache/lxde-base/Manifest.gz
diff --git a/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5 b/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
index 0d915aa5c701..fff14b3bd281 100644
--- a/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
+++ b/metadata/md5-cache/lxde-base/lxmenu-data-0.1.5
@@ -3,8 +3,8 @@ DEPEND=sys-devel/gettext >=dev-util/intltool-0.40.0 virtual/pkgconfig
 DESCRIPTION=Provides files needed for LXDE application menus
 EAPI=6
 HOMEPAGE=https://lxde.org/
-KEYWORDS=~alpha amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxmenu-data-0.1.5.tar.xz
-_md5_=6c51b096b720d36b8eaafa3ab3129d69
+_md5_=a3c120144b5aaf26af4db68c1adf5eba
diff --git a/metadata/md5-cache/lxde-base/lxsession-0.5.4-r1 b/metadata/md5-cache/lxde-base/lxsession-0.5.4-r1
index 2641452ef552..3d6a329f2536 100644
--- a/metadata/md5-cache/lxde-base/lxsession-0.5.4-r1
+++ b/metadata/md5-cache/lxde-base/lxsession-0.5.4-r1
@@ -5,10 +5,10 @@ DESCRIPTION=LXDE session manager
 EAPI=7
 HOMEPAGE=https://wiki.lxde.org/en/LXSession
 IUSE=nls upower
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc x86 ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ppc x86 ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-libs/dbus-glib dev-libs/libunique:1 lxde-base/lxde-common sys-auth/polkit x11-libs/gtk+:2 x11-libs/libX11 sys-apps/dbus !lxde-base/lxsession-edit sys-apps/lsb-release upower? ( sys-power/upower )
 SLOT=0
 SRC_URI=mirror://sourceforge/lxde/lxsession-0.5.4.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd
-_md5_=702c5a44d74bb3f52b80a5204ae26cb2
+_md5_=f2252ad0530021ce33ba4905ebf41fc4
diff --git a/metadata/md5-cache/lxqt-base/Manifest.gz b/metadata/md5-cache/lxqt-base/Manifest.gz
index 92bbd5b23546..ab55322045fa 100644
--- a/metadata/md5-cache/lxqt-base/Manifest.gz
+++ b/metadata/md5-cache/lxqt-base/Manifest.gz
diff --git a/metadata/md5-cache/lxqt-base/liblxqt-0.14.1 b/metadata/md5-cache/lxqt-base/liblxqt-0.14.1
index 37fe86b91006..589633e526fb 100644
--- a/metadata/md5-cache/lxqt-base/liblxqt-0.14.1
+++ b/metadata/md5-cache/lxqt-base/liblxqt-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=Common base library for the LXQt desktop environment
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+ BSD
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] sys-auth/polkit-qt x11-libs/libX11 x11-libs/libXScrnSaver !lxqt-base/lxqt-l10n
 SLOT=0/0.14
 SRC_URI=https://downloads.lxqt.org/downloads/liblxqt/0.14.1/liblxqt-0.14.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36720386cb8684bbb74a2a39b354e51d
+_md5_=d9371809f3820bfcaf3f176e5a202623
diff --git a/metadata/md5-cache/lxqt-base/lxqt-about-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-about-0.14.1
index dfdacf1e51b5..cac859d4ce7c 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-about-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-about-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets
 DESCRIPTION=LXQt about dialog
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-about/0.14.1/lxqt-about-0.14.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=554b2361dbd5415a2d6f2ec7f59a5afa
+_md5_=680891460babc3f1704b3bb2b908c827
diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-config-0.14.1
index 5b71ba6024e0..e7711b492efa 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-config-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-config-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=LXQt system configuration control center
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=+monitor +touchpad
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.14* sys-libs/zlib:= x11-apps/setxkbmap x11-libs/libxcb:= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes monitor? ( kde-plasma/libkscreen:5= ) touchpad? ( virtual/libudev x11-drivers/xf86-input-libinput x11-libs/libXext ) !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-config/0.14.1/lxqt-config-0.14.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5634fd0efb7b458265a8c600c9ad391f
+_md5_=c6ae1413987ca4e54df02af4dfd26046
diff --git a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1
index 69237e5bbb9e..62d4ba4e9362 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=Daemon and library for global keyboard shortcuts registration
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 =lxqt-base/liblxqt-0.14* kde-frameworks/kwindowsystem:5 x11-libs/libX11 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-globalkeys/0.14.1/lxqt-globalkeys-0.14.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6887b235cc5441cc495f3cd3687eb0a
+_md5_=e1f90fba699a0d95da5ece1a0d08aa51
diff --git a/metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1 b/metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1
index 699d2474adbb..ac909f197f85 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1
+++ b/metadata/md5-cache/lxqt-base/lxqt-meta-0.14.1-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Meta ebuild for LXQt, the Lightweight Desktop Environment
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=+about admin +filemanager lightdm lximage minimal nls +policykit powermanagement processviewer screenshot sddm ssh-askpass sudo terminal +trash
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=metapackage
 RDEPEND=kde-frameworks/oxygen-icons >=lxde-base/lxmenu-data-0.1.5 =lxqt-base/lxqt-config-0.14* =lxqt-base/lxqt-globalkeys-0.14* =lxqt-base/lxqt-notificationd-0.14* =lxqt-base/lxqt-panel-0.14* =lxqt-base/lxqt-qtplugin-0.14* =lxqt-base/lxqt-runner-0.14* =lxqt-base/lxqt-session-0.14* virtual/ttf-fonts =x11-themes/lxqt-themes-0.14* about? ( =lxqt-base/lxqt-about-0.14* ) admin? ( =lxqt-base/lxqt-admin-0.14* ) filemanager? ( =x11-misc/pcmanfm-qt-0.14* ) lightdm? ( x11-misc/lightdm ) lximage? ( media-gfx/lximage-qt ) !minimal? ( x11-wm/openbox x11-misc/obconf-qt ) nls? ( dev-qt/qttranslations:5 ) policykit? ( =lxqt-base/lxqt-policykit-0.14* ) powermanagement? ( =lxqt-base/lxqt-powermanagement-0.14* ) processviewer? ( x11-misc/qps:0 ) screenshot? ( x11-misc/screengrab:0 ) sddm? ( >=x11-misc/sddm-0.11.0 ) ssh-askpass? ( =lxqt-base/lxqt-openssh-askpass-0.14* ) sudo? ( =lxqt-base/lxqt-sudo-0.14* ) terminal? ( x11-terms/qterminal:0 ) trash? ( gnome-base/gvfs )
 REQUIRED_USE=trash? ( filemanager )
 SLOT=0
-_md5_=5f9bac28b697bd8a9ed4132437d751f1
+_md5_=cbd047bece4e217f15a51270b860a939
diff --git a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1
index f375ac9b4f16..d7aea80f94ac 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt notification daemon and library
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-notificationd/0.14.1/lxqt-notificationd-0.14.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a654b03139a0dfe48b4cc4b33d0c1097
+_md5_=be7305090e3ceaea6a8fb34a5feab54a
diff --git a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1
index 8483dbb3a500..6e309b71df74 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14*
 DESCRIPTION=LXQt OpenSSH user password prompt tool
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-openssh-askpass/0.14.1/lxqt-openssh-askpass-0.14.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f588f2c485e31c17ced7a3d04ef9e7ac
+_md5_=c7048cb448e4ce0bb8d1c36edbefec7d
diff --git a/metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1
index cdb6494740cd..b94e289424e1 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-panel-0.14.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5 >=dev-util/lxqt-build-tools-0.6.0 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/lxmenu-data-0.1.5 >=lxde-base/menu-cache-1.1.0 =lxqt-base/liblxqt-0.14* =lxqt-base/lxqt-globalkeys-0.14* x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) tray? ( x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/xcb-util ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pavucontrol-qt media-sound/pulseaudio ) )
+DEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/lxmenu-data-0.1.5 >=lxde-base/menu-cache-1.1.0 =lxqt-base/liblxqt-0.14* =lxqt-base/lxqt-globalkeys-0.14* x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm-sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) tray? ( x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/xcb-util ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pavucontrol-qt media-sound/pulseaudio ) )
 DESCRIPTION=LXQt desktop panel and plugins
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +mainmenu +mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop +spacer statusnotifier sysstat +taskbar +tray +volume +worldclock
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/lxmenu-data-0.1.5 >=lxde-base/menu-cache-1.1.0 =lxqt-base/liblxqt-0.14* =lxqt-base/lxqt-globalkeys-0.14* x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) tray? ( x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/xcb-util ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pavucontrol-qt media-sound/pulseaudio ) ) !lxqt-base/lxqt-l10n
+RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/lxmenu-data-0.1.5 >=lxde-base/menu-cache-1.1.0 =lxqt-base/liblxqt-0.14* =lxqt-base/lxqt-globalkeys-0.14* x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm-sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) tray? ( x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/xcb-util ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pavucontrol-qt media-sound/pulseaudio ) ) !lxqt-base/lxqt-l10n
 REQUIRED_USE=|| ( desktopswitch mainmenu showdesktop taskbar ) volume? ( || ( alsa pulseaudio ) )
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-panel/0.14.1/lxqt-panel-0.14.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2f6f20b7f2a4fe3a48e601384cfb38e
+_md5_=c2906bc66b3d17e88cd7e3b40ca0e981
diff --git a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1
index b51e8cc11511..497b3a19903f 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5
 DESCRIPTION=LXQt PolKit authentication agent
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.14* sys-auth/polkit-qt[qt5(+)] !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-policykit/0.14.1/lxqt-policykit-0.14.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c6f48d1316d1fc0e5982f0cd67e25efa
+_md5_=a43c63e067dec761ba8bd8c2778eb152
diff --git a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0 b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0
index 8db42942a350..474ef7bfcb58 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.14.0
@@ -4,10 +4,10 @@ DEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore
 DESCRIPTION=LXQt system integration plugin for Qt
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 =x11-libs/libfm-qt-0.14*
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-qtplugin/0.14.0/lxqt-qtplugin-0.14.0.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8b385cd76bf7fcc764fc2f6d43d0a3b
+_md5_=969fa25041fa7c10c5cb455cf367dc5b
diff --git a/metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1
index 32636bbec71f..15da5255b19e 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-runner-0.14.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-cpp/muParser-2.2.3:= >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-
 DESCRIPTION=LXQt quick launcher
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/muParser-2.2.3:= >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5 >=lxde-base/menu-cache-0.5.1 =lxqt-base/liblxqt-0.14* =lxqt-base/lxqt-globalkeys-0.14* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-runner/0.14.1/lxqt-runner-0.14.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88418133c567dcbc7103281bc15d19c0
+_md5_=228c10c8a3dc26522e1c995db0dac9f2
diff --git a/metadata/md5-cache/lxqt-base/lxqt-session-0.14.1 b/metadata/md5-cache/lxqt-base/lxqt-session-0.14.1
index 662d60a55dbf..af87745d998b 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-session-0.14.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-session-0.14.1
@@ -5,10 +5,10 @@ DESCRIPTION=LXQT session manager
 EAPI=7
 HOMEPAGE=https://lxqt.org/
 IUSE=+themes +udev
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5[X] =lxqt-base/liblxqt-0.14* x11-libs/libX11 x11-misc/xdg-user-dirs themes? ( =x11-themes/lxqt-themes-0.14* ) udev? ( virtual/libudev ) !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-session/0.14.1/lxqt-session-0.14.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=21716734026e00591bf53cb3304f6dd7
+_md5_=70611f1475af1eecb9789c0e622e1bef
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 6589245d390d..61db1d439f1a 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/clawsker-0.7.10 b/metadata/md5-cache/mail-client/clawsker-0.7.10
deleted file mode 100644
index 0596b91df091..000000000000
--- a/metadata/md5-cache/mail-client/clawsker-0.7.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Applet to edit Claws Mail's hidden preferences
-EAPI=0
-HOMEPAGE=http://www.claws-mail.org/clawsker.php
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Gtk2-1.200 >=dev-perl/Locale-gettext-1.05 >=mail-client/claws-mail-3.5.0
-SLOT=0
-SRC_URI=http://www.claws-mail.org/tools/clawsker-0.7.10.tar.gz
-_md5_=c81616d2c73ed28d9bc84634ad1ba142
diff --git a/metadata/md5-cache/mail-client/cone-0.92 b/metadata/md5-cache/mail-client/cone-0.92
deleted file mode 100644
index a2417499828f..000000000000
--- a/metadata/md5-cache/mail-client/cone-0.92
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/openssl-0.9.6:0= dev-libs/libxml2 sys-libs/ncurses >=net-libs/courier-unicode-1.2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=CONE: COnsole News reader and Emailer
-EAPI=5
-HOMEPAGE=https://www.courier-mta.org/cone/
-IUSE=crypt fam gnutls idn ipv6 ldap
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/openssl-0.9.6:0= dev-libs/libxml2 sys-libs/ncurses >=net-libs/courier-unicode-1.2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap )
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/cone-0.92.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=71791cfb301340b78479eb2a3a4ee8cc
diff --git a/metadata/md5-cache/mail-client/cone-0.95 b/metadata/md5-cache/mail-client/cone-0.95
deleted file mode 100644
index 0441e95074d7..000000000000
--- a/metadata/md5-cache/mail-client/cone-0.95
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/openssl-0.9.6:0= dev-libs/libxml2 sys-libs/ncurses:= >=net-libs/courier-unicode-1.2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=CONE: COnsole News reader and Emailer
-EAPI=6
-HOMEPAGE=https://www.courier-mta.org/cone/
-IUSE=crypt fam gnutls idn ipv6 ldap
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/openssl-0.9.6:0= dev-libs/libxml2 sys-libs/ncurses:= >=net-libs/courier-unicode-1.2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap )
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/cone-0.95.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=44d8a3517a37afd812394b4b504b0c1d
diff --git a/metadata/md5-cache/mail-client/cone-0.96 b/metadata/md5-cache/mail-client/cone-0.96
deleted file mode 100644
index c204b21d1ea4..000000000000
--- a/metadata/md5-cache/mail-client/cone-0.96
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/openssl-0.9.6:0= dev-libs/libxml2 sys-libs/ncurses:= >=net-libs/courier-unicode-2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap ) dev-lang/perl >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=CONE: COnsole News reader and Emailer
-EAPI=6
-HOMEPAGE=https://www.courier-mta.org/cone/
-IUSE=crypt fam gnutls idn ipv6 ldap
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/openssl-0.9.6:0= dev-libs/libxml2 sys-libs/ncurses:= >=net-libs/courier-unicode-2 app-text/aspell crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap )
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/cone-0.96.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3b052817a25e90d18e3c164925eac54
diff --git a/metadata/md5-cache/mail-client/thunderbird-60.8.0 b/metadata/md5-cache/mail-client/thunderbird-60.8.0
index e2b467723cd2..6c8d0961cc7f 100644
--- a/metadata/md5-cache/mail-client/thunderbird-60.8.0
+++ b/metadata/md5-cache/mail-client/thunderbird-60.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=wifi? ( dbus )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ar.xpi -> thunderbird-60.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ast.xpi -> thunderbird-60.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/be.xpi -> thunderbird-60.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/bg.xpi -> thunderbird-60.8.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/br.xpi -> thunderbird-60.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ca.xpi -> thunderbird-60.8.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/cs.xpi -> thunderbird-60.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/cy.xpi -> thunderbird-60.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/da.xpi -> thunderbird-60.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/de.xpi -> thunderbird-60.8.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/el.xpi -> thunderbird-60.8.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/en-GB.xpi -> thunderbird-60.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-60.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-60.8.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/et.xpi -> thunderbird-60.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/eu.xpi -> thunderbird-60.8.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/fi.xpi -> thunderbird-60.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/fr.xpi -> thunderbird-60.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-60.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-60.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/gd.xpi -> thunderbird-60.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/gl.xpi -> thunderbird-60.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/he.xpi -> thunderbird-60.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/hr.xpi -> thunderbird-60.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/hsb.xpi -> thunderbird-60.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/hu.xpi -> thunderbird-60.8.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-60.8.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/id.xpi -> thunderbird-60.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/is.xpi -> thunderbird-60.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/it.xpi -> thunderbird-60.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ja.xpi -> thunderbird-60.8.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ko.xpi -> thunderbird-60.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/lt.xpi -> thunderbird-60.8.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-60.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/nl.xpi -> thunderbird-60.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-60.8.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/pl.xpi -> thunderbird-60.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-60.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-60.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/rm.xpi -> thunderbird-60.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ro.xpi -> thunderbird-60.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/ru.xpi -> thunderbird-60.8.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/si.xpi -> thunderbird-60.8.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/sk.xpi -> thunderbird-60.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/sl.xpi -> thunderbird-60.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/sq.xpi -> thunderbird-60.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/sr.xpi -> thunderbird-60.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-60.8.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/tr.xpi -> thunderbird-60.8.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/uk.xpi -> thunderbird-60.8.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/vi.xpi -> thunderbird-60.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-60.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-60.8.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/60.8.0/source/thunderbird-60.8.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/thunderbird-60.0-patches-0.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	c4b97a91aadfec77274ee168a08fa80e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=def8d7ae335e536ff0f761b0a88bc4e2
diff --git a/metadata/md5-cache/mail-client/thunderbird-68.0-r2 b/metadata/md5-cache/mail-client/thunderbird-68.0-r2
index ddf31208d229..2edef2c24c01 100644
--- a/metadata/md5-cache/mail-client/thunderbird-68.0-r2
+++ b/metadata/md5-cache/mail-client/thunderbird-68.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=wifi? ( dbus ) pgo? ( lto )
 RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/68.0/source/thunderbird-68.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-11.tar.xz l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ar.xpi -> thunderbird-68.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ast.xpi -> thunderbird-68.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/be.xpi -> thunderbird-68.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/bg.xpi -> thunderbird-68.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/br.xpi -> thunderbird-68.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ca.xpi -> thunderbird-68.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/cs.xpi -> thunderbird-68.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/cy.xpi -> thunderbird-68.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/da.xpi -> thunderbird-68.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/de.xpi -> thunderbird-68.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/el.xpi -> thunderbird-68.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/en-GB.xpi -> thunderbird-68.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/es-AR.xpi -> thunderbird-68.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/es-ES.xpi -> thunderbird-68.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/et.xpi -> thunderbird-68.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/eu.xpi -> thunderbird-68.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/fi.xpi -> thunderbird-68.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/fr.xpi -> thunderbird-68.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-68.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-68.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/gd.xpi -> thunderbird-68.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/gl.xpi -> thunderbird-68.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/he.xpi -> thunderbird-68.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/hr.xpi -> thunderbird-68.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/hsb.xpi -> thunderbird-68.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/hu.xpi -> thunderbird-68.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-68.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/id.xpi -> thunderbird-68.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/is.xpi -> thunderbird-68.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/it.xpi -> thunderbird-68.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ja.xpi -> thunderbird-68.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ko.xpi -> thunderbird-68.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/lt.xpi -> thunderbird-68.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-68.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/nl.xpi -> thunderbird-68.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-68.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/pl.xpi -> thunderbird-68.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-68.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-68.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/rm.xpi -> thunderbird-68.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ro.xpi -> thunderbird-68.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/ru.xpi -> thunderbird-68.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/si.xpi -> thunderbird-68.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sk.xpi -> thunderbird-68.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sl.xpi -> thunderbird-68.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sq.xpi -> thunderbird-68.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sr.xpi -> thunderbird-68.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-68.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/tr.xpi -> thunderbird-68.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/uk.xpi -> thunderbird-68.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/vi.xpi -> thunderbird-68.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-68.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-68.0-zh-TW.xpi )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	c4b97a91aadfec77274ee168a08fa80e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=520c4aa4013654540149f5b2b55bff99
diff --git a/metadata/md5-cache/mail-client/thunderbird-68.1.0 b/metadata/md5-cache/mail-client/thunderbird-68.1.0
new file mode 100644
index 000000000000..b760fb8c91fb
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-68.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.44.1 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.8.7 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.34.0 >=virtual/rust-1.34.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=https://www.mozilla.org/thunderbird
+IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free +gmp-autoupdate hardened jack lightning lto neon pgo pulseaudio selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.44.1 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=wifi? ( dbus ) pgo? ( lto )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/source/thunderbird-68.1.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-6.2.5.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-4.4.1.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-11.tar.xz l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ar.xpi -> thunderbird-68.1.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ast.xpi -> thunderbird-68.1.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/be.xpi -> thunderbird-68.1.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/bg.xpi -> thunderbird-68.1.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/br.xpi -> thunderbird-68.1.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ca.xpi -> thunderbird-68.1.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/cs.xpi -> thunderbird-68.1.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/cy.xpi -> thunderbird-68.1.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/da.xpi -> thunderbird-68.1.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/de.xpi -> thunderbird-68.1.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/el.xpi -> thunderbird-68.1.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/en-GB.xpi -> thunderbird-68.1.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/es-AR.xpi -> thunderbird-68.1.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/es-ES.xpi -> thunderbird-68.1.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/et.xpi -> thunderbird-68.1.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/eu.xpi -> thunderbird-68.1.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/fi.xpi -> thunderbird-68.1.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/fr.xpi -> thunderbird-68.1.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-68.1.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-68.1.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/gd.xpi -> thunderbird-68.1.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/gl.xpi -> thunderbird-68.1.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/he.xpi -> thunderbird-68.1.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/hr.xpi -> thunderbird-68.1.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/hsb.xpi -> thunderbird-68.1.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/hu.xpi -> thunderbird-68.1.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-68.1.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/id.xpi -> thunderbird-68.1.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/is.xpi -> thunderbird-68.1.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/it.xpi -> thunderbird-68.1.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ja.xpi -> thunderbird-68.1.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ko.xpi -> thunderbird-68.1.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/lt.xpi -> thunderbird-68.1.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-68.1.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/nl.xpi -> thunderbird-68.1.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-68.1.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/pl.xpi -> thunderbird-68.1.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-68.1.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-68.1.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/rm.xpi -> thunderbird-68.1.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ro.xpi -> thunderbird-68.1.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ru.xpi -> thunderbird-68.1.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/si.xpi -> thunderbird-68.1.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/sk.xpi -> thunderbird-68.1.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/sl.xpi -> thunderbird-68.1.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/sq.xpi -> thunderbird-68.1.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/sr.xpi -> thunderbird-68.1.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-68.1.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/tr.xpi -> thunderbird-68.1.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/uk.xpi -> thunderbird-68.1.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/vi.xpi -> thunderbird-68.1.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-68.1.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-68.1.0-zh-TW.xpi )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	c4b97a91aadfec77274ee168a08fa80e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a884d24155b81783a1e07eefb44507b1
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-68.1.0 b/metadata/md5-cache/mail-client/thunderbird-bin-68.1.0
new file mode 100644
index 000000000000..e0913dfe448a
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-68.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm prepare unpack
+DEPEND=app-arch/unzip app-arch/zip app-arch/unzip
+DESCRIPTION=Thunderbird Mail Client
+EAPI=6
+HOMEPAGE=https://www.thunderbird.net/
+IUSE=+crashreporter +ffmpeg +pulseaudio selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 pulseaudio? ( !<media-sound/apulse-0.1.9 || ( media-sound/pulseaudio media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ar.xpi -> thunderbird-68.1.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ast.xpi -> thunderbird-68.1.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/be.xpi -> thunderbird-68.1.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/bg.xpi -> thunderbird-68.1.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/br.xpi -> thunderbird-68.1.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ca.xpi -> thunderbird-68.1.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/cs.xpi -> thunderbird-68.1.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/cy.xpi -> thunderbird-68.1.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/da.xpi -> thunderbird-68.1.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/de.xpi -> thunderbird-68.1.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/el.xpi -> thunderbird-68.1.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/en-GB.xpi -> thunderbird-68.1.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/es-AR.xpi -> thunderbird-68.1.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/es-ES.xpi -> thunderbird-68.1.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/et.xpi -> thunderbird-68.1.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/eu.xpi -> thunderbird-68.1.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/fi.xpi -> thunderbird-68.1.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/fr.xpi -> thunderbird-68.1.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-68.1.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-68.1.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/gd.xpi -> thunderbird-68.1.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/gl.xpi -> thunderbird-68.1.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/he.xpi -> thunderbird-68.1.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/hr.xpi -> thunderbird-68.1.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/hsb.xpi -> thunderbird-68.1.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/hu.xpi -> thunderbird-68.1.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-68.1.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/id.xpi -> thunderbird-68.1.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/is.xpi -> thunderbird-68.1.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/it.xpi -> thunderbird-68.1.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ja.xpi -> thunderbird-68.1.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ko.xpi -> thunderbird-68.1.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/lt.xpi -> thunderbird-68.1.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-68.1.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/nl.xpi -> thunderbird-68.1.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-68.1.0-nn-NO.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/pl.xpi -> thunderbird-68.1.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-68.1.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-68.1.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/rm.xpi -> thunderbird-68.1.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ro.xpi -> thunderbird-68.1.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/ru.xpi -> thunderbird-68.1.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/si.xpi -> thunderbird-68.1.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/sk.xpi -> thunderbird-68.1.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/sl.xpi -> thunderbird-68.1.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/sq.xpi -> thunderbird-68.1.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/sr.xpi -> thunderbird-68.1.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-68.1.0-sv-SE.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/tr.xpi -> thunderbird-68.1.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/uk.xpi -> thunderbird-68.1.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/vi.xpi -> thunderbird-68.1.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-68.1.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-68.1.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-x86_64/en-US/thunderbird-68.1.0.tar.bz2 -> thunderbird-bin_x86_64-68.1.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/68.1.0/linux-i686/en-US/thunderbird-68.1.0.tar.bz2 -> thunderbird-bin_i686-68.1.0.tar.bz2 ) https://dev.gentoo.org/~juippis/distfiles/lightning-68.0b6.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe2819c18c8fcd933d0a69f95da5aff5
diff --git a/metadata/md5-cache/mail-client/trojita-9999 b/metadata/md5-cache/mail-client/trojita-9999
index 1b18b2d61a8b..4aa5be2d33da 100644
--- a/metadata/md5-cache/mail-client/trojita-9999
+++ b/metadata/md5-cache/mail-client/trojita-9999
@@ -1,14 +1,14 @@
-BDEPEND=dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) zlib? ( virtual/pkgconfig ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=dev-qt/linguist-tools:5 zlib? ( virtual/pkgconfig ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 addressbook? ( kde-apps/akonadi-contacts:5 ) crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) spell? ( kde-frameworks/sonnet:5 ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) pim? ( kde-apps/akonadi-contacts:5 ) spell? ( kde-frameworks/sonnet:5 ) zlib? ( sys-libs/zlib ) test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A Qt IMAP e-mail client
 EAPI=7
 HOMEPAGE=http://trojita.flaska.net/
-IUSE=addressbook +crypt +dbus debug +password +spell test +zlib test
+IUSE=+crypt +dbus debug +password pim +spell test +zlib test
 LICENSE=|| ( GPL-2 GPL-3 )
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 addressbook? ( kde-apps/akonadi-contacts:5 ) crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) spell? ( kde-frameworks/sonnet:5 ) zlib? ( sys-libs/zlib )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 crypt? ( >=app-crypt/gpgme-1.8.0[cxx,qt5] dev-libs/mimetic ) dbus? ( dev-qt/qtdbus:5 ) password? ( dev-libs/qtkeychain[qt5(+)] ) pim? ( kde-apps/akonadi-contacts:5 ) spell? ( kde-frameworks/sonnet:5 ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=password? ( dbus )
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd7b6ee57d97cdb47506386b156ffa48
+_md5_=8d6f27c6f2dfa5ad7e0265e07aa854bf
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index bbfb1bdb7e1b..4381d388f93b 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/amavisd-milter-1.5.0 b/metadata/md5-cache/mail-filter/amavisd-milter-1.5.0
deleted file mode 100644
index f6831261941b..000000000000
--- a/metadata/md5-cache/mail-filter/amavisd-milter-1.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) mail-filter/amavisd-new
-DESCRIPTION=sendmail milter for amavisd-new
-EAPI=4
-HOMEPAGE=http://amavisd-milter.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) mail-filter/amavisd-new
-SLOT=0
-SRC_URI=mirror://sourceforge/amavisd-milter/amavisd-milter-1.5.0.tar.gz
-_md5_=285245d779351b18fda375e660ee73a5
diff --git a/metadata/md5-cache/mail-filter/amavisd-milter-1.6.0 b/metadata/md5-cache/mail-filter/amavisd-milter-1.6.0
deleted file mode 100644
index cd70235de5d6..000000000000
--- a/metadata/md5-cache/mail-filter/amavisd-milter-1.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) mail-filter/amavisd-new
-DESCRIPTION=sendmail milter for amavisd-new
-EAPI=5
-HOMEPAGE=http://amavisd-milter.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) mail-filter/amavisd-new
-SLOT=0
-SRC_URI=mirror://sourceforge/amavisd-milter/amavisd-milter-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b61599b36d52a5a21ff998e3b41fe668
diff --git a/metadata/md5-cache/mail-filter/imapfilter-2.5.4 b/metadata/md5-cache/mail-filter/imapfilter-2.5.4
deleted file mode 100644
index bc6ace2f4e1e..000000000000
--- a/metadata/md5-cache/mail-filter/imapfilter-2.5.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/openssl:0= dev-libs/libpcre >=dev-lang/lua-5.1
-DESCRIPTION=An IMAP mail filtering utility
-EAPI=5
-HOMEPAGE=http://imapfilter.hellug.gr
-KEYWORDS=amd64 ppc x86
-LICENSE=MIT
-RDEPEND=dev-libs/openssl:0= dev-libs/libpcre >=dev-lang/lua-5.1
-SLOT=0
-SRC_URI=https://github.com/lefcha/imapfilter/archive/v2.5.4.tar.gz -> imapfilter-2.5.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=909eb6a09ac8d732f95dbc4a3b7ca949
diff --git a/metadata/md5-cache/mail-filter/imapfilter-2.5.7 b/metadata/md5-cache/mail-filter/imapfilter-2.5.7
deleted file mode 100644
index c78a80711113..000000000000
--- a/metadata/md5-cache/mail-filter/imapfilter-2.5.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/openssl:0= dev-libs/libpcre dev-lang/lua:*
-DESCRIPTION=An IMAP mail filtering utility
-EAPI=5
-HOMEPAGE=http://imapfilter.hellug.gr
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/openssl:0= dev-libs/libpcre dev-lang/lua:*
-SLOT=0
-SRC_URI=https://github.com/lefcha/imapfilter/archive/v2.5.7.tar.gz -> imapfilter-2.5.7.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f3a07a4783d531df0a83fa6401287d88
diff --git a/metadata/md5-cache/mail-filter/imapfilter-2.5.7-r1 b/metadata/md5-cache/mail-filter/imapfilter-2.5.7-r1
deleted file mode 100644
index abfc2e95c9ed..000000000000
--- a/metadata/md5-cache/mail-filter/imapfilter-2.5.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) dev-libs/libpcre dev-lang/lua:*
-DESCRIPTION=An IMAP mail filtering utility
-EAPI=5
-HOMEPAGE=http://imapfilter.hellug.gr
-IUSE=libressl
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) dev-libs/libpcre dev-lang/lua:*
-SLOT=0
-SRC_URI=https://github.com/lefcha/imapfilter/archive/v2.5.7.tar.gz -> imapfilter-2.5.7.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c16c94898ffed040fe2bc3775f43b006
diff --git a/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3 b/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3
deleted file mode 100644
index 1f5129a98391..000000000000
--- a/metadata/md5-cache/mail-filter/libspf2-1.2.9-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols
-EAPI=4
-HOMEPAGE=http://www.libspf2.org
-IUSE=static static-libs
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 BSD-2 )
-RDEPEND=!dev-perl/Mail-SPF-Query
-REQUIRED_USE=static? ( static-libs )
-SLOT=0
-SRC_URI=http://www.libspf2.org/spf/libspf2-1.2.9.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66bcedfbf9f78d7e928929be1ee1c28a
diff --git a/metadata/md5-cache/mail-filter/maildrop-2.8.3 b/metadata/md5-cache/mail-filter/maildrop-2.8.3
deleted file mode 100644
index 2bdce0a6abf0..000000000000
--- a/metadata/md5-cache/mail-filter/maildrop-2.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn net-libs/courier-unicode gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3:* ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Mail delivery agent/filter
-EAPI=5
-HOMEPAGE=http://www.courier-mta.org/maildrop/
-IUSE=berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86
-LICENSE=GPL-3
-RDEPEND=!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn net-libs/courier-unicode gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3:* ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) dev-lang/perl dovecot? ( net-mail/dovecot )
-REQUIRED_USE=mysql? ( authlib ) postgres? ( authlib ) ldap? ( authlib )
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/maildrop-2.8.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fde03c1571f6e5fbd8319288ac09d06c
diff --git a/metadata/md5-cache/mail-filter/maildrop-2.8.5 b/metadata/md5-cache/mail-filter/maildrop-2.8.5
deleted file mode 100644
index a436301d8ec4..000000000000
--- a/metadata/md5-cache/mail-filter/maildrop-2.8.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn net-libs/courier-unicode gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3:* ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Mail delivery agent/filter
-EAPI=6
-HOMEPAGE=http://www.courier-mta.org/maildrop/
-IUSE=berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn net-libs/courier-unicode gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3:* ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) dev-lang/perl dovecot? ( net-mail/dovecot )
-REQUIRED_USE=mysql? ( authlib ) postgres? ( authlib ) ldap? ( authlib )
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/maildrop-2.8.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c01ab2f7005a7cc93f6063f0e64083d8
diff --git a/metadata/md5-cache/mail-filter/maildrop-2.9.0 b/metadata/md5-cache/mail-filter/maildrop-2.9.0
deleted file mode 100644
index f737dce77059..000000000000
--- a/metadata/md5-cache/mail-filter/maildrop-2.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn >=net-libs/courier-unicode-2.0 gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3:* ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Mail delivery agent/filter
-EAPI=6
-HOMEPAGE=http://www.courier-mta.org/maildrop/
-IUSE=berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn >=net-libs/courier-unicode-2.0 gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3:* ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) dev-lang/perl dovecot? ( net-mail/dovecot )
-REQUIRED_USE=mysql? ( authlib ) postgres? ( authlib ) ldap? ( authlib )
-SLOT=0
-SRC_URI=mirror://sourceforge/courier/maildrop-2.9.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee081c5c671b6d20be66729b32a667b4
diff --git a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r16 b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r16
index 40df53b36fb7..07eeab8d7edd 100644
--- a/metadata/md5-cache/mail-filter/opendkim-2.10.3-r16
+++ b/metadata/md5-cache/mail-filter/opendkim-2.10.3-r16
@@ -10,5 +10,5 @@ RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) dev-libs/libbsd sys-apps/
 REQUIRED_USE=sasl? ( ldap ) stats? ( opendbx ) query_cache? ( berkdb )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendkim/opendkim-2.10.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f81a3dcf48a6f1186d5d80ace164a472
diff --git a/metadata/md5-cache/mail-filter/policyd-weight-0.1.15.2-r2 b/metadata/md5-cache/mail-filter/policyd-weight-0.1.15.2-r2
index d1e6d650db30..5527f4261e4b 100644
--- a/metadata/md5-cache/mail-filter/policyd-weight-0.1.15.2-r2
+++ b/metadata/md5-cache/mail-filter/policyd-weight-0.1.15.2-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/perl-File-Spec virtual/perl-Sys-Syslog dev-perl/Net-DNS dev-perl/Net-IP >=mail-mta/postfix-2.1 virtual/tmpfiles
 SLOT=0
 SRC_URI=http://www.policyd-weight.org/releases/policyd-weight-0.1.15.2.tar.gz mirror://gentoo/policyd-weight-0.1.15.2-patches-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/policyd-weight/policyd-weight-0.1.15.2-patches-1.0.tar.xz
-_eclasses_=tmpfiles	96a7c72c5b059d0b75854baf84950ce3	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=tmpfiles	6170dc7770585fb3f16efdee789a3218	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=20eefce102d70a133d336d3ce5d8043e
diff --git a/metadata/md5-cache/mail-filter/procmail-3.22-r14 b/metadata/md5-cache/mail-filter/procmail-3.22-r14
index 06f3f5141bb1..806fa392299b 100644
--- a/metadata/md5-cache/mail-filter/procmail-3.22-r14
+++ b/metadata/md5-cache/mail-filter/procmail-3.22-r14
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=selinux? ( sec-policy/selinux-procmail )
 SLOT=0
 SRC_URI=http://www.procmail.org/procmail-3.22.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=75df687958c7f9c6b320eb6de52daf6d
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.8.3 b/metadata/md5-cache/mail-filter/rspamd-1.8.3
index a5c803079af3..02060ffc9be6 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.8.3
+++ b/metadata/md5-cache/mail-filter/rspamd-1.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libevent:= net-l
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.8.3.tar.gz -> rspamd-1.8.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0380b85582f8f311d87e0d2feb04ca97
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.9.0 b/metadata/md5-cache/mail-filter/rspamd-1.9.0
index 8da632eaf59e..facc0159b941 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.9.0
+++ b/metadata/md5-cache/mail-filter/rspamd-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libevent:= net-l
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.9.0.tar.gz -> rspamd-1.9.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a433eb5636490a5260c8fecf3dfeebd
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.9.4 b/metadata/md5-cache/mail-filter/rspamd-1.9.4
index d11d4e76e853..7f19efb8eaf2 100644
--- a/metadata/md5-cache/mail-filter/rspamd-1.9.4
+++ b/metadata/md5-cache/mail-filter/rspamd-1.9.4
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libevent:= net-l
 REQUIRED_USE=torch? ( jit )
 SLOT=0
 SRC_URI=https://github.com/vstakhov/rspamd/archive/1.9.4.tar.gz -> rspamd-1.9.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=adbea30f74c94a341bcfab3384c18596
diff --git a/metadata/md5-cache/mail-filter/rspamd-9999 b/metadata/md5-cache/mail-filter/rspamd-9999
index 0ba62f07d134..071c0a428115 100644
--- a/metadata/md5-cache/mail-filter/rspamd-9999
+++ b/metadata/md5-cache/mail-filter/rspamd-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libevent:= net-libs/libnsl sys-apps/file dev-util/ragel cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) gd? ( media-libs/gd[jpeg] ) jemalloc? ( dev-libs/jemalloc ) jit? ( dev-lang/luajit:2 ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
 REQUIRED_USE=torch? ( jit )
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a433eb5636490a5260c8fecf3dfeebd
diff --git a/metadata/md5-cache/mail-filter/scmail-1.3 b/metadata/md5-cache/mail-filter/scmail-1.3
index 19aeb218ce3f..ccc01b6290a2 100644
--- a/metadata/md5-cache/mail-filter/scmail-1.3
+++ b/metadata/md5-cache/mail-filter/scmail-1.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-scheme/gauche >=sys-apps/sed-4
+DEPEND=dev-scheme/gauche:= >=sys-apps/sed-4
 DESCRIPTION=a mail filter written in Scheme
 EAPI=6
 HOMEPAGE=http://0xcc.net/scmail/
 KEYWORDS=amd64 ~ia64 ~ppc x86
 LICENSE=BSD
-RDEPEND=dev-scheme/gauche
+RDEPEND=dev-scheme/gauche:=
 SLOT=0
 SRC_URI=http://0xcc.net/scmail/scmail-1.3.tar.gz
 _eclasses_=fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c
-_md5_=34efdae53a4df96265dbdc022a273f26
+_md5_=0036978673160ed3a78ba9e2a1a69c95
diff --git a/metadata/md5-cache/mail-filter/spamdyke-4.3.0-r1 b/metadata/md5-cache/mail-filter/spamdyke-4.3.0-r1
deleted file mode 100644
index 69985e405aca..000000000000
--- a/metadata/md5-cache/mail-filter/spamdyke-4.3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=A drop-in connection-time spam filter for qmail
-EAPI=5
-HOMEPAGE=http://www.spamdyke.org/
-IUSE=libressl +ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) virtual/qmail
-SLOT=0
-SRC_URI=http://www.spamdyke.org/releases/spamdyke-4.3.0.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8409a28331bd7123443475fbd229dcec
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 851631f20d20..25a562e922a9 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/exim-4.92.2 b/metadata/md5-cache/mail-mta/exim-4.92.2
index 2c11b1daa217..0074bb3e5baa 100644
--- a/metadata/md5-cache/mail-mta/exim-4.92.2
+++ b/metadata/md5-cache/mail-mta/exim-4.92.2
@@ -5,11 +5,11 @@ DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=7
 HOMEPAGE=https://www.exim.org/
 IUSE=arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
 REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl ) !ssl? ( !dkim )
 SLOT=0
 SRC_URI=https://downloads.exim.org/exim4/exim-4.92.2.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.92.2.tar.xz )
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c35245ee2901ec9094cf72327a2fd2b4
+_md5_=aba14090acbc1bc1d3de7db47a7bba61
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r5 b/metadata/md5-cache/mail-mta/netqmail-1.06-r5
deleted file mode 100644
index deaa9bda488d..000000000000
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config install postinst preinst prepare setup unpack
-DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-apps/gentoo-functions sys-apps/groff net-dns/libidn2 >=sys-apps/sed-4
-DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agent
-EAPI=5
-HOMEPAGE=http://netqmail.org https://cr.yp.to/qmail.html http://qmail.org
-IUSE=authcram gencertdaily highvolume libressl qmail-spp ssl vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
-LICENSE=public-domain
-RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-apps/gentoo-functions sys-apps/groff net-dns/libidn2
-REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch http://inoa.net/qmail-tls/vu555316.patch http://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( http://shupp.org/patches/netqmail-1.05-tls-smtpauth-20070417.patch ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	99ced791fe1852c85e790a2a78f6d251	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ece7ab541f3298b5f762a936a64a1dc3
diff --git a/metadata/md5-cache/mail-mta/netqmail-1.06-r6 b/metadata/md5-cache/mail-mta/netqmail-1.06-r6
index a36d269262e7..3a6758975d7c 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r6
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile config install postinst preinst prepare setup unpack
-DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-apps/gentoo-functions sys-apps/groff net-dns/libidn2 >=sys-apps/sed-4
+DEPEND=!mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( >=dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:= ) ) sys-apps/gentoo-functions sys-apps/groff net-dns/libidn2 >=sys-apps/sed-4
 DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agent
 EAPI=6
 HOMEPAGE=http://netqmail.org https://cr.yp.to/qmail.html http://qmail.org
 IUSE=authcram gencertdaily highvolume libressl qmail-spp ssl vanilla
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
 LICENSE=public-domain
-RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-apps/gentoo-functions sys-apps/groff net-dns/libidn2
+RDEPEND=!mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] >=sys-apps/ucspi-tcp-0.88-r17 ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 ) virtual/daemontools >=net-mail/dot-forward-0.71-r3 virtual/checkpassword authcram? ( >=net-mail/cmd5checkpw-0.30 ) !mail-mta/qmail net-mail/queue-repair ssl? ( !libressl? ( >=dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:= ) ) sys-apps/gentoo-functions sys-apps/groff net-dns/libidn2
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://qmail/netqmail-1.06.tar.gz https://dev.gentoo.org/~hollow/distfiles/genqmail-20080406.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch http://inoa.net/qmail-tls/vu555316.patch http://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch !vanilla? ( highvolume? ( mirror://qmail/big-todo.103.patch ) qmail-spp? ( mirror://sourceforge/qmail-spp/qmail-spp-0.42.tar.gz ) ssl? ( https://mirror.alexh.name/qmail/netqmail/netqmail-1.05-tls-smtpauth-20190114.patch ) )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	99ced791fe1852c85e790a2a78f6d251	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=583cc1aedfaf1a46466a0708be49187e
+_md5_=a06ff6eeb48d70fc36131b4c7751a4b2
diff --git a/metadata/md5-cache/mail-mta/postfix-3.5_pre20190724 b/metadata/md5-cache/mail-mta/postfix-3.5_pre20190724
deleted file mode 100644
index 4988ef414662..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.5_pre20190724
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) )
-DESCRIPTION=A fast and secure drop-in replacement for sendmail
-EAPI=7
-HOMEPAGE=http://www.postfix.org/
-IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=|| ( IBM EPL-2.0 )
-RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl )
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.5-20190724.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=35097ba7f94508a69b40cf401b8c5cbf
diff --git a/metadata/md5-cache/mail-mta/postfix-3.5_pre20190908 b/metadata/md5-cache/mail-mta/postfix-3.5_pre20190908
new file mode 100644
index 000000000000..ec7156dc9120
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.5_pre20190908
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) )
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=7
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=|| ( IBM EPL-2.0 )
+RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.9.1:0= ) ) acct-group/postfix acct-group/postdrop acct-user/postfix memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.5-20190908.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=4b854376b31a3887064a26f3b3e37cfe
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.3 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.3
deleted file mode 100644
index ecae8b20c7c7..000000000000
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
-EAPI=7
-HOMEPAGE=https://protonmail.com/bridge/
-KEYWORDS=~amd64
-LICENSE=MIT protonmail-bridge-EULA
-RDEPEND=app-crypt/libsecret dev-libs/glib:2 media-sound/pulseaudio[glib] sys-apps/dbus virtual/opengl media-libs/fontconfig media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://protonmail.com/download/protonmail-bridge-1.1.3-1.x86_64.rpm
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	rpm	f52cfa3a435468d86d3b49c357b9cb35
-_md5_=e9986f7a6cdcf1a04d86b96c04f2aa41
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.4 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.4
deleted file mode 100644
index f8b93f646191..000000000000
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
-EAPI=7
-HOMEPAGE=https://protonmail.com/bridge/
-KEYWORDS=~amd64
-LICENSE=MIT protonmail-bridge-EULA
-RDEPEND=app-crypt/libsecret dev-libs/glib:2 media-sound/pulseaudio[glib] sys-apps/dbus virtual/opengl media-libs/fontconfig media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://protonmail.com/download/protonmail-bridge-1.1.4-1.x86_64.rpm
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	rpm	f52cfa3a435468d86d3b49c357b9cb35
-_md5_=e9986f7a6cdcf1a04d86b96c04f2aa41
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.5 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.5
deleted file mode 100644
index 68e5df822b01..000000000000
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
-EAPI=7
-HOMEPAGE=https://protonmail.com/bridge/
-KEYWORDS=~amd64
-LICENSE=MIT protonmail-bridge-EULA
-RDEPEND=app-crypt/libsecret dev-libs/glib:2 media-sound/pulseaudio[glib] sys-apps/dbus virtual/opengl media-libs/fontconfig media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://protonmail.com/download/protonmail-bridge-1.1.5-1.x86_64.rpm
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	rpm	f52cfa3a435468d86d3b49c357b9cb35
-_md5_=e9986f7a6cdcf1a04d86b96c04f2aa41
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.2 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.2
new file mode 100644
index 000000000000..af635cec63fa
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install prepare unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
+EAPI=7
+HOMEPAGE=https://protonmail.com/bridge/
+KEYWORDS=~amd64
+LICENSE=MIT protonmail-bridge-EULA
+RDEPEND=app-crypt/libsecret dev-libs/glib:2 media-sound/pulseaudio[glib] sys-apps/dbus virtual/opengl media-libs/fontconfig media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXi
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://protonmail.com/download/protonmail-bridge-1.2.2-1.x86_64.rpm
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_md5_=4a6f767dd1173f194cf3962648fbda0f
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2 b/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
index 4b2d23634d96..0aa9c2b06899 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://smtpd.develooper.com/files/qpsmtpd-0.84.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7a19d3d670de14d80009e219931294c
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.95 b/metadata/md5-cache/mail-mta/qpsmtpd-0.95
index dc3740e1c8ab..b8b00ce42aac 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.95
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.95
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/smtpd/qpsmtpd/archive/v0.95.tar.gz -> qpsmtpd-0.95.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eebccd59d8b6d0cd72934097dedb1d5b
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-9999 b/metadata/md5-cache/mail-mta/qpsmtpd-9999
index a22e040b6eb6..c750cfb5b060 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-9999
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl[-build(-)]
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	3aabf18eba60687bbe6855eba271f688	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	3aabf18eba60687bbe6855eba271f688	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3fefee1fe53f47116ee0c5aa0995e2ad
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.14.9-r1 b/metadata/md5-cache/mail-mta/sendmail-8.14.9-r1
deleted file mode 100644
index 108451cc510a..000000000000
--- a/metadata/md5-cache/mail-mta/sendmail-8.14.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation virtual/pkgconfig
-DESCRIPTION=Widely-used Mail Transport Agent (MTA)
-EAPI=5
-HOMEPAGE=http://www.sendmail.org/
-IUSE=ssl ldap libressl sasl tcpd mbox ipv6 nis sockets
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=Sendmail GPL-2
-PDEPEND=!mbox? ( mail-filter/procmail )
-RDEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation >=net-mail/mailbase-0.00 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/opensmtpd !mail-mta/qmail-ldap !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta]
-SLOT=0
-SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd9e6e298c2a337599358923ee274c2d
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.15.2 b/metadata/md5-cache/mail-mta/sendmail-8.15.2
deleted file mode 100644
index c22ebff1d20a..000000000000
--- a/metadata/md5-cache/mail-mta/sendmail-8.15.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation virtual/pkgconfig
-DESCRIPTION=Widely-used Mail Transport Agent (MTA)
-EAPI=6
-HOMEPAGE=http://www.sendmail.org/
-IUSE=ssl ldap libressl sasl tcpd mbox ipv6 nis sockets
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=Sendmail GPL-2
-PDEPEND=!mbox? ( mail-filter/procmail )
-RDEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation >=net-mail/mailbase-0.00 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/opensmtpd !mail-mta/qmail-ldap !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta]
-SLOT=0
-SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.15.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ebca1ae846f925870b70e4c100020e81
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.15.2-r1 b/metadata/md5-cache/mail-mta/sendmail-8.15.2-r1
deleted file mode 100644
index 39164c5085e3..000000000000
--- a/metadata/md5-cache/mail-mta/sendmail-8.15.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation virtual/pkgconfig
-DESCRIPTION=Widely-used Mail Transport Agent (MTA)
-EAPI=6
-HOMEPAGE=http://www.sendmail.org/
-IUSE=ssl ldap libressl sasl tcpd mbox ipv6 nis sockets
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=Sendmail GPL-2
-PDEPEND=!mbox? ( mail-filter/procmail )
-RDEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation >=net-mail/mailbase-0.00 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/opensmtpd !mail-mta/qmail-ldap !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta]
-SLOT=0
-SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.15.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=8288afc5236527f6b5245281f13a72ef
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.15.2-r2 b/metadata/md5-cache/mail-mta/sendmail-8.15.2-r2
index c8620842ff07..77d6fb366249 100644
--- a/metadata/md5-cache/mail-mta/sendmail-8.15.2-r2
+++ b/metadata/md5-cache/mail-mta/sendmail-8.15.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Widely-used Mail Transport Agent (MTA)
 EAPI=6
 HOMEPAGE=http://www.sendmail.org/
 IUSE=ssl ldap libressl sasl tcpd mbox ipv6 nis sockets
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=Sendmail GPL-2
 PDEPEND=!mbox? ( mail-filter/procmail )
 RDEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation >=net-mail/mailbase-0.00 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/opensmtpd !mail-mta/qmail-ldap !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta]
 SLOT=0
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.15.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7cdae7a3e48c8b0477d929394a33177a
+_md5_=cb793da3a134c96db39f622506f1f56d
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index eaab99ddda14..2f397f25b79a 100644
--- a/metadata/md5-cache/mate-extra/Manifest.gz
+++ b/metadata/md5-cache/mate-extra/Manifest.gz
diff --git a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.22.1 b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.22.1
index 9a01a90515ad..0d1157786d69 100644
--- a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.22.1
+++ b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.22.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.50:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl hddtemp? ( >=app-admin/hddtemp-0.3_beta13 ) libnotify? ( >=x11-libs/libnotify-0.7 ) lm_sensors? ( sys-apps/lm_sensors ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] ) ) app-text/rarian >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 >=mate-base/mate-common-1.22
+DEPEND=>=dev-libs/glib-2.50:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl hddtemp? ( >=app-admin/hddtemp-0.3_beta13 ) libnotify? ( >=x11-libs/libnotify-0.7 ) lm-sensors? ( sys-apps/lm-sensors ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] ) ) app-text/rarian >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 >=mate-base/mate-common-1.22
 DESCRIPTION=MATE panel applet to display readings from hardware sensors
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
-IUSE=+dbus hddtemp libnotify lm_sensors video_cards_nvidia
+IUSE=+dbus hddtemp libnotify lm-sensors video_cards_nvidia
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 PDEPEND=hddtemp? ( dbus? ( sys-fs/udisks:2 ) )
-RDEPEND=>=dev-libs/glib-2.50:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl hddtemp? ( >=app-admin/hddtemp-0.3_beta13 ) libnotify? ( >=x11-libs/libnotify-0.7 ) lm_sensors? ( sys-apps/lm_sensors ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] ) )
+RDEPEND=>=dev-libs/glib-2.50:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl hddtemp? ( >=app-admin/hddtemp-0.3_beta13 ) libnotify? ( >=x11-libs/libnotify-0.7 ) lm-sensors? ( sys-apps/lm-sensors ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] ) )
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-sensors-applet-1.22.1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68152186d7c656c15cf7040f0fceabc8
+_md5_=6253ef0b2e12e630c48d197977b26384
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 1a6849dadece..665d75300d2c 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/noto-20190524 b/metadata/md5-cache/media-fonts/noto-20190524
index 880f731a948d..da59ef39c1ef 100644
--- a/metadata/md5-cache/media-fonts/noto-20190524
+++ b/metadata/md5-cache/media-fonts/noto-20190524
@@ -4,11 +4,11 @@ DESCRIPTION=Google's font family that aims to support all the world's languages
 EAPI=6
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts
 IUSE=cjk +extra X
-KEYWORDS=alpha amd64 ~arm arm64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86
 LICENSE=OFL-1.1
 RDEPEND=cjk? ( media-fonts/noto-cjk )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-fonts/archive/34e98229863e627d0f841e124a8657d5d0348b04.tar.gz -> noto-20190524.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f245cfdc78cd672760d4719a4eea1e5e
+_md5_=fbc2092273701815df6f8ab87e8b5fb0
diff --git a/metadata/md5-cache/media-fonts/noto-cjk-20190416 b/metadata/md5-cache/media-fonts/noto-cjk-20190416
index 4d78bb305543..9cb22175883c 100644
--- a/metadata/md5-cache/media-fonts/noto-cjk-20190416
+++ b/metadata/md5-cache/media-fonts/noto-cjk-20190416
@@ -4,10 +4,10 @@ DESCRIPTION=Google's CJK font family
 EAPI=6
 HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlei18n/noto-cjk
 IUSE=X
-KEYWORDS=alpha amd64 ~arm arm64 ~mips ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/googlei18n/noto-cjk/archive/be6c059ac1587e556e2412b27f5155c8eb3ddbe6.tar.gz -> noto-cjk-20190416.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	3a7bf49a5b835558d339d7bf8dfee9d6	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3a1bfe779c02317fc1477366785fc694
+_md5_=1cd51c56f8e39900a17d440036b72cbd
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index b57211db5a35..d070fc6899a0 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/argyllcms-2.1.1 b/metadata/md5-cache/media-gfx/argyllcms-2.1.1
index f7573afed2ee..c9bfcd12295a 100644
--- a/metadata/md5-cache/media-gfx/argyllcms-2.1.1
+++ b/metadata/md5-cache/media-gfx/argyllcms-2.1.1
@@ -10,5 +10,5 @@ LICENSE=AGPL-3
 RDEPEND=dev-libs/openssl:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=http://www.argyllcms.com/Argyll_V2.1.1_src.zip
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=8a31422bd2186deb7e5d71c6280c0167
diff --git a/metadata/md5-cache/media-gfx/argyllcms-2.1.1-r1 b/metadata/md5-cache/media-gfx/argyllcms-2.1.1-r1
index bdf2ee12d844..e4a0474d33ed 100644
--- a/metadata/md5-cache/media-gfx/argyllcms-2.1.1-r1
+++ b/metadata/md5-cache/media-gfx/argyllcms-2.1.1-r1
@@ -10,5 +10,5 @@ LICENSE=AGPL-3
 RDEPEND=media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm x11-libs/libXScrnSaver !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=http://www.argyllcms.com/Argyll_V2.1.1_src.zip
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=ed77d80f94be66ebde0785e8757707e2
diff --git a/metadata/md5-cache/media-gfx/digikam-6.0.0 b/metadata/md5-cache/media-gfx/digikam-6.0.0
deleted file mode 100644
index 65ba0f83842f..000000000000
--- a/metadata/md5-cache/media-gfx/digikam-6.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext panorama? ( sys-devel/bison sys-devel/flex ) sys-devel/make >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-libs/expat >=media-gfx/exiv2-0.26:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= >=media-libs/opencv-3.1.0:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 ) calendar? ( >=kde-apps/kcalcore-19.04.3:5 ) gphoto2? ( media-libs/libgphoto2:= ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-apps/marble-19.04.3:5 >=dev-qt/qtconcurrent-5.12.3:5 ) mediaplayer? ( media-libs/qtav[opengl] !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.60.0:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.60.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) dev-cpp/eigen:3 dev-libs/boost[threads] dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Digital photo management application
-EAPI=7
-HOMEPAGE=https://www.digikam.org/
-IUSE=addressbook calendar gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-libs/expat >=media-gfx/exiv2-0.26:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= >=media-libs/opencv-3.1.0:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 ) calendar? ( >=kde-apps/kcalcore-19.04.3:5 ) gphoto2? ( media-libs/libgphoto2:= ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-apps/marble-19.04.3:5 >=dev-qt/qtconcurrent-5.12.3:5 ) mediaplayer? ( media-libs/qtav[opengl] !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.60.0:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.60.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) mysql? ( virtual/mysql[server] ) panorama? ( media-gfx/hugin ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/digikam/6.0.0/digikam-6.0.0.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f7f7af9a81a88bbffdc74a3491f82e1
diff --git a/metadata/md5-cache/media-gfx/digikam-6.2.0 b/metadata/md5-cache/media-gfx/digikam-6.2.0
index 11037a831132..ecc91cb96a65 100644
--- a/metadata/md5-cache/media-gfx/digikam-6.2.0
+++ b/metadata/md5-cache/media-gfx/digikam-6.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=Digital photo management application
 EAPI=7
 HOMEPAGE=https://www.digikam.org/
 IUSE=addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X debug
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-libs/expat >=media-gfx/exiv2-0.26:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= >=media-libs/opencv-3.1.0:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-apps/kcontacts-19.04.3:5 ) calendar? ( >=kde-apps/kcalcore-19.04.3:5 ) dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] ) gphoto2? ( media-libs/libgphoto2:= ) imagemagick? ( media-gfx/imagemagick:= ) lensfun? ( media-libs/lensfun ) marble? ( >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-apps/marble-19.04.3:5 >=dev-qt/qtconcurrent-5.12.3:5 ) mediaplayer? ( media-libs/qtav[opengl] !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.60.0:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.60.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) mysql? ( virtual/mysql[server] ) panorama? ( media-gfx/hugin ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/6.2.0/digikam-6.2.0.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2becffffdc17e84915dd4564e22573a3
+_md5_=71a1f3e5cfcd24c01dd1afb1be072996
diff --git a/metadata/md5-cache/media-gfx/feh-3.1.1 b/metadata/md5-cache/media-gfx/feh-3.1.1
deleted file mode 100644
index 786c6b278a4d..000000000000
--- a/metadata/md5-cache/media-gfx/feh-3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
-DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=6
-HOMEPAGE=https://feh.finalrewind.org/
-IUSE=debug curl exif test xinerama
-KEYWORDS=amd64 ~arm ~mips ppc ppc64 x86
-LICENSE=feh
-RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
-SLOT=0
-SRC_URI=https://feh.finalrewind.org/feh-3.1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d39c9c19e1827bdfdbbde52b1eb1bfe
diff --git a/metadata/md5-cache/media-gfx/feh-3.1.3 b/metadata/md5-cache/media-gfx/feh-3.1.3
deleted file mode 100644
index 472c9ff7261f..000000000000
--- a/metadata/md5-cache/media-gfx/feh-3.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
-DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=6
-HOMEPAGE=https://feh.finalrewind.org/
-IUSE=debug curl exif test xinerama
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
-LICENSE=feh
-RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
-SLOT=0
-SRC_URI=https://feh.finalrewind.org/feh-3.1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f1eada3132ed3edbc4f36ac47f4868e
diff --git a/metadata/md5-cache/media-gfx/feh-3.2 b/metadata/md5-cache/media-gfx/feh-3.2
deleted file mode 100644
index cd90fc940e75..000000000000
--- a/metadata/md5-cache/media-gfx/feh-3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
-DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=6
-HOMEPAGE=https://feh.finalrewind.org/
-IUSE=debug curl exif test xinerama
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
-LICENSE=feh
-RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? ( net-misc/curl ) exif? ( media-libs/libexif ) xinerama? ( x11-libs/libXinerama ) virtual/jpeg:0
-SLOT=0
-SRC_URI=https://feh.finalrewind.org/feh-3.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc6b62ce0610b9f931d2e5fde4455884
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.56 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.56
deleted file mode 100644
index f09b91cac88a..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.56
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-RESTRICT=perl? ( userpriv )
-SLOT=0/6.9.10.56
-SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-56.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=51a4a1a3e2fce5893c80324c63f9bf47
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.60 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.60
index 2bc07218512b..3cb2d01ebd47 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.60
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.60
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/6.9.10.60
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-60.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a5aaef979695a86c97543d756a403e64
+_md5_=51a4a1a3e2fce5893c80324c63f9bf47
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.10.64 b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.64
new file mode 100644
index 000000000000..ff256f30f797
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.10.64
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv )
+SLOT=0/6.9.10.64
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.10-64.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a5aaef979695a86c97543d756a403e64
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.56 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.56
deleted file mode 100644
index 2f9744fd38ea..000000000000
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.56
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare test
-DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A collection of tools and libraries for many image formats
-EAPI=6
-HOMEPAGE=https://www.imagemagick.org/
-IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
-SLOT=0/7.0.8.56
-SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-56.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4c6fa48b18fc88f0226aa066c02ae78b
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.60 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.60
index 2e7da4ce9def..117b6d6d8008 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.60
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.60
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=https://www.imagemagick.org/
 IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
 SLOT=0/7.0.8.60
 SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-60.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7b0b4caa091b933ba34a42cb66e213d1
+_md5_=4c6fa48b18fc88f0226aa066c02ae78b
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.64 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.64
new file mode 100644
index 000000000000..2915b473a8e5
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.64
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=6
+HOMEPAGE=https://www.imagemagick.org/
+IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+SLOT=0/7.0.8.64
+SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-64.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7b0b4caa091b933ba34a42cb66e213d1
diff --git a/metadata/md5-cache/media-gfx/iscan-data-1.39.0.1 b/metadata/md5-cache/media-gfx/iscan-data-1.39.0.1
index 9aafde5f673a..38570eb2d0b2 100644
--- a/metadata/md5-cache/media-gfx/iscan-data-1.39.0.1
+++ b/metadata/md5-cache/media-gfx/iscan-data-1.39.0.1
@@ -9,5 +9,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://support.epson.net/linux/src/scanner/iscan/iscan-data_1.39.0-1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=33c84a16ebca6c73210d76332bab7857
diff --git a/metadata/md5-cache/media-gfx/krita-4.2.6 b/metadata/md5-cache/media-gfx/krita-4.2.6
new file mode 100644
index 000000000000..64540e4a9455
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/krita-4.2.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/boost:= dev-libs/quazip dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sip[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? ( >=dev-libs/vc-1.1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
+EAPI=7
+HOMEPAGE=https://kde.org/applications/graphics/krita/ https://krita.org/
+IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/boost:= dev-libs/quazip dev-python/PyQt5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sip[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) !app-office/calligra:4[calligra_features_krita] !app-office/calligra-l10n:4[calligra_features_krita(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/krita/4.2.6/krita-4.2.6.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aa921f8ef83ffc89d64d808131d086d4
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.12.3 b/metadata/md5-cache/media-gfx/libimagequant-2.12.3
index 9c5d1ca3a740..c8326651b30e 100644
--- a/metadata/md5-cache/media-gfx/libimagequant-2.12.3
+++ b/metadata/md5-cache/media-gfx/libimagequant-2.12.3
@@ -3,9 +3,9 @@ DESCRIPTION=Palette quantization library that powers pngquant and other PNG opti
 EAPI=7
 HOMEPAGE=https://pngquant.org/lib/
 IUSE=cpu_flags_x86_sse2 debug openmp static-libs
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0/0
 SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.12.3.tar.gz -> libimagequant-2.12.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=15dda4b84caac1809b1fd8f7a104eb12
+_md5_=4ba5ff65af769cae1a91eccc36c46931
diff --git a/metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1 b/metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1
index 58b6c9e88623..3ad9cf25f9cd 100644
--- a/metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1
+++ b/metadata/md5-cache/media-gfx/lximage-qt-0.14.1-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtn
 DESCRIPTION=LXImage Image Viewer - GPicView replacement
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/libexif >=x11-libs/libfm-qt-0.12.0:= x11-libs/libX11 x11-libs/libXfixes !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lximage-qt/0.14.1/lximage-qt-0.14.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a3b9f32a36992a84de402d733843e870
+_md5_=b458bc5a404c925dcc7ffb42983dbc8a
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2 b/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2
deleted file mode 100644
index 76de18efb911..000000000000
--- a/metadata/md5-cache/media-gfx/mypaint-1.1.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/json-c-0.11:= media-libs/lcms:2 media-libs/libpng:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-lang/swig virtual/pkgconfig dev-util/scons[python_targets_python2_7]
-DESCRIPTION=fast and easy graphics application for digital painters
-EAPI=5
-HOMEPAGE=http://mypaint.intilinux.com/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pycairo-1.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/json-c-0.11:= media-libs/lcms:2 media-libs/libpng:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://download.gna.org/mypaint/mypaint-1.1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3444b22ef9f5b27447f71bb66cabd992
diff --git a/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3 b/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3
index d169b969d00f..1c50aa704dad 100644
--- a/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3
+++ b/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=abi_x86_32? ( http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_x86.tgz ) abi_x86_64? ( http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_x86_64.tgz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0a50ed3af24bad16c6f72e9ae282d041
diff --git a/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r5 b/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r5
index 510a159ac966..343885b235ea 100644
--- a/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r5
+++ b/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r5
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=abi_x86_32? ( http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_x86.tgz ) abi_x86_64? ( http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_x86_64.tgz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9b6dd6aea55660b3e95c7fbe2ce7882f
diff --git a/metadata/md5-cache/media-gfx/qimgv-0.7.3 b/metadata/md5-cache/media-gfx/qimgv-0.7.3
deleted file mode 100644
index dfd0b625898b..000000000000
--- a/metadata/md5-cache/media-gfx/qimgv-0.7.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kwindowsystem:5 ) video? ( media-video/mpv[libmpv] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A cross-platform image viewer with webm support. Written in qt5
-EAPI=6
-HOMEPAGE=https://github.com/easymodo/qimgv
-IUSE=kde video
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kwindowsystem:5 ) video? ( media-video/mpv[libmpv] )
-SLOT=0
-SRC_URI=https://github.com/easymodo/qimgv/archive/v0.7.3.tar.gz -> qimgv-0.7.3.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5ad19279fa2372aee459d7679574290
diff --git a/metadata/md5-cache/media-gfx/qimgv-0.8.2 b/metadata/md5-cache/media-gfx/qimgv-0.8.2
new file mode 100644
index 000000000000..a497f978cc8c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/qimgv-0.8.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/cmake virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-video/mpv[libmpv] exif? ( media-libs/libexif ) kde? ( kde-frameworks/kwindowsystem:5 )
+DESCRIPTION=A cross-platform image viewer with webm support, written in qt5
+EAPI=7
+HOMEPAGE=https://github.com/easymodo/qimgv
+IUSE=exif kde
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-video/mpv[libmpv] exif? ( media-libs/libexif ) kde? ( kde-frameworks/kwindowsystem:5 )
+SLOT=0
+SRC_URI=https://github.com/easymodo/qimgv/archive/v0.8.2.tar.gz -> qimgv-0.8.2.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a7c6a10f36cc14d47fcd9f65daf29645
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r3 b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r3
index 2fcf015ae62b..dd6bc0dacb3e 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r3
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r3
@@ -11,5 +11,5 @@ RDEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(
 REQUIRED_USE=sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( threads )
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/file/4224/sane-backends-1.0.27.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=c0ca2649fc1ba235909d82dd3095bdf3
diff --git a/metadata/md5-cache/media-gfx/sxiv-25 b/metadata/md5-cache/media-gfx/sxiv-25
index 79c2450ad44a..25662aa784ca 100644
--- a/metadata/md5-cache/media-gfx/sxiv-25
+++ b/metadata/md5-cache/media-gfx/sxiv-25
@@ -4,10 +4,10 @@ DESCRIPTION=Simple (or small or suckless) X Image Viewer
 EAPI=6
 HOMEPAGE=https://github.com/muennich/sxiv/
 IUSE=exif gif +jpeg +png savedconfig
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?,jpeg?,png?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://github.com/muennich/sxiv/archive/v25.tar.gz -> sxiv-25.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0c38912e9b32aef6433a71726675b4b1	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db77ade9c29eb678c09875cf1b37686f
+_md5_=9a46f1b4c5546aa5ff9d20e2c247be56
diff --git a/metadata/md5-cache/media-gfx/xpaint-2.9.10.2-r1 b/metadata/md5-cache/media-gfx/xpaint-2.9.10.2-r1
deleted file mode 100644
index 9872c336b57a..000000000000
--- a/metadata/md5-cache/media-gfx/xpaint-2.9.10.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=media-libs/fontconfig media-libs/freetype media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2c x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt sys-libs/zlib virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:0 ) pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0 media-libs/tiff:0 ) sys-devel/flex sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Image editor with tiff, jpeg and png support
-EAPI=5
-HOMEPAGE=http://sf-xpaint.sourceforge.net/
-IUSE=jpeg2k pgf tiff
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=media-libs/fontconfig media-libs/freetype media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2c x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt sys-libs/zlib virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:0 ) pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0 media-libs/tiff:0 )
-SLOT=0
-SRC_URI=mirror://sourceforge/sf-xpaint/xpaint-2.9.10.2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6499d0a96f9395dddb336b8bde3aaa38
diff --git a/metadata/md5-cache/media-gfx/xpaint-2.9.10.3-r1 b/metadata/md5-cache/media-gfx/xpaint-2.9.10.3-r1
deleted file mode 100644
index badaef752ebd..000000000000
--- a/metadata/md5-cache/media-gfx/xpaint-2.9.10.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=media-libs/fontconfig media-libs/freetype media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2c x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt sys-libs/zlib virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:0 ) pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0 media-libs/tiff:0 ) sys-devel/flex sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Image editor with tiff, jpeg and png support
-EAPI=5
-HOMEPAGE=http://sf-xpaint.sourceforge.net/
-IUSE=jpeg2k pgf tiff
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/fontconfig media-libs/freetype media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libXaw3dXft-1.6.2c x11-libs/libXext x11-libs/libXft x11-libs/libXmu x11-libs/libXpm x11-libs/libXt sys-libs/zlib virtual/jpeg:0 jpeg2k? ( media-libs/openjpeg:0 ) pgf? ( media-libs/libpgf ) tiff? ( media-libs/jbigkit:0 media-libs/tiff:0 )
-SLOT=0
-SRC_URI=mirror://sourceforge/sf-xpaint/xpaint-2.9.10.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c2d085a918d0d79e43f0a77a605cb1f7
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f09487be71b2..48d26bd2e9c3 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/glm-0.9.9.6 b/metadata/md5-cache/media-libs/glm-0.9.9.6
new file mode 100644
index 000000000000..e9c7c6a01b56
--- /dev/null
+++ b/metadata/md5-cache/media-libs/glm-0.9.9.6
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenGL Mathematics
+EAPI=7
+HOMEPAGE=http://glm.g-truc.net/
+IUSE=test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( HappyBunny MIT )
+RDEPEND=virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/g-truc/glm/archive/0.9.9.6.tar.gz -> glm-0.9.9.6.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=27533e2e25202971f7908623a6c94a20
diff --git a/metadata/md5-cache/media-libs/libffado-2.4.1 b/metadata/md5-cache/media-libs/libffado-2.4.1
index ea08c6a29aae..66f3cada8e37 100644
--- a/metadata/md5-cache/media-libs/libffado-2.4.1
+++ b/metadata/md5-cache/media-libs/libffado-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.ffado.org/files/libffado-2.4.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=36db66ea3d931970701b0b630165f380
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.20 b/metadata/md5-cache/media-libs/libgphoto2-2.5.20
index 46f6e925be92..08133be686d1 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.20
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.20
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libxml2-2.9.1-r4: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(-)?] dev-libs/libltdl: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(-)?] >=virtual/libusb-1-r1: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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,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-r2: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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] ) !<sys-fs/udev-201 dev-util/gtk-doc-am sys-devel/flex >=sys-devel/gettext-0.14.1 >=virtual/pkgconfig-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(-)?] doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend test
+DEPEND=acct-group/plugdev >=dev-libs/libxml2-2.9.1-r4: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(-)?] dev-libs/libltdl: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(-)?] >=virtual/libusb-1-r1: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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,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-r2: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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] ) !<sys-fs/udev-201 dev-util/gtk-doc-am sys-devel/flex >=sys-devel/gettext-0.14.1 >=virtual/pkgconfig-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(-)?] doc? ( app-doc/doxygen ) virtual/pkgconfig
 DESCRIPTION=Library that implements support for numerous digital cameras
 EAPI=6
 HOMEPAGE=http://www.gphoto.org/
 IUSE=doc examples exif gd jpeg nls serial +cameras_adc65 +cameras_agfa_cl20 +cameras_aox +cameras_ax203 +cameras_barbie +cameras_canon +cameras_casio_qv +cameras_clicksmart310 +cameras_digigr8 +cameras_digita +cameras_dimagev +cameras_dimera3500 +cameras_directory +cameras_enigma13 +cameras_fuji +cameras_gsmart300 +cameras_hp215 +cameras_iclick +cameras_jamcam +cameras_jd11 +cameras_jl2005a +cameras_jl2005c +cameras_kodak_dc120 +cameras_kodak_dc210 +cameras_kodak_dc240 +cameras_kodak_dc3200 +cameras_kodak_ez200 +cameras_konica +cameras_konica_qm150 +cameras_largan +cameras_lg_gsm +cameras_mars +cameras_mustek +cameras_panasonic_coolshot +cameras_panasonic_l859 +cameras_panasonic_dc1000 +cameras_panasonic_dc1580 +cameras_pccam300 +cameras_pccam600 +cameras_pentax +cameras_polaroid_pdc320 +cameras_polaroid_pdc640 +cameras_polaroid_pdc700 +cameras_ptp2 +cameras_ricoh +cameras_ricoh_g3 +cameras_samsung +cameras_sierra +cameras_sipix_blink2 +cameras_sipix_web2 +cameras_smal +cameras_sonix +cameras_sony_dscf1 +cameras_sony_dscf55 +cameras_soundvision +cameras_spca50x +cameras_sq905 +cameras_st2205 +cameras_stv0674 +cameras_stv0680 +cameras_sx330z +cameras_toshiba_pdrm11 +cameras_topfield +cameras_tp6801 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 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxml2-2.9.1-r4: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(-)?] dev-libs/libltdl: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(-)?] >=virtual/libusb-1-r1: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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,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-r2: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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] ) !<sys-fs/udev-201
+RDEPEND=acct-group/plugdev >=dev-libs/libxml2-2.9.1-r4: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(-)?] dev-libs/libltdl: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(-)?] >=virtual/libusb-1-r1: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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,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-r2: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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] ) !<sys-fs/udev-201
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.20.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c332bfd6211f426e358bb5543683cd3f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=92e8a915a22f2afa3dd3e2300b214881
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.22 b/metadata/md5-cache/media-libs/libgphoto2-2.5.22
index d12d80e79341..1a38d232aa50 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.22
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.22
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libxml2-2.9.1-r4: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(-)?] dev-libs/libltdl: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(-)?] >=virtual/libusb-1-r1: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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,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-r2: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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] ) !<sys-fs/udev-201 dev-util/gtk-doc-am sys-devel/flex >=sys-devel/gettext-0.14.1 >=virtual/pkgconfig-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(-)?] doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend test
+DEPEND=acct-group/plugdev >=dev-libs/libxml2-2.9.1-r4: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(-)?] dev-libs/libltdl: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(-)?] >=virtual/libusb-1-r1: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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,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-r2: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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] ) !<sys-fs/udev-201 dev-util/gtk-doc-am sys-devel/flex >=sys-devel/gettext-0.14.1 >=virtual/pkgconfig-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(-)?] doc? ( app-doc/doxygen ) virtual/pkgconfig
 DESCRIPTION=Library that implements support for numerous digital cameras
 EAPI=6
 HOMEPAGE=http://www.gphoto.org/
 IUSE=doc examples exif gd jpeg nls serial +cameras_adc65 +cameras_agfa_cl20 +cameras_aox +cameras_ax203 +cameras_barbie +cameras_canon +cameras_casio_qv +cameras_clicksmart310 +cameras_digigr8 +cameras_digita +cameras_dimagev +cameras_dimera3500 +cameras_directory +cameras_enigma13 +cameras_fuji +cameras_gsmart300 +cameras_hp215 +cameras_iclick +cameras_jamcam +cameras_jd11 +cameras_jl2005a +cameras_jl2005c +cameras_kodak_dc120 +cameras_kodak_dc210 +cameras_kodak_dc240 +cameras_kodak_dc3200 +cameras_kodak_ez200 +cameras_konica +cameras_konica_qm150 +cameras_largan +cameras_lg_gsm +cameras_mars +cameras_mustek +cameras_panasonic_coolshot +cameras_panasonic_l859 +cameras_panasonic_dc1000 +cameras_panasonic_dc1580 +cameras_pccam300 +cameras_pccam600 +cameras_pentax +cameras_polaroid_pdc320 +cameras_polaroid_pdc640 +cameras_polaroid_pdc700 +cameras_ptp2 +cameras_ricoh +cameras_ricoh_g3 +cameras_samsung +cameras_sierra +cameras_sipix_blink2 +cameras_sipix_web2 +cameras_smal +cameras_sonix +cameras_sony_dscf1 +cameras_sony_dscf55 +cameras_soundvision +cameras_spca50x +cameras_sq905 +cameras_st2205 +cameras_stv0674 +cameras_stv0680 +cameras_sx330z +cameras_toshiba_pdrm11 +cameras_topfield +cameras_tp6801 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 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxml2-2.9.1-r4: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(-)?] dev-libs/libltdl: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(-)?] >=virtual/libusb-1-r1: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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,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-r2: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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] ) !<sys-fs/udev-201
+RDEPEND=acct-group/plugdev >=dev-libs/libxml2-2.9.1-r4: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(-)?] dev-libs/libltdl: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(-)?] >=virtual/libusb-1-r1: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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,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-r2: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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] ) !<sys-fs/udev-201
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.22.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4f313d1499c2a2cb0cf295fb7a4b1b64
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d9512e0a56b9bf28a84c3756c449efb6
diff --git a/metadata/md5-cache/media-libs/libgpod-0.8.3-r2 b/metadata/md5-cache/media-libs/libgpod-0.8.3-r2
index 62422589a21c..1f114178e6ce 100644
--- a/metadata/md5-cache/media-libs/libgpod-0.8.3-r2
+++ b/metadata/md5-cache/media-libs/libgpod-0.8.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-pda/libplist-1.0:= >=dev-db/sqlite-3:3 >=dev-libs/glib-2.16:2 dev-
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkpod/libgpod-0.8.3.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d5c0a9cf1238cadd5f41e841904d67fc
diff --git a/metadata/md5-cache/media-libs/libhdhomerun-20140121 b/metadata/md5-cache/media-libs/libhdhomerun-20140121
deleted file mode 100644
index 3187bbd33f9f..000000000000
--- a/metadata/md5-cache/media-libs/libhdhomerun-20140121
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=SiliconDust HDHomeRun Utilties
-EAPI=5
-HOMEPAGE=http://www.silicondust.com/support/hdhomerun/downloads/linux/
-KEYWORDS=~amd64
-LICENSE=LGPL-3+
-SLOT=0
-SRC_URI=http://download.silicondust.com/hdhomerun/libhdhomerun_20140121.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=084580a76384bd83475679afbdbe606c
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.1 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.1
deleted file mode 100644
index e08d320bc9ac..000000000000
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-macos? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-cygwin? ( || ( dev-lang/nasm dev-lang/yasm ) ) java? ( >=virtual/jdk-1.5 ) sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 ) >=app-portage/elt-patches-20170815
-DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
-EAPI=6
-HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
-IUSE=java static-libs 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 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD IJG
-RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.0.1.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d6e5940251280d8760088f7be3ed088
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3
new file mode 100644
index 000000000000..25b3fbd89adf
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-macos? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-cygwin? ( || ( dev-lang/nasm dev-lang/yasm ) ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
+EAPI=7
+HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
+IUSE=java static-libs 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 elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD IJG
+RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.0.3.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af32fd3d32bbba0cc36b57f4ff36637a
diff --git a/metadata/md5-cache/media-libs/libmetalink-0.1.1-r1 b/metadata/md5-cache/media-libs/libmetalink-0.1.1-r1
deleted file mode 100644
index 76dbd62589fa..000000000000
--- a/metadata/md5-cache/media-libs/libmetalink-0.1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=expat? ( >=dev-libs/expat-2.1.0-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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[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? ( >=dev-util/cunit-2.1_p2[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(-)?] )
-DESCRIPTION=Library for handling Metalink files
-EAPI=5
-HOMEPAGE=https://launchpad.net/libmetalink
-IUSE=expat static-libs test 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
-KEYWORDS=amd64 arm hppa ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=expat? ( >=dev-libs/expat-2.1.0-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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[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=^^ ( expat xml )
-SLOT=0
-SRC_URI=https://launchpad.net/libmetalink/trunk/libmetalink-0.1.1/+download/libmetalink-0.1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5bcec2b2b426f32b306de6b8a70db183
diff --git a/metadata/md5-cache/media-libs/libmtp-1.1.16 b/metadata/md5-cache/media-libs/libmtp-1.1.16
index 99a8b132a14a..b84f3ada7b39 100644
--- a/metadata/md5-cache/media-libs/libmtp-1.1.16
+++ b/metadata/md5-cache/media-libs/libmtp-1.1.16
@@ -1,14 +1,14 @@
 BDEPEND=>sys-devel/gettext-0.18.3 virtual/pkgconfig doc? ( app-doc/doxygen ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
+DEFINED_PHASES=configure install prepare
+DEPEND=acct-group/plugdev virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 DESCRIPTION=Implementation of Microsoft's Media Transfer Protocol (MTP)
 EAPI=7
 HOMEPAGE=http://libmtp.sourceforge.net/
 IUSE=+crypt doc examples static-libs
 KEYWORDS=amd64 ~arm arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
+RDEPEND=acct-group/plugdev virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 SLOT=0/9
 SRC_URI=mirror://sourceforge/libmtp/libmtp-1.1.16.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=dfffd08292d1a970ba845c3020f436ab
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=1b08c0d819b464d8ff41f6a47a142f6f
diff --git a/metadata/md5-cache/media-libs/libmtp-9999 b/metadata/md5-cache/media-libs/libmtp-9999
index 92e6521f3701..fce91ecdfbd5 100644
--- a/metadata/md5-cache/media-libs/libmtp-9999
+++ b/metadata/md5-cache/media-libs/libmtp-9999
@@ -1,13 +1,13 @@
 BDEPEND=>sys-devel/gettext-0.18.3 virtual/pkgconfig doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 install prepare setup unpack
-DEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=acct-group/plugdev virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 DESCRIPTION=Implementation of Microsoft's Media Transfer Protocol (MTP)
 EAPI=7
 HOMEPAGE=http://libmtp.sourceforge.net/
 IUSE=+crypt doc examples static-libs
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
+RDEPEND=acct-group/plugdev virtual/libusb:1 crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )
 SLOT=0/9
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=681676cf14d2d98fbb313196330a0faf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=079e0d4ff1db5d8b519ff0b811ceb2e4
diff --git a/metadata/md5-cache/media-libs/libnjb-2.2.7 b/metadata/md5-cache/media-libs/libnjb-2.2.7
index 7d2b8420fe89..332f90e4545f 100644
--- a/metadata/md5-cache/media-libs/libnjb-2.2.7
+++ b/metadata/md5-cache/media-libs/libnjb-2.2.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=mirror://sourceforge/libnjb/libnjb-2.2.7.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=16e4d6b25b7e5aa4f73b362455811f20
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.10 b/metadata/md5-cache/media-libs/libsdl2-2.0.10
index ca23b534e53c..1a1a6e42339c 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.10
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.10
@@ -5,11 +5,11 @@ DESCRIPTION=Simple Direct Media Layer
 EAPI=7
 HOMEPAGE=http://www.libsdl.org
 IUSE=cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver 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 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) gles? ( >=media-libs/mesa-9.1.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(-)?,gles2] ) kms? ( >=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(-)?] >=media-libs/mesa-9.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(-)?,gbm] ) libsamplerate? ( media-libs/libsamplerate[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(-)?] ) nas? ( >=media-libs/nas-1.9.4[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/libXt-1.1.4[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(-)?] >=virtual/glu-9.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(-)?] ) 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(-)?] ) tslib? ( >=x11-libs/tslib-1.0-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(-)?] ) udev? ( >=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(-)?] ) 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(-)?] >=media-libs/mesa-9.1.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(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.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(-)?] ) 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/libXcursor-1.1.14[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/libXi-1.7.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/libXxf86vm-1.1.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(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-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(-)?] ) ) vulkan? ( media-libs/vulkan-loader )
 REQUIRED_USE=alsa? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) vulkan? ( video ) wayland? ( gles ) xinerama? ( X ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL2-2.0.10.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=360c5507d64c67a2cceeb9fbec728564
+_md5_=4bae8218457d802e3303969f886de116
diff --git a/metadata/md5-cache/media-libs/libvisio-0.1.7 b/metadata/md5-cache/media-libs/libvisio-0.1.7
new file mode 100644
index 000000000000..79c3066fce8d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libvisio-0.1.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 dev-libs/boost dev-util/gperf sys-devel/libtool test? ( dev-util/cppunit )
+DESCRIPTION=Library parsing the file format of MS Visio documents
+EAPI=7
+HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libvisio
+IUSE=doc static-libs test tools
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
+RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2
+SLOT=0
+SRC_URI=https://dev-www.libreoffice.org/src/libvisio/libvisio-0.1.7.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=d0efe39a84091c4de46e6a9a63789c50
diff --git a/metadata/md5-cache/media-libs/libvisio-9999 b/metadata/md5-cache/media-libs/libvisio-9999
index ead774172506..ca72d586075c 100644
--- a/metadata/md5-cache/media-libs/libvisio-9999
+++ b/metadata/md5-cache/media-libs/libvisio-9999
@@ -1,12 +1,13 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 install prepare unpack
-DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 dev-lang/perl dev-libs/boost dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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]
-DESCRIPTION=Library parsing the visio documents
-EAPI=6
+DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 dev-libs/boost dev-util/gperf sys-devel/libtool test? ( dev-util/cppunit )
+DESCRIPTION=Library parsing the file format of MS Visio documents
+EAPI=7
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libvisio
 IUSE=doc static-libs test tools
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 PROPERTIES=live
 RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=615ac64389d63afa73a1133272c9443a
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=d0efe39a84091c4de46e6a9a63789c50
diff --git a/metadata/md5-cache/media-libs/libvpx-1.7.0 b/metadata/md5-cache/media-libs/libvpx-1.7.0
index 813eb593985a..479c518b19b4 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.7.0
+++ b/metadata/md5-cache/media-libs/libvpx-1.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=WebM VP8 and VP9 Codec SDK
 EAPI=6
 HOMEPAGE=https://www.webmproject.org
 IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads 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 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 ) test? ( threads )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/webmproject/libvpx/archive/v1.7.0.tar.gz -> libvpx-1.7.0.tar.gz test? ( mirror://gentoo/libvpx-testdata-1.7.0.tar.xz )
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=192ca4a8ef5c98d8feecc7ca27abeaee
+_md5_=9d8494efbe40d83f8b03cbae0d08a75f
diff --git a/metadata/md5-cache/media-libs/mesa-19.0.8 b/metadata/md5-cache/media-libs/mesa-19.0.8
index dd54e1435d8a..00871e4fa409 100644
--- a/metadata/md5-cache/media-libs/mesa-19.0.8
+++ b/metadata/md5-cache/media-libs/mesa-19.0.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst pretend setup test
-DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[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/clang:7[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/clang-9:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[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/llvm:7[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/llvm-9:=[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-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto 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(-)?] || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[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/clang:7[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/clang-9:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[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/llvm:7[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/llvm-9:=[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-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig valgrind? ( dev-util/valgrind ) x11-base/xorg-proto 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(-)?] || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=6
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan wayland xa xvmc 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
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan wayland xa xvmc 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 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[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/clang:7[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/clang-9:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[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/llvm:7[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/llvm-9:=[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(-)?] ) ) ) ) )
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:8[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/clang:7[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/clang-9:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-9:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:8[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/llvm:7[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/llvm-9:=[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=d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.0.8.tar.xz
 _eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4b9ac1d316fad65db0771978060cd477
+_md5_=a630728991a3476facd25826b89752b6
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.3 b/metadata/md5-cache/media-libs/mesa-19.1.3
index 9a1393e06b8d..67fc24904191 100644
--- a/metadata/md5-cache/media-libs/mesa-19.1.3
+++ b/metadata/md5-cache/media-libs/mesa-19.1.3
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DEFINED_PHASES=compile configure install postinst pretend setup test
-DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) 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-base/xorg-proto
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) 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-base/xorg-proto
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc 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
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) )
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.3.tar.xz
 _eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=34bc129989d1324ced166def9e0ddf58
+_md5_=97c468d9444dc45ca019337ea4d55fda
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.4 b/metadata/md5-cache/media-libs/mesa-19.1.4
index 1e03871a2feb..4ce0106fbcb9 100644
--- a/metadata/md5-cache/media-libs/mesa-19.1.4
+++ b/metadata/md5-cache/media-libs/mesa-19.1.4
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DEFINED_PHASES=compile configure install postinst pretend setup test
-DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) 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-base/xorg-proto
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) 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-base/xorg-proto
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc 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
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) )
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.4.tar.xz
 _eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=34bc129989d1324ced166def9e0ddf58
+_md5_=97c468d9444dc45ca019337ea4d55fda
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.5 b/metadata/md5-cache/media-libs/mesa-19.1.5
index 7e3ae4f6c97a..99b712d36370 100644
--- a/metadata/md5-cache/media-libs/mesa-19.1.5
+++ b/metadata/md5-cache/media-libs/mesa-19.1.5
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DEFINED_PHASES=compile configure install postinst pretend setup test
-DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) 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-base/xorg-proto
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) 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-base/xorg-proto
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc 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
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) )
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.5.tar.xz
 _eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=34bc129989d1324ced166def9e0ddf58
+_md5_=97c468d9444dc45ca019337ea4d55fda
diff --git a/metadata/md5-cache/media-libs/mesa-19.1.6 b/metadata/md5-cache/media-libs/mesa-19.1.6
index 2629ed5d32c3..1389bc54d8a2 100644
--- a/metadata/md5-cache/media-libs/mesa-19.1.6
+++ b/metadata/md5-cache/media-libs/mesa-19.1.6
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DEFINED_PHASES=compile configure install postinst pretend setup test
-DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) 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-base/xorg-proto
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) 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-base/xorg-proto
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc 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
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland xa xvmc 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) )
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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/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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.97[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.97[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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_r100? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.97[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.1.6.tar.xz
 _eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=34bc129989d1324ced166def9e0ddf58
+_md5_=97c468d9444dc45ca019337ea4d55fda
diff --git a/metadata/md5-cache/media-libs/mesa-19.2.0_rc1 b/metadata/md5-cache/media-libs/mesa-19.2.0_rc1
index e8cb993177b3..cbfb90536e3c 100644
--- a/metadata/md5-cache/media-libs/mesa-19.2.0_rc1
+++ b/metadata/md5-cache/media-libs/mesa-19.2.0_rc1
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DEFINED_PHASES=compile configure install postinst pretend setup test
-DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( 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-base/xorg-proto )
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( 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-base/xorg-proto )
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc 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
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) )
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.2.0-rc1.tar.xz
 _eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=92d7913ceb2fc78abb1014fa85208e1a
+_md5_=8a5145f3ccdbe54afe95a5732893cbd3
diff --git a/metadata/md5-cache/media-libs/mesa-19.2.0_rc2 b/metadata/md5-cache/media-libs/mesa-19.2.0_rc2
index c518614b33fa..496aebf8f952 100644
--- a/metadata/md5-cache/media-libs/mesa-19.2.0_rc2
+++ b/metadata/md5-cache/media-libs/mesa-19.2.0_rc2
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
 DEFINED_PHASES=compile configure install postinst pretend setup test
-DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( 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-base/xorg-proto )
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( 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-base/xorg-proto )
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc 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
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) )
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.2.0-rc2.tar.xz
 _eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=bc4b769b638bbff2fb38f6affedb577f
+_md5_=c4faa30ddccfe816339d2965644fc2ce
diff --git a/metadata/md5-cache/media-libs/mesa-19.2.0_rc3 b/metadata/md5-cache/media-libs/mesa-19.2.0_rc3
new file mode 100644
index 000000000000..74a5687917b1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-19.2.0_rc3
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( 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-base/xorg-proto )
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=7
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.2.0-rc3.tar.xz
+_eclasses_=llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c4faa30ddccfe816339d2965644fc2ce
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 857d94bebf6e..105bf273b6fe 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -1,15 +1,15 @@
 BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 >=dev-python/mako-0.8.0[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst pretend setup test unpack
-DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( 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-base/xorg-proto )
+DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( 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-base/xorg-proto )
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc 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
+IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc 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
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm_sensors? ( sys-apps/lm_sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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(-)?] ) ) ) ) )
+RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-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(-)?] >=sys-libs/zlib-1.2.8[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(-)?] libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[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(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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_r600? ( virtual/libelf: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_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[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? ( dev-libs/ocl-icd[khronos-headers,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/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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.15.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(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.99[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.99[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang: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(-)?] ) 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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.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(-)?] >=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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.13:=[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(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.99[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:10[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/clang:9[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/clang:8[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/clang:7[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/clang:=[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? ( video_cards_r600? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:10[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:9[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[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(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:7[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(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:10[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/llvm:9[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/llvm:8[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/llvm:7[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/llvm:=[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=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=bc4b769b638bbff2fb38f6affedb577f
+_md5_=c4faa30ddccfe816339d2965644fc2ce
diff --git a/metadata/md5-cache/media-libs/stops-0.3.0 b/metadata/md5-cache/media-libs/stops-0.3.0
deleted file mode 100644
index 0a2605690c07..000000000000
--- a/metadata/md5-cache/media-libs/stops-0.3.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Organ stops for aeolus by Fons Adriaensen <fons.adriaensen@skynet.be>
-EAPI=0
-HOMEPAGE=http://www.kokkinizita.net/linuxaudio/aeolus/index.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://users.skynet.be/solaris/linuxaudio/downloads/stops-0.3.0.tar.bz2
-_md5_=85fcf99f8502c727d4f505147eeac0eb
diff --git a/metadata/md5-cache/media-libs/stops-0.3.0-r1 b/metadata/md5-cache/media-libs/stops-0.3.0-r1
index 99044eebeb52..0e5839518a15 100644
--- a/metadata/md5-cache/media-libs/stops-0.3.0-r1
+++ b/metadata/md5-cache/media-libs/stops-0.3.0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Organ stops for aeolus by Fons Adriaensen <fons.adriaensen@skynet.be>
 EAPI=5
 HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/stops-0.3.0.tar.bz2
-_md5_=7f5a6d4e94f0beea05befdd47a8f343c
+_md5_=515226810958865d8ade20ea551e40ab
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.10-r2 b/metadata/md5-cache/media-libs/tiff-4.0.10-r2
index 421b9bf6075a..77b8188135bf 100644
--- a/metadata/md5-cache/media-libs/tiff-4.0.10-r2
+++ b/metadata/md5-cache/media-libs/tiff-4.0.10-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Tag Image File Format (TIFF) library
 EAPI=7
 HOMEPAGE=http://libtiff.maptools.org
 IUSE=+cxx jbig jpeg lzma static-libs test webp zlib zstd 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=libtiff
 RDEPEND=jbig? ( >=media-libs/jbigkit-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(-)?] ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) webp? ( media-libs/libwebp:=[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(-)?] ) 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(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-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(-)?] )
 REQUIRED_USE=test? ( jpeg )
 SLOT=0
 SRC_URI=https://download.osgeo.org/libtiff/tiff-4.0.10.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b838ed4e0a0d6aebc5466ad92044287c
+_md5_=e6ac721a4d42b27ff3df7055a9cd00fb
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 04a15f534009..2f6c88234fa3 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/kodi-audiodecoder-sidplay-1.2.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.0
new file mode 100644
index 000000000000..20442b5916bb
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* media-libs/libsidplay:2
+DESCRIPTION=SidPlay decoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/notspiff/audiodecoder.sidplay
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* media-libs/libsidplay:2
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.sidplay/archive/1.2.0-Leia.tar.gz -> kodi-audiodecoder-sidplay-1.2.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=51a88a98facf3108df07a830a7d6c0d6
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
index 95b2c7e2eff8..8d54ceb7750e 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 media-libs/libsidplay:2
+DEPEND=~media-tv/kodi-9999 media-libs/libsidplay:2
 DESCRIPTION=SidPlay decoder addon for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/notspiff/audiodecoder.sidplay
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 media-libs/libsidplay:2
+RDEPEND=~media-tv/kodi-9999 media-libs/libsidplay:2
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a2d7f20a2d8a4f224d45ccb17bae68c
+_md5_=8cad04104b46220ff3f900b0a85df5cf
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.1
new file mode 100644
index 000000000000..52e0058859c4
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18*
+DESCRIPTION=SPC decoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/notspiff/audiodecoder.snesapu
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18*
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.snesapu/archive/2.0.1-Leia.tar.gz -> kodi-audiodecoder-snesapu-2.0.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8c892208ff4f72d1406b762071004913
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
index bffea34b938f..34047ef66df6 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
+DEPEND=~media-tv/kodi-9999
 DESCRIPTION=SPC decoder addon for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/notspiff/audiodecoder.snesapu
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
+RDEPEND=~media-tv/kodi-9999
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc1a9a002bd091b07a9550b5b2031dbb
+_md5_=4230efb8cec3b22ad26339b05e29f895
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.1
new file mode 100644
index 000000000000..340b5b72de97
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=SPC decoder addon for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/notspiff/audiodecoder.stsound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18*
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.stsound/archive/2.0.1-Leia.tar.gz -> kodi-audiodecoder-stsound-2.0.1.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=467a271f2c4424d60225d59f53831cee
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
index 70689d93b201..08a4617e5d9b 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
+DEPEND=~media-tv/kodi-9999
 DESCRIPTION=SPC decoder addon for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/notspiff/audiodecoder.stsound
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 ~media-libs/kodi-platform-9999
+RDEPEND=~media-tv/kodi-9999
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86d325e6bd9ceb11be6f392fb1412e8e
+_md5_=a2ad696c263f59affe2f526adea1e250
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1
deleted file mode 100644
index eb29a9d49314..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Timidity decoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/audiodecoder.timidity
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18*
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.timidity/archive/2.0.1-Leia.tar.gz -> kodi-audiodecoder-timidity-2.0.1-Leia.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=12c1433c29bf78ca0c68c481883dd00f
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1-r1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1-r1
deleted file mode 100644
index beac528da7dc..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Timidity decoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/audiodecoder.timidity
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.timidity/archive/2.0.1-Leia.tar.gz -> kodi-audiodecoder-timidity-2.0.1-Leia.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5dc490a7a16f40cd51cb8a0ff78fc9c2
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.3 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.3
new file mode 100644
index 000000000000..a3f7312f81b7
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Timidity decoder addon for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/notspiff/audiodecoder.timidity
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18*
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.timidity/archive/2.0.3-Leia.tar.gz -> kodi-audiodecoder-timidity-2.0.3-Leia.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4936e738b8b1bdf6152623ab1d98336c
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
index 915b8f6eeb57..b761b438035c 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
@@ -1,12 +1,12 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2*
+DEPEND=~media-tv/kodi-9999
 DESCRIPTION=Timidity decoder addon for Kodi
 EAPI=7
 HOMEPAGE=https://github.com/notspiff/audiodecoder.timidity
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2*
+RDEPEND=~media-tv/kodi-9999
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e302b84a58eae338b3ad5589e186bd9
+_md5_=7388163babd3b10ed23e202bba2b9a58
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.17.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.17.0
deleted file mode 100644
index ae12dc8e1326..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.17.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.17.0-Leia.tar.gz -> kodi-pvr-vuplus-3.17.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.18.1 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.18.1
deleted file mode 100644
index ff478c6ec62e..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.18.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.18.1-Leia.tar.gz -> kodi-pvr-vuplus-3.18.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.19.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.19.0
deleted file mode 100644
index 443cd2ec64c2..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.19.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.19.0-Leia.tar.gz -> kodi-pvr-vuplus-3.19.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.20.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.20.0
deleted file mode 100644
index a8a421d1f007..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.20.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.20.0-Leia.tar.gz -> kodi-pvr-vuplus-3.20.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.21.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.21.0
deleted file mode 100644
index 2dee95c97076..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.21.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.21.0-Leia.tar.gz -> kodi-pvr-vuplus-3.21.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.22.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.22.0
deleted file mode 100644
index 11235a030b49..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.22.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.22.0-Leia.tar.gz -> kodi-pvr-vuplus-3.22.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.23.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.23.0
deleted file mode 100644
index 632dfeed205f..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.23.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.23.0-Leia.tar.gz -> kodi-pvr-vuplus-3.23.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.24.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.24.0
deleted file mode 100644
index 643ab83b69e5..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.24.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.24.0-Leia.tar.gz -> kodi-pvr-vuplus-3.24.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.25.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.25.0
deleted file mode 100644
index 6d4262176d9e..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.25.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.25.0-Leia.tar.gz -> kodi-pvr-vuplus-3.25.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.26.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.26.0
deleted file mode 100644
index eb19130159ef..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.26.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.26.0-Leia.tar.gz -> kodi-pvr-vuplus-3.26.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.0
deleted file mode 100644
index 89c566c84ad1..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.27.0-Leia.tar.gz -> kodi-pvr-vuplus-3.27.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.1 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.1
deleted file mode 100644
index 94a053db37f6..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.27.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=6
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.27.1-Leia.tar.gz -> kodi-pvr-vuplus-3.27.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfbb835dd41ada40d8b3aab947635049
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.0
new file mode 100644
index 000000000000..f99c01277f17
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
+DESCRIPTION=Kodi's VuPlus client addon
+EAPI=7
+HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml dev-cpp/nlohmann_json
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/3.28.0-Leia.tar.gz -> kodi-pvr-vuplus-3.28.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kodi-addon	c1cb915efef96441d8262731df243cea	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3ebf00c7b32987037645ac9241a9f6bb
diff --git a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2 b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
index ed824bde85df..550a9229d3f2 100644
--- a/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
+++ b/metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/2086/vdr-imonlcd-1.0.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
 _md5_=02ff8d4077d16f6379f2ddf428b88acc
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
index ec51fd1af89a..8fba82db2eda 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
@@ -5,8 +5,8 @@ EAPI=5
 HOMEPAGE=http://firefly.vdr-developer.org/systeminfo/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/lm_sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=sys-apps/lm-sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=5fa13de0909758431e2e92c7633e35b1
+_md5_=e8c8b49fccfdfe0fad20db3c6e160d1f
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3
index 61e6c4e31444..9094744cd14a 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3
@@ -5,8 +5,8 @@ EAPI=5
 HOMEPAGE=http://firefly.vdr-developer.org/systeminfo/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/lm_sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=sys-apps/lm-sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=7c9993287f76ae5db43b5df632d5a3df
+_md5_=34e6f37109139b7a910a2aa24f2ec180
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
index 41ec34a26ed3..f92920598c20 100644
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
+++ b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.4
@@ -5,8 +5,8 @@ EAPI=6
 HOMEPAGE=http://firefly.vdr-developer.org/systeminfo/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/lm_sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+RDEPEND=sys-apps/lm-sensors app-admin/hddtemp >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
 SLOT=0
 SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.4.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	3719fa10a30f33eea321f9b883bd4baa
-_md5_=8f8e607581e843b829387eae066d2f6d
+_md5_=8e703c7eaf59a5005ae19e42939ce8f7
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a086cc295f83..3bbb1a3b6010 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.1.2 b/metadata/md5-cache/media-sound/alsa-utils-1.1.2
index cdbf22b7357f..4891525b6bed 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.1.2
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.1.2 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=mirror://alsaproject/utils/alsa-utils-1.1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b268a07856029529526ccd3386e5a80a
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.1.6 b/metadata/md5-cache/media-sound/alsa-utils-1.1.6
index f5c8796614a0..a1af6e5fb4b8 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.1.6
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.1.6 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=mirror://alsaproject/utils/alsa-utils-1.1.6.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=91f78ddf43cff481a572e9f72b1b1777
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.1.8 b/metadata/md5-cache/media-sound/alsa-utils-1.1.8
index f413956ee1e3..9fd710442ecd 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.1.8
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.1.8
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.1.8 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=mirror://alsaproject/utils/alsa-utils-1.1.8.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=22e5ad11f740cd3864bb91e6ac11d442
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.1.9 b/metadata/md5-cache/media-sound/alsa-utils-1.1.9
index b46d5db6c52b..45d98374e94b 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.1.9
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.1.9
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.1.9 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=mirror://alsaproject/utils/alsa-utils-1.1.9.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=dceb5fc61e9616a8d4aed227d82af7c1
diff --git a/metadata/md5-cache/media-sound/drumstick-1.1.3 b/metadata/md5-cache/media-sound/drumstick-1.1.3
new file mode 100644
index 000000000000..4c86d9f59acf
--- /dev/null
+++ b/metadata/md5-cache/media-sound/drumstick-1.1.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig x11-misc/shared-mime-info doc? ( app-doc/doxygen app-text/docbook-xsl-stylesheets dev-libs/libxslt ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib fluidsynth? ( media-sound/fluidsynth ) pulseaudio? ( media-sound/pulseaudio ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Qt/C++ wrapper for ALSA sequencer
+EAPI=7
+HOMEPAGE=http://drumstick.sourceforge.net/
+IUSE=doc fluidsynth pulseaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib fluidsynth? ( media-sound/fluidsynth ) pulseaudio? ( media-sound/pulseaudio )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/drumstick/drumstick-1.1.3.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ab525447e759244a9ce9679eaafa26d9
diff --git a/metadata/md5-cache/media-sound/mumble-1.3.0 b/metadata/md5-cache/media-sound/mumble-1.3.0
new file mode 100644
index 000000000000..05c15b6ceb07
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mumble-1.3.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-libs/boost-1.41.0 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
+EAPI=7
+HOMEPAGE=https://wiki.mumble.info
+IUSE=+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf 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
+LICENSE=BSD MIT
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+SLOT=0
+SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.0/mumble-1.3.0.tar.gz https://dl.mumble.info/mumble-1.3.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ba9329a88c17978d4a603ff773b30325
diff --git a/metadata/md5-cache/media-sound/mumble-1.3.0_rc1-r1 b/metadata/md5-cache/media-sound/mumble-1.3.0_rc1-r1
deleted file mode 100644
index 87c5b10b462b..000000000000
--- a/metadata/md5-cache/media-sound/mumble-1.3.0_rc1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-libs/boost-1.41.0 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
-EAPI=7
-HOMEPAGE=https://wiki.mumble.info
-IUSE=+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf 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
-LICENSE=BSD MIT
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/speex-1.2.0 media-libs/speexdsp sys-apps/lsb-release x11-libs/libX11 x11-libs/libXi alsa? ( media-libs/alsa-lib ) dbus? ( dev-qt/qtdbus:5 ) g15? ( app-misc/g15daemon ) jack? ( virtual/jack ) !libressl? ( >=dev-libs/openssl-1.0.0b:0= ) libressl? ( dev-libs/libressl ) opus? ( >=media-libs/opus-1.0.1 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) speech? ( >=app-accessibility/speech-dispatcher-0.8.0 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-SLOT=0
-SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.0-rc1/mumble-1.3.0-rc1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0135f0932b8c0427612158a787ff219d
diff --git a/metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0 b/metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0
index 10701886864d..7273db239ff7 100644
--- a/metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0
+++ b/metadata/md5-cache/media-sound/munt-mt32emu-alsadrv-2.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=media-libs/alsa-lib media-libs/munt-mt32emu X? ( x11-libs/libX11 x11-libs/libXpm x11-libs/libXt )
 SLOT=0
 SRC_URI=https://github.com/munt/munt/archive/munt_2_3_0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=fa1e6d19714b9f84ef84e6e6bb55942e
diff --git a/metadata/md5-cache/media-sound/murmur-1.3.0 b/metadata/md5-cache/media-sound/murmur-1.3.0
new file mode 100644
index 000000000000..09f8cece1f58
--- /dev/null
+++ b/metadata/md5-cache/media-sound/murmur-1.3.0
@@ -0,0 +1,14 @@
+BDEPEND=acct-group/murmur acct-user/murmur virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-libs/boost-1.41.0
+DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
+EAPI=7
+HOMEPAGE=https://wiki.mumble.info
+IUSE=+dbus debug +ice pch zeroconf
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=acct-group/murmur acct-user/murmur >=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+SLOT=0
+SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.0/mumble-1.3.0.tar.gz https://dl.mumble.info/mumble-1.3.0.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b04793b74cd21ece196cfb4f91e4b0bb
diff --git a/metadata/md5-cache/media-sound/murmur-1.3.0_rc2-r1 b/metadata/md5-cache/media-sound/murmur-1.3.0_rc2-r1
deleted file mode 100644
index a8c11122f793..000000000000
--- a/metadata/md5-cache/media-sound/murmur-1.3.0_rc2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-libs/boost-1.41.0
-DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat software
-EAPI=7
-HOMEPAGE=https://wiki.mumble.info
-IUSE=+dbus debug +ice pch zeroconf
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/openssl-1.0.0b:0= >=dev-libs/protobuf-2.2.0:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 || ( dev-qt/qtsql:5[sqlite] dev-qt/qtsql:5[mysql] ) dev-qt/qtxml:5 sys-apps/lsb-release >=sys-libs/libcap-2.15 dbus? ( dev-qt/qtdbus:5 ) ice? ( dev-libs/Ice:= ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-SLOT=0
-SRC_URI=https://github.com/mumble-voip/mumble/releases/download/1.3.0-rc2/mumble-1.3.0-rc2.tar.gz https://dl.mumble.info/mumble-1.3.0-rc2.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=4db22d25d2e618f7837809b2fe9b16b2
diff --git a/metadata/md5-cache/media-sound/pulseaudio-12.2 b/metadata/md5-cache/media-sound/pulseaudio-12.2
index 6daec535310f..63f5c8b03971 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-12.2
+++ b/metadata/md5-cache/media-sound/pulseaudio-12.2
@@ -11,5 +11,5 @@ RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-li
 REQUIRED_USE=bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) realtime? ( dbus ) udev? ( || ( alsa oss ) )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-12.2.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a82349f297eef6ead73a77df61a2365
diff --git a/metadata/md5-cache/media-sound/pulseaudio-12.2-r1 b/metadata/md5-cache/media-sound/pulseaudio-12.2-r1
index 0e597dffe16c..b9b246f02041 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-12.2-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-12.2-r1
@@ -11,5 +11,5 @@ RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-li
 REQUIRED_USE=?? ( elogind systemd ) bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) realtime? ( dbus ) udev? ( || ( alsa oss ) )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-12.2.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb320648a18cbef06366030665372532
diff --git a/metadata/md5-cache/media-sound/pulseaudio-12.2-r2 b/metadata/md5-cache/media-sound/pulseaudio-12.2-r2
index 802eaa8eba52..e94e5273c63f 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-12.2-r2
+++ b/metadata/md5-cache/media-sound/pulseaudio-12.2-r2
@@ -4,12 +4,12 @@ DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 IUSE=+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf +gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf kernel_linux 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-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[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(-)?] ) )
 RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[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.4.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/libxcb-1.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(-)?] x11-libs/libSM[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/libICE[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/libXtst[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(-)?] ) caps? ( >=sys-libs/libcap-2.22-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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.26.0: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(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[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(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.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(-)?] ) gtk? ( x11-libs/gtk+:3 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[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/udev-143[hwdb(+)] ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) media-libs/speexdsp gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd: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(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) realtime? ( sys-auth/rtkit ) gconf? ( >=gnome-base/gconf-3.2.6 ) equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) ) system-wide? ( alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-5 ) )
 REQUIRED_USE=?? ( elogind systemd ) bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) realtime? ( dbus ) udev? ( || ( alsa oss ) )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-12.2.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b46c023dd92af56c884e9f5f4fbff5b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=71eaeadd54d3d22bf981683f9c217417
diff --git a/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1 b/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1
deleted file mode 100644
index 665d0c7457e2..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-3.2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/gst-python-1.12.0:1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3.18:3[introspection] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.18[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/lilv-0.24.2-r1 >=media-plugins/calf-0.90.0[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0[introspection] >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 dev-libs/appstream-glib sys-devel/gettext >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=6
-HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/gst-python-1.12.0:1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3.18:3[introspection] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.18[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/lilv-0.24.2-r1 >=media-plugins/calf-0.90.0[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0[introspection] >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 dev-libs/appstream-glib sys-devel/gettext media-sound/pulseaudio[equalizer]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v3.2.3.tar.gz -> pulseeffects-3.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=845819a3dc51a595fc1fefdcf61af8ab
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.6.5 b/metadata/md5-cache/media-sound/pulseeffects-4.6.5
deleted file mode 100644
index ba2ed7a0b5e3..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-4.6.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=7
-HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=bs2b calf mda-lv2 rubberband
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.6.5.tar.gz -> pulseeffects-4.6.5.tar.gz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fbf18ed0a3d3d4e28d20f078bf009277
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.6.7 b/metadata/md5-cache/media-sound/pulseeffects-4.6.7
new file mode 100644
index 000000000000..4cd8389236cb
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.6.7
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool media-libs/libsamplerate virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
+DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
+EAPI=7
+HOMEPAGE=https://github.com/wwmm/pulseeffects
+IUSE=bs2b calf mda-lv2 rubberband
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
+SLOT=0
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.6.7.tar.gz -> pulseeffects-4.6.7.tar.gz
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=466ada9a2b0baaf4da549c95146663f5
diff --git a/metadata/md5-cache/media-sound/supercollider-3.9.3-r1 b/metadata/md5-cache/media-sound/supercollider-3.9.3-r1
deleted file mode 100644
index ff82101b313e..000000000000
--- a/metadata/md5-cache/media-sound/supercollider-3.9.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=media-libs/alsa-lib sys-libs/readline:0= x11-libs/libX11 x11-libs/libXt fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) !jack? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) server? ( !app-admin/supernova ) sndfile? ( media-libs/libsndfile ) zeroconf? ( net-dns/avahi ) dev-libs/icu virtual/pkgconfig emacs? ( virtual/emacs ) gedit? ( app-editors/gedit ) qt5? ( dev-qt/linguist-tools:5 dev-qt/qtdeclarative:5 dev-qt/qtconcurrent:5 ) vim? ( app-editors/vim ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An environment and a programming language for real time audio synthesis.
-EAPI=6
-HOMEPAGE=https://supercollider.github.io/
-IUSE=cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim zeroconf
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 gpl3? ( GPL-3 )
-RDEPEND=media-libs/alsa-lib sys-libs/readline:0= x11-libs/libX11 x11-libs/libXt fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) !jack? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) server? ( !app-admin/supernova ) sndfile? ( media-libs/libsndfile ) zeroconf? ( net-dns/avahi )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/supercollider/supercollider/releases/download/Version-3.9.3/SuperCollider-3.9.3-Source-linux.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=589e2b8e2912253ce908903a94ef5e61
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 4305a3cc4d3c..222674f8efd4 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index 8bd847dd8592..6711c3b2180c 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] ) python_single_target_python3_5? ( dev-lang/python:3.5[libressl?,sqlite,ssl] ) python_single_target_python3_6? ( dev-lang/python:3.6[libressl?,sqlite,ssl] ) python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_5? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] ) python_single_target_python3_5? ( dev-lang/python:3.5[libressl?,sqlite,ssl] ) python_single_target_python3_6? ( dev-lang/python:3.6[libressl?,sqlite,ssl] ) python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_5? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
 IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] ) python_single_target_python3_5? ( dev-lang/python:3.5[libressl?,sqlite,ssl] ) python_single_target_python3_6? ( dev-lang/python:3.6[libressl?,sqlite,ssl] ) python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_5? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] ) python_single_target_python3_5? ( dev-lang/python:3.5[libressl?,sqlite,ssl] ) python_single_target_python3_6? ( dev-lang/python:3.6[libressl?,sqlite,ssl] ) python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_5? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) || ( gles opengl ) ^^ ( gbm raspberry-pi wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.4-Leia-18.4.tar.gz -> ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aeeee82397ca98326dd2497d3fd2e2f8
+_md5_=84a409ae81227a91bd05de1ae12c255c
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.10.1 b/metadata/md5-cache/media-tv/v4l-utils-1.10.1
index d0755875f32e..7d81da344a19 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.10.1
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=media-libs/libv4l-1.10.1 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 virtual/opengl media-libs/alsa-lib ) udev? ( virtual/libudev ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.10.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=490106e622d84d3e4e9bddedd16e8bfc
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.16.3 b/metadata/md5-cache/media-tv/v4l-utils-1.16.3
index 0e5956c7c90d..df19b13b3568 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.16.3
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.16.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=media-libs/libv4l-1.16.3[jpeg] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl ) media-libs/alsa-lib ) virtual/libudev >=virtual/jpeg-0-r2:0= virtual/libelf:= !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.3.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e42389c22ab27775418174c0c6d064c
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.16.3-r1 b/metadata/md5-cache/media-tv/v4l-utils-1.16.3-r1
index e204c0e53662..c4ef5faef28c 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.16.3-r1
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.16.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=media-libs/libv4l-1.16.3[jpeg] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl ) media-libs/alsa-lib ) virtual/libudev >=virtual/jpeg-0-r2:0= bpf? ( virtual/libelf:= ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.3.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=613252b0081eed6b4ea411dded5c0505
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.16.6 b/metadata/md5-cache/media-tv/v4l-utils-1.16.6
index 9a59e91014e9..243285f50c04 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.16.6
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.16.6
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=media-libs/libv4l-1.16.6[jpeg] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl ) media-libs/alsa-lib ) virtual/libudev >=virtual/jpeg-0-r2:0= bpf? ( virtual/libelf:= ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.6.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=961e24d33044561dabc6f87ba708187a
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 92f4b1f2b157..edacafce1896 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/acidrip-0.14-r4 b/metadata/md5-cache/media-video/acidrip-0.14-r4
index e8b9dcdc1fb6..7f8bce614cce 100644
--- a/metadata/md5-cache/media-video/acidrip-0.14-r4
+++ b/metadata/md5-cache/media-video/acidrip-0.14-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl:= dev-perl/Gtk2 media-video/lsdvd media-video/mplayer[encode] encode? ( >=media-sound/lame-3.92 ) dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/acidrip/files/acidrip/0.14%20-%20Your%20two-wheeled%20knife/acidrip-0.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ce6d59f252237515630383fab44da2b4
diff --git a/metadata/md5-cache/media-video/clive-2.3.0.1 b/metadata/md5-cache/media-video/clive-2.3.0.1
index b8622cd3dbf1..689144c1c4f5 100644
--- a/metadata/md5-cache/media-video/clive-2.3.0.1
+++ b/metadata/md5-cache/media-video/clive-2.3.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-perl/BerkeleyDB-0.34 >=dev-perl/Config-Tiny-2.12 >=virtual/perl-Digest-SHA-5.47 >=dev-perl/HTML-TokeParser-Simple-2.37 >=dev-perl/Class-Singleton-1.4 >=dev-perl/WWW-Curl-4.05 >=dev-perl/XML-Simple-2.18 >=dev-perl/Getopt-ArgvFile-1.11 dev-perl/JSON-XS dev-perl/URI virtual/perl-Getopt-Long virtual/perl-File-Spec clipboard? ( >=dev-perl/Clipboard-0.09 ) pager? ( >=dev-perl/IO-Pager-0.05 ) password? ( >=dev-perl/Expect-1.21 ) media-libs/quvi || ( net-misc/wget net-misc/curl ) dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/clive/2.3/clive-2.3.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d2e307228c6edd323573d3b9ab431e7
diff --git a/metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1 b/metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1
index 67c3a77da775..7c47774fe344 100644
--- a/metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1
+++ b/metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 virtual/libusb:0 virtual/udev
 SLOT=0
 SRC_URI=https://launchpad.net/isight-firmware-tools/main/1.6/+download/isight-firmware-tools-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b9b1703ef672c832a735c0e100c9456a
diff --git a/metadata/md5-cache/media-video/kino-1.3.4-r1 b/metadata/md5-cache/media-video/kino-1.3.4-r1
index 118cc81e778c..99fb4ee1ab41 100644
--- a/metadata/md5-cache/media-video/kino-1.3.4-r1
+++ b/metadata/md5-cache/media-video/kino-1.3.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.6.0:2 >=gnome-base/libglade-2.5.0 >=dev-libs/glib-2:2 x11-libs/libXv dev-libs/libxml2:2 media-libs/audiofile >=sys-libs/libraw1394-1.0.0 >=sys-libs/libavc1394-0.4.1 >=media-libs/libdv-0.103 media-libs/libsamplerate media-libs/libiec61883 media-libs/libv4l:0= alsa? ( >=media-libs/alsa-lib-1.0.9 ) !libav? ( >=media-video/ffmpeg-3:0= ) libav? ( media-video/libav:0= ) quicktime? ( >=media-libs/libquicktime-0.9.5 ) media-video/mjpegtools media-sound/rawrec dvdr? ( media-video/dvdauthor app-cdr/dvd+rw-tools ) gpac? ( media-video/gpac ) lame? ( media-sound/lame ) sox? ( media-sound/sox ) vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/kino/kino-1.3.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=fdd869aec0ddeb4be3d3d8503f7c3146
diff --git a/metadata/md5-cache/media-video/movit-1.6.2 b/metadata/md5-cache/media-video/movit-1.6.2
index e79a38428ca8..71bb7e6037dd 100644
--- a/metadata/md5-cache/media-video/movit-1.6.2
+++ b/metadata/md5-cache/media-video/movit-1.6.2
@@ -3,11 +3,11 @@ DEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy >=sci-l
 DESCRIPTION=Modern Video Toolkit
 EAPI=5
 HOMEPAGE=http://movit.sesse.net/
-KEYWORDS=~amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/mesa[X(+)] >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy >=sci-libs/fftw-3 media-libs/libsdl2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://movit.sesse.net/movit-1.6.2.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bfc4226988602f5050952d64c0cb5a11
+_md5_=220a28fe3e9ac7b3883d5e92b65de836
diff --git a/metadata/md5-cache/media-video/photofilmstrip-2.1.0-r2 b/metadata/md5-cache/media-video/photofilmstrip-2.1.0-r2
deleted file mode 100644
index 31c5b36b2984..000000000000
--- a/metadata/md5-cache/media-video/photofilmstrip-2.1.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/wxpython:3.0[cairo?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-video/mplayer[encode] sdl? ( dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Movie slideshow creator using Ken Burns effect
-EAPI=6
-HOMEPAGE=http://www.photofilmstrip.org
-IUSE=cairo sdl python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/wxpython:3.0[cairo?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-video/mplayer[encode] sdl? ( dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/photostoryx/photofilmstrip/2.1.0/photofilmstrip-2.1.0.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=774088fc5f8d2f6e1bce0fa306ab8bb9
diff --git a/metadata/md5-cache/media-video/pipewire-0.2.6 b/metadata/md5-cache/media-video/pipewire-0.2.6
index 0e33171aeca9..de7b114e48b2 100644
--- a/metadata/md5-cache/media-video/pipewire-0.2.6
+++ b/metadata/md5-cache/media-video/pipewire-0.2.6
@@ -5,10 +5,10 @@ DESCRIPTION=Multimedia processing graphs
 EAPI=7
 HOMEPAGE=https://pipewire.org/
 IUSE=bluetooth doc ffmpeg libav gstreamer sdl systemd vaapi X
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=media-libs/alsa-lib sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc ) ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) sdl? ( media-libs/libsdl2 ) systemd? ( sys-apps/systemd ) vaapi? ( x11-libs/libva ) X? ( x11-libs/libX11 )
 SLOT=0/0.2
 SRC_URI=https://github.com/PipeWire/pipewire/archive/0.2.6.tar.gz -> pipewire-0.2.6.tar.gz
 _eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b1d5b2df7d59596b546a5c6b81023042
+_md5_=debe3afca368584d37dee047abf8af6c
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 736efb6fe350..e0ef62d59c6f 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/graphite-web-1.1.3-r1 b/metadata/md5-cache/net-analyzer/graphite-web-1.1.3-r1
index 0e96a7ecdac5..e260e6588c3f 100644
--- a/metadata/md5-cache/net-analyzer/graphite-web-1.1.3-r1
+++ b/metadata/md5-cache/net-analyzer/graphite-web-1.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=carbon? ( dev-python/carbon[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphite-web/graphite-web-1.1.3.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=986ba30afb11be26e1afb7331c4fee9e
diff --git a/metadata/md5-cache/net-analyzer/graphite-web-1.1.5 b/metadata/md5-cache/net-analyzer/graphite-web-1.1.5
index 11df587691e7..953996bcdc1f 100644
--- a/metadata/md5-cache/net-analyzer/graphite-web-1.1.5
+++ b/metadata/md5-cache/net-analyzer/graphite-web-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=carbon? ( dev-python/carbon[python_targets_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphite-web/graphite-web-1.1.5.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=caf3161ea5c5366459f7530e46fd961b
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1
index 8aa64e2412a4..b7822f457476 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=6
 HOMEPAGE=http://www.net-snmp.org/
-IUSE=X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
+IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=HPND BSD GPL-2
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
 REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/35
 SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.8/net-snmp-5.8.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cca45d00a38fc076a10ac96b7b93f36
+_md5_=18ebf1dd70981fba17e7f6921df64b22
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r2 b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r2
index e85087bb01a0..ce64369ae08a 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r2
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=6
 HOMEPAGE=http://www.net-snmp.org/
-IUSE=X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
+IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=HPND BSD GPL-2
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
 REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/35
 SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.8/net-snmp-5.8.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ebd8b1f0410a336a34a1f02d0cf7217e
+_md5_=10514305875e5fe7f38c8bc7ed5d3f6b
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r4 b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r4
new file mode 100644
index 000000000000..5ad6ca9e4dd8
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Software for generating and retrieving SNMP data
+EAPI=6
+HOMEPAGE=http://www.net-snmp.org/
+IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=HPND BSD GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
+RESTRICT=test
+SLOT=0/35
+SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.8/net-snmp-5.8.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4d693ad1fb8513c426e8888a13fe64ca
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-99999999 b/metadata/md5-cache/net-analyzer/net-snmp-99999999
index 8906bb3b5772..3c747e4bdae8 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-99999999
+++ b/metadata/md5-cache/net-analyzer/net-snmp-99999999
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
+DEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=6
 HOMEPAGE=http://www.net-snmp.org/
-IUSE=X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
+IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
 LICENSE=HPND BSD GPL-2
 PROPERTIES=live
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+RDEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
 REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/35
 SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=59c8fad37bec4a584b67105111a75b7a
+_md5_=0344f0af9dcd52debc9e1b227ed49cfa
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.17.1 b/metadata/md5-cache/net-analyzer/netdata-1.17.1
new file mode 100644
index 000000000000..e6b954992ab7
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netdata-1.17.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 postinst prepare setup
+DEPEND=app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-analyzer/tcpdump net-analyzer/traceroute net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( dev-libs/libuv app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] mysql? ( || ( dev-python/mysqlclient[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mysql-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) tor? ( net-libs/stem[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DESCRIPTION=Linux real time system monitoring, done right!
+EAPI=7
+HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
+IUSE=caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen +filecaps kernel_linux python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ MIT BSD
+RDEPEND=app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-analyzer/tcpdump net-analyzer/traceroute net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( dev-libs/libuv app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] mysql? ( || ( dev-python/mysqlclient[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mysql-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) postgres? ( dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) tor? ( net-libs/stem[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) xen? ( app-emulation/xen-tools dev-libs/yajl )
+REQUIRED_USE=mysql? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) tor? ( python )
+SLOT=0
+SRC_URI=https://github.com/netdata/netdata/archive/v1.17.1.tar.gz -> netdata-1.17.1.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	fcaps	9445d60c1eb084a91c38ef4c070b2f16	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=f5ee0bae8edc2fd7f33d442a2ba745be
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.12 b/metadata/md5-cache/net-analyzer/snort-2.9.12
index 905c31333b56..9fc3304dca52 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.12
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.12
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 de
 REQUIRED_USE=!kernel_linux? ( !shared-rep )
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.12.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=4815930ad5b16d4399779044d03699a8
diff --git a/metadata/md5-cache/net-analyzer/suricata-4.0.4 b/metadata/md5-cache/net-analyzer/suricata-4.0.4
index 8dd301bf8cce..f6c431628dcc 100644
--- a/metadata/md5-cache/net-analyzer/suricata-4.0.4
+++ b/metadata/md5-cache/net-analyzer/suricata-4.0.4
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/jansson-2.2 dev-libs/libpcre dev-libs/libyaml net-libs/libnet
 SLOT=0
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-4.0.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a731be859598a54d703695c3f32a101
+_md5_=6fcc354df502abf0fe6a690a789169b6
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.0.3 b/metadata/md5-cache/net-analyzer/wireshark-3.0.3
index 4ac9b80a24ff..2fea0d671f66 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.0.3
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.0.3
@@ -5,11 +5,11 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=7
 HOMEPAGE=https://www.wireshark.org/
 IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark +udpdump zlib +filecaps python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc64 x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0/3.0.3
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.0.3.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a9c88bd3631afcc5b6b98fd07bd37af4
+_md5_=3774015bb9e9cdad36f1a705e532af06
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.0.4 b/metadata/md5-cache/net-analyzer/wireshark-3.0.4
new file mode 100644
index 000000000000..95364b06defb
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.0.4
@@ -0,0 +1,15 @@
+BDEPEND=!<perl-core/Pod-Simple-3.170 !<virtual/perl-Pod-Simple-3.170 dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] filecaps? ( sys-libs/libcap )
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=7
+HOMEPAGE=https://www.wireshark.org/
+IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark +udpdump zlib +filecaps python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgcrypt:0 adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) netlink? ( dev-libs/libnl:3 ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0/3.0.4
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.0.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3a0f4812250e6c7c7bd37964226f00f1
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 861effcdfd66..0dcb2ed0f044 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/coredns-1.3.0 b/metadata/md5-cache/net-dns/coredns-1.3.0
deleted file mode 100644
index 9a41bd9a8513..000000000000
--- a/metadata/md5-cache/net-dns/coredns-1.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=A DNS server that chains middleware
-EAPI=6
-HOMEPAGE=https://github.com/coredns/coredns
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/coredns/coredns/archive/v1.3.0.tar.gz -> coredns-1.3.0.tar.gz https://github.com/mholt/caddy/archive/6f580c6aa36c54c3e1c65b5c609550a8a2508e3e.tar.gz -> github.com-mholt-caddy-6f580c6aa36c54c3e1c65b5c609550a8a2508e3e.tar.gz https://github.com/miekg/dns/archive/7586a3cbe8ccfc63f82de3ab2ceeb08c9939af72.tar.gz -> github.com-miekg-dns-7586a3cbe8ccfc63f82de3ab2ceeb08c9939af72.tar.gz https://github.com/prometheus/client_golang/archive/505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz -> github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/prometheus/procfs/archive/1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz -> github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=357b5378b5581a2c31d16632c67a5d9a
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.27 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.27
new file mode 100644
index 000000000000..e998fe8ca6e4
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.27
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-lang/go-1.12 filecaps? ( sys-libs/libcap )
+DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
+EAPI=7
+HOMEPAGE=https://github.com/jedisct1/dnscrypt-proxy
+IUSE=pie +filecaps
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=ISC
+RDEPEND=acct-group/dnscrypt-proxy acct-user/dnscrypt-proxy
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/jedisct1/dnscrypt-proxy/archive/2.0.27.tar.gz -> dnscrypt-proxy-2.0.27.tar.gz
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b5239592496a3db715ef2c04edc12da0
diff --git a/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1 b/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1
deleted file mode 100644
index 2b8ec7353ad3..000000000000
--- a/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple virtual/pkgconfig
-DESCRIPTION=Tools to ease the deployment of DNSSEC related technologies
-EAPI=6
-HOMEPAGE=https://www.dnssec-tools.org/
-IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/perl dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple
-SLOT=0
-SRC_URI=https://www.dnssec-tools.org/download/dnssec-tools-2.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=7dcf1b138206796c38e73751078291a1
diff --git a/metadata/md5-cache/net-dns/rbldnsd-0.998-r2 b/metadata/md5-cache/net-dns/rbldnsd-0.998-r2
deleted file mode 100644
index 0d218c446a48..000000000000
--- a/metadata/md5-cache/net-dns/rbldnsd-0.998-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=zlib? ( sys-libs/zlib ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pydns:2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DESCRIPTION=DNS server designed to serve blacklist zones
-EAPI=6
-HOMEPAGE=https://rbldnsd.io/
-IUSE=ipv6 test zlib
-KEYWORDS=~amd64 ~hppa ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=https://github.com/spamhaus/rbldnsd/archive/0.998.tar.gz -> rbldnsd-0.998.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c12159c77d55cc573ac47a563e7c1f56
diff --git a/metadata/md5-cache/net-dns/rbldnsd-0.998b b/metadata/md5-cache/net-dns/rbldnsd-0.998b
new file mode 100644
index 000000000000..0a517a677b9c
--- /dev/null
+++ b/metadata/md5-cache/net-dns/rbldnsd-0.998b
@@ -0,0 +1,14 @@
+BDEPEND=test? ( zlib? ( sys-libs/zlib ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pydns:2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
+DEFINED_PHASES=compile configure install preinst setup test
+DEPEND=zlib? ( sys-libs/zlib )
+DESCRIPTION=DNS server designed to serve blacklist zones
+EAPI=7
+HOMEPAGE=https://rbldnsd.io/
+IUSE=ipv6 test zlib
+KEYWORDS=~amd64 ~hppa ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=https://github.com/spamhaus/rbldnsd/archive/0.998b.tar.gz -> rbldnsd-0.998b.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=eeaf85b86114ce0862cb62c97b7a4124
diff --git a/metadata/md5-cache/net-dns/validns-0.7 b/metadata/md5-cache/net-dns/validns-0.7
deleted file mode 100644
index 185ebdbcd78e..000000000000
--- a/metadata/md5-cache/net-dns/validns-0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/judy test? ( dev-perl/Test-Command-Simple )
-DESCRIPTION=A high performance DNS/DNSSEC zone validator
-EAPI=4
-HOMEPAGE=http://www.validns.net/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-libs/judy
-SLOT=0
-SRC_URI=http://www.validns.net/download/validns-0.7.tar.gz
-_md5_=00746dc98705fbb5ca6173d4b51721e0
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 55552325d147..83d19fa493bb 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.0-r5 b/metadata/md5-cache/net-firewall/nftables-0.9.0-r5
index 60025d37afce..462d16f3e38c 100644
--- a/metadata/md5-cache/net-firewall/nftables-0.9.0-r5
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.0-r5
@@ -4,10 +4,10 @@ DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
 EAPI=6
 HOMEPAGE=https://netfilter.org/projects/nftables/
 IUSE=debug doc +gmp json +modern_kernel +readline kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.1:0=
 SLOT=0
 SRC_URI=https://git.netfilter.org/nftables/snapshot/v0.9.0.tar.gz -> nftables-0.9.0.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=88683a90bbc66cdf17371830adcb249d
+_md5_=850013076b252c1cfc0df3f4fd639939
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.3.3 b/metadata/md5-cache/net-firewall/shorewall-5.2.3.3
deleted file mode 100644
index 950f1474c403..000000000000
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A high-level tool for configuring Netfilter
-EAPI=6
-HOMEPAGE=http://www.shorewall.net/
-IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux kernel_linux
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
-REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
-SLOT=0
-SRC_URI=http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-core-5.2.3.3.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-5.2.3.3.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall6-5.2.3.3.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-lite-5.2.3.3.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall6-lite-5.2.3.3.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-init-5.2.3.3.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-docs-html-5.2.3.3.tar.bz2 )
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7882ae04b6320277e8ecc003e424d30d
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.3.4 b/metadata/md5-cache/net-firewall/shorewall-5.2.3.4
index db0d0de520b1..c60ac1db4018 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.2.3.4
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.3.4
@@ -4,11 +4,11 @@ DESCRIPTION=A high-level tool for configuring Netfilter
 EAPI=7
 HOMEPAGE=http://www.shorewall.net/
 IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux kernel_linux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
 REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
 SLOT=0
 SRC_URI=http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-core-5.2.3.4.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-5.2.3.4.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall6-5.2.3.4.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-lite-5.2.3.4.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall6-lite-5.2.3.4.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-init-5.2.3.4.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-docs-html-5.2.3.4.tar.bz2 )
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=392b60c4f879198be8624a4f73de9349
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ebc21953015245c4df8b11d9e5974ee3
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 4c8e1edee3ef..adf0130389ef 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.9 b/metadata/md5-cache/net-fs/cifs-utils-6.9
deleted file mode 100644
index 1a984d374d7d..000000000000
--- a/metadata/md5-cache/net-fs/cifs-utils-6.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 postinst prepare setup
-DEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 sys-apps/keyutils ads? ( sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam )
-DESCRIPTION=Tools for Managing Linux CIFS Client Filesystems
-EAPI=7
-HOMEPAGE=https://wiki.samba.org/index.php/LinuxCIFS_utils
-IUSE=+acl +ads +caps creds pam kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux
-LICENSE=GPL-3
-PDEPEND=acl? ( >=net-fs/samba-4.0.0_alpha1 )
-RDEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 sys-apps/keyutils ads? ( sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam )
-REQUIRED_USE=acl? ( ads )
-SLOT=0
-SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.9.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e832aea96ff1fe4ec4a0998c259e4450
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.9-r1 b/metadata/md5-cache/net-fs/cifs-utils-6.9-r1
new file mode 100644
index 000000000000..e9f791567a62
--- /dev/null
+++ b/metadata/md5-cache/net-fs/cifs-utils-6.9-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 postinst prepare setup
+DEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 sys-apps/keyutils:= ads? ( sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam )
+DESCRIPTION=Tools for Managing Linux CIFS Client Filesystems
+EAPI=7
+HOMEPAGE=https://wiki.samba.org/index.php/LinuxCIFS_utils
+IUSE=+acl +ads +caps creds pam kernel_linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux
+LICENSE=GPL-3
+PDEPEND=acl? ( >=net-fs/samba-4.0.0_alpha1 )
+RDEPEND=!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 sys-apps/keyutils:= ads? ( sys-libs/talloc virtual/krb5 ) caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam )
+REQUIRED_USE=acl? ( ads )
+SLOT=0
+SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.9.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=4ee1e0be51a064db00e2552df8607d28
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r1 b/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r1
index dd966ffb4dcb..6a3a97920031 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r1
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=NFS client and server daemons
 EAPI=7
 HOMEPAGE=http://linux-nfs.org/
 IUSE=caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-db/sqlite-3.3 dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap !net-nds/portmap !<sys-apps/openrc-0.13.9 selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
 REQUIRED_USE=kerberos? ( nfsv4 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.4.1.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a0804ff02eea91a0bab0346c8b66c337
+_md5_=80c18dceff9fe4089f4ebafabf2386a6
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 3a2a1795e0ed..e89c2c25b176 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.6-r5 b/metadata/md5-cache/net-ftp/proftpd-1.3.6-r5
index 34e871267d91..78256a7292fb 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.6-r5
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.6-r5
@@ -12,5 +12,5 @@ REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-0.11rc.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.6.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8c6524a2a9b9beae8265709a3d416a54
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 31657833846d..b1332b168659 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/bitlbee-steam-1.2.0 b/metadata/md5-cache/net-im/bitlbee-steam-1.2.0
deleted file mode 100644
index b59719f5f467..000000000000
--- a/metadata/md5-cache/net-im/bitlbee-steam-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 dev-libs/libgpg-error >=net-im/bitlbee-3.2.1[plugins] virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Steam protocol plugin for BitlBee
-EAPI=5
-HOMEPAGE=https://github.com/jgeboski/bitlbee-steam
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1 BSD-2
-RDEPEND=dev-libs/glib:2 dev-libs/libgpg-error >=net-im/bitlbee-3.2.1[plugins]
-SLOT=0
-SRC_URI=https://github.com/jgeboski/bitlbee-steam/archive/v1.2.0.tar.gz -> bitlbee-steam-1.2.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2126169272232180b48f76db4f8210c3
diff --git a/metadata/md5-cache/net-im/choqok-1.6.0-r1 b/metadata/md5-cache/net-im/choqok-1.6.0-r1
deleted file mode 100644
index 0545cfd893ef..000000000000
--- a/metadata/md5-cache/net-im/choqok-1.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca[qt5(+)] dev-libs/qoauth:5 attica? ( >=kde-frameworks/attica-5.60.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.9.1:5 ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Free/Open Source micro-blogging client by KDE
-EAPI=6
-HOMEPAGE=https://choqok.kde.org/
-IUSE=attica konqueror telepathy debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca[qt5(+)] dev-libs/qoauth:5 attica? ( >=kde-frameworks/attica-5.60.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.9.1:5 ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) !net-im/choqok:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/choqok/1.6/src/choqok-1.6.0.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea30aa5be55d97b44dddd832824663f6
diff --git a/metadata/md5-cache/net-im/choqok-1.6.0_p20190726 b/metadata/md5-cache/net-im/choqok-1.6.0_p20190726
index 7f156171ed47..daeae274f4b3 100644
--- a/metadata/md5-cache/net-im/choqok-1.6.0_p20190726
+++ b/metadata/md5-cache/net-im/choqok-1.6.0_p20190726
@@ -5,10 +5,10 @@ DESCRIPTION=Free/Open Source micro-blogging client by KDE
 EAPI=7
 HOMEPAGE=https://choqok.kde.org/
 IUSE=attica konqueror telepathy debug +handbook
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetworkauth-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca[qt5(+)] attica? ( >=kde-frameworks/attica-5.60.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/choqok-1.6.0_p20190726.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f556fba297c8d50589e1052b2b4356f
+_md5_=66c1865394b6c82e8e0ad85bd1a718d1
diff --git a/metadata/md5-cache/net-im/coturn-4.5.0.7 b/metadata/md5-cache/net-im/coturn-4.5.0.7
index eab72d61a0a6..a706ee9f3503 100644
--- a/metadata/md5-cache/net-im/coturn-4.5.0.7
+++ b/metadata/md5-cache/net-im/coturn-4.5.0.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/coturn/coturn/archive/4.5.0.7.tar.gz -> coturn-4.5.0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ca2d84487773d324ecdda86302f1a8c7
diff --git a/metadata/md5-cache/net-im/coturn-4.5.0.8 b/metadata/md5-cache/net-im/coturn-4.5.0.8
index 3cbb2d305368..56c5d9e28c6c 100644
--- a/metadata/md5-cache/net-im/coturn-4.5.0.8
+++ b/metadata/md5-cache/net-im/coturn-4.5.0.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/coturn/coturn/archive/4.5.0.8.tar.gz -> coturn-4.5.0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ca2d84487773d324ecdda86302f1a8c7
diff --git a/metadata/md5-cache/net-im/coturn-9999 b/metadata/md5-cache/net-im/coturn-9999
index f6fdada35889..386767fc5386 100644
--- a/metadata/md5-cache/net-im/coturn-9999
+++ b/metadata/md5-cache/net-im/coturn-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=|| ( dev-libs/libevent[-ssl,libressl] dev-libs/libevent[ssl,-libressl] >dev-libs/libevent-2.1.8[ssl,libressl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:* ) redis? ( dev-libs/hiredis ) sqlite? ( dev-db/sqlite ) virtual/tmpfiles
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ca2d84487773d324ecdda86302f1a8c7
diff --git a/metadata/md5-cache/net-im/gg-transport-2.2.4-r1 b/metadata/md5-cache/net-im/gg-transport-2.2.4-r1
deleted file mode 100644
index 5fc508c84ae7..000000000000
--- a/metadata/md5-cache/net-im/gg-transport-2.2.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=net-im/jabber-base-0.01 >=dev-libs/glib-2.6.4 net-dns/libidn >=net-libs/libgadu-1.9.0_rc3 dev-libs/expat virtual/pkgconfig
-DESCRIPTION=Gadu-Gadu transport for Jabber
-EAPI=6
-HOMEPAGE=https://github.com/Jajcus/jggtrans
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=net-im/jabber-base-0.01 >=dev-libs/glib-2.6.4 net-dns/libidn >=net-libs/libgadu-1.9.0_rc3 dev-libs/expat
-SLOT=0
-SRC_URI=mirror://github/Jajcus/jggtrans/jggtrans-2.2.4.tar.gz
-_md5_=d257c2c5f3e2935262faff1dd3c4e263
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.26.2 b/metadata/md5-cache/net-im/signal-desktop-bin-1.26.2
deleted file mode 100644
index abeebf5509f1..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.26.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
-EAPI=7
-HOMEPAGE=https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop
-KEYWORDS=-* ~amd64
-LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=dev-libs/nss media-libs/mesa[X(+)] net-print/cups x11-libs/gtk+:3[X] x11-libs/libXScrnSaver x11-libs/libXtst
-SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.26.2_amd64.deb
-_eclasses_=pax-utils	db85a3c508cf82c45f24b2723791cc93	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d19084033f7abfa369d26338e5a8ded9
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.27.2 b/metadata/md5-cache/net-im/signal-desktop-bin-1.27.2
new file mode 100644
index 000000000000..aeb7df2af8bd
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.27.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
+EAPI=7
+HOMEPAGE=https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
+RDEPEND=dev-libs/nss media-libs/mesa[X(+)] net-print/cups x11-libs/gtk+:3[X] x11-libs/libXScrnSaver x11-libs/libXtst
+SLOT=0
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.27.2_amd64.deb
+_eclasses_=pax-utils	db85a3c508cf82c45f24b2723791cc93	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=282a018583fc28cc6b2c6619fb22b1b4
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index c88a1c1bb49f..923af3c74096 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/bnc-2.9.4-r1 b/metadata/md5-cache/net-irc/bnc-2.9.4-r1
index 236e5cdaea3d..5dcf078d259c 100644
--- a/metadata/md5-cache/net-irc/bnc-2.9.4-r1
+++ b/metadata/md5-cache/net-irc/bnc-2.9.4-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=ssl? ( dev-libs/openssl:0 )
+DEPEND=ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=BNC (BouNCe) is used as a gateway to an IRC Server
 EAPI=6
 HOMEPAGE=http://gotbnc.com/
 IUSE=ssl
 KEYWORDS=alpha amd64 arm ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:0 )
+RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://gotbnc.com/files/bnc2.9.4.tar.gz
-_md5_=8ccdf1f178ec8d2024d3ea378cd6f385
+_md5_=75fca2a851f0f9b04d936f1ed888482d
diff --git a/metadata/md5-cache/net-irc/ii-1.7-r1 b/metadata/md5-cache/net-irc/ii-1.7-r1
deleted file mode 100644
index 2289544fc07b..000000000000
--- a/metadata/md5-cache/net-irc/ii-1.7-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=A minimalist FIFO and filesystem-based IRC client
-EAPI=6
-HOMEPAGE=https://tools.suckless.org/ii/
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://dl.suckless.org/tools/ii-1.7.tar.gz
-_eclasses_=fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=62df0deb30b1751c9bd9df12eba5060c
diff --git a/metadata/md5-cache/net-irc/weechat-2.6 b/metadata/md5-cache/net-irc/weechat-2.6
new file mode 100644
index 000000000000..267925200124
--- /dev/null
+++ b/metadata/md5-cache/net-irc/weechat-2.6
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
+DESCRIPTION=Portable and multi-interface IRC client
+EAPI=7
+HOMEPAGE=https://weechat.org/
+IUSE=doc man nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://weechat.org/files/src/weechat-2.6.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8787fdd76b7f653240ef436e36995d4a
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 4b119a0b4c2c..f81cb77b5343 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80f2619ffe728dd781c8741ebb038c7f
+_md5_=8787fdd76b7f653240ef436e36995d4a
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 5fa9be0e87dc..ef4bf14c804d 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/ccnet-6.1.7 b/metadata/md5-cache/net-libs/ccnet-6.1.7
deleted file mode 100644
index 3a5d6c3366a3..000000000000
--- a/metadata/md5-cache/net-libs/ccnet-6.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/openssl:0 dev-db/sqlite:3 || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Ccnet is a framework for writing networked applications in C
-EAPI=6
-HOMEPAGE=https://github.com/haiwen/ccnet http://seafile.com/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/openssl:0 dev-db/sqlite:3
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/haiwen/ccnet/archive/v6.1.7.tar.gz -> ccnet-6.1.7.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=16cfb52c9a25799cc78bde697de88b25
diff --git a/metadata/md5-cache/net-libs/davix-0.7.5 b/metadata/md5-cache/net-libs/davix-0.7.5
new file mode 100644
index 000000000000..dcf87ea8eb23
--- /dev/null
+++ b/metadata/md5-cache/net-libs/davix-0.7.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libxml2:2= dev-libs/openssl:0= kernel_linux? ( sys-apps/util-linux ) doc? ( app-doc/doxygen[dot] dev-python/sphinx ) virtual/pkgconfig
+DESCRIPTION=High-performance file management over WebDAV/HTTP
+EAPI=7
+HOMEPAGE=https://dmc.web.cern.ch/projects/davix
+IUSE=doc ipv6 kernel_linux test tools
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libxml2:2= dev-libs/openssl:0= kernel_linux? ( sys-apps/util-linux )
+REQUIRED_USE=test? ( tools )
+SLOT=0
+SRC_URI=http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/0.7.5/davix-0.7.5.tar.gz -> davix-0.7.5.tar
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=29b9ac6e4d84ec074e229d44e7cd0193
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.60.3 b/metadata/md5-cache/net-libs/glib-networking-2.60.3
index ffdb5efdbabf..d27279505cbb 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.60.3
+++ b/metadata/md5-cache/net-libs/glib-networking-2.60.3
@@ -5,10 +5,10 @@ DESCRIPTION=Network-related giomodules for glib
 EAPI=7
 HOMEPAGE=https://git.gnome.org/browse/glib-networking/
 IUSE=+gnome +libproxy +ssl test 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 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.55.1: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(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-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(-)?] ) >=net-libs/gnutls-3.4.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(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.60/glib-networking-2.60.3.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4ad2272d04e7b20d29b837f393c7d48a
+_md5_=924d8f71147edd18061edfaa3950d136
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.21 b/metadata/md5-cache/net-libs/gloox-1.0.21
deleted file mode 100644
index a1b3aea55a36..000000000000
--- a/metadata/md5-cache/net-libs/gloox-1.0.21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
-DESCRIPTION=A portable high-level Jabber/XMPP library for C++
-EAPI=7
-HOMEPAGE=https://camaya.net/gloox/
-IUSE=debug gnutls idn libressl ssl static-libs test zlib
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
-RESTRICT=test
-SLOT=0/17
-SRC_URI=https://camaya.net/download/gloox-1.0.21.tar.bz2
-_md5_=9318f1fc4d5b2a77fb89c47808fda653
diff --git a/metadata/md5-cache/net-libs/libhackrf-2017.02.1 b/metadata/md5-cache/net-libs/libhackrf-2017.02.1
index 2a1733ebe8f5..d2f4d2bbefba 100644
--- a/metadata/md5-cache/net-libs/libhackrf-2017.02.1
+++ b/metadata/md5-cache/net-libs/libhackrf-2017.02.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:1
 SLOT=0/2017.02.1
 SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2017.02.1/hackrf-2017.02.1.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2cbe8a981009a8aab72a90ecde4ff531
diff --git a/metadata/md5-cache/net-libs/libhackrf-2018.01.1 b/metadata/md5-cache/net-libs/libhackrf-2018.01.1
index e9dcf558961d..4bbbc71d8f6c 100644
--- a/metadata/md5-cache/net-libs/libhackrf-2018.01.1
+++ b/metadata/md5-cache/net-libs/libhackrf-2018.01.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=virtual/libusb:1
 SLOT=0/2018.01.1
 SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2018.01.1/hackrf-2018.01.1.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d064fc08311dab033e7bcea2445bef9
diff --git a/metadata/md5-cache/net-libs/libhackrf-9999 b/metadata/md5-cache/net-libs/libhackrf-9999
index 389429ef1c04..cbc029c2e317 100644
--- a/metadata/md5-cache/net-libs/libhackrf-9999
+++ b/metadata/md5-cache/net-libs/libhackrf-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=virtual/libusb:1
 SLOT=0/9999
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2cbe8a981009a8aab72a90ecde4ff531
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.14-r1 b/metadata/md5-cache/net-libs/liblockfile-1.14-r1
deleted file mode 100644
index 84b44ef145f4..000000000000
--- a/metadata/md5-cache/net-libs/liblockfile-1.14-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=acct-group/mail >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Implements functions designed to lock the standard mailboxes
-EAPI=6
-HOMEPAGE=http://www.debian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2
-RDEPEND=acct-group/mail
-SLOT=0
-SRC_URI=mirror://debian/pool/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=e03803b77eb3a43337521dc993ad3d7a
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.15 b/metadata/md5-cache/net-libs/liblockfile-1.15
deleted file mode 100644
index 7a2ef21a6271..000000000000
--- a/metadata/md5-cache/net-libs/liblockfile-1.15
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure prepare
-DEPEND=acct-group/mail
-DESCRIPTION=Implements functions designed to lock the standard mailboxes
-EAPI=7
-HOMEPAGE=https://www.debian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2
-RDEPEND=acct-group/mail
-SLOT=0
-SRC_URI=mirror://debian/pool/main/libl/liblockfile/liblockfile_1.15.orig.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6fb90e37e816a638437e3b9fb519b9e8
diff --git a/metadata/md5-cache/net-libs/libntlm-1.3 b/metadata/md5-cache/net-libs/libntlm-1.3
deleted file mode 100644
index 2900bdcfcf89..000000000000
--- a/metadata/md5-cache/net-libs/libntlm-1.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Microsoft's NTLM authentication (libntlm) library
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/libntlm/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=http://www.nongnu.org/libntlm/releases/libntlm-1.3.tar.gz
-_md5_=59a19484b0264fa216a3b2830d2321c3
diff --git a/metadata/md5-cache/net-libs/libtirpc-1.1.4 b/metadata/md5-cache/net-libs/libtirpc-1.1.4
index e6e988535308..b01f015f01ae 100644
--- a/metadata/md5-cache/net-libs/libtirpc-1.1.4
+++ b/metadata/md5-cache/net-libs/libtirpc-1.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=Transport Independent RPC library (SunRPC replacement)
 EAPI=6
 HOMEPAGE=http://libtirpc.sourceforge.net/
 IUSE=ipv6 kerberos static-libs 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 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=kerberos? ( >=virtual/krb5-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(-)?] )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/libtirpc/libtirpc-1.1.4.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=7b3718a0f737bd475116e26626cdb4c3
+_md5_=de6d1a65fc68945a814d7c6e520486ad
diff --git a/metadata/md5-cache/net-libs/phodav-2.2 b/metadata/md5-cache/net-libs/phodav-2.2
index 104b9ddfaf13..c6deb429f253 100644
--- a/metadata/md5-cache/net-libs/phodav-2.2
+++ b/metadata/md5-cache/net-libs/phodav-2.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.51:2 >=net-libs/libsoup-2.48:2.4 dev-libs/libxml2 zeroconf? ( net-dns/avahi )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/phodav/2.2/phodav-2.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5da536d5b58a90fb5d0e87f4d49722d
diff --git a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.10 b/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.10
deleted file mode 100644
index ebe6b71b97c6..000000000000
--- a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] test? ( dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A parsing library for RIPE Atlas result strings
-EAPI=6
-HOMEPAGE=https://atlas.ripe.net/
-IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/r/ripe.atlas.sagan/ripe.atlas.sagan-1.1.10.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=656d6ccd615cb6b378befdda5cd44e7c
diff --git a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.8 b/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.8
deleted file mode 100644
index fb6e2a8f51a3..000000000000
--- a/metadata/md5-cache/net-libs/ripe-atlas-sagan-1.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] test? ( dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A parsing library for RIPE Atlas result strings
-EAPI=6
-HOMEPAGE=https://atlas.ripe.net/
-IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/r/ripe.atlas.sagan/ripe.atlas.sagan-1.1.8.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=759f09fa5eba5f3f54b61f2f84fbe8e8
diff --git a/metadata/md5-cache/net-libs/rpcsvc-proto-1.4 b/metadata/md5-cache/net-libs/rpcsvc-proto-1.4
index 70157bc8bce9..90f32ef145bd 100644
--- a/metadata/md5-cache/net-libs/rpcsvc-proto-1.4
+++ b/metadata/md5-cache/net-libs/rpcsvc-proto-1.4
@@ -3,10 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=rpcsvc protocol definitions from glibc
 EAPI=6
 HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
-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=LGPL-2.1+ BSD
 RDEPEND=!<sys-libs/glibc-2.26
 SLOT=0
 SRC_URI=https://github.com/thkukuk/rpcsvc-proto/archive/v1.4.tar.gz -> rpcsvc-proto-1.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=764c977690b4c36e83f4618bcdd2debb
+_md5_=091a9b06c3b476b303c8d9cd642e9796
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index d1f545b197c5..aaa480048133 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.36.4 b/metadata/md5-cache/net-mail/dovecot-2.2.36.4
index 32927cebe934..d0caced10a37 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.36.4
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.36.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=https://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1 MIT
-RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
+RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.36.4.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.24.2.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.24.2.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=01733b47f72aa3e64663736d9d1878cf
+_md5_=e6c72688b89c4a0bb7b2634c0443cf4f
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.6 b/metadata/md5-cache/net-mail/dovecot-2.3.6
index 565d3363cb6a..62eeceb3793e 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.6
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
+DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=https://www.dovecot.org/
 IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sparc x86
 LICENSE=LGPL-2.1 MIT
-RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
+RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.6.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.6.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.6.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=56c3b1385117d34708aaad34c6137929
+_md5_=906a5fff15e5d895c35106c09a562c0a
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.7.1 b/metadata/md5-cache/net-mail/dovecot-2.3.7.1
index 1b91f81d6e48..824ad1eca388 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.7.1
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.7.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
+DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=https://www.dovecot.org/
 IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1 MIT
-RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
+RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.7.1.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.1.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.1.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=a1a8b9ddab59317115bbf344ecc5bc73
+_md5_=0a846efd62a20c83251696e975cd166d
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.7.2 b/metadata/md5-cache/net-mail/dovecot-2.3.7.2
index d6ffad562d63..4a6316468558 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.7.2
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.7.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
+DEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=6
 HOMEPAGE=https://www.dovecot.org/
 IUSE=kerberos ldap lua mysql pam postgres sqlite vpopmail bzip2 lzma lz4 zlib argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sparc x86
 LICENSE=LGPL-2.1 MIT
-RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
+RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) suid? ( acct-group/mail ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.7.2.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.2.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.2.tar.gz )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fbfdbaef3e1b70739ff5e4188929720b
+_md5_=45f2290c8d805a6b9bb75873b2447d54
diff --git a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r2 b/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r2
deleted file mode 100644
index 67c758729f0d..000000000000
--- a/metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) >=sys-apps/sed-4
-DESCRIPTION=Simple yet powerful mailing list manager for qmail
-EAPI=0
-HOMEPAGE=http://www.ezmlm.org
-IUSE=mysql postgres
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) virtual/qmail
-SLOT=0
-SRC_URI=http://www.ezmlm.org/archive/7.0.0/ezmlm-idx-7.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	99ced791fe1852c85e790a2a78f6d251	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dddc93d386f15eaadede583a184dd10a
diff --git a/metadata/md5-cache/net-mail/getmail-5.8 b/metadata/md5-cache/net-mail/getmail-5.8
deleted file mode 100644
index 7cfdf1e87759..000000000000
--- a/metadata/md5-cache/net-mail/getmail-5.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A mail retriever with reliable Maildir and mbox delivery
-EAPI=7
-HOMEPAGE=http://pyropus.ca/software/getmail/
-IUSE=ssl python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://pyropus.ca/software/getmail/old-versions/getmail-5.8.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a872cf07882f4cea0d2451abaa119f21
diff --git a/metadata/md5-cache/net-mail/gnubiff-2.2.15-r3 b/metadata/md5-cache/net-mail/gnubiff-2.2.15-r3
deleted file mode 100644
index fa328a9d798e..000000000000
--- a/metadata/md5-cache/net-mail/gnubiff-2.2.15-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:0= ) fam? ( virtual/fam ) x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=A mail notification program
-EAPI=5
-HOMEPAGE=http://gnubiff.sourceforge.net/
-IUSE=debug fam nls password
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:0= ) fam? ( virtual/fam ) x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf
-SLOT=0
-SRC_URI=mirror://sourceforge/gnubiff/gnubiff-2.2.15.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5930c80d156c0906a4798719bfe34e37
diff --git a/metadata/md5-cache/net-mail/imapsync-1.607-r1 b/metadata/md5-cache/net-mail/imapsync-1.607-r1
deleted file mode 100644
index b7abc9b7279b..000000000000
--- a/metadata/md5-cache/net-mail/imapsync-1.607-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=A tool allowing incremental and recursive imap transfer from one mailbox to another
-EAPI=5
-HOMEPAGE=http://ks.lamiral.info/imapsync/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=WTFPL-2
-RDEPEND=dev-lang/perl dev-perl/Digest-HMAC dev-perl/File-Copy-Recursive dev-perl/IO-Socket-SSL dev-perl/IO-Tee dev-perl/Mail-IMAPClient dev-perl/TermReadKey dev-perl/Unicode-String virtual/perl-Digest-MD5 virtual/perl-MIME-Base64
-RESTRICT=test
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/imapsync/imapsync-1.607.tgz
-_md5_=ef19d16598c80e767e9e9af3d955baed
diff --git a/metadata/md5-cache/net-mail/imapsync-1.644 b/metadata/md5-cache/net-mail/imapsync-1.644
deleted file mode 100644
index bc02d0987ab5..000000000000
--- a/metadata/md5-cache/net-mail/imapsync-1.644
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=A tool allowing incremental and recursive imap transfer from one mailbox to another
-EAPI=5
-HOMEPAGE=http://ks.lamiral.info/imapsync/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=WTFPL-2
-RDEPEND=dev-lang/perl dev-perl/Digest-HMAC dev-perl/File-Copy-Recursive dev-perl/IO-Socket-SSL dev-perl/IO-Tee dev-perl/Mail-IMAPClient dev-perl/TermReadKey dev-perl/Unicode-String virtual/perl-Digest-MD5 virtual/perl-MIME-Base64
-RESTRICT=test
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/imapsync/imapsync-1.644.tgz
-_md5_=f57b7128a575a6045a2920cde641fd8d
diff --git a/metadata/md5-cache/net-mail/imapsync-1.684 b/metadata/md5-cache/net-mail/imapsync-1.684
deleted file mode 100644
index 03272b601750..000000000000
--- a/metadata/md5-cache/net-mail/imapsync-1.684
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=A tool allowing incremental and recursive IMAP transfers between mailboxes
-EAPI=6
-HOMEPAGE=http://ks.lamiral.info/imapsync/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=WTFPL-2
-RDEPEND=dev-lang/perl dev-perl/Digest-HMAC dev-perl/File-Copy-Recursive dev-perl/IO-Socket-SSL dev-perl/IO-Tee dev-perl/Mail-IMAPClient dev-perl/TermReadKey dev-perl/Unicode-String virtual/perl-Digest-MD5 virtual/perl-MIME-Base64
-RESTRICT=test
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/imapsync/imapsync-1.684.tgz
-_md5_=114e599c990b91658b3f80c2c21387d3
diff --git a/metadata/md5-cache/net-mail/lbdb-0.42 b/metadata/md5-cache/net-mail/lbdb-0.42
deleted file mode 100644
index 2ddc2e5b1bca..000000000000
--- a/metadata/md5-cache/net-mail/lbdb-0.42
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/libvformat evo? ( mail-client/evolution ) finger? ( net-misc/netkit-fingerd ) abook? ( app-misc/abook ) crypt? ( app-crypt/gnupg )
-DESCRIPTION=Little Brother database
-EAPI=6
-HOMEPAGE=http://www.spinnaker.de/lbdb/
-IUSE=pda ldap finger abook crypt evo
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libvformat evo? ( mail-client/evolution ) finger? ( net-misc/netkit-fingerd ) abook? ( app-misc/abook ) crypt? ( app-crypt/gnupg ) pda? ( dev-perl/Palm ) ldap? ( dev-perl/perl-ldap )
-SLOT=0
-SRC_URI=http://www.spinnaker.de/debian/lbdb_0.42.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=09925c61b77ec95e2a5fd1e6e0eff97c
diff --git a/metadata/md5-cache/net-mail/lbdb-0.42.1 b/metadata/md5-cache/net-mail/lbdb-0.42.1
deleted file mode 100644
index 0de180b3e968..000000000000
--- a/metadata/md5-cache/net-mail/lbdb-0.42.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/libvformat evo? ( mail-client/evolution ) finger? ( net-misc/netkit-fingerd ) abook? ( app-misc/abook ) crypt? ( app-crypt/gnupg )
-DESCRIPTION=Little Brother database
-EAPI=6
-HOMEPAGE=http://www.spinnaker.de/lbdb/
-IUSE=pda ldap finger abook crypt evo
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libvformat evo? ( mail-client/evolution ) finger? ( net-misc/netkit-fingerd ) abook? ( app-misc/abook ) crypt? ( app-crypt/gnupg ) pda? ( dev-perl/Palm ) ldap? ( dev-perl/perl-ldap )
-SLOT=0
-SRC_URI=http://www.spinnaker.de/debian/lbdb_0.42.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f2676ba59fdfc1d13d3ac932d96a2806
diff --git a/metadata/md5-cache/net-mail/offlineimap-6.7.0.3 b/metadata/md5-cache/net-mail/offlineimap-6.7.0.3
deleted file mode 100644
index deae80ad8df1..000000000000
--- a/metadata/md5-cache/net-mail/offlineimap-6.7.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=doc? ( app-text/asciidoc ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite?,ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Powerful IMAP/Maildir synchronization and reader support
-EAPI=6
-HOMEPAGE=https://www.offlineimap.org/
-IUSE=doc ssl sqlite python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite?,ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/OfflineIMAP/offlineimap/archive/v6.7.0.3.tar.gz -> offlineimap-6.7.0.3.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=785011596edf85bb0093efd8a48f6e38
diff --git a/metadata/md5-cache/net-mail/offlineimap-7.2.2 b/metadata/md5-cache/net-mail/offlineimap-7.2.2
deleted file mode 100644
index f5c703d4bcc5..000000000000
--- a/metadata/md5-cache/net-mail/offlineimap-7.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite,ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=doc? ( app-text/asciidoc )
-DESCRIPTION=Powerful IMAP/Maildir synchronization and reader support
-EAPI=7
-HOMEPAGE=https://www.offlineimap.org/
-IUSE=doc ssl python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite,ssl?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/OfflineIMAP/offlineimap/archive/v7.2.2.tar.gz -> offlineimap-7.2.2.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1661caa4475a52617866be82d80445c0
diff --git a/metadata/md5-cache/net-mail/ripole-0.2.1 b/metadata/md5-cache/net-mail/ripole-0.2.1
deleted file mode 100644
index 247a42f1a577..000000000000
--- a/metadata/md5-cache/net-mail/ripole-0.2.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Program/library to pull out attachment from OLE2 data files
-EAPI=4
-HOMEPAGE=http://www.pldaniels.com/ripole/
-KEYWORDS=~amd64 hppa ~sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.pldaniels.com/ripole/ripole-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a9a2db76c08a5f0a43ccfe2739b58806
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1 b/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1
deleted file mode 100644
index e008b35a91e2..000000000000
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 >=sys-apps/sed-4 >=sys-apps/sed-4
-DESCRIPTION=Collection of programs to manage virtual email on Qmail servers
-EAPI=5
-HOMEPAGE=http://www.inter7.com/index.php?page=vpopmail
-IUSE=clearpasswd ipalias maildrop mysql postgres spamassassin
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin )
-REQUIRED_USE=mysql? ( !postgres )
-SLOT=0
-SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	99ced791fe1852c85e790a2a78f6d251	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2a1b6e5ee036004f9366761a20a219e1
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 67741e5648dc..01354d3555dc 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/anydesk-5.1.2 b/metadata/md5-cache/net-misc/anydesk-5.1.2
new file mode 100644
index 000000000000..235733b4f164
--- /dev/null
+++ b/metadata/md5-cache/net-misc/anydesk-5.1.2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Feature rich multi-platform remote desktop application
+EAPI=7
+HOMEPAGE=https://anydesk.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=AnyDesk-TOS BSD BSD-2 openssl ZLIB
+RDEPEND=dev-libs/atk dev-libs/glib:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/glu media-libs/mesa[X(+)] sys-auth/polkit x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-libs/pangox-compat
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://download.anydesk.com/linux/anydesk-5.1.2-amd64.tar.gz ) x86? ( https://download.anydesk.com/linux/anydesk-5.1.2-i386.tar.gz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c096bdc58e47cbe6ebe82d0c9985a6b5
diff --git a/metadata/md5-cache/net-misc/aria2-1.34.0-r1 b/metadata/md5-cache/net-misc/aria2-1.34.0-r1
deleted file mode 100644
index 1b91dc1947be..000000000000
--- a/metadata/md5-cache/net-misc/aria2-1.34.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/zlib:0= ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= ) !gnutls? ( dev-libs/openssl:0= ) ) adns? ( >=net-dns/c-ares-1.5.0:0= ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) jemalloc? ( dev-libs/jemalloc ) libuv? ( >=dev-libs/libuv-1.13:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.12.0:0 )
-DESCRIPTION=A download utility with segmented downloading with BitTorrent support
-EAPI=6
-HOMEPAGE=https://aria2.github.io/
-IUSE=adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=sys-libs/zlib:0= ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= ) !gnutls? ( dev-libs/openssl:0= ) ) adns? ( >=net-dns/c-ares-1.5.0:0= ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) jemalloc? ( dev-libs/jemalloc ) libuv? ( >=dev-libs/libuv-1.13:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) nls? ( virtual/libiconv virtual/libintl ) scripts? ( dev-lang/ruby )
-REQUIRED_USE=?? ( jemalloc tcmalloc ) metalink? ( xmlrpc )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.34.0/aria2-1.34.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1360e17803af50de1cbd59402f05c502
diff --git a/metadata/md5-cache/net-misc/asterisk-11.25.3 b/metadata/md5-cache/net-misc/asterisk-11.25.3
index f48f3bafd81d..ebcd7e457b68 100644
--- a/metadata/md5-cache/net-misc/asterisk-11.25.3
+++ b/metadata/md5-cache/net-misc/asterisk-11.25.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
+DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
 DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=6
 HOMEPAGE=http://www.asterisk.org/
@@ -7,9 +7,9 @@ IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
-RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
+RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
 REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.25.3.tar.gz mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9d8307181b53187af45c3e0579a96a3a
+_md5_=2d2ccc6f74ebd6c4e8fead8c785cbe4b
diff --git a/metadata/md5-cache/net-misc/asterisk-13.23.1 b/metadata/md5-cache/net-misc/asterisk-13.23.1
index f4f810f9e475..463e887f6e20 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.23.1
+++ b/metadata/md5-cache/net-misc/asterisk-13.23.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig pjproject? ( >=net-libs/pjproject-2.6 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
+DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig pjproject? ( >=net-libs/pjproject-2.6 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
 DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=6
 HOMEPAGE=http://www.asterisk.org/
@@ -7,9 +7,9 @@ IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
-RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
+RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp:0 ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
 REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.23.1.tar.gz mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=baff20ca3c121164c19cca0e237b84da
+_md5_=50f6177b55f5d7cf3cd76f4588e1af34
diff --git a/metadata/md5-cache/net-misc/bfgminer-5.4.2 b/metadata/md5-cache/net-misc/bfgminer-5.4.2
index f54018aaf59b..146012e9379f 100644
--- a/metadata/md5-cache/net-misc/bfgminer-5.4.2
+++ b/metadata/md5-cache/net-misc/bfgminer-5.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install
-DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm_sensors? ( sys-apps/lm_sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) ) virtual/pkgconfig >=dev-libs/uthash-1.9.7 sys-apps/sed cpumining? ( amd64? ( >=dev-lang/yasm-1.0.1 ) x86? ( >=dev-lang/yasm-1.0.1 ) )
+DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm-sensors? ( sys-apps/lm-sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) ) virtual/pkgconfig >=dev-libs/uthash-1.9.7 sys-apps/sed cpumining? ( amd64? ( >=dev-lang/yasm-1.0.1 ) x86? ( >=dev-lang/yasm-1.0.1 ) )
 DESCRIPTION=Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C
 EAPI=6
 HOMEPAGE=https://bitcointalk.org/?topic=168174
-IUSE=adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex
+IUSE=adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-3
-RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm_sensors? ( sys-apps/lm_sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) ) opencl? ( || ( virtual/opencl dev-util/nvidia-cuda-sdk[opencl] ) )
-REQUIRED_USE=|| ( keccak scrypt sha256d ) || ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex ) adl? ( opencl ) antminer? ( sha256d ) avalon? ( sha256d ) avalonmm? ( sha256d ) bfsb? ( sha256d bitfury ) bfx? ( sha256d bitfury libusb ) bifury? ( sha256d ) bigpic? ( sha256d bitfury ) bitforce? ( sha256d ) bitfury? ( sha256d ) cointerra? ( sha256d ) drillbit? ( sha256d bitfury ) dualminer? ( || ( sha256d scrypt ) icarus ) gridseed? ( scrypt ) hashbuster? ( sha256d bitfury ) hashbuster2? ( sha256d bitfury libusb ) hashfast? ( sha256d ) icarus? ( || ( scrypt sha256d ) ) jingtian? ( sha256d ) keccak? ( || ( cpumining opencl proxy ) ) klondike? ( sha256d libusb ) littlefury? ( sha256d bitfury ) lm_sensors? ( opencl ) metabank? ( sha256d bitfury ) minion? ( sha256d ) modminer? ( sha256d ) nanofury? ( sha256d bitfury ) scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) ) sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) ) twinfury? ( bitfury ) unicode? ( ncurses ) proxy? ( || ( proxy_getwork proxy_stratum ) ) proxy_getwork? ( proxy ) proxy_stratum? ( proxy ) rockminer? ( sha256d ) twinfury? ( sha256d ) x6500? ( sha256d libusb ) zeusminer? ( scrypt icarus ) ztex? ( sha256d libusb )
+RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm-sensors? ( sys-apps/lm-sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) ) opencl? ( || ( virtual/opencl dev-util/nvidia-cuda-sdk[opencl] ) )
+REQUIRED_USE=|| ( keccak scrypt sha256d ) || ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex ) adl? ( opencl ) antminer? ( sha256d ) avalon? ( sha256d ) avalonmm? ( sha256d ) bfsb? ( sha256d bitfury ) bfx? ( sha256d bitfury libusb ) bifury? ( sha256d ) bigpic? ( sha256d bitfury ) bitforce? ( sha256d ) bitfury? ( sha256d ) cointerra? ( sha256d ) drillbit? ( sha256d bitfury ) dualminer? ( || ( sha256d scrypt ) icarus ) gridseed? ( scrypt ) hashbuster? ( sha256d bitfury ) hashbuster2? ( sha256d bitfury libusb ) hashfast? ( sha256d ) icarus? ( || ( scrypt sha256d ) ) jingtian? ( sha256d ) keccak? ( || ( cpumining opencl proxy ) ) klondike? ( sha256d libusb ) littlefury? ( sha256d bitfury ) lm-sensors? ( opencl ) metabank? ( sha256d bitfury ) minion? ( sha256d ) modminer? ( sha256d ) nanofury? ( sha256d bitfury ) scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) ) sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) ) twinfury? ( bitfury ) unicode? ( ncurses ) proxy? ( || ( proxy_getwork proxy_stratum ) ) proxy_getwork? ( proxy ) proxy_stratum? ( proxy ) rockminer? ( sha256d ) twinfury? ( sha256d ) x6500? ( sha256d libusb ) zeusminer? ( scrypt icarus ) ztex? ( sha256d libusb )
 SLOT=0
 SRC_URI=http://luke.dashjr.org/programs/bitcoin/files/bfgminer/5.4.2/bfgminer-5.4.2.txz -> bfgminer-5.4.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ab471315effb06d88a770238e6e09262
+_md5_=b9bca3fe1c489334d32e6163ed668297
diff --git a/metadata/md5-cache/net-misc/bfgminer-5.5.0 b/metadata/md5-cache/net-misc/bfgminer-5.5.0
index dad03f5dddac..475caec6ba3a 100644
--- a/metadata/md5-cache/net-misc/bfgminer-5.5.0
+++ b/metadata/md5-cache/net-misc/bfgminer-5.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install
-DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm_sensors? ( sys-apps/lm_sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) ) virtual/pkgconfig >=dev-libs/uthash-1.9.7 sys-apps/sed cpumining? ( amd64? ( >=dev-lang/yasm-1.0.1 ) x86? ( >=dev-lang/yasm-1.0.1 ) )
+DEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm-sensors? ( sys-apps/lm-sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) ) virtual/pkgconfig >=dev-libs/uthash-1.9.7 sys-apps/sed cpumining? ( amd64? ( >=dev-lang/yasm-1.0.1 ) x86? ( >=dev-lang/yasm-1.0.1 ) )
 DESCRIPTION=Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C
 EAPI=6
 HOMEPAGE=https://bitcointalk.org/?topic=168174
-IUSE=adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex
+IUSE=adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
-RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm_sensors? ( sys-apps/lm_sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) ) opencl? ( || ( virtual/opencl dev-util/nvidia-cuda-sdk[opencl] ) )
-REQUIRED_USE=|| ( keccak scrypt sha256d ) || ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex ) adl? ( opencl ) alchemist? ( scrypt ) avalon? ( sha256d ) avalonmm? ( sha256d ) bitmain? ( sha256d ) bfsb? ( sha256d bitfury ) bfx? ( sha256d bitfury libusb ) bifury? ( sha256d ) bigpic? ( sha256d bitfury ) bitforce? ( sha256d ) bitfury? ( sha256d ) cointerra? ( sha256d ) drillbit? ( sha256d bitfury ) dualminer? ( || ( sha256d scrypt ) icarus ) gridseed? ( scrypt ) hashbuster? ( sha256d bitfury ) hashbuster2? ( sha256d bitfury libusb ) hashfast? ( sha256d ) icarus? ( || ( scrypt sha256d ) ) jingtian? ( sha256d ) keccak? ( || ( cpumining opencl proxy ) ) klondike? ( sha256d libusb ) littlefury? ( sha256d bitfury ) lm_sensors? ( opencl ) metabank? ( sha256d bitfury ) minion? ( sha256d ) modminer? ( sha256d ) nanofury? ( sha256d bitfury ) scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) ) sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) ) unicode? ( ncurses ) proxy? ( || ( proxy_getwork proxy_stratum ) ) proxy_getwork? ( proxy ) proxy_stratum? ( proxy ) rockminer? ( sha256d ) twinfury? ( bitfury sha256d ) x6500? ( sha256d libusb ) zeusminer? ( scrypt icarus ) ztex? ( sha256d libusb )
+RDEPEND=net-misc/curl ncurses? ( sys-libs/ncurses:=[unicode?] ) >=dev-libs/jansson-2 dev-libs/libbase58 net-libs/libblkmaker udev? ( virtual/udev ) hashbuster? ( dev-libs/hidapi ) libusb? ( virtual/libusb:1 ) lm-sensors? ( sys-apps/lm-sensors ) nanofury? ( dev-libs/hidapi ) proxy_getwork? ( net-libs/libmicrohttpd ) proxy_stratum? ( dev-libs/libevent ) screen? ( app-misc/screen || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) ) opencl? ( || ( virtual/opencl dev-util/nvidia-cuda-sdk[opencl] ) )
+REQUIRED_USE=|| ( keccak scrypt sha256d ) || ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex ) adl? ( opencl ) alchemist? ( scrypt ) avalon? ( sha256d ) avalonmm? ( sha256d ) bitmain? ( sha256d ) bfsb? ( sha256d bitfury ) bfx? ( sha256d bitfury libusb ) bifury? ( sha256d ) bigpic? ( sha256d bitfury ) bitforce? ( sha256d ) bitfury? ( sha256d ) cointerra? ( sha256d ) drillbit? ( sha256d bitfury ) dualminer? ( || ( sha256d scrypt ) icarus ) gridseed? ( scrypt ) hashbuster? ( sha256d bitfury ) hashbuster2? ( sha256d bitfury libusb ) hashfast? ( sha256d ) icarus? ( || ( scrypt sha256d ) ) jingtian? ( sha256d ) keccak? ( || ( cpumining opencl proxy ) ) klondike? ( sha256d libusb ) littlefury? ( sha256d bitfury ) lm-sensors? ( opencl ) metabank? ( sha256d bitfury ) minion? ( sha256d ) modminer? ( sha256d ) nanofury? ( sha256d bitfury ) scrypt? ( || ( alchemist cpumining dualminer gridseed opencl proxy zeusminer ) ) sha256d? ( || ( avalon avalonmm bitmain bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) ) unicode? ( ncurses ) proxy? ( || ( proxy_getwork proxy_stratum ) ) proxy_getwork? ( proxy ) proxy_stratum? ( proxy ) rockminer? ( sha256d ) twinfury? ( bitfury sha256d ) x6500? ( sha256d libusb ) zeusminer? ( scrypt icarus ) ztex? ( sha256d libusb )
 SLOT=0
 SRC_URI=http://luke.dashjr.org/programs/bitcoin/files/bfgminer/5.5.0/bfgminer-5.5.0.txz -> bfgminer-5.5.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce54559eb0a615a058f73e029ec06f22
+_md5_=7777946cbb3a5a9a2fec12ec8548c271
diff --git a/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2 b/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
index 9ab96d7f2d26..7d812a4aa589 100644
--- a/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
+++ b/metadata/md5-cache/net-misc/bwwhois-5.5.2-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://whois.bw.org/dist/whois-5.5.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e094b570dc2e8c54f16aba9aa7be1724
diff --git a/metadata/md5-cache/net-misc/calico-cni-plugin-2.0.1 b/metadata/md5-cache/net-misc/calico-cni-plugin-2.0.1
deleted file mode 100644
index f9f1eba4516e..000000000000
--- a/metadata/md5-cache/net-misc/calico-cni-plugin-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Calico Networking for CNI
-EAPI=6
-HOMEPAGE=https://github.com/projectcalico/cni-plugin
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-misc/cni-plugins
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/projectcalico/cni-plugin/archive/v2.0.1.tar.gz -> calico-cni-plugin-2.0.1.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/containernetworking/cni/archive/a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz -> github.com-containernetworking-cni-a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz https://github.com/containernetworking/plugins/archive/7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz -> github.com-containernetworking-plugins-7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/coreos/go-iptables/archive/259c8e6a4275d497442c721fa52204d7a58bde8b.tar.gz -> github.com-coreos-go-iptables-259c8e6a4275d497442c721fa52204d7a58bde8b.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/onsi/ginkgo/archive/9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz -> github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz https://github.com/onsi/gomega/archive/003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz -> github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/felix/archive/fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz -> github.com-projectcalico-felix-fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz -> github.com-projectcalico-libcalico-go-a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz -> github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz -> github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz https://github.com/golang/crypto/archive/1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz -> github.com-golang-crypto-1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/076b546753157f758b316e59bcb51e6807c04057.tar.gz -> github.com-golang-sys-076b546753157f758b316e59bcb51e6807c04057.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz -> github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/389dfa299845bcf399c16af89987e8775718ea48.tar.gz -> github.com-kubernetes-api-389dfa299845bcf399c16af89987e8775718ea48.tar.gz https://github.com/kubernetes/apimachinery/archive/4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz -> github.com-kubernetes-apimachinery-4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=35499cccb402ad913d803c02c156336d
diff --git a/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.0 b/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.0
deleted file mode 100644
index 7be1fd7d9e4e..000000000000
--- a/metadata/md5-cache/net-misc/calico-cni-plugin-3.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Calico Networking for CNI
-EAPI=6
-HOMEPAGE=https://github.com/projectcalico/cni-plugin
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-misc/cni-plugins
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/projectcalico/cni-plugin/archive/v3.1.0.tar.gz -> calico-cni-plugin-3.1.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/containernetworking/cni/archive/a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz -> github.com-containernetworking-cni-a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz https://github.com/containernetworking/plugins/archive/7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz -> github.com-containernetworking-plugins-7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/coreos/go-iptables/archive/b5b1876b170881a8259f036445ee89c8669db386.tar.gz -> github.com-coreos-go-iptables-b5b1876b170881a8259f036445ee89c8669db386.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/onsi/ginkgo/archive/9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz -> github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz https://github.com/onsi/gomega/archive/003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz -> github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/felix/archive/fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz -> github.com-projectcalico-felix-fa15f1776244d1db9e30fcd99f51b8b99be509c8.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz -> github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz -> github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz -> github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz https://github.com/golang/crypto/archive/1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz -> github.com-golang-crypto-1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/076b546753157f758b316e59bcb51e6807c04057.tar.gz -> github.com-golang-sys-076b546753157f758b316e59bcb51e6807c04057.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz -> github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz -> github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz https://github.com/kubernetes/apimachinery/archive/ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz -> github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=ea761a14a50b4f5450a1bbd393beaef2
diff --git a/metadata/md5-cache/net-misc/calicoctl-1.5.0 b/metadata/md5-cache/net-misc/calicoctl-1.5.0
deleted file mode 100644
index e3c3870cedaf..000000000000
--- a/metadata/md5-cache/net-misc/calicoctl-1.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=CLI to manage Calico network and security policy
-EAPI=6
-HOMEPAGE=https://github.com/projectcalico/calicoctl
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/projectcalico/calicoctl/archive/v1.5.0.tar.gz -> calicoctl-1.5.0.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/mcuadros/go-version/archive/257f7b9a7d87427c8d7f89469a5958d57f8abd7c.tar.gz -> github.com-mcuadros-go-version-257f7b9a7d87427c8d7f89469a5958d57f8abd7c.tar.gz https://github.com/mitchellh/go-ps/archive/4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz -> github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz https://github.com/olekukonko/tablewriter/archive/be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz -> github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz https://github.com/mattn/go-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz https://github.com/osrg/gobgp/archive/bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz -> github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz https://github.com/armon/go-radix/archive/1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz -> github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz https://github.com/eapache/channels/archive/47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz -> github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz https://github.com/eapache/queue/archive/44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz -> github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/influxdata/influxdb/archive/392fa03cf3cc98b78e606c34996976cea65b6814.tar.gz -> github.com-influxdata-influxdb-392fa03cf3cc98b78e606c34996976cea65b6814.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/25a8c377d7b3299a50197a92704d606f5f5ca691.tar.gz -> github.com-projectcalico-libcalico-go-25a8c377d7b3299a50197a92704d606f5f5ca691.tar.gz https://github.com/coreos/etcd/archive/17ae440991da3bdb2df4309936dd2074f66ec394.tar.gz -> github.com-coreos-etcd-17ae440991da3bdb2df4309936dd2074f66ec394.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/coreos/go-semver/archive/568e959cd89871e61434c1143528d9162da89ef2.tar.gz -> github.com-coreos-go-semver-568e959cd89871e61434c1143528d9162da89ef2.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/sirupsen/logrus/archive/ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz -> github.com-sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/hashicorp/hcl/archive/392dba7d905ed5d04a5794ba89f558b27e2ba1ca.tar.gz -> github.com-hashicorp-hcl-392dba7d905ed5d04a5794ba89f558b27e2ba1ca.tar.gz https://github.com/magiconair/properties/archive/be5ece7dd465ab0765a9682137865547526d1dfb.tar.gz -> github.com-magiconair-properties-be5ece7dd465ab0765a9682137865547526d1dfb.tar.gz https://github.com/mitchellh/mapstructure/archive/d0303fe809921458f417bcf828397a65db30a7e4.tar.gz -> github.com-mitchellh-mapstructure-d0303fe809921458f417bcf828397a65db30a7e4.tar.gz https://github.com/pelletier/go-toml/archive/69d355db5304c0f7f809a2edc054553e7142f016.tar.gz -> github.com-pelletier-go-toml-69d355db5304c0f7f809a2edc054553e7142f016.tar.gz https://github.com/spf13/afero/archive/9be650865eab0c12963d8753212f4f9c66cdcf12.tar.gz -> github.com-spf13-afero-9be650865eab0c12963d8753212f4f9c66cdcf12.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/jwalterweatherman/archive/0efa5202c04663c757d84f90f5219c1250baf94f.tar.gz -> github.com-spf13-jwalterweatherman-0efa5202c04663c757d84f90f5219c1250baf94f.tar.gz https://github.com/spf13/pflag/archive/08b1a584251b5b62f458943640fc8ebd4d50aaa5.tar.gz -> github.com-spf13-pflag-08b1a584251b5b62f458943640fc8ebd4d50aaa5.tar.gz https://github.com/termie/go-shutil/archive/bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz -> github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz https://github.com/ugorji/go/archive/ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz -> github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz https://github.com/vishvananda/netlink/archive/f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz -> github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/golang/net/archive/f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz -> github.com-golang-net-f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz https://github.com/golang/sys/archive/8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9.tar.gz -> github.com-golang-sys-8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9.tar.gz https://github.com/golang/text/archive/19e51611da83d6be54ddafce4a4af510cb3e9ea4.tar.gz -> github.com-golang-text-19e51611da83d6be54ddafce4a4af510cb3e9ea4.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/grpc/grpc-go/archive/777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz -> github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/tchap/go-patricia/archive/666120de432aea38ab06bd5c818f04f4129882c9.tar.gz -> github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/client-go/archive/4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz -> github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz https://github.com/kubernetes/apimachinery/archive/b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz -> github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=9740a245c1114b07163b75f94127c9fa
diff --git a/metadata/md5-cache/net-misc/calicoctl-2.0.0 b/metadata/md5-cache/net-misc/calicoctl-2.0.0
deleted file mode 100644
index f4f6cb16a0d5..000000000000
--- a/metadata/md5-cache/net-misc/calicoctl-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=CLI to manage Calico network and security policy
-EAPI=6
-HOMEPAGE=https://github.com/projectcalico/calicoctl
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/projectcalico/calicoctl/archive/v2.0.0.tar.gz -> calicoctl-2.0.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/armon/go-radix/archive/1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz -> github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/coreos/etcd/archive/bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz -> github.com-coreos-etcd-bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz -> github.com-dgrijalva-jwt-go-d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/eapache/channels/archive/47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz -> github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz https://github.com/eapache/queue/archive/44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz -> github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/925471ac9e2131377a91e1595defec898166fe49.tar.gz -> github.com-google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz -> github.com-googleapis-gnostic-68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/hashicorp/hcl/archive/23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz -> github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/influxdata/influxdb/archive/b287c191f362e7313aae0fa08c19b787076ad530.tar.gz -> github.com-influxdata-influxdb-b287c191f362e7313aae0fa08c19b787076ad530.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/magiconair/properties/archive/49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz -> github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/mitchellh/go-ps/archive/4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz -> github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz https://github.com/mitchellh/mapstructure/archive/06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz -> github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz https://github.com/olekukonko/tablewriter/archive/65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz -> github.com-olekukonko-tablewriter-65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz https://github.com/onsi/ginkgo/archive/9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz -> github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz https://github.com/onsi/gomega/archive/c893efa28eb45626cdaa76c9f653b62488858837.tar.gz -> github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.tar.gz https://github.com/osrg/gobgp/archive/bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz -> github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/pelletier/go-toml/archive/b8b5e7696574464b2f9bf303a7b37781bb52889f.tar.gz -> github.com-pelletier-go-toml-b8b5e7696574464b2f9bf303a7b37781bb52889f.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz -> github.com-projectcalico-libcalico-go-7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/49fee292b27bfff7f354ee0f64e1bc4850462edf.tar.gz -> github.com-prometheus-common-49fee292b27bfff7f354ee0f64e1bc4850462edf.tar.gz https://github.com/prometheus/procfs/archive/a1dba9ce8baed984a2495b658c82687f8157b98f.tar.gz -> github.com-prometheus-procfs-a1dba9ce8baed984a2495b658c82687f8157b98f.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/afero/archive/8d919cbe7e2627e417f3e45c3c0e489a5b7e2536.tar.gz -> github.com-spf13-afero-8d919cbe7e2627e417f3e45c3c0e489a5b7e2536.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/jwalterweatherman/archive/12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz -> github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/spf13/viper/archive/1a0c4a370c3e8286b835467d2dfcdaf636c3538b.tar.gz -> github.com-spf13-viper-1a0c4a370c3e8286b835467d2dfcdaf636c3538b.tar.gz https://github.com/termie/go-shutil/archive/bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz -> github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/golang/crypto/archive/9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz -> github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/314a259e304ff91bd6985da2a7149bbf91237993.tar.gz -> github.com-golang-sys-314a259e304ff91bd6985da2a7149bbf91237993.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz -> github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz https://github.com/grpc/grpc-go/archive/8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz -> github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz -> github.com-kubernetes-api-9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz https://github.com/kubernetes/apimachinery/archive/5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz -> github.com-kubernetes-apimachinery-5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=bb41e587792a69963b2b37e2a1bb3e10
diff --git a/metadata/md5-cache/net-misc/calicoctl-3.1.0 b/metadata/md5-cache/net-misc/calicoctl-3.1.0
deleted file mode 100644
index bfbfd77f000f..000000000000
--- a/metadata/md5-cache/net-misc/calicoctl-3.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=CLI to manage Calico network and security policy
-EAPI=6
-HOMEPAGE=https://github.com/projectcalico/calicoctl
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/projectcalico/calicoctl/archive/v3.1.0.tar.gz -> calicoctl-3.1.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/armon/go-radix/archive/1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz -> github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz -> github.com-dgrijalva-jwt-go-d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/eapache/channels/archive/47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz -> github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz https://github.com/eapache/queue/archive/093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz -> github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/925471ac9e2131377a91e1595defec898166fe49.tar.gz -> github.com-google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz -> github.com-googleapis-gnostic-68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/influxdata/influxdb/archive/38d2d29f79f249b4f7647b441355cbc03e9fec1a.tar.gz -> github.com-influxdata-influxdb-38d2d29f79f249b4f7647b441355cbc03e9fec1a.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/magiconair/properties/archive/2c9e9502788518c97fe44e8955cd069417ee89df.tar.gz -> github.com-magiconair-properties-2c9e9502788518c97fe44e8955cd069417ee89df.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-runewidth/archive/a9d6d1e4dc51df2130326793d49971f238839169.tar.gz -> github.com-mattn-go-runewidth-a9d6d1e4dc51df2130326793d49971f238839169.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mcuadros/go-version/archive/88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz -> github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz https://github.com/mitchellh/go-ps/archive/4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz -> github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz https://github.com/mitchellh/mapstructure/archive/00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz -> github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz https://github.com/olekukonko/tablewriter/archive/b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz -> github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz https://github.com/onsi/ginkgo/archive/9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz -> github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz https://github.com/onsi/gomega/archive/003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz -> github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz https://github.com/osrg/gobgp/archive/bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz -> github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/pelletier/go-toml/archive/66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz -> github.com-pelletier-go-toml-66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz -> github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz -> github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/afero/archive/63644898a8da0bc22138abf860edaf5277b6102e.tar.gz -> github.com-spf13-afero-63644898a8da0bc22138abf860edaf5277b6102e.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/spf13/viper/archive/8dc2790b029dc41e2b8ff772c63c26adbb1db70d.tar.gz -> github.com-spf13-viper-8dc2790b029dc41e2b8ff772c63c26adbb1db70d.tar.gz https://github.com/termie/go-shutil/archive/bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz -> github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz https://github.com/vishvananda/netlink/archive/fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz -> github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/golang/crypto/archive/9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz -> github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz -> github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz -> github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz https://github.com/kubernetes/apimachinery/archive/ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz -> github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=2187060610a140676ad5693ce0b9ea5c
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-57.0.2987.37 b/metadata/md5-cache/net-misc/chrome-remote-desktop-57.0.2987.37
deleted file mode 100644
index 049be25667db..000000000000
--- a/metadata/md5-cache/net-misc/chrome-remote-desktop-57.0.2987.37
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup unpack
-DESCRIPTION=access remote computers via Chrome!
-EAPI=5
-HOMEPAGE=https://support.google.com/chrome/answer/1649523 https://chrome.google.com/remotedesktop
-IUSE=l10n_am l10n_ar l10n_bg l10n_bn l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_en-GB l10n_en l10n_es-419 l10n_es l10n_et l10n_fa l10n_fil l10n_fi l10n_fr l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_it l10n_ja l10n_kn l10n_ko l10n_lt l10n_lv l10n_ml l10n_mr l10n_ms l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_sw l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python2_7
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/expat-2 dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-python/psutil gnome-base/gconf:2 media-libs/fontconfig media-libs/freetype:2 sys-devel/gcc sys-libs/glibc sys-libs/pam x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXtst x11-libs/pango x11-base/xorg-server[xvfb]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_57.0.2987.37_amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7638babe1f7c06156b498423f976ad12
diff --git a/metadata/md5-cache/net-misc/connman-1.37 b/metadata/md5-cache/net-misc/connman-1.37
index e6d72d5e255b..0391bd2bc4f0 100644
--- a/metadata/md5-cache/net-misc/connman-1.37
+++ b/metadata/md5-cache/net-misc/connman-1.37
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.16 >=sys-apps/dbus-1.2.24 sys-libs/readline:0= iptable
 REQUIRED_USE=|| ( iptables nftables )
 SLOT=0
 SRC_URI=mirror://kernel/linux/network/connman/connman-1.37.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=29f1ad91b78b241f315fd01ca47c6e60
diff --git a/metadata/md5-cache/net-misc/curl-7.64.0 b/metadata/md5-cache/net-misc/curl-7.64.0
deleted file mode 100644
index 15f06fe05817..000000000000
--- a/metadata/md5-cache/net-misc/curl-7.64.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[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? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,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/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,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(-)?] ) adns? ( net-dns/c-ares: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-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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-libs/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(-)?] >=virtual/pkgconfig-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(-)?] test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=A Client that groks URLs
-EAPI=6
-HOMEPAGE=https://curl.haxx.se/
-IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt 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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[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? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,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/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,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(-)?] ) adns? ( net-dns/c-ares: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-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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-libs/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(-)?]
-REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://curl.haxx.se/download/curl-7.64.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b375c12e82718826be2de272ec714a8d
diff --git a/metadata/md5-cache/net-misc/curl-7.64.1 b/metadata/md5-cache/net-misc/curl-7.64.1
deleted file mode 100644
index 21d0bfbf635e..000000000000
--- a/metadata/md5-cache/net-misc/curl-7.64.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install prepare test
-DEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[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? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,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/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,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(-)?] ) adns? ( net-dns/c-ares: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-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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-libs/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(-)?] >=virtual/pkgconfig-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(-)?] test? ( sys-apps/diffutils dev-lang/perl )
-DESCRIPTION=A Client that groks URLs
-EAPI=7
-HOMEPAGE=https://curl.haxx.se/
-IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt 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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[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? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,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/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,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(-)?] ) adns? ( net-dns/c-ares: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-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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-libs/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(-)?]
-REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://curl.haxx.se/download/curl-7.64.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a8a973fea0a2bca0a15be1202997ac73
diff --git a/metadata/md5-cache/net-misc/curl-7.65.0 b/metadata/md5-cache/net-misc/curl-7.65.0
index 568c34ab3714..bc461f88029c 100644
--- a/metadata/md5-cache/net-misc/curl-7.65.0
+++ b/metadata/md5-cache/net-misc/curl-7.65.0
@@ -12,5 +12,5 @@ REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( cur
 RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.65.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=e0afd98d385fa866116bf5a99f14658a
diff --git a/metadata/md5-cache/net-misc/curl-7.65.1 b/metadata/md5-cache/net-misc/curl-7.65.1
deleted file mode 100644
index 29c381d2479e..000000000000
--- a/metadata/md5-cache/net-misc/curl-7.65.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install prepare test
-DEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[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? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,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/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,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(-)?] ) adns? ( net-dns/c-ares: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-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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-libs/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(-)?] >=virtual/pkgconfig-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(-)?] test? ( sys-apps/diffutils dev-lang/perl )
-DESCRIPTION=A Client that groks URLs
-EAPI=7
-HOMEPAGE=https://curl.haxx.se/
-IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt 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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[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? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,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/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,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(-)?] ) adns? ( net-dns/c-ares: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-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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-libs/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(-)?]
-REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://curl.haxx.se/download/curl-7.65.1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=006c0bd78ee12aa1934c4d4d34db2634
diff --git a/metadata/md5-cache/net-misc/curl-7.65.3 b/metadata/md5-cache/net-misc/curl-7.65.3
index 0a22c8a87013..6b110a6f87cc 100644
--- a/metadata/md5-cache/net-misc/curl-7.65.3
+++ b/metadata/md5-cache/net-misc/curl-7.65.3
@@ -12,5 +12,5 @@ REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( cur
 RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.65.3.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=5b35ae995b2dafa68ed76e26d7ef8ca1
diff --git a/metadata/md5-cache/net-misc/curl-7.66.0 b/metadata/md5-cache/net-misc/curl-7.66.0
new file mode 100644
index 000000000000..90d09460fdd5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.66.0
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install prepare test
+DEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[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? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,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/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,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(-)?] ) adns? ( net-dns/c-ares: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-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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-libs/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(-)?] >=virtual/pkgconfig-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(-)?] test? ( sys-apps/diffutils dev-lang/perl )
+DESCRIPTION=A Client that groks URLs
+EAPI=7
+HOMEPAGE=https://curl.haxx.se/
+IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt 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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=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(-)?] ) brotli? ( app-arch/brotli:=[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? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,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/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,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(-)?] ) adns? ( net-dns/c-ares: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-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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-libs/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(-)?]
+REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://curl.haxx.se/download/curl-7.66.0.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=5b35ae995b2dafa68ed76e26d7ef8ca1
diff --git a/metadata/md5-cache/net-misc/electrum-3.3.4 b/metadata/md5-cache/net-misc/electrum-3.3.4
deleted file mode 100644
index df5503b4fcf8..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=User friendly Bitcoin client
-EAPI=6
-HOMEPAGE=https://electrum.org/
-IUSE=audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb l10n_ar l10n_be l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_sv l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/aiohttp-socks[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/aiorpcX[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jsonrpclib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PySocks[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/qrcode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/tlslite[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://download.electrum.org/3.3.4/Electrum-3.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6604d61d3b59973ecd73899c44c4d8e0
diff --git a/metadata/md5-cache/net-misc/electrum-3.3.6-r2 b/metadata/md5-cache/net-misc/electrum-3.3.6-r2
deleted file mode 100644
index 540d4820e299..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.3.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=7
-HOMEPAGE=https://electrum.org/
-IUSE=audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb l10n_ar l10n_be l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_sv l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/aiohttp-socks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/aiorpcX-0.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/dnspython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ecdsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jsonrpclib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyaes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PySocks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/qrcode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://download.electrum.org/3.3.6/Electrum-3.3.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9dd51f5d20029b4932d96277f172d54f
diff --git a/metadata/md5-cache/net-misc/electrum-3.3.6-r3 b/metadata/md5-cache/net-misc/electrum-3.3.6-r3
deleted file mode 100644
index e77b75b84c2f..000000000000
--- a/metadata/md5-cache/net-misc/electrum-3.3.6-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=7
-HOMEPAGE=https://electrum.org/
-IUSE=cli ncurses qrcode +qt5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/aiohttp-socks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/aiorpcX-0.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/dnspython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ecdsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jsonrpclib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyaes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PySocks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/qrcode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ncurses? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://download.electrum.org/3.3.6/Electrum-3.3.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69d14223d47f36eb8e83d81023fc500c
diff --git a/metadata/md5-cache/net-misc/electrum-3.3.8 b/metadata/md5-cache/net-misc/electrum-3.3.8
index 5682947e7ca2..3b81274f1d1c 100644
--- a/metadata/md5-cache/net-misc/electrum-3.3.8
+++ b/metadata/md5-cache/net-misc/electrum-3.3.8
@@ -4,11 +4,11 @@ DESCRIPTION=User friendly Bitcoin client
 EAPI=7
 HOMEPAGE=https://electrum.org/
 IUSE=cli ncurses qrcode +qt5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/aiohttp-socks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-python/aiorpcX-0.18*[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/dnspython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ecdsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jsonrpclib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyaes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PySocks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/qrcode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ncurses? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://download.electrum.org/3.3.8/Electrum-3.3.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f4229d9d4c1ccb65dd1ef3534186dff
+_md5_=80fa733ca9772cf027c9789699c580fd
diff --git a/metadata/md5-cache/net-misc/felix-2.5.1 b/metadata/md5-cache/net-misc/felix-2.5.1
deleted file mode 100644
index 42ae7206aa5b..000000000000
--- a/metadata/md5-cache/net-misc/felix-2.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Calico's per-host agent, responsible for programming routes and security policy
-EAPI=6
-HOMEPAGE=https://github.com/projectcalico/felix
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/projectcalico/felix/archive/2.5.1.tar.gz -> felix-2.5.1.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/gavv/monotime/archive/47d58efa69556a936a3c15eb2ed42706d968ab01.tar.gz -> github.com-gavv-monotime-47d58efa69556a936a3c15eb2ed42706d968ab01.tar.gz https://github.com/go-ini/ini/archive/20b96f641a5ea98f2f8619ff4f3e061cff4833bd.tar.gz -> github.com-go-ini-ini-20b96f641a5ea98f2f8619ff4f3e061cff4833bd.tar.gz https://github.com/gogo/protobuf/archive/100ba4e885062801d56799d78530b73b178a78f3.tar.gz -> github.com-gogo-protobuf-100ba4e885062801d56799d78530b73b178a78f3.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/mipearson/rfw/archive/6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz -> github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz https://github.com/projectcalico/libcalico-go/archive/fc4a3648215b9beda5d08e26d76e91f12fb45079.tar.gz -> github.com-projectcalico-libcalico-go-fc4a3648215b9beda5d08e26d76e91f12fb45079.tar.gz https://github.com/coreos/etcd/archive/d267ca9c184e953554257d0acdd1dc9c47d38229.tar.gz -> github.com-coreos-etcd-d267ca9c184e953554257d0acdd1dc9c47d38229.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/typha/archive/71413e6c4e8f903f899429329cf3e38e17633ba5.tar.gz -> github.com-projectcalico-typha-71413e6c4e8f903f899429329cf3e38e17633ba5.tar.gz https://github.com/coreos/pkg/archive/fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8.tar.gz -> github.com-coreos-pkg-fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/coreos/go-systemd/archive/2688e91251d9d8e404e86dd8f096e23b2f086958.tar.gz -> github.com-coreos-go-systemd-2688e91251d9d8e404e86dd8f096e23b2f086958.tar.gz https://github.com/golang/protobuf/archive/8616e8ee5e20a1704615e6c8d7afcdac06087a67.tar.gz -> github.com-golang-protobuf-8616e8ee5e20a1704615e6c8d7afcdac06087a67.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/61f87aac8082fa8c3c5655c7608d7478d46ac2ad.tar.gz -> github.com-prometheus-common-61f87aac8082fa8c3c5655c7608d7478d46ac2ad.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/prometheus/procfs/archive/e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2.tar.gz -> github.com-prometheus-procfs-e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/sirupsen/logrus/archive/ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz -> github.com-sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz https://github.com/ugorji/go/archive/ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz -> github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz https://github.com/vishvananda/netlink/archive/f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz -> github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz https://github.com/vishvananda/netns/archive/86bef332bfc3b59b7624a600bd53009ce91a9829.tar.gz -> github.com-vishvananda-netns-86bef332bfc3b59b7624a600bd53009ce91a9829.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/net/archive/3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz -> github.com-golang-net-3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz https://github.com/golang/sys/archive/43e60d72a8e2bd92ee98319ba9a384a0e9837c08.tar.gz -> github.com-golang-sys-43e60d72a8e2bd92ee98319ba9a384a0e9837c08.tar.gz https://github.com/go-playground/validator/archive/5f1438d3fca68893a817e4a66806cea46a9e4ebf.tar.gz -> github.com-go-playground-validator-5f1438d3fca68893a817e4a66806cea46a9e4ebf.tar.gz https://github.com/tchap/go-patricia/archive/666120de432aea38ab06bd5c818f04f4129882c9.tar.gz -> github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz https://github.com/kubernetes/apimachinery/archive/b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz -> github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz https://github.com/kubernetes/client-go/archive/4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz -> github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=2ac9d64ecc45c4262985027f9635e3ed
diff --git a/metadata/md5-cache/net-misc/felix-3.1.0 b/metadata/md5-cache/net-misc/felix-3.1.0
deleted file mode 100644
index f83e09a9acd7..000000000000
--- a/metadata/md5-cache/net-misc/felix-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-libs/protobuf-3 dev-go/gogo-protobuf >=dev-lang/go-1.10 virtual/pkgconfig
-DESCRIPTION=Calico's per-host agent, responsible for programming routes and security policy
-EAPI=6
-HOMEPAGE=https://github.com/projectcalico/felix
-IUSE=+bird
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-firewall/ipset bird? ( net-misc/bird )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/projectcalico/felix/archive/3.1.0.tar.gz -> felix-3.1.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/containernetworking/cni/archive/137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz -> github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/emicklei/go-restful/archive/777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz -> github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/go-ini/ini/archive/5e9692864e22d02ac79e2fa499cffb00520b4fea.tar.gz -> github.com-go-ini-ini-5e9692864e22d02ac79e2fa499cffb00520b4fea.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz -> github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/gxed/eventfd/archive/80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz -> github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz https://github.com/gxed/GoEndian/archive/0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz -> github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/ipfs/go-log/archive/4b54e7d2460df21c1c2d345af2337f91bfc938ca.tar.gz -> github.com-ipfs-go-log-4b54e7d2460df21c1c2d345af2337f91bfc938ca.tar.gz https://github.com/jbenet/go-reuseport/archive/7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz -> github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz https://github.com/jbenet/go-sockaddr/archive/2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz -> github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-colorable/archive/efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz -> github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/Microsoft/go-winio/archive/78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz -> github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz https://github.com/Microsoft/hcsshim/archive/34a629f78a5d50f7de07727e41a948685c45e026.tar.gz -> github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz https://github.com/mipearson/rfw/archive/6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz -> github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz https://github.com/onsi/ginkgo/archive/9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz -> github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz https://github.com/onsi/gomega/archive/003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz -> github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz https://github.com/opentracing/opentracing-go/archive/328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz -> github.com-opentracing-opentracing-go-328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz -> github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz https://github.com/projectcalico/typha/archive/6913426bf2b4ce2a6d24c9fed5e97539b9f7dacf.tar.gz -> github.com-projectcalico-typha-6913426bf2b4ce2a6d24c9fed5e97539b9f7dacf.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz -> github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/85aa3b74a43a9fa174a588ce9a042c9b71b0842c.tar.gz -> github.com-vishvananda-netlink-85aa3b74a43a9fa174a588ce9a042c9b71b0842c.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/whyrusleeping/go-logging/archive/0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz -> github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz https://github.com/golang/crypto/archive/b2aa35443fbc700ab74c586ae79b81c171851023.tar.gz -> github.com-golang-crypto-b2aa35443fbc700ab74c586ae79b81c171851023.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a.tar.gz -> github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz https://github.com/golang/appengine/archive/ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz -> github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz -> github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz https://github.com/kubernetes/apimachinery/archive/ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz -> github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=06c29a6e2b9bb2836867615fe4849d7c
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1
index d5bec6c9657f..6dd956179283 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc2-r1
@@ -3,11 +3,11 @@ DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys
 DESCRIPTION=Free implementation of the Remote Desktop Protocol
 EAPI=6
 HOMEPAGE=http://www.freerdp.com/
-IUSE=alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
+IUSE=alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
 KEYWORDS=alpha amd64 arm ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0/2
 SRC_URI=https://pub.freerdp.com/releases/freerdp-2.0.0-rc2.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1422ae41d09d880ab6f18e77f6e3b9d3
+_md5_=32059bc9a6ff2bbc182c7e9ba4c2c6fe
diff --git a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc4 b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc4
index ec8d146f29b4..e22464ff8726 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.0.0_rc4
+++ b/metadata/md5-cache/net-misc/freerdp-2.0.0_rc4
@@ -3,11 +3,11 @@ DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys
 DESCRIPTION=Free implementation of the Remote Desktop Protocol
 EAPI=6
 HOMEPAGE=http://www.freerdp.com/
-IUSE=alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
+IUSE=alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
 KEYWORDS=alpha amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0/2
 SRC_URI=https://pub.freerdp.com/releases/freerdp-2.0.0-rc4.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca13ff3527a5009ec5419510d3ce96bc
+_md5_=85448d1013c2025bcc4b96b9c316e379
diff --git a/metadata/md5-cache/net-misc/freerdp-9999 b/metadata/md5-cache/net-misc/freerdp-9999
index 6083a8e89e50..f27f219c6fc9 100644
--- a/metadata/md5-cache/net-misc/freerdp-9999
+++ b/metadata/md5-cache/net-misc/freerdp-9999
@@ -3,10 +3,10 @@ DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys
 DESCRIPTION=Free implementation of the Remote Desktop Protocol
 EAPI=6
 HOMEPAGE=http://www.freerdp.com/
-IUSE=alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
+IUSE=alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) client? ( usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) openh264? ( media-libs/openh264 ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
 SLOT=0/2
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9aeb6e46cba528e63343309ab4066a98
+_md5_=8b3a24c7fa00cecca65bef90e95ae1aa
diff --git a/metadata/md5-cache/net-misc/gerbera-1.2.0-r1 b/metadata/md5-cache/net-misc/gerbera-1.2.0-r1
index b3813760d29c..15ed65979569 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.2.0-r1
+++ b/metadata/md5-cache/net-misc/gerbera-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!!net-misc/mediatomb >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.2.0.tar.gz -> gerbera-1.2.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3033eaa22ef8cb50546f5287fa14782c
diff --git a/metadata/md5-cache/net-misc/gerbera-1.3.1 b/metadata/md5-cache/net-misc/gerbera-1.3.1
index e5db73ff5005..a81cdac20bc2 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.3.1
+++ b/metadata/md5-cache/net-misc/gerbera-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!!net-misc/mediatomb >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.3.1.tar.gz -> gerbera-1.3.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a25c2220407f7c595d2b49a159e739ee
diff --git a/metadata/md5-cache/net-misc/gerbera-1.3.2 b/metadata/md5-cache/net-misc/gerbera-1.3.2
index 914170b58cd6..de8c8690c3ac 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.3.2
+++ b/metadata/md5-cache/net-misc/gerbera-1.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!!net-misc/mediatomb >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.3.2.tar.gz -> gerbera-1.3.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a25c2220407f7c595d2b49a159e739ee
diff --git a/metadata/md5-cache/net-misc/gerbera-9999 b/metadata/md5-cache/net-misc/gerbera-9999
index e227ec9a4f9a..b08e30b863e2 100644
--- a/metadata/md5-cache/net-misc/gerbera-9999
+++ b/metadata/md5-cache/net-misc/gerbera-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=!!net-misc/mediatomb >=net-libs/libupnp-1.8.3[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a25c2220407f7c595d2b49a159e739ee
diff --git a/metadata/md5-cache/net-misc/gsutil-4.27 b/metadata/md5-cache/net-misc/gsutil-4.27
deleted file mode 100644
index dff68dc0d6d7..000000000000
--- a/metadata/md5-cache/net-misc/gsutil-4.27
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/argcomplete-1.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.47.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/crcmod-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gcs-oauth2-boto-plugin-1.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apitools-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/oauth2client-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=command line tool for interacting with cloud storage services
-EAPI=5
-HOMEPAGE=https://github.com/GoogleCloudPlatform/gsutil
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/argcomplete-1.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.47.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/crcmod-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gcs-oauth2-boto-plugin-1.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apitools-0.5.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/oauth2client-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.27.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e06842aaa627e8501863fe796878b921
diff --git a/metadata/md5-cache/net-misc/gsutil-4.28 b/metadata/md5-cache/net-misc/gsutil-4.28
deleted file mode 100644
index 6a7f6144993f..000000000000
--- a/metadata/md5-cache/net-misc/gsutil-4.28
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/argcomplete-1.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.48.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/crcmod-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.10.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gcs-oauth2-boto-plugin-1.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apitools-0.5.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/oauth2client-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=command line tool for interacting with cloud storage services
-EAPI=5
-HOMEPAGE=https://github.com/GoogleCloudPlatform/gsutil
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/argcomplete-1.8.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.48.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/crcmod-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.10.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gcs-oauth2-boto-plugin-1.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apitools-0.5.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-python/oauth2client-2.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.28.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=45d9d621eb3d8d51f2f0c674494f180d
diff --git a/metadata/md5-cache/net-misc/gsutil-4.30 b/metadata/md5-cache/net-misc/gsutil-4.30
deleted file mode 100644
index b11f995d120f..000000000000
--- a/metadata/md5-cache/net-misc/gsutil-4.30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/argcomplete-1.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.48.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/crcmod-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fasteners-0.14.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gcs-oauth2-boto-plugin-1.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apitools-0.5.22[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.10.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/monotonic-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oauth2client-4.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=command line tool for interacting with cloud storage services
-EAPI=5
-HOMEPAGE=https://github.com/GoogleCloudPlatform/gsutil
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/argcomplete-1.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.48.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/crcmod-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fasteners-0.14.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gcs-oauth2-boto-plugin-1.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apitools-0.5.22[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.10.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/monotonic-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oauth2client-4.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61e730c69fb2fce4b3dbc1cbd29ad5b0
diff --git a/metadata/md5-cache/net-misc/gsutil-4.32 b/metadata/md5-cache/net-misc/gsutil-4.32
deleted file mode 100644
index 17e04c76addd..000000000000
--- a/metadata/md5-cache/net-misc/gsutil-4.32
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/argcomplete-1.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.48.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/crcmod-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fasteners-0.14.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gcs-oauth2-boto-plugin-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apitools-0.5.22[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/google-reauth-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/monotonic-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oauth2client-4.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=command line tool for interacting with cloud storage services
-EAPI=6
-HOMEPAGE=https://github.com/GoogleCloudPlatform/gsutil
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/argcomplete-1.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/boto-2.48.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/crcmod-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/fasteners-0.14.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gcs-oauth2-boto-plugin-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apitools-0.5.22[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/google-reauth-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.11.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/monotonic-1.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oauth2client-4.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/PySocks-1.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.32.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7f0a2f5671f923691bc48e680f5b2a08
diff --git a/metadata/md5-cache/net-misc/hylafaxplus-5.5.9 b/metadata/md5-cache/net-misc/hylafaxplus-5.5.9
deleted file mode 100644
index df3b76b92e55..000000000000
--- a/metadata/md5-cache/net-misc/hylafaxplus-5.5.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-libs/zlib-1.1.4 app-text/ghostscript-gpl virtual/mta media-libs/tiff:0[jbig?] virtual/jpeg:0 jbig? ( media-libs/jbigkit ) virtual/awk lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) mgetty? ( net-dialup/mgetty[-fax] ) !net-dialup/mgetty[fax]
-DESCRIPTION=Enterprise client-server fax package for class 1 and 2 fax modems
-EAPI=6
-HOMEPAGE=http://hylafax.sourceforge.net
-IUSE=jbig html lcms ldap mgetty pam
-KEYWORDS=~amd64 ~x86
-LICENSE=hylafaxplus
-RDEPEND=>=sys-libs/zlib-1.1.4 app-text/ghostscript-gpl virtual/mta media-libs/tiff:0[jbig?] virtual/jpeg:0 jbig? ( media-libs/jbigkit ) virtual/awk lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) mgetty? ( net-dialup/mgetty[-fax] ) !net-dialup/mgetty[fax] net-mail/metamail !net-dialup/sendpage
-SLOT=0
-SRC_URI=mirror://sourceforge/hylafax/hylafax-5.5.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=487e0a386c8404b7ebc77f18e6a4530f
diff --git a/metadata/md5-cache/net-misc/ipmiview-2.15.0.190109 b/metadata/md5-cache/net-misc/ipmiview-2.15.0.190109
index f5c0c2250503..1f4e94028823 100644
--- a/metadata/md5-cache/net-misc/ipmiview-2.15.0.190109
+++ b/metadata/md5-cache/net-misc/ipmiview-2.15.0.190109
@@ -10,5 +10,5 @@ RDEPEND=net-misc/stunnel virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
 RESTRICT=bindist fetch mirror strip
 SLOT=0
 SRC_URI=amd64? ( ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.15.0_build.190109_bundleJRE_Linux_x64.tar.gz ) x86? ( ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.15.0_build.190109_bundleJRE_Linux.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=60836d7c75a4833214f1c33582754ce2
diff --git a/metadata/md5-cache/net-misc/kea-9999 b/metadata/md5-cache/net-misc/kea-9999
index a368b62cf025..0cafcc10446e 100644
--- a/metadata/md5-cache/net-misc/kea-9999
+++ b/metadata/md5-cache/net-misc/kea-9999
@@ -4,10 +4,10 @@ DEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-c
 DESCRIPTION=High-performance production grade DHCPv4 & DHCPv6 server
 EAPI=7
 HOMEPAGE=http://www.isc.org/kea/
-IUSE=mysql openssl postgres samples
+IUSE=mysql +openssl postgres samples
 LICENSE=ISC BSD SSLeay GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:0= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=82680dede7072f3c3ef34d00eee8adbf
+_md5_=23518c09fff42135597ab73416b555c9
diff --git a/metadata/md5-cache/net-misc/minidlna-1.2.1-r1 b/metadata/md5-cache/net-misc/minidlna-1.2.1-r1
index 6942ba773116..ffb63b5749a7 100644
--- a/metadata/md5-cache/net-misc/minidlna-1.2.1-r1
+++ b/metadata/md5-cache/net-misc/minidlna-1.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=dev-db/sqlite:3 media-libs/flac:= media-libs/libexif:= media-libs/libid3tag:= media-libs/libogg:= media-libs/libvorbis:= virtual/jpeg:0= libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) zeroconf? ( net-dns/avahi:= ) virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://sourceforge/minidlna/1.2.1/minidlna-1.2.1.tar.gz https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0aa2739f816564ae8457ad04bcdb67a7
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.5.20190210 b/metadata/md5-cache/net-misc/minissdpd-1.5.20190210
deleted file mode 100644
index d1adc0c343d4..000000000000
--- a/metadata/md5-cache/net-misc/minissdpd-1.5.20190210
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=net-libs/libnfnetlink
-DESCRIPTION=MiniSSDP Daemon
-EAPI=7
-HOMEPAGE=http://miniupnp.free.fr/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=net-libs/libnfnetlink || ( net-misc/miniupnpd net-libs/miniupnpc )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.5.20190210.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1ed989e654e8a26fbf0c11e09b82e316
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190630 b/metadata/md5-cache/net-misc/miniupnpd-2.1.20190630
deleted file mode 100644
index 3bb1c8405105..000000000000
--- a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190630
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= ) sys-apps/lsb-release
-DESCRIPTION=MiniUPnP IGD Daemon
-EAPI=7
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.1.20190630.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f214412f9a908c745f8d17d1d871a98a
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190824 b/metadata/md5-cache/net-misc/miniupnpd-2.1.20190824
deleted file mode 100644
index 790a3596ae04..000000000000
--- a/metadata/md5-cache/net-misc/miniupnpd-2.1.20190824
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= ) sys-apps/lsb-release
-DESCRIPTION=MiniUPnP IGD Daemon
-EAPI=7
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=+leasefile igd2 ipv6 nftables pcp-peer portinuse strict
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.1.20190824.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f214412f9a908c745f8d17d1d871a98a
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.10.0 b/metadata/md5-cache/net-misc/modemmanager-1.10.0
index a22663014e6b..3ccd037e782e 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.10.0
+++ b/metadata/md5-cache/net-misc/modemmanager-1.10.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
 IUSE=elogind +introspection mbim policykit +qmi systemd +udev vala
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.36.0:2 udev? ( >=virtual/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.18.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.22.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 )
+RDEPEND=>=dev-libs/glib-2.36.0:2 udev? ( >=virtual/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.18.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.22.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) policykit? ( acct-group/plugdev )
 REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.10.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68a27f0b26287e0945ae6ca4b73becea
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=20a88f0d7ecb80caf4067febc54cb7b9
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1 b/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1
index 7240ea569111..466110713ec0 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1
+++ b/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
 IUSE=elogind +introspection mbim policykit +qmi systemd +udev vala
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.36.0:2 udev? ( >=virtual/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.16.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.20.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 )
+RDEPEND=>=dev-libs/glib-2.36.0:2 udev? ( >=virtual/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.16.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.20.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) policykit? ( acct-group/plugdev )
 REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.8.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57bbf005a0c06ecad2075881239ce123
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9091b04917e14b74067fce40501e8cd9
diff --git a/metadata/md5-cache/net-misc/mulk-0.6.0 b/metadata/md5-cache/net-misc/mulk-0.6.0
deleted file mode 100644
index 64d68f649780..000000000000
--- a/metadata/md5-cache/net-misc/mulk-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=net-misc/curl app-text/htmltidy dev-libs/uriparser metalink? ( media-libs/libmetalink checksum? ( dev-libs/openssl ) )
-DESCRIPTION=Download agent similar to wget/curl
-EAPI=4
-HOMEPAGE=http://mulk.sourceforge.net/
-IUSE=checksum debug metalink
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-misc/curl app-text/htmltidy dev-libs/uriparser metalink? ( media-libs/libmetalink checksum? ( dev-libs/openssl ) )
-REQUIRED_USE=checksum? ( metalink )
-SLOT=0
-SRC_URI=mirror://sourceforge/mulk/mulk-0.6.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=33dcfba50d682c5c95c0e8f01958903b
diff --git a/metadata/md5-cache/net-misc/netifrc-0.2.2 b/metadata/md5-cache/net-misc/netifrc-0.2.2
index 16ed35132bac..74c79e2984bb 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.2.2
+++ b/metadata/md5-cache/net-misc/netifrc-0.2.2
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=!<sys-fs/udev-init-scripts-26-r1 !<sys-fs/udev-172 >=sys-apps/openrc-0.12 !<sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.2.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=07734400697d21ef27d7c77350da3920
diff --git a/metadata/md5-cache/net-misc/netifrc-0.2.3 b/metadata/md5-cache/net-misc/netifrc-0.2.3
index 4344d8462ce7..983e89a95cf3 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.2.3
+++ b/metadata/md5-cache/net-misc/netifrc-0.2.3
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=!<sys-fs/udev-init-scripts-26-r1 !<sys-fs/udev-172 >=sys-apps/openrc-0.12 !<sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.2.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1b3a8c0d2c3edb0bdb8e36db3bbc90ea
diff --git a/metadata/md5-cache/net-misc/netifrc-0.2.4 b/metadata/md5-cache/net-misc/netifrc-0.2.4
index 1469d312c75e..40ff0cf37a37 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.2.4
+++ b/metadata/md5-cache/net-misc/netifrc-0.2.4
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=!<sys-fs/udev-init-scripts-26-r1 !<sys-fs/udev-172 >=sys-apps/openrc-0.12 !<sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.2.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c62b7f82898dab85975c2f397181584e
diff --git a/metadata/md5-cache/net-misc/netifrc-0.3.1 b/metadata/md5-cache/net-misc/netifrc-0.3.1
index 0833d06e3371..481b4d50dfd4 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.3.1
+++ b/metadata/md5-cache/net-misc/netifrc-0.3.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.3.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=74743dff7008a0780ff7aadd64e972a3
diff --git a/metadata/md5-cache/net-misc/netifrc-0.4.0 b/metadata/md5-cache/net-misc/netifrc-0.4.0
index bf7a313f4411..c35a81e25000 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.4.0
+++ b/metadata/md5-cache/net-misc/netifrc-0.4.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.12
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.4.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=74743dff7008a0780ff7aadd64e972a3
diff --git a/metadata/md5-cache/net-misc/netifrc-0.4.0-r1 b/metadata/md5-cache/net-misc/netifrc-0.4.0-r1
index 43efd2b5068f..91dd8a6f34e8 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.4.0-r1
+++ b/metadata/md5-cache/net-misc/netifrc-0.4.0-r1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.4.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=940c1f9a274b7d88359305ce3356d827
diff --git a/metadata/md5-cache/net-misc/netifrc-0.5.0 b/metadata/md5-cache/net-misc/netifrc-0.5.0
index f4b533b5a20b..f1759695b439 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.5.0
+++ b/metadata/md5-cache/net-misc/netifrc-0.5.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.5.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fef931e52c425da83d6d790e336f9821
diff --git a/metadata/md5-cache/net-misc/netifrc-0.5.1 b/metadata/md5-cache/net-misc/netifrc-0.5.1
index db3544319fe6..93067a96dc9f 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.5.1
+++ b/metadata/md5-cache/net-misc/netifrc-0.5.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.5.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=65111dab2adb1fee7bcb89a63f820155
diff --git a/metadata/md5-cache/net-misc/netifrc-0.6.0 b/metadata/md5-cache/net-misc/netifrc-0.6.0
index 66620a4972bd..61d23cb42ad3 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.6.0
+++ b/metadata/md5-cache/net-misc/netifrc-0.6.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.6.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=65db856860eccb4bb1c632c3acde2b60
diff --git a/metadata/md5-cache/net-misc/netifrc-0.6.1 b/metadata/md5-cache/net-misc/netifrc-0.6.1
index ba2ea1067d92..1bd10dce963d 100644
--- a/metadata/md5-cache/net-misc/netifrc-0.6.1
+++ b/metadata/md5-cache/net-misc/netifrc-0.6.1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/netifrc.git/snapshot/netifrc-0.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c3b3ca4ad2cd40373caffdfab41fbd7d
diff --git a/metadata/md5-cache/net-misc/netifrc-9999 b/metadata/md5-cache/net-misc/netifrc-9999
index 6a75fa767631..e2b1cae55f0d 100644
--- a/metadata/md5-cache/net-misc/netifrc-9999
+++ b/metadata/md5-cache/net-misc/netifrc-9999
@@ -7,5 +7,5 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=sys-apps/gentoo-functions >=sys-apps/openrc-0.15 !<sys-fs/udev-init-scripts-27
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fef931e52c425da83d6d790e336f9821
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.16.0 b/metadata/md5-cache/net-misc/networkmanager-1.16.0
deleted file mode 100644
index 25e365fc0479..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[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/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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[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(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[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-libs/readline:0= >=virtual/libudev-175:=[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(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[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(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.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(-)?] ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig[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(-)?] introspection? ( || ( ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/dbus-python[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test 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 ~ia64 ppc ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[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/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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[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(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[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-libs/readline:0= >=virtual/libudev-175:=[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(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[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(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.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(-)?] ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.16/NetworkManager-1.16.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0609dd4fa2ed76d3c496cc8d5396439a
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.16.2 b/metadata/md5-cache/net-misc/networkmanager-1.16.2
deleted file mode 100644
index cca4af9218c9..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.16.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[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/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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[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(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[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-libs/readline: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(-)?] >=virtual/libudev-175:=[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(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[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(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.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(-)?] ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig[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(-)?] introspection? ( || ( ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/dbus-python[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[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/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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[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(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[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-libs/readline: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(-)?] >=virtual/libudev-175:=[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(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[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(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.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(-)?] ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.16/NetworkManager-1.16.2.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f99376bee461885b572fd84e660cde74
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.18.2 b/metadata/md5-cache/net-misc/networkmanager-1.18.2
index f8eb838a4427..b83b953d305f 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.18.2
+++ b/metadata/md5-cache/net-misc/networkmanager-1.18.2
@@ -4,11 +4,11 @@ DESCRIPTION=A set of co-operative tools that make networking simple and straight
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test 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 ~ia64 ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
-RDEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[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/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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[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(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[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-libs/readline:0= >=virtual/libudev-175:=[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(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[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(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.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(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[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(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+RDEPEND=>=sys-apps/dbus-1.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(-)?] >=dev-libs/dbus-glib-0.100[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/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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[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(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[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-libs/readline:0= >=virtual/libudev-175:=[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(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[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(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.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(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[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(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
 REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( consolekit elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.18/NetworkManager-1.18.2.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f0b2dd6d74a06b634a2d1220e413a7d8
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c62296c972aab045d3ebbca3331d838c
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.4 b/metadata/md5-cache/net-misc/ntpsec-1.1.4
index 539e149951cc..5c666c5ab866 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.4
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libbsd? ( dev-libs/libbsd:0= ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) app-text/asciidoc dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libbsd? ( dev-libs/libbsd:0= ) dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) app-text/asciidoc dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig
 DESCRIPTION=The NTP reference implementation, refactored
 EAPI=6
 HOMEPAGE=https://www.ntpsec.org/
-IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libbsd? ( dev-libs/libbsd:0= ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libbsd? ( dev-libs/libbsd:0= ) dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) nist? ( rclock_local )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=e87259be48a3836eba795ebeb37b20fc
+_md5_=562cdad797959c9c8ecef377144b7701
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.6 b/metadata/md5-cache/net-misc/ntpsec-1.1.6
index d24324fca1c4..7a5f6377b35a 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.6
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libbsd? ( dev-libs/libbsd:0= ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) app-text/asciidoc dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libbsd? ( dev-libs/libbsd:0= ) dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) app-text/asciidoc dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig
 DESCRIPTION=The NTP reference implementation, refactored
 EAPI=6
 HOMEPAGE=https://www.ntpsec.org/
-IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libbsd? ( dev-libs/libbsd:0= ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libbsd? ( dev-libs/libbsd:0= ) dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) nist? ( rclock_local )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=ef2e74bff8e05dc66e2d4b9dbbf0df09
+_md5_=26a7e79aa426e03487f358ba4a01b754
diff --git a/metadata/md5-cache/net-misc/ntpsec-9999 b/metadata/md5-cache/net-misc/ntpsec-9999
index fb2c3cae0185..7582dd376b93 100644
--- a/metadata/md5-cache/net-misc/ntpsec-9999
+++ b/metadata/md5-cache/net-misc/ntpsec-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libbsd? ( dev-libs/libbsd:0= ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) app-text/asciidoc dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libbsd? ( dev-libs/libbsd:0= ) dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) app-text/asciidoc dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=The NTP reference implementation, refactored
 EAPI=6
 HOMEPAGE=https://www.ntpsec.org/
-IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
 PROPERTIES=live
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libbsd? ( dev-libs/libbsd:0= ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/libcap dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] libbsd? ( dev-libs/libbsd:0= ) dev-libs/openssl:0= seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) nist? ( rclock_local )
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=ef2e74bff8e05dc66e2d4b9dbbf0df09
+_md5_=26a7e79aa426e03487f358ba4a01b754
diff --git a/metadata/md5-cache/net-misc/nxplayer-5.0.63.3 b/metadata/md5-cache/net-misc/nxplayer-5.0.63.3
deleted file mode 100644
index 6c46e649e0fe..000000000000
--- a/metadata/md5-cache/net-misc/nxplayer-5.0.63.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Client for NoMachine remote servers
-EAPI=5
-HOMEPAGE=https://www.nomachine.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=nomachine
-RDEPEND=dev-libs/glib:2 dev-libs/openssl:0
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://download.nomachine.com/download/5.0/Linux/nomachine-enterprise-client_5.0.63_3_x86_64.tar.gz ) x86? ( http://download.nomachine.com/download/5.0/Linux/nomachine-enterprise-client_5.0.63_3_i686.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=82b80ab1a321247febd812acb7e9b5e4
diff --git a/metadata/md5-cache/net-misc/nxplayer-5.1.7.6 b/metadata/md5-cache/net-misc/nxplayer-5.1.7.6
deleted file mode 100644
index a25d0d8553bb..000000000000
--- a/metadata/md5-cache/net-misc/nxplayer-5.1.7.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Client for NoMachine remote servers
-EAPI=6
-HOMEPAGE=https://www.nomachine.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=nomachine
-RDEPEND=dev-libs/glib:2 dev-libs/openssl:0
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://download.nomachine.com/download/5.1/Linux/nomachine-enterprise-client_5.1.7_6_x86_64.tar.gz ) x86? ( http://download.nomachine.com/download/5.1/Linux/nomachine-enterprise-client_5.1.7_6_i686.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d58f3e5bb9abac5766610a8294929870
diff --git a/metadata/md5-cache/net-misc/omniORB-4.2.1_p2 b/metadata/md5-cache/net-misc/omniORB-4.2.1_p2
deleted file mode 100644
index 87ecc57fa451..000000000000
--- a/metadata/md5-cache/net-misc/omniORB-4.2.1_p2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=A robust, high-performance CORBA 2 ORB
-EAPI=6
-HOMEPAGE=http://omniorb.sourceforge.net/
-IUSE=doc ipv6 ssl python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2 GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/omniorb/omniORB-4.2.1-2.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=92ac3ceefbdce03fe3dbc26cbd293020
diff --git a/metadata/md5-cache/net-misc/pingu-1.5 b/metadata/md5-cache/net-misc/pingu-1.5
index 66cbafca7f77..b668bb88360f 100644
--- a/metadata/md5-cache/net-misc/pingu-1.5
+++ b/metadata/md5-cache/net-misc/pingu-1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libev:= virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/ncopa/pingu/archive/v1.5.tar.gz -> pingu-1.5.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=da6db109eccd8f4417b592105a1288d3
diff --git a/metadata/md5-cache/net-misc/pingu-9999 b/metadata/md5-cache/net-misc/pingu-9999
index e92d642ec280..c2f0f7b0fce1 100644
--- a/metadata/md5-cache/net-misc/pingu-9999
+++ b/metadata/md5-cache/net-misc/pingu-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=dev-libs/libev:= virtual/tmpfiles
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=6a56b2acb8145d2d5b1a3223e7defc69
diff --git a/metadata/md5-cache/net-misc/pmsvn-1.0.5 b/metadata/md5-cache/net-misc/pmsvn-1.0.5
deleted file mode 100644
index a9f65b610104..000000000000
--- a/metadata/md5-cache/net-misc/pmsvn-1.0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Server's configuration management and monitoring tool
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/pmsvn/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-analyzer/nrpe >=app-shells/bash-4.0_p37 >=sys-apps/sed-4.2 >=dev-vcs/subversion-1.6.9
-SLOT=0
-SRC_URI=mirror://sourceforge/pmsvn/pmsvn-1.0.5.tgz
-_md5_=29e25613f10816e11b0e6902cfca6d17
diff --git a/metadata/md5-cache/net-misc/pmsvn-1.0.6 b/metadata/md5-cache/net-misc/pmsvn-1.0.6
deleted file mode 100644
index 0ea8fe531844..000000000000
--- a/metadata/md5-cache/net-misc/pmsvn-1.0.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Server's configuration management and monitoring tool
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/pmsvn/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-analyzer/nrpe >=app-shells/bash-4.0_p37 >=sys-apps/sed-4.2 >=dev-vcs/subversion-1.6.9
-SLOT=0
-SRC_URI=mirror://sourceforge/pmsvn/pmsvn-1.0.6.tgz
-_md5_=7348c0ab61ba97acecd10bb8546eb6f7
diff --git a/metadata/md5-cache/net-misc/quagga-1.2.4 b/metadata/md5-cache/net-misc/quagga-1.2.4
index a9026922caad..add7f97d220d 100644
--- a/metadata/md5-cache/net-misc/quagga-1.2.4
+++ b/metadata/md5-cache/net-misc/quagga-1.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2 virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.2.4.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=049e8252a80effaca5eadb3198ed8101
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.10 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.10
index 265c4f41a311..7450c69ae9a9 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.10
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.10
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install preinst setup
-DEPEND=>=dev-lang/erlang-19.3[ssl,smp] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.6.6 <dev-lang/elixir-1.7.0 dev-libs/libxslt || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DEPEND=>=dev-lang/erlang-19.3[ssl,smp(+)] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.6.6 <dev-lang/elixir-1.7.0 dev-libs/libxslt || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
 DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
 EAPI=7
 HOMEPAGE=https://www.rabbitmq.com/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 MPL-1.1
-RDEPEND=>=dev-lang/erlang-19.3[ssl,smp]
+RDEPEND=>=dev-lang/erlang-19.3[ssl,smp(+)]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.10/rabbitmq-server-3.7.10.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=2e75549219168a8dd25b86a8925b1424
+_md5_=bae6e4de6e870d3487d95f9bdfe3461e
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.11 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.11
index f36c6768925f..b4adfcf3bd0e 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.11
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.11
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install preinst setup
-DEPEND=>=dev-lang/erlang-20.3[ssl,smp] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.6.6 <dev-lang/elixir-1.7.0 dev-libs/libxslt || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DEPEND=>=dev-lang/erlang-20.3[ssl,smp(+)] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.6.6 <dev-lang/elixir-1.7.0 dev-libs/libxslt || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
 DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
 EAPI=7
 HOMEPAGE=https://www.rabbitmq.com/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 MPL-1.1
-RDEPEND=>=dev-lang/erlang-20.3[ssl,smp]
+RDEPEND=>=dev-lang/erlang-20.3[ssl,smp(+)]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.11/rabbitmq-server-3.7.11.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=eef6d6bcd283ab6abfab38bc8f944889
+_md5_=f376fa95a037926405de2870e881062a
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.17 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.17
new file mode 100644
index 000000000000..ccb403993f07
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.17
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install preinst setup
+DEPEND=>=dev-lang/erlang-21.0[ssl] <dev-lang/erlang-23.0[ssl] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.6.6 dev-libs/libxslt || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
+EAPI=7
+HOMEPAGE=https://www.rabbitmq.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 MPL-1.1
+RDEPEND=>=dev-lang/erlang-21.0[ssl] <dev-lang/erlang-23.0[ssl]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.17/rabbitmq-server-3.7.17.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=cabab03e146e8fe0fe9585607bfd263a
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.3 b/metadata/md5-cache/net-misc/rsync-3.1.3
index 87046357aea6..8ac00ecb48da 100644
--- a/metadata/md5-cache/net-misc/rsync-3.1.3
+++ b/metadata/md5-cache/net-misc/rsync-3.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b4c8d9b25eb57bb808f9ad700d8b7217
diff --git a/metadata/md5-cache/net-misc/rwhoisd-1.5.9.5-r3 b/metadata/md5-cache/net-misc/rwhoisd-1.5.9.5-r3
deleted file mode 100644
index 6e3aac00635e..000000000000
--- a/metadata/md5-cache/net-misc/rwhoisd-1.5.9.5-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=sys-devel/flex virtual/yacc
-DESCRIPTION=ARIN rwhois daemon
-EAPI=5
-HOMEPAGE=http://projects.arin.net/rwhois/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://projects.arin.net/rwhois/ftp/rwhoisd-1.5.9.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dcf86d50bad61d528e8d5c9b4d23a6f5
diff --git a/metadata/md5-cache/net-misc/seafile-6.1.7 b/metadata/md5-cache/net-misc/seafile-6.1.7
deleted file mode 100644
index e8de5939416a..000000000000
--- a/metadata/md5-cache/net-misc/seafile-6.1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] =net-libs/ccnet-6.1.7[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3 || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=File syncing and sharing software with file encryption and group sharing
-EAPI=6
-HOMEPAGE=https://github.com/haiwen/seafile/ http://www.seafile.com/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] =net-libs/ccnet-6.1.7[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/haiwen/seafile/archive/v6.1.7.tar.gz -> seafile-6.1.7.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45fd9f2a5ba00a04854695e2be9b9b8f
diff --git a/metadata/md5-cache/net-misc/seafile-6.2.4 b/metadata/md5-cache/net-misc/seafile-6.2.4
deleted file mode 100644
index 1f057931006f..000000000000
--- a/metadata/md5-cache/net-misc/seafile-6.2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=install prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ~net-libs/ccnet-6.1.7[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3 || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 )
-DESCRIPTION=File syncing and sharing software with file encryption and group sharing
-EAPI=7
-HOMEPAGE=https://github.com/haiwen/seafile/ http://www.seafile.com/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ~net-libs/ccnet-6.1.7[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/haiwen/seafile/archive/v6.2.4.tar.gz -> seafile-6.2.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd
-_md5_=8d7e9f0d0a68edfe0d4c19b7a966ad9b
diff --git a/metadata/md5-cache/net-misc/seafile-client-6.1.7 b/metadata/md5-cache/net-misc/seafile-client-6.1.7
deleted file mode 100644
index 49630f9d7e89..000000000000
--- a/metadata/md5-cache/net-misc/seafile-client-6.1.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=net-libs/libsearpc =net-libs/ccnet-6.1.7 =net-misc/seafile-6.1.7 dev-libs/libevent dev-libs/jansson dev-libs/openssl:0 dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) ) dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Seafile desktop client
-EAPI=6
-HOMEPAGE=https://github.com/haiwen/seafile-client/ http://www.seafile.com/
-IUSE=shibboleth test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=net-libs/libsearpc =net-libs/ccnet-6.1.7 =net-misc/seafile-6.1.7 dev-libs/libevent dev-libs/jansson dev-libs/openssl:0 dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )
-SLOT=0
-SRC_URI=https://github.com/haiwen/seafile-client/archive/v6.1.7.tar.gz -> seafile-client-6.1.7.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7aa4a6ca93fa3cb451eb6e5012a45204
diff --git a/metadata/md5-cache/net-misc/seafile-client-6.2.4 b/metadata/md5-cache/net-misc/seafile-client-6.2.4
deleted file mode 100644
index 2cffad97a338..000000000000
--- a/metadata/md5-cache/net-misc/seafile-client-6.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=net-libs/libsearpc ~net-misc/seafile-6.2.4 dev-libs/libevent dev-libs/jansson dev-libs/openssl:0 dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) ) dev-qt/linguist-tools:5 test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Seafile desktop client
-EAPI=6
-HOMEPAGE=https://github.com/haiwen/seafile-client/ http://www.seafile.com/
-IUSE=shibboleth test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=net-libs/libsearpc ~net-misc/seafile-6.2.4 dev-libs/libevent dev-libs/jansson dev-libs/openssl:0 dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )
-SLOT=0
-SRC_URI=https://github.com/haiwen/seafile-client/archive/v6.2.4.tar.gz -> seafile-client-6.2.4.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=308ba33c8fcf9015fbc7a82dc25e26a4
diff --git a/metadata/md5-cache/net-misc/ser2net-2.7-r1 b/metadata/md5-cache/net-misc/ser2net-2.7-r1
deleted file mode 100644
index 76cef2b5b982..000000000000
--- a/metadata/md5-cache/net-misc/ser2net-2.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Serial To Network Proxy
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/ser2net
-IUSE=tcpd
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers )
-SLOT=0
-SRC_URI=mirror://sourceforge/ser2net/ser2net-2.7.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e972c9f36b13b89302a96f0cb93e273
diff --git a/metadata/md5-cache/net-misc/ser2net-2.9.1 b/metadata/md5-cache/net-misc/ser2net-2.9.1
deleted file mode 100644
index b25c42daf0b6..000000000000
--- a/metadata/md5-cache/net-misc/ser2net-2.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=tcpd? ( sys-apps/tcp-wrappers )
-DESCRIPTION=Serial To Network Proxy
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/ser2net
-IUSE=tcpd
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers )
-SLOT=0
-SRC_URI=mirror://sourceforge/ser2net/ser2net-2.9.1.tar.gz
-_md5_=ee8adf47379c50e2f22b530e717b636d
diff --git a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2 b/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2
deleted file mode 100644
index 4d878ad14dfa..000000000000
--- a/metadata/md5-cache/net-misc/taylor-uucp-1.07-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare
-DEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Taylor UUCP
-EAPI=4
-HOMEPAGE=https://www.airs.com/ian/uucp.html
-KEYWORDS=alpha amd64 ~arm ia64 ppc sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gnu/uucp/uucp-1.07.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=116cce22cd45bdf9f02c5249c501527e
diff --git a/metadata/md5-cache/net-misc/tipcutils-2.0.0 b/metadata/md5-cache/net-misc/tipcutils-2.0.0
deleted file mode 100644
index 1237fbf30e80..000000000000
--- a/metadata/md5-cache/net-misc/tipcutils-2.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-kernel/linux-headers-2.6.39
-DESCRIPTION=Utilities for TIPC (Transparent Inter-Process Communication)
-EAPI=4
-HOMEPAGE=http://tipc.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/tipc/tipcutils-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c529119cf8cb3c19eb6bb9e2af263827
diff --git a/metadata/md5-cache/net-misc/trackma-0.7.3 b/metadata/md5-cache/net-misc/trackma-0.7.3
deleted file mode 100644
index fd74cb567655..000000000000
--- a/metadata/md5-cache/net-misc/trackma-0.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ncurses? ( dev-python/urwid[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) gtk? ( dev-python/pygobject:3[python_targets_python3_5(-)?,-python_single_target_python3_5(-),cairo] dev-python/pycairo[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/pillow[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) qt5? ( dev-python/PyQt5[python_targets_python3_5(-)?,-python_single_target_python3_5(-),gui,widgets] dev-python/pillow[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-DESCRIPTION=Open multi-site list manager for media tracking sites
-EAPI=6
-HOMEPAGE=https://github.com/z411/trackma
-IUSE=+ncurses cli gtk inotify qt5 python_targets_python3_5
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=sys-process/lsof inotify? ( || ( dev-python/inotifyx dev-python/pyinotify ) ) ncurses? ( dev-python/urwid[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) gtk? ( dev-python/pygobject:3[python_targets_python3_5(-)?,-python_single_target_python3_5(-),cairo] dev-python/pycairo[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] dev-python/pillow[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) qt5? ( dev-python/PyQt5[python_targets_python3_5(-)?,-python_single_target_python3_5(-),gui,widgets] dev-python/pillow[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( cli gtk ncurses qt5 ) || ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/z411/trackma/archive/v0.7.3.tar.gz -> trackma-0.7.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d34204306d198cf3ae2c2c568c54c604
diff --git a/metadata/md5-cache/net-misc/wakeonlan-0.41-r2 b/metadata/md5-cache/net-misc/wakeonlan-0.41-r2
index 6ceab18569a5..b6beac41a2ba 100644
--- a/metadata/md5-cache/net-misc/wakeonlan-0.41-r2
+++ b/metadata/md5-cache/net-misc/wakeonlan-0.41-r2
@@ -8,5 +8,5 @@ LICENSE=Artistic GPL-2
 RDEPEND=dev-lang/perl[-build(-)]
 SLOT=0
 SRC_URI=http://gsd.di.uminho.pt/jpo/software/wakeonlan/downloads/wakeonlan-0.41.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7cedfce795a5cff8ac93dee98f9719be
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.08.13 b/metadata/md5-cache/net-misc/youtube-dl-2019.08.13
deleted file mode 100644
index 70228910bfc5..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2019.08.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=7
-HOMEPAGE=https://github.com/ytdl-org/youtube-dl/
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://youtube-dl.org/downloads/2019.08.13/youtube-dl-2019.08.13.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3303a01a1f405d78dd112946ee5af6ad
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.09.01 b/metadata/md5-cache/net-misc/youtube-dl-2019.09.01
index d8b141d072e6..3755a95da443 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2019.09.01
+++ b/metadata/md5-cache/net-misc/youtube-dl-2019.09.01
@@ -5,7 +5,7 @@ DESCRIPTION=Download videos from YouTube.com (and more sites...)
 EAPI=7
 HOMEPAGE=https://github.com/ytdl-org/youtube-dl/
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2019.09.01/youtube-dl-2019.09.01.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=ecce94f27c83031f68ddcda6b754430b
+_md5_=3303a01a1f405d78dd112946ee5af6ad
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2019.09.12.1 b/metadata/md5-cache/net-misc/youtube-dl-2019.09.12.1
new file mode 100644
index 000000000000..3a608f341ad7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2019.09.12.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=7
+HOMEPAGE=https://github.com/ytdl-org/youtube-dl/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://youtube-dl.org/downloads/2019.09.12.1/youtube-dl-2019.09.12.1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ecce94f27c83031f68ddcda6b754430b
diff --git a/metadata/md5-cache/net-nds/389-ds-base-1.3.5.19 b/metadata/md5-cache/net-nds/389-ds-base-1.3.5.19
deleted file mode 100644
index 4db6022b9687..000000000000
--- a/metadata/md5-cache/net-nds/389-ds-base-1.3.5.19
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-libs/db:4.8 >=dev-libs/cyrus-sasl-2.1.19 >=net-analyzer/net-snmp-5.1.2 >=dev-libs/icu-3.4:= >=dev-libs/nss-3.22[utils] dev-libs/nspr >=dev-libs/svrcore-4.1.2 dev-libs/openssl:0= dev-libs/libpcre:3 >=dev-perl/perl-mozldap-1.5.3 dev-perl/NetAddr-IP net-nds/openldap sys-libs/pam sys-libs/zlib kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=389 Directory Server (core librares and daemons )
-EAPI=5
-HOMEPAGE=http://www.port389.org/
-IUSE=autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise presence kerberos selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=sys-libs/db:4.8 >=dev-libs/cyrus-sasl-2.1.19 >=net-analyzer/net-snmp-5.1.2 >=dev-libs/icu-3.4:= >=dev-libs/nss-3.22[utils] dev-libs/nspr >=dev-libs/svrcore-4.1.2 dev-libs/openssl:0= dev-libs/libpcre:3 >=dev-perl/perl-mozldap-1.5.3 dev-perl/NetAddr-IP net-nds/openldap sys-libs/pam sys-libs/zlib kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] ) selinux? ( sec-policy/selinux-dirsrv ) virtual/perl-Time-Local virtual/perl-MIME-Base64
-SLOT=0
-SRC_URI=http://www.port389.org/sources/389-ds-base-1.3.5.19.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a5927d810954f99c42be8aba3e3e6a0
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 6e8926ca53ad..f8e363037c2e 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.3.1 b/metadata/md5-cache/net-nds/jxplorer-3.3.1
index 995147860e81..29e995ba672b 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.3.1
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1
@@ -9,5 +9,5 @@ LICENSE=CAOSL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/javahelp-2.0.02_p46:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/jxplorer-3.3.1-project.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=bef683123bcb4656148d6f8e84950370
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.3.1.1 b/metadata/md5-cache/net-nds/jxplorer-3.3.1.1
index 81939e96d573..5fe17927f398 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.3.1.1
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1.1
@@ -9,5 +9,5 @@ LICENSE=CAOSL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/javahelp-2.0.02_p46:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/jxplorer-3.3.1.1-project.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=65a572c011dd0408083ec346ea08525b
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.3.1.2 b/metadata/md5-cache/net-nds/jxplorer-3.3.1.2
index b25fb3549318..987e50bc5c08 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.3.1.2
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/javahelp-2.0.02_p46:0 >=virtual/jre-1.5 >=dev-java/java-confi
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/jxplorer-3.3.1.2-project.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462
 _md5_=5823ebf1c6db3d5fdb152aa84a333b65
diff --git a/metadata/md5-cache/net-nds/rpcbind-1.2.5 b/metadata/md5-cache/net-nds/rpcbind-1.2.5
index 39e43813957c..5c89dfdbc387 100644
--- a/metadata/md5-cache/net-nds/rpcbind-1.2.5
+++ b/metadata/md5-cache/net-nds/rpcbind-1.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=portmap replacement which supports RPC over various protocols
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/rpcbind/
 IUSE=debug remotecalls selinux systemd tcpd warmstarts
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=net-libs/libtirpc-0.2.3:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-rpcbind )
 REQUIRED_USE=systemd? ( warmstarts )
 SLOT=0
 SRC_URI=mirror://sourceforge/rpcbind/rpcbind-1.2.5.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2e48ac67edc6d0c6021a4f62325e240f
+_md5_=8853047b9370c2382a6d67b05f22e09b
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index c1ee844e17a1..f5a7fc35ab56 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/ktorrent-5.1.2-r1 b/metadata/md5-cache/net-p2p/ktorrent-5.1.2-r1
index 42ec8b1660c4..85521d50c476 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-5.1.2-r1
+++ b/metadata/md5-cache/net-p2p/ktorrent-5.1.2-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Powerful BitTorrent client based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://kde.org/applications/internet/ktorrent/
 IUSE=+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator +mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=net-libs/libktorrent-2.1.1:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=kde-frameworks/syndication-5.60.0:5 ) search? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.15.5:5 ) stats? ( >=kde-frameworks/kplotting-5.60.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.60.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.60.0:5 ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-apps/kio-extras-19.04.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.1.2/ktorrent-5.1.2.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	4f2f402770db1a28789af98b041f5f4a	kde5-functions	8593b8fd9e43123f882a49d0079dc20e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85351b0b50f85fdac031cd030a147f9f
+_md5_=a0f3b1557272ab1a4791cea7bf3359d2
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.6.1 b/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
index 5f492d3ba136..91ce18d115d0 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/tmpfiles
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.6.1-1_amd64.deb ) x86? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.6.1-1_i386.deb )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=c83c801efb884bbf6beec0f7c1b81713
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.6.3 b/metadata/md5-cache/net-p2p/resilio-sync-2.6.3
index 61a472b1c825..643d8d8faa7b 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.6.3
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.6.3
@@ -10,5 +10,5 @@ RDEPEND=virtual/tmpfiles
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( http://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_amd64.deb ) x86? ( http://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_i386.deb )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=70584ef7a1155bb9a313fcefa37c3559
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index ed976133293b..e77fe0d8cee2 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11 b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11
index 0cd3ebb23a7a..fc8fdf2a21a0 100644
--- a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11
+++ b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.11
@@ -9,5 +9,5 @@ PDEPEND=net-print/foomatic-db
 RDEPEND=dev-libs/libxml2 >=net-print/cups-filters-1.0.43-r1[foomatic] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3b8b74b64129d02c18373ebf71a8afba
diff --git a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12 b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
index e195bc422bb4..8f19fec44989 100644
--- a/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
+++ b/metadata/md5-cache/net-print/foomatic-db-engine-4.0.12
@@ -9,5 +9,5 @@ PDEPEND=net-print/foomatic-db
 RDEPEND=dev-libs/libxml2 >=net-print/cups-filters-1.0.43-r1[foomatic] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-engine-4.0.12.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d4c5db1df5996c4d7362e563f9d3ba66	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	d56a25e78e4082846f5eaee5799a7cb3	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=82d6121e1a84efe9d2b5ca1bad03073e
diff --git a/metadata/md5-cache/net-print/hplip-3.18.12 b/metadata/md5-cache/net-print/hplip-3.18.12
index 58863c5e999d..91278519c6c8 100644
--- a/metadata/md5-cache/net-print/hplip-3.18.12
+++ b/metadata/md5-cache/net-print/hplip-3.18.12
@@ -11,5 +11,5 @@ RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic]
 REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.18.12.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.12-patches-1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=0525d7686dc60cbc26120d2a428f3f80
diff --git a/metadata/md5-cache/net-print/hplip-3.19.6 b/metadata/md5-cache/net-print/hplip-3.19.6
index 2391d8eaebef..287b90fcdce4 100644
--- a/metadata/md5-cache/net-print/hplip-3.19.6
+++ b/metadata/md5-cache/net-print/hplip-3.19.6
@@ -11,5 +11,5 @@ RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic]
 REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.19.6.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.12-patches-1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=d1207302c04131f3809e028bcd2a406a
diff --git a/metadata/md5-cache/net-print/hplip-3.19.8 b/metadata/md5-cache/net-print/hplip-3.19.8
index 6d0077f6b255..8e649c861d26 100644
--- a/metadata/md5-cache/net-print/hplip-3.19.8
+++ b/metadata/md5-cache/net-print/hplip-3.19.8
@@ -11,5 +11,5 @@ RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic]
 REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.19.8.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.12-patches-1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=505b0451db789795c8698269cf47e433
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.18.12 b/metadata/md5-cache/net-print/hplip-plugin-3.18.12
index ee225eaa0182..4e5714ad17b2 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.18.12
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.18.12
@@ -9,5 +9,5 @@ RDEPEND=~net-print/hplip-3.18.12 virtual/udev
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.18.12-plugin.run
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
 _md5_=027c49b47bcc3240c3bf9390d5aa12bd
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 958b02d4e8ee..8b4a1f1fc439 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/haproxy-1.8.19 b/metadata/md5-cache/net-proxy/haproxy-1.8.19
deleted file mode 100644
index e6b1d5fd3546..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=6
-HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0
-SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1a4291c795ff060a87e3555f6ee29053
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.21 b/metadata/md5-cache/net-proxy/haproxy-1.8.21
new file mode 100644
index 000000000000..d19d5b4960ce
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=6
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0
+SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.21.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=1a4291c795ff060a87e3555f6ee29053
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.9.9 b/metadata/md5-cache/net-proxy/haproxy-1.9.9
deleted file mode 100644
index ef7b6a09ea41..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-1.9.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0
-SRC_URI=http://haproxy.1wt.eu/download/1.9/src/haproxy-1.9.9.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=74e877176288f4540618cedc4e71b6f0
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.3 b/metadata/md5-cache/net-proxy/haproxy-2.0.3
deleted file mode 100644
index 794a7b063fc8..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
-SLOT=0
-SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.3.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=63507e889039cb2706f33b7f3fd48d53
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.5 b/metadata/md5-cache/net-proxy/haproxy-2.0.5
new file mode 100644
index 000000000000..457b73fc6a8c
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0
+SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.5.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=63507e889039cb2706f33b7f3fd48d53
diff --git a/metadata/md5-cache/net-proxy/http-replicator-3.0-r8 b/metadata/md5-cache/net-proxy/http-replicator-3.0-r8
deleted file mode 100644
index 53f64ad192a9..000000000000
--- a/metadata/md5-cache/net-proxy/http-replicator-3.0-r8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Proxy cache for Gentoo packages
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/http-replicator
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 hppa ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/http-replicator/http-replicator_3.0.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=89a36928895bdeab63b31a9398beb33e
diff --git a/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1 b/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1
index d7311c7f588a..d34d1cbb6e13 100644
--- a/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1
+++ b/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/tmpfiles
 REQUIRED_USE=test? ( xtinyproxy-header )
 SLOT=0
 SRC_URI=https://github.com/tinyproxy/tinyproxy/releases/download/1.10.0/tinyproxy-1.10.0.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=5021c8a62f4951f76dced2be4bb172f1
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index f1ffe47db48b..17b35c447003 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/bladerf-2018.08 b/metadata/md5-cache/net-wireless/bladerf-2018.08
index 2fe36ba41e17..977eb835af66 100644
--- a/metadata/md5-cache/net-wireless/bladerf-2018.08
+++ b/metadata/md5-cache/net-wireless/bladerf-2018.08
@@ -10,5 +10,5 @@ PDEPEND=>=net-wireless/bladerf-firmware-2.2.0 >=net-wireless/bladerf-fpga-0.7.3
 RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
 SLOT=0/2018.08
 SRC_URI=https://github.com/Nuand/bladeRF/archive/2018.08.tar.gz -> bladerf-2018.08.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c36384e9bc48092894951d2a373e25d
diff --git a/metadata/md5-cache/net-wireless/bladerf-2019.07 b/metadata/md5-cache/net-wireless/bladerf-2019.07
index d74059f65f70..f8ac99e60161 100644
--- a/metadata/md5-cache/net-wireless/bladerf-2019.07
+++ b/metadata/md5-cache/net-wireless/bladerf-2019.07
@@ -11,5 +11,5 @@ PDEPEND=>=net-wireless/bladerf-firmware-2.3.2 >=net-wireless/bladerf-fpga-0.11.0
 RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
 SLOT=0/2019.07
 SRC_URI=https://github.com/Nuand/bladeRF/archive/2019.07.tar.gz -> bladerf-2019.07.tar.gz https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80cf7f717d41e73e2eaae2f04590c09a
diff --git a/metadata/md5-cache/net-wireless/bladerf-9999 b/metadata/md5-cache/net-wireless/bladerf-9999
index 2a0e620c882a..ec13e3f3a3a8 100644
--- a/metadata/md5-cache/net-wireless/bladerf-9999
+++ b/metadata/md5-cache/net-wireless/bladerf-9999
@@ -10,5 +10,5 @@ PDEPEND=>=net-wireless/bladerf-firmware-2.3.2 >=net-wireless/bladerf-fpga-0.11.0
 PROPERTIES=live
 RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
 SLOT=0/9999
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80cf7f717d41e73e2eaae2f04590c09a
diff --git a/metadata/md5-cache/net-wireless/bluez-5.50-r2 b/metadata/md5-cache/net-wireless/bluez-5.50-r2
index 7bbd2df4b997..aedca6d68da3 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.50-r2
+++ b/metadata/md5-cache/net-wireless/bluez-5.50-r2
@@ -7,9 +7,9 @@ HOMEPAGE=http://www.bluez.org
 IUSE=alsa btpclient cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session python_targets_python2_7 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 arm arm64 ~hppa ~mips ppc ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.28: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(-)?] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) btpclient? ( >=dev-libs/ell-0.3 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.3 dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+RDEPEND=>=dev-libs/glib-2.28: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(-)?] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) btpclient? ( >=dev-libs/ell-0.3 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.3 dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) acct-group/plugdev selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.50.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c87d43c81e5c9f949ae3c0707561512b
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=5b057d521486d2735165b97df34e9cb1
diff --git a/metadata/md5-cache/net-wireless/bluez-5.50-r3 b/metadata/md5-cache/net-wireless/bluez-5.50-r3
index 52761c9f563b..a31932a29421 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.50-r3
+++ b/metadata/md5-cache/net-wireless/bluez-5.50-r3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.50.tar.xz https://dev.gentoo.org/~pacho/bluez/bluez-5.50-fedora-backports.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=ef7ed26c86c319ab894daa907319d5bc
diff --git a/metadata/md5-cache/net-wireless/crda-3.18-r3 b/metadata/md5-cache/net-wireless/crda-3.18-r3
index f01e8191140a..35d0625f2353 100644
--- a/metadata/md5-cache/net-wireless/crda-3.18-r3
+++ b/metadata/md5-cache/net-wireless/crda-3.18-r3
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=!gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gcrypt? ( dev-libs/libgcrypt:0= ) dev-libs/libnl:3 net-wireless/wireless-regdb
 SLOT=0
 SRC_URI=http://linuxwireless.org/download/crda/crda-3.18.tar.xz mirror://kernel/software/network/crda/crda-3.18.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=f12c212a1704465a971a3955c7fc58af
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2 b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2
index 23b635be3ed1..141d6eaa1961 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=>=x11-libs/gtk+-3.12:3[introspection?] media-libs/libcanberra[gtk3] >=x11-libs/libnotify-0.7.0 virtual/libudev >=dev-libs/glib-2.38:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) !net-wireless/bluez-gnome dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.9 ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Bluetooth graphical utilities integrated with GNOME
 EAPI=6
@@ -6,8 +6,8 @@ HOMEPAGE=https://wiki.gnome.org/Projects/GnomeBluetooth
 IUSE=gtk-doc +introspection
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
-RDEPEND=>=x11-libs/gtk+-3.12:3[introspection?] media-libs/libcanberra[gtk3] >=x11-libs/libnotify-0.7.0 virtual/libudev >=dev-libs/glib-2.38:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) virtual/udev >=net-wireless/bluez-5
+RDEPEND=>=x11-libs/gtk+-3.12:3[introspection?] media-libs/libcanberra[gtk3] >=x11-libs/libnotify-0.7.0 virtual/libudev >=dev-libs/glib-2.38:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) acct-group/plugdev virtual/udev >=net-wireless/bluez-5
 SLOT=2/13
 SRC_URI=mirror://gnome/sources/gnome-bluetooth/3.28/gnome-bluetooth-3.28.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea45935ab904363905f3bb4d9d10b2a1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc822aa42e5800df1fc51b1bde512b02
diff --git a/metadata/md5-cache/net-wireless/gobi_loader-0.7-r2 b/metadata/md5-cache/net-wireless/gobi_loader-0.7-r2
index 65ea7c40e135..356d974cb02e 100644
--- a/metadata/md5-cache/net-wireless/gobi_loader-0.7-r2
+++ b/metadata/md5-cache/net-wireless/gobi_loader-0.7-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=https://www.codon.org.uk/~mjg59/gobi_loader/download/gobi_loader-0.7.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=6c66d780597a3f7a5a63a8e83037bf38
diff --git a/metadata/md5-cache/net-wireless/gr-scan-20160104 b/metadata/md5-cache/net-wireless/gr-scan-20160104
deleted file mode 100644
index b912b82132c6..000000000000
--- a/metadata/md5-cache/net-wireless/gr-scan-20160104
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=net-wireless/gnuradio net-wireless/gr-osmosdr
-DESCRIPTION=Frequency scanner for GNU Radio
-EAPI=5
-HOMEPAGE=http://git.zx2c4.com/gr-scan/about
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-wireless/gnuradio net-wireless/gr-osmosdr
-SLOT=0
-SRC_URI=http://git.zx2c4.com/gr-scan/snapshot/gr-scan-20160104.tar.xz
-_md5_=aba64a8cd09dd686cc0f294261137687
diff --git a/metadata/md5-cache/net-wireless/gr-scan-20160211 b/metadata/md5-cache/net-wireless/gr-scan-20160211
new file mode 100644
index 000000000000..3bae2661ca4f
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-scan-20160211
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=net-wireless/gnuradio:= net-wireless/gr-osmosdr:= dev-libs/boost:=
+DESCRIPTION=Frequency scanner for GNU Radio
+EAPI=7
+HOMEPAGE=http://git.zx2c4.com/gr-scan/about
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-wireless/gnuradio:= net-wireless/gr-osmosdr:= dev-libs/boost:=
+SLOT=0
+SRC_URI=https://git.zx2c4.com/gr-scan/snapshot/gr-scan-25030f6063e796e5cb048ffc1ec7e1914192146b.tar.xz -> gr-scan-20160211.tar.xz
+_md5_=cbf1b9c7e7676fee332375509314974a
diff --git a/metadata/md5-cache/net-wireless/horst-4.2 b/metadata/md5-cache/net-wireless/horst-4.2
deleted file mode 100644
index 12b8f59b74d0..000000000000
--- a/metadata/md5-cache/net-wireless/horst-4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses:0 pcap? ( net-libs/libpcap ) test? ( sys-devel/sparse )
-DESCRIPTION=Small 802.11 wireless LAN analyzer
-EAPI=5
-HOMEPAGE=http://br1.einfach.org/tech/horst/
-IUSE=debug +pcap test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0 pcap? ( net-libs/libpcap )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://br1.einfach.org/horst_dl/horst-4.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=f5ec16ae15a0e5a39d6640a34a3566dd
diff --git a/metadata/md5-cache/net-wireless/horst-5.0 b/metadata/md5-cache/net-wireless/horst-5.0
deleted file mode 100644
index a75775726927..000000000000
--- a/metadata/md5-cache/net-wireless/horst-5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/ncurses:0 pcap? ( net-libs/libpcap ) test? ( sys-devel/sparse )
-DESCRIPTION=Small 802.11 wireless LAN analyzer
-EAPI=5
-HOMEPAGE=http://br1.einfach.org/tech/horst/
-IUSE=debug +pcap test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0 pcap? ( net-libs/libpcap )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/br101/horst/archive/version-5.0.tar.gz -> horst-5.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=aaf8eefe34574baf27ce188ce3cdc816
diff --git a/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r6 b/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r6
index 553a8f5876da..1e3df805eeb6 100644
--- a/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r6
+++ b/metadata/md5-cache/net-wireless/irda-utils-0.9.18-r6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=sys-apps/pciutils-2.2.7-r1 sys-process/procps sys-apps/setserial sys-apps/grep virtual/udev
 SLOT=0
 SRC_URI=mirror://sourceforge/irda/irda-utils-0.9.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=14d23dda8a234e4afead71c7e20af841
diff --git a/metadata/md5-cache/net-wireless/kismet-2019.09.1 b/metadata/md5-cache/net-wireless/kismet-2019.09.1
index ae9e1d2113bc..e1d7b906e76c 100644
--- a/metadata/md5-cache/net-wireless/kismet-2019.09.1
+++ b/metadata/md5-cache/net-wireless/kismet-2019.09.1
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 postinst preinst prepare setup
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig
 DESCRIPTION=IEEE 802.11 wireless LAN sniffer
 EAPI=7
 HOMEPAGE=https://www.kismetwireless.net
-IUSE=lm_sensors mousejack networkmanager +pcre selinux +suid python_targets_python3_6
+IUSE=lm-sensors mousejack networkmanager +pcre selinux +suid python_targets_python3_6
 KEYWORDS=amd64 arm ~arm64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] selinux? ( sec-policy/selinux-kismet )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] selinux? ( sec-policy/selinux-kismet )
 REQUIRED_USE=python_targets_python3_6
 SLOT=0/2019.09.1
 SRC_URI=https://www.kismetwireless.net/code/kismet-2019-09-R1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=808c3b2c5ab49345a9b3585513d8dbfd
+_md5_=49781f38c7091362cc8f91e5fea49f89
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index 00f3dad4ebd4..dd8fc334e8e9 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 install postinst preinst prepare setup unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig
 DESCRIPTION=IEEE 802.11 wireless LAN sniffer
 EAPI=7
 HOMEPAGE=https://www.kismetwireless.net
-IUSE=lm_sensors mousejack networkmanager +pcre selinux +suid python_targets_python3_6
+IUSE=lm-sensors mousejack networkmanager +pcre selinux +suid python_targets_python3_6
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm_sensors? ( sys-apps/lm_sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] selinux? ( sec-policy/selinux-kismet )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] selinux? ( sec-policy/selinux-kismet )
 REQUIRED_USE=python_targets_python3_6
 RESTRICT=strip
 SLOT=0/9999
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=808c3b2c5ab49345a9b3585513d8dbfd
+_md5_=49781f38c7091362cc8f91e5fea49f89
diff --git a/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1 b/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
index 474c7ccbdb08..b0775e8ae915 100644
--- a/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
+++ b/metadata/md5-cache/net-wireless/madwimax-0.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://madwimax.googlecode.com/files/madwimax-0.1.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=d3c3d892f5865b3c656203697a0ac0b4
diff --git a/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1 b/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
index 109862a47e57..7c740688aa52 100644
--- a/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
+++ b/metadata/md5-cache/net-wireless/osmo-fl2k-0.1.1
@@ -10,5 +10,5 @@ PDEPEND=media-sound/sox sys-apps/pv
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://git.osmocom.org/osmo-fl2k/snapshot/v0.1.1.tar.gz -> osmo-fl2k-0.1.1.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3cc55fd56ae9956c36042de19fe36e7
diff --git a/metadata/md5-cache/net-wireless/osmo-fl2k-9999 b/metadata/md5-cache/net-wireless/osmo-fl2k-9999
index e2cb3d673a64..3f787c0ca24d 100644
--- a/metadata/md5-cache/net-wireless/osmo-fl2k-9999
+++ b/metadata/md5-cache/net-wireless/osmo-fl2k-9999
@@ -9,5 +9,5 @@ PDEPEND=media-sound/sox sys-apps/pv
 PROPERTIES=live
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dce6d84e8f9a80aac0fc61d23f00a327
diff --git a/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1 b/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
index 86a40e3dcdee..ba1e65495489 100644
--- a/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
+++ b/metadata/md5-cache/net-wireless/sdrplay-2.13.1-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libusb:1 virtual/udev
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=http://www.sdrplay.com/software/SDRplay_RSP_API-Linux-2.13.1.run
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d039fa2929056ba9469f001cdbc9bcbb
diff --git a/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2 b/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2
index 75ca2f354bc7..74ffe47294a3 100644
--- a/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2
+++ b/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses ) gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://www.kismetwireless.net/code/spectools-2011-08-R1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=38a04e5c9ef258d878700b7273891ea6
diff --git a/metadata/md5-cache/net-wireless/spectools-2011.08.1_p20140618-r1 b/metadata/md5-cache/net-wireless/spectools-2011.08.1_p20140618-r1
index e6343b9ea08a..b3cf0b11f2d5 100644
--- a/metadata/md5-cache/net-wireless/spectools-2011.08.1_p20140618-r1
+++ b/metadata/md5-cache/net-wireless/spectools-2011.08.1_p20140618-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/spectools-2011-08-R1_p20140618.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a846f7e68649251b5200926e458954e9
diff --git a/metadata/md5-cache/net-wireless/spectools-2016.01.1 b/metadata/md5-cache/net-wireless/spectools-2016.01.1
index 500f318f5b08..fdb6a57fc7a8 100644
--- a/metadata/md5-cache/net-wireless/spectools-2016.01.1
+++ b/metadata/md5-cache/net-wireless/spectools-2016.01.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango dev-libs/glib:= )
 SLOT=0
 SRC_URI=https://www.kismetwireless.net/code/spectools-2016-01-R1.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f45f1d2c49da82e37edb1f600bcd9b1d
diff --git a/metadata/md5-cache/net-wireless/spectools-9999 b/metadata/md5-cache/net-wireless/spectools-9999
index e5ee8007535e..22ddc15c525c 100644
--- a/metadata/md5-cache/net-wireless/spectools-9999
+++ b/metadata/md5-cache/net-wireless/spectools-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses:0= ) gtk? ( x11-libs/gtk+:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango dev-libs/glib:= )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c9219b884d6f2eafc860febfed26c9e
diff --git a/metadata/md5-cache/net-wireless/ubertooth-2018.08.1 b/metadata/md5-cache/net-wireless/ubertooth-2018.08.1
index e1076b26113b..e5923ea07364 100644
--- a/metadata/md5-cache/net-wireless/ubertooth-2018.08.1
+++ b/metadata/md5-cache/net-wireless/ubertooth-2018.08.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-2018.08.1:=[static-libs?] static-libs? ( dev-libs/libusb[static-libs] ) virtual/libusb:1= udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://github.com/greatscottgadgets/ubertooth/releases/download/2018-08-R1/ubertooth-2018-08-R1.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68223435dd6308a49b4a9b23147e7f8f
diff --git a/metadata/md5-cache/net-wireless/ubertooth-2018.12.1 b/metadata/md5-cache/net-wireless/ubertooth-2018.12.1
index e3a2788027d2..6e5007342c78 100644
--- a/metadata/md5-cache/net-wireless/ubertooth-2018.12.1
+++ b/metadata/md5-cache/net-wireless/ubertooth-2018.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-2018.12.1:=[static-libs?] static-libs? ( dev-libs/libusb[static-libs] ) virtual/libusb:1= udev? ( virtual/udev )
 SLOT=0
 SRC_URI=https://github.com/greatscottgadgets/ubertooth/releases/download/2018-12-R1/ubertooth-2018-12-R1.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68223435dd6308a49b4a9b23147e7f8f
diff --git a/metadata/md5-cache/net-wireless/ubertooth-9999 b/metadata/md5-cache/net-wireless/ubertooth-9999
index c42dbb7567f5..849e4cc5b1d3 100644
--- a/metadata/md5-cache/net-wireless/ubertooth-9999
+++ b/metadata/md5-cache/net-wireless/ubertooth-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-9999:=[static-libs?] static-libs? ( dev-libs/libusb[static-libs] ) virtual/libusb:1= udev? ( virtual/udev )
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68223435dd6308a49b4a9b23147e7f8f
diff --git a/metadata/md5-cache/net-wireless/unifi-5.11.46 b/metadata/md5-cache/net-wireless/unifi-5.11.46
new file mode 100644
index 000000000000..bfdf22db7c27
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.11.46
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=6
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/5.11
+SRC_URI=https://dl.ui.com/unifi/5.11.46-a5113ebc10/UniFi.unix.zip -> unifi-5.11.46.zip
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=87c669ba6c903b8014b1cd827f225cf2
diff --git a/metadata/md5-cache/net-wireless/unifi-5.12.5 b/metadata/md5-cache/net-wireless/unifi-5.12.5
new file mode 100644
index 000000000000..1d5e2260904a
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-5.12.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=6
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/5.12
+SRC_URI=https://dl.ui.com/unifi/5.12.5-802c4da1a2/UniFi.unix.zip -> unifi-5.12.5.zip
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_md5_=ec13f41625eefc7a52267a7651bf4419
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 5c7ae2abc164..ad28966544e3 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/bioruby-1.5.2 b/metadata/md5-cache/sci-biology/bioruby-1.5.2
index 514a955abc5a..39200ec9c6d5 100644
--- a/metadata/md5-cache/sci-biology/bioruby-1.5.2
+++ b/metadata/md5-cache/sci-biology/bioruby-1.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=An integrated environment for bioinformatics using the Ruby language
 EAPI=6
 HOMEPAGE=http://bioruby.org/
 IUSE=test ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Ruby
 RDEPEND=ruby_targets_ruby24? ( dev-ruby/libxml[ruby_targets_ruby24] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/bio-1.5.2.gem
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=cace4cbf54fd4dd9d2cf115d83e92ad5
+_md5_=4588868f94109a54952cb9e4d284c53d
diff --git a/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2 b/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2
index 5f0c082b5864..1f17c0c61785 100644
--- a/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2
+++ b/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng:0= X? ( media-libs/fontconfig x11-libs/motif:0= x11-libs/libICE x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXt )
 SLOT=0
 SRC_URI=ftp://ftp.ncbi.nlm.nih.gov/blast/executables/release/2.2.26/ncbi.tar.gz -> ncbi-tools-2.2.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=550e2f5b19e400b1ca82a7ba4f7bd44a
diff --git a/metadata/md5-cache/sci-biology/psipred-3.2.1 b/metadata/md5-cache/sci-biology/psipred-3.2.1
index 6056c9085944..c7f3a2d17f2f 100644
--- a/metadata/md5-cache/sci-biology/psipred-3.2.1
+++ b/metadata/md5-cache/sci-biology/psipred-3.2.1
@@ -8,5 +8,5 @@ LICENSE=psipred
 RDEPEND=sci-biology/ncbi-tools sci-biology/update-blastdb
 SLOT=0
 SRC_URI=http://bioinf.cs.ucl.ac.uk/downloads/psipred/psipred321.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3bfa6c8db72c665ebd3da2fcad0fa1b5
diff --git a/metadata/md5-cache/sci-biology/psipred-3.3 b/metadata/md5-cache/sci-biology/psipred-3.3
index a0eb963850f7..494b45655382 100644
--- a/metadata/md5-cache/sci-biology/psipred-3.3
+++ b/metadata/md5-cache/sci-biology/psipred-3.3
@@ -8,5 +8,5 @@ LICENSE=psipred
 RDEPEND=sci-biology/ncbi-tools sci-biology/update-blastdb
 SLOT=0
 SRC_URI=http://bioinf.cs.ucl.ac.uk/downloads/psipred/psipred3.3.tar.gz test? ( http://bioinfadmin.cs.ucl.ac.uk/downloads/psipred/old/data/tdbdata.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=26211f9b01966485ec2f6d801b58e61b
diff --git a/metadata/md5-cache/sci-biology/psipred-3.4 b/metadata/md5-cache/sci-biology/psipred-3.4
index a922008b4e81..5844b667db95 100644
--- a/metadata/md5-cache/sci-biology/psipred-3.4
+++ b/metadata/md5-cache/sci-biology/psipred-3.4
@@ -8,5 +8,5 @@ LICENSE=psipred
 RDEPEND=app-shells/tcsh sci-biology/ncbi-tools sci-biology/update-blastdb
 SLOT=0
 SRC_URI=http://bioinf.cs.ucl.ac.uk/downloads/psipred/psipred3.4.tar.gz test? ( http://bioinfadmin.cs.ucl.ac.uk/downloads/psipred/old/data/tdbdata.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=aa07fe12602b4a284c9d8734857542e5
diff --git a/metadata/md5-cache/sci-biology/psipred-3.5 b/metadata/md5-cache/sci-biology/psipred-3.5
index 4b0e9b0c7fe1..84c9d09d38d4 100644
--- a/metadata/md5-cache/sci-biology/psipred-3.5
+++ b/metadata/md5-cache/sci-biology/psipred-3.5
@@ -8,5 +8,5 @@ LICENSE=psipred
 RDEPEND=app-shells/tcsh sci-biology/ncbi-tools sci-biology/update-blastdb
 SLOT=0
 SRC_URI=http://bioinf.cs.ucl.ac.uk/downloads/psipred/psipred3.5.tar.gz test? ( http://bioinfadmin.cs.ucl.ac.uk/downloads/psipred/old/data/tdbdata.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=aa07fe12602b4a284c9d8734857542e5
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 636791874363..a1157ad4970f 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5 b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
index e880334505c7..8d7fa9b05098 100644
--- a/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
+++ b/metadata/md5-cache/sci-chemistry/molmol-2k_p2-r5
@@ -8,5 +8,5 @@ LICENSE=molmol
 RDEPEND=|| ( ( media-libs/mesa[X(+)] x11-libs/libGLw ) media-libs/mesa[motif,X(+)] ) media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libXpm x11-libs/motif:0 x11-apps/xdpyinfo
 SLOT=0
 SRC_URI=ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-src.tar.gz ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/molmol-2k.2.0-doc.tar.gz https://dev.gentoo.org/~soap/distfiles/molmol-patches.tbz2 https://dev.gentoo.org/~pacho/molmol/molmol.png
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=7d8a4c625c1b9bdc28452405ff187cb7
diff --git a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2 b/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
index 4a5508e651fc..c4fb5741994f 100644
--- a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
+++ b/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 RASLIC )
 RDEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 virtual/fortran
 SLOT=0
 SRC_URI=mirror://sourceforge/openrasmol/RasMol/RasMol_2.7.5/rasmol-2.7.5.2-13May11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8a7375a0ce23cc08c7876397d54ee0c9
diff --git a/metadata/md5-cache/sci-chemistry/raster3d-3.0.2 b/metadata/md5-cache/sci-chemistry/raster3d-3.0.2
index c5809c565bc0..a28ef25b1e81 100644
--- a/metadata/md5-cache/sci-chemistry/raster3d-3.0.2
+++ b/metadata/md5-cache/sci-chemistry/raster3d-3.0.2
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=tiff? ( media-libs/tiff:0 ) gd? ( media-libs/gd[jpeg,png] ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.bmsc.washington.edu/raster3d/Raster3D_3.0-2.tar.gz -> Raster3D_3.0-2.tar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a59b1e92082f2d173671dfd85c99cf41
diff --git a/metadata/md5-cache/sci-chemistry/raster3d-3.0.3 b/metadata/md5-cache/sci-chemistry/raster3d-3.0.3
index 60c78c720945..b1aca26fe997 100644
--- a/metadata/md5-cache/sci-chemistry/raster3d-3.0.3
+++ b/metadata/md5-cache/sci-chemistry/raster3d-3.0.3
@@ -9,5 +9,5 @@ LICENSE=Artistic-2
 RDEPEND=tiff? ( media-libs/tiff:0 ) gd? ( media-libs/gd[jpeg,png] ) virtual/fortran
 SLOT=0
 SRC_URI=http://www.bmsc.washington.edu/raster3d/Raster3D_3.0-3.tar.gz -> Raster3D_3.0-3.tar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=342cdfa3f027929bf6f5b74156fe7c8e
diff --git a/metadata/md5-cache/sci-chemistry/sparky-3.115-r2 b/metadata/md5-cache/sci-chemistry/sparky-3.115-r2
index a10b766b20f1..d39198a4f8b2 100644
--- a/metadata/md5-cache/sci-chemistry/sparky-3.115-r2
+++ b/metadata/md5-cache/sci-chemistry/sparky-3.115-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.cgl.ucsf.edu/home/sparky/distrib-3.115/sparky-source-3.115.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=602d930dbfabc45f0336eb464eeadbdb
diff --git a/metadata/md5-cache/sci-chemistry/viewmol-2.4.1-r3 b/metadata/md5-cache/sci-chemistry/viewmol-2.4.1-r3
index c6be45c14e0a..2ffa7f35bbdb 100644
--- a/metadata/md5-cache/sci-chemistry/viewmol-2.4.1-r3
+++ b/metadata/md5-cache/sci-chemistry/viewmol-2.4.1-r3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libpng:0= media-libs/tiff:0 virtual/glu virtual/opengl x11-li
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/viewmol/viewmol-2.4.1.src.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=5c16e9f922010a805910e336d46f96ba
diff --git a/metadata/md5-cache/sci-chemistry/vmd-1.9.2 b/metadata/md5-cache/sci-chemistry/vmd-1.9.2
index 6804858ee3b7..6481557ba772 100644
--- a/metadata/md5-cache/sci-chemistry/vmd-1.9.2
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=fetch
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/vmd-1.9.2-gentoo-patches.tar.xz vmd-1.9.2.src.tar.gz
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3b3602d69781423798c32266c3e13c12
diff --git a/metadata/md5-cache/sci-chemistry/vmd-1.9.3 b/metadata/md5-cache/sci-chemistry/vmd-1.9.3
index c013b20c14b4..62add31a9d58 100644
--- a/metadata/md5-cache/sci-chemistry/vmd-1.9.3
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=fetch
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/vmd-1.9.3-gentoo-patches.tar.xz vmd-1.9.3.src.tar
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d79e8d4e511d4caa002c923a4036b9ca
diff --git a/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r1 b/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r1
index 36548c01e454..94984a85425d 100644
--- a/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r1
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=fetch
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/vmd-1.9.3-gentoo-patches.tar.xz vmd-1.9.3.src.tar
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=31b621c2df338245164f87c909dae1df
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 20232f372b8b..1ddf07cceed6 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3 b/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3
deleted file mode 100644
index a8431ca840c9..000000000000
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/gjs-1.50.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10 >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection] dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A map application for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Maps
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/gjs-1.50.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10 >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-maps/3.30/gnome-maps-3.30.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cfc26f3890aefa0ce923dad72bffc575
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3.1 b/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3.1
index b89ea363261c..09e9d4bb6515 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3.1
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-3.30.3.1
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/gjs-1.50.0 >=dev-libs/gobject-introsp
 DESCRIPTION=A map application for GNOME
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Maps
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/gjs-1.50.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10 >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/3.30/gnome-maps-3.30.3.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11474ded3ddb2b349f38dbc819637901
+_md5_=994d021e31ae432de80216e97f5b8114
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
index 8a6506c4cc0e..a6ba2bb35bcd 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez ) dbus
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) ) qt5? ( cxx )
 SLOT=0/23
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa96f6b7adb25065e6295b892f4db307
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4
new file mode 100644
index 000000000000..448b4a5cb303
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare
+DEPEND=>=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig test? ( sys-devel/bc ) virtual/pkgconfig >=dev-util/scons-1.2.1[python_targets_python2_7]
+DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
+EAPI=5
+HOMEPAGE=http://catb.org/gpsd/
+IUSE=gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fury gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_geostar gpsd_protocols_gpsclock gpsd_protocols_isync gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea0183 gpsd_protocols_nmea2000 gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_passthrough gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_skytraq gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) ) qt5? ( cxx )
+SLOT=0/23
+SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5b20264b48c21a6f4abcd94ae0172f4c
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index bc8b48232e21..57ecb0f8d106 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/ntpsec net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) ) qt5? ( cxx )
 SLOT=0/23
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	3aabf18eba60687bbe6855eba271f688	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4eb2d61906ccfd365613af3cb4c0ccf8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-2	3aabf18eba60687bbe6855eba271f688	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5d5410adb5c007ab495eb033ccaf5603
diff --git a/metadata/md5-cache/sci-geosciences/libtcd-2.2.6 b/metadata/md5-cache/sci-geosciences/libtcd-2.2.6
deleted file mode 100644
index 958d951bcd5a..000000000000
--- a/metadata/md5-cache/sci-geosciences/libtcd-2.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sci-geosciences/harmonics-dwf-free-20120302
-DESCRIPTION=Library for reading and writing Tide Constituent Database (TCD) files
-EAPI=5
-HOMEPAGE=http://www.flaterco.com/xtide/libtcd.html
-IUSE=doc static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=>=sci-geosciences/harmonics-dwf-free-20120302
-SLOT=0/1
-SRC_URI=ftp://ftp.flaterco.com/xtide/libtcd-2.2.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd0ace21998385d01ad82942fd57a94b
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index d24d94187e2d..a2895898e1e9 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/hdf5-1.10.5 b/metadata/md5-cache/sci-libs/hdf5-1.10.5
index 25489ffcd7dd..dff2272bca21 100644
--- a/metadata/md5-cache/sci-libs/hdf5-1.10.5
+++ b/metadata/md5-cache/sci-libs/hdf5-1.10.5
@@ -11,5 +11,5 @@ RDEPEND=mpi? ( virtual/mpi[romio] ) szip? ( virtual/szip ) zlib? ( sys-libs/zlib
 REQUIRED_USE=cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran !hl )
 SLOT=0/1.10.5
 SRC_URI=http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/hdf5-1.10.5.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=30c4ad762172e3691864a28c8042f07b
diff --git a/metadata/md5-cache/sci-libs/indilib-1.7.5 b/metadata/md5-cache/sci-libs/indilib-1.7.5
index 7898fbfd67a1..4db220790b4c 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.7.5
+++ b/metadata/md5-cache/sci-libs/indilib-1.7.5
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/gsl:= sci-libs/libnova sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora )
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/indilib-1.7.5.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b099e185a344d408e7b1cf4fabceee6
diff --git a/metadata/md5-cache/sci-libs/keras-applications-1.0.8 b/metadata/md5-cache/sci-libs/keras-applications-1.0.8
new file mode 100644
index 000000000000..1f4668334bca
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/keras-applications-1.0.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Keras deep learning library reference implementations of deep learning models
+EAPI=6
+HOMEPAGE=https://keras.io/applications/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/keras-team/keras-applications/archive/1.0.8.tar.gz -> keras-applications-1.0.8.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6fccbe1ea9aa9f26692e6db6f383fbcf
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0
new file mode 100644
index 000000000000..7b0f655cca77
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Easy data preprocessing and data augmentation for deep learning models
+EAPI=6
+HOMEPAGE=https://keras.io/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/keras-team/keras-preprocessing/archive/1.1.0.tar.gz -> keras-preprocessing-1.1.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=da9e71bc6284de913668e41fe0b79e0c
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.1 b/metadata/md5-cache/sci-libs/libsigrok-0.5.1
index b3940e4eabda..ffed8bdedfb2 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.1
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( de
 REQUIRED_USE=java? ( cxx ) python? ( cxx ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b194e27a357290de9dc1cbbc01076a6a
diff --git a/metadata/md5-cache/sci-libs/libsigrok-9999 b/metadata/md5-cache/sci-libs/libsigrok-9999
index 2d69663e96fd..3e3c1e3f2a26 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-9999
+++ b/metadata/md5-cache/sci-libs/libsigrok-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygobject-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ruby? ( ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=java? ( cxx ) python? ( cxx || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) ruby? ( cxx || ( ruby_targets_ruby26 ruby_targets_ruby25 ruby_targets_ruby24 ) )
 SLOT=0/9999
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=604d2aadc1b2792a90e3c1a497101cb6
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.1.0 b/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
index f57a437ab511..0bf7ba6d6fc4 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:1
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.1.0.tar.gz firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=55404a37ba2eb82c03f47dd08c0b565a
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.2.0 b/metadata/md5-cache/sci-libs/linux-gpib-4.2.0
index 50623dc06521..88d51be28aff 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.2.0
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:1
 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=mirror://sourceforge/linux-gpib/linux-gpib-4.2.0.tar.gz firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=750b00841fc6af5d2fa826754106864c
diff --git a/metadata/md5-cache/sci-libs/rosetta-fragments-3.1-r1 b/metadata/md5-cache/sci-libs/rosetta-fragments-3.1-r1
index 8024fa1c4289..323664de9d71 100644
--- a/metadata/md5-cache/sci-libs/rosetta-fragments-3.1-r1
+++ b/metadata/md5-cache/sci-libs/rosetta-fragments-3.1-r1
@@ -8,5 +8,5 @@ RDEPEND=sci-biology/ncbi-tools sci-biology/update-blastdb sci-biology/psipred
 RESTRICT=fetch
 SLOT=0
 SRC_URI=rosetta3.1_fragments.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d6ac51319adcee915ddfc463249c238f
diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.15.0_rc0 b/metadata/md5-cache/sci-libs/tensorflow-1.15.0_rc0
new file mode 100644
index 000000000000..3f45f559abd0
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-1.15.0_rc0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip >=dev-libs/protobuf-3.6.0 dev-java/java-config dev-python/mock dev-lang/swig dev-python/cython || ( =dev-util/bazel-0.24* =dev-util/bazel-0.26* =dev-util/bazel-0.27* ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.1[profiler] ) !python? ( dev-lang/python ) python? ( >=dev-python/grpcio-tools-1.22.0 ) >=dev-util/bazel-0.20
+DEFINED_PHASES=compile configure install prepare pretend setup unpack
+DEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/icu >=dev-libs/jsoncpp-1.9 dev-libs/libpcre dev-libs/nsync dev-libs/openssl:0= >=dev-libs/protobuf-3.6.1:= >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.22.0 net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( >=dev-util/nvidia-cuda-toolkit-9.1[profiler] dev-libs/cudnn ) mpi? ( virtual/mpi ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/flatbuffers-1.8.0 dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/astor-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/gast[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.16[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/google-pasta[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/opt-einsum[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/grpcio-1.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wrapt-1.11.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-libs/keras-preprocessing-1.0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-visualization/tensorboard-1.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/mock
+DESCRIPTION=Computation framework using data flow graphs for scalable machine learning
+EAPI=7
+HOMEPAGE=https://www.tensorflow.org/
+IUSE=cuda mpi +python xla cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+PDEPEND=python? ( >=sci-libs/tensorflow-estimator-1.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/icu >=dev-libs/jsoncpp-1.9 dev-libs/libpcre dev-libs/nsync dev-libs/openssl:0= >=dev-libs/protobuf-3.6.1:= >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.22.0 net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2 cuda? ( >=dev-util/nvidia-cuda-toolkit-9.1[profiler] dev-libs/cudnn ) mpi? ( virtual/mpi ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-libs/flatbuffers-1.8.0 dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/astor-0.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/gast[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.16[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/google-pasta[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/opt-einsum[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/grpcio-1.22.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wrapt-1.11.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-libs/keras-preprocessing-1.0.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-visualization/tensorboard-1.15.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.15.0-rc0.tar.gz -> tensorflow-1.15.0_rc0.tar.gz http://www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz https://bitbucket.org/eigen/eigen/get/8071cda5714d.tar.gz -> eigen-8071cda5714d.tar.gz https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.11.1/rules_swift.0.11.1.tar.gz -> bazelbuild-rules_swift.0.11.1.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz https://github.com/llvm-mirror/llvm/archive/7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz -> llvm-7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
+_eclasses_=bazel	a0b1163178726619e8646179984e463d	check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=90b2aa7e33cf55255c84f74a60b79a53
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0 b/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0
new file mode 100644
index 000000000000..8d702e24fc09
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-java/java-config >=dev-util/bazel-0.20 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-libs/tensorflow[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=A high-level TensorFlow API that greatly simplifies machine learning programming
+EAPI=7
+HOMEPAGE=https://www.tensorflow.org/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=sci-libs/tensorflow[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/tensorflow/estimator/archive/v1.15.0.tar.gz -> tensorflow-estimator-1.15.0.tar.gz
+_eclasses_=bazel	a0b1163178726619e8646179984e463d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0cdd8849026f37b6217af87c7d805db4
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 935ab3305473..c172587a8d91 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/alt-ergo-1.30 b/metadata/md5-cache/sci-mathematics/alt-ergo-1.30
index 391a93447e35..278e9995e894 100644
--- a/metadata/md5-cache/sci-mathematics/alt-ergo-1.30
+++ b/metadata/md5-cache/sci-mathematics/alt-ergo-1.30
@@ -9,4 +9,4 @@ LICENSE=CeCILL-C
 RDEPEND=>=dev-lang/ocaml-3.12.1[ocamlopt?] dev-ml/zarith gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] ) dev-ml/camlzip <=dev-ml/ocplib-simplex-0.3
 SLOT=0
 SRC_URI=https://alt-ergo.ocamlpro.com/http/alt-ergo-1.30/alt-ergo-1.30.tar.gz
-_md5_=075ee495003ecdb5ac2fa616c2ff9819
+_md5_=d167e36408e397f7fe7c48b46d65059a
diff --git a/metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0 b/metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0
index 5b32f9e7a8cf..c1048c466b2f 100644
--- a/metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0
+++ b/metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0
@@ -9,4 +9,4 @@ LICENSE=CeCILL-C
 RDEPEND=>=dev-lang/ocaml-3.12.1[ocamlopt?] dev-ml/zarith gtk? ( >=dev-ml/lablgtk-2.14[sourceview,ocamlopt?] ) dev-ml/camlzip sci-mathematics/psmt2-frontend >=dev-ml/ocplib-simplex-0.4 >=dev-ml/menhir-20181006 dev-ml/dune
 SLOT=0
 SRC_URI=https://alt-ergo.ocamlpro.com/http/alt-ergo-2.3.0/alt-ergo-2.3.0.tar.gz
-_md5_=acc9a2063582911a9c9189b444b7bbfd
+_md5_=15e3288182e3ca23743385f4c20ab25a
diff --git a/metadata/md5-cache/sci-mathematics/e-1.5 b/metadata/md5-cache/sci-mathematics/e-1.5
deleted file mode 100644
index 3405e1da771f..000000000000
--- a/metadata/md5-cache/sci-mathematics/e-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=isabelle? ( >=sci-mathematics/isabelle-2011.1-r1:= )
-DESCRIPTION=E is a theorem prover for full first-order logic with equality
-EAPI=5
-HOMEPAGE=http://www4.informatik.tu-muenchen.de/~schulz/E/E.html
-IUSE=doc examples isabelle
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=isabelle? ( >=sci-mathematics/isabelle-2011.1-r1:= )
-SLOT=0/1.5
-SRC_URI=http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_1.5/E.tgz -> E-1.5.tgz
-_md5_=402a784f0a2afd3a70beea5802b2b523
diff --git a/metadata/md5-cache/sci-mathematics/e-1.6 b/metadata/md5-cache/sci-mathematics/e-1.6
deleted file mode 100644
index 71bd28b3795f..000000000000
--- a/metadata/md5-cache/sci-mathematics/e-1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=isabelle? ( >=sci-mathematics/isabelle-2011.1-r1:= )
-DESCRIPTION=E is a theorem prover for full first-order logic with equality
-EAPI=5
-HOMEPAGE=http://www4.informatik.tu-muenchen.de/~schulz/E/E.html
-IUSE=doc examples isabelle
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=isabelle? ( >=sci-mathematics/isabelle-2011.1-r1:= )
-SLOT=0/1.6
-SRC_URI=http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_1.6/E.tgz -> E-1.6.tgz
-_md5_=dd437b06ade967d474eba3890ca3df00
diff --git a/metadata/md5-cache/sci-mathematics/e-2.3 b/metadata/md5-cache/sci-mathematics/e-2.3
new file mode 100644
index 000000000000..971fe28c9cf6
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/e-2.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=doc? ( dev-texlive/texlive-latex )
+DESCRIPTION=E is a theorem prover for full first-order logic with equality
+EAPI=7
+HOMEPAGE=https://wwwlehre.dhbw-stuttgart.de/~sschulz/E/E.html
+IUSE=doc examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0/2.3
+SRC_URI=http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_2.3/E.tgz -> E-2.3.tgz
+_md5_=0c7ea47c3fc08ba2d5f2ca8f6557c836
diff --git a/metadata/md5-cache/sci-mathematics/singular-3.1.6 b/metadata/md5-cache/sci-mathematics/singular-3.1.6
index ec2f7bdfc2a6..ca3592e9c89e 100644
--- a/metadata/md5-cache/sci-mathematics/singular-3.1.6
+++ b/metadata/md5-cache/sci-mathematics/singular-3.1.6
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-6/Singular-3-1-6.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-6/Singular-3-1-6-share.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6bd74ed38ee494dde93bc4b2794bcf5f
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.0.2 b/metadata/md5-cache/sci-mathematics/singular-4.0.2
index 3ccd61665af6..e6fb71fd54c0 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.0.2
+++ b/metadata/md5-cache/sci-mathematics/singular-4.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0 >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) sci-mathematics/flint sci-mathematics/4ti2 sci-libs/cddlib
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2-share.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f548d2bebbeef8372909890e5eeec96d
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.0.3 b/metadata/md5-cache/sci-mathematics/singular-4.0.3
index eb4553235289..836d842ffe2e 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.0.3
+++ b/metadata/md5-cache/sci-mathematics/singular-4.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0 >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) sci-mathematics/flint sci-mathematics/4ti2 sci-libs/cddlib
 SLOT=0
 SRC_URI=http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-3/singular-4.0.3.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-3/singular-4.0.3-share.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=10523ef794486fef6a7ee94113c47e16
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.5 b/metadata/md5-cache/sci-mathematics/z3-4.8.5
index 898914a75eff..a05428b83b67 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.5
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.5
@@ -4,11 +4,11 @@ DESCRIPTION=An efficient theorem prover
 EAPI=6
 HOMEPAGE=https://github.com/Z3Prover/z3/
 IUSE=doc examples gmp isabelle java openmp python 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_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc64 x86
 LICENSE=MIT
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gmp? ( dev-libs/gmp: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(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 SLOT=0/4.8
 SRC_URI=https://github.com/Z3Prover/z3/archive/Z3-4.8.5.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce3a2ce931ec9a1935234563ca41fcf1
+_md5_=daeffb83da397c13cb9e3529e0eedec1
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index dd082f14550d..cad838d09226 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.12.06-r11 b/metadata/md5-cache/sci-physics/root-6.12.06-r11
index 4226c2a70a03..f9053aeb080a 100644
--- a/metadata/md5-cache/sci-physics/root-6.12.06-r11
+++ b/metadata/md5-cache/sci-physics/root-6.12.06-r11
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/l
 REQUIRED_USE=!X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) qt5? ( root7 ) tmva? ( gsl )
 SLOT=6.12/06
 SRC_URI=https://root.cern/download/root_v6.12.06.source.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3ee6c778976cb0256f1f4e42d95254f
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 becb67b04152..9f7e6685a439 100644
--- a/metadata/md5-cache/sci-physics/root-6.14.08-r4
+++ b/metadata/md5-cache/sci-physics/root-6.14.08-r4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/l
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
 SLOT=6.14/08
 SRC_URI=https://root.cern/download/root_v6.14.08.source.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e697a3c88d7d16a9cf35b0776345e6cf
diff --git a/metadata/md5-cache/sci-physics/root-6.16.00-r3 b/metadata/md5-cache/sci-physics/root-6.16.00-r3
deleted file mode 100644
index 26ddcabf0530..000000000000
--- a/metadata/md5-cache/sci-physics/root-6.16.00-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
-DESCRIPTION=C++ data analysis framework and interpreter from CERN
-EAPI=6
-HOMEPAGE=https://root.cern
-IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
-RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) xinetd? ( sys-apps/xinetd ) fortran? ( virtual/fortran )
-REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
-SLOT=6.16/00
-SRC_URI=https://root.cern/download/root_v6.16.00.source.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e16c6b6d609207d40e9e4081ed195ce
diff --git a/metadata/md5-cache/sci-physics/root-6.16.00-r4 b/metadata/md5-cache/sci-physics/root-6.16.00-r4
new file mode 100644
index 000000000000..057fa0e3ed6f
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/root-6.16.00-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
+DESCRIPTION=C++ data analysis framework and interpreter from CERN
+EAPI=6
+HOMEPAGE=https://root.cern
+IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
+RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) xinetd? ( sys-apps/xinetd ) fortran? ( virtual/fortran )
+REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
+SLOT=6.16/00
+SRC_URI=https://root.cern/download/root_v6.16.00.source.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cb60a57008fd1607ce4fc2dd26068ef6
diff --git a/metadata/md5-cache/sci-physics/root-6.18.00-r2 b/metadata/md5-cache/sci-physics/root-6.18.00-r2
deleted file mode 100644
index 3b88185f80cf..000000000000
--- a/metadata/md5-cache/sci-physics/root-6.18.00-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
-DESCRIPTION=C++ data analysis framework and interpreter from CERN
-EAPI=6
-HOMEPAGE=https://root.cern
-IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +threads +tiff +tmva +unuran vc +vmc +xml xrootd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
-RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
-REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
-SLOT=6.18/00
-SRC_URI=https://root.cern/download/root_v6.18.00.source.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99a3aa10c5d75d23b346ec6503404b89
diff --git a/metadata/md5-cache/sci-physics/root-6.18.02 b/metadata/md5-cache/sci-physics/root-6.18.02
new file mode 100644
index 000000000000..f3db5f536d85
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/root-6.18.02
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
+DESCRIPTION=C++ data analysis framework and interpreter from CERN
+EAPI=6
+HOMEPAGE=https://root.cern
+IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +threads +tiff +tmva +unuran vc +vmc +xml xrootd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
+RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
+REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
+SLOT=6.18/02
+SRC_URI=https://root.cern/download/root_v6.18.02.source.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b19c4b15ae83c4b2eb1e7db246c146a7
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index 613b780c134f..2686332b4e78 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
 EAPI=6
 HOMEPAGE=https://root.cern
 IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc vmc +xml xrootd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 PROPERTIES=live
-RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
+RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3 dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXpm:0 opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebengine:5[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6 ) pythia8? ( sci-physics/pythia:8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
 SLOT=0
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c62f060ea441b514c0637fdc27943dd
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=605c1382adae81c312f452ba2001e31a
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 6eefbef04942..2694438be862 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/tensorboard-1.15.0 b/metadata/md5-cache/sci-visualization/tensorboard-1.15.0
new file mode 100644
index 000000000000..d787f030b528
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/tensorboard-1.15.0
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=install prepare
+DESCRIPTION=TensorFlow's Visualization Toolkit
+EAPI=7
+HOMEPAGE=https://www.tensorflow.org/
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+PDEPEND=sci-libs/tensorflow[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/bleach[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/grpcio[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-41[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/werkzeug[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/py3/t/tensorboard/tensorboard-1.15.0-py3-none-any.whl -> tensorboard-1.15.0.zip
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=58ca0c01fbe506f87ad6614fd5045eba
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index c7b4452de01e..fe0975f0592b 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/baselayout-2.4.1-r2 b/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
index d98711590e64..356d08bedee3 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
+++ b/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh spa
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.4.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=490ed1106493276135183f95fc996a0d
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.6-r1 b/metadata/md5-cache/sys-apps/baselayout-2.6-r1
index 023362a90055..e1787db51ee4 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.6-r1
+++ b/metadata/md5-cache/sys-apps/baselayout-2.6-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.6.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2346504dab28844a422f2909d2b7e42b
diff --git a/metadata/md5-cache/sys-apps/baselayout-9999 b/metadata/md5-cache/sys-apps/baselayout-9999
index bff4b308bd49..ce3393335b59 100644
--- a/metadata/md5-cache/sys-apps/baselayout-9999
+++ b/metadata/md5-cache/sys-apps/baselayout-9999
@@ -7,5 +7,5 @@ IUSE=build kernel_FreeBSD kernel_linux +split-usr
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6ce2eb58868db4d15586acad84f039b6
diff --git a/metadata/md5-cache/sys-apps/biosdevname-0.7.2 b/metadata/md5-cache/sys-apps/biosdevname-0.7.2
index e6e6b825c947..9df2b81f09e9 100644
--- a/metadata/md5-cache/sys-apps/biosdevname-0.7.2
+++ b/metadata/md5-cache/sys-apps/biosdevname-0.7.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=http://linux.dell.com/biosdevname/biosdevname-0.7.2/biosdevname-0.7.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=7efc4fd7f204fed432f186ca68c360ab
diff --git a/metadata/md5-cache/sys-apps/biosdevname-0.7.3 b/metadata/md5-cache/sys-apps/biosdevname-0.7.3
index 8f995916697c..06a3d0d44d86 100644
--- a/metadata/md5-cache/sys-apps/biosdevname-0.7.3
+++ b/metadata/md5-cache/sys-apps/biosdevname-0.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=https://github.com/dell/biosdevname/archive/v0.7.3.tar.gz -> biosdevname-0.7.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=ee6e43d020cc6879311f0e7b01bfdd13
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.8.6.2 b/metadata/md5-cache/sys-apps/debianutils-4.8.6.2
deleted file mode 100644
index 5877e4fd2e70..000000000000
--- a/metadata/md5-cache/sys-apps/debianutils-4.8.6.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=A selection of tools from Debian
-EAPI=7
-HOMEPAGE=https://packages.qa.debian.org/d/debianutils.html
-IUSE=+installkernel static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
-LICENSE=BSD GPL-2 SMAIL
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.8.6.2.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e22d012ecba769a549795bfb9e672d2e
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.9 b/metadata/md5-cache/sys-apps/debianutils-4.9
new file mode 100644
index 000000000000..ed39c7726cf0
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/debianutils-4.9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=A selection of tools from Debian
+EAPI=7
+HOMEPAGE=https://packages.qa.debian.org/d/debianutils.html
+IUSE=+installkernel static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=BSD GPL-2 SMAIL
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.9.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e22d012ecba769a549795bfb9e672d2e
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.6 b/metadata/md5-cache/sys-apps/etckeeper-1.18.6
index c12826456252..e6bf75ba4b98 100644
--- a/metadata/md5-cache/sys-apps/etckeeper-1.18.6
+++ b/metadata/md5-cache/sys-apps/etckeeper-1.18.6
@@ -10,5 +10,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) app-portage/portage-utils cron? ( virtual/cron )
 REQUIRED_USE=bazaar? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=https://github.com/joeyh/etckeeper/archive/1.18.6.tar.gz -> etckeeper-1.18.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5fec74fb4a4995fafa4f72132d2f12c8
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.6-r1 b/metadata/md5-cache/sys-apps/etckeeper-1.18.6-r1
deleted file mode 100644
index d607d16c9994..000000000000
--- a/metadata/md5-cache/sys-apps/etckeeper-1.18.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=bazaar? ( dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=A collection of tools to let /etc be stored in a repository
-EAPI=6
-HOMEPAGE=https://etckeeper.branchable.com/
-IUSE=bazaar cron python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=bazaar? ( dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-portage/portage-utils cron? ( virtual/cron ) bazaar? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !bazaar? ( || ( dev-vcs/git dev-vcs/mercurial dev-vcs/darcs ) )
-REQUIRED_USE=bazaar? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-1.18.6.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=a8cc79b38ced3a856f8fb853ce41f7ca
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.7 b/metadata/md5-cache/sys-apps/etckeeper-1.18.7
deleted file mode 100644
index 6c5c2cf49f59..000000000000
--- a/metadata/md5-cache/sys-apps/etckeeper-1.18.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=bazaar? ( dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-util/bats )
-DESCRIPTION=A collection of tools to let /etc be stored in a repository
-EAPI=6
-HOMEPAGE=https://etckeeper.branchable.com/
-IUSE=bazaar cron test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=bazaar? ( dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-portage/portage-utils cron? ( virtual/cron ) bazaar? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !bazaar? ( || ( dev-vcs/git dev-vcs/mercurial dev-vcs/darcs ) )
-REQUIRED_USE=bazaar? ( || ( python_targets_python2_7 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-1.18.7.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=59cace3217701a2452b8a3b2cab27719
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.8 b/metadata/md5-cache/sys-apps/etckeeper-1.18.8
index a0042f9f1b87..935af0d81ee8 100644
--- a/metadata/md5-cache/sys-apps/etckeeper-1.18.8
+++ b/metadata/md5-cache/sys-apps/etckeeper-1.18.8
@@ -11,5 +11,5 @@ REQUIRED_USE=bazaar? ( || ( python_targets_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-1.18.8.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=fc79107540c5e19d944759e78b76752c
diff --git a/metadata/md5-cache/sys-apps/frandom-1.1 b/metadata/md5-cache/sys-apps/frandom-1.1
index efd975d2b039..a11899fff55a 100644
--- a/metadata/md5-cache/sys-apps/frandom-1.1
+++ b/metadata/md5-cache/sys-apps/frandom-1.1
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/frandom//frandom-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=de0d164228bb386ad341920090146e2f
diff --git a/metadata/md5-cache/sys-apps/fwts-15.12.00 b/metadata/md5-cache/sys-apps/fwts-15.12.00
deleted file mode 100644
index 7dd1c1616dd5..000000000000
--- a/metadata/md5-cache/sys-apps/fwts-15.12.00
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/json-c-0.10-r1 dev-libs/glib:2 dev-libs/libpcre sys-apps/pciutils sys-power/iasl sys-power/pmtools sys-apps/dmidecode sys-devel/libtool >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Firmware Test Suite
-EAPI=5
-HOMEPAGE=https://wiki.ubuntu.com/Kernel/Reference/fwts
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/json-c-0.10-r1 dev-libs/glib:2 dev-libs/libpcre sys-apps/pciutils sys-power/iasl sys-power/pmtools sys-apps/dmidecode
-SLOT=0
-SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/fwts_15.12.00.orig.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d8d50c0af60f618760db2f532db81440
diff --git a/metadata/md5-cache/sys-apps/gradm-3.1.201603152148 b/metadata/md5-cache/sys-apps/gradm-3.1.201603152148
index 1c51d5f5db7d..c3ef470813a1 100644
--- a/metadata/md5-cache/sys-apps/gradm-3.1.201603152148
+++ b/metadata/md5-cache/sys-apps/gradm-3.1.201603152148
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-3.1-201603152148.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e1d89e233f61db45dd5b1983832c37e1
diff --git a/metadata/md5-cache/sys-apps/gradm-3.1.201607172312 b/metadata/md5-cache/sys-apps/gradm-3.1.201607172312
index 429918722b80..7c756b7e780f 100644
--- a/metadata/md5-cache/sys-apps/gradm-3.1.201607172312
+++ b/metadata/md5-cache/sys-apps/gradm-3.1.201607172312
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-3.1-201607172312.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e1d89e233f61db45dd5b1983832c37e1
diff --git a/metadata/md5-cache/sys-apps/gradm-3.1.201608131257 b/metadata/md5-cache/sys-apps/gradm-3.1.201608131257
index ef5205a512aa..7fb97e16d629 100644
--- a/metadata/md5-cache/sys-apps/gradm-3.1.201608131257
+++ b/metadata/md5-cache/sys-apps/gradm-3.1.201608131257
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-3.1-201608131257.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=791dd913aacbf02e76e37cf68a4adc44
diff --git a/metadata/md5-cache/sys-apps/gradm-3.1.201708012022 b/metadata/md5-cache/sys-apps/gradm-3.1.201708012022
index e43b3bba2cf1..fd4353ff1110 100644
--- a/metadata/md5-cache/sys-apps/gradm-3.1.201708012022
+++ b/metadata/md5-cache/sys-apps/gradm-3.1.201708012022
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/hardened-sources/gradm/gradm-3.1-201708012022.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=791dd913aacbf02e76e37cf68a4adc44
diff --git a/metadata/md5-cache/sys-apps/help2man-1.47.10 b/metadata/md5-cache/sys-apps/help2man-1.47.10
index 8ec03b18313c..f0cc79f9e15a 100644
--- a/metadata/md5-cache/sys-apps/help2man-1.47.10
+++ b/metadata/md5-cache/sys-apps/help2man-1.47.10
@@ -4,9 +4,9 @@ DESCRIPTION=GNU utility to convert program --help output to a man page
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/help2man/
 IUSE=nls
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl nls? ( dev-perl/Locale-gettext )
 SLOT=0
 SRC_URI=mirror://gnu/help2man/help2man-1.47.10.tar.xz
-_md5_=5c14f7d7088d48d50956a4823800f73e
+_md5_=772ecc32b4440640b97872ec9cbd74e7
diff --git a/metadata/md5-cache/sys-apps/hwids-20171003 b/metadata/md5-cache/sys-apps/hwids-20171003
index 34cc0230ad8d..529db3e7147b 100644
--- a/metadata/md5-cache/sys-apps/hwids-20171003
+++ b/metadata/md5-cache/sys-apps/hwids-20171003
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20171003.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=df494eff216aa85c8583105943cc0ff5
diff --git a/metadata/md5-cache/sys-apps/hwids-20180917 b/metadata/md5-cache/sys-apps/hwids-20180917
index d7c87ac62bd4..719daad858ab 100644
--- a/metadata/md5-cache/sys-apps/hwids-20180917
+++ b/metadata/md5-cache/sys-apps/hwids-20180917
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20180917.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=facb1376e9052c835a3704ffab6a0f66
diff --git a/metadata/md5-cache/sys-apps/hwids-20190316 b/metadata/md5-cache/sys-apps/hwids-20190316
index 125fce156d05..a4a5f8df0678 100644
--- a/metadata/md5-cache/sys-apps/hwids-20190316
+++ b/metadata/md5-cache/sys-apps/hwids-20190316
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20190316.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=63e70b04f0706759f6eacb9c987fe5ef
diff --git a/metadata/md5-cache/sys-apps/hwids-20190818 b/metadata/md5-cache/sys-apps/hwids-20190818
index 8c74c11b528a..6a3503722f6f 100644
--- a/metadata/md5-cache/sys-apps/hwids-20190818
+++ b/metadata/md5-cache/sys-apps/hwids-20190818
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD ) public-domain
 RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
 SRC_URI=https://github.com/gentoo/hwids/archive/hwids-20190818.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=4553db22507b51c4df84731b763797f4
diff --git a/metadata/md5-cache/sys-apps/hwids-99999999 b/metadata/md5-cache/sys-apps/hwids-99999999
index 9074c1032a31..b5ee9f621efd 100644
--- a/metadata/md5-cache/sys-apps/hwids-99999999
+++ b/metadata/md5-cache/sys-apps/hwids-99999999
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD ) public-domain
 PROPERTIES=live
 RDEPEND=udev? ( virtual/udev ) !<sys-apps/pciutils-3.1.9-r2 !<sys-apps/usbutils-005-r1
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=4553db22507b51c4df84731b763797f4
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.0 b/metadata/md5-cache/sys-apps/i2c-tools-4.0
index b2dca9275f87..abebbfb37c81 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.0
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!<sys-apps/lm_sensors-3 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DEPEND=!<sys-apps/lm-sensors-3 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
 DESCRIPTION=I2C tools for bus probing, chip dumping, EEPROM decoding, and more
 EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/software/utils/i2c-tools
 IUSE=python python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
-RDEPEND=!<sys-apps/lm_sensors-3 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+RDEPEND=!<sys-apps/lm-sensors-3 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4dbb30afa32f5c4eb6ae35b0f468540
+_md5_=9df0697d44a628374ca4d99b4d7b6399
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1 b/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
index 0152e2c58927..9d306e1dc667 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=!<sys-apps/lm_sensors-3 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=!<sys-apps/lm-sensors-3 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=I2C tools for bus probing, chip dumping, EEPROM decoding, and more
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/software/utils/i2c-tools
 IUSE=perl python static-libs python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=!<sys-apps/lm_sensors-3 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) perl? ( dev-lang/perl )
+RDEPEND=!<sys-apps/lm-sensors-3 python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) perl? ( dev-lang/perl )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.1.tar.xz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6a05a1b9cf552473f5dfa246073c4781
+_md5_=f1cb36033aae3257207ecbc7d398b829
diff --git a/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.8 b/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.8
deleted file mode 100644
index 4859b4b94b93..000000000000
--- a/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=sys-devel/gcc-4:* sys-apps/sed filecaps? ( sys-libs/libcap )
-DESCRIPTION=Intel Performance Counter Monitor - A better way to measure CPU utilization
-EAPI=5
-HOMEPAGE=https://software.intel.com/en-us/articles/intel-performance-counter-monitor-a-better-way-to-measure-cpu-utilization
-IUSE=+filecaps
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=sys-devel/gcc-4:*
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dlan/distfiles/IntelPerformanceCounterMonitorV2.8.zip
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	fcaps	9445d60c1eb084a91c38ef4c070b2f16	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=93c64741a5d4e3d9623a3bc30d972a5c
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.6.1 b/metadata/md5-cache/sys-apps/keyutils-1.6.1
index ac5f64c18c27..4965be6d020c 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.6.1
+++ b/metadata/md5-cache/sys-apps/keyutils-1.6.1
@@ -4,9 +4,9 @@ DESCRIPTION=Linux Key Management Utilities
 EAPI=7
 HOMEPAGE=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git
 IUSE=static static-libs test kernel_linux 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 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 SLOT=0/1.9
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-1.6.1.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=e79eb2dd5c7c7b1bbd3f7ca24a3d2017
+_md5_=c87871648eb9d52e82084dca352011c7
diff --git a/metadata/md5-cache/sys-apps/lm-sensors-3.5.0 b/metadata/md5-cache/sys-apps/lm-sensors-3.5.0
new file mode 100644
index 000000000000..a9adce7074d0
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/lm-sensors-3.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) sys-devel/bison sys-devel/flex virtual/pkgconfig
+DESCRIPTION=Hardware Monitoring user-space utilities
+EAPI=6
+HOMEPAGE=https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors
+IUSE=contrib sensord static-libs kernel_linux 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 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1
+RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.21.7
+SLOT=0/5.0.0
+SRC_URI=https://github.com/lm-sensors/lm-sensors/archive/V3-5-0.tar.gz -> lm-sensors-3.5.0.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e2076b0e93820700570e72f16be29f5e
diff --git a/metadata/md5-cache/sys-apps/lm-sensors-3.5.0_p20190505 b/metadata/md5-cache/sys-apps/lm-sensors-3.5.0_p20190505
new file mode 100644
index 000000000000..bf0894dcd78e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/lm-sensors-3.5.0_p20190505
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) sys-devel/bison sys-devel/flex
+DESCRIPTION=Hardware Monitoring user-space utilities
+EAPI=7
+HOMEPAGE=https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors
+IUSE=contrib sensord static-libs kernel_linux 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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1
+RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.36
+SLOT=0/5.0.0
+SRC_URI=https://github.com/lm-sensors/lm-sensors/archive/2c8cca3d6cd60121b401734c1a24cfec7daed4fc.tar.gz -> lm-sensors-3.5.0_p20190505.tar.gz
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=38007c55f570c163d6be30e3504c0e0f
diff --git a/metadata/md5-cache/sys-apps/lm_sensors-3.5.0 b/metadata/md5-cache/sys-apps/lm_sensors-3.5.0
deleted file mode 100644
index acb8b1aa3d8b..000000000000
--- a/metadata/md5-cache/sys-apps/lm_sensors-3.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) sys-devel/bison sys-devel/flex virtual/pkgconfig
-DESCRIPTION=Hardware Monitoring user-space utilities
-EAPI=6
-HOMEPAGE=https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors
-IUSE=contrib sensord static-libs kernel_linux 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 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1
-RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.21.7
-SLOT=0/5.0.0
-SRC_URI=https://github.com/lm-sensors/lm-sensors/archive/V3-5-0.tar.gz -> lm_sensors-3.5.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4a910c194907ee6c7efe3c907dcd3de0
diff --git a/metadata/md5-cache/sys-apps/lm_sensors-3.5.0_p20190505 b/metadata/md5-cache/sys-apps/lm_sensors-3.5.0_p20190505
deleted file mode 100644
index 64c269baaa12..000000000000
--- a/metadata/md5-cache/sys-apps/lm_sensors-3.5.0_p20190505
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) sys-devel/bison sys-devel/flex
-DESCRIPTION=Hardware Monitoring user-space utilities
-EAPI=7
-HOMEPAGE=https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors
-IUSE=contrib sensord static-libs kernel_linux 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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1
-RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-apps/openrc-0.36
-SLOT=0/5.0.0
-SRC_URI=https://github.com/lm-sensors/lm-sensors/archive/2c8cca3d6cd60121b401734c1a24cfec7daed4fc.tar.gz -> lm_sensors-3.5.0_p20190505.tar.gz
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d75bd12ced85fbe552d53d560fbb6142
diff --git a/metadata/md5-cache/sys-apps/logwatch-7.5.1 b/metadata/md5-cache/sys-apps/logwatch-7.5.1
index f5fdcba1de49..46469d001f2b 100644
--- a/metadata/md5-cache/sys-apps/logwatch-7.5.1
+++ b/metadata/md5-cache/sys-apps/logwatch-7.5.1
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://sourceforge/logwatch/logwatch-7.5.1/logwatch-7.5.1.tar.gz
-_eclasses_=tmpfiles	96a7c72c5b059d0b75854baf84950ce3
+_eclasses_=tmpfiles	6170dc7770585fb3f16efdee789a3218
 _md5_=388ce0b91caa719fb68410827e6a8f40
diff --git a/metadata/md5-cache/sys-apps/logwatch-7.5.2 b/metadata/md5-cache/sys-apps/logwatch-7.5.2
index 9a8837cffa0e..a8300babfa00 100644
--- a/metadata/md5-cache/sys-apps/logwatch-7.5.2
+++ b/metadata/md5-cache/sys-apps/logwatch-7.5.2
@@ -7,5 +7,5 @@ LICENSE=MIT
 RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://sourceforge/logwatch/logwatch-7.5.2/logwatch-7.5.2.tar.gz
-_eclasses_=tmpfiles	96a7c72c5b059d0b75854baf84950ce3
+_eclasses_=tmpfiles	6170dc7770585fb3f16efdee789a3218
 _md5_=6230ada55b856c567ffc2b68fa0655f0
diff --git a/metadata/md5-cache/sys-apps/logwatch-9999 b/metadata/md5-cache/sys-apps/logwatch-9999
index f0b4d6741263..ec40df3aae4e 100644
--- a/metadata/md5-cache/sys-apps/logwatch-9999
+++ b/metadata/md5-cache/sys-apps/logwatch-9999
@@ -7,5 +7,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo virtual/tmpfiles
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	tmpfiles	96a7c72c5b059d0b75854baf84950ce3
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	tmpfiles	6170dc7770585fb3f16efdee789a3218
 _md5_=6230ada55b856c567ffc2b68fa0655f0
diff --git a/metadata/md5-cache/sys-apps/lomoco-1.0-r9 b/metadata/md5-cache/sys-apps/lomoco-1.0-r9
index bda3111613d2..2d88a5811bc2 100644
--- a/metadata/md5-cache/sys-apps/lomoco-1.0-r9
+++ b/metadata/md5-cache/sys-apps/lomoco-1.0-r9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0
 SLOT=0
 SRC_URI=http://www.lomoco.org/lomoco-1.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=305bb90aebed04283926571fb8802a50
diff --git a/metadata/md5-cache/sys-apps/lsb-release-1.4-r3 b/metadata/md5-cache/sys-apps/lsb-release-1.4-r3
index bf7e5f1628ca..6d0ace36594d 100644
--- a/metadata/md5-cache/sys-apps/lsb-release-1.4-r3
+++ b/metadata/md5-cache/sys-apps/lsb-release-1.4-r3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x8
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/lsb/lsb-release-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=62fc3ccf4d683149d4b269ee312cf3b6
diff --git a/metadata/md5-cache/sys-apps/man-1.6g-r1 b/metadata/md5-cache/sys-apps/man-1.6g-r1
index a51b7a3313ab..ee750a62f1f6 100644
--- a/metadata/md5-cache/sys-apps/man-1.6g-r1
+++ b/metadata/md5-cache/sys-apps/man-1.6g-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/groff-1.19.2-r1 !sys-apps/man-db !<app-arch/lzma-4.63 lzma? ( app-arch/xz-utils ) selinux? ( sec-policy/selinux-makewhatis )
 SLOT=0
 SRC_URI=http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7612139a4035fe81873a1a3e9d798454
diff --git a/metadata/md5-cache/sys-apps/nvme-cli-1.9 b/metadata/md5-cache/sys-apps/nvme-cli-1.9
new file mode 100644
index 000000000000..bd3ef28df263
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/nvme-cli-1.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=uuid? ( sys-apps/util-linux:= )
+DESCRIPTION=NVM-Express user space tooling for Linux
+EAPI=7
+HOMEPAGE=https://github.com/linux-nvme/nvme-cli
+IUSE=+uuid
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=uuid? ( sys-apps/util-linux:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linux-nvme/nvme-cli/archive/v1.9.tar.gz -> nvme-cli-1.9.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=6eddcd34009d03539840727231aa26df
diff --git a/metadata/md5-cache/sys-apps/onerng-3.6-r2 b/metadata/md5-cache/sys-apps/onerng-3.6-r2
index 2a6f485affd7..585294140650 100644
--- a/metadata/md5-cache/sys-apps/onerng-3.6-r2
+++ b/metadata/md5-cache/sys-apps/onerng-3.6-r2
@@ -11,5 +11,5 @@ RDEPEND=virtual/udev python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/OneRNG/onerng.github.io/raw/master/sw/onerng_3.6.orig.tar.gz -> onerng-3.6.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=6fab70d3ad018001820b2dcdf8fc8f0d
diff --git a/metadata/md5-cache/sys-apps/opentmpfiles-0.1.3-r1 b/metadata/md5-cache/sys-apps/opentmpfiles-0.1.3-r1
index d2f4455b00d8..fcd3dc9af7c0 100644
--- a/metadata/md5-cache/sys-apps/opentmpfiles-0.1.3-r1
+++ b/metadata/md5-cache/sys-apps/opentmpfiles-0.1.3-r1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=!<sys-apps/openrc-0.23 selinux? ( sec-policy/selinux-base-policy )
 SLOT=0
 SRC_URI=https://github.com/openrc/opentmpfiles/archive/0.1.3.tar.gz -> opentmpfiles-0.1.3.tar.gz
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=cfa7f1339fcb59bba27eb0e173deb377
diff --git a/metadata/md5-cache/sys-apps/opentmpfiles-0.2 b/metadata/md5-cache/sys-apps/opentmpfiles-0.2
index c9e6003ca81e..4bb047e42658 100644
--- a/metadata/md5-cache/sys-apps/opentmpfiles-0.2
+++ b/metadata/md5-cache/sys-apps/opentmpfiles-0.2
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=!<sys-apps/openrc-0.23 selinux? ( sec-policy/selinux-base-policy )
 SLOT=0
 SRC_URI=https://github.com/openrc/opentmpfiles/archive/0.2.tar.gz -> opentmpfiles-0.2.tar.gz
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=7fde13c58766a935f62b32dffdb78d9d
diff --git a/metadata/md5-cache/sys-apps/opentmpfiles-9999 b/metadata/md5-cache/sys-apps/opentmpfiles-9999
index 126b06a8cd4e..8e37c251b7fd 100644
--- a/metadata/md5-cache/sys-apps/opentmpfiles-9999
+++ b/metadata/md5-cache/sys-apps/opentmpfiles-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 PROPERTIES=live
 RDEPEND=!<sys-apps/openrc-0.23 selinux? ( sec-policy/selinux-base-policy )
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=115a6f8795524bad88dca31b701134f3
diff --git a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1 b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
index 844ede9e8401..3bfa75475671 100644
--- a/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
+++ b/metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/modutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pcmciautils/pcmciautils_018.orig.tar.gz mirror://debian/pool/main/p/pcmciautils/pcmciautils_018-8.debian.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c7c54118ec30b09fb1266d3f8b968747
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.24 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.24
index 8b1f8cf0174e..e7f65bb56dfb 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.24
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.24
@@ -11,5 +11,5 @@ RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-a
 REQUIRED_USE=^^ ( udev libusb ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://pcsclite.apdu.fr/files/pcsc-lite-1.8.24.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=66ac5da61f512589280a5e18305e6a00
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.25 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.25
index 6ac4caccf26e..6aed6f2371a8 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.25
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.25
@@ -11,5 +11,5 @@ RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-a
 REQUIRED_USE=^^ ( udev libusb ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://pcsclite.apdu.fr/files/pcsc-lite-1.8.25.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=046182eb96dcc09c37dfdedf75197546
diff --git a/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r5 b/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r5
index 7d96dbef5fef..c7f8c120ac3a 100644
--- a/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r5
+++ b/metadata/md5-cache/sys-apps/pmount-0.9.99_alpha-r5
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=>=sys-apps/util-linux-2.17.2 crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 ) dev-util/intltool sys-devel/gettext
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acct-group/plugdev >=sys-apps/util-linux-2.17.2 crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 ) dev-util/intltool sys-devel/gettext
 DESCRIPTION=Policy based mounter that gives the ability to mount removable devices as a user
 EAPI=5
 HOMEPAGE=https://launchpad.net/pmount
 IUSE=crypt
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86
 LICENSE=GPL-2
-RDEPEND=>=sys-apps/util-linux-2.17.2 crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )
+RDEPEND=acct-group/plugdev >=sys-apps/util-linux-2.17.2 crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/pmount/pmount_0.9.99-alpha.orig.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aed535c9826a6a47eb1f89f5755ef6fd
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f21804921811b10b216fc212f188b0ce
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.66-r1 b/metadata/md5-cache/sys-apps/portage-2.3.66-r1
index cefda052f7ae..17906c912de9 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.66-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.66-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.66.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.66.tar.bz2 https://github.com/gentoo/portage/commit/fbebef9677d63db70f1c68b197e58b041ec6ac61.patch -> repoman-bug-685482-fbebef9677d6.patch
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=09dc722b6c9f2571ca3119a12bcbffd5
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.69 b/metadata/md5-cache/sys-apps/portage-2.3.69
index d11b9a9892cf..dc76fc0e9c6b 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.69
+++ b/metadata/md5-cache/sys-apps/portage-2.3.69
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.69.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.69.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16e05463f7117915eb20a014b9442c1d
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.75-r1 b/metadata/md5-cache/sys-apps/portage-2.3.75-r1
index cc81850960bb..4179b07c6549 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.75-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.75-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.75.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.75.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2edc3582ce6cf9ddbc574d76222b6423
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.76 b/metadata/md5-cache/sys-apps/portage-2.3.76
new file mode 100644
index 000000000000..9ecde7342f51
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.76
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.76.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.76.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4d3d6d03fbb671021f77083da1c14b45
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index c9d5ac61c707..339a3fc26d40 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dbad5284447f4e365f0681ec95168164
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.39-r1 b/metadata/md5-cache/sys-apps/razercfg-0.39-r1
index cf7efd392298..6d3e654a836d 100644
--- a/metadata/md5-cache/sys-apps/razercfg-0.39-r1
+++ b/metadata/md5-cache/sys-apps/razercfg-0.39-r1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://bues.ch/razercfg/razercfg-0.39.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15613f09c32f6b551e9c736b817810e1
diff --git a/metadata/md5-cache/sys-apps/roccat-tools-5.7.0 b/metadata/md5-cache/sys-apps/roccat-tools-5.7.0
index e74d76920418..e6bd41d63d6b 100644
--- a/metadata/md5-cache/sys-apps/roccat-tools-5.7.0
+++ b/metadata/md5-cache/sys-apps/roccat-tools-5.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 virtual/libgudev:= virtual/libusb:1 input_devices_roccat_ryosmk? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) input_devices_roccat_ryosmkfx? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) input_devices_roccat_ryostkl? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/roccat/roccat-tools-5.7.0.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d15d32def03a3cbf7584e913604289e3
diff --git a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0 b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0
index 02ee18d2af0e..b1d5193f0022 100644
--- a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0
+++ b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 virtual/libgudev:= virtual/libusb:1 input_devices_roccat_ryosmk? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) input_devices_roccat_ryosmkfx? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) ) input_devices_roccat_ryostkl? ( || ( dev-lang/lua:5.1 dev-lang/lua:0 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/roccat/roccat-tools-5.9.0.tar.bz2
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c45b03dbf9734b6d4c8c56f9135b4516
diff --git a/metadata/md5-cache/sys-apps/s390-tools-2.4.0-r1 b/metadata/md5-cache/sys-apps/s390-tools-2.4.0-r1
index cce497db2009..ca7b8e607661 100644
--- a/metadata/md5-cache/sys-apps/s390-tools-2.4.0-r1
+++ b/metadata/md5-cache/sys-apps/s390-tools-2.4.0-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=fuse? ( sys-fs/fuse:0= ) ncurses? ( sys-libs/ncurses:0= ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/ibm-s390-tools/s390-tools/archive/v2.4.0.tar.gz -> s390-tools-2.4.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=307e906139dc41dc0cd3aeb93e50b66d
diff --git a/metadata/md5-cache/sys-apps/s390-tools-2.9.0 b/metadata/md5-cache/sys-apps/s390-tools-2.9.0
index 55f627a93f69..13f1fbeb8529 100644
--- a/metadata/md5-cache/sys-apps/s390-tools-2.9.0
+++ b/metadata/md5-cache/sys-apps/s390-tools-2.9.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=fuse? ( sys-fs/fuse:0= ) ncurses? ( sys-libs/ncurses:0= ) openssl? ( dev-libs/openssl:0= cryptsetup? ( >=sys-fs/cryptsetup-2.0.3:= dev-libs/json-c:= ) ) pfm? ( app-misc/pfm ) snmp? ( net-analyzer/net-snmp ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://github.com/ibm-s390-tools/s390-tools/archive/v2.9.0.tar.gz -> s390-tools-2.9.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=27345ab9f39896db2f46261f7d250281
diff --git a/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r2 b/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r2
deleted file mode 100644
index b02760237719..000000000000
--- a/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Supermicro Update Manager (SUM) kernel module
-EAPI=7
-HOMEPAGE=https://www.supermicro.com
-IUSE=kernel_linux kernel_linux
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=supermicro
-RDEPEND=kernel_linux? ( virtual/modutils )
-RESTRICT=bindist fetch mirror
-SLOT=0
-SRC_URI=sum_driver_V1.6.0_20151201.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=300af85b1a364bdcd1fae09833b18b91
diff --git a/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r3 b/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r3
new file mode 100644
index 000000000000..eb8ddf2b7813
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/smc-sum-driver-1.6.0.20151201-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install nofetch postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Supermicro Update Manager (SUM) kernel module
+EAPI=7
+HOMEPAGE=https://www.supermicro.com
+IUSE=kernel_linux kernel_linux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=supermicro
+RDEPEND=kernel_linux? ( virtual/modutils )
+RESTRICT=bindist fetch mirror
+SLOT=0
+SRC_URI=sum_driver_V1.6.0_20151201.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c144ac12995aee9d0f41df25c111fad9
diff --git a/metadata/md5-cache/sys-apps/smcipmitool-2.21.0.181029 b/metadata/md5-cache/sys-apps/smcipmitool-2.21.0.181029
index e1bc8a6bb647..8715d3e466ad 100644
--- a/metadata/md5-cache/sys-apps/smcipmitool-2.21.0.181029
+++ b/metadata/md5-cache/sys-apps/smcipmitool-2.21.0.181029
@@ -10,5 +10,5 @@ RDEPEND=net-misc/stunnel sys-libs/ncurses:5 virtual/jre:1.8 >=dev-java/java-conf
 RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=amd64? ( ftp://ftp.supermicro.com/utility/SMCIPMItool/Linux/SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux_x64.tar.gz ) x86? ( ftp://ftp.supermicro.com/utility/SMCIPMItool/Linux/SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5f4e8850614cb8783e265d10142f2f61
diff --git a/metadata/md5-cache/sys-apps/systemd-242-r6 b/metadata/md5-cache/sys-apps/systemd-242-r6
index 14b0245607d3..8d4d85141358 100644
--- a/metadata/md5-cache/sys-apps/systemd-242-r6
+++ b/metadata/md5-cache/sys-apps/systemd-242-r6
@@ -13,5 +13,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v242/systemd-242.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=8ad8f340cf4cfc361863d045970bcb16
diff --git a/metadata/md5-cache/sys-apps/systemd-242-r7 b/metadata/md5-cache/sys-apps/systemd-242-r7
index b5894c9dd2f6..0dbf477e94d3 100644
--- a/metadata/md5-cache/sys-apps/systemd-242-r7
+++ b/metadata/md5-cache/sys-apps/systemd-242-r7
@@ -5,7 +5,7 @@ DESCRIPTION=System and service manager for Linux
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 IUSE=acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb kernel_linux 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 ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) acct-group/adm acct-group/wheel acct-group/kmem acct-group/tty acct-group/utmp acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/render acct-group/tape acct-group/video acct-group/systemd-journal acct-user/systemd-journal-remote acct-user/systemd-coredump acct-user/systemd-network acct-user/systemd-resolve acct-user/systemd-timesync >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
@@ -13,5 +13,5 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v242/systemd-242.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=5f1aae502a78c412f3f72317855eef18
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=98c2b2f6dbc1666e82e2d9147782ef66
diff --git a/metadata/md5-cache/sys-apps/systemd-243 b/metadata/md5-cache/sys-apps/systemd-243
new file mode 100644
index 000000000000..5f3c62295a2d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-243
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig[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? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb kernel_linux 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 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) acct-group/adm acct-group/wheel acct-group/kmem acct-group/tty acct-group/utmp acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/render acct-group/tape acct-group/video acct-group/systemd-journal acct-user/systemd-journal-remote acct-user/systemd-coredump acct-user/systemd-network acct-user/systemd-resolve acct-user/systemd-timesync >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v243/systemd-243.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=c4c20d0ed67ba6b0bf17a5b34612491e
diff --git a/metadata/md5-cache/sys-apps/systemd-243_rc2-r1 b/metadata/md5-cache/sys-apps/systemd-243_rc2-r1
deleted file mode 100644
index e3363fe2a773..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-243_rc2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig[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? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=System and service manager for Linux
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb kernel_linux 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 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[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(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) acct-group/adm acct-group/wheel acct-group/kmem acct-group/tty acct-group/utmp acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/render acct-group/tape acct-group/video acct-group/systemd-journal acct-user/systemd-journal-remote acct-user/systemd-coredump acct-user/systemd-network acct-user/systemd-resolve acct-user/systemd-timesync >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=importd? ( curl gcrypt lzma )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v243-rc2/systemd-243-rc2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=e66b15c213b7e13ef874044b44d8d200
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 05954d143b6d..ea1514a8ff8a 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -12,5 +12,5 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=540ada21d2162d78e92943fc43da491e
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=c4c20d0ed67ba6b0bf17a5b34612491e
diff --git a/metadata/md5-cache/sys-apps/systemd-readahead-216 b/metadata/md5-cache/sys-apps/systemd-readahead-216
index 0d6a31038031..9634d02df98a 100644
--- a/metadata/md5-cache/sys-apps/systemd-readahead-216
+++ b/metadata/md5-cache/sys-apps/systemd-readahead-216
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=sys-apps/systemd-217:=
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/systemd/systemd-216.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=7da07563028e821778c5f86f5cae9631
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.94 b/metadata/md5-cache/sys-apps/sysvinit-2.94
deleted file mode 100644
index 365b352f3387..000000000000
--- a/metadata/md5-cache/sys-apps/sysvinit-2.94
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
-DESCRIPTION=/sbin/init - parent of all processes
-EAPI=6
-HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
-IUSE=selinux ibm static kernel_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) selinux? ( sec-policy/selinux-shutdown ) !<sys-apps/openrc-0.13
-SLOT=0
-SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.94.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=53841f20517d970474f5cb8e579c9685
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.95 b/metadata/md5-cache/sys-apps/sysvinit-2.95
deleted file mode 100644
index 0a6321fcd591..000000000000
--- a/metadata/md5-cache/sys-apps/sysvinit-2.95
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
-DESCRIPTION=/sbin/init - parent of all processes
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
-IUSE=selinux ibm static kernel_FreeBSD
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) selinux? ( sec-policy/selinux-shutdown ) !<sys-apps/openrc-0.13
-SLOT=0
-SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.95.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=738d79702114d42ddb04bb94e3a74bfc
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.96 b/metadata/md5-cache/sys-apps/sysvinit-2.96
new file mode 100644
index 000000000000..69e22f76f23a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sysvinit-2.96
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
+DESCRIPTION=/sbin/init - parent of all processes
+EAPI=7
+HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
+IUSE=selinux ibm static kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) selinux? ( sec-policy/selinux-shutdown ) !<sys-apps/openrc-0.13
+SLOT=0
+SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.96.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=69fd3f934b2c96f97df6d835a31fd37a
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.96_beta b/metadata/md5-cache/sys-apps/sysvinit-2.96_beta
deleted file mode 100644
index cd08d806a5c6..000000000000
--- a/metadata/md5-cache/sys-apps/sysvinit-2.96_beta
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
-DESCRIPTION=/sbin/init - parent of all processes
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
-IUSE=selinux ibm static kernel_FreeBSD
-LICENSE=GPL-2
-RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) selinux? ( sec-policy/selinux-shutdown ) !<sys-apps/openrc-0.13
-SLOT=0
-SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.96-beta.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=69fd3f934b2c96f97df6d835a31fd37a
diff --git a/metadata/md5-cache/sys-apps/uam-0.3.2-r1 b/metadata/md5-cache/sys-apps/uam-0.3.2-r1
index b0af7edff3a5..49f7aef2f13e 100644
--- a/metadata/md5-cache/sys-apps/uam-0.3.2-r1
+++ b/metadata/md5-cache/sys-apps/uam-0.3.2-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=postinst
-DEPEND=virtual/udev virtual/pkgconfig virtual/pkgconfig
+DEPEND=virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Simple udev-based automounter for removable USB media
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/uam/
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=virtual/udev
+RDEPEND=acct-group/plugdev virtual/udev
 SLOT=0
 SRC_URI=https://github.com/mgorny/uam/releases/download/uam-0.3.2/uam-0.3.2.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=b5c9b27314485b6bf1779377f833fe53
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=4be8e12b5dd5ca48c63bd3ea250818da
diff --git a/metadata/md5-cache/sys-apps/uam-9999 b/metadata/md5-cache/sys-apps/uam-9999
index 698c0856959d..14690e157a49 100644
--- a/metadata/md5-cache/sys-apps/uam-9999
+++ b/metadata/md5-cache/sys-apps/uam-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=postinst prepare unpack
-DEPEND=virtual/udev virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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] virtual/pkgconfig
+DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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] virtual/pkgconfig
 DESCRIPTION=Simple udev-based automounter for removable USB media
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/uam/
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=virtual/udev
+RDEPEND=acct-group/plugdev virtual/udev
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=17801f9ed904af7bf94ddff914c9afdc
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=fffbee941cc24d1a9111dcfbcd202671
diff --git a/metadata/md5-cache/sys-apps/udevil-0.4.4-r1 b/metadata/md5-cache/sys-apps/udevil-0.4.4-r1
deleted file mode 100644
index 6dcc369323a6..000000000000
--- a/metadata/md5-cache/sys-apps/udevil-0.4.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=mount and unmount removable devices without a password
-EAPI=5
-HOMEPAGE=https://ignorantguru.github.com/udevil/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143
-SLOT=0
-SRC_URI=https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz -> udevil-0.4.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	epatch	a1bf4756dba418a7238f3be0cb010c54	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ebb76c13bde82108aa5206ecdc139436
diff --git a/metadata/md5-cache/sys-apps/udevil-0.4.4-r2 b/metadata/md5-cache/sys-apps/udevil-0.4.4-r2
deleted file mode 100644
index 92bd75830765..000000000000
--- a/metadata/md5-cache/sys-apps/udevil-0.4.4-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=mount and unmount removable devices without a password
-EAPI=6
-HOMEPAGE=https://ignorantguru.github.com/udevil/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143
-SLOT=0
-SRC_URI=https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz -> udevil-0.4.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=beb02b2970afb02359f3a5df093f77f6
diff --git a/metadata/md5-cache/sys-apps/udevil-0.4.4-r3 b/metadata/md5-cache/sys-apps/udevil-0.4.4-r3
index 44a37f9d8353..380df5097463 100644
--- a/metadata/md5-cache/sys-apps/udevil-0.4.4-r3
+++ b/metadata/md5-cache/sys-apps/udevil-0.4.4-r3
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 postinst prepare
+DEPEND=acct-group/plugdev >=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=mount and unmount removable devices without a password
 EAPI=6
 HOMEPAGE=https://ignorantguru.github.com/udevil/
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=>=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143
+RDEPEND=acct-group/plugdev >=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz -> udevil-0.4.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=3f104772c25dd2206c1fe3c82fac15f8
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e55d119d1a36f400a0a59daedbcbaa2f
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
index 65570ffe8bd6..8826addff340 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.2.6.tar.bz2 http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20151101.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b1f808a269756023894198cf4fc968aa
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
index 65a0779ad0bd..7f3b0132be01 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.3.0.tar.bz2 http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20160112.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5ed014e1ae2c532656ff7eb4132444b6
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
index f670d1798ea2..12211b5b1cd1 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.4.0.tar.bz2 http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20160803.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b79ac9467acc2b30fb41189558c638ea
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
index 00cbd7d8354f..223f88b0da00 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
 SLOT=0
 SRC_URI=http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.5.2.tar.bz2 http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20170806.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a4f7f8e41681247813097aadbc794c85
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 693313045193..ba269e118895 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/elogind-241.3 b/metadata/md5-cache/sys-auth/elogind-241.3
index ed126e2458b2..d389e3ede098 100644
--- a/metadata/md5-cache/sys-auth/elogind-241.3
+++ b/metadata/md5-cache/sys-auth/elogind-241.3
@@ -11,5 +11,5 @@ PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
 RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
 SLOT=0
 SRC_URI=https://github.com/elogind/elogind/archive/v241.3.tar.gz -> elogind-241.3.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f81fa5629db7940db55fdbf5954e891e
diff --git a/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1 b/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1
index 6a9a03ec1e8e..e4e8da798503 100644
--- a/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1
+++ b/metadata/md5-cache/sys-auth/fingerprint-gui-1.09-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-crypt/qca[qt5(+)] dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 sys-auth/libfprint sys-auth/polkit-qt[qt5(+)] sys-libs/pam x11-libs/libX11 x11-libs/libfakekey dev-libs/libusb !sys-auth/thinkfinger
 SLOT=0
 SRC_URI=https://github.com/maksbotan/fingerprint-gui/archive/v1.09-qt5.tar.gz -> fingerprint-gui-1.09.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=850533891b3eb0d29c844c65f672f461
diff --git a/metadata/md5-cache/sys-auth/google-authenticator-1.04-r1 b/metadata/md5-cache/sys-auth/google-authenticator-1.04-r1
deleted file mode 100644
index 04386657a228..000000000000
--- a/metadata/md5-cache/sys-auth/google-authenticator-1.04-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=virtual/pam >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=PAM Module for two step verification via mobile platform
-EAPI=6
-HOMEPAGE=https://github.com/google/google-authenticator-libpam
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=virtual/pam
-SLOT=0
-SRC_URI=https://github.com/google/google-authenticator-libpam/archive/1.04.tar.gz -> google-authenticator-1.04.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=5292b556ccb462e1191d939164fa7ebf
diff --git a/metadata/md5-cache/sys-auth/libfprint-0.99.0 b/metadata/md5-cache/sys-auth/libfprint-0.99.0
index 46f9f4862922..c093a1b4d3cb 100644
--- a/metadata/md5-cache/sys-auth/libfprint-0.99.0
+++ b/metadata/md5-cache/sys-auth/libfprint-0.99.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv
 SLOT=0
 SRC_URI=https://github.com/freedesktop/libfprint/archive/V_0_99_0.tar.gz -> libfprint-0.99.0.tar.gz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=2517a60bc49d0e63c7b5a146cd4bbae9
diff --git a/metadata/md5-cache/sys-auth/libfprint-1.0 b/metadata/md5-cache/sys-auth/libfprint-1.0
new file mode 100644
index 000000000000..206777ca985a
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/libfprint-1.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/glib:2 dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv dev-util/gtk-doc
+DESCRIPTION=library to add support for consumer fingerprint readers
+EAPI=7
+HOMEPAGE=https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib:2 dev-libs/nss virtual/libusb:1= x11-libs/gtk+:3 x11-libs/pixman x11-libs/libX11 x11-libs/libXv
+SLOT=0
+SRC_URI=https://github.com/freedesktop/libfprint/archive/V_1_0.tar.gz -> libfprint-1.0.tar.gz
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=9bc355a707a34610cbd8178fb7e861e2
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.13 b/metadata/md5-cache/sys-auth/munge-0.5.13
index df1af79dc68a..9b1cd825d7d2 100644
--- a/metadata/md5-cache/sys-auth/munge-0.5.13
+++ b/metadata/md5-cache/sys-auth/munge-0.5.13
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=66ca964ec325f386ba856738b594d940
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.13-r1 b/metadata/md5-cache/sys-auth/munge-0.5.13-r1
index df1af79dc68a..9b1cd825d7d2 100644
--- a/metadata/md5-cache/sys-auth/munge-0.5.13-r1
+++ b/metadata/md5-cache/sys-auth/munge-0.5.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=66ca964ec325f386ba856738b594d940
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10
index 76da7729be14..a126783a4284 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10
@@ -10,5 +10,5 @@ RDEPEND=net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) pynslcd )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	s6	77dc4ae04ca4f45f43b492f80a8fa2ea	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=68b5e6cbb14406a9be3a1ab74b27e5bc
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.9 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.9
index f229ae3ef116..c15f725bb223 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.9
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.9
@@ -10,5 +10,5 @@ RDEPEND=net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) pynslcd )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	s6	77dc4ae04ca4f45f43b492f80a8fa2ea	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2e00f7dd1fd1856208c6b2f6ca991a9a
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-265-r5 b/metadata/md5-cache/sys-auth/nss_ldap-265-r5
index c7f12d2f0126..91b31d95e688 100644
--- a/metadata/md5-cache/sys-auth/nss_ldap-265-r5
+++ b/metadata/md5-cache/sys-auth/nss_ldap-265-r5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=net-nds/openldap-2.4.38-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(-)?] sasl? ( >=dev-libs/cyrus-sasl-2.1.26-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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) !<net-fs/autofs-4.1.3
 SLOT=0
 SRC_URI=http://www.padl.com/download/nss_ldap-265.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c0da70b2b1478ab9435a25bd03d76d87
diff --git a/metadata/md5-cache/sys-auth/pam-afs-session-1.3 b/metadata/md5-cache/sys-auth/pam-afs-session-1.3
deleted file mode 100644
index 6e6eb77f22b5..000000000000
--- a/metadata/md5-cache/sys-auth/pam-afs-session-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/krb5 virtual/pam
-DESCRIPTION=OpenAFS PAM Module
-EAPI=0
-HOMEPAGE=https://www.eyrie.org/~eagle/software/pam-afs-session/
-KEYWORDS=~amd64 ~x86
-LICENSE=HPND openafs-krb5-a
-RDEPEND=virtual/krb5 virtual/pam
-SLOT=0
-SRC_URI=https://archives.eyrie.org/software/ARCHIVE/pam-afs-session/pam-afs-session-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0e111e062962d0da5ed778d9c9bbe458
diff --git a/metadata/md5-cache/sys-auth/pam-afs-session-1.5 b/metadata/md5-cache/sys-auth/pam-afs-session-1.5
deleted file mode 100644
index 43f80e8d5b89..000000000000
--- a/metadata/md5-cache/sys-auth/pam-afs-session-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/krb5 virtual/pam
-DESCRIPTION=OpenAFS PAM Module
-EAPI=0
-HOMEPAGE=https://www.eyrie.org/~eagle/software/pam-afs-session/
-KEYWORDS=~amd64 ~x86
-LICENSE=HPND openafs-krb5-a
-RDEPEND=virtual/krb5 virtual/pam
-SLOT=0
-SRC_URI=https://archives.eyrie.org/software/ARCHIVE/pam-afs-session/pam-afs-session-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0e111e062962d0da5ed778d9c9bbe458
diff --git a/metadata/md5-cache/sys-auth/ykclient-2.14 b/metadata/md5-cache/sys-auth/ykclient-2.14
deleted file mode 100644
index 5a5bcd310b6a..000000000000
--- a/metadata/md5-cache/sys-auth/ykclient-2.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-misc/curl-7.21.1 >=app-portage/elt-patches-20170815
-DESCRIPTION=Yubico C client library
-EAPI=5
-HOMEPAGE=https://github.com/Yubico/yubico-c-client
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=net-misc/curl-7.21.1
-RESTRICT=test
-SLOT=0
-SRC_URI=http://opensource.yubico.com/yubico-c-client/releases/ykclient-2.14.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ffb6fc55cd28464f9a406b803b65370b
diff --git a/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0 b/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
index e8620ce121f4..9f8036d4843d 100644
--- a/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
+++ b/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/pcsc-lite
 SLOT=0
 SRC_URI=http://yubico.github.io/ykneo-ccid-tools/releases/ykneo-ccid-tools-0.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=014ab1716523fce31c34d58461e8b866
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.18.0 b/metadata/md5-cache/sys-auth/ykpers-1.18.0
index 23d86b011321..3d2b7ccf93c2 100644
--- a/metadata/md5-cache/sys-auth/ykpers-1.18.0
+++ b/metadata/md5-cache/sys-auth/ykpers-1.18.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=sys-auth/libyubikey-1.6 virtual/libusb:1 consolekit? ( sys-auth/consolekit[acl] )
 SLOT=0
 SRC_URI=https://github.com/Yubico/yubikey-personalization/archive/v1.18.0.tar.gz -> ykpers-1.18.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=eb177a600f22ee8e8db80c177fca8558
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.18.1 b/metadata/md5-cache/sys-auth/ykpers-1.18.1
index 4892c3ce2ce2..ec3b3fbb3b0c 100644
--- a/metadata/md5-cache/sys-auth/ykpers-1.18.1
+++ b/metadata/md5-cache/sys-auth/ykpers-1.18.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=sys-auth/libyubikey-1.6 virtual/libusb:1 consolekit? ( sys-auth/consolekit[acl] )
 SLOT=0
 SRC_URI=https://github.com/Yubico/yubikey-personalization/archive/v1.18.1.tar.gz -> ykpers-1.18.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=ea29d35025842b44a801d1e02e6a7bb4
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.19.0 b/metadata/md5-cache/sys-auth/ykpers-1.19.0
index f41b506c3fef..fea277ab7617 100644
--- a/metadata/md5-cache/sys-auth/ykpers-1.19.0
+++ b/metadata/md5-cache/sys-auth/ykpers-1.19.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/json-c:= >=sys-auth/libyubikey-1.6 virtual/libusb:1 consolekit? ( sys-auth/consolekit[acl] )
 SLOT=0
 SRC_URI=https://github.com/Yubico/yubikey-personalization/archive/v1.19.0.tar.gz -> ykpers-1.19.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=704aecf6f9c1588df48637d03efb548d
diff --git a/metadata/md5-cache/sys-auth/ykpers-1.19.3-r1 b/metadata/md5-cache/sys-auth/ykpers-1.19.3-r1
index 96528f603613..e9ed1fb7f5f6 100644
--- a/metadata/md5-cache/sys-auth/ykpers-1.19.3-r1
+++ b/metadata/md5-cache/sys-auth/ykpers-1.19.3-r1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/json-c:= >=sys-auth/libyubikey-1.6 virtual/libusb:1 consolekit? ( sys-auth/consolekit[acl] )
 SLOT=0
 SRC_URI=https://github.com/Yubico/yubikey-personalization/archive/v1.19.3.tar.gz -> ykpers-1.19.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=fc10087d702bf1dd04324bfaf71d4232
diff --git a/metadata/md5-cache/sys-auth/yubico-piv-tool-1.4.4 b/metadata/md5-cache/sys-auth/yubico-piv-tool-1.4.4
deleted file mode 100644
index b63bafc001ef..000000000000
--- a/metadata/md5-cache/sys-auth/yubico-piv-tool-1.4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-util/gengetopt sys-apps/help2man virtual/pkgconfig dev-libs/openssl:0=[-bindist] sys-apps/pcsc-lite >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Command line tool for the YubiKey PIV application
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=dev-libs/openssl:0=[-bindist] sys-apps/pcsc-lite
-SLOT=0/1
-SRC_URI=https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-1.4.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=4885124b6778a96aa89575ff074eaa77
diff --git a/metadata/md5-cache/sys-auth/yubico-piv-tool-1.5.0 b/metadata/md5-cache/sys-auth/yubico-piv-tool-1.5.0
deleted file mode 100644
index 581dc2b44a3f..000000000000
--- a/metadata/md5-cache/sys-auth/yubico-piv-tool-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/openssl:0=[-bindist] sys-apps/pcsc-lite dev-util/gengetopt sys-apps/help2man virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Command line tool for the YubiKey PIV application
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=dev-libs/openssl:0=[-bindist] sys-apps/pcsc-lite
-SLOT=0/1
-SRC_URI=https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-1.5.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=50b4129015aecbb50037a5faeed88277
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 81abd200b6d1..476023f880ba 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/io-scheduler-udev-rules-1 b/metadata/md5-cache/sys-block/io-scheduler-udev-rules-1
index 46a82a02099f..3c5c2d43b989 100644
--- a/metadata/md5-cache/sys-block/io-scheduler-udev-rules-1
+++ b/metadata/md5-cache/sys-block/io-scheduler-udev-rules-1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/udev
 SLOT=0
 SRC_URI=https://gitlab.com/pachoramos/io-scheduler-udev-rules/-/archive/1/io-scheduler-udev-rules-1.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=aad4daa649bd126cb12daaf3fbac3291
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
index 7c0a20d966c1..6b464ef0e26a 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=slp? ( net-libs/openslp ) sys-fs/lsscsi sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=da7c7150bbcacd3198827ca93becf054
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.875 b/metadata/md5-cache/sys-block/open-iscsi-2.0.875
index ce63df8ab6a9..79a2b56b9a9c 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.875
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.875
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= infiniband? ( sys-fabric/ofed ) sys-kernel/linux-h
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bc6d9784a31630148e800537d18cc614
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.876 b/metadata/md5-cache/sys-block/open-iscsi-2.0.876
index ab22b64c2298..7290e31c6f82 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.876
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.876
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= infiniband? ( sys-fabric/ofed ) sys-kernel/linux-h
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.876.tar.gz -> open-iscsi-2.0.876.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=22eb823edfa4a5edda7efdda0e40aa90
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.876_p20180814-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.876_p20180814-r1
index 2b67000b652b..bb453ec43cf9 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.876_p20180814-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.876_p20180814-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-block/open-isns:= infiniband? ( sys-fabric/ofed ) sys-kernel/linux-h
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0/0.2
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/96c1a8e344d93594a3bb4faa848f878cc7315bde.tar.gz -> open-iscsi-2.0.876_p20180814.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0bc6b0f25d2d4e6b1ca224d173b2c740
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.877 b/metadata/md5-cache/sys-block/open-iscsi-2.0.877
index 2b6e798e3de5..794dc9d0c927 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.877
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.877
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband?
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0/0.2
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.0.877.tar.gz -> open-iscsi-2.0.877.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=60a0bdddf4ccca3c956e9516355216b9
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index eb9ac600844c..2c5998a7c312 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/systemd-boot-239 b/metadata/md5-cache/sys-boot/systemd-boot-239
deleted file mode 100644
index 2f50697c4582..000000000000
--- a/metadata/md5-cache/sys-boot/systemd-boot-239
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=sys-apps/util-linux-2.30 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 >=dev-util/intltool-0.50 dev-util/gperf >=sys-boot/gnu-efi-3.0.2 sys-libs/libcap virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=UEFI boot manager from systemd (formerly gummiboot)
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-RDEPEND=>=sys-apps/util-linux-2.30 !sys-apps/systemd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd/archive/v239.tar.gz -> systemd-239.tar.gz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=770dab890f037338d2cde997098bdbb2
diff --git a/metadata/md5-cache/sys-boot/systemd-boot-243 b/metadata/md5-cache/sys-boot/systemd-boot-243
new file mode 100644
index 000000000000..302ac6a9e8fb
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/systemd-boot-243
@@ -0,0 +1,14 @@
+BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 >=dev-util/intltool-0.50 dev-util/gperf >=dev-util/patchelf-0.10 virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DEPEND=>=sys-apps/util-linux-2.30 >=sys-boot/gnu-efi-3.0.2 sys-libs/libcap
+DESCRIPTION=UEFI boot manager from systemd (formerly gummiboot)
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+RDEPEND=>=sys-apps/util-linux-2.30 !sys-apps/systemd
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd/archive/v243.tar.gz -> systemd-243.tar.gz
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c1602b73b69d38609d98b5e34fb8dad3
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 247c166eebc5..c03e588b2896 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.11 b/metadata/md5-cache/sys-cluster/ceph-12.2.11
index 589b40872e4c..8be45e755660 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.11
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.11
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.11.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=613537dd39cd6bfb662416d017637563
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.12-r2 b/metadata/md5-cache/sys-cluster/ceph-12.2.12-r2
index d712ce1a1d5a..19136d60edec 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.12-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.12-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.12.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e818aebfd39d07257c9e2e22735c63f5
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.8-r1 b/metadata/md5-cache/sys-cluster/ceph-12.2.8-r1
index 26c46b99e845..a11bef1a8e16 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.8-r1
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.8.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d26ea94fa1243331004b9dae5725689e
diff --git a/metadata/md5-cache/sys-cluster/ceph-13.2.5-r4 b/metadata/md5-cache/sys-cluster/ceph-13.2.5-r4
index 1c1ce155375b..bfc4b8ab3dde 100644
--- a/metadata/md5-cache/sys-cluster/ceph-13.2.5-r4
+++ b/metadata/md5-cache/sys-cluster/ceph-13.2.5-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-13.2.5.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2a4c99c346ae56f2a83c41d0894cf93
diff --git a/metadata/md5-cache/sys-cluster/ceph-13.2.6 b/metadata/md5-cache/sys-cluster/ceph-13.2.6
index 365a4b959598..46889515e27c 100644
--- a/metadata/md5-cache/sys-cluster/ceph-13.2.6
+++ b/metadata/md5-cache/sys-cluster/ceph-13.2.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-13.2.6.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4ea78824e0ce1a8756659e73715776b
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.3 b/metadata/md5-cache/sys-cluster/ceph-14.2.3
index 9a2615570d38..66c5a2122a2e 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.3
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9de2585a86dc073a92debeb874d7abcb
diff --git a/metadata/md5-cache/sys-cluster/charm-6.5.1-r1 b/metadata/md5-cache/sys-cluster/charm-6.5.1-r1
deleted file mode 100644
index a232e7bfc604..000000000000
--- a/metadata/md5-cache/sys-cluster/charm-6.5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=mpi? ( virtual/mpi ) doc? ( >=app-text/poppler-0.12.3-r3[utils] dev-tex/latex2html virtual/tex-base >=dev-python/beautifulsoup-4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/netpbm python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) virtual/fortran
-DESCRIPTION=Message-passing parallel language and runtime system
-EAPI=5
-HOMEPAGE=http://charm.cs.uiuc.edu/
-IUSE=charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=charm
-RDEPEND=mpi? ( virtual/mpi ) virtual/fortran
-REQUIRED_USE=doc? ( python_targets_python2_7 ) cmkopt? ( !charmdebug !charmtracing ) charmproduction? ( !charmdebug !charmtracing )
-SLOT=0
-SRC_URI=http://charm.cs.uiuc.edu/distrib/charm-6.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2090c35661d01fdd79b37784ccfb03e
diff --git a/metadata/md5-cache/sys-cluster/charm-6.5.1-r2 b/metadata/md5-cache/sys-cluster/charm-6.5.1-r2
deleted file mode 100644
index 64d55db0c5c4..000000000000
--- a/metadata/md5-cache/sys-cluster/charm-6.5.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=mpi? ( virtual/mpi ) doc? ( >=app-text/poppler-0.12.3-r3[utils] dev-tex/latex2html virtual/tex-base >=dev-python/beautifulsoup-4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/netpbm python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) virtual/fortran
-DESCRIPTION=Message-passing parallel language and runtime system
-EAPI=5
-HOMEPAGE=http://charm.cs.uiuc.edu/
-IUSE=charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=charm
-RDEPEND=mpi? ( virtual/mpi ) virtual/fortran
-REQUIRED_USE=doc? ( python_targets_python2_7 ) cmkopt? ( !charmdebug !charmtracing ) charmproduction? ( !charmdebug !charmtracing )
-SLOT=0
-SRC_URI=http://charm.cs.uiuc.edu/distrib/charm-6.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=09850ce015e215a0e155f7020aadc3a4
diff --git a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.3 b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.3
index cfb9c9a0091e..853e6ab402e9 100644
--- a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.3
+++ b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=heartbeat? ( sys-cluster/heartbeat ) pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev ) !!sys-cluster/drbd
 SLOT=0
 SRC_URI=http://oss.linbit.com/drbd/drbd-utils-8.9.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=eb03c6673101d59ae14813838209cbf3
diff --git a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6 b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6
index a58013d440d8..f25339e8dabc 100644
--- a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6
+++ b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=heartbeat? ( sys-cluster/heartbeat ) pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev ) !!sys-cluster/drbd
 SLOT=0
 SRC_URI=http://oss.linbit.com/drbd/drbd-utils-8.9.6.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=af33470d0727191c518a3f3edb675c2a
diff --git a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6-r1 b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6-r1
index 7243a266d554..112801808d79 100644
--- a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6-r1
+++ b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=heartbeat? ( sys-cluster/heartbeat ) pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev ) !!sys-cluster/drbd
 SLOT=0
 SRC_URI=http://oss.linbit.com/drbd/drbd-utils-8.9.6.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dd36617da7f6dffc48e714f1f135dbb2
diff --git a/metadata/md5-cache/sys-cluster/knem-1.1.3 b/metadata/md5-cache/sys-cluster/knem-1.1.3
index ba7410bdfa62..8387f696afa5 100644
--- a/metadata/md5-cache/sys-cluster/knem-1.1.3
+++ b/metadata/md5-cache/sys-cluster/knem-1.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/37186/knem-1.1.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7eefcb7d9ca2f55c6defdba8d2f7274a
diff --git a/metadata/md5-cache/sys-cluster/knem-9999 b/metadata/md5-cache/sys-cluster/knem-9999
index 2fae7c249c78..d3d31ea2cc28 100644
--- a/metadata/md5-cache/sys-cluster/knem-9999
+++ b/metadata/md5-cache/sys-cluster/knem-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2
 PROPERTIES=live
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c75e4547c52c64f76e5fab9c00376bd
diff --git a/metadata/md5-cache/sys-cluster/open-mx-1.5.4 b/metadata/md5-cache/sys-cluster/open-mx-1.5.4
index 100af183288b..893525504dce 100644
--- a/metadata/md5-cache/sys-cluster/open-mx-1.5.4
+++ b/metadata/md5-cache/sys-cluster/open-mx-1.5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://gforge.inria.fr/frs/download.php/34371/open-mx-1.5.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5ed87fbc4dd733c7af066e6ed48fb376
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-24.0 b/metadata/md5-cache/sys-cluster/rdma-core-24.0
new file mode 100644
index 000000000000..b432dd7605f8
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/rdma-core-24.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) python? ( dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
+EAPI=7
+HOMEPAGE=https://github.com/linux-rdma/rdma-core
+IUSE=neigh python static-libs systemd valgrind python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
+RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=https://github.com/linux-rdma/rdma-core/releases/download/v24.0/rdma-core-24.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4e90049d0bbc4badf6e54a56e053ce1
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-25.0 b/metadata/md5-cache/sys-cluster/rdma-core-25.0
new file mode 100644
index 000000000000..50c147de7ca6
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/rdma-core-25.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) python? ( dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
+EAPI=7
+HOMEPAGE=https://github.com/linux-rdma/rdma-core
+IUSE=neigh python static-libs systemd valgrind python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
+RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=https://github.com/linux-rdma/rdma-core/releases/download/v25.0/rdma-core-25.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=274e77e72f73b09ef6f16836e4d58c61
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-9999 b/metadata/md5-cache/sys-cluster/rdma-core-9999
new file mode 100644
index 000000000000..cc92461d6a76
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/rdma-core-9999
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) python? ( dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
+EAPI=7
+HOMEPAGE=https://github.com/linux-rdma/rdma-core
+IUSE=neigh python static-libs systemd valgrind python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
+PROPERTIES=live
+RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) !!sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9c6d7d4c36bf954aabf74bab8da618e
diff --git a/metadata/md5-cache/sys-cluster/slurm-17.11.13.2 b/metadata/md5-cache/sys-cluster/slurm-17.11.13.2
index d7aece05f120..ded08be9f51f 100644
--- a/metadata/md5-cache/sys-cluster/slurm-17.11.13.2
+++ b/metadata/md5-cache/sys-cluster/slurm-17.11.13.2
@@ -11,5 +11,5 @@ REQUIRED_USE=torque? ( perl )
 RESTRICT=primaryuri test
 SLOT=0
 SRC_URI=https://download.schedmd.com/slurm/slurm-17.11.13-2.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	756a09f72c4cdbb55f2694c95f1e0860	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	756a09f72c4cdbb55f2694c95f1e0860	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e9fe4f57743471ed5635ad21f75defb7
diff --git a/metadata/md5-cache/sys-cluster/slurm-18.08.7 b/metadata/md5-cache/sys-cluster/slurm-18.08.7
index 16f6be37aa78..3efeed78a265 100644
--- a/metadata/md5-cache/sys-cluster/slurm-18.08.7
+++ b/metadata/md5-cache/sys-cluster/slurm-18.08.7
@@ -11,5 +11,5 @@ REQUIRED_USE=torque? ( perl )
 RESTRICT=primaryuri test
 SLOT=0
 SRC_URI=https://download.schedmd.com/slurm/slurm-18.08.7.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	756a09f72c4cdbb55f2694c95f1e0860	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	756a09f72c4cdbb55f2694c95f1e0860	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	20c90ae7e826995a597683580cdfcdcb	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=755474b5e07803ed87f70058ddc40d7d
diff --git a/metadata/md5-cache/sys-cluster/vzctl-4.9.4 b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
index eb1d25af0397..9488329d411b 100644
--- a/metadata/md5-cache/sys-cluster/vzctl-4.9.4
+++ b/metadata/md5-cache/sys-cluster/vzctl-4.9.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-firewall/iptables sys-apps/ed >=sys-apps/iproute2-3.3.0 >=sys-fs/vzquota-3.1 ploop? ( >=sys-cluster/ploop-1.13 sys-block/parted sys-fs/quota dev-libs/libxml2 ) >=dev-libs/libcgroup-0.38 vzmigrate? ( net-misc/openssh net-misc/rsync[xattr,acl] app-arch/tar[xattr,acl] net-misc/bridge-utils virtual/awk ) virtual/udev sys-apps/attr
 SLOT=0
 SRC_URI=http://download.openvz.org/utils/vzctl/4.9.4/src/vzctl-4.9.4.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=767cf1c299446e147d8b21c0991b4749
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index e65609a2a89e..4e1ec8c4b337 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/binutils-apple-8.2.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
index 5019f9b9eb0a..3df9d857cacb 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=APSL-2
 RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm:* sys-libs/libcxx
 SLOT=8
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-274.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-895.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-421.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-8.2-r1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6cd18e7df6ab5e2b3dbde2d2bde4e8bb
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5-r4 b/metadata/md5-cache/sys-devel/binutils-config-5-r4
index a439f9c07ab3..3373046c8140 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-5-r4
+++ b/metadata/md5-cache/sys-devel/binutils-config-5-r4
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions !<app-admin/eselect-1.4.5
 SLOT=0
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=6f9dc1af8d9c2b2e5dde7c0c89f9e297
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5.1-r1 b/metadata/md5-cache/sys-devel/binutils-config-5.1-r1
index 5aa06ff71bcc..e11ae82e564a 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-5.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-config-5.1-r1
@@ -6,5 +6,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions !<app-admin/eselect-1.4.5
 SLOT=0
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
 _md5_=562c698b8d406dc8f8027b64e428797a
diff --git a/metadata/md5-cache/sys-devel/byfl-1.6 b/metadata/md5-cache/sys-devel/byfl-1.6
deleted file mode 100644
index 5acbce68db8d..000000000000
--- a/metadata/md5-cache/sys-devel/byfl-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=>=sys-devel/clang-5.0.1:5 >=sys-devel/llvm-5.0.1:5 sys-devel/binutils:* dev-lang/perl:= dev-perl/Switch hdf5? ( sci-libs/hdf5[cxx] ) sqlite? ( dev-db/sqlite:3 )
-DESCRIPTION=Compiler-based Application Analysis
-EAPI=6
-HOMEPAGE=https://github.com/lanl/Byfl
-IUSE=hdf5 static-libs sqlite
-KEYWORDS=~amd64 ~amd64-linux
-LICENSE=BSD
-RDEPEND=>=sys-devel/clang-5.0.1:5 >=sys-devel/llvm-5.0.1:5 sys-devel/binutils:* dev-lang/perl:= dev-perl/Switch hdf5? ( sci-libs/hdf5[cxx] ) sqlite? ( dev-db/sqlite:3 )
-SLOT=0
-SRC_URI=https://github.com/lanl/Byfl/releases/download/v1.6-llvm-5.0.1/byfl-1.6-llvm-5.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3a67e8c9a5df06380ef5d262cb1f31fb
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.0.9999 b/metadata/md5-cache/sys-devel/clang-10.0.0.9999
index 4d1c83079ec9..eb9e1c8cd794 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-10.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5
 RESTRICT=!test? ( test )
 SLOT=10
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=872ffa636dbcab50cb2844483da7f203
+_md5_=8be39a995e95be75b1da8ce668b6b269
diff --git a/metadata/md5-cache/sys-devel/clang-5.0.2 b/metadata/md5-cache/sys-devel/clang-5.0.2
deleted file mode 100644
index 9aee51033ce0..000000000000
--- a/metadata/md5-cache/sys-devel/clang-5.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-5.0.2:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,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(-)?] static-analyzer? ( dev-lang/perl:* z3? ( <sci-mathematics/z3-4.6:0= ) ) xml? ( dev-libs/libxml2: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(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=C language family frontend for LLVM
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore 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
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=UoI-NCSA
-PDEPEND=~sys-devel/clang-runtime-5.0.2 default-compiler-rt? ( =sys-libs/compiler-rt-5.0.2* ) default-libcxx? ( >=sys-libs/libcxx-5.0.2 )
-RDEPEND=~sys-devel/llvm-5.0.2:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,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(-)?] static-analyzer? ( dev-lang/perl:* z3? ( <sci-mathematics/z3-4.6:0= ) ) xml? ( dev-libs/libxml2: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(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
-REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
-SLOT=5
-SRC_URI=https://releases.llvm.org/5.0.2/cfe-5.0.2.src.tar.xz https://releases.llvm.org/5.0.2/clang-tools-extra-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.2-manpages.tar.bz2 )
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97429121ebd5bee5a8e099a18dbdd8ea
diff --git a/metadata/md5-cache/sys-devel/clang-6.0.1 b/metadata/md5-cache/sys-devel/clang-6.0.1
index 556a329b5ea0..18ea3d8ae7b0 100644
--- a/metadata/md5-cache/sys-devel/clang-6.0.1
+++ b/metadata/md5-cache/sys-devel/clang-6.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMD
 RESTRICT=!test? ( test )
 SLOT=6
 SRC_URI=https://releases.llvm.org/6.0.1/cfe-6.0.1.src.tar.xz https://releases.llvm.org/6.0.1/clang-tools-extra-6.0.1.src.tar.xz test? ( https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-6.0.1-manpages.tar.bz2 )
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe97579c0af36a5c884a87cec6146c61
diff --git a/metadata/md5-cache/sys-devel/clang-7.1.0 b/metadata/md5-cache/sys-devel/clang-7.1.0
index 294c3d976446..97f947f0a450 100644
--- a/metadata/md5-cache/sys-devel/clang-7.1.0
+++ b/metadata/md5-cache/sys-devel/clang-7.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMD
 RESTRICT=!test? ( test )
 SLOT=7/7.1
 SRC_URI=https://releases.llvm.org/7.1.0/cfe-7.1.0.src.tar.xz https://releases.llvm.org/7.1.0/clang-tools-extra-7.1.0.src.tar.xz test? ( https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-7.1.0-manpages.tar.bz2 )
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5c13097184c42954c4e708fc0eae5af
diff --git a/metadata/md5-cache/sys-devel/clang-8.0.0 b/metadata/md5-cache/sys-devel/clang-8.0.0
index 468dadff3f0b..4233fa2d6ffe 100644
--- a/metadata/md5-cache/sys-devel/clang-8.0.0
+++ b/metadata/md5-cache/sys-devel/clang-8.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMD
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://releases.llvm.org/8.0.0/cfe-8.0.0.src.tar.xz https://releases.llvm.org/8.0.0/clang-tools-extra-8.0.0.src.tar.xz test? ( https://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-8.0.0-manpages.tar.bz2 )
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6272c0f73fe9e18419859fc2ef6b12bb
diff --git a/metadata/md5-cache/sys-devel/clang-8.0.1 b/metadata/md5-cache/sys-devel/clang-8.0.1
index 2ad11f1a7d0f..d3e5277a534f 100644
--- a/metadata/md5-cache/sys-devel/clang-8.0.1
+++ b/metadata/md5-cache/sys-devel/clang-8.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=C language family frontend for LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore 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
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-8.0.1 default-compiler-rt? ( =sys-libs/compiler-rt-8.0.1* ) default-libcxx? ( >=sys-libs/libcxx-8.0.1 )
 RDEPEND=~sys-devel/llvm-8.0.1:8=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,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(-)?] static-analyzer? ( dev-lang/perl:* z3? ( >=sci-mathematics/z3-4.7.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(-)?] ) ) xml? ( dev-libs/libxml2: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(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
@@ -12,5 +12,5 @@ REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMD
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/cfe-8.0.1.src.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/clang-tools-extra-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-8.0.1-manpages.tar.bz2 )
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ffee3f34e5372d14af73154e800e0a67
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce3650a901b1dbcdf55b8a4921b2bccc
diff --git a/metadata/md5-cache/sys-devel/clang-9.0.0.9999 b/metadata/md5-cache/sys-devel/clang-9.0.0.9999
index 0caf6a2afaeb..34508617cd8e 100644
--- a/metadata/md5-cache/sys-devel/clang-9.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-9.0.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5
 RESTRICT=!test? ( test )
 SLOT=9
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	llvm	5dbc14df2333105b7c006124ead9bf3f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14340af8ad9c4d8522140445354141b0
+_md5_=1a99ce855890c573b69f297781a67c2f
diff --git a/metadata/md5-cache/sys-devel/clang-common-8.0.1 b/metadata/md5-cache/sys-devel/clang-common-8.0.1
index 8e26c7709977..8e01e46ec770 100644
--- a/metadata/md5-cache/sys-devel/clang-common-8.0.1
+++ b/metadata/md5-cache/sys-devel/clang-common-8.0.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=Common files shared between multiple slots of clang
 EAPI=6
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/cfe-8.0.1.src.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=423534a99665eadff88f54307438f3df
+_md5_=3e5ed65b29186397fb56a60077c5edf5
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-5.0.2 b/metadata/md5-cache/sys-devel/clang-runtime-5.0.2
deleted file mode 100644
index c0d8285d336b..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-5.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=6
-HOMEPAGE=https://clang.llvm.org/
-IUSE=+compiler-rt crt libcxx openmp +sanitize 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 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-5.0.2:5.0.2 sanitize? ( ~sys-libs/compiler-rt-sanitizers-5.0.2:5.0.2 ) ) crt? ( || ( sys-libs/netbsd-csu[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-freebsd/freebsd-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(-)?] ) ) libcxx? ( >=sys-libs/libcxx-5.0.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(-)?] ) openmp? ( >=sys-libs/libomp-5.0.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(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=5.0.2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=87ad5b51e3d4129da9c9a3d166fa1179
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-8.0.1 b/metadata/md5-cache/sys-devel/clang-runtime-8.0.1
index 7cb0a368283e..dad63bdf325d 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-8.0.1
+++ b/metadata/md5-cache/sys-devel/clang-runtime-8.0.1
@@ -3,10 +3,10 @@ DESCRIPTION=Meta-ebuild for clang runtime libraries
 EAPI=6
 HOMEPAGE=https://clang.llvm.org/
 IUSE=+compiler-rt crt libcxx openmp +sanitize 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 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-8.0.1:8.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-8.0.1:8.0.1 ) ) crt? ( || ( sys-libs/netbsd-csu[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-freebsd/freebsd-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(-)?] ) ) libcxx? ( >=sys-libs/libcxx-8.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(-)?] ) openmp? ( >=sys-libs/libomp-8.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(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=8.0.1
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=3d81c07c5eca1c70f82e74c6b9b40ac6
+_md5_=3faea37d62ae37dc0cd036942c55ea35
diff --git a/metadata/md5-cache/sys-devel/crossdev-20190908 b/metadata/md5-cache/sys-devel/crossdev-20190908
new file mode 100644
index 000000000000..d690f90dd9da
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/crossdev-20190908
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Gentoo Cross-toolchain generator
+EAPI=7
+HOMEPAGE=https://www.gentoo.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
+SLOT=0
+SRC_URI=mirror://gentoo/crossdev-20190908.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20190908.tar.xz
+_md5_=6ca92e9622fb71e75386aeddb7526aa5
diff --git a/metadata/md5-cache/sys-devel/distcc-3.3.2-r5 b/metadata/md5-cache/sys-devel/distcc-3.3.2-r5
index acf20fdf6e12..cd1a42342ff9 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.3.2-r5
+++ b/metadata/md5-cache/sys-devel/distcc-3.3.2-r5
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/distcc/distcc/releases/download/v3.3.2/distcc-3.3.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dec88ac95bdc92a88824a6f47778b076
diff --git a/metadata/md5-cache/sys-devel/distcc-3.3.3 b/metadata/md5-cache/sys-devel/distcc-3.3.3
index 65bf7dc251cf..9e67db215317 100644
--- a/metadata/md5-cache/sys-devel/distcc-3.3.3
+++ b/metadata/md5-cache/sys-devel/distcc-3.3.3
@@ -4,12 +4,12 @@ DESCRIPTION=Distribute compilation of C code across several machines on a networ
 EAPI=6
 HOMEPAGE=http://distcc.org/
 IUSE=gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) !net-misc/pump dev-util/shadowman >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/distcc/distcc/releases/download/v3.3.3/distcc-3.3.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db4e546b1b57c51f54c1bc0e660583a5
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=92ec67597129326bcba78f5cd1bbdcd1
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r3 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r3
index c818c725aa06..a4ca00127047 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r3
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r3
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl
 RESTRICT=strip
 SLOT=3.3.6
 SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-1.11.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-1.11.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c1561a4b79055276abdf35669a4bd71
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r4 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r4
index 9a6f03f06837..0d8b3043da55 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r4
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r4
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl
 RESTRICT=strip
 SLOT=3.3.6
 SRC_URI=mirror://gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2 mirror://gentoo/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-2.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d3abaaaed4f11a7cd6c3d3b9dc97a5ba
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
index 9decf85a4c2b..a3d1a3e98369 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4.6
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.6-patches-1.8.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d7dec1766720fc67e21b08bfe6022486
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r3 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r3
index b94d406866e7..1bd21453ebc6 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r3
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4.6
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-1.9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.6-patches-1.9.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5fbefd12263f450441111ea1bee9deb
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r4 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r4
index b19bde173458..f0e5062f1ffa 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r4
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=3.4.6
 SRC_URI=mirror://gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2 mirror://gentoo/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.5-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.4.6-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.6-patches-2.tar.bz2 boundschecking? ( mirror://sourceforge/boundschecking/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 mirror://gentoo/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~vapier/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~rhill/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~zorry/patches/gcc/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~blueness/dist/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~tamiko/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 https://dev.gentoo.org/~slyfox/distfiles/bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 ) d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f4150cc572b1d95d9540039f847c6bc1
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.0.4-r2
index 294a5e76fcb2..ff26dbabb038 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.0.4
 SRC_URI=mirror://gnu/gcc/gcc-4.0.4/gcc-4.0.4.tar.bz2 mirror://gentoo/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-patches-1.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1bbc42906ab3aa336b87c98b81b2f622
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2 b/metadata/md5-cache/sys-devel/gcc-4.1.2
index a79f8ea77940..5f37174991df 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.6.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=624ba5f357ebde380fd7dcfcfda8449c
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2-r2 b/metadata/md5-cache/sys-devel/gcc-4.1.2-r2
index 814d4aca45ef..4ed8ad0bbaa0 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.8.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5c86282ca4bd992897e77a91edb424d
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
index 4b390ae34486..14aca7a1f252 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=40eb7f3a89055031f38431809365bc09
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r3 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r3
index a520debcb5ed..5fb91e67bfc5 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f4a302b614d5f1af5799ca8f24708cd3
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
index 9833b4c5e0e1..50e34abe164c 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.6
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-patches-1.2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=96b4ef1a01a77ed5ac862323a395109e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r3 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r3
index 819e4a217b39..b49df8b52d00 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.6
 SRC_URI=mirror://gnu/gcc/gcc-4.3.6/gcc-4.3.6.tar.bz2 mirror://gentoo/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-patches-1.4.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aa0f2e8255b5f001fbcee4662193ecb0
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7 b/metadata/md5-cache/sys-devel/gcc-4.4.7
index 5ad35775acfb..dcd93cb4a7c5 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dceb9c7c83221cc16d1e96976accad5e
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7-r2 b/metadata/md5-cache/sys-devel/gcc-4.4.7-r2
index eff2970993ce..8e5ae47fe764 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.4.7
 SRC_URI=mirror://gnu/gcc/gcc-4.4.7/gcc-4.4.7.tar.bz2 mirror://gentoo/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-patches-1.5.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df55d2bdcf1e25d2cc1d9355da13b9e1
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4 b/metadata/md5-cache/sys-devel/gcc-4.5.4
index 10db08a902a2..50e51fd30d9a 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=571cff20a06f6ff7c1aca3aaa417c068
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.5.4-r2
index ec3c6d6b5eec..bf02ce46f146 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.5.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=769b7ef7bd7f15680f46348b3ce98b80
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4 b/metadata/md5-cache/sys-devel/gcc-4.6.4
index 411301301871..a2f3a51eb31b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0b8362c82ddcd2644cca03e1d286bbaa
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4-r2 b/metadata/md5-cache/sys-devel/gcc-4.6.4-r2
index 540cbb0e223a..b82707a5a650 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.5.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=933cb429614a5207e83597549d87c7e4
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
index 84e349f68467..81751e5626cc 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7c4348c5456f94428a7c422251a1f18
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4-r3 b/metadata/md5-cache/sys-devel/gcc-4.7.4-r3
index d1dffd985d58..bd72a8117179 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.6.tar.bz2 mirror://gentoo/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-piepatches-v0.5.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2212b967cdf0ce79e3a78c70636783fb
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.5-r1 b/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
index cc0945d621fd..c0fe1171750a 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.5-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5208fe90a7af46207bca10b23ea935ac
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.5-r3 b/metadata/md5-cache/sys-devel/gcc-4.8.5-r3
index 24d9ea902baf..b2870dfea298 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.5-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.5-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.5.tar.bz2 mirror://gentoo/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-piepatches-v0.6.2.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=864c70b56d2c0dd6f54f82d9a5308558
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4 b/metadata/md5-cache/sys-devel/gcc-4.9.4
index c7d799ab5c92..100604407d06 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2c051e9cf5eb44aa3fdb596e4e1c7c83
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
index c22a857051ab..2883cffd69b0 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.4.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v0.6.4.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bc9ac4fa5bc7919e21e32d9a4e0b59c1
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
index 1ddce09fbb9a..b3574a9f76a8 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.9.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eaa0d13b0e1d57db19fc7011c9befd7b
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r6 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r6
index a30490911bc2..39d72d1810f6 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r6
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r6
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.11.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.11.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b18328c29f63fa1914f57adb1a570d2
diff --git a/metadata/md5-cache/sys-devel/gcc-5.5.0 b/metadata/md5-cache/sys-devel/gcc-5.5.0
index 87f7477b3f73..10fd006fcb9e 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-5.5.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=5.5.0
 SRC_URI=mirror://gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.xz mirror://gentoo/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c725c4af43e3c3b4ebc995d53ba094b7
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
index 03f03e86efc6..7f87cb010aa0 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.3.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8c07f4b3f1057325c5297a300d7a3e3
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0-r5 b/metadata/md5-cache/sys-devel/gcc-6.4.0-r5
index a65553433acf..0b3add4218dc 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0-r5
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0-r5
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.8.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eab704a174f4f72ee52c10d51288a78f
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
index e39bd4a464d9..5cdc1eec57b4 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=6.5.0
 SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fd8abb938a8bf0cfd3bfa80923684c3b
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0-r3 b/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
index 0991ef8fbafc..d7be0f86d4b5 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8a97475e8d048e3adf03495a5d3719d1
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0-r6 b/metadata/md5-cache/sys-devel/gcc-7.3.0-r6
index e4d3382c4e12..ab881a08711e 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0-r6
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0-r6
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=09e59f6d7fc4cb431ef19b926a610d1f
diff --git a/metadata/md5-cache/sys-devel/gcc-7.4.0-r1 b/metadata/md5-cache/sys-devel/gcc-7.4.0-r1
index b597f1c1b8a0..3d569a533235 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.4.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-7.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.4.0
 SRC_URI=mirror://gnu/gcc/gcc-7.4.0/gcc-7.4.0.tar.xz mirror://gentoo/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.4.0-patches-1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f82587a71bfd62de6c781a42ebd45304
diff --git a/metadata/md5-cache/sys-devel/gcc-7.4.0-r2 b/metadata/md5-cache/sys-devel/gcc-7.4.0-r2
index 0016279dd0d9..096a00eabf16 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.4.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-7.4.0-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=7.4.0
 SRC_URI=mirror://gnu/gcc/gcc-7.4.0/gcc-7.4.0.tar.xz mirror://gentoo/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.4.0-patches-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50151b6ee0a38b94d7d5e2dfab2aee82
diff --git a/metadata/md5-cache/sys-devel/gcc-8.2.0-r5 b/metadata/md5-cache/sys-devel/gcc-8.2.0-r5
index ce96b8016c83..813be287d9a7 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.2.0-r5
+++ b/metadata/md5-cache/sys-devel/gcc-8.2.0-r5
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.2.0
 SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.2.0-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.2.0-patches-1.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c1c1937e58c871d2b137b5598896d6f5
diff --git a/metadata/md5-cache/sys-devel/gcc-8.2.0-r6 b/metadata/md5-cache/sys-devel/gcc-8.2.0-r6
index c9605b59946a..034640cb24f4 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.2.0-r6
+++ b/metadata/md5-cache/sys-devel/gcc-8.2.0-r6
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.2.0
 SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.2.0-patches-1.7.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.2.0-patches-1.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8662040db10cce70d663f811a4177f2c
diff --git a/metadata/md5-cache/sys-devel/gcc-8.3.0 b/metadata/md5-cache/sys-devel/gcc-8.3.0
index 46b10b90385b..031192188963 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.3.0
+++ b/metadata/md5-cache/sys-devel/gcc-8.3.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b33fa6966647c15c744a2cdbf29b0c2b
diff --git a/metadata/md5-cache/sys-devel/gcc-8.3.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.3.0-r1
index 649910b041a0..b5f6b347a333 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.3.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.3.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=754cfab0b624c66aa9f8810527da734c
diff --git a/metadata/md5-cache/sys-devel/gcc-9.1.0 b/metadata/md5-cache/sys-devel/gcc-9.1.0
index 63964b968908..2d967f395440 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.1.0
+++ b/metadata/md5-cache/sys-devel/gcc-9.1.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=9.1.0
 SRC_URI=mirror://gnu/gcc/gcc-9.1.0/gcc-9.1.0.tar.xz mirror://gentoo/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.1.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.1.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e5625d994498b125cfa030274fcdc96
diff --git a/metadata/md5-cache/sys-devel/gcc-9.1.0-r1 b/metadata/md5-cache/sys-devel/gcc-9.1.0-r1
index 38503c65322a..bd17459e07c1 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.1.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-9.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=9.1.0
 SRC_URI=mirror://gnu/gcc/gcc-9.1.0/gcc-9.1.0.tar.xz mirror://gentoo/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.1.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=906b707fbad1cd1f08179a66bb2f1a30
diff --git a/metadata/md5-cache/sys-devel/gcc-9.2.0 b/metadata/md5-cache/sys-devel/gcc-9.2.0
index 4a3fe782887a..ca3fa911208f 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.2.0
+++ b/metadata/md5-cache/sys-devel/gcc-9.2.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=9.2.0
 SRC_URI=mirror://gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz mirror://gentoo/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.2.0-patches-1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1217d309fb4d2fbb7a10f7975266c9ce
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
index 251080a42072..8ea622271e73 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9d045438c8d24fad84c5133405ed383f
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.1 b/metadata/md5-cache/sys-devel/gcc-config-2.1
new file mode 100644
index 000000000000..d5827879cde3
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-config-2.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Utility to manage compilers
+EAPI=7
+HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/gentoo-functions-0.10
+SLOT=0
+SRC_URI=mirror://gentoo/gcc-config-2.1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gcc-config-2.1.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=8f866e4f33968711dd7ff089a43f28d6
diff --git a/metadata/md5-cache/sys-devel/gcc-config-9999 b/metadata/md5-cache/sys-devel/gcc-config-9999
index 985251179cfe..e6ccc02b1335 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-9999
+++ b/metadata/md5-cache/sys-devel/gcc-config-9999
@@ -1,11 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Utility to manage compilers
-EAPI=6
+EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=fa16f4e1ccc7f37fd2e7063f4a12d654
+_md5_=37d218550528ff356375bbd04bc7195a
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-20161104 b/metadata/md5-cache/sys-devel/gnuconfig-20161104
deleted file mode 100644
index 1b9734ce43a0..000000000000
--- a/metadata/md5-cache/sys-devel/gnuconfig-20161104
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DESCRIPTION=Updated config.sub and config.guess file from GNU
-EAPI=5
-HOMEPAGE=https://savannah.gnu.org/projects/config
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/gnuconfig-20161104.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=27ec7ccaa45bbc888c3c56cf3f960c70
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-20180101 b/metadata/md5-cache/sys-devel/gnuconfig-20180101
index 110a03e016dc..425f45072599 100644
--- a/metadata/md5-cache/sys-devel/gnuconfig-20180101
+++ b/metadata/md5-cache/sys-devel/gnuconfig-20180101
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare test unpack
 DESCRIPTION=Updated config.sub and config.guess file from GNU
 EAPI=5
 HOMEPAGE=https://savannah.gnu.org/projects/config
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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-fbsd ~x86-fbsd ~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
 SLOT=0
 SRC_URI=mirror://gentoo/gnuconfig-20180101.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a0ae7d96852cecee3aeef8fa1ff16a58
+_md5_=4986e6e643c159291cdef7c380ac7f99
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-20190804 b/metadata/md5-cache/sys-devel/gnuconfig-20190804
new file mode 100644
index 000000000000..bdece7ada05e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gnuconfig-20190804
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare test unpack
+DESCRIPTION=Updated config.sub and config.guess file from GNU
+EAPI=6
+HOMEPAGE=https://savannah.gnu.org/projects/config
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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
+SLOT=0
+SRC_URI=mirror://gentoo/gnuconfig-20190804.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a590054b4d48bfbd71fa47388f32ee6a
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-99999999 b/metadata/md5-cache/sys-devel/gnuconfig-99999999
index 4711750b8435..dbd3a327c30a 100644
--- a/metadata/md5-cache/sys-devel/gnuconfig-99999999
+++ b/metadata/md5-cache/sys-devel/gnuconfig-99999999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare test unpack
 DEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Updated config.sub and config.guess file from GNU
-EAPI=5
+EAPI=6
 HOMEPAGE=https://savannah.gnu.org/projects/config
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=418c6cf071a4588c423e1d96105b637b
+_md5_=a590054b4d48bfbd71fa47388f32ee6a
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index 2bd5024f9008..2ae66df15cce 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.1.2
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.1.2
 SRC_URI=mirror://gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 mirror://gentoo/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-1.0.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4287b0b7f9ce8b6865f6948812501cc8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.2.4 b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
index 90e16a3a33ae..e7dccfb27652 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.2.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.2.4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=strip
 SLOT=4.2.4
 SRC_URI=mirror://gnu/gcc/gcc-4.2.4/gcc-4.2.4.tar.bz2 mirror://gentoo/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b6f206f7701d664aa14a87c3585f0ddd
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.3.5 b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
index 9e5d159c6776..8aeeb2fef8ce 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.3.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.3.5
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=4.3.5
 SRC_URI=mirror://gnu/gcc/gcc-4.3.5/gcc-4.3.5.tar.bz2 mirror://gentoo/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.5-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.5-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ec6572a5964dbd4fb0e9b408ab1a4906
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.5 b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
index 938d398f35d6..1f56c8628847 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4.5
 SRC_URI=mirror://gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.bz2 mirror://gentoo/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.5-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.5-patches-1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=885ff8764444180b5b9468b039d1d6c7
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.4.6 b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
index c98925324276..a61a180f1085 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.4.6
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.4.6
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.3.2 >=sys-devel/gcc-config-1.4 sy
 RESTRICT=strip
 SLOT=4.4.6
 SRC_URI=mirror://gnu/gcc/gcc-4.4.6/gcc-4.4.6.tar.bz2 mirror://gentoo/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.6-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.6-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7c248eb43f85d6e92aa0d3da6bb4643e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.3 b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
index b11a2ba5a92e..ccd19ed7d872 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5.3
 SRC_URI=mirror://gnu/gcc/gcc-4.5.3/gcc-4.5.3.tar.bz2 mirror://gentoo/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.3-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.3-patches-1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bc38515ddf23da9bea281583fd294e01
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.5.4 b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
index 0f6a98b7c014..359a66c20bb6 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.5.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.5.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.5.4
 SRC_URI=mirror://gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2 mirror://gentoo/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=66fb8a6b7789b020c7ec831ff6734136
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.6.4 b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
index ad3d0be195bf..35c794a86206 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.6.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.6.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.6.4
 SRC_URI=mirror://gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.bz2 mirror://gentoo/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=72222fd69b078160875299e54f945848
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.3 b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
index 8b6810e49267..bb307a430949 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.7.3
 SRC_URI=mirror://gnu/gcc/gcc-4.7.3/gcc-4.7.3.tar.bz2 mirror://gentoo/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-patches-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5f7f7adb1120b7069c7bff6460186eb
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.7.4 b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
index f224169b718d..461f376d43aa 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.7.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.7.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.7.4
 SRC_URI=mirror://gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 mirror://gentoo/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f12ff1dddfea91247a92f36600960ad6
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.3 b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
index fd2dc92f6630..e22814df1c81 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.3
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.8.3
 SRC_URI=mirror://gnu/gcc/gcc-4.8.3/gcc-4.8.3.tar.bz2 mirror://gentoo/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.3-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.3-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8471dd65776a9de1df31e6ac5983dbd4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.8.5 b/metadata/md5-cache/sys-devel/kgcc64-4.8.5
index fd2d08b150ae..3dfad79672de 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.8.5
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.8.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.8.5
 SRC_URI=mirror://gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2 mirror://gentoo/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5be437344c8ffaae90c70c4fdd9ddc60
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.9.4 b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
index 3b2a6aed2e1e..86ecb9ad1919 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-4.9.4
+++ b/metadata/md5-cache/sys-devel/kgcc64-4.9.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=4.9.4
 SRC_URI=mirror://gnu/gcc/gcc-4.9.4/gcc-4.9.4.tar.bz2 mirror://gentoo/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-5.4.0 b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
index f4d8f74d88ed..8addf7a88137 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-5.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-5.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=5.4.0
 SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.3.0 b/metadata/md5-cache/sys-devel/kgcc64-6.3.0
index 39c01742ad03..0c51f9c125b4 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=6.3.0
 SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dd30e381df3740b88e76ffa3e5a8933e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-6.4.0 b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
index c2ad0b93784d..5bc0cd35a882 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-6.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-6.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=6.4.0
 SRC_URI=mirror://gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz mirror://gentoo/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4664212d44d7899566dd93153173e74e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.2.0 b/metadata/md5-cache/sys-devel/kgcc64-7.2.0
index 1a23805abf38..0d65afd95f94 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=7.2.0
 SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.1.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cebaf5a44a3f27a06d34b25f117ec3f4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-7.3.0 b/metadata/md5-cache/sys-devel/kgcc64-7.3.0
index f0a7cd5dd856..7929ea8ef75c 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-7.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-7.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=7.3.0
 SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7c76e15073553d95a38e1d2cec3e32c4
diff --git a/metadata/md5-cache/sys-devel/kgcc64-8.2.0 b/metadata/md5-cache/sys-devel/kgcc64-8.2.0
index 640ade83b7ce..1c6a27342ec7 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=8.2.0
 SRC_URI=mirror://gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz mirror://gentoo/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.1.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.1.0-patches-1.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7692942c28ca16a1a019705350e29088
diff --git a/metadata/md5-cache/sys-devel/kgcc64-8.3.0 b/metadata/md5-cache/sys-devel/kgcc64-8.3.0
index 562bd9164187..fcaf7ea8a270 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 >=sys-de
 RESTRICT=strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f85787023afacf25f97077d7f472118
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.1.0 b/metadata/md5-cache/sys-devel/kgcc64-9.1.0
index f1e39c3a77ec..ff330615d5d4 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.1.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.1.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=9.1.0
 SRC_URI=mirror://gnu/gcc/gcc-9.1.0/gcc-9.1.0.tar.xz mirror://gentoo/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.1.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5756d668b26576277a3a1e42c7a29bae
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.2.0 b/metadata/md5-cache/sys-devel/kgcc64-9.2.0
index d657e6614d23..b5d1fad38688 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.2.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=strip
 SLOT=9.2.0
 SRC_URI=mirror://gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz mirror://gentoo/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.2.0-patches-1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	f10289dcdd815611b6e6ae00c98f7922	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=74b7b6deab0a7032e778604278c91faf
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r4 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r4
index 65e3dc38028b..017c41d47e29 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r4
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e35b065feb538e9a1629c032ac240f12
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r5 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r5
index d8c26bf9af7c..3f6512a56d54 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r5
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.6-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3fc589c074e8d43738a4a0a6b45e8e91
diff --git a/metadata/md5-cache/sys-devel/libtool-9999 b/metadata/md5-cache/sys-devel/libtool-9999
index 235143c2f108..c053b7eb1578 100644
--- a/metadata/md5-cache/sys-devel/libtool-9999
+++ b/metadata/md5-cache/sys-devel/libtool-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
 SLOT=2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ab42b440535e7d58d643388d89d91d81
diff --git a/metadata/md5-cache/sys-devel/lld-8.0.1 b/metadata/md5-cache/sys-devel/lld-8.0.1
index b6c1ba134150..fe65cbd8b6b0 100644
--- a/metadata/md5-cache/sys-devel/lld-8.0.1
+++ b/metadata/md5-cache/sys-devel/lld-8.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=The LLVM linker (link editor)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-8.0.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/lld-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz )
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34c17c250ecc9ddcbed03fb943712a67
+_md5_=0e9a0ee249b4de2535faad4cdd0fba1a
diff --git a/metadata/md5-cache/sys-devel/llvm-5.0.2 b/metadata/md5-cache/sys-devel/llvm-5.0.2
deleted file mode 100644
index e0478294e6b8..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-5.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sys-libs/zlib: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(-)?] gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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.9-r3: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(-)?] ) dev-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) kernel_Darwin? ( <sys-libs/libcxx-5.0.2.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=Low Level Virtual Machine
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=debug doc gold libedit +libffi ncurses test kernel_Darwin kernel_linux llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore 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 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
-PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-5 )
-RDEPEND=sys-libs/zlib: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(-)?] gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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.9-r3: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(-)?] ) !sys-devel/llvm:0
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
-SLOT=5
-SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.1-patchset.tar.bz2 !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.2-manpages.tar.bz2 )
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b8d1dfdae392638a589be9dd6f31ab3
diff --git a/metadata/md5-cache/sys-devel/llvm-8.0.1 b/metadata/md5-cache/sys-devel/llvm-8.0.1
index d13068e9f32a..7db2cc6b843c 100644
--- a/metadata/md5-cache/sys-devel/llvm-8.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-8.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Low Level Virtual Machine
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore 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 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
 PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-8 )
 RDEPEND=sys-libs/zlib: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(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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.9-r3: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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2: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(-)?] ) !sys-devel/llvm:0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-8.0.1-manpages.tar.bz2 )
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=227936fd4731e10de10d77ec1ce905a5
+_md5_=950abda0845b22f6925e0f209591bf9d
diff --git a/metadata/md5-cache/sys-devel/llvm-common-5.0.2 b/metadata/md5-cache/sys-devel/llvm-common-5.0.2
deleted file mode 100644
index ff3025649c14..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-5.0.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=6
-HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz
-_md5_=4c52db077eed4d5e698e4d090e5221ce
diff --git a/metadata/md5-cache/sys-devel/llvm-common-8.0.1 b/metadata/md5-cache/sys-devel/llvm-common-8.0.1
index 86e3a4996708..fa75793bf1a4 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-8.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-common-8.0.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=Common files shared between multiple slots of LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz
-_md5_=dc5c195929394c0173cd9d4c1d9bb962
+_md5_=67caafca66bfa85613daebeada773ab5
diff --git a/metadata/md5-cache/sys-devel/llvmgold-5 b/metadata/md5-cache/sys-devel/llvmgold-5
deleted file mode 100644
index 9dc3d6666b2b..000000000000
--- a/metadata/md5-cache/sys-devel/llvmgold-5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=LLVMgold plugin symlink for autoloading
-EAPI=6
-HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux
-LICENSE=public-domain
-RDEPEND=sys-devel/llvm:5[gold] !sys-devel/llvm:0
-SLOT=0
-_md5_=241ae96ffcf2262298942d67d3c8179b
diff --git a/metadata/md5-cache/sys-devel/llvmgold-8 b/metadata/md5-cache/sys-devel/llvmgold-8
index 0ae8a3192af9..2f3c46df59cd 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-8
+++ b/metadata/md5-cache/sys-devel/llvmgold-8
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=6
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux
+KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:8[gold] !sys-devel/llvm:0
 SLOT=0
-_md5_=d8a0f3000c74f4fc2e187aea62a6b270
+_md5_=e7de9c46d675c8590a2722fc3b2ae780
diff --git a/metadata/md5-cache/sys-fabric/Manifest.gz b/metadata/md5-cache/sys-fabric/Manifest.gz
index 817017db50ab..7839d85f078b 100644
--- a/metadata/md5-cache/sys-fabric/Manifest.gz
+++ b/metadata/md5-cache/sys-fabric/Manifest.gz
diff --git a/metadata/md5-cache/sys-fabric/infinipath-psm-3.2 b/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
index a65eee83b600..581a670c2967 100644
--- a/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
+++ b/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/infinipath-psm:0 !sys-fabric/infinipath-psm:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9635e09ab70f1fc2148f68c9ff4db65e
diff --git a/metadata/md5-cache/sys-fabric/ofed-3.12_rc1 b/metadata/md5-cache/sys-fabric/ofed-3.12_rc1
index e5dfe2069b78..f3f7e14a672b 100644
--- a/metadata/md5-cache/sys-fabric/ofed-3.12_rc1
+++ b/metadata/md5-cache/sys-fabric/ofed-3.12_rc1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=!sys-fabric/openib !sys-fabric/openib-files sys-fabric/libibcm:3.12 sys-fabric/libibmad:3.12 sys-fabric/libibumad:3.12 sys-fabric/librdmacm:3.12 dapl? ( sys-fabric/dapl:3.12 ) diags? ( sys-fabric/infiniband-diags:3.12 ) ibacm? ( sys-fabric/ibacm:3.12 ) opensm? ( sys-fabric/opensm:3.12 ) perftest? ( sys-fabric/perftest:3.12 ) qperf? ( sys-fabric/qperf:3.12 ) srp? ( sys-fabric/srptools:3.12 ) rds? ( sys-fabric/rds-tools:3.12 ) ofed_drivers_cxgb3? ( sys-fabric/libcxgb3:3.12 ) ofed_drivers_cxgb4? ( sys-fabric/libcxgb4:3.12 ) ofed_drivers_ehca? ( sys-fabric/libehca:3.12 ) ofed_drivers_ipath? ( sys-fabric/libipathverbs:3.12 ) ofed_drivers_mlx4? ( sys-fabric/libmlx4:3.12 ) ofed_drivers_mlx5? ( sys-fabric/libmlx5:3.12 ) ofed_drivers_mthca? ( sys-fabric/libmthca:3.12 ) ofed_drivers_nes? ( sys-fabric/libnes:3.12 ) ofed_drivers_ocrdma? ( sys-fabric/libocrdma:3.12 ) ofed_drivers_psm? ( sys-fabric/infinipath-psm:3.12 ) !sys-fabric/ofed:0 !sys-fabric/ofed:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=aef86e3f03d45fffbd5bc07fa82ea0ff
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index c9432262cb0e..2986f0ce7c92 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.29 b/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.29
index 7303d89a6bec..555dfac0d09c 100644
--- a/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.29
+++ b/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.29
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa_cards_usb-usx2y? ( sys-apps/fxload ) alsa_cards_hdsp? ( media-sound/alsa-tools ) alsa_cards_hdspm? ( media-sound/alsa-tools )
 SLOT=0
 SRC_URI=mirror://alsaproject/firmware/alsa-firmware-1.0.29.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=ca0f8a96c6582c6e3b39ea0a49aa97df
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190819 b/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190819
deleted file mode 100644
index 7fe588c9ddd6..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190819
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DEPEND=sys-apps/iucode_tool
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=6
-HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
-IUSE=hostonly initramfs +split-ucode vanilla kernel_linux
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks bindist mirror strip
-SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20190618.tar.gz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20190819.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c0177ee4ed4324001311edc0f8cd7300
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190908 b/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190908
new file mode 100644
index 000000000000..3ae2d78c8096
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20190618_p20190908
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
+DEPEND=sys-apps/iucode_tool
+DESCRIPTION=Intel IA32/IA64 microcode update data
+EAPI=6
+HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
+IUSE=hostonly initramfs +split-ucode vanilla kernel_linux
+KEYWORDS=-* amd64 x86
+LICENSE=intel-ucode
+RDEPEND=hostonly? ( sys-apps/iucode_tool )
+REQUIRED_USE=|| ( initramfs split-ucode )
+RESTRICT=binchecks bindist mirror strip
+SLOT=0
+SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20190618.tar.gz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20190908.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=c0177ee4ed4324001311edc0f8cd7300
diff --git a/metadata/md5-cache/sys-firmware/midisport-firmware-1.2 b/metadata/md5-cache/sys-firmware/midisport-firmware-1.2
index 69c0a4b5364e..5adac13de10f 100644
--- a/metadata/md5-cache/sys-firmware/midisport-firmware-1.2
+++ b/metadata/md5-cache/sys-firmware/midisport-firmware-1.2
@@ -9,5 +9,5 @@ LICENSE=Midisport
 RDEPEND=sys-apps/fxload virtual/udev
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/usb-midi-fw/midisport-firmware-1.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=292cbf787ef3e518b41a41646fbfd2cd
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 1484c9ec430d..6f2f6ce6765d 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/bcache-tools-1.0.5 b/metadata/md5-cache/sys-fs/bcache-tools-1.0.5
index fefe985610bb..d5cfa1d6c171 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.0.5
+++ b/metadata/md5-cache/sys-fs/bcache-tools-1.0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.24
 SLOT=0
 SRC_URI=https://github.com/g2p/bcache-tools/archive/v1.0.5.tar.gz -> bcache-tools-1.0.5.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=5bdd18a868926c3f7e72df7c9d814574
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-1.0.8 b/metadata/md5-cache/sys-fs/bcache-tools-1.0.8
index 6adca40fe390..61674fdcda57 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.0.8
+++ b/metadata/md5-cache/sys-fs/bcache-tools-1.0.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.24
 SLOT=0
 SRC_URI=https://github.com/g2p/bcache-tools/archive/v1.0.8.tar.gz -> bcache-tools-1.0.8.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=5bdd18a868926c3f7e72df7c9d814574
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-1.0.8_p20140220-r1 b/metadata/md5-cache/sys-fs/bcache-tools-1.0.8_p20140220-r1
index 1dc46e2003db..11340dae58e4 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.0.8_p20140220-r1
+++ b/metadata/md5-cache/sys-fs/bcache-tools-1.0.8_p20140220-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/g2p/bcache-tools/archive/v1.0.8.tar.gz -> bcache-tools-1.0.8_p20140220.tgz https://dev.gentoo.org/~jlec/distfiles/bcache-status-20140220.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=04c10ef3d9076a970a1e925754b1e8d8
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-9999 b/metadata/md5-cache/sys-fs/bcache-tools-9999
index a279bd8a918f..00b8e3bc914e 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-9999
+++ b/metadata/md5-cache/sys-fs/bcache-tools-9999
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.24
 SLOT=0
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=977caf5e701a4f3deadf704d879ed8af
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.2.1 b/metadata/md5-cache/sys-fs/cryptsetup-2.2.1
index 48074148723e..5a91b96536d8 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.2.1
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.2.1
@@ -5,11 +5,11 @@ DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=7
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 IUSE=gcrypt kernel nettle +openssl +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=GPL-2+
 RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) libressl? ( openssl ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=mirror://kernel/linux/utils/cryptsetup/v2.2/cryptsetup-2.2.1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=121e54b0811c52f92fef0570da5aea7f
+_md5_=54563a5180ba43ed70a8efaf16854dd5
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.2 b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.2
index 8235bf6ff8a3..f38e339d4602 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.2
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.45.2 >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.45.2.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.2/e2fsprogs-1.45.2.tar.xz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
 _md5_=1494d74f4604b602cf8844d58d6210f9
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.3 b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.3
index c88c70904c9c..3694313f2e24 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.45.3
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.45.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.45.3 >=sys-apps/util-linux-2.16 cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.45.3.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.3/e2fsprogs-1.45.3.tar.xz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
 _md5_=8a67e5da8722ccc64037d0c2adcf3fe5
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.8 b/metadata/md5-cache/sys-fs/fuse-2.9.8
index d2e26cc37d79..cd58679aed02 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.8
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.8
@@ -10,5 +10,5 @@ PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 RDEPEND=sys-fs/fuse-common
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.8/fuse-2.9.8.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=b43ebb924216d40debb0f0c8ff94bd04
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.9 b/metadata/md5-cache/sys-fs/fuse-2.9.9
index 11e704cc1c9f..b49e1834aed5 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.9
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.9
@@ -11,5 +11,5 @@ PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=031a9d26a5ba1fd3019d70565d9728d3
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.9-r1 b/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
index 36116000068d..5e5716bd9b14 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
@@ -11,5 +11,5 @@ PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=6e14878eb86e1e9dc059ef706dadc94b
diff --git a/metadata/md5-cache/sys-fs/fuse-3.6.2 b/metadata/md5-cache/sys-fs/fuse-3.6.2
index 325a153d5d76..ea69ca9e1bf6 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.6.2
+++ b/metadata/md5-cache/sys-fs/fuse-3.6.2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.6.2/fuse-3.6.2.tar.xz
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=dbcaaf79c5655797269a1b35ac781f39
diff --git a/metadata/md5-cache/sys-fs/fuse-common-3.2.6 b/metadata/md5-cache/sys-fs/fuse-common-3.2.6
index 2b36be880895..15e1c2889ebe 100644
--- a/metadata/md5-cache/sys-fs/fuse-common-3.2.6
+++ b/metadata/md5-cache/sys-fs/fuse-common-3.2.6
@@ -9,5 +9,5 @@ RDEPEND=!<sys-fs/fuse-2.9.7-r1:0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.6/fuse-3.2.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ebd559c3cc72f46e699cf47a1dfeb0aa
diff --git a/metadata/md5-cache/sys-fs/fuse-common-3.3.0-r1 b/metadata/md5-cache/sys-fs/fuse-common-3.3.0-r1
index 6b5ff9661ada..e1801d1eb7e5 100644
--- a/metadata/md5-cache/sys-fs/fuse-common-3.3.0-r1
+++ b/metadata/md5-cache/sys-fs/fuse-common-3.3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!<sys-fs/fuse-2.9.7-r1:0
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.3.0/fuse-3.3.0.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=26e46c6174942dd246e27ba6f99d0423
diff --git a/metadata/md5-cache/sys-fs/fuse-common-3.4.1 b/metadata/md5-cache/sys-fs/fuse-common-3.4.1
index 1893b771c1c0..387eddb516b0 100644
--- a/metadata/md5-cache/sys-fs/fuse-common-3.4.1
+++ b/metadata/md5-cache/sys-fs/fuse-common-3.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!<sys-fs/fuse-2.9.7-r1:0
 SLOT=0
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.4.1/fuse-3.4.1.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=004953d92c6fbeb622c0bd7a83e0ba21
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.116 b/metadata/md5-cache/sys-fs/lvm2-2.02.116
index 9fe636f13ac1..bbd883f871c6 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.116
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.116
@@ -3,12 +3,12 @@ DEPEND=readline? ( sys-libs/readline:0= ) udev? ( >=virtual/libudev-208:=[static
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=5
 HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only kernel_linux split-usr
+IUSE=readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only kernel_linux
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=readline? ( sys-libs/readline:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !lvm1 !lvm2create_initrd !thin ) systemd? ( udev ) static? ( !udev !systemd )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.116.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.116.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b5eb80d824f58a969dbe3f4b73d41e4a
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9d6532fb88824682f53a632fb211aed3
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
index 70ad0571b535..d1858b4828a7 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.145-r2
@@ -3,12 +3,12 @@ DEPEND=readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/systemd-205:0= )
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=6
 HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only kernel_linux split-usr
+IUSE=readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only kernel_linux
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !lvm1 !lvm2create_initrd !thin ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.145.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.145.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4469a35c270246a6ed62b864871611ac
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8d51dd33d15b6f8e99ef3a8ba8a15679
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.183 b/metadata/md5-cache/sys-fs/lvm2-2.02.183
index e3800e2bd46b..fbefa6d637ea 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.183
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.183
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !s
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=6
 HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only kernel_linux split-usr
+IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only kernel_linux
 KEYWORDS=alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.183.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.183.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=36ac138bd9718040571d1120d4e46979
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e3a090fb3f51513dcf87350fa7bb0e4f
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.184-r4 b/metadata/md5-cache/sys-fs/lvm2-2.02.184-r4
index 2688a19ce12c..4729d63db1b9 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.184-r4
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.184-r4
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !s
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=6
 HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only kernel_linux split-usr
+IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only kernel_linux
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.184.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.184.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=472c2666cd5f3a9578e9faf2628bd432
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=663201f23854eb5352e173bbe9755263
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.185-r1 b/metadata/md5-cache/sys-fs/lvm2-2.02.185-r1
index 5fd7b0e4fb49..f0cbde8b62ac 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.185-r1
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.185-r1
@@ -4,12 +4,12 @@ DEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !s
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=7
 HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only kernel_linux split-usr
+IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.185.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.185.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=20da49196a6f448fc2f60b95502559a9
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=cb661305c9b5c179216d76f8b5684b59
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.186 b/metadata/md5-cache/sys-fs/lvm2-2.02.186
index 4a3fdc28fe33..cf8c4404c397 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.186
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.186
@@ -4,12 +4,12 @@ DEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !s
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=7
 HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only kernel_linux split-usr
+IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.186.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.186.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=20da49196a6f448fc2f60b95502559a9
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=cb661305c9b5c179216d76f8b5684b59
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.05-r1 b/metadata/md5-cache/sys-fs/lvm2-2.03.05-r1
index af99153360c1..923e1fd65298 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.05-r1
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.05-r1
@@ -4,12 +4,12 @@ DEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !s
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=7
 HOMEPAGE=https://sourceware.org/lvm2/
-IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only kernel_linux split-usr
+IUSE=readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:=[static-libs?] ) >=sys-apps/baselayout-2.2 !<sys-apps/openrc-0.11 !<sys-fs/cryptsetup-1.1.2 !!sys-fs/lvm-user >=sys-apps/util-linux-2.16 lvm2create_initrd? ( sys-apps/makedev ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
 REQUIRED_USE=device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.03.05.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.03.05.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=33b18821af789ac805b22a81f51e6173
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=75a567fd47fc0bf007bcbd002dc008ac
diff --git a/metadata/md5-cache/sys-fs/mdadm-4.1 b/metadata/md5-cache/sys-fs/mdadm-4.1
index 7fb13c27a04b..612dc717b745 100644
--- a/metadata/md5-cache/sys-fs/mdadm-4.1
+++ b/metadata/md5-cache/sys-fs/mdadm-4.1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/util-linux-2.16
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_4.1~rc1-4.debian.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9374a8696056e3e3273034841b0c9ecb
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1 b/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
index 011f06ac813a..ecc82b1d43ff 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu:= sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd )
 SLOT=0
 SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.6.4;sf=tgz -> multipath-tools-0.6.4.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=a5e69adfdcb4ae4ca5aa11bdd9094801
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.7.9 b/metadata/md5-cache/sys-fs/multipath-tools-0.7.9
index b57da20c70c7..d6aabf7772de 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.7.9
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.7.9
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.7.9;sf=tgz -> multipath-tools-0.7.9.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=8e64777d6fc8671beb8cbf8261a855f6
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.8.1 b/metadata/md5-cache/sys-fs/multipath-tools-0.8.1
index 4aa71ff6313b..e9004fc7aa0f 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.8.1
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.1;sf=tgz -> multipath-tools-0.8.1.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=03f39cd23a6462b4778ae9d9fd038b4b
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.8.2 b/metadata/md5-cache/sys-fs/multipath-tools-0.8.2
index f2194ebfb704..5043912fee76 100644
--- a/metadata/md5-cache/sys-fs/multipath-tools-0.8.2
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/json-c:= dev-libs/libaio dev-libs/userspace-rcu:= >=sys-fs/lvm2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.2;sf=tgz -> multipath-tools-0.8.2.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=fba6697b8610a947ed27dc6c6cf24fff
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2 b/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
index 4b028ad0a8d4..9bb805f28c81 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2016.2.22-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/util-linux-2.20.1-r2 !sys-fs/ntfsprogs ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 <sys-fs/fuse-3.0.0_pre )
 SLOT=0/87
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2016.2.22.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6518862469adadd4756ddeaf4fa8be68
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r1 b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r1
index 5d5fd67684f4..65a73ab4b3ec 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r1
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/util-linux-2.20.1-r2 !sys-fs/ntfsprogs ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0:0 )
 SLOT=0/88
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2017.3.23.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1db008af5c7a5c82b43c3cd3ace325e4
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r2 b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r2
index 38988c9cf889..e0d15d0abdc9 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r2
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<sys-apps/util-linux-2.20.1-r2 !sys-fs/ntfsprogs ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0:0 )
 SLOT=0/88
 SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2017.3.23.tgz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=75a27fcf4add891caef1d0c121f70301
diff --git a/metadata/md5-cache/sys-fs/udev-236-r1 b/metadata/md5-cache/sys-fs/udev-236-r1
index 662992dc24df..535b69802683 100644
--- a/metadata/md5-cache/sys-fs/udev-236-r1
+++ b/metadata/md5-cache/sys-fs/udev-236-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6eea47095a9ad21cbe4bb47772b56341
diff --git a/metadata/md5-cache/sys-fs/udev-238 b/metadata/md5-cache/sys-fs/udev-238
index ce41733238c1..5c33cb9af67e 100644
--- a/metadata/md5-cache/sys-fs/udev-238
+++ b/metadata/md5-cache/sys-fs/udev-238
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v238.tar.gz -> systemd-238.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=201c5d4a368afcb2f2077f0e27f64436
diff --git a/metadata/md5-cache/sys-fs/udev-239 b/metadata/md5-cache/sys-fs/udev-239
index 22e6849956a7..0ee8b1065a10 100644
--- a/metadata/md5-cache/sys-fs/udev-239
+++ b/metadata/md5-cache/sys-fs/udev-239
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v239.tar.gz -> systemd-239.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=39c678835d41c8dc36f9d5284cc73f01
diff --git a/metadata/md5-cache/sys-fs/udev-240-r2 b/metadata/md5-cache/sys-fs/udev-240-r2
index 46f4a8b43b9a..c27892675328 100644
--- a/metadata/md5-cache/sys-fs/udev-240-r2
+++ b/metadata/md5-cache/sys-fs/udev-240-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v240.tar.gz -> systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=e5731b746f2a3b1b47cddbcecb7bd3f2
diff --git a/metadata/md5-cache/sys-fs/udev-240-r3 b/metadata/md5-cache/sys-fs/udev-240-r3
index 3a7dcb7c0bcc..1b2e4513109e 100644
--- a/metadata/md5-cache/sys-fs/udev-240-r3
+++ b/metadata/md5-cache/sys-fs/udev-240-r3
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v240.tar.gz -> systemd-240.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-240-patches-3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=2f52045509fd6779fe7919e381c091d0
diff --git a/metadata/md5-cache/sys-fs/udev-241 b/metadata/md5-cache/sys-fs/udev-241
index 53ee3e364614..b02ebe41423d 100644
--- a/metadata/md5-cache/sys-fs/udev-241
+++ b/metadata/md5-cache/sys-fs/udev-241
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v241/systemd-241.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=410f6d5a3c70bf164b4853a929029a2c
diff --git a/metadata/md5-cache/sys-fs/udev-241_rc1 b/metadata/md5-cache/sys-fs/udev-241_rc1
index 7a5a5d10482d..f0cdafd798b8 100644
--- a/metadata/md5-cache/sys-fs/udev-241_rc1
+++ b/metadata/md5-cache/sys-fs/udev-241_rc1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v241-rc1/systemd-241-rc1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=169b46a589ce099f9feb900c2f711dab
diff --git a/metadata/md5-cache/sys-fs/udev-241_rc2 b/metadata/md5-cache/sys-fs/udev-241_rc2
index 8c9a386da64a..7690851d0a3c 100644
--- a/metadata/md5-cache/sys-fs/udev-241_rc2
+++ b/metadata/md5-cache/sys-fs/udev-241_rc2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v241-rc2/systemd-241-rc2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
 _md5_=169b46a589ce099f9feb900c2f711dab
diff --git a/metadata/md5-cache/sys-fs/udev-242 b/metadata/md5-cache/sys-fs/udev-242
index a3a5d176dd2b..952df90537d1 100644
--- a/metadata/md5-cache/sys-fs/udev-242
+++ b/metadata/md5-cache/sys-fs/udev-242
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v242/systemd-242.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=7ed7ef7a868817c07c0f59b15035f745
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 0c872a1c9707..5e819a69e12c 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/util-linux-2.30[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-libs/libcap[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(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/kmem acct-group/tty acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/lp acct-group/render acct-group/tape acct-group/video !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	562b380fc59ae6a8622171d0acb777d1	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=e5127e9aed7b1ff1256c81c1058e143a
diff --git a/metadata/md5-cache/sys-fs/udisks-1.0.5-r3 b/metadata/md5-cache/sys-fs/udisks-1.0.5-r3
index 749d37f7787e..c6a9de77f858 100644
--- a/metadata/md5-cache/sys-fs/udisks-1.0.5-r3
+++ b/metadata/md5-cache/sys-fs/udisks-1.0.5-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=sys-apps/dbus-1.6 >=sys-apps/sg3_utils-1.27.20090411 >=sys-block/parted-3 lvm? ( >=sys-fs/lvm2-2.02.66 <sys-fs/lvm2-2.02.183 ) virtual/libgudev:= virtual/libudev:= virtual/udev selinux? ( sec-policy/selinux-devicekit ) >=sys-apps/util-linux-2.20.1-r2 virtual/eject remote-access? ( net-dns/avahi )
 SLOT=0
 SRC_URI=https://hal.freedesktop.org/releases/udisks-1.0.5.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f15e8a67989d1e0247e55ac45d1aa220
diff --git a/metadata/md5-cache/sys-fs/udisks-2.8.2 b/metadata/md5-cache/sys-fs/udisks-2.8.2
index 1c9ea2f5cece..8935aad2b7fd 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.8.2
+++ b/metadata/md5-cache/sys-fs/udisks-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.1
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.8.2/udisks-2.8.2.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=494205abe202cd0a74a9ee7d59d1450e
diff --git a/metadata/md5-cache/sys-fs/udisks-2.8.3 b/metadata/md5-cache/sys-fs/udisks-2.8.3
index 7e62064c189d..fadf0e3d2efb 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.8.3
+++ b/metadata/md5-cache/sys-fs/udisks-2.8.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.1
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.8.3/udisks-2.8.3.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a68a46b09727d2d685d0390016dc99d6
diff --git a/metadata/md5-cache/sys-fs/udisks-2.8.4 b/metadata/md5-cache/sys-fs/udisks-2.8.4
index 3a6bb226685b..d5da7447dbae 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.8.4
+++ b/metadata/md5-cache/sys-fs/udisks-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.1
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.8.4/udisks-2.8.4.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a68a46b09727d2d685d0390016dc99d6
diff --git a/metadata/md5-cache/sys-fs/vhba-20190410 b/metadata/md5-cache/sys-fs/vhba-20190410
index c0ac5447e7d9..d44e53e91f80 100644
--- a/metadata/md5-cache/sys-fs/vhba-20190410
+++ b/metadata/md5-cache/sys-fs/vhba-20190410
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/udev kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/cdemu/vhba-module-20190410.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5441d840ac12e53c851a60dfffd87f18
diff --git a/metadata/md5-cache/sys-fs/vhba-20190827 b/metadata/md5-cache/sys-fs/vhba-20190827
index e69e3fc1f1ac..7381290140db 100644
--- a/metadata/md5-cache/sys-fs/vhba-20190827
+++ b/metadata/md5-cache/sys-fs/vhba-20190827
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/udev kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/cdemu/vhba-module-20190827.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=93bf9a95c3ee24cb98eeb154c9ff0efc
diff --git a/metadata/md5-cache/sys-fs/vhba-20190831 b/metadata/md5-cache/sys-fs/vhba-20190831
index b98d1ca33dbb..eb3cb31d0725 100644
--- a/metadata/md5-cache/sys-fs/vhba-20190831
+++ b/metadata/md5-cache/sys-fs/vhba-20190831
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/udev kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/vhba-module/vhba-module-20190831.tar.bz2
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=cf4e8639229d913099dff7d5657a3134
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.13 b/metadata/md5-cache/sys-fs/zfs-0.7.13
index d8b33a21ba06..f8c2a9e4abfe 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.7.13
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.13
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/zfs-0.7.13.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=895cabeda373bcaa219c86c4acef5ed6
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.1 b/metadata/md5-cache/sys-fs/zfs-0.8.1
index a314b1a05778..79bc25ef1061 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.8.1
+++ b/metadata/md5-cache/sys-fs/zfs-0.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.1/zfs-0.8.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
 _md5_=bfa266f92a1e34e05ac81f138b61dc53
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index cec4c94e5689..b0cac43b39c7 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -1,6 +1,6 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig python? ( dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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]
+BDEPEND=virtual/awk virtual/pkgconfig python? ( dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) 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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-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_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://zfsonlinux.org/
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=12910bf639dfb08ce47f9764acef6a58
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	9838160d624a44b2d56d1266a69fd473	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=dbdcd7d8ac9583e8fd11834cd34cbc77
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-9999 b/metadata/md5-cache/sys-fs/zfs-kmod-9999
index 4001822801f8..57f28a36ad0f 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-9999
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -11,4 +11,4 @@ RDEPEND=!sys-fs/zfs-fuse !sys-kernel/spl kernel_linux? ( virtual/modutils )
 RESTRICT=debug? ( strip ) test
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=cfc71e51301bab6bc2a3910695da0be5
+_md5_=0f51a580326d8f34eb12455578337ebb
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index d8aaa36f9f12..88985edf5ef5 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta16 b/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta16
deleted file mode 100644
index fe264f083389..000000000000
--- a/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend unpack
-DESCRIPTION=Gentoo automatic kernel building scripts
-EAPI=7
-HOMEPAGE=https://www.gentoo.org
-IUSE=ibm +firmware
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware ) !<sys-apps/openrc-0.9.9
-SLOT=0
-SRC_URI=mirror://gentoo/genkernel-4.0.0_beta16.tar.xz mirror://sourceforge/boost/boost_1_70_0.tar.bz2 mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.2.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.0.tar.bz2 mirror://kernel/linux/utils/cryptsetup/v2.2/cryptsetup-2.2.0.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_7/expat-2.2.7.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.3/e2fsprogs-1.45.3.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.5.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.36.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.185.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1.tar.xz https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.0;sf=tgz -> multipath-tools-0.8.0.tar.gz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.2/strace-5.2.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://lttng.org/files/urcu/userspace-rcu-0.10.2.tar.bz2 mirror://kernel/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.1.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.1.tar.gz -> zstd-1.4.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c7c41afd1a7a9c1be0835df651478075
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta17 b/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta17
new file mode 100644
index 000000000000..79d185215ef9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend unpack
+DESCRIPTION=Gentoo automatic kernel building scripts
+EAPI=7
+HOMEPAGE=https://www.gentoo.org
+IUSE=ibm +firmware
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches sys-apps/sandbox sys-devel/autoconf sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool virtual/pkgconfig firmware? ( sys-kernel/linux-firmware ) !<sys-apps/openrc-0.9.9
+SLOT=0
+SRC_URI=mirror://gentoo/genkernel-4.0.0_beta17.tar.xz mirror://sourceforge/boost/boost_1_70_0.tar.bz2 mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.2.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.0.tar.bz2 mirror://kernel/linux/utils/cryptsetup/v2.2/cryptsetup-2.2.1.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_7/expat-2.2.7.tar.xz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.3/e2fsprogs-1.45.3.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.5.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.36.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.186.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1.tar.xz https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.0;sf=tgz -> multipath-tools-0.8.0.tar.gz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.2/strace-5.2.tar.xz https://github.com/jthornber/thin-provisioning-tools/archive/v0.8.5.tar.gz -> thin-provisioning-tools-0.8.5.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://lttng.org/files/urcu/userspace-rcu-0.10.2.tar.bz2 mirror://kernel/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.2.1.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.2.tar.gz -> zstd-1.4.2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	mount-boot	0ed73d6bc7399be07e136b5dc46709d9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f46846fb1b18e3a97deb1ca6825e59eb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.138 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.138
index bd770148a0ad..99d83be151b9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.138
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.138
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.14.138
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-147.base.tar.xz mirror://gentoo/genpatches-4.14-147.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-147.experimental.tar.xz )
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8ea79a101cd81b10fb7cca8b7b00cf5c
+_md5_=7819d31ac6facd3199ddce7400d166c1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.143 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.143
new file mode 100644
index 000000000000..f56ea045c337
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.143
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.143
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-152.base.tar.xz mirror://gentoo/genpatches-4.14-152.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-152.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=e3168f5aefdb2d9378e8eb6123b0c49d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.66 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.66
index c688d4b0e185..4b5936e618d7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.66
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.66
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.19.66
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-66.base.tar.xz mirror://gentoo/genpatches-4.19-66.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-66.experimental.tar.xz )
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b032a089c8123eca5b5ff9db0f6655d9
+_md5_=58b96c6bdc2da1819b71f446bec54ed1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.72 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.72
new file mode 100644
index 000000000000..1a5f114e3600
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.72
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.72
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-71.base.tar.xz mirror://gentoo/genpatches-4.19-71.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-71.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=029c203c519712eaeb4d6821c97eb1f4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.189 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.189
index f0a03af09e89..320763759c24 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.189
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.189
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.4.189
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-190.base.tar.xz mirror://gentoo/genpatches-4.4-190.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-190.experimental.tar.xz )
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=efa15286144a99215696a77343c90648
+_md5_=d03440672fbbc5a72639c9b9d427ddf5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.192 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.192
new file mode 100644
index 000000000000..b98728123005
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.192
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.192
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-193.base.tar.xz mirror://gentoo/genpatches-4.4-193.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-193.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=179abeac1446aebd6c9eef14c045d9ea
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.189 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.189
index f1fb6955f303..d564adfd194e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.189
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.189
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
 SLOT=4.9.189
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-194.base.tar.xz mirror://gentoo/genpatches-4.9-194.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-194.experimental.tar.xz )
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d5e16d0c4770bc1586934fef0e5635ff
+_md5_=aa7324baa99494410bb7c59df5059d01
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.192 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.192
new file mode 100644
index 000000000000..e0b284ae9694
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.192
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.192
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-197.base.tar.xz mirror://gentoo/genpatches-4.9-197.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-197.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=aaa630f88629e32221508263267a2689
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.14 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.14
new file mode 100644
index 000000000000..b4ab60f6c0c9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.2 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.2.14
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz mirror://gentoo/genpatches-5.2-14.base.tar.xz mirror://gentoo/genpatches-5.2-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.2-14.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=28b99c67f63e7ddb5f75331454e28ced
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.3_rc8 b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc8
new file mode 100644
index 000000000000..bcd615ea6166
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.3_rc8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.3_rc8
+SRC_URI=https://git.kernel.org/torvalds/p/v5.3-rc8/v5.2 -> patch-5.3-rc8.patch mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ce6201206cd2f236435c15b325654952
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20190904 b/metadata/md5-cache/sys-kernel/linux-firmware-20190904
new file mode 100644
index 000000000000..71620dc6bf3c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20190904
@@ -0,0 +1,15 @@
+BDEPEND=initramfs? ( app-arch/cpio )
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
+DESCRIPTION=Linux firmware files
+EAPI=7
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86
+LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
+RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] !media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885] !media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700] !net-dialup/ueagle-atm !net-dialup/ueagle4-atm !net-wireless/ar9271-firmware !net-wireless/i2400m-fw !net-wireless/libertas-firmware !sys-firmware/rt61-firmware !net-wireless/rt73-firmware !net-wireless/rt2860-firmware !net-wireless/rt2870-firmware !sys-block/qla-fc-firmware !sys-firmware/amd-ucode !sys-firmware/iwl1000-ucode !sys-firmware/iwl2000-ucode !sys-firmware/iwl2030-ucode !sys-firmware/iwl3945-ucode !sys-firmware/iwl4965-ucode !sys-firmware/iwl5000-ucode !sys-firmware/iwl5150-ucode !sys-firmware/iwl6000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl7265-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
+REQUIRED_USE=initramfs? ( redistributable )
+RESTRICT=binchecks strip unknown-license? ( bindist )
+SLOT=0
+SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-6ddb9d9704e2171d91439c9c42c5965bf3863de8.tar.gz -> linux-firmware-20190904.tar.gz
+_eclasses_=mount-boot	0ed73d6bc7399be07e136b5dc46709d9	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	0c38912e9b32aef6433a71726675b4b1
+_md5_=864ae5527bad46597143da32ea4d5be0
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.135 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.135
deleted file mode 100644
index 52cb57b7cda8..000000000000
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.14.135
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20180128
-EAPI=6
-HOMEPAGE=https://www.linux-mips.org/ https://www.gentoo.org/
-IUSE=experimental ip27 ip28 ip30 symlink build
-KEYWORDS=-* ~mips
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.135
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.135.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/mipsgit-4.14.0-20180128.diff.xz mirror://gentoo/mips-sources-4.14.0-patches-v2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ec47017cf8ad3ac894f9e436164d0fb
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.143 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.143
new file mode 100644
index 000000000000..468da4b6533c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.14.143
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20180128
+EAPI=6
+HOMEPAGE=https://www.linux-mips.org/ https://www.gentoo.org/
+IUSE=experimental ip27 ip28 ip30 symlink build
+KEYWORDS=-* ~mips
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.143
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.143.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/mipsgit-4.14.0-20180128.diff.xz mirror://gentoo/mips-sources-4.14.0-patches-v2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7ec47017cf8ad3ac894f9e436164d0fb
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.4.186 b/metadata/md5-cache/sys-kernel/mips-sources-4.4.186
deleted file mode 100644
index b59dbab967c0..000000000000
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.4.186
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20160123
-EAPI=6
-HOMEPAGE=https://www.linux-mips.org/ https://www.gentoo.org/
-IUSE=experimental ip27 ip28 ip30 symlink build
-KEYWORDS=-* ~mips
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.186
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.186.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/mipsgit-4.4.0-20160123.diff.xz mirror://gentoo/mips-sources-4.4.0-patches-v2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e55592090868567992c7ac3eb34c952
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.4.192 b/metadata/md5-cache/sys-kernel/mips-sources-4.4.192
new file mode 100644
index 000000000000..c37c08bccc50
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.4.192
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20160123
+EAPI=6
+HOMEPAGE=https://www.linux-mips.org/ https://www.gentoo.org/
+IUSE=experimental ip27 ip28 ip30 symlink build
+KEYWORDS=-* ~mips
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.192
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.192.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/mipsgit-4.4.0-20160123.diff.xz mirror://gentoo/mips-sources-4.4.0-patches-v2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3e55592090868567992c7ac3eb34c952
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.9.186 b/metadata/md5-cache/sys-kernel/mips-sources-4.9.186
deleted file mode 100644
index 8cddc491df4f..000000000000
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.9.186
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20161216
-EAPI=6
-HOMEPAGE=https://www.linux-mips.org/ https://www.gentoo.org/
-IUSE=experimental ip27 ip28 ip30 symlink build
-KEYWORDS=-* ~mips
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.186
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.186.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/mipsgit-4.9.0-20161216.diff.xz mirror://gentoo/mips-sources-4.9.0-patches-v2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2de6104c23ad0708aaf3de76361348ee
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.9.192 b/metadata/md5-cache/sys-kernel/mips-sources-4.9.192
new file mode 100644
index 000000000000..14f956fbc4a9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.9.192
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20161216
+EAPI=6
+HOMEPAGE=https://www.linux-mips.org/ https://www.gentoo.org/
+IUSE=experimental ip27 ip28 ip30 symlink build
+KEYWORDS=-* ~mips
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.192
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.192.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/mipsgit-4.9.0-20161216.diff.xz mirror://gentoo/mips-sources-4.9.0-patches-v2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2de6104c23ad0708aaf3de76361348ee
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p8 b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p8
new file mode 100644
index 000000000000..9ddacd737cb0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://gitlab.com/post-factum/pf-kernel/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.2_p8
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.2...v5.2-pf8.diff -> pf-sources-5.2_p8.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.extras.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	kernel-2	d8ffb340027c53001eede0f9d32f3f14	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=07efbd65cd802f1b1931ae12068fdf63
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.142 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.142
deleted file mode 100644
index 1fe2d8ecf1d2..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.142
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.14.142
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.142.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.143 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.143
new file mode 100644
index 000000000000..3029fd2c2afc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.143
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.143
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.143.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.71 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.71
deleted file mode 100644
index ee5aaf9217c5..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.71
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.19.71
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.71.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.72 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.72
new file mode 100644
index 000000000000..ad0b4c753d44
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.72
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.72
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.72.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.191 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.191
deleted file mode 100644
index 12ba24bb5169..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.191
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.4.191
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.191.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.192 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.192
new file mode 100644
index 000000000000..7e9d8cd1bc9a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.192
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.4.192
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.192.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.191 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.191
deleted file mode 100644
index 3ca3321c15f6..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.191
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=4.9.191
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.191.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.192 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.192
new file mode 100644
index 000000000000..865aa73c87f4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.192
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.9.192
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.192.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.21 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.21
deleted file mode 100644
index 721f21581afd..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=5.1.21
-SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.1.21.xz mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.2.13 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.2.13
deleted file mode 100644
index 4380c2b77bf0..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.2.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Full sources for the Linux kernel
-EAPI=6
-HOMEPAGE=https://www.kernel.org
-IUSE=symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
-RESTRICT=binchecks strip
-SLOT=5.2.13
-SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.2.13.xz mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.2.14 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.2.14
new file mode 100644
index 000000000000..88bff285b93c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.2.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=6
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.2.14
+SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.2.14.xz mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	d8ffb340027c53001eede0f9d32f3f14	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 770bd21d688b..8505bf618eb6 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-5.0.2 b/metadata/md5-cache/sys-libs/compiler-rt-5.0.2
deleted file mode 100644
index 743c8f60ffa5..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-5.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-devel/llvm-4 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-5.0.2*:5 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=+clang test
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( UoI-NCSA MIT )
-SLOT=5.0.2
-SRC_URI=https://releases.llvm.org/5.0.2/compiler-rt-5.0.2.src.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf306ab79e82e1e310441e78889afacf
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-8.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-8.0.1
index 971f7ea47947..6711f5b03d15 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-8.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-8.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler runtime library for clang (built-in part)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=8.0.1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/compiler-rt-8.0.1.src.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=92190ef2fbed47ebedbabdf7613242dd
+_md5_=9b9c115e0be5758ff99a319e38ff2f97
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
deleted file mode 100644
index 402152f4cae6..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-5.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=sys-devel/llvm-4 clang? ( sys-devel/clang ) test? ( !<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/lit-5[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-5.0.2*:5 sys-libs/compiler-rt:5.0.2 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=+clang test elibc_glibc
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( UoI-NCSA MIT )
-SLOT=5.0.2
-SRC_URI=https://releases.llvm.org/5.0.2/compiler-rt-5.0.2.src.tar.xz test? ( https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz )
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b3a665ffe7cf8222f54030be24485c2
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.1
index 34b01bf9c257..8f020116c601 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( UoI-NCSA MIT )
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=8.0.1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/compiler-rt-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz )
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22396aba2ac95f3987229e3f19c28fa2
+_md5_=acb74796b8afe3e00a3dc7d324c0227b
diff --git a/metadata/md5-cache/sys-libs/glibc-2.19-r2 b/metadata/md5-cache/sys-libs/glibc-2.19-r2
index e8e9991f8a68..7892261ddd82 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.19-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.19-r2
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.19.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.19-patches-9.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=04955b00828f80708f6e6c6b869ce9ff
diff --git a/metadata/md5-cache/sys-libs/glibc-2.24-r4 b/metadata/md5-cache/sys-libs/glibc-2.24-r4
index 81837536a8d1..53945ff01e5a 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.24-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.24-r4
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.24.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.24.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.24.tar.xz mirror://gentoo/glibc-2.24.tar.xz mirror://gentoo/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.24-patches-10.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	toolchain-glibc	e81093d2c1f28c0310b60bebe5dcad30	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	toolchain-glibc	e81093d2c1f28c0310b60bebe5dcad30	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=36c80b1f5798debe5a5cb207889f0888
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r11 b/metadata/md5-cache/sys-libs/glibc-2.25-r11
index 01b25fc27e0f..db65a36976b8 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r11
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r11
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-15.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-15.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	toolchain-glibc	e81093d2c1f28c0310b60bebe5dcad30	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	toolchain-glibc	e81093d2c1f28c0310b60bebe5dcad30	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d79e920063ca7e9c46ac4d783fe0ddb3
diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r7 b/metadata/md5-cache/sys-libs/glibc-2.26-r7
index fd0ef33a46c0..0ddc88914851 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.26-r7
+++ b/metadata/md5-cache/sys-libs/glibc-2.26-r7
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-7.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	toolchain-glibc	e81093d2c1f28c0310b60bebe5dcad30	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	toolchain-glibc	e81093d2c1f28c0310b60bebe5dcad30	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=334588e9f95c475ec78d0eabe0c9d8e3
diff --git a/metadata/md5-cache/sys-libs/glibc-2.27-r6 b/metadata/md5-cache/sys-libs/glibc-2.27-r6
index 4830a2eda51b..addae1ee61a9 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.27-r6
+++ b/metadata/md5-cache/sys-libs/glibc-2.27-r6
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.27.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.27-patches-3.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3cf5df89c8b9cf6c1da5d870a4b5cffd
diff --git a/metadata/md5-cache/sys-libs/glibc-2.28-r6 b/metadata/md5-cache/sys-libs/glibc-2.28-r6
index 4a72629594db..359ff9a7a771 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.28-r6
+++ b/metadata/md5-cache/sys-libs/glibc-2.28-r6
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.28.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.28-patches-9.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2ca9c0e38e8a050fd4e89420053abd04
diff --git a/metadata/md5-cache/sys-libs/glibc-2.29-r2 b/metadata/md5-cache/sys-libs/glibc-2.29-r2
index 916a8886c665..dc25bcd17df9 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.29-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.29-r2
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.29.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.29-patches-3.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=caf1a48a1a47f1eb3c2f99d45ed46a10
diff --git a/metadata/md5-cache/sys-libs/glibc-2.29-r4 b/metadata/md5-cache/sys-libs/glibc-2.29-r4
index 7505c4c85c2e..2b656e6a2735 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.29-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.29-r4
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.29.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.29-patches-5.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6507e548627f9f61c73696e48c668a30
diff --git a/metadata/md5-cache/sys-libs/glibc-2.29-r5 b/metadata/md5-cache/sys-libs/glibc-2.29-r5
index 028205d4a39a..790a7987bbaf 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.29-r5
+++ b/metadata/md5-cache/sys-libs/glibc-2.29-r5
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.29.tar.xz https://dev.gentoo.org/~slyfox/distfiles/glibc-2.29-patches-6.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c87906418acfba2d04825637f11454bb
diff --git a/metadata/md5-cache/sys-libs/glibc-2.30 b/metadata/md5-cache/sys-libs/glibc-2.30
index e82c4a4ad668..1dea90b046b1 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.30
+++ b/metadata/md5-cache/sys-libs/glibc-2.30
@@ -10,5 +10,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.30.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.30-patches-1.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bef4c3e12ff4bc6c095acd970472e79b
diff --git a/metadata/md5-cache/sys-libs/glibc-2.30-r1 b/metadata/md5-cache/sys-libs/glibc-2.30-r1
index 0746f176f6a1..77220fbcea96 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.30-r1
+++ b/metadata/md5-cache/sys-libs/glibc-2.30-r1
@@ -10,5 +10,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.30.tar.xz https://dev.gentoo.org/~slyfox/distfiles/glibc-2.30-patches-2.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d6dab5dea67fe9bfc6ccd3486ffecdeb
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index b557adf2dc95..6c39eb796d07 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db >=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data )
 SLOT=2.2
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/glibc-9999-patches-14.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
 _md5_=6a496af9c3245cc116f0a4e34991204c
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.21 b/metadata/md5-cache/sys-libs/libblockdev-2.21
deleted file mode 100644
index fe435ab38714..000000000000
--- a/metadata/md5-cache/sys-libs/libblockdev-2.21
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-libs/gobject-introspection-1.3.0 sys-devel/autoconf-archive doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 setup
-DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DESCRIPTION=A library for manipulating block devices
-EAPI=7
-HOMEPAGE=https://github.com/storaged-project/libblockdev
-IUSE=bcache +cryptsetup device-mapper dmraid doc escrow lvm kbd test +tools vdo python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) escrow? ( cryptsetup )
-SLOT=0
-SRC_URI=https://github.com/storaged-project/libblockdev/archive/2.21-1.tar.gz -> libblockdev-2.21-1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4e3547d62ac54dcb94bfded1600a57c
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.23 b/metadata/md5-cache/sys-libs/libblockdev-2.23
new file mode 100644
index 000000000000..8a74da27ba8d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.23
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gtk-doc-am introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+DESCRIPTION=A library for manipulating block devices
+EAPI=7
+HOMEPAGE=https://github.com/storaged-project/libblockdev
+IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) escrow? ( cryptsetup )
+SLOT=0
+SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.23-1/libblockdev-2.23.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2ddd4d5e35eee12837b74aea498cf25e
diff --git a/metadata/md5-cache/sys-libs/libblockdev-9999 b/metadata/md5-cache/sys-libs/libblockdev-9999
index 2f38c5446482..d71e6226c850 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-9999
+++ b/metadata/md5-cache/sys-libs/libblockdev-9999
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-app
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) escrow? ( cryptsetup )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e67a7e2b8cc10a4270b96fa839cfe764
+_md5_=2ddd4d5e35eee12837b74aea498cf25e
diff --git a/metadata/md5-cache/sys-libs/libcxx-8.0.1 b/metadata/md5-cache/sys-libs/libcxx-8.0.1
index 45089cefd387..5516f53de2cd 100644
--- a/metadata/md5-cache/sys-libs/libcxx-8.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-8.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=New implementation of the C++ standard library, targeting C++11
 EAPI=6
 HOMEPAGE=https://libcxx.llvm.org/
 IUSE=elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test 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 ~arm ~arm64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm ~arm64 x86 ~amd64-fbsd
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-8.0.1[libunwind=,static-libs?,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(-)?] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,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(-)?] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )
 REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxx-8.0.1.src.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82b6932eb56e47229a1438bc32d13002
+_md5_=3a6eeb20ef579053071cf76f3bd291a0
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-8.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-8.0.1
index 3915d82b3dba..901e73f72b9b 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-8.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-8.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Low level support for a standard C++ library
 EAPI=6
 HOMEPAGE=https://libcxxabi.llvm.org/
 IUSE=+libunwind +static-libs test elibc_musl 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 ~arm ~arm64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm ~arm64 x86 ~amd64-fbsd
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,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-libs/llvm-libunwind-3.9.0-r1[static-libs?,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
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxxabi-8.0.1.src.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxx-8.0.1.src.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb38acf913094d9faac408af1aa5e535
+_md5_=72b48995b87a787c9946c82412c928a9
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20180311 b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20180311
index 9d1420187271..74142019d20f 100644
--- a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20180311
+++ b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20180311
@@ -4,10 +4,10 @@ DESCRIPTION=C++ Runtime from PathScale, FreeBSD and NetBSD
 EAPI=5
 HOMEPAGE=https://github.com/pathscale/libcxxrt
 IUSE=+libunwind +static-libs test 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 ~arm arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,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-libs/llvm-libunwind[static-libs?,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=mirror://gentoo/libcxxrt-0.0_p20180311.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a623e11f225b39b53810d6154cab471c
+_md5_=711cd1c2d16c7320bbd0cbd486a705f5
diff --git a/metadata/md5-cache/sys-libs/libhugetlbfs-2.20 b/metadata/md5-cache/sys-libs/libhugetlbfs-2.20
deleted file mode 100644
index 03d2f334e013..000000000000
--- a/metadata/md5-cache/sys-libs/libhugetlbfs-2.20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=easy hugepage access
-EAPI=5
-HOMEPAGE=https://github.com/libhugetlbfs/libhugetlbfs
-IUSE=perl static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86
-LICENSE=GPL-2
-RDEPEND=perl? ( dev-lang/perl:= )
-SLOT=0
-SRC_URI=https://github.com/libhugetlbfs/libhugetlbfs/archive/2.20.tar.gz -> libhugetlbfs-2.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a1a6b21507f516367137a70b87365bd0
diff --git a/metadata/md5-cache/sys-libs/libhugetlbfs-2.22 b/metadata/md5-cache/sys-libs/libhugetlbfs-2.22
new file mode 100644
index 000000000000..492e9361e9f4
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libhugetlbfs-2.22
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) )
+DESCRIPTION=easy hugepage access
+EAPI=7
+HOMEPAGE=https://github.com/libhugetlbfs/libhugetlbfs
+IUSE=static-libs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/libhugetlbfs/libhugetlbfs/archive/2.22.tar.gz -> libhugetlbfs-2.22.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=af0632cb64c0b0d60cf06c34d7e5c79f
diff --git a/metadata/md5-cache/sys-libs/libomp-8.0.1 b/metadata/md5-cache/sys-libs/libomp-8.0.1
index 9352242f13ad..54fb781732dc 100644
--- a/metadata/md5-cache/sys-libs/libomp-8.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-8.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=6
 HOMEPAGE=https://openmp.llvm.org
 IUSE=cuda hwloc kernel_linux offload ompt test 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 kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos
+KEYWORDS=amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x64-macos
 LICENSE=|| ( UoI-NCSA MIT ) MIT LLVM-Grant
 RDEPEND=hwloc? ( sys-apps/hwloc: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(-)?] ) offload? ( virtual/libelf:=[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/libffi:=[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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/openmp-8.0.1.src.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f022b53e94ae524ec38320b547b0424
+_md5_=1a8036122cd9ab9a494333420b8cbbb4
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.2.0 b/metadata/md5-cache/sys-libs/libosinfo-1.2.0
index cffc407a4a38..bb1462b23704 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.2.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.36.0:2 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4de79ff60c28d2028bd8eb84d0fd4b50
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.3.0 b/metadata/md5-cache/sys-libs/libosinfo-1.3.0
index c85ad7c3602d..9bbcb110e57d 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.3.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.0:2 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=769384496a265ce806896c462994c23c
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.4.0 b/metadata/md5-cache/sys-libs/libosinfo-1.4.0
index 313c5064feb9..4a667626bf7e 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.4.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.0:2 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4009bd8656f9c8ca5ce3cd930a4f2faf
diff --git a/metadata/md5-cache/sys-libs/libstatgrab-0.17 b/metadata/md5-cache/sys-libs/libstatgrab-0.17
deleted file mode 100644
index f1b20b5983d7..000000000000
--- a/metadata/md5-cache/sys-libs/libstatgrab-0.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses >=app-portage/elt-patches-20170815
-DESCRIPTION=A tool to provide access to statistics about the system on which it's run
-EAPI=4
-HOMEPAGE=https://www.i-scream.org/libstatgrab/
-IUSE=static-libs
-KEYWORDS=amd64 ~arm ~ia64 ppc x86
-LICENSE=|| ( GPL-2 LGPL-2.1 )
-RDEPEND=sys-libs/ncurses
-SLOT=0
-SRC_URI=https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-0.17.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f41999b5373ded3f5e68a3d82c894f54
diff --git a/metadata/md5-cache/sys-libs/libvpd-2.2.4 b/metadata/md5-cache/sys-libs/libvpd-2.2.4
index ce8423af01a5..c0a0f5a3d83f 100644
--- a/metadata/md5-cache/sys-libs/libvpd-2.2.4
+++ b/metadata/md5-cache/sys-libs/libvpd-2.2.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-db/sqlite-3.7.8 sys-libs/zlib
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/linux-diag/files/libvpd/2.2.4/libvpd-2.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7fec6c07b4f8f489e5256edfd75c462
diff --git a/metadata/md5-cache/sys-libs/libvpd-2.2.5 b/metadata/md5-cache/sys-libs/libvpd-2.2.5
index 657a8f3f6a49..11162c49af24 100644
--- a/metadata/md5-cache/sys-libs/libvpd-2.2.5
+++ b/metadata/md5-cache/sys-libs/libvpd-2.2.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-db/sqlite-3.7.8 sys-libs/zlib
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/linux-diag/files/libvpd/2.2.5/libvpd-2.2.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7fec6c07b4f8f489e5256edfd75c462
diff --git a/metadata/md5-cache/sys-libs/libvpd-2.2.6 b/metadata/md5-cache/sys-libs/libvpd-2.2.6
index c9c009f0f560..06dedc85ba8c 100644
--- a/metadata/md5-cache/sys-libs/libvpd-2.2.6
+++ b/metadata/md5-cache/sys-libs/libvpd-2.2.6
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-db/sqlite-3.7.8 sys-libs/zlib
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/linux-diag/files/libvpd/2.2.6/libvpd-2.2.6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=d6fadb4a448852f7f17b1411ad758d9d
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1
index f0b07fff074b..61991231183e 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=C++ runtime stack unwinder from LLVM
 EAPI=6
 HOMEPAGE=https://github.com/llvm-mirror/libunwind
 IUSE=debug +static-libs test 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 ~arm ~arm64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 arm ~arm64 x86 ~amd64-fbsd
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libunwind-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxx-8.0.1.src.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxxabi-8.0.1.src.tar.xz )
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5c9cbc6b9d73c28d4facb0af921cf30
+_md5_=55fe6821677680bcb6cbad8f2ec8d1e4
diff --git a/metadata/md5-cache/sys-libs/lwp-2.2 b/metadata/md5-cache/sys-libs/lwp-2.2
deleted file mode 100644
index 8a995d554171..000000000000
--- a/metadata/md5-cache/sys-libs/lwp-2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=sys-apps/grep sys-apps/sed sys-devel/libtool sys-devel/gcc
-DESCRIPTION=Light weight process library (used by Coda). This is NOT libwww-perl
-EAPI=0
-HOMEPAGE=http://www.coda.cs.cmu.edu/
-KEYWORDS=alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-SLOT=1
-SRC_URI=http://www.coda.cs.cmu.edu/pub/lwp/src/lwp-2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fadc776aa91b6449bbc71e012f521a7c
diff --git a/metadata/md5-cache/sys-libs/lwp-2.6-r1 b/metadata/md5-cache/sys-libs/lwp-2.6-r1
deleted file mode 100644
index d1f13c561209..000000000000
--- a/metadata/md5-cache/sys-libs/lwp-2.6-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Light-weight process library (used by Coda)
-EAPI=6
-HOMEPAGE=http://www.coda.cs.cmu.edu/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-SLOT=1
-SRC_URI=http://www.coda.cs.cmu.edu/pub/lwp/src/lwp-2.6.tar.gz
-_md5_=e01284357c7ed8326f828c8cbef5b9dd
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.23 b/metadata/md5-cache/sys-libs/musl-1.1.23
index de2faedc861e..b76cada710db 100644
--- a/metadata/md5-cache/sys-libs/musl-1.1.23
+++ b/metadata/md5-cache/sys-libs/musl-1.1.23
@@ -3,9 +3,9 @@ DESCRIPTION=Light, fast and simple C library focused on standards-conformance an
 EAPI=6
 HOMEPAGE=http://www.musl-libc.org/
 IUSE=headers-only
-KEYWORDS=-* amd64 ~arm ~arm64 ~mips ~ppc x86
+KEYWORDS=-* amd64 ~arm arm64 ~mips ~ppc x86
 LICENSE=MIT LGPL-2 GPL-2
 SLOT=0
 SRC_URI=http://www.musl-libc.org/releases/musl-1.1.23.tar.gz https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee469ba674b6966d69e221083deab494
+_md5_=41c3e3d5eab5a9a946b53bfa74760a32
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index b80d73b11a8f..1dec65e31947 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/acpilight-1.1 b/metadata/md5-cache/sys-power/acpilight-1.1
index f9708d5182dc..214395da91ab 100644
--- a/metadata/md5-cache/sys-power/acpilight-1.1
+++ b/metadata/md5-cache/sys-power/acpilight-1.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev python_targets_python3_5? ( dev-lang/python:3.5 ) python_ta
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://gitlab.com/wavexx/acpilight/-/archive/v1.1/acpilight-v1.1.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=b0f1ffe5d587bd2ae8c2142ad0207105
diff --git a/metadata/md5-cache/sys-power/acpilight-1.2 b/metadata/md5-cache/sys-power/acpilight-1.2
index 8f9bdb292e56..3eb9be8cf960 100644
--- a/metadata/md5-cache/sys-power/acpilight-1.2
+++ b/metadata/md5-cache/sys-power/acpilight-1.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/udev acct-group/video python_targets_python3_5? ( dev-lang/pytho
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.com/wavexx/acpilight/-/archive/v1.2/acpilight-v1.2.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=33bbde15371eb01a6c3f7952c01b7103
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.13 b/metadata/md5-cache/sys-power/apcupsd-3.14.13
index a550d70d828b..bd7754dd4fc3 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.13
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/util-linux-2.23[tty-helpers(-)] sys-freebsd/freebsd-ubin ) cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) sys-apps/openrc virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7e1955976e5b158713f834b48df83a61
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r2 b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r2
index a28a6bc6467e..b4f8cf85b9ab 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r2
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/util-linux-2.23[tty-helpers(-)] sys-freebsd/freebsd-ubin ) modbus? ( usb? ( virtual/libusb:0 ) ) cgi? ( >=media-libs/gd-1.8.4 ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=23cae3fe0a4a7bfbde34aecb350dcbda
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 682ed6f85e2b..f7857359ac88 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/anacron-2.3-r3 b/metadata/md5-cache/sys-process/anacron-2.3-r3
deleted file mode 100644
index eba4c6eb4201..000000000000
--- a/metadata/md5-cache/sys-process/anacron-2.3-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-process/cronbase
-DESCRIPTION=a periodic command scheduler
-EAPI=5
-HOMEPAGE=http://anacron.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2+
-RDEPEND=virtual/mta
-SLOT=0
-SRC_URI=mirror://sourceforge/anacron/anacron-2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ff4d6d554677ce8f4951e1554167b5ae
diff --git a/metadata/md5-cache/sys-process/evisum-0.2.6 b/metadata/md5-cache/sys-process/evisum-0.2.6
new file mode 100644
index 000000000000..37d45706b80b
--- /dev/null
+++ b/metadata/md5-cache/sys-process/evisum-0.2.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=dev-libs/efl
+DESCRIPTION=System and process monitor written with EFL
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/apps/evisum/evisum-0.2.6.tar.xz
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b37666e06e6aaec9e7d87f7cf244ef3
diff --git a/metadata/md5-cache/sys-process/parallel-20190422 b/metadata/md5-cache/sys-process/parallel-20190422
deleted file mode 100644
index f227f1e568e9..000000000000
--- a/metadata/md5-cache/sys-process/parallel-20190422
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/parallel/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20190422.tar.bz2
-_md5_=d4f07d612de0745c8e2e1d1e85e35f67
diff --git a/metadata/md5-cache/sys-process/parallel-20190622 b/metadata/md5-cache/sys-process/parallel-20190622
deleted file mode 100644
index 8eddf9eb2e7a..000000000000
--- a/metadata/md5-cache/sys-process/parallel-20190622
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/parallel/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20190622.tar.bz2
-_md5_=d64f8076cf5378396d2846b299a56c1e
diff --git a/metadata/md5-cache/sys-process/parallel-20190722 b/metadata/md5-cache/sys-process/parallel-20190722
index b638a2ec82b4..56ca354e4ba5 100644
--- a/metadata/md5-cache/sys-process/parallel-20190722
+++ b/metadata/md5-cache/sys-process/parallel-20190722
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl
 DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/parallel/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20190722.tar.bz2
-_md5_=d64f8076cf5378396d2846b299a56c1e
+_md5_=9dbba291e062dda0fc472ee60842b3dd
diff --git a/metadata/md5-cache/sys-process/prll-0.6.2 b/metadata/md5-cache/sys-process/prll-0.6.2
index 9b845c8ff033..977c54a89fd7 100644
--- a/metadata/md5-cache/sys-process/prll-0.6.2
+++ b/metadata/md5-cache/sys-process/prll-0.6.2
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/prll/prll-0.6.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b2247c42cdc092cf8193a9c885fb90dd
diff --git a/metadata/md5-cache/sys-process/rtirq-20150216 b/metadata/md5-cache/sys-process/rtirq-20150216
deleted file mode 100644
index 6dc2ff6072d4..000000000000
--- a/metadata/md5-cache/sys-process/rtirq-20150216
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Modify realtime scheduling policy and priority of IRQ handlers
-EAPI=6
-HOMEPAGE=https://www.rncbc.org/archive/#rtirq
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/util-linux-2.13
-SLOT=0
-SRC_URI=https://www.rncbc.org/archive/old/rtirq-20150216.tar.gz
-_md5_=3e29fad82d95912ace38b886c0f758eb
diff --git a/metadata/md5-cache/sys-process/usbtop-1.0 b/metadata/md5-cache/sys-process/usbtop-1.0
new file mode 100644
index 000000000000..458925c38143
--- /dev/null
+++ b/metadata/md5-cache/sys-process/usbtop-1.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=net-libs/libpcap:=[usb] dev-libs/boost:=
+DESCRIPTION=utility that shows an estimated instantaneous bandwidth on USB buses and devices
+EAPI=7
+HOMEPAGE=https://github.com/aguinet/usbtop
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=net-libs/libpcap:=[usb] dev-libs/boost:=
+SLOT=0
+SRC_URI=https://github.com/aguinet/usbtop/archive/release-1.0.tar.gz -> usbtop-1.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6fb4c7fa783376a0f4e6597a256c3ecd
diff --git a/metadata/md5-cache/sys-process/vixie-cron-4.1-r14 b/metadata/md5-cache/sys-process/vixie-cron-4.1-r14
deleted file mode 100644
index d4bbf5126ccc..000000000000
--- a/metadata/md5-cache/sys-process/vixie-cron-4.1-r14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst setup unpack
-DEPEND=selinux? ( sys-libs/libselinux ) pam? ( virtual/pam ) >=sys-apps/sed-4.0.5 virtual/pkgconfig
-DESCRIPTION=Paul Vixie's cron daemon, a fully featured crond implementation
-EAPI=0
-HOMEPAGE=ftp://ftp.isc.org/isc/cron/
-IUSE=selinux pam debug
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=ISC BSD-2 BSD
-RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( virtual/pam ) >=sys-process/cronbase-0.3.2 !sys-process/bcron !sys-process/cronie !sys-process/dcron !sys-process/fcron
-SLOT=0
-SRC_URI=mirror://gentoo/vixie-cron-4.1.tar.bz2 mirror://gentoo/vixie-cron-4.1-gentoo-r4.patch.bz2
-_eclasses_=cron	5ba8300c950866f90ad70a7b2bfddac2	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2b55d95531734faa7bcfd41ae3246f33
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 4104ff4324b2..618e0e552b46 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/imap-c-client-0 b/metadata/md5-cache/virtual/imap-c-client-0
deleted file mode 100644
index 24386c048dee..000000000000
--- a/metadata/md5-cache/virtual/imap-c-client-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for IMAP c-client
-EAPI=5
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-RDEPEND=|| ( net-libs/c-client net-mail/uw-imap )
-SLOT=0
-_md5_=138b672cbf45a190d28a847e6e85ebff
diff --git a/metadata/md5-cache/virtual/linuxtv-dvb-headers-5.3 b/metadata/md5-cache/virtual/linuxtv-dvb-headers-5.3
deleted file mode 100644
index 03566bfa3f96..000000000000
--- a/metadata/md5-cache/virtual/linuxtv-dvb-headers-5.3
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual Package installing the Header files for DVB
-EAPI=5
-KEYWORDS=amd64 arm ppc ppc64 x86
-RDEPEND=>=sys-kernel/linux-headers-3.0
-SLOT=0
-_md5_=4dd46c09cccc984773cd17bc82e5b811
diff --git a/metadata/md5-cache/virtual/mailx-0 b/metadata/md5-cache/virtual/mailx-0
deleted file mode 100644
index ef288d7d91a2..000000000000
--- a/metadata/md5-cache/virtual/mailx-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for mail implementations
-EAPI=5
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-RDEPEND=|| ( mail-client/mailx mail-client/nail net-mail/mailutils )
-SLOT=0
-_md5_=9960ee8d033485ca1774c577e18ff5ef
diff --git a/metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r1 b/metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r1
index b910b5d054d2..3d33c378e22c 100644
--- a/metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r1
+++ b/metadata/md5-cache/virtual/perl-Attribute-Handlers-1.10.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Attribute-Handlers
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Attribute-Handlers-1.10.0 ) dev-lang/perl:= !<perl-core/Attribute-Handlers-1.10.0 !>perl-core/Attribute-Handlers-1.10.0-r999
 SLOT=0
-_md5_=988fe2800d6c2d0eb83ac80facd7a93c
+_md5_=fa1ea21f16155fd6e4f72acc228f4d6b
diff --git a/metadata/md5-cache/virtual/perl-B-Debug-1.260.0 b/metadata/md5-cache/virtual/perl-B-Debug-1.260.0
index 63ca57ed3377..138495943611 100644
--- a/metadata/md5-cache/virtual/perl-B-Debug-1.260.0
+++ b/metadata/md5-cache/virtual/perl-B-Debug-1.260.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for B-Debug
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/B-Debug-1.260.0 ) dev-lang/perl:= !<perl-core/B-Debug-1.260.0 !>perl-core/B-Debug-1.260.0-r999
 SLOT=0
-_md5_=11f0d5ad8a9538a46c953c1155982388
+_md5_=63e6d5388dd6fde4c43de0573786e805
diff --git a/metadata/md5-cache/virtual/perl-CPAN-2.200.0 b/metadata/md5-cache/virtual/perl-CPAN-2.200.0
index acc8e5ace6d5..7f108d1de1e9 100644
--- a/metadata/md5-cache/virtual/perl-CPAN-2.200.0
+++ b/metadata/md5-cache/virtual/perl-CPAN-2.200.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for CPAN
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/CPAN-2.200.0 ) dev-lang/perl:= !<perl-core/CPAN-2.200.0 !>perl-core/CPAN-2.200.0-r999
 SLOT=0
-_md5_=d64bfe53f8f60d076ef94ddb348d0723
+_md5_=6961f44ae56462b89dfea30d92ad7ab1
diff --git a/metadata/md5-cache/virtual/perl-Carp-1.500.0-r1 b/metadata/md5-cache/virtual/perl-Carp-1.500.0-r1
index d702555c87b4..8fb8215ebdbd 100644
--- a/metadata/md5-cache/virtual/perl-Carp-1.500.0-r1
+++ b/metadata/md5-cache/virtual/perl-Carp-1.500.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Carp
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Carp-1.500.0 ) dev-lang/perl:= !<perl-core/Carp-1.500.0 !>perl-core/Carp-1.500.0-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.76.0 b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.76.0
index ae4b35403698..c9aaf9dc9119 100644
--- a/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.76.0
+++ b/metadata/md5-cache/virtual/perl-Compress-Raw-Zlib-2.76.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Compress-Raw-Zlib
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Compress-Raw-Zlib-2.76.0 ) dev-lang/perl:= !<perl-core/Compress-Raw-Zlib-2.76.0 !>perl-core/Compress-Raw-Zlib-2.76.0-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/virtual/perl-Data-Dumper-2.170.0 b/metadata/md5-cache/virtual/perl-Data-Dumper-2.170.0
index f57c970a71e0..8b769059985b 100644
--- a/metadata/md5-cache/virtual/perl-Data-Dumper-2.170.0
+++ b/metadata/md5-cache/virtual/perl-Data-Dumper-2.170.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Data-Dumper
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Data-Dumper-2.170.0 ) dev-lang/perl:= !<perl-core/Data-Dumper-2.170.0 !>perl-core/Data-Dumper-2.170.0-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.400.0 b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.400.0
index d6fd493b84d5..7c47ffa95617 100644
--- a/metadata/md5-cache/virtual/perl-Devel-PPPort-3.400.0
+++ b/metadata/md5-cache/virtual/perl-Devel-PPPort-3.400.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Devel-PPPort
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Devel-PPPort-3.400.0 ) dev-lang/perl:= !<perl-core/Devel-PPPort-3.400.0 !>perl-core/Devel-PPPort-3.400.0-r999
 SLOT=0
-_md5_=15f1cda532f436c8e56034cb1c009d51
+_md5_=9e4e29e544ae528e0df08f0810925030
diff --git a/metadata/md5-cache/virtual/perl-Digest-SHA-6.10.0 b/metadata/md5-cache/virtual/perl-Digest-SHA-6.10.0
index faf35d98159b..a4b633b21369 100644
--- a/metadata/md5-cache/virtual/perl-Digest-SHA-6.10.0
+++ b/metadata/md5-cache/virtual/perl-Digest-SHA-6.10.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Digest-SHA
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Digest-SHA-6.10.0 ) dev-lang/perl:= !<perl-core/Digest-SHA-6.10.0 !>perl-core/Digest-SHA-6.10.0-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/virtual/perl-Encode-2.970.0 b/metadata/md5-cache/virtual/perl-Encode-2.970.0
index 4d83b187a669..db4f26cc383a 100644
--- a/metadata/md5-cache/virtual/perl-Encode-2.970.0
+++ b/metadata/md5-cache/virtual/perl-Encode-2.970.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Encode
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Encode-2.970.0 ) dev-lang/perl:= !<perl-core/Encode-2.970.0 !>perl-core/Encode-2.970.0-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/virtual/perl-Exporter-5.730.0-r1 b/metadata/md5-cache/virtual/perl-Exporter-5.730.0-r1
index ea1f5b25ecae..145fcb4c9966 100644
--- a/metadata/md5-cache/virtual/perl-Exporter-5.730.0-r1
+++ b/metadata/md5-cache/virtual/perl-Exporter-5.730.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Exporter
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Exporter-5.730.0 ) dev-lang/perl:= !<perl-core/Exporter-5.730.0 !>perl-core/Exporter-5.730.0-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.230 b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.230
index d4901d087845..9f9c2c7459f1 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.230
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-CBuilder-0.280.230
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-CBuilder
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/ExtUtils-CBuilder-0.280.230 ) dev-lang/perl:= !<perl-core/ExtUtils-CBuilder-0.280.230 !>perl-core/ExtUtils-CBuilder-0.280.230-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r1 b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r1
index c1b462d74ff3..6b921d44f5f2 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r1
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Constant-0.250.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Constant
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/ExtUtils-Constant-0.250.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Constant-0.250.0 !>perl-core/ExtUtils-Constant-0.250.0-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r1 b/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r1
index 35c4173f9d79..ca1c266116b8 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r1
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-Install-2.140.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-Install
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/ExtUtils-Install-2.140.0 ) dev-lang/perl:= !<perl-core/ExtUtils-Install-2.140.0 !>perl-core/ExtUtils-Install-2.140.0-r999
 SLOT=0
-_md5_=1e4bbae7e0fc59e26a632a671be158c9
+_md5_=9aa4dd563a8f44461b2190b36aa69e6b
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.340.0-r1 b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.340.0-r1
index 43d6904d4c09..30b6aee117bc 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.340.0-r1
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.340.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-MakeMaker
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/ExtUtils-MakeMaker-7.340.0 ) dev-lang/perl:= !<perl-core/ExtUtils-MakeMaker-7.340.0 !>perl-core/ExtUtils-MakeMaker-7.340.0-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.390.0 b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.390.0
index c7eb876ffff2..2fb20ae68a99 100644
--- a/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.390.0
+++ b/metadata/md5-cache/virtual/perl-ExtUtils-ParseXS-3.390.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for ExtUtils-ParseXS
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/ExtUtils-ParseXS-3.390.0 ) dev-lang/perl:= !<perl-core/ExtUtils-ParseXS-3.390.0 !>perl-core/ExtUtils-ParseXS-3.390.0-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/virtual/perl-File-Path-2.150.0 b/metadata/md5-cache/virtual/perl-File-Path-2.150.0
index 59ba916e6f11..1805e7a96e98 100644
--- a/metadata/md5-cache/virtual/perl-File-Path-2.150.0
+++ b/metadata/md5-cache/virtual/perl-File-Path-2.150.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Path
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/File-Path-2.150.0 ) dev-lang/perl:= !<perl-core/File-Path-2.150.0 !>perl-core/File-Path-2.150.0-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/virtual/perl-File-Spec-3.740.0 b/metadata/md5-cache/virtual/perl-File-Spec-3.740.0
index 929771c20db2..62366d673967 100644
--- a/metadata/md5-cache/virtual/perl-File-Spec-3.740.0
+++ b/metadata/md5-cache/virtual/perl-File-Spec-3.740.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Spec
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/File-Spec-3.740.0 ) dev-lang/perl:= !<perl-core/File-Spec-3.740.0 !>perl-core/File-Spec-3.740.0-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/virtual/perl-Filter-Simple-0.950.0-r1 b/metadata/md5-cache/virtual/perl-Filter-Simple-0.950.0-r1
index e12f070749eb..297037124c3c 100644
--- a/metadata/md5-cache/virtual/perl-Filter-Simple-0.950.0-r1
+++ b/metadata/md5-cache/virtual/perl-Filter-Simple-0.950.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for perl-core/Filter-Simple
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Filter-Simple-0.950.0 ) dev-lang/perl:= !<perl-core/Filter-Simple-0.950.0 !>perl-core/Filter-Simple-0.950.0-r999
 SLOT=0
-_md5_=f2a2846b093db93578dd6190c97c7d58
+_md5_=577889cdedd8c2b9b09b9e87b97432e2
diff --git a/metadata/md5-cache/virtual/perl-Getopt-Long-2.500.0-r1 b/metadata/md5-cache/virtual/perl-Getopt-Long-2.500.0-r1
index 21fdf807ae18..4342152dc678 100644
--- a/metadata/md5-cache/virtual/perl-Getopt-Long-2.500.0-r1
+++ b/metadata/md5-cache/virtual/perl-Getopt-Long-2.500.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Getopt-Long
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Getopt-Long-2.500.0 ) dev-lang/perl:= !<perl-core/Getopt-Long-2.500.0 !>perl-core/Getopt-Long-2.500.0-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.430.0-r1 b/metadata/md5-cache/virtual/perl-I18N-LangTags-0.430.0-r1
index 14292bf253ec..6c7aa99b3bca 100644
--- a/metadata/md5-cache/virtual/perl-I18N-LangTags-0.430.0-r1
+++ b/metadata/md5-cache/virtual/perl-I18N-LangTags-0.430.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for I18N-LangTags
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/I18N-LangTags-0.430.0 ) dev-lang/perl:= !<perl-core/I18N-LangTags-0.430.0 !>perl-core/I18N-LangTags-0.430.0-r999
 SLOT=0
-_md5_=dc0cbee4326d9dfe4188d7c9284a7081
+_md5_=bac6af3c82d2fa6d37ce67d953995814
diff --git a/metadata/md5-cache/virtual/perl-IO-1.390.0 b/metadata/md5-cache/virtual/perl-IO-1.390.0
index 3f20246152fb..7cc9250e5f09 100644
--- a/metadata/md5-cache/virtual/perl-IO-1.390.0
+++ b/metadata/md5-cache/virtual/perl-IO-1.390.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/IO-1.390.0 ) dev-lang/perl:= !<perl-core/IO-1.390.0 !>perl-core/IO-1.390.0-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.390.0-r1 b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.390.0-r1
index 23bcf82beab7..5ff5019fd71c 100644
--- a/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.390.0-r1
+++ b/metadata/md5-cache/virtual/perl-IO-Socket-IP-0.390.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IO-Socket-IP
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/IO-Socket-IP-0.390.0 ) dev-lang/perl:= !<perl-core/IO-Socket-IP-0.390.0 !>perl-core/IO-Socket-IP-0.390.0-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-IPC-Cmd-1.0.0 b/metadata/md5-cache/virtual/perl-IPC-Cmd-1.0.0
index a544e5b4f2d3..aa32b54e90f3 100644
--- a/metadata/md5-cache/virtual/perl-IPC-Cmd-1.0.0
+++ b/metadata/md5-cache/virtual/perl-IPC-Cmd-1.0.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for IPC-Cmd
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/IPC-Cmd-1.0.0 ) dev-lang/perl:= !<perl-core/IPC-Cmd-1.0.0 !>perl-core/IPC-Cmd-1.0.0-r999
 SLOT=0
-_md5_=11f0d5ad8a9538a46c953c1155982388
+_md5_=63e6d5388dd6fde4c43de0573786e805
diff --git a/metadata/md5-cache/virtual/perl-JSON-PP-2.970.10 b/metadata/md5-cache/virtual/perl-JSON-PP-2.970.10
index 5837aacd30c7..6ce28c3fc824 100644
--- a/metadata/md5-cache/virtual/perl-JSON-PP-2.970.10
+++ b/metadata/md5-cache/virtual/perl-JSON-PP-2.970.10
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for JSON-PP
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/JSON-PP-2.970.10 ) dev-lang/perl:= !<perl-core/JSON-PP-2.970.10 !>perl-core/JSON-PP-2.970.10-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0-r1 b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0-r1
index 271c4bb77ebf..53fa83850387 100644
--- a/metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0-r1
+++ b/metadata/md5-cache/virtual/perl-Locale-Maketext-1.290.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Locale-Maketext
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Locale-Maketext-1.290.0 ) dev-lang/perl:= !<perl-core/Locale-Maketext-1.290.0 !>perl-core/Locale-Maketext-1.290.0-r999
 SLOT=0
-_md5_=85180b9faa4eaf6347c3230bbb92ee73
+_md5_=6a549045cc1e7118062549d8dcd0ddba
diff --git a/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.811 b/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.811
index 22b636be06c9..7c0c3b985537 100644
--- a/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.811
+++ b/metadata/md5-cache/virtual/perl-Math-BigInt-1.999.811
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-BigInt
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Math-BigInt-1.999.811 ) dev-lang/perl:= !<perl-core/Math-BigInt-1.999.811 !>perl-core/Math-BigInt-1.999.811-r999
 SLOT=0
-_md5_=15f1cda532f436c8e56034cb1c009d51
+_md5_=9e4e29e544ae528e0df08f0810925030
diff --git a/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.600 b/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.600
index 45d5feae70e6..3727046d2b8b 100644
--- a/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.600
+++ b/metadata/md5-cache/virtual/perl-Math-BigInt-FastCalc-0.500.600
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-BigInt-FastCalc
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Math-BigInt-FastCalc-0.500.600 ) dev-lang/perl:= !<perl-core/Math-BigInt-FastCalc-0.500.600 !>perl-core/Math-BigInt-FastCalc-0.500.600-r999
 SLOT=0
-_md5_=15f1cda532f436c8e56034cb1c009d51
+_md5_=9e4e29e544ae528e0df08f0810925030
diff --git a/metadata/md5-cache/virtual/perl-Math-BigRat-0.261.300 b/metadata/md5-cache/virtual/perl-Math-BigRat-0.261.300
index 3037976f5252..d8d2400c0e07 100644
--- a/metadata/md5-cache/virtual/perl-Math-BigRat-0.261.300
+++ b/metadata/md5-cache/virtual/perl-Math-BigRat-0.261.300
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Math-BigRat
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Math-BigRat-0.261.300 ) dev-lang/perl:= !<perl-core/Math-BigRat-0.261.300 !>perl-core/Math-BigRat-0.261.300-r999
 SLOT=0
-_md5_=15f1cda532f436c8e56034cb1c009d51
+_md5_=9e4e29e544ae528e0df08f0810925030
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.904.190 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.904.190
index a620373effc9..c26ba9030564 100644
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.904.190
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.201.904.190
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-CoreList
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28.2* ~perl-core/Module-CoreList-5.201.904.190 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.201.904.190 !>perl-core/Module-CoreList-5.201.904.190-r999
 SLOT=0
-_md5_=dd53f6eebb3869efd38d391fdc51f9d3
+_md5_=0320d9cfa92666d0b60c3eaf13567c8c
diff --git a/metadata/md5-cache/virtual/perl-Net-Ping-2.620.0 b/metadata/md5-cache/virtual/perl-Net-Ping-2.620.0
index 913a0ffa740f..ee1a0b391195 100644
--- a/metadata/md5-cache/virtual/perl-Net-Ping-2.620.0
+++ b/metadata/md5-cache/virtual/perl-Net-Ping-2.620.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Net-Ping
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Net-Ping-2.620.0 ) dev-lang/perl:= !<perl-core/Net-Ping-2.620.0 !>perl-core/Net-Ping-2.620.0-r999
 SLOT=0
-_md5_=3228b4c0db74321d57e47c0913d06bad
+_md5_=ea81c904e636ef42255b205ebfdc1a26
diff --git a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.500.0-r1 b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.500.0-r1
index 95881b7ef7ec..9459cf34ca66 100644
--- a/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.500.0-r1
+++ b/metadata/md5-cache/virtual/perl-Scalar-List-Utils-1.500.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Scalar-List-Utils-1.500.0 ) dev-lang/perl:= !<perl-core/Scalar-List-Utils-1.500.0 !>perl-core/Scalar-List-Utils-1.500.0-r999
 SLOT=0
-_md5_=c12169e0beb14cbf05c3cb7077f55fdf
+_md5_=0739edba4b6050808c34949ec7e691d1
diff --git a/metadata/md5-cache/virtual/perl-Socket-2.27.0-r1 b/metadata/md5-cache/virtual/perl-Socket-2.27.0-r1
index 541ced3a6b62..85ab6c11ccf8 100644
--- a/metadata/md5-cache/virtual/perl-Socket-2.27.0-r1
+++ b/metadata/md5-cache/virtual/perl-Socket-2.27.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Socket
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Socket-2.27.0 ) dev-lang/perl:= !<perl-core/Socket-2.27.0 !>perl-core/Socket-2.27.0-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-Storable-3.80.100_rc b/metadata/md5-cache/virtual/perl-Storable-3.80.100_rc
index 326a9dca5c53..30471c569af2 100644
--- a/metadata/md5-cache/virtual/perl-Storable-3.80.100_rc
+++ b/metadata/md5-cache/virtual/perl-Storable-3.80.100_rc
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Storable
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28.2* ~perl-core/Storable-3.80.100_rc ) dev-lang/perl:= !<perl-core/Storable-3.80.100_rc !>perl-core/Storable-3.80.100_rc-r999
 SLOT=0
-_md5_=a95d3f2d9afdf485a330f0e614f8f9fc
+_md5_=b5f76e631fc83d1817a0273fcbe7402d
diff --git a/metadata/md5-cache/virtual/perl-Test-1.310.0-r1 b/metadata/md5-cache/virtual/perl-Test-1.310.0-r1
index 0aec3f89fb6f..63a213b54223 100644
--- a/metadata/md5-cache/virtual/perl-Test-1.310.0-r1
+++ b/metadata/md5-cache/virtual/perl-Test-1.310.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Test-1.310.0 ) dev-lang/perl:= !<perl-core/Test-1.310.0 !>perl-core/Test-1.310.0-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-Test-Harness-3.420.0-r1 b/metadata/md5-cache/virtual/perl-Test-Harness-3.420.0-r1
index 04ed75b2a875..89d129c01545 100644
--- a/metadata/md5-cache/virtual/perl-Test-Harness-3.420.0-r1
+++ b/metadata/md5-cache/virtual/perl-Test-Harness-3.420.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Harness
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Test-Harness-3.420.0 ) dev-lang/perl:= !<perl-core/Test-Harness-3.420.0 !>perl-core/Test-Harness-3.420.0-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-Test-Simple-1.302.133 b/metadata/md5-cache/virtual/perl-Test-Simple-1.302.133
index 3e71b5b04e31..d42c85095450 100644
--- a/metadata/md5-cache/virtual/perl-Test-Simple-1.302.133
+++ b/metadata/md5-cache/virtual/perl-Test-Simple-1.302.133
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Test-Simple
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Test-Simple-1.302.133 ) dev-lang/perl:= !<dev-perl/Test-Tester-0.114.0 !<dev-perl/Test-use-ok-0.160.0
 SLOT=0
-_md5_=a1d0bd9d2b1923e444abb3e3edf2d08f
+_md5_=bb549f764b819e97bd50f5aa9998a69a
diff --git a/metadata/md5-cache/virtual/perl-Time-HiRes-1.975.900 b/metadata/md5-cache/virtual/perl-Time-HiRes-1.975.900
index 31ec8962e485..e410a482738f 100644
--- a/metadata/md5-cache/virtual/perl-Time-HiRes-1.975.900
+++ b/metadata/md5-cache/virtual/perl-Time-HiRes-1.975.900
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Time-HiRes
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Time-HiRes-1.975.900 ) dev-lang/perl:= !<perl-core/Time-HiRes-1.975.900 !>perl-core/Time-HiRes-1.975.900-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/virtual/perl-Time-Piece-1.320.400 b/metadata/md5-cache/virtual/perl-Time-Piece-1.320.400
index 8e4722b6aa43..30886459b88e 100644
--- a/metadata/md5-cache/virtual/perl-Time-Piece-1.320.400
+++ b/metadata/md5-cache/virtual/perl-Time-Piece-1.320.400
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Time-Piece
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Time-Piece-1.320.400 ) dev-lang/perl:= !<perl-core/Time-Piece-1.320.400 !>perl-core/Time-Piece-1.320.400-r999
 SLOT=0
-_md5_=724f30df8c998f37ad843db45dc60c10
+_md5_=51b6720534329b7cdbc8dbeb425e6291
diff --git a/metadata/md5-cache/virtual/perl-Unicode-Collate-1.250.0 b/metadata/md5-cache/virtual/perl-Unicode-Collate-1.250.0
index 0eb25f7f296a..16fa2aa5bda3 100644
--- a/metadata/md5-cache/virtual/perl-Unicode-Collate-1.250.0
+++ b/metadata/md5-cache/virtual/perl-Unicode-Collate-1.250.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Unicode-Collate
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/Unicode-Collate-1.250.0 ) dev-lang/perl:= !<perl-core/Unicode-Collate-1.250.0 !>perl-core/Unicode-Collate-1.250.0-r999
 SLOT=0
-_md5_=11f0d5ad8a9538a46c953c1155982388
+_md5_=63e6d5388dd6fde4c43de0573786e805
diff --git a/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.260.0-r1 b/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.260.0-r1
index 70dc2ea99385..ff96ae921b4b 100644
--- a/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.260.0-r1
+++ b/metadata/md5-cache/virtual/perl-Unicode-Normalize-1.260.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Unicode-Normalize
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/Unicode-Normalize-1.260.0 ) dev-lang/perl:= !<perl-core/Unicode-Normalize-1.260.0 !>perl-core/Unicode-Normalize-1.260.0-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-XSLoader-0.300.0-r1 b/metadata/md5-cache/virtual/perl-XSLoader-0.300.0-r1
index a3861bf23751..30d8363d98a5 100644
--- a/metadata/md5-cache/virtual/perl-XSLoader-0.300.0-r1
+++ b/metadata/md5-cache/virtual/perl-XSLoader-0.300.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for XSLoader
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/XSLoader-0.300.0 ) dev-lang/perl:= !<perl-core/XSLoader-0.300.0 !>perl-core/XSLoader-0.300.0-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-bignum-0.490.0 b/metadata/md5-cache/virtual/perl-bignum-0.490.0
index c9d8e5c6a5b2..cb49a07bbfa9 100644
--- a/metadata/md5-cache/virtual/perl-bignum-0.490.0
+++ b/metadata/md5-cache/virtual/perl-bignum-0.490.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for bignum
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/bignum-0.490.0 ) dev-lang/perl:= !<perl-core/bignum-0.490.0 !>perl-core/bignum-0.490.0-r999
 SLOT=0
-_md5_=15f1cda532f436c8e56034cb1c009d51
+_md5_=9e4e29e544ae528e0df08f0810925030
diff --git a/metadata/md5-cache/virtual/perl-if-0.60.800-r1 b/metadata/md5-cache/virtual/perl-if-0.60.800-r1
index df9d17525a6b..b1ff9ddf21e2 100644
--- a/metadata/md5-cache/virtual/perl-if-0.60.800-r1
+++ b/metadata/md5-cache/virtual/perl-if-0.60.800-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for if
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/if-0.60.800 ) dev-lang/perl:= !<perl-core/if-0.60.800 !>perl-core/if-0.60.800-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-libnet-3.110.0-r1 b/metadata/md5-cache/virtual/perl-libnet-3.110.0-r1
index d5912b2b95e9..46e2f0672cf2 100644
--- a/metadata/md5-cache/virtual/perl-libnet-3.110.0-r1
+++ b/metadata/md5-cache/virtual/perl-libnet-3.110.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for libnet
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/libnet-3.110.0 ) dev-lang/perl:= !<perl-core/libnet-3.110.0 !>perl-core/libnet-3.110.0-r999
 SLOT=0
-_md5_=6078d1568643bdfe0711735d007a4097
+_md5_=814084f52dd81360cfab4c51f7429ac9
diff --git a/metadata/md5-cache/virtual/perl-podlators-4.100.0 b/metadata/md5-cache/virtual/perl-podlators-4.100.0
index f421dcbd0feb..1041d5121a06 100644
--- a/metadata/md5-cache/virtual/perl-podlators-4.100.0
+++ b/metadata/md5-cache/virtual/perl-podlators-4.100.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for podlators
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/podlators-4.100.0 ) dev-lang/perl:= !<perl-core/podlators-4.100.0 !>perl-core/podlators-4.100.0-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/virtual/perl-threads-2.220.0-r1 b/metadata/md5-cache/virtual/perl-threads-2.220.0-r1
index 64d892ef4576..27514a2db2b4 100644
--- a/metadata/md5-cache/virtual/perl-threads-2.220.0-r1
+++ b/metadata/md5-cache/virtual/perl-threads-2.220.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for threads
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin
 RDEPEND=|| ( =dev-lang/perl-5.30*[ithreads] =dev-lang/perl-5.28*[ithreads] ~perl-core/threads-2.220.0 ) dev-lang/perl:= !<perl-core/threads-2.220.0 !>perl-core/threads-2.220.0-r999
 SLOT=0
-_md5_=2be82c404132f96f836bb043d3d8c8f0
+_md5_=352980d9536f629bf38c3487613e6768
diff --git a/metadata/md5-cache/virtual/perl-threads-shared-1.580.0 b/metadata/md5-cache/virtual/perl-threads-shared-1.580.0
index 82e1d44a02f3..91489e1e934d 100644
--- a/metadata/md5-cache/virtual/perl-threads-shared-1.580.0
+++ b/metadata/md5-cache/virtual/perl-threads-shared-1.580.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for threads-shared
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/threads-shared-1.580.0 ) dev-lang/perl:= !<perl-core/threads-shared-1.580.0 !>perl-core/threads-shared-1.580.0-r999
 SLOT=0
-_md5_=cc1be37975af04220bd335f42dff9971
+_md5_=eefa248482cfc726cc23cfc993af8997
diff --git a/metadata/md5-cache/virtual/perl-version-0.992.300 b/metadata/md5-cache/virtual/perl-version-0.992.300
index f80aff4601d3..f2c656c283a5 100644
--- a/metadata/md5-cache/virtual/perl-version-0.992.300
+++ b/metadata/md5-cache/virtual/perl-version-0.992.300
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for version
 EAPI=6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-lang/perl-5.28* ~perl-core/version-0.992.300 ) dev-lang/perl:= !<perl-core/version-0.992.300 !>perl-core/version-0.992.300-r999
 SLOT=0
-_md5_=c0dea42271498cf5d47f2ce4e48f0c5f
+_md5_=57a984ea7ced628a76be93e65039f425
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 86f27f9c7913..699935ba6937 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_diagnostics-0.0.1 b/metadata/md5-cache/www-apache/mod_diagnostics-0.0.1
index 3393902c4eed..494b306df013 100644
--- a/metadata/md5-cache/www-apache/mod_diagnostics-0.0.1
+++ b/metadata/md5-cache/www-apache/mod_diagnostics-0.0.1
@@ -4,9 +4,9 @@ DESCRIPTION=An Apache2 module which can do debugging of modules in the Apache2 F
 EAPI=0
 HOMEPAGE=http://apache.webthing.com/mod_diagnostics/
 KEYWORDS=x86
-LICENSE=GPL-2
+LICENSE=Apache-1.1
 RDEPEND==www-servers/apache-2*
 SLOT=0
 SRC_URI=mirror://gentoo/mod_diagnostics-0.0.1.c
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8ea8aa5d4b6cf4312db21e5d47888834
+_md5_=238f8ec5807b72234d6adcddde803b41
diff --git a/metadata/md5-cache/www-apache/mod_limitipconn-0.24 b/metadata/md5-cache/www-apache/mod_limitipconn-0.24
deleted file mode 100644
index 36ab46bfd07f..000000000000
--- a/metadata/md5-cache/www-apache/mod_limitipconn-0.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND==www-servers/apache-2*
-DESCRIPTION=Allows administrators to limit the number of simultaneous downloads permitted
-EAPI=0
-HOMEPAGE=http://dominia.org/djao/limitipconn2.html
-KEYWORDS=amd64 ppc x86
-LICENSE=Apache-2.0
-RDEPEND==www-servers/apache-2*
-RESTRICT=test
-SLOT=2
-SRC_URI=http://dominia.org/djao/limit/mod_limitipconn-0.24.tar.bz2
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=d8bd5d1f96514a959a70afe8067daa36
diff --git a/metadata/md5-cache/www-apache/passenger-6.0.3 b/metadata/md5-cache/www-apache/passenger-6.0.3
new file mode 100644
index 000000000000..52d2434af5c1
--- /dev/null
+++ b/metadata/md5-cache/www-apache/passenger-6.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26] >=dev-ruby/rake-0.8.1[ruby_targets_ruby26] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
+EAPI=6
+HOMEPAGE=https://www.phusionpassenger.com/
+IUSE=apache2 debug test apache2 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby26] >=dev-ruby/rake-0.8.1[ruby_targets_ruby26] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-6.0.3.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f889b8d7960fe937399984c914c2ad0f
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index a2c9f4ccd86c..b665c529aead 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/blazeblogger-1.2.0 b/metadata/md5-cache/www-apps/blazeblogger-1.2.0
deleted file mode 100644
index 066a84ca15ca..000000000000
--- a/metadata/md5-cache/www-apps/blazeblogger-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=Simple, capable content management system for producing static content
-EAPI=4
-HOMEPAGE=http://blaze.blackened.cz/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=FDL-1.3 GPL-3
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=https://blazeblogger.googlecode.com/files/blazeblogger-1.2.0.tar.gz doc? ( https://blazeblogger.googlecode.com/files/blazeblogger-doc-1.2.0.tar.gz )
-_md5_=047427a6a8b7c28b3565606183ee3ad9
diff --git a/metadata/md5-cache/www-apps/drupal-8.7.7 b/metadata/md5-cache/www-apps/drupal-8.7.7
new file mode 100644
index 000000000000..ec076c6b4842
--- /dev/null
+++ b/metadata/md5-cache/www-apps/drupal-8.7.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=6
+HOMEPAGE=https://www.drupal.org/
+IUSE=+accelerator +mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=-alpha ~amd64 -ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=8.7.7
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.7.7.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=7bc41d77388d1b22d2ff5c975ea409c6
diff --git a/metadata/md5-cache/www-apps/hugo-0.46 b/metadata/md5-cache/www-apps/hugo-0.46
deleted file mode 100644
index 42a2d8580dc7..000000000000
--- a/metadata/md5-cache/www-apps/hugo-0.46
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=A Fast and Flexible Static Site Generator built with love in Go
-EAPI=6
-HOMEPAGE=https://gohugo.io https://github.com/gohugoio/hugo
-IUSE=+sass
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/gohugoio/hugo/archive/v0.46.tar.gz -> hugo-0.46.tar.gz https://github.com/BurntSushi/locker/archive/a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz -> github.com-BurntSushi-locker-a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/PuerkitoBio/purell/archive/0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz -> github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/de5bf2ad457846296e2031421a34e2568e304e35.tar.gz -> github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz https://github.com/alecthomas/assert/archive/405dbfeb8e38effee6e723317226e93fff912d06.tar.gz -> github.com-alecthomas-assert-405dbfeb8e38effee6e723317226e93fff912d06.tar.gz https://github.com/alecthomas/chroma/archive/e4dff9a08cad984e9cf8eaa39fb80f2beae10484.tar.gz -> github.com-alecthomas-chroma-e4dff9a08cad984e9cf8eaa39fb80f2beae10484.tar.gz https://github.com/alecthomas/colour/archive/60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz -> github.com-alecthomas-colour-60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz https://github.com/alecthomas/repr/archive/f49988b46e025398b9f834f7c726afe001ec481f.tar.gz -> github.com-alecthomas-repr-f49988b46e025398b9f834f7c726afe001ec481f.tar.gz https://github.com/bep/debounce/archive/844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz -> github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz https://github.com/bep/gitmap/archive/012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz -> github.com-bep-gitmap-012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz https://github.com/bep/go-tocss/archive/2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz -> github.com-bep-go-tocss-2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz https://github.com/chaseadamsio/goorgeous/archive/dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz -> github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz https://github.com/cpuguy83/go-md2man/archive/a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz -> github.com-cpuguy83-go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz https://github.com/danwakefield/fnmatch/archive/cbb64ac3d964b81592e64f957ad53df015803288.tar.gz -> github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/disintegration/imaging/archive/dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz -> github.com-disintegration-imaging-dd50a3ee9985ccd313a2f03c398fcaedc96dc707.tar.gz https://github.com/dlclark/regexp2/archive/487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz -> github.com-dlclark-regexp2-487489b64fb796de2e55f4e8a4ad1e145f80e957.tar.gz https://github.com/eknkc/amber/archive/cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz -> github.com-eknkc-amber-cdade1c073850f4ffc70a829e31235ea6892853b.tar.gz https://github.com/fortytw2/leaktest/archive/a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz -> github.com-fortytw2-leaktest-a5ef70473c97b71626b9abeda80ee92ba2a7de9e.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gorilla/websocket/archive/ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz -> github.com-gorilla-websocket-ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz -> github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz https://github.com/hashicorp/golang-lru/archive/0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz -> github.com-hashicorp-golang-lru-0fb14efe8c47ae851c0034ed7a448854d3d34cf3.tar.gz https://github.com/hashicorp/hcl/archive/ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz -> github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jdkato/prose/archive/20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz -> github.com-jdkato-prose-20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz https://github.com/kyokomi/emoji/archive/7e06b236c489543f53868841f188a294e3383eab.tar.gz -> github.com-kyokomi-emoji-7e06b236c489543f53868841f188a294e3383eab.tar.gz https://github.com/magefile/mage/archive/2f974307b636f59c13b88704cf350a4772fef271.tar.gz -> github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz https://github.com/magiconair/properties/archive/c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz -> github.com-magiconair-properties-c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz https://github.com/markbates/inflect/archive/a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz -> github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz https://github.com/mattn/go-isatty/archive/0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz -> github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz -> github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz https://github.com/miekg/mmark/archive/fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz -> github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz https://github.com/mitchellh/hashstructure/archive/2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz -> github.com-mitchellh-hashstructure-2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz https://github.com/mitchellh/mapstructure/archive/00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz -> github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz https://github.com/muesli/smartcrop/archive/f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz -> github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz https://github.com/nicksnyder/go-i18n/archive/0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz -> github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz https://github.com/olekukonko/tablewriter/archive/b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz -> github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz https://github.com/pelletier/go-toml/archive/acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz -> github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/russross/blackfriday/archive/11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz -> github.com-russross-blackfriday-11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz https://github.com/sanity-io/litter/archive/ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz -> github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz https://github.com/sergi/go-diff/archive/1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz -> github.com-sergi-go-diff-1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz -> github.com-shurcooL-sanitized_anchor_name-86672fcb3f950f35f2e675df2240550f2a50762f.tar.gz https://github.com/spf13/afero/archive/787d034dfe70e44075ccc060d346146ef53270ad.tar.gz -> github.com-spf13-afero-787d034dfe70e44075ccc060d346146ef53270ad.tar.gz https://github.com/spf13/cast/archive/8965335b8c7107321228e3e3702cab9832751bac.tar.gz -> github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/fsync/archive/12a01e648f05a938100a26858d2d59a120307a18.tar.gz -> github.com-spf13-fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz https://github.com/spf13/jwalterweatherman/archive/7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz -> github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz https://github.com/spf13/nitro/archive/24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz -> github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/spf13/viper/archive/b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz -> github.com-spf13-viper-b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz https://github.com/stretchr/testify/archive/12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz -> github.com-stretchr-testify-12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz https://github.com/tdewolff/minify/archive/8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz -> github.com-tdewolff-minify-8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz https://github.com/tdewolff/parse/archive/d739d6fccb0971177e06352fea02d3552625efb1.tar.gz -> github.com-tdewolff-parse-d739d6fccb0971177e06352fea02d3552625efb1.tar.gz https://github.com/wellington/go-libsass/archive/615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz -> github.com-wellington-go-libsass-615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz https://github.com/yosssi/ace/archive/ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz -> github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz https://github.com/golang/image/archive/f315e440302883054d0c2bd85486878cb4f8572c.tar.gz -> github.com-golang-image-f315e440302883054d0c2bd85486878cb4f8572c.tar.gz https://github.com/golang/net/archive/61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz -> github.com-golang-net-61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz https://github.com/golang/sys/archive/3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz -> github.com-golang-sys-3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz https://github.com/golang/text/archive/2cb43934f0eece38629746959acc633cba083fe4.tar.gz -> github.com-golang-text-2cb43934f0eece38629746959acc633cba083fe4.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1ff95094a3ff481f9d4ab2d79f93955d
diff --git a/metadata/md5-cache/www-apps/nanoc-4.11.11 b/metadata/md5-cache/www-apps/nanoc-4.11.11
new file mode 100644
index 000000000000..a05d374308d9
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-4.11.11
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby24] dev-ruby/rack:*[ruby_targets_ruby24] www-servers/adsf[ruby_targets_ruby24] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby24] >=dev-ruby/colored-1.2:0[ruby_targets_ruby24] >=dev-ruby/cri-2.15:0[ruby_targets_ruby24] ~www-apps/nanoc-core-4.11.11[ruby_targets_ruby24] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby24] >=dev-ruby/tomlrb-1.2:1[ruby_targets_ruby24] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby24] >=dev-ruby/tty-file-0.7:0[ruby_targets_ruby24] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby24] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby25] dev-ruby/rack:*[ruby_targets_ruby25] www-servers/adsf[ruby_targets_ruby25] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby25] >=dev-ruby/colored-1.2:0[ruby_targets_ruby25] >=dev-ruby/cri-2.15:0[ruby_targets_ruby25] ~www-apps/nanoc-core-4.11.11[ruby_targets_ruby25] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby25] >=dev-ruby/tomlrb-1.2:1[ruby_targets_ruby25] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby25] >=dev-ruby/tty-file-0.7:0[ruby_targets_ruby25] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby25] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby26] dev-ruby/rack:*[ruby_targets_ruby26] www-servers/adsf[ruby_targets_ruby26] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby26] >=dev-ruby/colored-1.2:0[ruby_targets_ruby26] >=dev-ruby/cri-2.15:0[ruby_targets_ruby26] ~www-apps/nanoc-core-4.11.11[ruby_targets_ruby26] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby26] >=dev-ruby/tomlrb-1.2:1[ruby_targets_ruby26] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby26] >=dev-ruby/tty-file-0.7:0[ruby_targets_ruby26] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby26] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/asciidoctor[ruby_targets_ruby24] dev-ruby/fuubar[ruby_targets_ruby24] dev-ruby/haml[ruby_targets_ruby24] dev-ruby/maruku[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/mustache[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] >=dev-ruby/rouge-3.5.1:2[ruby_targets_ruby24] dev-ruby/rubypants[ruby_targets_ruby24] dev-ruby/systemu[ruby_targets_ruby24] dev-ruby/timecop[ruby_targets_ruby24] dev-ruby/vcr[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby24] dev-ruby/rdiscount[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] dev-ruby/asciidoctor[ruby_targets_ruby25] dev-ruby/fuubar[ruby_targets_ruby25] dev-ruby/haml[ruby_targets_ruby25] dev-ruby/maruku[ruby_targets_ruby25] >=dev-ruby/mocha-0.13[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] dev-ruby/mustache[ruby_targets_ruby25] dev-ruby/pry[ruby_targets_ruby25] dev-ruby/rdoc[ruby_targets_ruby25] >=dev-ruby/rouge-3.5.1:2[ruby_targets_ruby25] dev-ruby/rubypants[ruby_targets_ruby25] dev-ruby/systemu[ruby_targets_ruby25] dev-ruby/timecop[ruby_targets_ruby25] dev-ruby/vcr[ruby_targets_ruby25] dev-ruby/webmock[ruby_targets_ruby25] dev-ruby/yard[ruby_targets_ruby25] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby25] dev-ruby/rdiscount[ruby_targets_ruby25] dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] dev-ruby/asciidoctor[ruby_targets_ruby26] dev-ruby/fuubar[ruby_targets_ruby26] dev-ruby/haml[ruby_targets_ruby26] dev-ruby/maruku[ruby_targets_ruby26] >=dev-ruby/mocha-0.13[ruby_targets_ruby26] dev-ruby/minitest[ruby_targets_ruby26] dev-ruby/mustache[ruby_targets_ruby26] dev-ruby/pry[ruby_targets_ruby26] dev-ruby/rdoc[ruby_targets_ruby26] >=dev-ruby/rouge-3.5.1:2[ruby_targets_ruby26] dev-ruby/rubypants[ruby_targets_ruby26] dev-ruby/systemu[ruby_targets_ruby26] dev-ruby/timecop[ruby_targets_ruby26] dev-ruby/vcr[ruby_targets_ruby26] dev-ruby/webmock[ruby_targets_ruby26] dev-ruby/yard[ruby_targets_ruby26] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby26] dev-ruby/rdiscount[ruby_targets_ruby26] dev-ruby/yard[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/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] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/asciidoc app-text/highlight ) 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] )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=7
+HOMEPAGE=https://nanoc.ws/
+IUSE=minimal test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby24] dev-ruby/rack:*[ruby_targets_ruby24] www-servers/adsf[ruby_targets_ruby24] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby24] >=dev-ruby/colored-1.2:0[ruby_targets_ruby24] >=dev-ruby/cri-2.15:0[ruby_targets_ruby24] ~www-apps/nanoc-core-4.11.11[ruby_targets_ruby24] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby24] >=dev-ruby/tomlrb-1.2:1[ruby_targets_ruby24] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby24] >=dev-ruby/tty-file-0.7:0[ruby_targets_ruby24] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby24] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby25] dev-ruby/rack:*[ruby_targets_ruby25] www-servers/adsf[ruby_targets_ruby25] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby25] >=dev-ruby/colored-1.2:0[ruby_targets_ruby25] >=dev-ruby/cri-2.15:0[ruby_targets_ruby25] ~www-apps/nanoc-core-4.11.11[ruby_targets_ruby25] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby25] >=dev-ruby/tomlrb-1.2:1[ruby_targets_ruby25] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby25] >=dev-ruby/tty-file-0.7:0[ruby_targets_ruby25] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby25] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby26] dev-ruby/rack:*[ruby_targets_ruby26] www-servers/adsf[ruby_targets_ruby26] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby26] >=dev-ruby/colored-1.2:0[ruby_targets_ruby26] >=dev-ruby/cri-2.15:0[ruby_targets_ruby26] ~www-apps/nanoc-core-4.11.11[ruby_targets_ruby26] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby26] >=dev-ruby/tomlrb-1.2:1[ruby_targets_ruby26] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby26] >=dev-ruby/tty-file-0.7:0[ruby_targets_ruby26] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby26] >=dev-ruby/tty-which-0.4:0[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? ( 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 )
+SLOT=0
+SRC_URI=https://github.com/nanoc/nanoc/archive/4.11.11.tar.gz -> nanoc-4.11.11.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=00b115d4e9692e1db9a75091e947596e
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.11.11 b/metadata/md5-cache/www-apps/nanoc-core-4.11.11
new file mode 100644
index 000000000000..1dd994e1548b
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.11.11
@@ -0,0 +1,15 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/ddmemoize:1[ruby_targets_ruby24] dev-ruby/ddmetrics:1[ruby_targets_ruby24] dev-ruby/ddplugin:1[ruby_targets_ruby24] =dev-ruby/hamster-3*[ruby_targets_ruby24] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby24] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby24] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ddmemoize:1[ruby_targets_ruby25] dev-ruby/ddmetrics:1[ruby_targets_ruby25] dev-ruby/ddplugin:1[ruby_targets_ruby25] =dev-ruby/hamster-3*[ruby_targets_ruby25] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby25] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby25] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ddmemoize:1[ruby_targets_ruby26] dev-ruby/ddmetrics:1[ruby_targets_ruby26] dev-ruby/ddplugin:1[ruby_targets_ruby26] =dev-ruby/hamster-3*[ruby_targets_ruby26] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby26] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby26] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] dev-ruby/fuubar[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/timecop[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] dev-ruby/rspec:3[ruby_targets_ruby25] dev-ruby/rspec-its[ruby_targets_ruby25] dev-ruby/fuubar[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] dev-ruby/timecop[ruby_targets_ruby25] dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26] dev-ruby/rspec:3[ruby_targets_ruby26] dev-ruby/rspec-its[ruby_targets_ruby26] dev-ruby/fuubar[ruby_targets_ruby26] dev-ruby/minitest[ruby_targets_ruby26] dev-ruby/timecop[ruby_targets_ruby26] dev-ruby/yard[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/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] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/asciidoc app-text/highlight ) 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] )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=7
+HOMEPAGE=https://nanoc.ws/
+IUSE=minimal test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/ddmemoize:1[ruby_targets_ruby24] dev-ruby/ddmetrics:1[ruby_targets_ruby24] dev-ruby/ddplugin:1[ruby_targets_ruby24] =dev-ruby/hamster-3*[ruby_targets_ruby24] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby24] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby24] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ddmemoize:1[ruby_targets_ruby25] dev-ruby/ddmetrics:1[ruby_targets_ruby25] dev-ruby/ddplugin:1[ruby_targets_ruby25] =dev-ruby/hamster-3*[ruby_targets_ruby25] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby25] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby25] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/ddmemoize:1[ruby_targets_ruby26] dev-ruby/ddmetrics:1[ruby_targets_ruby26] dev-ruby/ddplugin:1[ruby_targets_ruby26] =dev-ruby/hamster-3*[ruby_targets_ruby26] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby26] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby26] >=dev-ruby/zeitwerk-2.1:2[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? ( 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 )
+SLOT=0
+SRC_URI=https://github.com/nanoc/nanoc/archive/4.11.11.tar.gz -> nanoc-core-4.11.11.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=fa47af58425809a1d7096da0b01506aa
diff --git a/metadata/md5-cache/www-apps/phpsysinfo-3.3.1 b/metadata/md5-cache/www-apps/phpsysinfo-3.3.1
index 588fbce378a4..ad3c21a35eb7 100644
--- a/metadata/md5-cache/www-apps/phpsysinfo-3.3.1
+++ b/metadata/md5-cache/www-apps/phpsysinfo-3.3.1
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode] virtual/httpd-php >=a
 SLOT=3.3.1
 SRC_URI=https://github.com/rk4an/phpsysinfo/archive/v3.3.1.tar.gz -> phpsysinfo-3.3.1.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=be456dfaeac0cfe365d26d1ca41f8b42
+_md5_=ad78e92a6f26eb6274352c7fbb0de17b
diff --git a/metadata/md5-cache/www-apps/tt-rss-20180105 b/metadata/md5-cache/www-apps/tt-rss-20180105
index 498beb71a670..bd062f97b4d6 100644
--- a/metadata/md5-cache/www-apps/tt-rss-20180105
+++ b/metadata/md5-cache/www-apps/tt-rss-20180105
@@ -10,5 +10,5 @@ RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( dev-lang/php:*[mysqli?,postg
 REQUIRED_USE=|| ( mysqli postgres )
 SLOT=20180105
 SRC_URI=https://git.tt-rss.org/git/tt-rss/archive/c30f5e18119d1935e8fe6d422053b127e8f4f1b3.tar.gz -> tt-rss-20180105.tar.gz
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe	user	00484e1be1aac73e24fca1c99557a7d6	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501	user	00484e1be1aac73e24fca1c99557a7d6	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=11f53d1c564f8684d7496f5d2bacf560
diff --git a/metadata/md5-cache/www-apps/tt-rss-20190523 b/metadata/md5-cache/www-apps/tt-rss-20190523
index aded20314cde..c7f7a271e86c 100644
--- a/metadata/md5-cache/www-apps/tt-rss-20190523
+++ b/metadata/md5-cache/www-apps/tt-rss-20190523
@@ -10,5 +10,5 @@ RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( dev-lang/php:*[mysqli?,postg
 REQUIRED_USE=|| ( mysqli postgres )
 SLOT=20190523
 SRC_URI=https://git.tt-rss.org/git/tt-rss/archive/4a2836ea90c4c471029d189a8c9fe5ec10a9521b.tar.gz -> tt-rss-20190523.tar.gz
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe	user	00484e1be1aac73e24fca1c99557a7d6	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501	user	00484e1be1aac73e24fca1c99557a7d6	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=4889666c45d4d5f540407bca1302e41f
diff --git a/metadata/md5-cache/www-apps/tt-rss-99999999 b/metadata/md5-cache/www-apps/tt-rss-99999999
index d0c177e622a6..4c0934961e97 100644
--- a/metadata/md5-cache/www-apps/tt-rss-99999999
+++ b/metadata/md5-cache/www-apps/tt-rss-99999999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] ) !daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysqli postgres )
 SLOT=99999999
-_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	prefix	e51c7882b7b721e54e684f7eb143cbfe	user	00484e1be1aac73e24fca1c99557a7d6	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	prefix	c2993e4c430c1ee24f278983d6189501	user	00484e1be1aac73e24fca1c99557a7d6	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=15732b2927bbee0903215752c2191054
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index ab5939384337..6b6a7b4a4597 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-77.0.3865.56 b/metadata/md5-cache/www-client/chromium-77.0.3865.56
deleted file mode 100644
index f5d576b034ee..000000000000
--- a/metadata/md5-cache/www-client/chromium-77.0.3865.56
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=http://chromium.org/
-IUSE=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-REQUIRED_USE=component-build? ( !suid )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-77.0.3865.56.tar.xz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=083d6701d0643e8ba770502de8eee062
diff --git a/metadata/md5-cache/www-client/chromium-77.0.3865.75 b/metadata/md5-cache/www-client/chromium-77.0.3865.75
new file mode 100644
index 000000000000..8cec36d37ea5
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-77.0.3865.75
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn dev-vcs/git >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex closure-compile? ( virtual/jre ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=http://chromium.org/
+IUSE=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-64:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+REQUIRED_USE=component-build? ( !suid )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-77.0.3865.75.tar.xz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd1a27ed9efbdcc5a236d10fce65524b
diff --git a/metadata/md5-cache/www-client/epiphany-3.30.5 b/metadata/md5-cache/www-client/epiphany-3.30.5
new file mode 100644
index 000000000000..0659d626a357
--- /dev/null
+++ b/metadata/md5-cache/www-client/epiphany-3.30.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.21.92:4= >=x11-libs/cairo-1.2 >=dev-libs/libdazzle-3.28.0 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool sys-apps/paxctl >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=GNOME webbrowser based on Webkit
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Web
+IUSE=test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.52.0:2 >=x11-libs/gtk+-3.22.13:3 >=dev-libs/nettle-3.2:= >=net-libs/webkit-gtk-2.21.92:4= >=x11-libs/cairo-1.2 >=dev-libs/libdazzle-3.28.0 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 dev-db/sqlite:3 dev-libs/gmp:0= >=gnome-base/gsettings-desktop-schemas-0.0.1 x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/epiphany/3.30/epiphany-3.30.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aaa2167aca7e3732c6b841941525dce6
diff --git a/metadata/md5-cache/www-client/epiphany-3.32.4 b/metadata/md5-cache/www-client/epiphany-3.32.4
index 42dab5326cf8..b7f307d6d4b5 100644
--- a/metadata/md5-cache/www-client/epiphany-3.32.4
+++ b/metadata/md5-cache/www-client/epiphany-3.32.4
@@ -5,10 +5,10 @@ DESCRIPTION=GNOME webbrowser based on Webkit
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Web
 IUSE=test test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.24.1:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=dev-libs/libdazzle-3.31.90 >=gui-libs/libhandy-0.0.9:0.0= >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 dev-db/sqlite:3 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.32/epiphany-3.32.4.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=138872b973aa33b6bfa513ebd838f133
+_md5_=151470024a4564cac60df578ced12609
diff --git a/metadata/md5-cache/www-client/epiphany-3.32.5 b/metadata/md5-cache/www-client/epiphany-3.32.5
new file mode 100644
index 000000000000..8935f072f29f
--- /dev/null
+++ b/metadata/md5-cache/www-client/epiphany-3.32.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.24.1:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=dev-libs/libdazzle-3.31.90 >=gui-libs/libhandy-0.0.9:0.0= >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 dev-db/sqlite:3 dev-libs/gmp:0= dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME webbrowser based on Webkit
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Web
+IUSE=test test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.24.1:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas dev-libs/icu:= >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.2.4 >=dev-libs/libdazzle-3.31.90 >=gui-libs/libhandy-0.0.9:0.0= >=x11-libs/libnotify-0.5.1 >=app-crypt/libsecret-0.14 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 dev-db/sqlite:3 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/epiphany/3.32/epiphany-3.32.5.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=151470024a4564cac60df578ced12609
diff --git a/metadata/md5-cache/www-client/firefox-60.8.0 b/metadata/md5-cache/www-client/firefox-60.8.0
index 0106df686505..711c40eb937c 100644
--- a/metadata/md5-cache/www-client/firefox-60.8.0
+++ b/metadata/md5-cache/www-client/firefox-60.8.0
@@ -10,5 +10,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/ns
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.8.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.8.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.8.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.8.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.8.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.8.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.8.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.8.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.8.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.8.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.8.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.8.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.8.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cak.xpi -> firefox-60.8.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.8.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.8.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.8.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.8.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/dsb.xpi -> firefox-60.8.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.8.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.8.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.8.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.8.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.8.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.8.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.8.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.8.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.8.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.8.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.8.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ff.xpi -> firefox-60.8.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.8.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.8.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.8.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.8.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.8.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.8.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gn.xpi -> firefox-60.8.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.8.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.8.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.8.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.8.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.8.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.8.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.8.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.8.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.8.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.8.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.8.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ka.xpi -> firefox-60.8.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kab.xpi -> firefox-60.8.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.8.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.8.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.8.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.8.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lij.xpi -> firefox-60.8.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.8.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.8.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.8.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.8.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.8.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.8.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.8.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.8.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.8.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.8.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.8.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.8.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.8.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.8.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.8.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.8.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.8.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.8.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.8.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.8.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.8.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.8.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.8.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.8.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.8.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.8.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.8.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.8.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.8.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.8.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.8.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.8.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.8.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.8.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.8.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.8.0esr/source/firefox-60.8.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	c4b97a91aadfec77274ee168a08fa80e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f1e6e0d1ab174514d1d2c4da566ca79
diff --git a/metadata/md5-cache/www-client/firefox-60.9.0 b/metadata/md5-cache/www-client/firefox-60.9.0
index 4c7e7e43ba7e..f22be07e0301 100644
--- a/metadata/md5-cache/www-client/firefox-60.9.0
+++ b/metadata/md5-cache/www-client/firefox-60.9.0
@@ -10,5 +10,5 @@ RDEPEND=system-icu? ( >=dev-libs/icu-60.2 ) jack? ( virtual/jack ) >=dev-libs/ns
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ach.xpi -> firefox-60.9.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/af.xpi -> firefox-60.9.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/an.xpi -> firefox-60.9.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ar.xpi -> firefox-60.9.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/as.xpi -> firefox-60.9.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ast.xpi -> firefox-60.9.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/az.xpi -> firefox-60.9.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bg.xpi -> firefox-60.9.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-BD.xpi -> firefox-60.9.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bn-IN.xpi -> firefox-60.9.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/br.xpi -> firefox-60.9.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/bs.xpi -> firefox-60.9.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ca.xpi -> firefox-60.9.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cak.xpi -> firefox-60.9.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cs.xpi -> firefox-60.9.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/cy.xpi -> firefox-60.9.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/da.xpi -> firefox-60.9.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/de.xpi -> firefox-60.9.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/dsb.xpi -> firefox-60.9.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/el.xpi -> firefox-60.9.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-GB.xpi -> firefox-60.9.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/en-ZA.xpi -> firefox-60.9.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eo.xpi -> firefox-60.9.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-AR.xpi -> firefox-60.9.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-CL.xpi -> firefox-60.9.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-ES.xpi -> firefox-60.9.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/es-MX.xpi -> firefox-60.9.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/et.xpi -> firefox-60.9.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/eu.xpi -> firefox-60.9.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fa.xpi -> firefox-60.9.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ff.xpi -> firefox-60.9.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fi.xpi -> firefox-60.9.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fr.xpi -> firefox-60.9.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/fy-NL.xpi -> firefox-60.9.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ga-IE.xpi -> firefox-60.9.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gd.xpi -> firefox-60.9.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gl.xpi -> firefox-60.9.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gn.xpi -> firefox-60.9.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/gu-IN.xpi -> firefox-60.9.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/he.xpi -> firefox-60.9.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hi-IN.xpi -> firefox-60.9.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hr.xpi -> firefox-60.9.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hsb.xpi -> firefox-60.9.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hu.xpi -> firefox-60.9.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/hy-AM.xpi -> firefox-60.9.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/id.xpi -> firefox-60.9.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/is.xpi -> firefox-60.9.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/it.xpi -> firefox-60.9.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ja.xpi -> firefox-60.9.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ka.xpi -> firefox-60.9.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kab.xpi -> firefox-60.9.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kk.xpi -> firefox-60.9.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/km.xpi -> firefox-60.9.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/kn.xpi -> firefox-60.9.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ko.xpi -> firefox-60.9.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lij.xpi -> firefox-60.9.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lt.xpi -> firefox-60.9.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/lv.xpi -> firefox-60.9.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mai.xpi -> firefox-60.9.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mk.xpi -> firefox-60.9.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ml.xpi -> firefox-60.9.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/mr.xpi -> firefox-60.9.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ms.xpi -> firefox-60.9.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nb-NO.xpi -> firefox-60.9.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nl.xpi -> firefox-60.9.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/nn-NO.xpi -> firefox-60.9.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/or.xpi -> firefox-60.9.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pa-IN.xpi -> firefox-60.9.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pl.xpi -> firefox-60.9.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-BR.xpi -> firefox-60.9.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/pt-PT.xpi -> firefox-60.9.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/rm.xpi -> firefox-60.9.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ro.xpi -> firefox-60.9.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ru.xpi -> firefox-60.9.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/si.xpi -> firefox-60.9.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sk.xpi -> firefox-60.9.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sl.xpi -> firefox-60.9.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/son.xpi -> firefox-60.9.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sq.xpi -> firefox-60.9.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sr.xpi -> firefox-60.9.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/sv-SE.xpi -> firefox-60.9.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/ta.xpi -> firefox-60.9.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/te.xpi -> firefox-60.9.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/th.xpi -> firefox-60.9.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/tr.xpi -> firefox-60.9.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uk.xpi -> firefox-60.9.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/uz.xpi -> firefox-60.9.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/vi.xpi -> firefox-60.9.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/xh.xpi -> firefox-60.9.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-CN.xpi -> firefox-60.9.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/60.6.1esr/linux-i686/xpi/zh-TW.xpi -> firefox-60.9.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/60.9.0esr/source/firefox-60.9.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-60.6-patches-07.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-60.6-patches-07.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	c4b97a91aadfec77274ee168a08fa80e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0839b154e1ad7733e78fd8168eef54f7
diff --git a/metadata/md5-cache/www-client/firefox-68.0.2 b/metadata/md5-cache/www-client/firefox-68.0.2
deleted file mode 100644
index 398ea9d88e73..000000000000
--- a/metadata/md5-cache/www-client/firefox-68.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.44.1 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.8.7 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/cargo-1.34.0 >=virtual/rust-1.34.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.5[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tr l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.44.1 >=dev-libs/nspr-4.21 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-63.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.7.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=wifi? ( dbus ) pgo? ( lto )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ach.xpi -> firefox-68.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/af.xpi -> firefox-68.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/an.xpi -> firefox-68.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ar.xpi -> firefox-68.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ast.xpi -> firefox-68.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/az.xpi -> firefox-68.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/be.xpi -> firefox-68.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/bg.xpi -> firefox-68.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/bn.xpi -> firefox-68.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/br.xpi -> firefox-68.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/bs.xpi -> firefox-68.0.2-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ca.xpi -> firefox-68.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/cak.xpi -> firefox-68.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/cs.xpi -> firefox-68.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/cy.xpi -> firefox-68.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/da.xpi -> firefox-68.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/de.xpi -> firefox-68.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/dsb.xpi -> firefox-68.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/el.xpi -> firefox-68.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/en-CA.xpi -> firefox-68.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/en-GB.xpi -> firefox-68.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/eo.xpi -> firefox-68.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/es-AR.xpi -> firefox-68.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/es-CL.xpi -> firefox-68.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/es-ES.xpi -> firefox-68.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/es-MX.xpi -> firefox-68.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/et.xpi -> firefox-68.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/eu.xpi -> firefox-68.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/fa.xpi -> firefox-68.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ff.xpi -> firefox-68.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/fi.xpi -> firefox-68.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/fr.xpi -> firefox-68.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/fy-NL.xpi -> firefox-68.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ga-IE.xpi -> firefox-68.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/gd.xpi -> firefox-68.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/gl.xpi -> firefox-68.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/gn.xpi -> firefox-68.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/gu-IN.xpi -> firefox-68.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/he.xpi -> firefox-68.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hi-IN.xpi -> firefox-68.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hr.xpi -> firefox-68.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hsb.xpi -> firefox-68.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hu.xpi -> firefox-68.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/hy-AM.xpi -> firefox-68.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ia.xpi -> firefox-68.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/id.xpi -> firefox-68.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/is.xpi -> firefox-68.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/it.xpi -> firefox-68.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ja.xpi -> firefox-68.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ka.xpi -> firefox-68.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/kab.xpi -> firefox-68.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/kk.xpi -> firefox-68.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/km.xpi -> firefox-68.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/kn.xpi -> firefox-68.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ko.xpi -> firefox-68.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/lij.xpi -> firefox-68.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/lt.xpi -> firefox-68.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/lv.xpi -> firefox-68.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/mk.xpi -> firefox-68.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/mr.xpi -> firefox-68.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ms.xpi -> firefox-68.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/my.xpi -> firefox-68.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/nb-NO.xpi -> firefox-68.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/nl.xpi -> firefox-68.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/nn-NO.xpi -> firefox-68.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/oc.xpi -> firefox-68.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/pa-IN.xpi -> firefox-68.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/pl.xpi -> firefox-68.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/pt-BR.xpi -> firefox-68.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/pt-PT.xpi -> firefox-68.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/rm.xpi -> firefox-68.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ro.xpi -> firefox-68.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ru.xpi -> firefox-68.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/si.xpi -> firefox-68.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sk.xpi -> firefox-68.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sl.xpi -> firefox-68.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/son.xpi -> firefox-68.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sq.xpi -> firefox-68.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sr.xpi -> firefox-68.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/sv-SE.xpi -> firefox-68.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ta.xpi -> firefox-68.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/te.xpi -> firefox-68.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/th.xpi -> firefox-68.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/tr.xpi -> firefox-68.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/uk.xpi -> firefox-68.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/ur.xpi -> firefox-68.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/uz.xpi -> firefox-68.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/vi.xpi -> firefox-68.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/xh.xpi -> firefox-68.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/zh-CN.xpi -> firefox-68.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xpi/zh-TW.xpi -> firefox-68.0.2-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/68.0.2/source/firefox-68.0.2.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-11.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=12bb4cf7a784135b4e1c4569967d1df8
diff --git a/metadata/md5-cache/www-client/firefox-68.1.0 b/metadata/md5-cache/www-client/firefox-68.1.0
index 31f8cadc7f9f..624f8cf2a5ff 100644
--- a/metadata/md5-cache/www-client/firefox-68.1.0
+++ b/metadata/md5-cache/www-client/firefox-68.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=wifi? ( dbus ) pgo? ( lto )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ach.xpi -> firefox-68.1.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/af.xpi -> firefox-68.1.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/an.xpi -> firefox-68.1.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ar.xpi -> firefox-68.1.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ast.xpi -> firefox-68.1.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/az.xpi -> firefox-68.1.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/be.xpi -> firefox-68.1.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/bg.xpi -> firefox-68.1.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/bn.xpi -> firefox-68.1.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/br.xpi -> firefox-68.1.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/bs.xpi -> firefox-68.1.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ca.xpi -> firefox-68.1.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/cak.xpi -> firefox-68.1.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/cs.xpi -> firefox-68.1.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/cy.xpi -> firefox-68.1.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/da.xpi -> firefox-68.1.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/de.xpi -> firefox-68.1.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/dsb.xpi -> firefox-68.1.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/el.xpi -> firefox-68.1.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/en-CA.xpi -> firefox-68.1.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/en-GB.xpi -> firefox-68.1.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/eo.xpi -> firefox-68.1.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/es-AR.xpi -> firefox-68.1.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/es-CL.xpi -> firefox-68.1.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/es-ES.xpi -> firefox-68.1.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/es-MX.xpi -> firefox-68.1.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/et.xpi -> firefox-68.1.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/eu.xpi -> firefox-68.1.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/fa.xpi -> firefox-68.1.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ff.xpi -> firefox-68.1.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/fi.xpi -> firefox-68.1.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/fr.xpi -> firefox-68.1.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-68.1.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-68.1.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/gd.xpi -> firefox-68.1.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/gl.xpi -> firefox-68.1.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/gn.xpi -> firefox-68.1.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-68.1.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/he.xpi -> firefox-68.1.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-68.1.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hr.xpi -> firefox-68.1.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hsb.xpi -> firefox-68.1.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hu.xpi -> firefox-68.1.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-68.1.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ia.xpi -> firefox-68.1.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/id.xpi -> firefox-68.1.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/is.xpi -> firefox-68.1.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/it.xpi -> firefox-68.1.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ja.xpi -> firefox-68.1.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ka.xpi -> firefox-68.1.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/kab.xpi -> firefox-68.1.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/kk.xpi -> firefox-68.1.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/km.xpi -> firefox-68.1.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/kn.xpi -> firefox-68.1.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ko.xpi -> firefox-68.1.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/lij.xpi -> firefox-68.1.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/lt.xpi -> firefox-68.1.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/lv.xpi -> firefox-68.1.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/mk.xpi -> firefox-68.1.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/mr.xpi -> firefox-68.1.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ms.xpi -> firefox-68.1.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/my.xpi -> firefox-68.1.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-68.1.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/nl.xpi -> firefox-68.1.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-68.1.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/oc.xpi -> firefox-68.1.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-68.1.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/pl.xpi -> firefox-68.1.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-68.1.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-68.1.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/rm.xpi -> firefox-68.1.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ro.xpi -> firefox-68.1.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ru.xpi -> firefox-68.1.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/si.xpi -> firefox-68.1.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sk.xpi -> firefox-68.1.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sl.xpi -> firefox-68.1.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/son.xpi -> firefox-68.1.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sq.xpi -> firefox-68.1.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sr.xpi -> firefox-68.1.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-68.1.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ta.xpi -> firefox-68.1.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/te.xpi -> firefox-68.1.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/th.xpi -> firefox-68.1.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/tr.xpi -> firefox-68.1.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/uk.xpi -> firefox-68.1.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/ur.xpi -> firefox-68.1.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/uz.xpi -> firefox-68.1.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/vi.xpi -> firefox-68.1.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/xh.xpi -> firefox-68.1.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-68.1.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-68.1.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/68.1.0esr/source/firefox-68.1.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-68.0-patches-11.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-68.0-patches-11.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	c4b97a91aadfec77274ee168a08fa80e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=69fbfc6dfb3384fd6691a8a1dabd8554
diff --git a/metadata/md5-cache/www-client/firefox-69.0 b/metadata/md5-cache/www-client/firefox-69.0
index eea912d1a2ef..ef63f4e0d787 100644
--- a/metadata/md5-cache/www-client/firefox-69.0
+++ b/metadata/md5-cache/www-client/firefox-69.0
@@ -11,5 +11,5 @@ REQUIRED_USE=pgo? ( lto )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ach.xpi -> firefox-69.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/af.xpi -> firefox-69.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/an.xpi -> firefox-69.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ar.xpi -> firefox-69.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ast.xpi -> firefox-69.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/az.xpi -> firefox-69.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/be.xpi -> firefox-69.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/bg.xpi -> firefox-69.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/bn.xpi -> firefox-69.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/br.xpi -> firefox-69.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/bs.xpi -> firefox-69.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ca.xpi -> firefox-69.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/cak.xpi -> firefox-69.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/cs.xpi -> firefox-69.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/cy.xpi -> firefox-69.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/da.xpi -> firefox-69.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/de.xpi -> firefox-69.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/dsb.xpi -> firefox-69.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/el.xpi -> firefox-69.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/en-CA.xpi -> firefox-69.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/en-GB.xpi -> firefox-69.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/eo.xpi -> firefox-69.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/es-AR.xpi -> firefox-69.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/es-CL.xpi -> firefox-69.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/es-ES.xpi -> firefox-69.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/es-MX.xpi -> firefox-69.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/et.xpi -> firefox-69.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/eu.xpi -> firefox-69.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/fa.xpi -> firefox-69.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ff.xpi -> firefox-69.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/fi.xpi -> firefox-69.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/fr.xpi -> firefox-69.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/fy-NL.xpi -> firefox-69.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ga-IE.xpi -> firefox-69.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/gd.xpi -> firefox-69.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/gl.xpi -> firefox-69.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/gn.xpi -> firefox-69.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/gu-IN.xpi -> firefox-69.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/he.xpi -> firefox-69.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/hi-IN.xpi -> firefox-69.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/hr.xpi -> firefox-69.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/hsb.xpi -> firefox-69.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/hu.xpi -> firefox-69.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/hy-AM.xpi -> firefox-69.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ia.xpi -> firefox-69.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/id.xpi -> firefox-69.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/is.xpi -> firefox-69.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/it.xpi -> firefox-69.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ja.xpi -> firefox-69.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ka.xpi -> firefox-69.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/kab.xpi -> firefox-69.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/kk.xpi -> firefox-69.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/km.xpi -> firefox-69.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/kn.xpi -> firefox-69.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ko.xpi -> firefox-69.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/lij.xpi -> firefox-69.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/lt.xpi -> firefox-69.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/lv.xpi -> firefox-69.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/mk.xpi -> firefox-69.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/mr.xpi -> firefox-69.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ms.xpi -> firefox-69.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/my.xpi -> firefox-69.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/nb-NO.xpi -> firefox-69.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/nl.xpi -> firefox-69.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/nn-NO.xpi -> firefox-69.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/oc.xpi -> firefox-69.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/pa-IN.xpi -> firefox-69.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/pl.xpi -> firefox-69.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/pt-BR.xpi -> firefox-69.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/pt-PT.xpi -> firefox-69.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/rm.xpi -> firefox-69.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ro.xpi -> firefox-69.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ru.xpi -> firefox-69.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/si.xpi -> firefox-69.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/sk.xpi -> firefox-69.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/sl.xpi -> firefox-69.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/son.xpi -> firefox-69.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/sq.xpi -> firefox-69.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/sr.xpi -> firefox-69.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/sv-SE.xpi -> firefox-69.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ta.xpi -> firefox-69.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/te.xpi -> firefox-69.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/th.xpi -> firefox-69.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/tr.xpi -> firefox-69.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/uk.xpi -> firefox-69.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/ur.xpi -> firefox-69.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/uz.xpi -> firefox-69.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/vi.xpi -> firefox-69.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/xh.xpi -> firefox-69.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/zh-CN.xpi -> firefox-69.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xpi/zh-TW.xpi -> firefox-69.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/69.0/source/firefox-69.0.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-69.0-patches-06.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-69.0-patches-06.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-69.0-patches-06.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-69.0-patches-06.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	5dbc14df2333105b7c006124ead9bf3f	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	c4b97a91aadfec77274ee168a08fa80e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfcbf8ba54a1be8cf35414e601b55ebf
diff --git a/metadata/md5-cache/www-client/google-chrome-76.0.3809.132 b/metadata/md5-cache/www-client/google-chrome-76.0.3809.132
deleted file mode 100644
index d98eb75292dc..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-76.0.3809.132
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_76.0.3809.132-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/google-chrome-77.0.3865.75 b/metadata/md5-cache/www-client/google-chrome-77.0.3865.75
new file mode 100644
index 000000000000..3c6fb6fe31ee
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-77.0.3865.75
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_77.0.3865.75-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=41d165a2c0d07dba94ea75edcaf796a1
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-77.0.3865.70 b/metadata/md5-cache/www-client/google-chrome-beta-77.0.3865.70
deleted file mode 100644
index 43918b4571a4..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-77.0.3865.70
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_77.0.3865.70-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41d165a2c0d07dba94ea75edcaf796a1
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-77.0.3865.75 b/metadata/md5-cache/www-client/google-chrome-beta-77.0.3865.75
new file mode 100644
index 000000000000..afd557958778
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-77.0.3865.75
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_77.0.3865.75-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=41d165a2c0d07dba94ea75edcaf796a1
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3902.4 b/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3902.4
deleted file mode 100644
index a8fd9b81a066..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3902.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_78.0.3902.4-1_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41d165a2c0d07dba94ea75edcaf796a1
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3904.9 b/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3904.9
new file mode 100644
index 000000000000..735c0bfa4f7a
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-78.0.3904.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=kernel_linux +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_78.0.3904.9-1_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=41d165a2c0d07dba94ea75edcaf796a1
diff --git a/metadata/md5-cache/www-client/midori-9.0 b/metadata/md5-cache/www-client/midori-9.0
new file mode 100644
index 000000000000..05b479015ea4
--- /dev/null
+++ b/metadata/md5-cache/www-client/midori-9.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-arch/libarchive:= >=app-crypt/gcr-3:=[gtk,vala] >=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.46.2:2 >=dev-libs/json-glib-0.12 dev-libs/libpeas[gtk] dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4[vala] >=net-libs/webkit-gtk-2.16.6:4[introspection] >=x11-libs/libnotify-0.7 >=x11-libs/gtk+-3.12.0:3 || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) dev-util/intltool sys-devel/gettext
+DESCRIPTION=A lightweight web browser based on WebKitGTK+
+EAPI=7
+HOMEPAGE=https://www.midori-browser.org/
+KEYWORDS=~amd64 ~arm ~mips ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=app-arch/libarchive:= >=app-crypt/gcr-3:=[gtk,vala] >=dev-db/sqlite-3.6.19:3 >=dev-libs/glib-2.46.2:2 >=dev-libs/json-glib-0.12 dev-libs/libpeas[gtk] dev-libs/libxml2 >=net-libs/libsoup-2.38:2.4[vala] >=net-libs/webkit-gtk-2.16.6:4[introspection] >=x11-libs/libnotify-0.7 >=x11-libs/gtk+-3.12.0:3
+SLOT=0
+SRC_URI=https://github.com/midori-browser/core/releases/download/v9.0/midori-v9.0.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=67ab1374556f304dd6ac02d0036e7a9f
diff --git a/metadata/md5-cache/www-client/opera-63.0.3368.53 b/metadata/md5-cache/www-client/opera-63.0.3368.53
deleted file mode 100644
index 4b53cc285a98..000000000000
--- a/metadata/md5-cache/www-client/opera-63.0.3368.53
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/63.0.3368.53/linux/opera-stable_63.0.3368.53_amd64.deb https://download2.operacdn.com/pub/opera/desktop/63.0.3368.53/linux/opera-stable_63.0.3368.53_amd64.deb https://download3.operacdn.com/pub/opera/desktop/63.0.3368.53/linux/opera-stable_63.0.3368.53_amd64.deb https://download4.operacdn.com/pub/opera/desktop/63.0.3368.53/linux/opera-stable_63.0.3368.53_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89708cd7601a34cbaa703f107640ea1c
diff --git a/metadata/md5-cache/www-client/opera-63.0.3368.66 b/metadata/md5-cache/www-client/opera-63.0.3368.66
index dafa14e7bde0..79042d4ead1f 100644
--- a/metadata/md5-cache/www-client/opera-63.0.3368.66
+++ b/metadata/md5-cache/www-client/opera-63.0.3368.66
@@ -3,10 +3,10 @@ DESCRIPTION=A fast and secure web browser
 EAPI=7
 HOMEPAGE=https://www.opera.com/
 IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
 SRC_URI=https://download1.operacdn.com/pub/opera/desktop/63.0.3368.66/linux/opera-stable_63.0.3368.66_amd64.deb https://download2.operacdn.com/pub/opera/desktop/63.0.3368.66/linux/opera-stable_63.0.3368.66_amd64.deb https://download3.operacdn.com/pub/opera/desktop/63.0.3368.66/linux/opera-stable_63.0.3368.66_amd64.deb https://download4.operacdn.com/pub/opera/desktop/63.0.3368.66/linux/opera-stable_63.0.3368.66_amd64.deb
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=042e9bfb56943b80785aa8a9197b3797
+_md5_=89708cd7601a34cbaa703f107640ea1c
diff --git a/metadata/md5-cache/www-client/opera-63.0.3368.88 b/metadata/md5-cache/www-client/opera-63.0.3368.88
new file mode 100644
index 000000000000..86b370f3af96
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-63.0.3368.88
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/63.0.3368.88/linux/opera-stable_63.0.3368.88_amd64.deb https://download2.operacdn.com/pub/opera/desktop/63.0.3368.88/linux/opera-stable_63.0.3368.88_amd64.deb https://download3.operacdn.com/pub/opera/desktop/63.0.3368.88/linux/opera-stable_63.0.3368.88_amd64.deb https://download4.operacdn.com/pub/opera/desktop/63.0.3368.88/linux/opera-stable_63.0.3368.88_amd64.deb
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=042e9bfb56943b80785aa8a9197b3797
diff --git a/metadata/md5-cache/www-client/opera-beta-64.0.3417.11 b/metadata/md5-cache/www-client/opera-beta-64.0.3417.11
new file mode 100644
index 000000000000..9f5f867ba8a7
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-64.0.3417.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/64.0.3417.11/linux/opera-beta_64.0.3417.11_amd64.deb https://download2.operacdn.com/pub/opera-beta/64.0.3417.11/linux/opera-beta_64.0.3417.11_amd64.deb https://download3.operacdn.com/pub/opera-beta/64.0.3417.11/linux/opera-beta_64.0.3417.11_amd64.deb https://download4.operacdn.com/pub/opera-beta/64.0.3417.11/linux/opera-beta_64.0.3417.11_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3a6af105b075ad391ce7d3274cbee92f
diff --git a/metadata/md5-cache/www-client/opera-developer-65.0.3425.0 b/metadata/md5-cache/www-client/opera-developer-65.0.3425.0
deleted file mode 100644
index c53be1756fc9..000000000000
--- a/metadata/md5-cache/www-client/opera-developer-65.0.3425.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/65.0.3425.0/linux/opera-developer_65.0.3425.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/65.0.3425.0/linux/opera-developer_65.0.3425.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/65.0.3425.0/linux/opera-developer_65.0.3425.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/65.0.3425.0/linux/opera-developer_65.0.3425.0_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15a3756fba642990d5e49f40be495e5e
diff --git a/metadata/md5-cache/www-client/opera-developer-65.0.3437.0 b/metadata/md5-cache/www-client/opera-developer-65.0.3437.0
new file mode 100644
index 000000000000..c91f2ffe5825
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-65.0.3437.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/65.0.3437.0/linux/opera-developer_65.0.3437.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/65.0.3437.0/linux/opera-developer_65.0.3437.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/65.0.3437.0/linux/opera-developer_65.0.3437.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/65.0.3437.0/linux/opera-developer_65.0.3437.0_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=15a3756fba642990d5e49f40be495e5e
diff --git a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.6 b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.6
deleted file mode 100644
index a003680d2ebd..000000000000
--- a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/socketio-client-0.6.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jsonschema[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A Python wrapper around the RIPE Atlas API
-EAPI=5
-HOMEPAGE=https://atlas.ripe.net/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/socketio-client-0.6.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/r/ripe.atlas.cousteau/ripe.atlas.cousteau-1.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91fb1e7caf353838e78b7531904f102b
diff --git a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.7 b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.7
deleted file mode 100644
index 26965202f177..000000000000
--- a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/socketio-client-0.6.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jsonschema[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A Python wrapper around the RIPE Atlas API
-EAPI=5
-HOMEPAGE=https://atlas.ripe.net/
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/socketio-client-0.6.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/r/ripe.atlas.cousteau/ripe.atlas.cousteau-1.0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2cf72e55e4d122eec3e5f1d42ca6f6ad
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.5 b/metadata/md5-cache/www-client/seamonkey-2.49.5
index 0170c64ba960..476c2159e942 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.5
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.5
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 jack? ( virtual/jack ) crypt? ( <x11-plugins/enigmail-2.1.0 ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.34:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10:= virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-icu? ( >=dev-libs/icu-59.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-sqlite? ( >=dev-db/sqlite-3.23.1:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] <media-libs/libvpx-1.8:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.4.2:0= >=media-gfx/graphite2-1.3.9-r1 ) >=x11-libs/gtk+-3.4.0:3 wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.49.5/source/seamonkey-2.49.5.source.tar.xz -> seamonkey-2.49.5.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.49.5/source/seamonkey-2.49.5.source-l10n.tar.xz -> seamonkey-2.49.5.source-l10n.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.49.5-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.49.5-patches-01.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	538fb83e520732ac59d59385c2372939	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.60	4f62da16d617090e7ca9d890a4a9357a	mozcoreconf-v6	c4b97a91aadfec77274ee168a08fa80e	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7bea2cb2a267cabf5dcd894a48419ecf
diff --git a/metadata/md5-cache/www-client/vivaldi-2.7.1628.30_p1 b/metadata/md5-cache/www-client/vivaldi-2.7.1628.30_p1
deleted file mode 100644
index db1f08958da6..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-2.7.1628.30_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.30-1_amd64.deb -> vivaldi-2.7.1628.30_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.30-1_armhf.deb -> vivaldi-2.7.1628.30_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.30-1_i386.deb -> vivaldi-2.7.1628.30_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c71bed7d90a1783a268c7e21ac0c7fba
diff --git a/metadata/md5-cache/www-client/vivaldi-2.7.1628.33_p1 b/metadata/md5-cache/www-client/vivaldi-2.7.1628.33_p1
index 3516acf6784c..e2ad4520d24d 100644
--- a/metadata/md5-cache/www-client/vivaldi-2.7.1628.33_p1
+++ b/metadata/md5-cache/www-client/vivaldi-2.7.1628.33_p1
@@ -4,11 +4,11 @@ DESCRIPTION=A browser for our friends
 EAPI=7
 HOMEPAGE=https://vivaldi.com/
 IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~x86
+KEYWORDS=-* amd64 ~arm x86
 LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.33-1_amd64.deb -> vivaldi-2.7.1628.33_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.33-1_armhf.deb -> vivaldi-2.7.1628.33_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.33-1_i386.deb -> vivaldi-2.7.1628.33_p1-i386.deb )
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ad3d712e255fffc3879cdf00b491412
+_md5_=c71bed7d90a1783a268c7e21ac0c7fba
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1650.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1650.3_p1
deleted file mode 100644
index 1f9793e2e403..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1650.3_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm64 ~x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1650.3-1_amd64.deb -> vivaldi-snapshot-2.8.1650.3_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1650.3-1_arm64.deb -> vivaldi-snapshot-2.8.1650.3_p1-arm64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1650.3-1_i386.deb -> vivaldi-snapshot-2.8.1650.3_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de6c7914abc1088989488af9607b839e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1657.8_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1657.8_p1
deleted file mode 100644
index 0498187a1971..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1657.8_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1657.8-1_amd64.deb -> vivaldi-snapshot-2.8.1657.8_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1657.8-1_i386.deb -> vivaldi-snapshot-2.8.1657.8_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74f684b78353f34222abc77b2c93d46e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1662.4_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1662.4_p1
new file mode 100644
index 000000000000..531d1b45a180
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1662.4_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm64 ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1662.4-1_amd64.deb -> vivaldi-snapshot-2.8.1662.4_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1662.4-1_arm64.deb -> vivaldi-snapshot-2.8.1662.4_p1-arm64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1662.4-1_i386.deb -> vivaldi-snapshot-2.8.1662.4_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=de6c7914abc1088989488af9607b839e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1664.4_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1664.4_p1
new file mode 100644
index 000000000000..9a30ccce3ee1
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.8.1664.4_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm64 ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1664.4-1_amd64.deb -> vivaldi-snapshot-2.8.1664.4_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1664.4-1_arm64.deb -> vivaldi-snapshot-2.8.1664.4_p1-arm64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.8.1664.4-1_i386.deb -> vivaldi-snapshot-2.8.1664.4_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=de6c7914abc1088989488af9607b839e
diff --git a/metadata/md5-cache/www-client/w3m-0.5.3_p20180125 b/metadata/md5-cache/www-client/w3m-0.5.3_p20180125
index ae8cf60e1bde..a8dceab35ee2 100644
--- a/metadata/md5-cache/www-client/w3m-0.5.3_p20180125
+++ b/metadata/md5-cache/www-client/w3m-0.5.3_p20180125
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boehm-gc:= sys-libs/ncurses:0= sys-libs/zlib X? ( x11-libs/libX
 REQUIRED_USE=X? ( ?? ( gdk-pixbuf imlib ) ) fbcon? ( ?? ( gdk-pixbuf imlib ) )
 SLOT=0
 SRC_URI=https://github.com/tats/w3m/archive/v0.5.3+git20180125.tar.gz -> w3m-0.5.3+git20180125.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=7d97d1f753b04a898919115534d0fc7c
diff --git a/metadata/md5-cache/www-client/w3m-0.5.3_p20190105 b/metadata/md5-cache/www-client/w3m-0.5.3_p20190105
index 477484632c1d..dd9eb0530514 100644
--- a/metadata/md5-cache/www-client/w3m-0.5.3_p20190105
+++ b/metadata/md5-cache/www-client/w3m-0.5.3_p20190105
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boehm-gc:= sys-libs/ncurses:0= sys-libs/zlib X? ( x11-libs/libX
 REQUIRED_USE=X? ( ?? ( gdk-pixbuf imlib ) ) fbcon? ( ?? ( gdk-pixbuf imlib ) )
 SLOT=0
 SRC_URI=https://github.com/tats/w3m/archive/v0.5.3+git20190105.tar.gz -> w3m-0.5.3+git20190105.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=314201306d69c824fad229d2e5eac0d3
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 81925b9a46ca..e8623bcb569f 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/fcgiwrap-1.1.0_pre20150419 b/metadata/md5-cache/www-misc/fcgiwrap-1.1.0_pre20150419
deleted file mode 100644
index b357195e1eb8..000000000000
--- a/metadata/md5-cache/www-misc/fcgiwrap-1.1.0_pre20150419
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst prepare
-DEPEND=dev-libs/fcgi systemd? ( sys-apps/systemd ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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
-DESCRIPTION=Simple FastCGI wrapper for CGI scripts (CGI support for nginx)
-EAPI=6
-HOMEPAGE=https://github.com/gnosek/fcgiwrap
-IUSE=systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/fcgi systemd? ( sys-apps/systemd )
-SLOT=0
-SRC_URI=https://github.com/gnosek/fcgiwrap/tarball/99c942c90063c73734e56bacaa65f947772d9186 -> fcgiwrap-1.1.0_pre20150419.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=1955e3c4fca3236f4f8f345372e6f4bd
diff --git a/metadata/md5-cache/www-misc/monitorix-3.10.0-r1 b/metadata/md5-cache/www-misc/monitorix-3.10.0-r1
index e5df8d04b811..14f4773ba48c 100644
--- a/metadata/md5-cache/www-misc/monitorix-3.10.0-r1
+++ b/metadata/md5-cache/www-misc/monitorix-3.10.0-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/Config-General dev-perl/DBI dev-perl/HTTP-Server-Simple dev-per
 SLOT=0
 SRC_URI=https://github.com/mikaku/Monitorix/archive/v3.10.0.tar.gz -> monitorix-3.10.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=dda447b74e6f544d58d8be7b4c63e697
+_md5_=001f755a02964dcc0ffa57f3c8e7bf7c
diff --git a/metadata/md5-cache/www-misc/monitorix-3.10.1 b/metadata/md5-cache/www-misc/monitorix-3.10.1
index a9969b4502c2..f2e13076687f 100644
--- a/metadata/md5-cache/www-misc/monitorix-3.10.1
+++ b/metadata/md5-cache/www-misc/monitorix-3.10.1
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/Config-General dev-perl/DBI dev-perl/HTTP-Server-Simple dev-per
 SLOT=0
 SRC_URI=https://www.monitorix.org/monitorix-3.10.1.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=1b0d99dc6c2564e313b5e390e7e43999
+_md5_=89397d07762d16ee8831fc60099e71fd
diff --git a/metadata/md5-cache/www-misc/monitorix-3.11.0 b/metadata/md5-cache/www-misc/monitorix-3.11.0
index 5dc963660162..7a4233557cb9 100644
--- a/metadata/md5-cache/www-misc/monitorix-3.11.0
+++ b/metadata/md5-cache/www-misc/monitorix-3.11.0
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/Config-General dev-perl/DBI dev-perl/HTTP-Server-Simple dev-per
 SLOT=0
 SRC_URI=https://www.monitorix.org/monitorix-3.11.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c943c72d6e83e718d270e49ab7049f17
+_md5_=d0b4df69062ba1c9398e448802a60b00
diff --git a/metadata/md5-cache/www-misc/monitorix-3.9.0 b/metadata/md5-cache/www-misc/monitorix-3.9.0
index e114be68f330..6c5b5f7d7dff 100644
--- a/metadata/md5-cache/www-misc/monitorix-3.9.0
+++ b/metadata/md5-cache/www-misc/monitorix-3.9.0
@@ -3,11 +3,11 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=A lightweight system monitoring tool
 EAPI=6
 HOMEPAGE=https://www.monitorix.org/
-IUSE=apcupsd hddtemp httpd lm_sensors postfix
+IUSE=apcupsd hddtemp httpd lm-sensors postfix
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=dev-perl/Config-General dev-perl/DBI dev-perl/HTTP-Server-Simple dev-perl/IO-Socket-SSL dev-perl/libwww-perl dev-perl/MIME-Lite dev-perl/XML-Simple net-analyzer/rrdtool[graph,perl] dev-perl/CGI apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) httpd? ( virtual/httpd-cgi ) lm_sensors? ( sys-apps/lm_sensors ) postfix? ( net-mail/pflogsumm dev-perl/MailTools )
+RDEPEND=dev-perl/Config-General dev-perl/DBI dev-perl/HTTP-Server-Simple dev-perl/IO-Socket-SSL dev-perl/libwww-perl dev-perl/MIME-Lite dev-perl/XML-Simple net-analyzer/rrdtool[graph,perl] dev-perl/CGI apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) httpd? ( virtual/httpd-cgi ) lm-sensors? ( sys-apps/lm-sensors ) postfix? ( net-mail/pflogsumm dev-perl/MailTools )
 SLOT=0
 SRC_URI=https://github.com/mikaku/Monitorix/archive/v3.9.0.tar.gz -> monitorix-3.9.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=1b2714a1dc1617b2e25ee9d7929d6642
+_md5_=45e9ba8a0c2f6cc9988b62819a3a9880
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 56d3e4a41e79..2958fefd01cb 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.238 b/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.238
deleted file mode 100644
index 0f9478b336b3..000000000000
--- a/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.238
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Adobe Flash Player
-EAPI=6
-HOMEPAGE=https://www.adobe.com/products/flashplayer.html https://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html
-IUSE=+nsplugin +ppapi 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 x86
-LICENSE=AdobeFlash-11.x
-RDEPEND=!www-plugins/chrome-binary-plugins[flash(-)] nsplugin? ( dev-libs/atk[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/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(-)?] dev-libs/nspr[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/nss[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/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(-)?] media-libs/freetype[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-libs/glibc-2.4 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/gdk-pixbuf[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+: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/libX11[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/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/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(-)?] x11-libs/libXt[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/pango[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(-)?] !www-plugins/adobe-flash:0 )
-REQUIRED_USE=|| ( nsplugin ppapi )
-RESTRICT=strip mirror
-SLOT=22
-SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.238/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-32.0.0.238-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.238/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.238-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.238/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-32.0.0.238-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.238/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.238-ppapi.x86_64.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2dc002aba745e63b5b6b261d94190f42
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.255 b/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.255
new file mode 100644
index 000000000000..3a0f574ec77b
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.255
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm test unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Adobe Flash Player
+EAPI=6
+HOMEPAGE=https://www.adobe.com/products/flashplayer.html https://get.adobe.com/flashplayer/ https://helpx.adobe.com/security/products/flash-player.html
+IUSE=+nsplugin +ppapi 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 x86
+LICENSE=AdobeFlash-11.x
+RDEPEND=!www-plugins/chrome-binary-plugins[flash(-)] nsplugin? ( dev-libs/atk[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/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(-)?] dev-libs/nspr[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/nss[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/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(-)?] media-libs/freetype[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-libs/glibc-2.4 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/gdk-pixbuf[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+: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/libX11[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/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/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(-)?] x11-libs/libXt[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/pango[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(-)?] !www-plugins/adobe-flash:0 )
+REQUIRED_USE=|| ( nsplugin ppapi )
+RESTRICT=strip mirror
+SLOT=22
+SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.255/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-32.0.0.255-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.255/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.255-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.255/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-32.0.0.255-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.255/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.255-ppapi.x86_64.tar.gz ) )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	mozextension	f47f008a138943f9e40e37c1fca10b24	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2dc002aba745e63b5b6b261d94190f42
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3809.132 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3809.132
deleted file mode 100644
index 8aab736c44e8..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-76.0.3809.132
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=stable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_76.0.3809.132-1_amd64.deb
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=d42a365cfcb1cb0bb53fcf1c1818eeb6
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.70_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.70_beta
deleted file mode 100644
index fc7aaa5fd699..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.70_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_77.0.3865.70-1_amd64.deb
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.75 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.75
new file mode 100644
index 000000000000..e083e6bcf3d7
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.75
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=stable
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_77.0.3865.75-1_amd64.deb
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=d42a365cfcb1cb0bb53fcf1c1818eeb6
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.75_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.75_beta
new file mode 100644
index 000000000000..2d07a0631348
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-77.0.3865.75_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=beta
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_77.0.3865.75-1_amd64.deb
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3902.4_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3902.4_alpha
deleted file mode 100644
index 0593a2f53a89..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-78.0.3902.4_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
-RESTRICT=bindist mirror strip
-SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_78.0.3902.4-1_amd64.deb
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=d0584ac6311f93b5abb2623862e97f4d
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 976816d7d165..72467ef30d04 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/apache-2.4.41 b/metadata/md5-cache/www-servers/apache-2.4.41
index 4ee2f6270183..2bc18d7c4aff 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.41
+++ b/metadata/md5-cache/www-servers/apache-2.4.41
@@ -11,5 +11,5 @@ RDEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_ht
 REQUIRED_USE=apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_substitute? ( apache2_modules_filter )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.41.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.39-20190402.tar.bz2
-_eclasses_=apache-2	20ad1434bfafa6a0c06f7898cf4059ef	autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=apache-2	20ad1434bfafa6a0c06f7898cf4059ef	autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=79f31a75dc86e9b017b8f3c56ea5a484
diff --git a/metadata/md5-cache/www-servers/caddy-0.10.10 b/metadata/md5-cache/www-servers/caddy-0.10.10
deleted file mode 100644
index 4e81a2f42667..000000000000
--- a/metadata/md5-cache/www-servers/caddy-0.10.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.10
-DESCRIPTION=Fast, cross-platform HTTP/2 web server with automatic HTTPS
-EAPI=6
-HOMEPAGE=https://github.com/mholt/caddy
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mholt/caddy/archive/v0.10.10.tar.gz -> caddy-0.10.10.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=cbd8142c206335ba0fdb937c72e6d162
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.94 b/metadata/md5-cache/www-servers/tomcat-7.0.94
index d6bfa4281c8c..66ebe12dc2d7 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.94
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.94
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre !<d
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.94/src/apache-tomcat-7.0.94-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4e4902772aded64d04883c86c74ee58e
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.96 b/metadata/md5-cache/www-servers/tomcat-7.0.96
index 3bce11cf0768..f2935b19f340 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.96
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.96
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre !<d
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.96/src/apache-tomcat-7.0.96-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f5818e2053347b0ea5da4231efe2b6bc
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.53 b/metadata/md5-cache/www-servers/tomcat-8.0.53
index 3601c041f6fd..3fff42e0a1a7 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.53
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.53
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.1 !<dev-java/tomc
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.53/src/apache-tomcat-8.0.53-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=749124fb526a97dfb9d2eaa975d5cf05
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.42 b/metadata/md5-cache/www-servers/tomcat-8.5.42
index 041f87d460ab..0d0bcc8fe83d 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.42
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.42
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !<dev-jav
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.42/src/apache-tomcat-8.5.42-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b2a48e2e96eb4b5683d2f0c5556492e6
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.43 b/metadata/md5-cache/www-servers/tomcat-8.5.43
index 957bcef46f57..66a170b02016 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.43
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.43
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !<dev-jav
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.43/src/apache-tomcat-8.5.43-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=57440fb9295fcb1ae22cd794f69795b4
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.45 b/metadata/md5-cache/www-servers/tomcat-8.5.45
index 5fdefff142d4..791153b1859a 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.45
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.45
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !<dev-jav
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.45/src/apache-tomcat-8.5.45-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=57440fb9295fcb1ae22cd794f69795b4
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.21 b/metadata/md5-cache/www-servers/tomcat-9.0.21
index b05b764bb5c0..7e4012ffe633 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.21
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.21
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.10 dev-java/glassfish-xmlrpc-api:0 dev-java/tomca
 RESTRICT=test
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.21/src/apache-tomcat-9.0.21-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/4.1.0/biz.aQute.bnd-4.1.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/4.1.0/biz.aQute.bndlib-4.1.0.jar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=aeb96d2319a10dd23ec46ae09d8ab848
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.22 b/metadata/md5-cache/www-servers/tomcat-9.0.22
index f5cbf5c410a5..012e06477cc3 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.22
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.22
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.10 dev-java/glassfish-xmlrpc-api:0 dev-java/tomca
 RESTRICT=test
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.22/src/apache-tomcat-9.0.22-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/4.1.0/biz.aQute.bnd-4.1.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/4.1.0/biz.aQute.bndlib-4.1.0.jar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=aeb96d2319a10dd23ec46ae09d8ab848
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.24 b/metadata/md5-cache/www-servers/tomcat-9.0.24
index 096a785e4029..7c229e0485a1 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.24
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.24
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.10 dev-java/glassfish-xmlrpc-api:0 dev-java/tomca
 RESTRICT=test
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.24/src/apache-tomcat-9.0.24-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/4.1.0/biz.aQute.bnd-4.1.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/4.1.0/biz.aQute.bndlib-4.1.0.jar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=aeb96d2319a10dd23ec46ae09d8ab848
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.7 b/metadata/md5-cache/www-servers/tomcat-9.0.7
index 826ef26a702c..e052966cc709 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.7
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.7:4.0 !<dev-ja
 RESTRICT=test
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.7/src/apache-tomcat-9.0.7-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0607cefda2f7ead73b69c28d3112274b
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 6adbd9b080ef..1324758fbae9 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107-r1
index 5bf95e2aa971..d736d30d8dc7 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X )
 RESTRICT=bindist mirror
 SLOT=0/340
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/340.107/NVIDIA-FreeBSD-x86_64-340.107.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/340.107/NVIDIA-Linux-x86_64-340.107.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/340.107/NVIDIA-FreeBSD-x86-340.107.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/340.107/NVIDIA-Linux-x86-340.107.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.107.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=98c951bb4c65b2bcfa2709ea6a93c29f
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.129 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.129
index b4dc49f0255b..f7d425cc6f9a 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.129
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.129
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.129/NVIDIA-FreeBSD-x86_64-390.129.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.129/NVIDIA-Linux-x86_64-390.129.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.129/NVIDIA-Linux-armv7l-gnueabihf-390.129.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.129/NVIDIA-FreeBSD-x86-390.129.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.129/NVIDIA-Linux-x86-390.129.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.129.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f3911ee8f3e9e658880dcf2c7f669d03
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-410.104-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.104-r2
index a51197510893..7853ae8579a6 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-410.104-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.104-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/410
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/410.104/NVIDIA-FreeBSD-x86_64-410.104.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/410.104/NVIDIA-Linux-x86_64-410.104.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-410.104.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3f57c674ac55e6cedd4a998c88f93061
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.27-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.27-r2
index 5f520c124b61..c79caa58df0c 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.27-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.27-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/415
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/415.27/NVIDIA-FreeBSD-x86_64-415.27.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/415.27/NVIDIA-Linux-x86_64-415.27.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-415.27.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3cfa8fe86cd9ab3d50c074748c369634
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-418.88 b/metadata/md5-cache/x11-drivers/nvidia-drivers-418.88
index 4c76eabff474..2367f0d2ab95 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-418.88
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-418.88
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/418
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/418.88/NVIDIA-FreeBSD-x86_64-418.88.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/418.88/NVIDIA-Linux-x86_64-418.88.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-418.88.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b61c63ee99ca2636269782b765fb49ba
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.40 b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.40
index 387fcbad7255..c323ae5deec4 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.40
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.40
@@ -11,5 +11,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=test
 SLOT=0/430
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/430.40/NVIDIA-FreeBSD-x86_64-430.40.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/430.40/NVIDIA-Linux-x86_64-430.40.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-430.40.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=02158afefec73bf6a750346ed9212930
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.50 b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.50
new file mode 100644
index 000000000000..eace7c988a54
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.50
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils virtual/pkgconfig
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=6
+HOMEPAGE=https://www.nvidia.com/
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux 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 ~amd64-fbsd
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[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-base/xorg-server-1.20.99:= >=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/libvdpau-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(-)?] sys-libs/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(-)?] ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=test
+SLOT=0/430
+SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/430.50/NVIDIA-FreeBSD-x86_64-430.50.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/430.50/NVIDIA-Linux-x86_64-430.50.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-430.50.tar.bz2 )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0c69382f10c80e3aac74792d4e4ce148
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.17 b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.17
deleted file mode 100644
index adce754f4a56..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.17
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils virtual/pkgconfig
-DESCRIPTION=NVIDIA Accelerated Graphics Driver
-EAPI=6
-HOMEPAGE=https://www.nvidia.com/
-IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux 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 ~amd64-fbsd
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[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-base/xorg-server-1.20.99:= >=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/libvdpau-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(-)?] sys-libs/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(-)?] ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=tools? ( X ) static-libs? ( tools )
-RESTRICT=test
-SLOT=0/435
-SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/435.17/NVIDIA-FreeBSD-x86_64-435.17.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/435.17/NVIDIA-Linux-x86_64-435.17.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-435.17.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=067a3386d94dfe62728070cb103ca14c
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21 b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21
index 5e61e98a4ef4..63a9e0d8b80e 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21
@@ -4,12 +4,12 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=6
 HOMEPAGE=https://www.nvidia.com/
 IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux 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 ~amd64-fbsd
+KEYWORDS=-* amd64 ~amd64-fbsd
 LICENSE=GPL-2 NVIDIA-r2
 RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[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-eselect/eselect-opengl ) app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland[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-base/xorg-server-1.20.99:= >=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/libvdpau-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(-)?] sys-libs/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(-)?] ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=test
 SLOT=0/435
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/435.21/NVIDIA-FreeBSD-x86_64-435.21.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/435.21/NVIDIA-Linux-x86_64-435.21.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-435.21.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=801848d187f5ae6600bb2dc6c67beb85
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=cfc6bba6138ad262ba054ebb86912653
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
index 804c3bffc680..5acdf9c5a4d0 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	4d854e511b91b4119fc0e8e227cfcd98
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	4d854e511b91b4119fc0e8e227cfcd98
 _md5_=fc5416fc1cb117560f05ccdee97e17ca
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999 b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999
index d9484cdc222d..39ef6381085a 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999
+++ b/metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999
@@ -7,5 +7,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	4d854e511b91b4119fc0e8e227cfcd98
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	4d854e511b91b4119fc0e8e227cfcd98
 _md5_=d0a967e29368ceef906ba75327b06c58
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2
index 9fe5b77d7a04..31b53f2ca05f 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libwacom virtual/libudev:= >=x11-base/xorg-server-1.7 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama x11-base/xorg-server:= x11-base/xorg-server[xorg]
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxwacom/xf86-input-wacom/xf86-input-wacom-0.36.0.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	4d854e511b91b4119fc0e8e227cfcd98
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	4d854e511b91b4119fc0e8e227cfcd98
 _md5_=38de417953d7cc723e05ae4f97893cf2
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index cdd39a3dff7e..2b93ebb54eb6 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/gdk-pixbuf-2.38.2 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.38.2
new file mode 100644
index 000000000000..c40f409b520e
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.38.2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.20 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Image loading library for GTK+
+EAPI=7
+HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
+IUSE=X gtk-doc +introspection jpeg tiff 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.48.0: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-misc/shared-mime-info >=media-libs/libpng-1.4: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(-)?] ) tiff? ( >=media-libs/tiff-3.9.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(-)?] ) X? ( x11-libs/libX11[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
+SLOT=2
+SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.38/gdk-pixbuf-2.38.2.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8c20754618b6bb98fe1e363dcbac805b
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.10 b/metadata/md5-cache/x11-libs/gtk+-3.24.10
index 1f89ab1c0771..a0df6545374b 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.10
+++ b/metadata/md5-cache/x11-libs/gtk+-3.24.10
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama test 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 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[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-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.15[introspection?,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/fribidi-0.19.7[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/glib-2.53.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(-)?] 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(-)?] >=media-libs/libepoxy-1.4[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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,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(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,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/pango-1.41.0[introspection?,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/harfbuzz-0.9:= x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[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/json-glib-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(-)?] ) colord? ( >=x11-misc/colord-0.1.9: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(-)?] ) cups? ( >=net-print/cups-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[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/wayland-protocols-1.12 media-libs/mesa[wayland,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/libxkbcommon-0.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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.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(-)?] media-libs/mesa[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(-)?] x11-libs/libX11[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-1.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(-)?] 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/libXrandr-1.5[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/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/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/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(-)?] x11-libs/libXdamage[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(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.10.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2042164cc2765a7103b43f7a5b667bb0
+_md5_=774195202590c54851370a55ecf6e9a0
diff --git a/metadata/md5-cache/x11-libs/pixman-9999 b/metadata/md5-cache/x11-libs/pixman-9999
index 9d6d8875e596..2ee108844fe4 100644
--- a/metadata/md5-cache/x11-libs/pixman-9999
+++ b/metadata/md5-cache/x11-libs/pixman-9999
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install test unpack
 DESCRIPTION=Low-level pixel manipulation routines
 EAPI=7
 HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
-IUSE=altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 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
+IUSE=cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 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
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	562b380fc59ae6a8622171d0acb777d1	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=c94abc90904ae9376fa2089f67ff3dbf
+_md5_=b66d0b1cbed1a26032a972474ccb78fa
diff --git a/metadata/md5-cache/x11-libs/rep-gtk-0.90.8.1 b/metadata/md5-cache/x11-libs/rep-gtk-0.90.8.1
deleted file mode 100644
index 0a43e5f7cb7a..000000000000
--- a/metadata/md5-cache/x11-libs/rep-gtk-0.90.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/librep-0.90.5 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gdk-pixbuf-2.23:2 virtual/pkgconfig app-arch/xz-utils
-DESCRIPTION=A GTK+/libglade/GNOME language binding for the librep Lisp environment
-EAPI=4
-HOMEPAGE=http://sawfish.wikia.com/wiki/Main_Page
-KEYWORDS=alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/librep-0.90.5 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gdk-pixbuf-2.23:2
-SLOT=gtk-2.0
-SRC_URI=http://download.tuxfamily.org/librep/rep-gtk/rep-gtk-0.90.8.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c2a4c665662516da6483b5577b48388
diff --git a/metadata/md5-cache/x11-libs/xosd-2.2.14-r2 b/metadata/md5-cache/x11-libs/xosd-2.2.14-r2
deleted file mode 100644
index f0b0e5bb2bf0..000000000000
--- a/metadata/md5-cache/x11-libs/xosd-2.2.14-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt media-fonts/font-misc-misc virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library for overlaying text in X-Windows X-On-Screen-Display
-EAPI=0
-HOMEPAGE=https://sourceforge.net/projects/libxosd/
-IUSE=xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt media-fonts/font-misc-misc
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xosd/xosd_2.2.14.orig.tar.gz https://dev.gentoo.org/~jer/xosd_2.2.14-1.diff.gz http://digilander.libero.it/dgp85/gentoo/xosd-gentoo-m4-1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d63d1fbf8ab40a581f77a61447eaf466
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 1c767f53c518..7bb52fdb0e16 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/colord-1.3.5 b/metadata/md5-cache/x11-misc/colord-1.3.5
index 0da6cb7fc5e1..68f9a0097c88 100644
--- a/metadata/md5-cache/x11-misc/colord-1.3.5
+++ b/metadata/md5-cache/x11-misc/colord-1.3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=https://www.freedesktop.org/software/colord/releases/colord-1.3.5.tar.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bac09ef969f61eef0f373fe1c60b627a
diff --git a/metadata/md5-cache/x11-misc/grsync-1.2.6 b/metadata/md5-cache/x11-misc/grsync-1.2.6
index c507249aeb08..b9223cf605d9 100644
--- a/metadata/md5-cache/x11-misc/grsync-1.2.6
+++ b/metadata/md5-cache/x11-misc/grsync-1.2.6
@@ -3,9 +3,9 @@ DEPEND=>=x11-libs/gtk+-2.16:2 net-misc/rsync virtual/pkgconfig dev-util/intltool
 DESCRIPTION=A gtk frontend to rsync
 EAPI=6
 HOMEPAGE=http://www.opbyte.it/grsync/
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.16:2 net-misc/rsync
 SLOT=0
 SRC_URI=http://www.opbyte.it/release/grsync-1.2.6.tar.gz
-_md5_=bd22d749b44586b80ccfb0823859b1e6
+_md5_=b4c07bde44772748ea488503ffe55fde
diff --git a/metadata/md5-cache/x11-misc/i3blocks-1.4-r1 b/metadata/md5-cache/x11-misc/i3blocks-1.4-r1
index f11190fb2df2..5b721ed5f99f 100644
--- a/metadata/md5-cache/x11-misc/i3blocks-1.4-r1
+++ b/metadata/md5-cache/x11-misc/i3blocks-1.4-r1
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://github.com/vivien/i3blocks
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3
-RDEPEND=app-admin/sysstat media-sound/playerctl sys-apps/lm_sensors sys-power/acpi || ( x11-wm/i3 x11-wm/i3-gaps )
+RDEPEND=app-admin/sysstat media-sound/playerctl sys-apps/lm-sensors sys-power/acpi || ( x11-wm/i3 x11-wm/i3-gaps )
 SLOT=0
 SRC_URI=https://github.com/vivien/i3blocks/archive/1.4.tar.gz -> i3blocks-1.4.tar.gz
-_md5_=ad5b3270a9e3750d31d21a6fcfab1ee2
+_md5_=599a32490ebf924c9a9a68bbd79cf864
diff --git a/metadata/md5-cache/x11-misc/magick-rotation-1.6.2-r2 b/metadata/md5-cache/x11-misc/magick-rotation-1.6.2-r2
index 7df67d772df1..70d3fc53f1d5 100644
--- a/metadata/md5-cache/x11-misc/magick-rotation-1.6.2-r2
+++ b/metadata/md5-cache/x11-misc/magick-rotation-1.6.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/magick-rotation/trunk/1.6/+download/magick-rotation-1.6.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=7ce6fe1a189440d796620b2974066830
diff --git a/metadata/md5-cache/x11-misc/obconf-qt-0.14.1 b/metadata/md5-cache/x11-misc/obconf-qt-0.14.1
index 6d5679fa20ed..29c5418dc79c 100644
--- a/metadata/md5-cache/x11-misc/obconf-qt-0.14.1
+++ b/metadata/md5-cache/x11-misc/obconf-qt-0.14.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/
 DESCRIPTION=Openbox window manager configuration tool
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/sed x11-wm/openbox:3 x11-libs/libX11 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/obconf-qt/0.14.1/obconf-qt-0.14.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c6400bbeb820eff731ee2419fd06385
+_md5_=bb98bc35d3ebd157c28680da0b289251
diff --git a/metadata/md5-cache/x11-misc/obmenu-generator-0.66 b/metadata/md5-cache/x11-misc/obmenu-generator-0.66
deleted file mode 100644
index a5049e462504..000000000000
--- a/metadata/md5-cache/x11-misc/obmenu-generator-0.66
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A fast pipe/static menu generator for the Openbox Window Manager
-EAPI=6
-HOMEPAGE=http://trizen.go.ro/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl dev-perl/Data-Dump >=dev-perl/Linux-DesktopFiles-0.90.0 x11-wm/openbox
-SLOT=0
-SRC_URI=https://github.com/trizen/obmenu-generator/archive/0.66.tar.gz -> obmenu-generator-0.66.tar.gz
-_md5_=4d8d24a8bdf0bec7876ea3957a8ee22f
diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.1-r1 b/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
index 2a19cb9e4d00..bd0e02edd40d 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
+++ b/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Simple Desktop Display Manager
 EAPI=7
 HOMEPAGE=https://github.com/sddm/sddm
 IUSE=consolekit elogind +pam systemd test
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
 RDEPEND=>=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d27c13248beb282f70a48232311b706e
+_md5_=4f2c6d2c350fbfe6e6c9ccaab0aa2528
diff --git a/metadata/md5-cache/x11-misc/vdpauinfo-99999 b/metadata/md5-cache/x11-misc/vdpauinfo-99999
new file mode 100644
index 000000000000..da771c70c618
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/vdpauinfo-99999
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=prepare unpack
+DEPEND=x11-libs/libX11 >=x11-libs/libvdpau-1.3 virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=Displays info about your card's VDPAU support
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/VDPAU
+LICENSE=MIT
+PROPERTIES=live
+RDEPEND=x11-libs/libX11 >=x11-libs/libvdpau-1.3
+SLOT=0
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=add5d152cacfbe19d0ebbdb0f3769c43
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.56 b/metadata/md5-cache/x11-misc/xlockmore-5.56
deleted file mode 100644
index 8a97c5d00e42..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.56
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Just another screensaver application for X
-EAPI=6
-HOMEPAGE=http://www.sillycycle.com/xlockmore.html
-IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
-SLOT=0
-SRC_URI=http://www.sillycycle.com/xlock/xlockmore-5.56.tar.xz https://dev.gentoo.org/~jer/ax_pthread.m4.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d52009b857005b552d77f41fa7c43541
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.57 b/metadata/md5-cache/x11-misc/xlockmore-5.57
index b6c3df72d582..08798004b310 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.57
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.57
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
 SLOT=0
 SRC_URI=http://www.sillycycle.com/xlock/xlockmore-5.57.tar.xz https://dev.gentoo.org/~jer/ax_pthread.m4.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=496a2a032bec0d7c647042b7717878cc
+_md5_=0b6229122b714ef6357256e5b1ecacb5
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.58 b/metadata/md5-cache/x11-misc/xlockmore-5.58
new file mode 100644
index 000000000000..6eb9521e994a
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.58
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 unpack
+DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=Just another screensaver application for X
+EAPI=7
+HOMEPAGE=http://www.sillycycle.com/xlockmore.html
+IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
+REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
+SLOT=0
+SRC_URI=http://www.sillycycle.com/xlock/xlockmore-5.58.tar.xz https://dev.gentoo.org/~jer/ax_pthread.m4.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0b6229122b714ef6357256e5b1ecacb5
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.58_alpha b/metadata/md5-cache/x11-misc/xlockmore-5.58_alpha
deleted file mode 100644
index 4fac6664748e..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.58_alpha
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Just another screensaver application for X
-EAPI=7
-HOMEPAGE=http://www.sillycycle.com/xlockmore.html
-IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
-SLOT=0
-SRC_URI=http://www.sillycycle.com/xlock/xlockmore-5.58ALPHA.tar.xz https://dev.gentoo.org/~jer/ax_pthread.m4.xz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=496a2a032bec0d7c647042b7717878cc
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.59_alpha4 b/metadata/md5-cache/x11-misc/xlockmore-5.59_alpha4
new file mode 100644
index 000000000000..01beadbc62a2
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.59_alpha4
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 unpack
+DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=Just another screensaver application for X
+EAPI=7
+HOMEPAGE=http://www.sillycycle.com/xlockmore.html
+IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
+REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
+SLOT=0
+SRC_URI=http://www.sillycycle.com/xlock/xlockmore-5.59ALPHA4.tar.xz https://dev.gentoo.org/~jer/ax_pthread.m4.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=0b6229122b714ef6357256e5b1ecacb5
diff --git a/metadata/md5-cache/x11-misc/xsensors-0.70-r1 b/metadata/md5-cache/x11-misc/xsensors-0.70-r1
index f946e1f743dc..fd9d4bdf8b2e 100644
--- a/metadata/md5-cache/x11-misc/xsensors-0.70-r1
+++ b/metadata/md5-cache/x11-misc/xsensors-0.70-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=prepare
-DEPEND=x11-libs/gtk+:2 >=sys-apps/lm_sensors-3 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=x11-libs/gtk+:2 >=sys-apps/lm-sensors-3 virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=A hardware health information viewer, interface to lm-sensors
 EAPI=6
 HOMEPAGE=http://www.linuxhardware.org/xsensors/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 >=sys-apps/lm_sensors-3
+RDEPEND=x11-libs/gtk+:2 >=sys-apps/lm-sensors-3
 SLOT=0
 SRC_URI=http://www.linuxhardware.org/xsensors/xsensors-0.70.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=65b348e0d4270432192075192f171f3d
+_md5_=63786d2ffe9b6e00b34b5f7ae32782c9
diff --git a/metadata/md5-cache/x11-misc/zim-0.71.1 b/metadata/md5-cache/x11-misc/zim-0.71.1
index 3a9c3aee4e71..fe268d8cef1f 100644
--- a/metadata/md5-cache/x11-misc/zim-0.71.1
+++ b/metadata/md5-cache/x11-misc/zim-0.71.1
@@ -5,7 +5,7 @@ DESCRIPTION=A desktop wiki
 EAPI=7
 HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-wiki
 IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=BSD GPL-2+
 RDEPEND=dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.71.1.tar.gz -> zim-0.71.1.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c91d25f3b2e063b459a1deceafa6d86
+_md5_=487057c128d2e3d5a36cd8d168177542
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 3829ac3337d4..87ff74e7f50d 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/wmacpimon-0.2.1 b/metadata/md5-cache/x11-plugins/wmacpimon-0.2.1
index fa16ecd5049a..50067a7e096f 100644
--- a/metadata/md5-cache/x11-plugins/wmacpimon-0.2.1
+++ b/metadata/md5-cache/x11-plugins/wmacpimon-0.2.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=DockApp monitors the temperature and Speedstep features in ACPI-based systems
 EAPI=6
-HOMEPAGE=http://www.vrlteam.org/wmacpimon/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/wmacpimon/wmacpimon-0.2.1.tar.gz
-_md5_=84156ed84c4df107d0e09b208145404c
+_md5_=a07488080d79180fb40e5bb9fcb458c3
diff --git a/metadata/md5-cache/x11-plugins/wmgtemp-1.2 b/metadata/md5-cache/x11-plugins/wmgtemp-1.2
index e71c8cfadda1..531400222696 100644
--- a/metadata/md5-cache/x11-plugins/wmgtemp-1.2
+++ b/metadata/md5-cache/x11-plugins/wmgtemp-1.2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=-
-DEPEND=sys-apps/lm_sensors:= >=x11-libs/libdockapp-0.7:= x11-libs/libX11
+DEPEND=sys-apps/lm-sensors:= >=x11-libs/libdockapp-0.7:= x11-libs/libX11
 DESCRIPTION=CPU and SYS temperature dockapp
 EAPI=6
 HOMEPAGE=https://www.dockapps.net/wmgtemp
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic
-RDEPEND=sys-apps/lm_sensors:= >=x11-libs/libdockapp-0.7:= x11-libs/libX11
+RDEPEND=sys-apps/lm-sensors:= >=x11-libs/libdockapp-0.7:= x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.dockapps.net/download/wmgtemp-1.2.tar.gz
-_md5_=7b67d8b7cc74b1db7fb7f1d0befce4dc
+_md5_=dbd16db988fe5bbbc060a2dcc30817d9
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index db49e322c689..5b74753c727a 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/lxqt-themes-0.14.0 b/metadata/md5-cache/x11-themes/lxqt-themes-0.14.0
index b38fade0be69..f568d4fbe8e6 100644
--- a/metadata/md5-cache/x11-themes/lxqt-themes-0.14.0
+++ b/metadata/md5-cache/x11-themes/lxqt-themes-0.14.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Themes, graphics and icons for LXQt
 EAPI=7
 HOMEPAGE=https://lxqt.org/
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/lxqt-themes/0.14.0/lxqt-themes-0.14.0.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=99e2acd4da41fefda4e57befe992c1c3
+_md5_=e9da785b07456ffc94060a510a0e5bf0
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 41589d92638e..9cd5362ff163 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3 b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3
index 3fc23adf7e07..c399d266f8af 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3
+++ b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r3
@@ -10,5 +10,5 @@ RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/flux
 REQUIRED_USE=systray? ( toolbar )
 SLOT=0
 SRC_URI=mirror://sourceforge/fluxbox/fluxbox-1.3.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=be1c097020e018aaa2d5c7cf25c7412d
diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4 b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
index 64e675191340..74266ba85683 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
+++ b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r4
@@ -10,5 +10,5 @@ RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/flux
 REQUIRED_USE=systray? ( toolbar )
 SLOT=0
 SRC_URI=mirror://sourceforge/fluxbox/fluxbox-1.3.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4014773bf4ac856eb46a5594fdb4b610
diff --git a/metadata/md5-cache/x11-wm/fluxbox-9999 b/metadata/md5-cache/x11-wm/fluxbox-9999
index 73847940d733..29df4944901b 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-9999
+++ b/metadata/md5-cache/x11-wm/fluxbox-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) truetype? ( media-libs/freetype ) vim-syntax? ( app-vim/fluxbox-syntax ) x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) || ( x11-misc/gxmessage x11-apps/xmessage )
 REQUIRED_USE=systray? ( toolbar )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-2	3aabf18eba60687bbe6855eba271f688	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	git-2	3aabf18eba60687bbe6855eba271f688	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=30454d7c42ced416627b4a9351c63b35
diff --git a/metadata/md5-cache/x11-wm/i3-4.17.1 b/metadata/md5-cache/x11-wm/i3-4.17.1
new file mode 100644
index 000000000000..a60f37c17d60
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/i3-4.17.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config >=x11-libs/cairo-1.14.4[X,xcb] >=x11-libs/pango-1.30.0[X] test? ( dev-perl/AnyEvent >=dev-perl/X11-XCB-0.120.0 dev-perl/Inline dev-perl/Inline-C dev-perl/IPC-Run dev-perl/ExtUtils-PkgConfig dev-perl/local-lib >=virtual/perl-Test-Simple-0.940.0 x11-base/xorg-server[xephyr] )
+DESCRIPTION=An improved dynamic tiling window manager
+EAPI=7
+HOMEPAGE=https://i3wm.org/
+IUSE=doc debug test test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config >=x11-libs/cairo-1.14.4[X,xcb] >=x11-libs/pango-1.30.0[X] dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
+REQUIRED_USE=test? ( debug )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://i3wm.org/downloads/i3-4.17.1.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462
+_md5_=cac3824c171013e03d6abf027269ffb1
diff --git a/metadata/md5-cache/x11-wm/jwm-2.3.4-r1 b/metadata/md5-cache/x11-wm/jwm-2.3.4-r1
deleted file mode 100644
index 3a17151d812f..000000000000
--- a/metadata/md5-cache/x11-wm/jwm-2.3.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=xpm? ( x11-libs/libXpm ) xinerama? ( x11-libs/libXinerama ) x11-libs/libXext x11-libs/libXrender x11-libs/libXau x11-libs/libXdmcp truetype? ( x11-libs/libXft ) png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0= ) bidi? ( dev-libs/fribidi ) dev-libs/expat x11-base/xorg-proto
-DESCRIPTION=Very fast and lightweight still powerful window manager for X
-EAPI=5
-HOMEPAGE=http://joewing.net/projects/jwm/
-IUSE=bidi debug jpeg png truetype xinerama xpm
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=xpm? ( x11-libs/libXpm ) xinerama? ( x11-libs/libXinerama ) x11-libs/libXext x11-libs/libXrender x11-libs/libXau x11-libs/libXdmcp truetype? ( x11-libs/libXft ) png? ( media-libs/libpng:0= ) jpeg? ( virtual/jpeg:0= ) bidi? ( dev-libs/fribidi ) dev-libs/expat
-SLOT=0
-SRC_URI=http://joewing.net/programs/jwm/releases/jwm-2.3.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c7c8eeac8fcceeaf4bdc9268ce7db90f
diff --git a/metadata/md5-cache/x11-wm/jwm-2.3.5 b/metadata/md5-cache/x11-wm/jwm-2.3.5
deleted file mode 100644
index 51c36ca87ef9..000000000000
--- a/metadata/md5-cache/x11-wm/jwm-2.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=dev-libs/expat x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXmu x11-libs/libXrender bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo gnome-base/librsvg ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg:0= ) nls? ( sys-devel/gettext virtual/libintl ) png? ( media-libs/libpng:0= ) truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) x11-base/xorg-proto
-DESCRIPTION=Very fast and lightweight still powerful window manager for X
-EAPI=6
-HOMEPAGE=http://joewing.net/projects/jwm/
-IUSE=bidi cairo debug iconv jpeg nls png truetype xinerama xpm
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXmu x11-libs/libXrender bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo gnome-base/librsvg ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg:0= ) nls? ( sys-devel/gettext virtual/libintl ) png? ( media-libs/libpng:0= ) truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm )
-SLOT=0
-SRC_URI=http://joewing.net/projects/jwm/releases/jwm-2.3.5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=acbdbb817e6c9e59407810c21b51134e
diff --git a/metadata/md5-cache/x11-wm/jwm-2.3.6 b/metadata/md5-cache/x11-wm/jwm-2.3.6
deleted file mode 100644
index daadd7d9448c..000000000000
--- a/metadata/md5-cache/x11-wm/jwm-2.3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=dev-libs/expat x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXmu x11-libs/libXrender bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo gnome-base/librsvg ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg:0= ) nls? ( sys-devel/gettext virtual/libintl ) png? ( media-libs/libpng:0= ) truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) x11-base/xorg-proto
-DESCRIPTION=Very fast and lightweight still powerful window manager for X
-EAPI=6
-HOMEPAGE=http://joewing.net/projects/jwm/
-IUSE=bidi cairo debug iconv jpeg nls png truetype xinerama xpm
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-libs/expat x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXmu x11-libs/libXrender bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo gnome-base/librsvg ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg:0= ) nls? ( sys-devel/gettext virtual/libintl ) png? ( media-libs/libpng:0= ) truetype? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm )
-SLOT=0
-SRC_URI=http://joewing.net/projects/jwm/releases/jwm-2.3.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a907b51e9e097283519684e24061cc53
diff --git a/metadata/md5-cache/x11-wm/mutter-3.30.2-r4 b/metadata/md5-cache/x11-wm/mutter-3.30.2-r4
index 0e25386d01d0..0a682da50a4b 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.30.2-r4
+++ b/metadata/md5-cache/x11-wm/mutter-3.30.2-r4
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME 3 compositing window manager based on Clutter
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
 IUSE=debug elogind gles2 input_devices_wacom +introspection screencast systemd test udev wayland test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/atk-2.5.3 >=x11-libs/gdk-pixbuf-2:2 >=dev-libs/json-glib-0.12.0 >=x11-libs/pango-1.30[introspection?] >=x11-libs/cairo-1.14[X] >=x11-libs/gtk+-3.19.8:3[X,introspection?] >=dev-libs/glib-2.53.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.21.4[introspection?] <gnome-base/gsettings-desktop-schemas-3.31 gnome-base/gnome-desktop:3= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity media-libs/mesa[X(+),egl,gles2?] input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= ) udev? ( >=virtual/libgudev-232:= ) screencast? ( >=media-video/pipewire-0.2.2:0/0.2 ) wayland? ( >=dev-libs/libinput-1.4 >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.16 >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) >=virtual/libgudev-232:= >=virtual/libudev-136:= x11-base/xorg-server[wayland] x11-libs/libdrm:= )
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) )
 SLOT=0/3
 SRC_URI=mirror://gnome/sources/mutter/3.30/mutter-3.30.2.tar.xz https://dev.gentoo.org/~leio/distfiles/mutter-3.30.2-r4-patchset.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5021f70c8650febd7e6104e12c2d41b
+_md5_=b18271bf7d0865f31e4ff49259d858d7
diff --git a/metadata/md5-cache/x11-wm/spectrwm-2.7.2-r1 b/metadata/md5-cache/x11-wm/spectrwm-2.7.2-r1
deleted file mode 100644
index 1bf56c2ec734..000000000000
--- a/metadata/md5-cache/x11-wm/spectrwm-2.7.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXtst x11-libs/xcb-util !x11-wm/scrotwm
-DESCRIPTION=Small dynamic tiling window manager for X11
-EAPI=5
-HOMEPAGE=https://opensource.conformal.com/wiki/spectrwm
-KEYWORDS=amd64 x86
-LICENSE=ISC
-RDEPEND=x11-misc/dmenu
-SLOT=0
-SRC_URI=http://opensource.conformal.com/snapshots/spectrwm/spectrwm-2.7.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8deb40c95eb417865b57897df770bd23
diff --git a/metadata/md5-cache/x11-wm/stumpwm-1.0.1_rc b/metadata/md5-cache/x11-wm/stumpwm-1.0.1_rc
deleted file mode 100644
index d3af939cc14b..000000000000
--- a/metadata/md5-cache/x11-wm/stumpwm-1.0.1_rc
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-lisp/alexandria dev-lisp/cl-ppcre dev-lisp/clx >=dev-lisp/sbcl-1.3.0 emacs? ( virtual/emacs app-emacs/slime ) sys-apps/texinfo doc? ( virtual/texi2dvi ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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=Stumpwm is a Window Manager written entirely in Common Lisp.
-EAPI=6
-HOMEPAGE=https://stumpwm.github.io/
-IUSE=contrib doc emacs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=contrib? ( x11-wm/stumpwm-contrib ) virtual/commonlisp
-RDEPEND=dev-lisp/alexandria dev-lisp/cl-ppcre dev-lisp/clx >=dev-lisp/sbcl-1.3.0 emacs? ( virtual/emacs app-emacs/slime )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=https://github.com/stumpwm/stumpwm/archive/v1.0.1-rc.tar.gz -> stumpwm-1.0.1_rc.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	common-lisp-3	3f23602a5efddf587c5205de7b6de7f8	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=819f354c4dd42ecad62f498c6d8e0c83
diff --git a/metadata/md5-cache/x11-wm/xpra-2.2.2-r1 b/metadata/md5-cache/x11-wm/xpra-2.2.2-r1
index 4281e493cc6b..5162cb29dce6 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.2.2-r1
+++ b/metadata/md5-cache/x11-wm/xpra-2.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.2.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfe9ac2ae1a299912e8d72bbf8c22754
diff --git a/metadata/md5-cache/x11-wm/xpra-2.2.6-r2 b/metadata/md5-cache/x11-wm/xpra-2.2.6-r2
index d726bb6c602a..0e8e15549cda 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.2.6-r2
+++ b/metadata/md5-cache/x11-wm/xpra-2.2.6-r2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.2.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1da9505adf20a22b9f6be392217f2207
diff --git a/metadata/md5-cache/x11-wm/xpra-2.4.3 b/metadata/md5-cache/x11-wm/xpra-2.4.3
index 8cb963cd1a81..45ec4c44efd8 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.4.3
+++ b/metadata/md5-cache/x11-wm/xpra-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.4.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	96a7c72c5b059d0b75854baf84950ce3	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd4aec62e668841e42b4fd920e744774
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 87ac0b1b5b4f..5f4a086dfe83 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.13.3 b/metadata/md5-cache/xfce-base/xfwm4-4.13.3
deleted file mode 100644
index e1e08cdf776b..000000000000
--- a/metadata/md5-cache/xfce-base/xfwm4-4.13.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig
-DESCRIPTION=Window manager for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=opengl startup-notification +xcomposite +xpresent
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-4.13.3.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a830e06d27f0d6562fdf6a0bd5b15ac
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.13.4 b/metadata/md5-cache/xfce-base/xfwm4-4.13.4
deleted file mode 100644
index 0b3005844b37..000000000000
--- a/metadata/md5-cache/xfce-base/xfwm4-4.13.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig
-DESCRIPTION=Window manager for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=opengl startup-notification +xcomposite +xpresent
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-4.13.4.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a830e06d27f0d6562fdf6a0bd5b15ac
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.14.0 b/metadata/md5-cache/xfce-base/xfwm4-4.14.0
deleted file mode 100644
index 808ba843b16d..000000000000
--- a/metadata/md5-cache/xfce-base/xfwm4-4.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig
-DESCRIPTION=Window manager for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=opengl startup-notification +xcomposite +xpresent
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=dev-libs/dbus-glib >=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.14/xfwm4-4.14.0.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc3c63b6af1437feec68077236bfb68f
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.14.0-r1 b/metadata/md5-cache/xfce-base/xfwm4-4.14.0-r1
new file mode 100644
index 000000000000..28dbc3bb19a2
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.14.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) dev-util/intltool sys-devel/gettext x11-libs/libICE x11-libs/libSM xfce-base/exo virtual/pkgconfig
+DESCRIPTION=Window manager for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=opengl startup-notification +xcomposite +xpresent
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.20 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/pango >=x11-libs/libwnck-3.14:3 >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.14/xfwm4-4.14.0.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ba573d912f96c7e4ae973f4b9407cb1
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 9d808a4a04fd..ac6807e28739 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0-r1 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0-r1
index 00620c8f5729..2d289d7b2ed9 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat net-analyzer/gnu-netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A panel plug-in for acpi, lm_sensors and hddtemp sensors
+DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat net-analyzer/gnu-netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig
+DESCRIPTION=A panel plug-in for acpi, lm-sensors and hddtemp sensors
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
-IUSE=+acpi hddtemp libnotify lm_sensors video_cards_nvidia
+IUSE=+acpi hddtemp libnotify lm-sensors video_cards_nvidia
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat net-analyzer/gnu-netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-REQUIRED_USE=|| ( hddtemp lm_sensors acpi )
+RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat net-analyzer/gnu-netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+REQUIRED_USE=|| ( hddtemp lm-sensors acpi )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-1.3.0.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8862f104f4c38e48404e3df50347151b
+_md5_=92fc09571a112c715bcbabf92c7ffd54
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92-r1 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92-r1
index c586cef5d1f4..cefe14813903 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92-r1
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat net-analyzer/gnu-netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig
-DESCRIPTION=A panel plug-in for acpi, lm_sensors and hddtemp sensors
+DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat net-analyzer/gnu-netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig
+DESCRIPTION=A panel plug-in for acpi, lm-sensors and hddtemp sensors
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
-IUSE=+acpi hddtemp libnotify lm_sensors video_cards_nvidia
+IUSE=+acpi hddtemp libnotify lm-sensors video_cards_nvidia
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2+
-RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat net-analyzer/gnu-netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-REQUIRED_USE=|| ( hddtemp lm_sensors acpi )
+RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp || ( net-analyzer/openbsd-netcat net-analyzer/netcat net-analyzer/gnu-netcat ) ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+REQUIRED_USE=|| ( hddtemp lm-sensors acpi )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-1.3.92.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d7b8a4b3754f4ca3dad8600bc04836c
+_md5_=8914cacba3688381d73e9814452631bb
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 6bc6c7217b1a..f8994c616b0b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 12241 BLAKE2B 350d0fa9c9068c79a454f1d29525cdb50bc4ab6c7b0234d7f96c810c6738176a8180e8609bb8d3c1d0c548de68e67c49c6ae5bfde637c852df27ea57ba15fdd0 SHA512 a93acc45a7247b1e99c20aa686e6ab2bf355f9fa51aab26f04010bf33a32d11cd2683454eecad4bf080edf22099ff1057b150ced2f3ed9b9454607aae714890f
-TIMESTAMP 2019-09-07T23:09:08Z
+TIMESTAMP 2019-09-13T16:08:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl10OJRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl17vxdfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB6GQ//XiTq/pxnsK4Rnhd1bmeDekTciGyD8PVOw3EZ7oYxFOyO4fMPU8y60emz
-Oe12XS4tyydlmEe9azgkqjmMaYuX/vzlVSe+5RK66F6Zex+Cs42rP+eccLeWp3DL
-FBlaVhCrGJN0hkmQSFXF+k66e3Ms3KfZLcVf47nzvyv+gV+loAju335izwWiHjDt
-0AWb12agGGzVNEMsyWeck9QVGQJR68/0oA3iNUvYzTzFMXf2zJKpMKWmnUKJBrXN
-ZHPSycqy82rTDQRfnRPmm6laS8Ypc00Yr328QjvW943nA8VHFkskMthNGyZZiY0D
-QxjAgtMzU8/tLz6Szd+fo1O+I9Enq/FsH1yGFNM3OqRnO3CvProocgchOxsoaIRG
-NLju3CJeqM9ncaict8jPH4DWSjeUIUnsjjxmItudWG4lmbC9wQ7HSlt87G1mSf9/
-8sBPg6aaQ0CBGxD1JkJcvHhVIYAZdA/fIDxpNaYe776XSCxUM2FCz4lzarabIo86
-mVPnGbViKDsRvjab/epFVI3EkLMOhx7DRC9TCO2Faed8j7zt8q5YSq1ggDmat2AB
-Bes0CnfBLGx9A3uW1fdjjsVZ9a0wttB5VukXvdgR+eFd0vTr34IEnj6WIAATXWpx
-+aszo2ZabKVbW8bElA97jzPw/bOPNf8V0NZzsJ5sj3BEYk0NbCk=
-=MMMw
+klC5SA/9HAVrCW29ofsTDfhnepd7LaZionf3sSrh3//qzecS6WiMtB7uzZoc2i0u
+U+lDpzZOwkBwSvnpUhiDqqh8NciokGdAC3b1wNH8QR8aq288pftTOfc2/YhDcNDK
+4vwGF8cqQpVaJrz3GtgP1PsRLfuJCBXpsDhOB38SNI1G7csVpPKa760JDq2X2qOY
+0WPDTikCvzAa4VrsDdyZLsguSWqyEoEJ4ehD8PNMjBFAh5/byuwfupONBrwWSf/i
+tzgRzayVDWqJtg9voWWpURcpAIjPrWIAG3MNIeIkLTRJ2wdtJbLdCPFiz7yUkMPX
+4NpTT9PeAQ0ZVAC+r6K3FbjqxpmyFsqmCCiL82ZAl8byAvfcy/ipu93paD2WJsh3
+cEvZINKYweKoLrFHw/w0Pv5sa9GTGIGIXSKBWXcfe3H5lqGdMMu8LRjuuHST0yi3
+Zt+Ba7tUh7CKU5iNXBuK+Kul0SkNlLNnZxqrbc/MXRXVxhzwJnySevxLAHlRFl1A
+9LVbHbR0ZzqC8upGMex5n0/Jy688wiLC+YEPg1DNh5LSK082XwoXVCxa1nIvo/Rg
+28PyN7JM+yR9gWuDiM0KUed+1JkQDrmfACwuTZD1qiOmFFhQvxBPv/mZcxCtlB4h
+dibV4l/IPgLTabEeBs/ODLkBg+IA67foRi0cTGga81u3Y9eBZhU=
+=WYHz
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 36c3392d5556..4897696602c8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 07 Sep 2019 23:09:04 +0000
+Fri, 13 Sep 2019 16:08:52 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ddeb61452ccc..4d52fb0cf3c4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Sep  7 23:09:04 UTC 2019
+Fri Sep 13 16:08:52 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4be9882bb9eb..de1455f1a20a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 07 Sep 2019 23:15:01 +0000
+Fri, 13 Sep 2019 16:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index d97c3ba57195..483768c9a376 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-83b6c7da77061484a32bab7a95da5f7ecc67c996 1567895951 2019-09-07T22:39:11+00:00
+feb71a73d02d1f22d98830f216d724b3013783ea 1568389969 2019-09-13T15:52:49+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c0ca0426899d..329da5d8561e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1567897501 Sat 07 Sep 2019 11:05:01 PM UTC
+1568390701 Fri 13 Sep 2019 04:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 36c3392d5556..4897696602c8 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 07 Sep 2019 23:09:04 +0000
+Fri, 13 Sep 2019 16:08:52 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index a6aff67b81ea..574defe5a632 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index df29868ad6f4..3b059f42287d 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,6 +1,8 @@
 AUX net-snmp-5.1.2-snmpconf-selinux.patch 189 BLAKE2B ca3ac3cc5786226ca5ed73997df2b9ec5c75405f098ed8eb29a52f5187399a1a6fd357613ca10c8dad3a4a5c8f03e25771e785ec9673ae0d3da3970827b90afc SHA512 5859742fa90c297af17b1b1a4718af8d03edbb3a78f723c2cbde54576c68a5f562ed573cc0f8cfdd0bdee9d5accb769e6183dbd16d5e5aa66f0d43f174658f75
 AUX net-snmp-5.7.3-include-limits.patch 578 BLAKE2B ae19f67f0e06a5010d8399e51f716cf7f2148ed9ed0737c00f195892346c2ec56985e2de9a12dbc111c98a012f591e69f6bac3d74ff8d83e36c56a9d0a21036e SHA512 47c27ac62c97a0b3ecfcfe05adeedd55436cc9cfc094a71f00df06cb5dece5f297c40fc255ad73e72a0c468a3c5f62afc98b79c0adc7d31a67813f25f1ec9415
+AUX net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch 1257 BLAKE2B 2cdb98653d617e7c00a0ec2810d529e1b3e80668fdbbe771dd14a2dee3cf39dac069981bb2b8f8b9ae9fdaaef943a75662fc42cc8dd15000cdbf56ad6be6dc6c SHA512 3b5b48c1c1cad6953fe4687cca9a54161b6686bd887aa068f1ce61219d4772c839459eeecde8fde0863a75e65a9cfc0a8ec1a607e7e7aa47e2cfa19ef0dbcfab
 AUX net-snmp-5.8-my_bool.patch 751 BLAKE2B d0caff5c2cebb50cc2fcf4375d222f1146e3908698565eb7201d3e009b4bcbbccf653c336c1af9a23a8dc1a5f468da12d77d940ea4a00eb3f7c14db7dd45463e SHA512 5fe9d44653e5c26d1d1d6041b48f0abf5c38d148b8dfe82d6fc83290e66becc25dda43962a895994989f7267d5914f69969b118c999c324b7fac0184c383bbce
+AUX net-snmp-5.8-pcap.patch 1030 BLAKE2B e082b3a9e889ee2f9abd3229ba09a7ac35ca61b5ef65b5fd3460b89ace7753d6bef55560b5c066705bbb1965625e9739f6ebfb78c3e5b5edee2607e3df0728ac SHA512 af60ee67f1407f846f2590008a7ee1d24777f1004547d6281d7bf21d79020e5ceb4b2d0502f08c7d9e25f0fd10b8c5a8e6309963f30f2e43167d1590194ce32e
 AUX net-snmp-5.8-tinfo.patch 340 BLAKE2B 59b75cc89e83d59249921f92ca3b54e3a6fb943a956bb603c891a253f2d015b23ef00029d42bb799625bfd3af2eab5803474fad2dace5d2013f7004221c71e8d SHA512 94598dd39c0067a161beba68bfa09ef4c0dc09376c94a4b0b7346a718e75da173a8c9cb37349c79ec6909fb82a39552ca84b170c3f7f07927386991771b4568e
 AUX snmpd.conf 552 BLAKE2B 9d2801b0ddc2148a62e332a1d355a9ddc050ec95aea2dde31f25413096c4b91dbab794c1e71b75f5baba1234d89729a6e8c50287098c04991a3eec4d9f512b3c SHA512 e64f93631e5cb2160d3fb26abb84fc74f5632d8875227d5c8dfa24809b25e8202dcf23251ea8f296aedf16298c31ce49b8e64fb6325c18775d8899a50b853bbc
 AUX snmpd.init.2 680 BLAKE2B ce21b60980c2a0d74c810bb473c6b4c70eb11a2fc0636ec4af8a262ce412324ba80bc6c72b2544d359b4e2f536cf329df99e0be7d96035fa20c25f9ab7dc4a16 SHA512 10394f04dee23537a195f5aed63a3e758ca90227e269076ae9d13f883c7bd666c1c43823d1b869c43f232e97dc4138e52648cae995327f7a7f676ba416ee6fff
@@ -10,7 +12,8 @@ AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf92524
 AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c5976394c04bfd8da30917395b1a752f8e66502259d271ccf264c3e99f99e95df62b80447d4099d1dd7 SHA512 763682e3926fd1e7f28a013be2ad56cc53eed26a0415770906968e07a183128c9d5fb70d76513244ba0cc95fc2526b68c32207b5fda83b8f53c256549cfa1b1d
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7
-EBUILD net-snmp-5.8-r1.ebuild 5264 BLAKE2B 08450602568f2b2854cb62c123709035259cf71435911fa34f9ba7aa512755d8a911373d831ec7645f1829c42281444da4bc85c6f30f7da1e2082290d0e3b572 SHA512 8d870aa51ac3d5d65dfef6e94ca38fe154d689c011d494e1a931852b34ddc17a5fb3382ba1637b3f7bffd6bf8e79c52a75a25a675c7b9b8a41ad1c8a8151f848
-EBUILD net-snmp-5.8-r2.ebuild 5321 BLAKE2B 495325377ce6ef83dbc4ad6b4ffae809ecc9e99ac5908a1a001c87ad275fe556cacc3866d0a2d712b49a9ae8c5d1fe11a70355cb457e4c9571b0448c02e2ee47 SHA512 9474859c802d792503a6d4235eac511de6210648092acf071f938e928675fb1cb560e33a78b34d1cebfde7098464c7df992fb78c67646c58d8a52bfa065bc671
-EBUILD net-snmp-99999999.ebuild 5227 BLAKE2B 30ce2a65e1628ce78759589124604cd9db583c05edfc7cd8c1ab05d31fec7368271eaa073dff921304849e835608f0e63d58c0775b85bd69d391a259b9d3d1a9 SHA512 9690b14e47ecb2e9e5d8f6d32a6e9c429b3c5561975f0045e82fa9616afaae1f892099f789243eb68fcb522e0318b19782bf82fbc848356c93aa97b3fd5ba47c
-MISC metadata.xml 1193 BLAKE2B b53ad11776e58b025bb3655b4f3bb96580f0dbde557cfa037e272ab6e71411b4bec434a82df646da3f3b53e1eda24555cf26366084c27d8729ec0342249a5c93 SHA512 4b9d6d7d36786dd2176f0d90bc4f55f310595807d4a364132c098df60de2c0bab6e8619760de768667e1c13bbcf5d209a73469e06bd1d78323bea76ae4fdf981
+EBUILD net-snmp-5.8-r1.ebuild 5264 BLAKE2B 92dd24ccb4cb1b431bff22d4e3712fe86c126e64bd870b927a5c8cb5bb6ce8f32eff0cdaa55fb88e44ea0ad4d8d6bc9704c922ccf480cd20cf2af8c88ac3ce57 SHA512 91b3a19e4e96ba6f6bce0bd91d8b963b68d42da0cdc31a2bf527402367bbf1621c131e7c3848f005459f30290bdc839f64c79b80d1d0fe1c7840242a87b455b3
+EBUILD net-snmp-5.8-r2.ebuild 5321 BLAKE2B 6518dc5b01b36a4a231186bdee13c955b9df155d06e16c3561df12625b3f5637467dc8daaf27acac2694a1b22f54b8d29669ee779de54e25a1b17cc57c3efdb9 SHA512 c1de2dd6516e2230203d085090790ab566d500975ab94c14c07afafe8c1822b3458f60dae6bb2c55bb576d5c5c5ed73c697d51fa5d8ce947cca6b0198cfa3461
+EBUILD net-snmp-5.8-r4.ebuild 5493 BLAKE2B 97520422d339c0b95df79990463423963b96c0c2d33d5639ba6350315b7f9c9d91e1b973056b38dc8300fca1f18bdf0b6da7550e3b22a1e2938b8abe15eb7ada SHA512 6b8c6356f7ba8da4d49f932380d3929154670bbaa93f9baa639e4a91b97bb759df1f65db264f1040351fc0eab2354a99da20c9d495e84292625ef6cb584a92a0
+EBUILD net-snmp-99999999.ebuild 5318 BLAKE2B 4dcb3ceacf691790ee8a7553c1d1a1b8cfa672385cfb6446820a4a997a0a9b0d438ec9d2fd01407b50bc8c07cc0a5fe2808bf806438ba2aa5b99cd545cddd452 SHA512 1fc4beb414853e3b1a2b7bc66d89fe671e0ef93966289e4ad866ba811d5297a2dba35e386fc1e6926fe993861f36872df8173d98b05aebbfde42a537682cfd92
+MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
new file mode 100644
index 000000000000..4e3001e1e473
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
@@ -0,0 +1,34 @@
+--- a/net-snmp-config.in
++++ b/net-snmp-config.in
+@@ -190,13 +190,13 @@
+     #################################################### client lib
+     --libs)
+       # use this one == --netsnmp-libs + --external-libs
+-      echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
++      echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
+       ;;
+     --netsnmp-libs)
+       echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS
+       ;;
+     --external-libs)
+-      echo $NSC_LDFLAGS $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@
++      echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@
+       ;;
+     #################################################### agent lib
+     --base-agent-libs)
+@@ -207,13 +207,13 @@
+       ;;
+     --agent-libs)
+       # use this one == --netsnmp-agent-libs + --external-libs
+-      echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
++      echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
+       ;;
+     --netsnmp-agent-libs)
+       echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS
+       ;;
+     --external-agent-libs)
+-      echo $NSC_LDFLAGS $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
++      echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
+       ;;
+     ####################################################
+     --version|--ver*)
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-pcap.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-pcap.patch
new file mode 100644
index 000000000000..43692240acb6
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.8-pcap.patch
@@ -0,0 +1,41 @@
+--- a/configure.d/config_project_with_enable
++++ b/configure.d/config_project_with_enable
+@@ -1187,6 +1187,11 @@
+   [],
+   [with_bzip2="no"])
+ 
++AC_ARG_WITH([pcap],
++  [ --with-pcap[=DIR]          use libpcap in DIR],
++  [],
++  [with_pcap="no"])
++
+ NETSNMP_ARG_WITH(
+  [mnttab],
+  AS_HELP_STRING(
+--- a/configure.d/config_os_libs2
++++ b/configure.d/config_os_libs2
+@@ -583,14 +590,16 @@
+ ##
+ #   libpcap
+ ##
+-NETSNMP_BUILD_PCAP_PROG_TRUE='#'
+-NETSNMP_BUILD_PCAP_PROG_FALSE=''
+-AC_CHECK_LIB([pcap], [pcap_create], [
+-   AC_CHECK_HEADERS([pcap/pcap.h], [
+-      NETSNMP_BUILD_PCAP_PROG_TRUE=''
+-      NETSNMP_BUILD_PCAP_PROG_FALSE='#'
+-       ])
+-])
++if test "x$with_pcap" = "xyes" ; then
++  NETSNMP_BUILD_PCAP_PROG_TRUE='#'
++  NETSNMP_BUILD_PCAP_PROG_FALSE=''
++  AC_CHECK_LIB([pcap], [pcap_create], [
++     AC_CHECK_HEADERS([pcap/pcap.h], [
++        NETSNMP_BUILD_PCAP_PROG_TRUE=''
++        NETSNMP_BUILD_PCAP_PROG_FALSE='#'
++         ])
++  ])
++fi
+ AC_SUBST(NETSNMP_BUILD_PCAP_PROG_TRUE)
+ AC_SUBST(NETSNMP_BUILD_PCAP_PROG_FALSE)
+ 
diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml
index 95e28946a27a..f3f6819a5361 100644
--- a/net-analyzer/net-snmp/metadata.xml
+++ b/net-analyzer/net-snmp/metadata.xml
@@ -10,10 +10,11 @@
 <flag name="kmem">Enable usage of /dev/kmem</flag>
 <flag name="mfd-rewrites">Use MFD rewrites of mib modules where available</flag>
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to fetch TCP statistics instead of using /proc/net/tcp (Linux only).</flag>
+<flag name="pcap">Install snmppcap which reads from PCAP files and writes to the SNMP transport</flag>
 <flag name="pci">Use libpci (from <pkg>sys-apps/pciutils</pkg>) to look up network interface description. This feature is only available on Linux.</flag>
 <flag name="rpm">Enable monitoring of <pkg>app-arch/rpm</pkg>. This flag requires the bzip2 and zlib flags to be enabled as well.</flag>
-<flag name="ucd-compat">Build UCD compatibility library. Increases significantly the install size.</flag>
 <flag name="smux">Enable support for the legacy smux protocol (superseded by agentx)</flag>
+<flag name="ucd-compat">Build UCD compatibility library. Increases significantly the install size.</flag>
 </use>
 <upstream>
 <remote-id type="sourceforge">net-snmp</remote-id>
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
index 32697e5f3148..99e0bd51b933 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${P/_/.}
 LICENSE="HPND BSD GPL-2"
 SLOT="0/35"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
+IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
 
 COMMON_DEPEND="
 	ssl? (
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 		${PYTHON_DEPS}
 	)
 	pci? ( sys-apps/pciutils )
-	lm_sensors? ( sys-apps/lm_sensors )
+	lm-sensors? ( sys-apps/lm-sensors )
 	netlink? ( dev-libs/libnl:3 )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	perl? ( dev-lang/perl:= )
@@ -93,7 +93,7 @@ src_prepare() {
 src_configure() {
 	# keep this in the same line, configure.ac arguments are passed down to config.h
 	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
 	use smux && mibs="${mibs} smux"
 
 	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild
index 2452860409a7..119ec81687a2 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${P/_/.}
 LICENSE="HPND BSD GPL-2"
 SLOT="0/35"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
+IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
 
 COMMON_DEPEND="
 	ssl? (
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 		${PYTHON_DEPS}
 	)
 	pci? ( sys-apps/pciutils )
-	lm_sensors? ( sys-apps/lm_sensors )
+	lm-sensors? ( sys-apps/lm-sensors )
 	netlink? ( dev-libs/libnl:3 )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	perl? ( dev-lang/perl:= )
@@ -94,7 +94,7 @@ src_prepare() {
 src_configure() {
 	# keep this in the same line, configure.ac arguments are passed down to config.h
 	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
 	use smux && mibs="${mibs} smux"
 
 	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
new file mode 100644
index 000000000000..a7359956604a
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+WANT_AUTOMAKE=none
+PATCHSET=3
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools distutils-r1 eutils perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://www.net-snmp.org/"
+SRC_URI="
+	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+"
+
+S=${WORKDIR}/${P/_/.}
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/35"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="
+	X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
+	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+"
+
+COMMON_DEPEND="
+	bzip2? ( app-arch/bzip2 )
+	elf? ( dev-libs/elfutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	pci? ( sys-apps/pciutils )
+	perl? ( dev-lang/perl:= )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+S=${WORKDIR}/${P/_p*/}
+
+RESTRICT=test
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+	eapply "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
+	eapply "${FILESDIR}"/${PN}-5.8-my_bool.patch
+	eapply "${FILESDIR}"/${PN}-5.8-pcap.patch
+	eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch
+
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pcap) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared --disable-static \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	for target in snmplib agent sedscript all; do
+		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
+	done
+
+	use doc && emake docsdox
+}
+
+src_install () {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	prune_libtool_files
+}
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index 66e5dca50e31..c6deae576b94 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -13,7 +13,7 @@ inherit autotools distutils-r1 eutils git-r3 perl-module systemd
 
 DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://www.net-snmp.org/"
-EGIT_REPO_URI="https://git.code.sf.net/p/net-snmp/code"
+EGIT_REPO_URI="https://github.com/net-snmp/net-snmp"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
 "
@@ -22,34 +22,38 @@ SRC_URI="
 LICENSE="HPND BSD GPL-2"
 SLOT="0/35"
 KEYWORDS=""
-IUSE="X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
+IUSE="
+	X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
+	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	rpm? ( bzip2 zlib )
 "
 
 COMMON_DEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
 	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
 	elf? ( dev-libs/elfutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	pci? ( sys-apps/pciutils )
+	perl? ( dev-lang/perl:= )
 	python? (
 		dev-python/setuptools[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
 	)
-	pci? ( sys-apps/pciutils )
-	lm_sensors? ( sys-apps/lm_sensors )
-	netlink? ( dev-libs/libnl:3 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	perl? ( dev-lang/perl:= )
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -68,6 +72,7 @@ S=${WORKDIR}/${P/_p*/}
 RESTRICT=test
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+	"${FILESDIR}"/${PN}-5.8-pcap.patch
 	"${FILESDIR}"/${PN}-5.8-tinfo.patch
 )
 
@@ -96,7 +101,7 @@ src_prepare() {
 src_configure() {
 	# keep this in the same line, configure.ac arguments are passed down to config.h
 	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
 	use smux && mibs="${mibs} smux"
 
 	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
@@ -113,6 +118,7 @@ src_configure() {
 		$(use_with kmem kmem-usage) \
 		$(use_with mysql) \
 		$(use_with netlink nl) \
+		$(use_with pcap) \
 		$(use_with pci) \
 		$(use_with perl perl-modules INSTALLDIRS=vendor) \
 		$(use_with python python-modules) \
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 8783b6eedd96..b895f8b664c3 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -4,6 +4,7 @@ DIST netdata-1.15.0.tar.gz 3175237 BLAKE2B 75f4c6f0dba53e6ff01fb98767e266ede8a8b
 DIST netdata-1.16.0.tar.gz 3233403 BLAKE2B 5e51722f9f11171a38231afd918a319c18fb7c95d5605a3fe73616af955b50036d2db7729494e8cc08d95a0bd11fb0259abb50d5f4da979f977b734778b16678 SHA512 132e8c0c57798d69ca8c3f360c2d55f1b8a46deaeacbb59979bc5bb5c52c9eaf02db7f7a166848787aae5807122d86f48fa86c0b9211ed0fdfd92889d1d8e2e4
 DIST netdata-1.16.1.tar.gz 3286225 BLAKE2B 4411baa2da9282173abef872dce02bc0a3f1b1e46a449648a0e09f35db27f2864bc63caf155f84e550ea8cff60c0c0d887a9e7043ac138a45a8170805059fed5 SHA512 f16dad4395b3cd2c437e03f98a2e0945fabd1cabd8b0f294d83e2fbd429955fe1cbe92668f9d3160d1c56ea744acc3908c8df91d0b3bb0623854361878317520
 DIST netdata-1.17.0.tar.gz 3313545 BLAKE2B 4225ed7e53d9d79d4e0e5e6c4c5408a78bcb1ce05a5d20925c231d55131e13ef3426586962c85f814073fad389495ac010b6843288865a44d8a0f22e55eab065 SHA512 fb1a2295868df3a161cc777dddece3bd8c6a2338a75ba72d6eaa7ca6914a1661cb056680229ad67d3059081309130f60eeff98d8e60ab3a03622f5c1947d1b08
+DIST netdata-1.17.1.tar.gz 3332115 BLAKE2B 4811d36beade1d990ddafdef2843f2740656c1127f192c89863639a0c44753b78743cae3eab49a5a4e4c65aa36a3e52479624ea7c45248b3a55a841753b834ec SHA512 795610ef3e7153982665edd90ece1f06fef264a3eaf28f49ef59505aa83983822f9dd88035a30885db1d462e72b6ce2416ef6365abb94229d6155b896d12a8aa
 EBUILD netdata-1.13.0.ebuild 2633 BLAKE2B 917373166cefb26f30a9f62fedec407be3e7332774b419cb36db4a8ec6978d774f527a21d8b09e9bc4ed920144d7dc0378c9ecd30eaf51e855c6557b4e950556 SHA512 b964e4a3949b0ccf268cc8caa6ede03a45c3fbf5ec9b2d98e2c8ca9efec2643d8bbcf4233a087ac259c9a62c19f54ecaa15183a51fae0642c93c80d27c95cda8
 EBUILD netdata-1.14.0-r1.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885df5587b57a3ddbdf88ed1781ffc2ea51c6179baeec5bc10322e09249fc1f745c1613b61a8ebb80b84d988040409 SHA512 15f74bfe0a00e23d2d108ffa2325b3837cf5cbfae91a22350cad78a4bfd0d05c89857b32a92896180a15d70e2c4aec7de53e1a70420636075092a642790c82dd
 EBUILD netdata-1.14.0.ebuild 2623 BLAKE2B 8552936e3884d9b62a6b2ee94ce4d14fb80feff59412e35b5f6174f5de2abc0506fc22311386b3337c3ee250fe0952acda36ae1524e924bf39673aa5f74a7eac SHA512 82d51a4bcd131b4dca9090ec6c6b344e37efabb5521f06315324bc006fdf5cd9930f4b68c4aa4a90f1ca7a1135803872726521f3d4ac21504a60047f8abaab96
@@ -13,5 +14,6 @@ EBUILD netdata-1.15.0.ebuild 2783 BLAKE2B 581d2bf6e944612d833d5d1c9a96a4de3f885d
 EBUILD netdata-1.16.0.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
 EBUILD netdata-1.16.1.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
 EBUILD netdata-1.17.0.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
+EBUILD netdata-1.17.1.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
 EBUILD netdata-9999.ebuild 3026 BLAKE2B 704563b33e7154b3349c84beb0e705cda9630c0170e9002ac2cf271fb31a08b96f8d6559f107d1d7b7bbd5fed31d008f1300cef34e69edb3171e65f9d00c3c98 SHA512 7dfcec1d5d3c5539ceb2c42bdabfd22d35651104286c217b8b93ef85da04d9c53872ec6664c7269b2d348620d87594485b468af0c04edd7efec592a19a837992
 MISC metadata.xml 939 BLAKE2B fa9652dfc67eb1f088383a62d435349665f81dc9db3e1dd9c8412110f27297cc15681cbd2307c8a09cd490bd195e830311bf9a2612abfe14ecec18fb99a17eed SHA512 c9e7794f190c22d0b5a14d2431d7f15d7b048fcbcf8cf48499e6a71fb21f7fc0292bd944db6767e1f70413c484a338ffeccbf7a70c63d7c128e4bc72c7d24fe3
diff --git a/net-analyzer/netdata/netdata-1.17.1.ebuild b/net-analyzer/netdata/netdata-1.17.1.ebuild
new file mode 100644
index 000000000000..b12cc034edfb
--- /dev/null
+++ b/net-analyzer/netdata/netdata-1.17.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools fcaps linux-info python-r1 systemd user
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Linux real time system monitoring, done right!"
+HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
+
+LICENSE="GPL-3+ MIT BSD"
+SLOT="0"
+IUSE="caps +compression cpu_flags_x86_sse2 cups dbengine ipmi mysql nfacct nodejs postgres +python tor xen"
+REQUIRED_USE="
+	mysql? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tor? ( python )"
+
+# most unconditional dependencies are for plugins.d/charts.d.plugin:
+RDEPEND="
+	app-misc/jq
+	>=app-shells/bash-4:0
+	|| (
+		net-analyzer/openbsd-netcat
+		net-analyzer/netcat
+	)
+	net-analyzer/tcpdump
+	net-analyzer/traceroute
+	net-misc/curl
+	net-misc/wget
+	sys-apps/util-linux
+	virtual/awk
+	caps? ( sys-libs/libcap )
+	cups? ( net-print/cups )
+	dbengine? (
+		dev-libs/libuv
+		app-arch/lz4
+		dev-libs/judy
+		dev-libs/openssl:=
+	)
+	compression? ( sys-libs/zlib )
+	ipmi? ( sys-libs/freeipmi )
+	nfacct? (
+		net-firewall/nfacct
+		net-libs/libmnl
+	)
+	nodejs? ( net-libs/nodejs )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		mysql? (
+			|| (
+				dev-python/mysqlclient[${PYTHON_USEDEP}]
+				dev-python/mysql-python[${PYTHON_USEDEP}]
+			)
+		)
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		tor? ( net-libs/stem[${PYTHON_USEDEP}] )
+	)
+	xen? (
+		app-emulation/xen-tools
+		dev-libs/yajl
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+: ${NETDATA_USER:=netdata}
+: ${NETDATA_GROUP:=netdata}
+
+FILECAPS=(
+	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 / ${PN}
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		--with-user=${NETDATA_USER} \
+		--disable-jsonc \
+		$(use_enable cups plugin-cups) \
+		$(use_enable dbengine) \
+		$(use_enable nfacct plugin-nfacct) \
+		$(use_enable ipmi plugin-freeipmi) \
+		$(use_enable xen plugin-xenstat) \
+		$(use_enable cpu_flags_x86_sse2 x86-sse) \
+		$(use_with compression zlib)
+}
+
+src_install() {
+	default
+
+	rm -rf "${D}/var/cache" || die
+
+	# Remove unneeded .keep files
+	find "${ED}" -name ".keep" -delete || die
+
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+	keepdir /var/log/netdata
+	fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+	keepdir /var/lib/netdata
+	keepdir /var/lib/netdata/registry
+
+	fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+
+	newinitd system/netdata-openrc ${PN}
+	systemd_dounit system/netdata.service
+	insinto /etc/netdata
+	doins system/netdata.conf
+
+	echo "CONFIG_PROTECT=\"${EPREFIX}/usr/$(get_libdir)/netdata/conf.d\"" > 99netdata
+	doenvd 99netdata
+}
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 9db300a11e26..0b90569f49a8 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -7,4 +7,4 @@ AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f7
 AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a
 DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
 EBUILD netperf-2.7.0-r2.ebuild 1919 BLAKE2B 21aae85ceff1b2d4728ee3a984c28796b2848e7a65de9513cd5a088ac9e747aa65370f6700ddf7f3f2f09c20b322fd3590e4894cb4459b5301cecebb84bf74f3 SHA512 b511f47c363bf844415c281fe664b7b96898eefbadcaf87189933a83dd17e349e7ddd7f8af2ee9a91c0cfb6919bdbec4a2b63a25829cfdf3817812661ce1a734
-MISC metadata.xml 775 BLAKE2B 7f097a5c5390a88319c63497486a12367b5b89ac7979e22271581f6c9b6eaa5c69209f4d3cc82c57e8a3b0d0c0469378cd73579447c56d9991379af46b7fca1d SHA512 c1aaecd84a7fe73d798842ed1c117357809069f3f8c30a6920abf6641c46a5885e170dcecf7f2172d376b7f010e6dd07c47e233f15289c5de432550f1d05845e
+MISC metadata.xml 855 BLAKE2B 20c4b64a1abe9e4f83a56e759b9d7cfb161886dd06a4672dc96828a80d3f91c064665138a87c263815c217091a869e7ced811fca059405bf047de337814c52a5 SHA512 628efc289da10094d7fab1c0c47e8acd67260fffc036e2d4eaa1430e1b91fd2610d681134211cff4dcd5f84858199a4bbf36aaaa73f3e507bef1114a64b4e588
diff --git a/net-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml
index 8b0f12738e3f..d9e80b8c44f1 100644
--- a/net-analyzer/netperf/metadata.xml
+++ b/net-analyzer/netperf/metadata.xml
@@ -19,4 +19,7 @@ netperf include:
 <use>
 <flag name="demo">Emit interim results during the run. May affect results</flag>
 </use>
+<upstream>
+<remote-id type="cpe">cpe:/a:netperf:netperf</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index ac025ccfe588..3f0225e9e3dc 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -1,7 +1,8 @@
-AUX suricata-4.0.3-conf 2767 BLAKE2B fe356820f57a8a7b068b66fd8c012c94a9bffdc8a62e2bd4a2210a9625778fa358a303bc770aeb4b1600ed8da5443533c50356ac4dfdabce6d0438ba246e1cd4 SHA512 fd3aec48b4e7e52f192af117f3cda063c5614f33082986dca4e3bdf7a46d62655cd03a1d723db9d36a1b1f84964dc2273e3bf00fb23648902639b18a64025d6b
-AUX suricata-4.0.3-init 5499 BLAKE2B c2aece3a386d0ecf821e9d0e6bcb74efd97b90a71bad59a3e86f0f6a30702c711e7a287d1065745e73521c6f6cfaf5444b50b064fc06052dc33d8a6bc690f2da SHA512 ac407c70751a3610d9082b0736e76dfe04bd82014a5ac850b581c2e3c5806bb9d8fd59788cfaeabf51a856861a4568e31f9f1e33687623cc380ce226c0e06b92
+AUX suricata-4.0.4-conf 2767 BLAKE2B fe356820f57a8a7b068b66fd8c012c94a9bffdc8a62e2bd4a2210a9625778fa358a303bc770aeb4b1600ed8da5443533c50356ac4dfdabce6d0438ba246e1cd4 SHA512 fd3aec48b4e7e52f192af117f3cda063c5614f33082986dca4e3bdf7a46d62655cd03a1d723db9d36a1b1f84964dc2273e3bf00fb23648902639b18a64025d6b
+AUX suricata-4.0.4-init 5496 BLAKE2B ea7922c300f3f42450e9c84b696a1389887ec062588a29cab201a70a2a2c1d52ce63d89642d85c584737594606ddc212d84632308de401504db80c60226872de SHA512 3b0294a0db38524f2a5126fb66000700cee2f1d10a10f35b5cb2a3598c4e41de72015719bbcf70da46f15505f2ac4b3afb2a4fa040fae68f0b1088ae40d5457b
 AUX suricata-4.0.4_configure-lua-flags.patch 502 BLAKE2B 14693f51888ba8d41a736a91065d1376e542d7c41d53dcc3ed9edd95d10f1db30a51d8b244154406a98338f844e67e2f836bcfc44bfa6dd6d0ffc19332c6a2c0 SHA512 a1be159aa592f2121b5e3fde70485e6a502cdfbd15fc76056e6ca1401a94ab7eddf1639728fa402f754ca546229aa5fd6fc05c243be761475c9249a7206b2830
+AUX suricata-4.0.4_sockios.patch 298 BLAKE2B 2a3fd2b8ace6363f90ad52f2f9802cd9565d3aabcc1d5fec4b2b0b9690110d7b28fa8d6be39d357b9dded7f2f09ba9b21e3837d92cac42483e0015ef76669ec8 SHA512 416cc3ff7636f7938e35a449bea41d2f4a02dacb80dce0821091db690279f966ef048a036a4b47b9f9208039b9103366500afcd0d6b3e85d8fe96372a0b3921a
 AUX suricata-logrotate 161 BLAKE2B d55edb7e36cc27819b6fba26778eff3cc66bfc5c04877e36e27ef9adcf3f003c10cff787b317e00a32a4c764c2180f90c9abd3f81e877d73bd2c892d5ca2d161 SHA512 c22a85667460df9b7b1fd15af1e4472dd5b7d1726a43f3b621547a884dcd64ff49b0728767d6a4dc70c413dd8997905e3753fa94c82cda34e4aaf903ebdb1cec
 DIST suricata-4.0.4.tar.gz 12511121 BLAKE2B d9dfb00a45c2e9810409a8ce91a83e23ebce20eb28492bf24f9688d292b5805dca932c39cc673cf1148325fe5ef7936dda7f6c7819605753cb2e2ddc1cf5dba0 SHA512 6e158aa6d3edb9d11e0df3f986392ee2ae49ab4dfb978288ced4484dbe5c08ae061db2a566be6d22cf14bd0b88f87f9cb9c0a657d7fc44e099b8783d933c771e
-EBUILD suricata-4.0.4.ebuild 4628 BLAKE2B 734f3ca0c4aeb9ec7bfd820c8192c422966c43c2390eac49c50a507587fbb570e1e5f8d7ae62347539f464d73b3e4827ef5747dae8522373ab20cca28dfb8932 SHA512 4e361bdfb9fd716f1c10444247f3c788536d73d601cbc3b3b7c59f5923634cf20d3aed9d06fac9759233cd5dc2816015aaf9a21e53eecc03e6b12a1294e6e866
+EBUILD suricata-4.0.4.ebuild 4744 BLAKE2B 03ad9be14e12649c8e50752e31d151ad9b97b968b8caf2305d958c9d68407d59b723e5b318ad7850c71b17d5aaebb07d865f6b81748148f2297311d531423c61 SHA512 0988822e3a3689d7ff0e7cb239f9c2504f5c693789b859777bb2eb5e0ce3c906ca1effb794905d7106093fdc80b3027d351434dda0528a2fc8e1e61e8a3dd720
 MISC metadata.xml 775 BLAKE2B faf442e43b5388b3a24b57ee3aa73ea22eb0f230bd7bfbdee98bc4ec0be260f52f47cf7caa67d44d3498cdba58e18c487741a295149c64cf2b4631a141537e8a SHA512 e9407a4c043553a31b1a66c6b45d352444368567eef3bfa4af26e64bb84a70a81bcc7a21e48dba7e532a3115c7086932e22b75a05b00ba1f84b59d4d7ec187c6
diff --git a/net-analyzer/suricata/files/suricata-4.0.3-init b/net-analyzer/suricata/files/suricata-4.0.3-init
deleted file mode 100644
index f54ba3a5e23b..000000000000
--- a/net-analyzer/suricata/files/suricata-4.0.3-init
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-SURICATA_BIN=/usr/bin/suricata
-SURICATA_DIR=${SURICATA_DIR:-/etc/suricata}
-SURICATA=${SVCNAME#*.}
-SURICATAID=$(shell_var "${SURICATA}")
-if [ -n "${SURICATA}" ] && [ ${SVCNAME} != "suricata" ]; then
-    eval SURICATACONF=\$SURICATA_CONF_${SURICATAID}
-    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata-${SURICATA}.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
-    SURICATAPID="/var/run/suricata/suricata.${SURICATA}.pid"
-    eval SURICATAOPTS=\$SURICATA_OPTS_${SURICATAID}
-    eval SURICATALOGPATH=\$SURICATA_LOG_FILE_${SURICATAID}
-    eval SURICATAUSER=\$SURICATA_USER_${SURICATAID}
-    eval SURICATAGROUP=\$SURICATA_GROUP_${SURICATAID}
-else
-    SURICATACONF=${SURICATA_CONF}
-    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
-    SURICATAPID="/var/run/suricata/suricata.pid"
-    SURICATAOPTS=${SURICATA_OPTS}
-    SURICATALOGPATH=${SURICATA_LOG_FILE}
-    SURICATAUSER=${SURICATA_USER}
-    SURICATAGROUP=${SURICATA_GROUP}
-fi
-SURICATAUSER=${SURICATAUSER:-${SURICATA_USER}}
-SURICATAGROUP=${SURICATAGROUP:-${SURICATA_GROUP}}
-[ -e ${SURICATACONF} ] && SURICATAOPTS="-c ${SURICATACONF} ${SURICATAOPTS}"
-[[ -z "${SURICATA_MAX_WAIT_ON_STOP// }" ]] || SURICATA_RETRY="--retry ${SURICATA_MAX_WAIT_ON_STOP}"
-
-description="Suricata IDS/IPS"
-extra_commands="checkconfig dump"
-description_checkconfig="Check config for ${SVCNAME}"
-description_dump="List all config values that can be used with --set"
-extra_started_commands="reload relog"
-description_reload="Live rule and config reload"
-description_relog="Close and re-open all log files"
-
-depend() {
-	need net
-	after mysql
-	after postgresql
-}
-
-checkconfig() {
-	if [ ! -d "/var/run/suricata" ] ; then
-		checkpath -d /var/run/suricata
-	fi
-	if [ ${#SURICATALOGPATH} -gt 0 ]; then
-		SURICATALOGFILE=$( basename ${SURICATALOGPATH} )
-		SURICATALOGFILE=${SURICATALOGFILE:-suricata.log}
-		SURICATALOGPATH=$( dirname ${SURICATALOGPATH} )
-		if [ ! -d "${SURICATALOGPATH}" ] ; then
-			checkpath -d "${SURICATALOGPATH}"
-		fi
-		if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ] && [ -e "${SURICATALOGPATH}" ]; then
-			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}" || return 1
-			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}"/* >/dev/null 2>&1 3>&1
-		fi
-		SURICATAOPTS="${SURICATAOPTS} --set logging.outputs.1.file.filename=${SURICATALOGPATH}/${SURICATALOGFILE}"
-		SURICATALOGPATH="-l ${SURICATALOGPATH}"
-	fi
-	if [ ! -e ${SURICATACONF} ] ; then
-		einfo "The configuration file ${SURICATACONF} was not found."
-		einfo "If this is OK then make sure you set enough options for ${SVCNAME} in /etc/conf.d/suricata."
-		einfo "Take a look at the suricata arguments --set and --dump-config."
-	fi
-	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
-		einfo "${SVCNAME} will run as user ${SURICATAUSER}:${SURICATAGROUP}."
-		SURICATAOPTS="${SURICATAOPTS} --user=${SURICATAUSER} --group=${SURICATAGROUP}"
-	fi
-}
-
-initpidinfo() {
-	[ -e ${SURICATAPID} ] && SUR_PID="$(cat ${SURICATAPID})"
-	if [ ${#SUR_PID} -gt 0 ]; then
-	    SUR_PID_CHECK="$(ps -eo pid | grep -c ${SUR_PID})"
-	    SUR_USER="$(ps -p ${SUR_PID} --no-headers -o user)"
-	fi
-}
-
-checkpidinfo() {
-	initpidinfo
-        if [ ! -e ${SURICATAPID} ]; then
-        	eerror "${SVCNAME} isn't running"
-                return 1
-	elif [ ${#SUR_PID} -eq 0 ] || [ $((SUR_PID_CHECK)) -ne 1 ]; then
-		eerror "Could not determine PID of ${SVCNAME}! Did the service crash?"
-		return 1
-	elif [ ${#SUR_USER} -eq 0 ]; then
-		eerror "Unable to determine user running ${SVCNAME}!"
-		return 1
-	elif [ "x${SUR_USER}" != "xroot" ]; then
-		ewarn "${SVCNAME} may need to be running as root or as a priviledged user for the extra commands reload and relog to work."
-        fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --exec ${SURICATA_BIN} \
-		-- --pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH} >/dev/null 2>&1
-	local SUR_EXIT=$?
-	if [ $((SUR_EXIT)) -ne 0 ]; then
-	    einfo "Could not start ${SURICATA_BIN} with:"
-	    einfo "--pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH}"
-	    einfo "Exit code ${SUR_EXIT}"
-	fi
-	eend ${SUR_EXIT}
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop ${SURICATA_RETRY} --quiet --pidfile ${SURICATAPID} >/dev/null 2>&1
-	eend $?
-}
-
-reload() {
-	checkpidinfo || return 1
-	checkconfig || return 1
-	ebegin "Sending USR2 signal to ${SVCNAME} to perform a live rule and config reload."
-	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
-		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal USR2 --pidfile ${SURICATAPID}
-	else
-		start-stop-daemon --signal USR2 --pidfile ${SURICATAPID}
-	fi
-	eend $?
-}
-
-relog() {
-	checkpidinfo || return 1
-	checkconfig || return 1
-	ebegin "Sending HUP signal to ${SVCNAME} to close and re-open all log files."
-	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
-		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal HUP --pidfile ${SURICATAPID}
-	else
-		start-stop-daemon --signal HUP --pidfile ${SURICATAPID}
-	fi
-	eend $?
-}
-
-dump() {
-	checkconfig || return 1
-	ebegin "Dumping ${SVCNAME} config values and quitting."
-	${SURICATA_BIN} --dump-config --pidfile ${SURICATAPID} ${SURICATAOPTS} ${SURICATALOGPATH}
-	eend $?
-}
diff --git a/net-analyzer/suricata/files/suricata-4.0.3-conf b/net-analyzer/suricata/files/suricata-4.0.4-conf
index 655b947fdd9b..655b947fdd9b 100644
--- a/net-analyzer/suricata/files/suricata-4.0.3-conf
+++ b/net-analyzer/suricata/files/suricata-4.0.4-conf
diff --git a/net-analyzer/suricata/files/suricata-4.0.4-init b/net-analyzer/suricata/files/suricata-4.0.4-init
new file mode 100644
index 000000000000..1db8137f31a4
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-4.0.4-init
@@ -0,0 +1,147 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+SURICATA_BIN=/usr/bin/suricata
+SURICATA_DIR=${SURICATA_DIR:-/etc/suricata}
+SURICATA=${SVCNAME#*.}
+SURICATAID=$(shell_var "${SURICATA}")
+if [ -n "${SURICATA}" ] && [ ${SVCNAME} != "suricata" ]; then
+    eval SURICATACONF=\$SURICATA_CONF_${SURICATAID}
+    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata-${SURICATA}.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
+    SURICATAPID="/var/run/suricata/suricata.${SURICATA}.pid"
+    eval SURICATAOPTS=\$SURICATA_OPTS_${SURICATAID}
+    eval SURICATALOGPATH=\$SURICATA_LOG_FILE_${SURICATAID}
+    eval SURICATAUSER=\$SURICATA_USER_${SURICATAID}
+    eval SURICATAGROUP=\$SURICATA_GROUP_${SURICATAID}
+else
+    SURICATACONF=${SURICATA_CONF}
+    [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}"
+    SURICATAPID="/var/run/suricata/suricata.pid"
+    SURICATAOPTS=${SURICATA_OPTS}
+    SURICATALOGPATH=${SURICATA_LOG_FILE}
+    SURICATAUSER=${SURICATA_USER}
+    SURICATAGROUP=${SURICATA_GROUP}
+fi
+SURICATAUSER=${SURICATAUSER:-${SURICATA_USER}}
+SURICATAGROUP=${SURICATAGROUP:-${SURICATA_GROUP}}
+[ -e ${SURICATACONF} ] && SURICATAOPTS="-c ${SURICATACONF} ${SURICATAOPTS}"
+[[ -z "${SURICATA_MAX_WAIT_ON_STOP// }" ]] || SURICATA_RETRY="--retry ${SURICATA_MAX_WAIT_ON_STOP}"
+
+description="Suricata IDS/IPS"
+extra_commands="checkconfig dump"
+description_checkconfig="Check config for ${SVCNAME}"
+description_dump="List all config values that can be used with --set"
+extra_started_commands="reload relog"
+description_reload="Live rule and config reload"
+description_relog="Close and re-open all log files"
+
+depend() {
+	need net
+	after mysql
+	after postgresql
+}
+
+checkconfig() {
+	if [ ! -d "/var/run/suricata" ] ; then
+		checkpath -d /var/run/suricata
+	fi
+	if [ ${#SURICATALOGPATH} -gt 0 ]; then
+		SURICATALOGFILE=$( basename ${SURICATALOGPATH} )
+		SURICATALOGFILE=${SURICATALOGFILE:-suricata.log}
+		SURICATALOGPATH=$( dirname ${SURICATALOGPATH} )
+		if [ ! -d "${SURICATALOGPATH}" ] ; then
+			checkpath -d "${SURICATALOGPATH}"
+		fi
+		if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ] && [ -e "${SURICATALOGPATH}" ]; then
+			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}" || return 1
+			chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}"/* >/dev/null 2>&1 3>&1
+		fi
+		SURICATAOPTS="${SURICATAOPTS} --set logging.outputs.1.file.filename=${SURICATALOGPATH}/${SURICATALOGFILE}"
+		SURICATALOGPATH="-l ${SURICATALOGPATH}"
+	fi
+	if [ ! -e ${SURICATACONF} ] ; then
+		einfo "The configuration file ${SURICATACONF} was not found."
+		einfo "If this is OK then make sure you set enough options for ${SVCNAME} in /etc/conf.d/suricata."
+		einfo "Take a look at the suricata arguments --set and --dump-config."
+	fi
+	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
+		einfo "${SVCNAME} will run as user ${SURICATAUSER}:${SURICATAGROUP}."
+		SURICATAOPTS="${SURICATAOPTS} --user=${SURICATAUSER} --group=${SURICATAGROUP}"
+	fi
+}
+
+initpidinfo() {
+	[ -e ${SURICATAPID} ] && SUR_PID="$(cat ${SURICATAPID})"
+	if [ ${#SUR_PID} -gt 0 ]; then
+	    SUR_PID_CHECK="$(ps -eo pid | grep -c ${SUR_PID})"
+	    SUR_USER="$(ps -p ${SUR_PID} --no-headers -o user)"
+	fi
+}
+
+checkpidinfo() {
+	initpidinfo
+        if [ ! -e ${SURICATAPID} ]; then
+        	eerror "${SVCNAME} isn't running"
+                return 1
+	elif [ ${#SUR_PID} -eq 0 ] || [ $((SUR_PID_CHECK)) -ne 1 ]; then
+		eerror "Could not determine PID of ${SVCNAME}! Did the service crash?"
+		return 1
+	elif [ ${#SUR_USER} -eq 0 ]; then
+		eerror "Unable to determine user running ${SVCNAME}!"
+		return 1
+	elif [ "x${SUR_USER}" != "xroot" ]; then
+		ewarn "${SVCNAME} may need to be running as root or as a priviledged user for the extra commands reload and relog to work."
+        fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --quiet --exec ${SURICATA_BIN} \
+		-- --pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH} >/dev/null 2>&1
+	local SUR_EXIT=$?
+	if [ $((SUR_EXIT)) -ne 0 ]; then
+	    einfo "Could not start ${SURICATA_BIN} with:"
+	    einfo "--pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH}"
+	    einfo "Exit code ${SUR_EXIT}"
+	fi
+	eend ${SUR_EXIT}
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop ${SURICATA_RETRY} --quiet --pidfile ${SURICATAPID} >/dev/null 2>&1
+	eend $?
+}
+
+reload() {
+	checkpidinfo || return 1
+	checkconfig || return 1
+	ebegin "Sending USR2 signal to ${SVCNAME} to perform a live rule and config reload."
+	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
+		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal USR2 --pidfile ${SURICATAPID}
+	else
+		start-stop-daemon --signal USR2 --pidfile ${SURICATAPID}
+	fi
+	eend $?
+}
+
+relog() {
+	checkpidinfo || return 1
+	checkconfig || return 1
+	ebegin "Sending HUP signal to ${SVCNAME} to close and re-open all log files."
+	if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then
+		start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal HUP --pidfile ${SURICATAPID}
+	else
+		start-stop-daemon --signal HUP --pidfile ${SURICATAPID}
+	fi
+	eend $?
+}
+
+dump() {
+	checkconfig || return 1
+	ebegin "Dumping ${SVCNAME} config values and quitting."
+	${SURICATA_BIN} --dump-config --pidfile ${SURICATAPID} ${SURICATAOPTS} ${SURICATALOGPATH}
+	eend $?
+}
diff --git a/net-analyzer/suricata/files/suricata-4.0.4_sockios.patch b/net-analyzer/suricata/files/suricata-4.0.4_sockios.patch
new file mode 100644
index 000000000000..a341d9c159f1
--- /dev/null
+++ b/net-analyzer/suricata/files/suricata-4.0.4_sockios.patch
@@ -0,0 +1,13 @@
+--- src/source-af-packet.c.orig	2019-09-08 20:50:06.416466432 +0200
++++ src/source-af-packet.c	2019-09-08 20:53:26.144471385 +0200
+@@ -70,6 +70,10 @@
+ 
+ #ifdef HAVE_AF_PACKET
+ 
++#ifdef HAVE_LINUX_SOCKIOS_H
++#include <linux/sockios.h>
++#endif
++
+ #if HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
+ #endif
diff --git a/net-analyzer/suricata/suricata-4.0.4.ebuild b/net-analyzer/suricata/suricata-4.0.4.ebuild
index 2622dccdb3b7..98ed94d5b7d5 100644
--- a/net-analyzer/suricata/suricata-4.0.4.ebuild
+++ b/net-analyzer/suricata/suricata-4.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -46,7 +46,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}_configure-lua-flags.patch
+	epatch "${FILESDIR}/${P}_configure-lua-flags.patch"
+	epatch "${FILESDIR}/${P}_sockios.patch"
+	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am"
 	eautoreconf
 }
 
@@ -124,14 +126,14 @@ src_install() {
 		doins rules/*.rules
 	fi
 
-	dodir "/var/lib/${PN}"
-	dodir "/var/log/${PN}"
+	keepdir "/var/lib/${PN}"
+	keepdir "/var/log/${PN}"
 
 	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
 	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
 
-	newinitd "${FILESDIR}/${PN}-4.0.3-init" ${PN}
-	newconfd "${FILESDIR}/${PN}-4.0.3-conf" ${PN}
+	newinitd "${FILESDIR}/${P}-init" ${PN}
+	newconfd "${FILESDIR}/${P}-conf" ${PN}
 
 	if use logrotate; then
 		insopts -m0644
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index ef98d053a6df..57033b3b46a7 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -3,4 +3,4 @@ DIST tcpdump-4.9.2.tar.gz 2298386 BLAKE2B b7e90d1091affa6f4734a622f23565976b0cb5
 EBUILD tcpdump-4.9.2-r1.ebuild 2196 BLAKE2B 3fa9633aec8cbf4fade7622b445336fb79d90b361299ad18d0704e613e749d05204f44b0e75b489692dc5851dcc1d987719c7f6cc4d1e5f5b9265775c1ffcc88 SHA512 6573400c2c12725e5c791756de76854c38869cbabe35c208c479beda30893f0f029011f407bd56f0ae6dd8a63a5dddf45f57d49b51babf25a966a407e0cdbe6b
 EBUILD tcpdump-4.9.2.ebuild 2074 BLAKE2B 94a22e1acea10408c02fcca114547eba248491b0a99505ee369549c681e23e5a5ffa51f4dd43ba6ae2eaa79d0abc85f1f5c1f9a057a96c70189d47e9d98e0028 SHA512 48bd328212aae63dc3f0361352f93b29edb165cbbe12f7d92cc3588c9240e4584e5257bda6adc52872b271e72dfcd65cbd78d79b1faf86b76088fe4f3244376f
 EBUILD tcpdump-9999.ebuild 2199 BLAKE2B 4931c70244b037b100cbabad036f2cb14a675d6bb0cec61697bcb2b996d18ee18e38afe6d04cec9e07b78b222cf5ef1f2cf01205eef137f7df5eb7d931605744 SHA512 57e1a444b5a345b2acc2cc14e64fd2298b6d8b20fcf45a9352ddfb3a6a16220fb078b0e4382031eb1b3ed61b7b33ab30c2790c7f1adb15a68701fd57fbe97f9f
-MISC metadata.xml 580 BLAKE2B 0769370fb4433cb7be15b66cbf8598298818b3ae024c534aab956afa695766cc77ec44041559547daac91a1b71d8427039137353497da9b8c6d8dbdb24c41952 SHA512 b8fd75f13c0993c8aa97e0c35649b4f11f992413f4dce8f737c28741d047bb36637b6c509139a046594fa788eb2932ee39a87046742372c63fe0bc6e037da49a
+MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392
diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 2d5b8e1103b2..926985b6a8cb 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="drop-root">Drop privileges to tcpdump:tcpdump when run as root</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:tcpdump:tcpdump</remote-id>
 		<remote-id type="github">the-tcpdump-group/tcpdump</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index e6424813a848..aecfe5b7f404 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,9 +6,11 @@ AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.0.1.tar.xz 30903792 BLAKE2B 583052691cc20e97511f2407a64fbdffae91c09275429c9c9a60dbafcfc91ce79270f09710e8fba7db053565f1afc9786caf22ef21e700dd0f97c2f38b139e31 SHA512 59c3f36e4e7a1a7ea8f926dbf8ca495f83346396e1df5edf6a1bb34823c84308f52a1b6d46be9675d3af9ce8718da4a574f63a4fb210d8fc52131f4534d8670d
 DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750
+DIST wireshark-3.0.4.tar.xz 30938336 BLAKE2B ab97cbfd9999a4e326787639debb67f0d0b8509572fb85297385a461dbaf081691d59fc2cb16b4a69baee8ca0ef873503f85f0238bf0fbedfcb3e0755749d3df SHA512 eb9ddc8ba3d78bc6c1f2e1d277e81c00939638793ed21b98999310231d13a0fc8a6149dc5e78f58026778b8137e954ad7f67069f8cb80465078ca2d9795b25d1
 DIST wireshark-3.1.0.tar.xz 31052040 BLAKE2B 96ede4dcbb3f5c4ecf1d935737bb26dcaecabe24e0767b34914febd31a1402d2428580e8b26c145bc98a71ef01fddcfca6e4f5709d9a8d90634ea6ed4789bb20 SHA512 df7ca131d0e0f00ec00ef0934cf070c7f6d06e55830777e5ab62f4b1c5588b57bfb45e69009f8ab0c3f405f9dd730bf35671d09f46a9a846a09154ec47caffc9
 EBUILD wireshark-3.0.1.ebuild 6603 BLAKE2B e6a553eaadb1eb0098088bc18f2603359f6b3c5c3a411d4abdc879c21e2b927362d383cdab19072f333beba35da851368263ea9fb059eb9726ea5bf6f5a969ef SHA512 33362ce11dd19ce6c93c47325907dbbea2f504724ad94464217d98744b19dad1f3461319ba709edb21ad442d22fce6db4d8fae596d1e0714520b34598bdbfcb2
-EBUILD wireshark-3.0.3.ebuild 6588 BLAKE2B 761fdb00eec746602a278540d2d88d722670a2b29fceb5af04471768d1d75b9a4bdefa48f5e4a16e2c17d0132d5930ae96e420441334408b4e2e632bc9e14969 SHA512 8f763e0dcf5d387f8e19b44529b81cf9d266a31be4faceba982752179c77990a60f5bcb4565ccbfe38baedc3b940ce0f60151dc0e2f56623a87a0bab4e963a15
+EBUILD wireshark-3.0.3.ebuild 6587 BLAKE2B 945be054888849eb430d9e1242d48a146890ea226d4af32dfe22904bf748880f2baa3537460f23c8d89b89f101e61a4833b1ebdd946f32e9b1b38c8d004ba742 SHA512 5b31f242fd6c315629eb0cd308dc374aefa8a41f3966ae2f81a2385a366270597f235a0733a27fa93230fb82318725d41502522256ec2b5e8bd97a4bcafb7e88
+EBUILD wireshark-3.0.4.ebuild 6594 BLAKE2B 2e5e7153270cf771d6543aa2b9fa78d4d48819e367b470ee976afb00cc730640ebdfaa3d21e146fae5dcd53fabe39ed5f68b708d6c0970f95f3e73c935aec7aa SHA512 4de4e53891684a93e699cef35d2ff7d9415b0725d57c530371a11a24a6adb4a161c1812e10bbb664577c6ee249c8d2e26704c1e7d5d46246c942445c8f6befbe
 EBUILD wireshark-3.1.0.ebuild 6796 BLAKE2B b8c8bf8ae8b08591ac11bfeefaddd953844ddb2b3c30c0bd5be3a3dea179ad6bb9896aa2dffe67e31f612e6b7cff6c7349981d8641b395041bc9b1999b59b3ff SHA512 5967b885881c10d5a6ae516eb5319ddffdb73a31856545e9bbb7676d0bf9b3b02c868bda2821f4c5e655cd0b0967fe7cd1e2f7d6d77607a492714c54cc7c07e5
 EBUILD wireshark-99999999.ebuild 6801 BLAKE2B d6fce252397acd89269ac1ba4e96377f8f9072045e378c97b4bdfb1452a14fd80e5b6014bf74616ce41639b1596c1de13dd10092a0f98e8bcdb7dd7201ed2c10 SHA512 bcb538192ffb47eb9c465ac7fcfce7b86c34a7657b6172750fa4965693d4a60a398664984ee4969fc4f884e79c4959ed544fd9d6d2e873deb5cd39366f20af11
 MISC metadata.xml 5146 BLAKE2B f126bc073b880c4c0fac986cef21b7cd6951826df28032ec546b21f5b4472192c91cb6442f765d8e408c1ac7d725518ae316e63a931996c01724154404f879e4 SHA512 895920a9ee9a7f4587d063581b36d00c08b85d554087ddbfb6acbbbd6c066795d8b484826c50740fb4c2db5cf0058ed4d85c0082ab42f7d5e96bd96413701b69
diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
index b18434e3aee7..602150453439 100644
--- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc64 x86"
 IUSE="
 	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
 	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
diff --git a/net-analyzer/wireshark/wireshark-3.0.4.ebuild b/net-analyzer/wireshark/wireshark-3.0.4.ebuild
new file mode 100644
index 000000000000..924c16aa9485
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.0.4.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+	adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+	nghttp2 +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd
+	smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark
+	+udpdump zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/libgcrypt:0
+	adns? ( >=net-dns/c-ares-1.5 )
+	bcg729? ( media-libs/bcg729 )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	netlink? ( dev-libs/libnl:3 )
+	nghttp2? ( net-libs/nghttp2 )
+	pcap? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		x11-misc/xdg-utils
+	)
+	sbc? ( media-libs/sbc )
+	sdjournal? ( sys-apps/systemd )
+	smi? ( net-libs/libsmi )
+	snappy? ( app-arch/snappy )
+	spandsp? ( media-libs/spandsp )
+	sshdump? ( >=net-libs/libssh-0.6 )
+	ssl? ( net-libs/gnutls:= )
+	zlib? ( sys-libs/zlib )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	!<perl-core/Pod-Simple-3.170
+	!<virtual/perl-Pod-Simple-3.170
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
+	"${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch
+	"${FILESDIR}"/${PN}-99999999-qtsvg.patch
+	"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_configure() {
+	local mycmakeargs
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+				;;
+		esac
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	python_setup 'python3*'
+
+	mycmakeargs+=(
+		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+		-DBUILD_androiddump=$(usex androiddump)
+		-DBUILD_capinfos=$(usex capinfos)
+		-DBUILD_captype=$(usex captype)
+		-DBUILD_ciscodump=$(usex ciscodump)
+		-DBUILD_dftest=$(usex dftest)
+		-DBUILD_dpauxmon=$(usex dpauxmon)
+		-DBUILD_dumpcap=$(usex dumpcap)
+		-DBUILD_editcap=$(usex editcap)
+		-DBUILD_mergecap=$(usex mergecap)
+		-DBUILD_mmdbresolve=$(usex maxminddb)
+		-DBUILD_randpkt=$(usex randpkt)
+		-DBUILD_randpktdump=$(usex randpktdump)
+		-DBUILD_reordercap=$(usex reordercap)
+		-DBUILD_sdjournal=$(usex sdjournal)
+		-DBUILD_sharkd=$(usex sharkd)
+		-DBUILD_sshdump=$(usex sshdump)
+		-DBUILD_text2pcap=$(usex text2pcap)
+		-DBUILD_tfshark=$(usex tfshark)
+		-DBUILD_tshark=$(usex tshark)
+		-DBUILD_udpdump=$(usex udpdump)
+		-DBUILD_wireshark=$(usex qt5)
+		-DCMAKE_INSTALL_DOCDIR="${EROOT%/}/usr/share/doc/${PF}"
+		-DDISABLE_WERROR=yes
+		-DENABLE_BCG729=$(usex bcg729)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_CARES=$(usex adns)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex nghttp2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+	# install headers
+	insinto /usr/include/wireshark
+	doins ws_diag_control.h ws_symbol_export.h \
+		"${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+	local dir dirs=(
+		epan
+		epan/crypt
+		epan/dfilter
+		epan/dissectors
+		epan/ftypes
+		epan/wmem
+		wiretap
+		wsutil
+	)
+	for dir in "${dirs[@]}"
+	do
+		insinto /usr/include/wireshark/${dir}
+		doins ${dir}/*.h
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking
+	# in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use qt5; then
+		local s
+		for s in 16 32 48 64 128 256 512 1024; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/apps
+			newins image/wsicon${s}.png wireshark.png
+		done
+		for s in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+	chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+
+	if use dumpcap && use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 7652fcb15fbd..ffa4ae5eb7d4 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index 3157fbf50cc1..040262693841 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -3,4 +3,4 @@ AUX minicom-2.7-lockdir.patch 535 BLAKE2B dfdd70268877e4eaa959fc3262342be3c0b89a
 AUX minirc.dfl 66 BLAKE2B fa087c52ace0bcc5915e58074b96f8d6b0304690dccdb5d2710a2d3c334825f05d89e75d9a613ac1c40a44bd1605cae8765d24a259212767e62fe3a6f8779b57 SHA512 dc6f65392ec4ee9e0f499596b6220cb23e443530a3802edc8805412a7999ffb48cb2f9f5c9f7a7ebfbbe166fdbf128847f00141c4f67c0176bb245081814955c
 DIST minicom-2.7.1.tar.gz 863544 BLAKE2B 473dbf9695e16fdf23581b831d1b76f32a5b9f47cf82c6430386646a4ad04a58d61bea08ba032d0c4f779fd19d90d12270df317b719bad6cba63d921c197c87c SHA512 eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a241071c91054ff0928cc9023d2c79d1936588cdffa9426f4962b556e8daa1783add0c5ac59b5af
 EBUILD minicom-2.7.1.ebuild 1293 BLAKE2B a87e5da4ce3f9039a5ac94aba035d9a60d9c461c1231a7f55f5663861f06966740c31e0d93949bd505fe7e4ca90412153f0eb1a33de69a61acb5ba5756cb9679 SHA512 3ac2a434c5db82be96d557f5349262038117c994fac5acb2aa19d69c1b4139f2784c701af0df3aaa2f88f10cfe0492d7ebe6716b97188222c7972ae52bcd4e8d
-MISC metadata.xml 456 BLAKE2B 9db6bc0deb96356565bb4bb74196b1a821bddd6dc7d5129a09f1fabe9d7aa9719098d362d95b60f8b18a282b80dba1155d144cd2c959579db0de8c1f91493b97 SHA512 9d7b2e8de12baea7bbc03a2031caf9e791b1168eb70a8100edbedea42344a26421e7f8e11b114ff86677799583d471220da2973c1395a0fe13d9f33b3a22c336
+MISC metadata.xml 552 BLAKE2B 08dc7635a7842cd0e8a601a303a05fafbc141ddfd3c8ab505a7dd2f83773fdd933b23d11eb2bc02762da4ab9d0f38636dcaacb42c7fdc2bc4085ffd4fa1ba352 SHA512 da0850a93f06da092c90434b64be1776b7357c099c8ca4f87d37aa7f07dc985fa4539793c446c1fb6774c55ba0b56d2e445cf5446d6d02abe6386b488040a9e8
diff --git a/net-dialup/minicom/metadata.xml b/net-dialup/minicom/metadata.xml
index 6c2a6ce03ca7..acd06db32225 100644
--- a/net-dialup/minicom/metadata.xml
+++ b/net-dialup/minicom/metadata.xml
@@ -9,4 +9,7 @@
     Minicom is a menu driven communications program. It emulates ANSI and VT102
     terminals. It has a dialing directory and auto zmodem download.
   </longdescription>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:minicom_project:minicom</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 3c4d7e6c54cb..6ae46d61e444 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 74cc4fbf015c..f07f657c052b 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -9,4 +9,4 @@ DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc8682
 EBUILD avahi-0.6.32.ebuild 5485 BLAKE2B a16979e77772ecf824dd03db48ae39d9c3ad8bba89211cc7c15ed3bec0cb57db0a793b14f3e0d55ff5afb52312fda6b8e5ca77ea17c1830f3be8a21d1cd9e6f6 SHA512 2290435448ddadfd4bc4b48b40e6cd2bce036e0022c20f717d5d782f7622627ff6116cc2057642a8a0291f17afb207182a0fd3ce1ec1c68313f9342350e51c41
 EBUILD avahi-0.7-r1.ebuild 5143 BLAKE2B 49679babf67928cbc925042e890abcbb60d97c7c967964712673a39a79dff3701dd05f53186b611c58c7d8df3d0d62f940c7306e17f91b0934494252ef833474 SHA512 6caee5018f83eb7a8b51bf5656c345ce36f5dcffd714bcdf318b82830381cb33711db62eed94c76e59e5577521e3daef58ac2761fa95caf65306e42c2697cef1
 EBUILD avahi-0.7-r2.ebuild 5123 BLAKE2B ee26ad8c2088ec3ecf0602955bc69b8294fca639030993c028f196a979cde210bd7cb4745528a97e7f9036039dd3c52547b96295e7834a44cdeb37db926bdba6 SHA512 7f9850f51b66538ae2b841683c3642a25cc03915bad5dba5d48aa6b341b857ee1b4478f66259c0570ad6e9b44c92ecec9c8acd31fb9ce257e2a8aa1515384fec
-MISC metadata.xml 970 BLAKE2B 26904ceb3a89833caa77e2315d99be8ef729277a021faa3800a1cd0abe94c516d53176e65668d00687a6bb6ee807a2011106268f14a4d5012c27132e4fca4f3c SHA512 b9498d4757b6bd793846e4cbdd5c37da601a8e1430cafd1a6039ff54f8ff10576684c58801ebc679061f975cefa5909c94c30976e84354a5fcc7d2a586f7fa8e
+MISC metadata.xml 1025 BLAKE2B 6a13958a5fafd973058008477fe96575956dde8888c555eb5dfc9382536a637b1f659494a164f7973dadf8a37420cc1b586f63ab2e418b9aea8bd44aa90c0250 SHA512 2f22fbed84d4e1b1f85523f3a2a4b43678ae76b9300e0c43dea561532f392c4370fff25ebfc04537423736e7059f0f606c25ade7e37410449ba9f0c8216c27a3
diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index 046761ce22c0..aa917b89cf2f 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -20,5 +20,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">lathiat/avahi</remote-id>
+		<remote-id type="cpe">cpe:/a:avahi:avahi</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index 6a35afae58d5..b9ef98965173 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -1,14 +1,11 @@
 AUX coredns.confd 39 BLAKE2B 5db4c5b9e992dc7beff0ba80a7cc5337d5ddad132c2467b64b5214d9e4fabfaf1821bb61e727a49d052196f64bf2ece1f40f4c665d8ca53f17a98d2251c0731e SHA512 ade2ce80cf2a1f0bdc5d2de3a80194973289e3d62cbd349cfc7f03fa3bc8c3afc95a7a8dc4a46eda0c401239c226c55acb50b71d5596ed65e9afc56be6dfbb97
 AUX coredns.initd 497 BLAKE2B 3e29d701123c0b039312c9d7306aa81aecbbec3dfa654da382ae9598b3bd6c2b3e224d0faef8549d37606055a49e9d78413e7aff552148bc417cebf3ecd5d960 SHA512 afc2a20c1a2918292931cf27446ac817df1a9e88a4c3ffe7fee50c4424c1c8ae7dd084753a624d382ad2158020fb565ba6151c3eaca2ff4d80c9640e566529a1
 AUX coredns.logrotated 81 BLAKE2B 7fe70e32133a9470a60834dee5632151ed215e478a9de697dbca3ee553e5a8719bc941251c6a37723625b7c59f10f5050c79edb94ac8d4127561c12813ba6a27 SHA512 c697c08c3b1153ae224a1eeb3521f9ee594de4852bc6ef78d94dc7f6f680517659a653ab5c13ea03918deb79e6654ef11512ba4c90fe06ea4591fefbab876ece
-DIST coredns-1.3.0.tar.gz 6503544 BLAKE2B b285743b2aa41c29f7c6e77615205ba09d856914d592e1906de36c60048ac0342416d3719b36a7dda635a0801c3a78478f6e07dc98e908b88f34410db7db5937 SHA512 d525ea7f224343f677842f17939207bf7719d81e21015c1e4ff298627d14fcdd9e8bd93833d28929ce19e782857018f45eb0be07d73926edc5ec54e3071b96b3
 DIST coredns-1.3.1.tar.gz 5784513 BLAKE2B 4f04bd338939732fa284901e60b094d555b186c9c701a849aef7416e020aec6f7eccb9ff4654e08cd1daf0b130ad103ba2b3d11ffaf1810029aa049e6e69a6bc SHA512 0992f6fff08aa0a91b0be3c03b54a23f50d5a6dcba63f652c6d65cf925b900826b1b711f7621402ec059152e4fdd01e0d2f8fee4a1e414aa4fd2b12ad6e7a13a
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
 DIST github.com-mholt-caddy-6f580c6aa36c54c3e1c65b5c609550a8a2508e3e.tar.gz 2918590 BLAKE2B 44e50f98c48687d0d5a2155bb7f093ef7e18b6a0f0a23186ee6be28866b9e7dd79a8e0b5223f8a2250f710b2d290d7274195cdaced8b25eb6c478c7e00a2dc43 SHA512 ebf7dfa6376d9bf9f487919a630148c9870fadc23beed12b70837ed73b72852bb0373407f3e994903bba2365ce1233f79c786465f2bc1c99f64718dd8e14d844
 DIST github.com-miekg-dns-56be65265e34e731425e0269a301774938827c60.tar.gz 3885474 BLAKE2B 7de6f916469ccd9a09fbfbf90feafdd47aab7484542167cbb6ab3ba6051f55e77f9691851adbc0fa285f3463200f09da4c752a643fc79f1fe48e4db48068aca3 SHA512 ae001df0d4b1c692f6c35c02bd67cd1d91b19d8cc1e92cad9f2253e21a0c1b88bd7b6b7b150bb51e551ffee31241d1e6bd736606a1b8305b1c65165c91b0c39d
-DIST github.com-miekg-dns-7586a3cbe8ccfc63f82de3ab2ceeb08c9939af72.tar.gz 3886474 BLAKE2B d844c4c6c5749c7fde4712ed87f2bda7f8f048a1694ec8f22e811b4c0d1e8b2ceffba88921ecf965efa65d7290c436744ec17cda3f00ed3df3aba08bbc6be796 SHA512 63f08795063d48a15bae40c55d5edd997b1b341dead43c908fc9b9be71c7876c19f28965d9dc58b81ce48eeefcf09e3f1832141b6e2e3850e138dd727f64995d
 DIST github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz 130114 BLAKE2B df1149ebda18c7940ea35fbe09b08be6437a8d4c4f812e3b4b088da8a374718212f0b10a153f3e04a6ffbe0bac109a92e5eca8b95814d221cd6a01d5fcfd48c5 SHA512 27a3cd10256ba6784b2f1318919ad6ce9e2a15c029c18961cd760a7569d5c683097c7407478b2ec96852163a321cda854aba18b0a73e0dda836480d05451bd62
 DIST github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz 61606 BLAKE2B f67de9c0f3e8d814bed1711f0e0771c13e7d4d8d9dcc67ede3615bb80f8a8f20bbcf9ef65e46dff4a41cc587ef10ad54ffdb6909fbe83f19993422ed5714dd81 SHA512 8cabd997ac2405fe53aa507b6755aff7aa4ae2a1fdb3711abfac5d29bdd369412a17359c3d9c3ebc4945d1b6310c2fadd25201ec7b040b20e2ac5d27b56c564b
-EBUILD coredns-1.3.0.ebuild 1325 BLAKE2B dd12e68824ba9d0d19888d1ae3b1243b2eb516f80e033d5c6f9ecc8e7628874383dbb2dd1ccf2fd33675f4647ccedb882853324a6237cae0dd6387fbb83e8d7e SHA512 6d9097ce0e665f3c6805edc1268280eaa8dabe762e8931bd3bca0257e8979c2497619fd0c42f3400b2a5e22319b45d4ead509ae4b1637b5e989f263aaae862de
 EBUILD coredns-1.3.1.ebuild 1329 BLAKE2B b3b7e499404ddad19ed072bba158a41adfa069034e68fbf4e45c7969c1b25ecb4e8f8bc751fd58ddee596189884a840d421d3fd580fd98c55620d0c22d1a72c8 SHA512 26599e042af39b5fc4aaa8292cb8268c135fc632533c920125f4516bea5cbb2afe60709db138156a8c066df51c5acc5837e8fdced80c4b0f00721218ca65a685
 MISC metadata.xml 252 BLAKE2B 7baf6a36298a65278df45bc6e36a8ad2e613e3442ce78d334635f1ea2550695e12883bf64e5648ce684803ed18014e70898f719db30558367e4012a63ca121ab SHA512 0b024640287c05805bfd170d1c38b1de9c1165ad20548d52a89650b39d6da814a27718d739252c2d2a57b8694ddae913fffc4af7bb78bb2a3985475a88c19d7c
diff --git a/net-dns/coredns/coredns-1.3.0.ebuild b/net-dns/coredns/coredns-1.3.0.ebuild
deleted file mode 100644
index e7bd00feea36..000000000000
--- a/net-dns/coredns/coredns-1.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "github.com/mholt/caddy 6f580c6aa36c54c3e1c65b5c609550a8a2508e3e"
-	"github.com/miekg/dns 7586a3cbe8ccfc63f82de3ab2ceeb08c9939af72"
-	"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
-	"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-	"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
-)
-
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-GITCOMMIT="c8f0e94026b5f3530064dd3266eef1a80e3b0f1c"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A DNS server that chains middleware"
-HOMEPAGE="https://github.com/coredns/coredns"
-
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -v -ldflags="-X github.com/coredns/coredns/coremain.GitCommit=${GITCOMMIT}" || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN}
-	dobin ${PN}
-	dodoc README.md
-	doman man/*
-	popd || die
-
-	newinitd "${FILESDIR}"/coredns.initd coredns
-	newconfd "${FILESDIR}"/coredns.confd coredns
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/coredns.logrotated coredns
-}
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index b34fb1bd58e4..5cc7d8b0e970 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -6,8 +6,10 @@ AUX dnscrypt-proxy.service 1198 BLAKE2B 14db1a48f94b07622e0f52d8510e6c1634013e66
 AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36
 DIST dnscrypt-proxy-2.0.19.tar.gz 3339713 BLAKE2B e65b5ed8243aa6cf471700c6edba6e843fdf6482443335ec74201363657b23a7c6e432318e4de508120b6210cecd02666d97bb62a5f2968ce7d4813518eb3997 SHA512 4501a64717c0f2a9313e9328340e466c9ec325d09ef548f6af9a7855ff3497fb741269a17b397a36e2a120519820378e9f98a6a768a3678ea8144ee4690364f6
 DIST dnscrypt-proxy-2.0.25.tar.gz 2596674 BLAKE2B 10947c9e496c47a565e62fb4ca6ad95679da0d237885fe09da367b501bf0dd228cb3d4af41b3527dca64665364527ec2db06afab2c209792409078debd7d3fc8 SHA512 74a47b013e15cbdcf8691bf3618cce40149f9832f6fc4c2cbfb6af2a72b4ecb52b068a150999771a77fcf4fdb49c64dabd127c5101ae29fb86723bc30c946133
+DIST dnscrypt-proxy-2.0.27.tar.gz 2478887 BLAKE2B e9cabd6bdb330c3174cb904951f9e1a0a5482b642d458dd9fc7cba8d05333e7d91c37d43fbd360d8fbcda1c5febd2e5d577e0e612d9c2211047ba2a047b929ef SHA512 68cecec0228b3f03d5c50576c7dec32c7474a22bd1740d43b29514b5a00f27376ed5236302fa68c493f0c188134855b277fbbbb922222937fa726783af3f7246
 EBUILD dnscrypt-proxy-2.0.19.ebuild 3057 BLAKE2B f624c0a34f235f9ed5c7bfd93e4c3f3284387d56ae594e27a51e541bfd56a19ea81fff955df3eb2442bca093c42f56b75759ebd325a972c05023e4e27f2f793e SHA512 6bd9621a4902a3de52b912f4bd3a0653cf42d74538a36328f558ae4d62f734e577ab90041d119fc6587067aa36faf5f52f0447e9c84f84fee873d748180ecdcf
 EBUILD dnscrypt-proxy-2.0.25-r2.ebuild 2818 BLAKE2B 68b69f308ceda1969bbc53f098a1a3ae0a04fe3029e38653993fc4899fe5d84956730ef4cc923ce041cc98cbe15559daa367fe901e125f5d69603ff0e8a40836 SHA512 786ff205b146066fb9d2d97d0d3d4f589a1d9523cc554633a738906a2bda435891af3b421985483d1a0e56731dc803f39e5ae9c8074d4297fae713c3822e4661
 EBUILD dnscrypt-proxy-2.0.25.ebuild 2760 BLAKE2B b5644b87589d113331e0d2bb902313481999e27d135df14ba0991c756eb4ecd3dc22e5d335ab794b980c540aa88c2ab92ad5fb9298e2fac18a397eb65d170065 SHA512 0ef7ddd2a4b6b33eed3bef91c9ef313c1e6d1f432f6d5de36fc4d908478b569e415c1eef4f5d53f3836bc337a8d93926f49526a5f964ae718b450ff17e6e01cc
+EBUILD dnscrypt-proxy-2.0.27.ebuild 2818 BLAKE2B 68b69f308ceda1969bbc53f098a1a3ae0a04fe3029e38653993fc4899fe5d84956730ef4cc923ce041cc98cbe15559daa367fe901e125f5d69603ff0e8a40836 SHA512 786ff205b146066fb9d2d97d0d3d4f589a1d9523cc554633a738906a2bda435891af3b421985483d1a0e56731dc803f39e5ae9c8074d4297fae713c3822e4661
 EBUILD dnscrypt-proxy-9999.ebuild 2818 BLAKE2B 68b69f308ceda1969bbc53f098a1a3ae0a04fe3029e38653993fc4899fe5d84956730ef4cc923ce041cc98cbe15559daa367fe901e125f5d69603ff0e8a40836 SHA512 786ff205b146066fb9d2d97d0d3d4f589a1d9523cc554633a738906a2bda435891af3b421985483d1a0e56731dc803f39e5ae9c8074d4297fae713c3822e4661
 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.27.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.27.ebuild
new file mode 100644
index 000000000000..694bc5d7c027
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.27.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+else
+	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+fi
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="pie"
+
+DEPEND=">=dev-lang/go-1.12"
+
+RDEPEND="
+	acct-group/dnscrypt-proxy
+	acct-user/dnscrypt-proxy
+"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
+
+src_prepare() {
+	default
+	# Create directory structure suitable for building
+	mkdir -p "src/${EGO_PN%/*}" || die
+	# fixes $GOPATH/go.mod exists but should not
+	rm go.mod || die
+	mv "${PN}" "src/${EGO_PN}" || die
+	mv "vendor" "src/${EGO_PN}" || die
+}
+
+src_configure() {
+	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
+}
+
+src_install() {
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
+	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
+
+	insinto /usr/share/dnscrypt-proxy
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
+	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53"
+		ewarn "please do one the following:"
+		ewarn "1) re-enable 'filecaps'"
+		ewarn "2) change port to > 1024"
+		ewarn "3) configure to run ${PN} as root (not recommended)"
+		ewarn
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "Using systemd socket activation may cause issues with speed"
+		elog "latency and reliability of ${PN} and is discouraged by upstream"
+		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
+		elog "It is disabled by default for new installations"
+		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
+		elog
+
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}
diff --git a/net-dns/dnssec-tools/Manifest b/net-dns/dnssec-tools/Manifest
index 55b37f6d4baf..c6a7cfad6275 100644
--- a/net-dns/dnssec-tools/Manifest
+++ b/net-dns/dnssec-tools/Manifest
@@ -6,7 +6,5 @@ AUX rollerd.confd 234 BLAKE2B 9a360e3c66bbc785b0a925991ae954e16808922b44a597949f
 AUX rollerd.initd 409 BLAKE2B d3f545fa48d061c0bff8d7a73352f4307678e14006ecb51cb78d32854685d422f269a436ab64307295aab700481bf601de5f3315b1677ac594319e341b15c423 SHA512 1d50ea92a5cd63f77bdf3c780cf33f1d540fc5dbcfd0bd5eea5cc1f156a15c872b2f6b3bbfdf57bb72a99527ce0a6d1bded254d153dc28df51bfab8e6dcd4d9d
 AUX rollerd.service 202 BLAKE2B 8d3841fdaa9a8a5503eba707e22ba66d62a5b28fea3ab1b7a689958f66dd4a3ae53a613f622093846f2dbfa1fdb52fc30bfe772def34d6180e88079b5b3d2bd6 SHA512 5eb0786a0fcad3fe88db3d2391a2ec3dd272818aed0c17a664fff7f126da467ef2e47671212c86c7cc27f0e62873c63968cdbdff6c561499639f8a608e93648b
 DIST dnssec-tools-2.2.3.tar.gz 42941393 BLAKE2B b7b6a54113fb5cf030bd60e18f5446b02d1ceba3564ac854b0305225672545e802fecfa1169dc81e68ffe195533e06082dc22500a51b48965aa9c0fc32c915ed SHA512 fd2467f116f77089bddf9311706f356957f4ae735d827d393534e4001b621c9dfc904ff3d4da698d37e8e97b1be9448ab2fd5455c124656399aac30f1f642baf
-DIST dnssec-tools-2.2.tar.gz 4430138 BLAKE2B 52683f19d66066b2938ef3667d066a6ab59b4579cb2cbba87c79b42700d3f70bfe84c0f712bca607ee3023d152b16b0ba1a9635e7779cc61aab7a2c8f9d05830 SHA512 5d0d936a2dabc648033cbd74ff6f1b309ae66bf3f2ab1223c8be5879fa4385bfdfd8cee2b4005b0d0e7ed85eeb1b81a9a4092d300fa725d4b19a84bf2619a280
-EBUILD dnssec-tools-2.2-r1.ebuild 1743 BLAKE2B aa9d666f251118863a65410ec534219732cf07a2794c290e231492e3908a179f1d8db3a4d9a467a233b1707d96b634e1bc458af61b0c86857d9955cf3e4d288e SHA512 74c273b9f4e55ed261450ffcf1b4b8a5bb45d248040e75e6167e257c6eb008452f64b1283e8c3fc8a4dab39cbaa2fd4f478a9e9c164a09d794877e4af8e25628
 EBUILD dnssec-tools-2.2.3.ebuild 1841 BLAKE2B b39a326d15fb4b5c321882f44884812b426c10b0d5cf015dd992edffeebd489e830fdbe20597dcbbb152f5ef2cd9f464ffcca4799e4664cddd0394127af14fc3 SHA512 4a1bcc954ef7363a4558105834abf481829c0f7ff31cde5a6ef8645b4e642a206fc447544ec9e72ee8a97dd73578ee070c2b0721f31fe292e9a4ffca585fb1c7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild
deleted file mode 100644
index f4c7cf6da527..000000000000
--- a/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1 systemd
-
-DESCRIPTION="Tools to ease the deployment of DNSSEC related technologies"
-HOMEPAGE="https://www.dnssec-tools.org/"
-SRC_URI="https://www.dnssec-tools.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Crypt-OpenSSL-Random
-	dev-perl/Getopt-GUI-Long
-	dev-perl/GraphViz
-	dev-perl/MailTools
-	dev-perl/Net-DNS
-	dev-perl/Net-DNS-SEC
-	dev-perl/XML-Simple"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-dtinitconf.patch )
-
-src_prepare() {
-	default
-	sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \
-		-i Makefile.in || die
-	sed -e 's:/usr/local/etc:/etc:g' \
-		-e 's:/usr/local:/usr:g' \
-		-i tools/donuts/donuts \
-		-i tools/etc/dnssec-tools/dnssec-tools.conf \
-		-i tools/scripts/genkrf || die
-}
-
-src_configure() {
-	econf \
-		--disable-bind-checks \
-		--without-validator \
-		--with-perl-build-args=INSTALLDIRS=vendor \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/rollerd.initd rollerd
-	newconfd "${FILESDIR}"/rollerd.confd rollerd
-	systemd_dounit "${FILESDIR}"/rollerd.service
-
-	newinitd "${FILESDIR}"/donutsd.initd donutsd
-	newconfd "${FILESDIR}"/donutsd.confd donutsd
-	systemd_dounit "${FILESDIR}"/donutsd.service
-
-	find "${ED}" -name "*.la" -delete || die
-	readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please run 'dtinitconf' in order to set up the required
-/etc/dnssec-tools/dnssec-tools.conf file
-
-DNSSEC Validator has been split into net-dns/dnssec-validator
-"
diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 9f4e0d1ad0a2..0e057371fdf5 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -4,4 +4,4 @@ DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21d
 EBUILD libidn2-2.1.1a-r1.ebuild 1319 BLAKE2B 15d25cfc11f73533d94bdd40c20bb3bcf313c7b79e3a2750b12af32f712b0156469b4a1198ab3f8653246ef19e1ebccb29a3b8f0bbf04d2ed0a4261b3497cb91 SHA512 a5c09aa232d92230a4ed703c8ca022b387fd2c2e9afd287f0bfa69912c97210fc79da5876b520d573dd7983604967e89a62911ebbc82d3462bde4736f0bb2b7d
 EBUILD libidn2-2.2.0.ebuild 1332 BLAKE2B 9ebf852e6f4af2212e70e779990586d1632483b204dd84c34f0773f19fbc76462fe6023fd7799431c2efb1dcb9c8254fdc658af5c8e52aed31faa324cddf883b SHA512 83050754150dfebea699555702da010a58c3e89f7287e9bc22c88f458b7a9d81b81e0db18dd95aff7f4aa84e7f503b5cac4453981fc540fec79e0b53d631b24f
 EBUILD libidn2-99999.ebuild 1416 BLAKE2B ea56153f0eb2ca68fcd2fd170e2cfeedc8399a3bf5ba78d8bc78250ebbd59dd05e4074dee3bb4d3caf67b4c3391de331a495423d0f0cdc16c953fd4fa75ea278 SHA512 66f96b4e87d01dbb779d29ab83cfe6c1e756dcbc5db1555ca9128f0faa7888156c45e71befb2daa45c86aa77afeb9bdd6551b6336b955f57fb4179d1b2c6e512
-MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
+MISC metadata.xml 298 BLAKE2B 10b6250e87ec67fff437294893f9ac1a0c923b6c2bf69bc0462698632fbed280538f547a920cba9e8a1175534ad35a5a5d8d0d48f6824c378c46d34f91787712 SHA512 fb859efba7ea8f760f3d3f341496feeda5f8af633f40d4785ea738037017eae89060555447ae29abe69c0acc6f911a323aaa94dfc39f34e6aa9996af506372c0
diff --git a/net-dns/libidn2/metadata.xml b/net-dns/libidn2/metadata.xml
index 5ba62861f1c4..87360eddc9b2 100644
--- a/net-dns/libidn2/metadata.xml
+++ b/net-dns/libidn2/metadata.xml
@@ -4,4 +4,7 @@
 <maintainer type="person">
 <email>jer@gentoo.org</email>
 </maintainer>
+<upstream>
+<remote-id type="cpe">cpe:/a:libidn2_project:libidn2</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-dns/rbldnsd/Manifest b/net-dns/rbldnsd/Manifest
index dedda795e839..9508e52a8e38 100644
--- a/net-dns/rbldnsd/Manifest
+++ b/net-dns/rbldnsd/Manifest
@@ -4,6 +4,7 @@ AUX rbldnsd-0.997a-format-security-compile-fix.patch 914 BLAKE2B dadce821f6d1d06
 AUX rbldnsd-0.997a-robust-ipv6-test-support.patch 10867 BLAKE2B b2470f4a364c490b01cc8c2349d18d54ce6bc44f0113883bab763742cd798a0edec8add591a716ea99ac2d121bb1070bda1109d40018a91c162aaede3a2bc31d SHA512 a502df0c102a92dbccba482741ef628cde409f6d87d8467b66a0e4f595f8b28b9e99db0832ca27e3dbf317018b33f666b8bb8962988177cfaf1e0d28b6bf21d6
 AUX rbldnsd-0.998-fix-huge-zone-OOM.patch 1659 BLAKE2B 310b0b0851a09b5161919ce5a7fd97bb57c6ecbc1d87780af04c31214c72d25ca5d9dae481a46d1e5ccec4c5ba7b04b2b216a8ed104eb2af47b95771e32fa1b8 SHA512 2342d29322e6a5b726319a60c54a7f8d19b020e3dfc8a9d236ac7b6a55d9755b9afe1505c2f835604016fb899630074090baa737b2d3a24f7b4d4e4d911b0443
 DIST rbldnsd-0.998.tar.gz 145363 BLAKE2B e698f5b99ed1deae1aedda1952c19eb6189cbdcc71ecfa043faada966d30eee93e158dfeb059603dc493a665a7c56c84ff6ee636fc9eec7de38eb0bc73ed26db SHA512 7b6fb106f8188b2ce6e05b622cf90a393a4642f00faa5bddc184ce02dbd2beee9d8de22cb09ae53a25c475f28f99d13fbf6252f0d4c1d72bf47ba23f769e7074
-EBUILD rbldnsd-0.998-r2.ebuild 1568 BLAKE2B c4983b42897a54744ac13f1393a0ffad8cbd9e878bb943d05a23e2b8fff72c3cab233258d667993368d2a879530b9bb6e09457fe81a1388dd81ad276996350f9 SHA512 4d027da14375e3d51a9fa8d9bc10697996c5ff5a68ba75d322c02b7ee8ddce062f993cec3ca2070fbd6d8f2d8452c99529e7d5b7e9a771b34dde110c43298b76
+DIST rbldnsd-0.998b.tar.gz 154022 BLAKE2B f0bf03bef69853d45c3546c6fd3e58ffb95e76192ecb64f71f6799c6041749b1d117bed2bb21edbf1dec81d1684334b3af7d60b35d49089efb3a5e28752be6db SHA512 9b9c8694824a99b4ad120a22dbe4b05351867434e43ed0d8137990d3ece90ed67349965b6ed0450066d6663c1858545774c733b0d7afff304095de500ba30175
 EBUILD rbldnsd-0.998.ebuild 1550 BLAKE2B aef0a1798de7b636f6f0d2bc7c46607fe321eabd3e0db3bc6820ba1ebaea6625ca002128422b44e21b65b0f9b4c9ecfb02cbfad64c4ccc7ecc2695bbc0cad496 SHA512 0035d4f3a4119a03cb7f102ae63a25ef09d85e216dae8fd847a050b670ac281b624fa4873fe6d4cc0454c4e67d891748509a4f0f2180bdb932def5ccc7aa999a
+EBUILD rbldnsd-0.998b.ebuild 1458 BLAKE2B 81fb2726eb6b4b86b180870743d512cc336b62fc488f140461a776c4beecbac72fc45686668759732729a68609a9c77997d40e73d6505e79856edb050fdd154b SHA512 176492ba596b13ee7003fb056149439bae7b1662a8adaed50b7c050e0452aac230fbf663f8031f9983abae696718e6d8c0da75ec5ca06deb5c4002bfd0a75314
 MISC metadata.xml 1219 BLAKE2B 78d1de3d2e056e8d1441e929686a9cf1d073348f2b58ef263ffee7c6e9c03ad59b387c6112fdcb845915b1d5f41eaf6825f21510e7d085852ab49567412eb867 SHA512 23bddced94702b936cadbaf9a6a51cfd8506715a766cbef9dbb0fb69bf02443e0c8636b6237f98fd3922d0c43fb17c7c2850074e6bdefc2c9af3731a01971f8f
diff --git a/net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild b/net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild
deleted file mode 100644
index 04537f305756..000000000000
--- a/net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs user python-any-r1
-
-DESCRIPTION="DNS server designed to serve blacklist zones"
-HOMEPAGE="https://rbldnsd.io/"
-SRC_URI="https://github.com/spamhaus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 test zlib"
-
-RDEPEND="zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/rbldnsd-0.997a-robust-ipv6-test-support.patch"
-	"${FILESDIR}/rbldnsd-0.997a-format-security-compile-fix.patch"
-	"${FILESDIR}/rbldnsd-0.998-fix-huge-zone-OOM.patch"
-)
-
-src_configure() {
-	# The ./configure file is handwritten and doesn't support a `make
-	# install` target, so there are no --prefix options. The econf
-	# function appends those automatically, so we can't use it.
-	./configure \
-		$(use_enable ipv6) \
-		$(use_enable zlib) \
-		|| die "./configure failed"
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
-	emake check \
-		CC="$(tc-getCC)" \
-		PYTHON="${PYTHON}"
-}
-
-src_install() {
-	einstalldocs
-	dosbin rbldnsd
-	doman rbldnsd.8
-	keepdir /var/db/rbldnsd
-	newinitd "${FILESDIR}"/initd-0.997a rbldnsd
-	newconfd "${FILESDIR}"/confd-0.997a rbldnsd
-}
-
-pkg_postinst() {
-	enewgroup rbldns
-	enewuser rbldns -1 -1 /var/db/rbldnsd rbldns
-	fowners rbldns:rbldns /var/db/rbldnsd
-}
diff --git a/net-dns/rbldnsd/rbldnsd-0.998b.ebuild b/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
new file mode 100644
index 000000000000..27c112013d70
--- /dev/null
+++ b/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs user python-any-r1
+
+DESCRIPTION="DNS server designed to serve blacklist zones"
+HOMEPAGE="https://rbldnsd.io/"
+SRC_URI="https://github.com/spamhaus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 test zlib"
+
+RDEPEND="zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/rbldnsd-0.997a-robust-ipv6-test-support.patch"
+)
+
+src_configure() {
+	# The ./configure file is handwritten and doesn't support a `make
+	# install` target, so there are no --prefix options. The econf
+	# function appends those automatically, so we can't use it.
+	./configure \
+		$(use_enable ipv6) \
+		$(use_enable zlib) \
+		|| die "./configure failed"
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_test() {
+	emake check \
+		CC="$(tc-getCC)" \
+		PYTHON="${PYTHON}"
+}
+
+src_install() {
+	einstalldocs
+	dosbin rbldnsd
+	doman rbldnsd.8
+	keepdir /var/db/rbldnsd
+	newinitd "${FILESDIR}"/initd-0.997a rbldnsd
+	newconfd "${FILESDIR}"/confd-0.997a rbldnsd
+}
+
+pkg_preinst() {
+	enewgroup rbldns
+	enewuser rbldns -1 -1 -1 rbldns
+	fowners rbldns:rbldns /var/db/rbldnsd
+}
diff --git a/net-dns/validns/Manifest b/net-dns/validns/Manifest
index e35fa1c9a3d7..7328e32f1e2f 100644
--- a/net-dns/validns/Manifest
+++ b/net-dns/validns/Manifest
@@ -1,5 +1,3 @@
-DIST validns-0.7.tar.gz 185377 BLAKE2B 53d1607062e4d6669b82bc5bfa3ff987eafabbb9d8a2b3005cdd1f5c5f1c2e29885de80c0b859cb22776d04f07c701ac8f8ffc4b7bfb6feb9eb411eab476acf2 SHA512 2309aabdf863ff51b035ecf4536f2499d9373aed057a07546bdf4498c06c8e6cb36fc8094a8e3b26b49bd12c245ea705421744b354e46c3cc3927f6c3b33e72a
 DIST validns-0.8.tar.gz 190325 BLAKE2B cb1f7200aa9256e24bc9c9d071c4680e22ef436dbe997bc0278331b76131070d3797012d0f40f7bd66f5cfa2c8b8baef80753764caf758351a41c27f8cc59030 SHA512 2443bb8a7373f27d41ab3be1a92b61696d05b74afa42c19db54f6e999e4a634499faa44a5feefd3bc515bc677a8ef0a076092cf13316eff6d1cc504ff9702038
-EBUILD validns-0.7.ebuild 526 BLAKE2B b108891333f275e69e8320e136dbe42cd491f07ebeb842ff2a14b471acb51d18c84d9adf3bb3600372ccc9502d49211e8456b628a6282cb9472e1c95b33c6582 SHA512 301fb91e5dbfb030f3cb16cb5e3a4ee07a8692e600b6a33ea049250ae430c751d50ed1e2945ead284795c4b19091f7de9fa74a7fcd000ddcc917a89e12e4fc6a
 EBUILD validns-0.8.ebuild 526 BLAKE2B b108891333f275e69e8320e136dbe42cd491f07ebeb842ff2a14b471acb51d18c84d9adf3bb3600372ccc9502d49211e8456b628a6282cb9472e1c95b33c6582 SHA512 301fb91e5dbfb030f3cb16cb5e3a4ee07a8692e600b6a33ea049250ae430c751d50ed1e2945ead284795c4b19091f7de9fa74a7fcd000ddcc917a89e12e4fc6a
 MISC metadata.xml 471 BLAKE2B bdb426332df401e1df1fc63668c077dfc5b4275ba7e9e1734a9a59e6cbccd433214323fc20a93eb3d570f653087250b85451f1402f1c8724a929ea98d98be6b8 SHA512 26c46b8856c214a71ac566859c44f7ed029d96d9e61f98094d9cce02201c3c4520986bd8aeafec734ecc6c89d95266544f21b0c58677c6411c49ff7e85f73142
diff --git a/net-dns/validns/validns-0.7.ebuild b/net-dns/validns/validns-0.7.ebuild
deleted file mode 100644
index b50c9ab0f8d9..000000000000
--- a/net-dns/validns/validns-0.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A high performance DNS/DNSSEC zone validator"
-HOMEPAGE="http://www.validns.net/"
-SRC_URI="http://www.validns.net/download/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-libs/judy"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-perl/Test-Command-Simple )
-"
-
-src_install() {
-	dobin validns
-	doman validns.1
-	dodoc {notes,technical-notes,todo,usage}.mdwn Changes README
-}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index c845c32d8bc4..56ab27d52281 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index bb0a84f6b801..592bfba18bc2 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -6,4 +6,4 @@ DIST conntrack-tools-1.4.4.tar.bz2 1010504 BLAKE2B 4190672f017f434b6b4a1841022d6
 DIST conntrack-tools-1.4.5.tar.bz2 479562 BLAKE2B 229531d1c6c237e539df5b83525dca5ce0b009a76a2a5f873282eabc73cc00095c15c686bc68f9364e81efc846bfa8eac8b08f7fd476199d10d0c25190ca2456 SHA512 480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1
 EBUILD conntrack-tools-1.4.4-r1.ebuild 2087 BLAKE2B f30c6468219e9020d40f73f5a2977d04825da1a7d2e6a9765c90a6b3104c8f4bfe7b49c9d4b234ca076f02ac252b72c27faab601dac06ab12e9a5f9bfe04adcc SHA512 6a0cc74bc6bd2e6fe30ecf4c54309d57ec4dd82d3189a890f2ce600ee9c73ffdb1c06eba081cf0ccb1bf39797a5676d7cc12d7317fea4633c0ffe157abc42e79
 EBUILD conntrack-tools-1.4.5.ebuild 2188 BLAKE2B 1faf2dc4138283ca08d36a9384d7bf4f88c2f5566f00a563e4779ec9dfb44a2bfca86bb1ba451b0a6d8d87a088f8dd86e670fccbc85bd4f93b1dd4eaebeb71b0 SHA512 3d72e57cd130c034f86176f6a583bc43ed7d063c203b3450bee2ca2f6afe3b130636d5e6f5399143ead765838eef10c5606e3cd789c98a50f21c96bf6b11711f
-MISC metadata.xml 958 BLAKE2B 61cf89e7c192b663fd573ba7be767cd359786ba0fff20e72212fbc24e07c0c69e3bc2ee2226d39ac1744620cb1f5c63a480fc073860af665064853f5b780332d SHA512 19c68ca3bc373de0b9d533c7a36cdbe1da52871fb985641fa725c6208ffc09536696b02cce37e836300a2809bab117be2f0046ef329d2a739de5827cf0ee189a
+MISC metadata.xml 1048 BLAKE2B beb5773ccddbbf517dd5a1e81672a502e3f728085d3c1128207bcd91c544dd8abc3fc3dead68c4bc44b86c3bda2c2f101620ecc86a03fae5c7231716c882f5bb SHA512 4fd1da860481f73d5a47422c93fb5051995884dd488b64d8cd80bc720f81fd37e15a9bb9b86192c37bdfdb024201f600900cd6bcf38b20979c40019b0b290338
diff --git a/net-firewall/conntrack-tools/metadata.xml b/net-firewall/conntrack-tools/metadata.xml
index b30175c95056..57e4187d1665 100644
--- a/net-firewall/conntrack-tools/metadata.xml
+++ b/net-firewall/conntrack-tools/metadata.xml
@@ -12,6 +12,9 @@ is the module that provides stateful packet inspection for iptables. The
 conntrack-tools are the userspace daemon conntrackd and the command line
 interface conntrack.
 </longdescription>
+<upstream>
+<remote-id type="cpe">cpe:/a:netfilter:conntrack-tools</remote-id>
+</upstream>
 <use>
 <flag name="libtirpc">Use <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
 <flag name="cthelper">Use <pkg>net-libs/libnetfilter_cthelper</pkg> for userspace conntrack helper support</flag>
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index ac79c8678730..8079815b6b8b 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -11,7 +11,7 @@ DIST nftables-0.9.0.tar.gz 417981 BLAKE2B 4dfba4d71928f1694ffeb4871353fc373d88e2
 DIST nftables-0.9.1.tar.bz2 764066 BLAKE2B 26b194d6b3b970c05348c32a3ab21e8c25fcdb0d09d3d6b467198ba23a5bb44e7b6450d3efb86c39a488df4a837885c4a1ab96c197d5449f7de49b7b18ff5f90 SHA512 e14b75197ba3fea2a46c090450bf8b45b39fdc20db67bab1d6919c90128dee8ea8bbe9508e070f86b22ec70bcad8ab584fb89630a2240f09683137471c77d242
 DIST nftables-0.9.2.tar.bz2 779850 BLAKE2B 40bf9ed956a126048f27b343afc7aa4f6e34f35dc91127402cb127903f8150d212c80491fef2b54c18a63ca065608521062b3f6a2dd78969bdbf4d7d8a5a751d SHA512 2d83b104af0d70f99a16c2e40afdb9bf89bd984323810e2895976c5e2e346bf09dd88850a391f295e335279adfdd39d34c13610cf8e6b801499dc0df2a5cecf6
 EBUILD nftables-0.9.0-r4.ebuild 2497 BLAKE2B 17916257a8fd7934348d4ceddcbead2c50a24954bff6b50e9f13ec5da2351935c3310be2c6749bfb94141523ca2157e6fe84d89bb7b56914f4f3a0553b7e58b8 SHA512 bf2036978cc0412b677c9117512db14c7344747e19f3fe1b2ef6a7d2b750cf64b33c41bdfaae55f8cfdda19c7f376faadd16a626816672a05b70b11d77231ffc
-EBUILD nftables-0.9.0-r5.ebuild 2875 BLAKE2B d8b081a9530c56d04a353b7512b405066bb0db152cbbcb375a2aeca7a84769c28cd78d50401abe71042bb4be51c4eb5ce660633fc682c22c0a0b0f97e4b8a93e SHA512 edba9fae6e9e0eb78cadeaffb65d26bf3373b219bdf1bf3548495b23443949d2007a033805d310d9f963def5dc3edcb95e13677f551b1010eaed95f791f11d72
+EBUILD nftables-0.9.0-r5.ebuild 2873 BLAKE2B f32da6d6645eae17945567b9250f8f431c4179461dce15fbcc252e95eaf89b281ada733fcf6d90ccda32f392697bc90ea7a1f8fd26946ee4a122238e8a2ed4e4 SHA512 b6a348f7b2b61c108b3e565f98ae5424cf480134449b43c1dd573918cbb7031f1e3496e5f2f2131e449e1c0c24afafed3cf7d13187e355efcf2f4ed951421f2f
 EBUILD nftables-0.9.1-r1.ebuild 3813 BLAKE2B 3f9a5e868ec743ad2fb702d8fe07b2bb4e0bb5da6a34a4daf2b3ae69ea2bcb799c0093b2ced4884e4904cd032cdd50738db8b8167fefa3e8d5cf27d8942c7d8d SHA512 b3cd2e1acb1cfb01b9ef74ff37230c5b4762453639c06ddeba889d6b832a5adcc7b587143f02e20388afd989811243d504a603c5dcc99d1a068e34a7ef5d9e60
 EBUILD nftables-0.9.2-r1.ebuild 3716 BLAKE2B 89a0ad3d4adfab23299b1908d80aee7469e73f90ab3360524e7636f4f2025afc3bceefdd21d56568f2b4e00b9ff36d5c68c62999495aab5bfc0ba1344fe5e8b3 SHA512 638f9b38806ccd4279ce9038ccbd45925d10adf7311b52d555c4ba70ec29d97eb4f3d76a0afac2f22529940efc21264e68005ecf7cc0fffc2923c8a1a6f2cc69
 MISC metadata.xml 918 BLAKE2B 16404ad621319f8a8e93e39d8586aaadb0f6fc6989ee928605a8e5e00f581c5f84b11b9718958667a2f76722950a893e5d6097ff2f242961998ac7b092901489 SHA512 27413ba6b81e930b13ae55292d1c308b54b173cf120430d5462313cd8052834bd01e272978b3ba1d4b9f1be99215a90446b2e93bd0a502d328182706be40f02d
diff --git a/net-firewall/nftables/nftables-0.9.0-r5.ebuild b/net-firewall/nftables/nftables-0.9.0-r5.ebuild
index d98c11e37e4c..4875e3c743db 100644
--- a/net-firewall/nftables/nftables-0.9.0-r5.ebuild
+++ b/net-firewall/nftables/nftables-0.9.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
 IUSE="debug doc +gmp json +modern_kernel +readline"
 
 RDEPEND=">=net-libs/libmnl-1.0.3:0=
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 16104f2f6076..204103f6333d 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -15,20 +15,12 @@ AUX shorewall.systemd 568 BLAKE2B 385edad8857f029f691481483cc3e5e5981836254b7b39
 AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67a18be2465a1099b81f7ed89cc3c63d4ef550521d3b9e3cc995915439e21e1142f46f8df1e44e22b5c29009d5 SHA512 0bd832d4f8857bf9b1c9c776a53739d8666f002d1caab29c976a248916cf1eb5806d6b59dbf7ee8a120a3158b10e6fa6e179e34fe9fa6077a794ffa7d1e06cec
 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
 AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8
-DIST shorewall-5.2.3.3.tar.bz2 556424 BLAKE2B 0a172f0e70449af91421308c5308420a8de7af405eb74107201966b10df2fa7a0fd6042337c182bfa30a92cce3e611e46f8f5b910fb1bbc282513e3fc2d77d0c SHA512 d4166332160cbbc9e36f0c7f8fb6db8573dda17f80bbfb062465bba42f748c4f6815c9467da8a072b9eb01f3745fad67e00eea657ef61d9f90b49ad3a4668300
 DIST shorewall-5.2.3.4.tar.bz2 554090 BLAKE2B b7c5305a23c661d73dcce0d0b2edacbf7dcad911fe8cd7bb11dc34f860505aab5290f0ac9c3902ee5bba826335ec0b656a44b3580250dc6b546436addaad18c1 SHA512 e73fd31d4242823ad592b453af2ad47c28f0b2bfa6fe357f7b0f40f6facd20a293800ae48a8f9db4be68937eb957f24902966710ae1ca649204489f6269cc780
-DIST shorewall-core-5.2.3.3.tar.bz2 69043 BLAKE2B 6e84490258bc5cff88ef081bae11520463ff63a079fa8884d5976fa8c812d85e029636abe1092f2fd97a8529e935dc16f877cb75d7f9a3c0aa2236b2a9636d22 SHA512 c8c03273f686a8fa4151686b2426e437b3169ec78831e2d2f4a5bb20bb5265f4ede4a701bca5d21d0d8cafb4bb1e2c460c1b7ebb72ff042ec47221304dfbddd5
 DIST shorewall-core-5.2.3.4.tar.bz2 69744 BLAKE2B 14305bbd73f7f8fd5156a89bf986cbd5a1f4a3f511e8246659a132bc04d3f9ec3b3c6df4f4ced8e29b6034e690751c0dcd1ff8d28d6694528d704ed8ceedd33f SHA512 9fcc55d6eef1456cf3d45b87c29bdfc311e366837a91776519a158605ca2c012779851e94462acbe56868b8549d906f68d36b517b18e99a344cbb39f7127c649
-DIST shorewall-docs-html-5.2.3.3.tar.bz2 4303296 BLAKE2B 26fa00d1226fee0a60c5c352bb6d625a365641837a3e7cc9b0a9ec249f45926bb5230e53052597cda098e8bcbc171c9909b98436af75a3ceff6407bab3cbc8ad SHA512 e43c48cad4abb4e8455ff5f012af8cc466737b0c0ff130cadeb5860cee7f3fc38a7d6eacde5fa49c8afbbb6c49cc9df310eb9bcf992bb12422ade26ae003740e
 DIST shorewall-docs-html-5.2.3.4.tar.bz2 4292826 BLAKE2B ad5430fac374caeb00cab6edf0f5e9c7d72a5f60c39d43efb57013987eecc029283f698c51b82b577f708f64c39257f679c0c63c4d1879b95aa06e081c4275b0 SHA512 7c3fdc0603c4a8395a86234b982f984c01e131d6ab32a290477fc2ca081f5417dc943dd749da8f1ab76e0f5c0745ca99a6e5d3c3f03f4aa56720e7bf12f430c6
-DIST shorewall-init-5.2.3.3.tar.bz2 34456 BLAKE2B 5e7bf650de96973cfe211e4cbb9927c78a9cbae4a4436b8d556ac3df679a999294205f61532906dcbd0fa1027608dfa087b35c31bf64065cb0ccd6d5689905d0 SHA512 6c7017a6ac2df5611910132d9e5d2281b3210dda5e31ce26b15eed9ccd302ca9e1ddfbf92c093e6a751080e6f5a745516db2110bf30154f077d078b607087485
 DIST shorewall-init-5.2.3.4.tar.bz2 34827 BLAKE2B c57fed92734aa9f2e82b9f232568c7181c7ed2dd85257efd1a903747bc6c15951f1ca5521019bc7afa8b1e3e135359e6fa8162ae2ca732a45f03e035a3d0251b SHA512 f22e1a06ee47feacd49add0f0d9cfd7746ed4db626e863c1d8bf0287a33e4a39f6579deb3af29d38c299e8adc35fa5c4b930ba07cad449b1dab87054780109db
-DIST shorewall-lite-5.2.3.3.tar.bz2 39290 BLAKE2B f499ead6ee21323847b314793cd3250c08eda5e66c335effd72d9df92629e041377cbace0a6a647f5f791489a50663570d79eca7b4c59e1b75d017e47af82706 SHA512 12e87dc80fc347dd8077c9de9d87435bfe689c9115a5e88460f46f58a406ed66ce67f9b9847960bc50bee09eba7f1fe526a871f4852c2978392e7c10929f6617
 DIST shorewall-lite-5.2.3.4.tar.bz2 39642 BLAKE2B 83181e5bedc92d0f7bc6854aa7efe49c05caf3de310a3d3fb5d24eac312f957e3ebaf092a9cf4fa4eb19b9e1b853ececd8b1f3ce64ce47e5b475669920f5464e SHA512 4f73c05f1163051a30c46e4c898622a41c623b8d895c5c819f06ab7d81612cb1d396cdc2dceb816c65a67a1a11642f2bc20f6a510c71f11fc11b4057af837d62
-DIST shorewall6-5.2.3.3.tar.bz2 190274 BLAKE2B be44782454dff686a769e0f84298d5bb6217a85953e67acc7d2df16bcb4ebafc0867c62fc308f24690ba1d3b71444779fd5df1c6bce6545e3f269b0efbe49bd3 SHA512 ceb887f479841ed4998e488019bf3ec6874585c552f67be60af39f6414b40d24e2f6595812241d2f5fdf021beed2e0e2af8d98b03cdc66e72c7aedecbad8d3b1
 DIST shorewall6-5.2.3.4.tar.bz2 190759 BLAKE2B ad4a8530341700c475f6fadc840968c7c11fe1841a3c68a1145de457092dadce9a6c6b8df7ca6cb39343d248b1b9c5f267641a62193a76dc41b2bf93d0fe6b01 SHA512 d9c73ac388b794a1714e4487ef805121cef5743c04f48980bad74fd805bd923aae35c678e47a605532634ef156c4ba983f0f63672ee704634bef636505bb7c55
-DIST shorewall6-lite-5.2.3.3.tar.bz2 39210 BLAKE2B de02932cfc5315f1db0a21b6ec2f20e393ab041c3634a2bfee3bb309de73614f5da0e8e60ced697d16f82ff19f8257e7fff943fdae983bf64e8b7a18d43811be SHA512 044d793bfd98c0698713adf2aea8837fac970f39956db6f44c9e5b68c4435c65ebf594f5c3091f58dbd3e4d34c2d178052c5af28b568f591c290359cc1418e61
 DIST shorewall6-lite-5.2.3.4.tar.bz2 39623 BLAKE2B fc7ee2d7eee5a4f50b53882ad0ced13893b5f3c4348214529791e7aeffc6662ec5a6e9cead676287be028a8575ccb083570606f12b5e6880848c7476ca90a382 SHA512 3acb0a11c175ec8fd18b48a164c53aedb9e65347e0ca985307624ea892e3609ef645e8b2659319e00757a42efc161a219691027163387da70c6db624d0d6739d
-EBUILD shorewall-5.2.3.3.ebuild 17106 BLAKE2B aa979e5dec0e76a93db5bb2a4671158e792bb76e23e0fc05460f3ddcda9d2638c5608eacd18822aaf8e0dd5ff314925494ead63b39060b131be5ab454b3bb2ce SHA512 8c881b26cb893c6f1660481334440225b7cbce5012f2fcf20e8cce8403baab12fa21ee489b287eb1604b0d85a05d05c1120fc51617a6001cd35fcaab61e09b43
-EBUILD shorewall-5.2.3.4.ebuild 16979 BLAKE2B be07687a0184b7c790fba59dfb2a1212503d7748e5772b5a959a04a0376c3fc89d827fdf5fd0666b066bc6d0f0add984955ccf6631f605ffff5c1fcd276e952a SHA512 ac4af4eee2c1d7bf44ed265d9541713f2cca27975f7be93cd302ff9f5a8c8b8c2b91ead699d4cf8b8c661801b6dea9e5f40e5d074835b7fc90a431dc1d7b69c0
+EBUILD shorewall-5.2.3.4.ebuild 16972 BLAKE2B b6391331228e5d0fc72ccd31474bb15f664366e7288d98f5cee5392cc55be5d8f3d82e38ab37d41a42fb055603b4bd5c166cdb980ffb8ad5522eb11767aff33c SHA512 92914339e37e3688236ae4cbde8efabc42434708db1f4dbd3695084fa1da10d9509ab373de72743776ac13cdccb750610c5a3725cbdf387585009b806eedcf0c
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.2.3.3.ebuild b/net-firewall/shorewall/shorewall-5.2.3.3.ebuild
deleted file mode 100644
index 14bfe9b234c5..000000000000
--- a/net-firewall/shorewall/shorewall-5.2.3.3.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info prefix systemd versionator
-
-DESCRIPTION='A high-level tool for configuring Netfilter'
-HOMEPAGE="http://www.shorewall.net/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +init +ipv4 ipv6 lite4 lite6 selinux"
-
-MY_PV=${PV/_rc/-RC}
-MY_PV=${MY_PV/_beta/-Beta}
-MY_P=${PN}-${MY_PV}
-
-MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
-MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
-
-# shorewall
-MY_PN_IPV4=Shorewall
-MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV}
-
-# shorewall6
-MY_PN_IPV6=Shorewall6
-MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV}
-
-# shorewall-lite
-MY_PN_LITE4=Shorewall-lite
-MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV}
-
-# shorewall6-lite
-MY_PN_LITE6=Shorewall6-lite
-MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV}
-
-# shorewall-init
-MY_PN_INIT=Shorewall-init
-MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV}
-
-# shorewall-core
-MY_PN_CORE=Shorewall-core
-MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV}
-
-# shorewall-docs-html
-MY_PN_DOCS=Shorewall-docs-html
-MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV}
-
-# Upstream URL schema:
-# Beta:    $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2
-# RC:      $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2
-# Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2
-
-MY_URL_PREFIX=
-MY_URL_SUFFIX=
-if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
-	MY_URL_PREFIX='development/'
-
-	_tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1))
-	_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV})
-	if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then
-		MY_URL_SUFFIX="-${_tmp_suffix}"
-	fi
-
-	# Cleaning up temporary variables
-	unset _tmp_last_index
-	unset _tmp_suffix
-else
-	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-fi
-
-SRC_URI="
-	http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
-	ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
-	ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
-	lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
-	lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
-	init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
-	doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 )
-"
-
-# - Shorewall6 requires Shorewall
-# - Installing Shorewall-init or just the documentation doesn't make any sense,
-#   that's why we force the user to select at least one "real" Shorewall product
-#
-# See http://shorewall.net/download.htm#Which
-REQUIRED_USE="
-	ipv6? ( ipv4 )
-	|| ( ipv4 lite4 lite6 )
-"
-
-# No build dependencies! Just plain shell scripts...
-DEPEND=""
-
-RDEPEND="
-	>=net-firewall/iptables-1.4.20
-	>=sys-apps/iproute2-3.8.0[-minimal]
-	>=sys-devel/bc-1.06.95
-	ipv4? (
-		>=dev-lang/perl-5.16
-		virtual/perl-Digest-SHA
-	)
-	ipv6? (
-		>=dev-perl/Socket6-0.230.0
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	lite6? (
-		>=net-firewall/iptables-1.4.20[ipv6]
-		>=sys-apps/iproute2-3.8.0[ipv6]
-	)
-	init? ( >=sys-apps/coreutils-8.20 )
-	selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 )
-	!net-firewall/shorewall-core
-	!net-firewall/shorewall6
-	!net-firewall/shorewall-lite
-	!net-firewall/shorewall6-lite
-	!net-firewall/shorewall-init
-	!<sys-apps/systemd-214
-"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NF_CONNTRACK"
-
-	local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable"
-	local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system."
-
-	# kernel >=4.19 has unified NF_CONNTRACK module, bug 671176
-	if kernel_is -lt 4 19; then
-		if use ipv4 || use lite4; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4"
-
-			local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will"
-			local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system."
-		fi
-
-		if use ipv6 || use lite6; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6"
-
-			local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will"
-			local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system."
-		fi
-	fi
-
-	check_extra_config
-}
-
-pkg_setup() {
-	if [[ -n "${DIGEST}" ]]; then
-		einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..."
-		unset DIGEST
-	fi
-}
-
-src_prepare() {
-	# We are moving each unpacked source from MY_P_* to MY_PN_*.
-	# This allows us to use patches from upstream and keeps epatch_user working
-
-	einfo "Preparing shorewallrc ..."
-	cp "${FILESDIR}"/shorewallrc-r3 "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed"
-	eprefixify "${S}"/shorewallrc.gentoo
-	sed -i \
-		-e "s|SERVICEDIR=tbs|SERVICEDIR=$(systemd_get_systemunitdir)|" \
-		"${S}"/shorewallrc.gentoo || die "Failed to update shorewallrc"
-
-	# shorewall-core
-	mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'"
-	ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..."
-	ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-	eend 0
-
-	pushd "${S}"/${MY_PN_CORE} &>/dev/null || die
-	eapply "${FILESDIR}"/shorewall-core-5.2.1-no-gzipped-manpages.patch
-	popd &>/dev/null || die
-
-	# shorewall
-	if use ipv4; then
-		mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall.systemd "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed"
-		eend 0
-
-		pushd "${S}"/${MY_PN_IPV4} &>/dev/null || die
-		eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch
-		popd &>/dev/null || die
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall.confd-r1 "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall.initd-r3 "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6.systemd "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed"
-		eend 0
-
-		pushd "${S}"/${MY_PN_IPV6} &>/dev/null || die
-		eapply "${FILESDIR}"/shorewall-5.2.1-no-gzipped-manpages.patch
-		popd &>/dev/null || die
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall-lite.systemd "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed"
-		eend 0
-
-		pushd "${S}"/${MY_PN_LITE4} &>/dev/null || die
-		eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch
-		popd &>/dev/null || die
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-lite.confd-r1 "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall-lite.confd-r1 failed"
-		cp "${FILESDIR}"/shorewall-lite.initd-r3 "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall-lite.initd-r2 failed"
-		cp "${FILESDIR}"/shorewall6-lite.systemd "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed"
-		eend 0
-
-		pushd "${S}"/${MY_PN_LITE6} &>/dev/null || die
-		eapply "${FILESDIR}"/shorewall-lite-5.2.1-no-gzipped-manpages.patch
-		popd &>/dev/null || die
-	fi
-
-	# shorewall-init
-	if use init; then
-		mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'"
-		ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}"
-		ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo"
-		cp "${FILESDIR}"/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed"
-		cp "${FILESDIR}"/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed"
-		cp "${FILESDIR}"/shorewall-init.systemd "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed"
-		cp "${FILESDIR}"/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed"
-		eend 0
-
-		eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh
-
-		pushd "${S}"/${MY_PN_INIT} &>/dev/null || die
-		eapply -p2 "${FILESDIR}"/shorewall-init-01_remove-ipset-functionality-r1.patch
-		popd &>/dev/null || die
-	fi
-
-	# shorewall-docs-html
-	if use doc; then
-		mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'"
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	# shorewall-core
-	einfo "Installing ${MY_P_CORE} ..."
-	DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed"
-	dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt
-
-	# shorewall
-	if use ipv4; then
-		einfo "Installing ${MY_P_IPV4} ..."
-		DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed"
-		keepdir /var/lib/shorewall
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV4}/Samples
-		fi
-	fi
-
-	# shorewall6
-	if use ipv6; then
-		einfo "Installing ${MY_P_IPV6} ..."
-		DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed"
-		keepdir /var/lib/shorewall6
-
-		if use doc; then
-			dodoc -r "${S}"/${MY_PN_IPV6}/Samples6
-		fi
-	fi
-
-	# shorewall-lite
-	if use lite4; then
-		einfo "Installing ${MY_P_LITE4} ..."
-		DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed"
-		keepdir /var/lib/shorewall-lite
-	fi
-
-	# shorewall6-lite
-	if use lite6; then
-		einfo "Installing ${MY_P_LITE6} ..."
-		DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed"
-		keepdir /var/lib/shorewall6-lite
-	fi
-
-	# shorewall-init
-	if use init; then
-		einfo "Installing ${MY_P_INIT} ..."
-		DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed"
-		dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt
-
-		if [[ -f "${D}etc/logrotate.d/shorewall-init" ]]; then
-			# On Gentoo, shorewall-init will not create shorewall-ifupdown.log,
-			# so we don't need a logrotate configuration file for shorewall-init
-			einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..."
-			rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed"
-		fi
-
-		if [[ -d "${D}etc/NetworkManager" ]]; then
-			# On Gentoo, we don't support NetworkManager
-			# so we don't need this folder at all
-			einfo "Removing unused \"${D}etc/NetworkManager\" ..."
-			rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed"
-		fi
-
-		if [[ -f "${D}usr/share/shorewall-init/ifupdown" ]]; then
-			# This script isn't supported on Gentoo
-			rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed"
-		fi
-	fi
-
-	if use doc; then
-		einfo "Installing ${MY_P_DOCS} ..."
-		docinto html && dodoc -r "${S}"/${MY_PN_DOCS}/*
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		# Show first steps for shorewall/shorewall6
-		local _PRODUCTS=""
-		if use ipv4; then
-			_PRODUCTS="shorewall"
-
-			if use ipv6; then
-				_PRODUCTS="${_PRODUCTS}/shorewall6"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:"
-			elog ""
-			elog "  /etc/shorewall/shorewall.conf"
-
-			if use ipv6; then
-				elog "  /etc/shorewall6/shorewall6.conf"
-			fi
-
-			elog ""
-			elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall default"
-
-			if use ipv6; then
-				elog "  # rc-update add shorewall6 default"
-			fi
-		fi
-
-		# Show first steps for shorewall-lite/shorewall6-lite
-		_PRODUCTS=""
-		if use lite4; then
-			_PRODUCTS="shorewall-lite"
-		fi
-
-		if use lite6; then
-			if [[ -z "${_PRODUCTS}" ]]; then
-				_PRODUCTS="shorewall6-lite"
-			else
-				_PRODUCTS="${_PRODUCTS}/shorewall6-lite"
-			fi
-		fi
-
-		if [[ -n "${_PRODUCTS}" ]]; then
-			if use ipv4; then
-				elog ""
-			fi
-
-			elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can"
-			elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)."
-			elog ""
-			elog "To read more about ${_PRODUCTS}, please visit"
-			elog "  http://shorewall.net/CompiledPrograms.html"
-			elog ""
-			elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:"
-			elog ""
-
-			if use lite4; then
-				elog "  # rc-update add shorewall-lite default"
-			fi
-
-			if use lite6; then
-				elog "  # rc-update add shorewall6-lite default"
-			fi
-		fi
-
-		if use init; then
-			elog ""
-			elog "To secure your system on boot, please add shorewall-init to your boot runlevel:"
-			elog ""
-			elog "  # rc-update add shorewall-init boot"
-			elog ""
-			elog "and review \$PRODUCTS in"
-			elog ""
-			elog "  /etc/conf.d/shorewall-init"
-		fi
-
-	fi
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least ${MY_MAJOR_RELEASE_NUMBER} ${v}; then
-			# This is an upgrade
-
-			elog "You are upgrading from a previous major version. It is highly recommended that you read"
-			elog ""
-			elog "  - /usr/share/doc/shorewall*/releasenotes.tx*"
-			elog "  - http://shorewall.net/Shorewall-5.html#idm214"
-
-			if use ipv4; then
-				elog ""
-				elog "You can auto-migrate your configuration using"
-				elog ""
-				elog "  # shorewall update -A"
-
-				if use ipv6; then
-					elog "  # shorewall6 update -A"
-				fi
-
-				elog ""
-				elog "*after* you have merged the changed files using one of the configuration"
-				elog "files update tools of your choice (dispatch-conf, etc-update...)."
-
-				elog ""
-				elog "But if you are not familiar with the \"shorewall[6] update\" command,"
-				elog "please read the shorewall[6] man page first."
-			fi
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if ! use init; then
-		elog ""
-		elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot"
-		elog "before your shorewall-based firewall is ready to start."
-		elog ""
-		elog "To read more about shorewall-init, please visit"
-		elog "  http://www.shorewall.net/Shorewall-init.html"
-	fi
-
-	if ! has_version "net-firewall/conntrack-tools"; then
-		elog ""
-		elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\""
-		elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!"
-	fi
-
-	if ! has_version "dev-perl/Devel-NYTProf"; then
-		elog ""
-		elog "If you want to profile your Shorewall firewall you need to install \"dev-perl/Devel-NYTProf\"!"
-	fi
-}
diff --git a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
index 6effdd7a417a..a36cb7a7d14d 100644
--- a/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
+++ b/net-firewall/shorewall/shorewall-5.2.3.4.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 fi
 
 SRC_URI="
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 20ba865d65b1..2b21e13ba243 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index b963fc3d2ab3..0f9d9f520cb1 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -5,5 +5,5 @@ DIST cifs-utils-6.8.tar.bz2 384426 BLAKE2B 002518f44489aefc94c47a23438b176a4056f
 DIST cifs-utils-6.9.tar.bz2 400430 BLAKE2B fc8cc55fae54d84fc1f1d4a14a9d666d87a3da78d1502f0d72ac9cb44ff1424ca2c5b15b0be510579d4c9f5181980627efedd00e0e5cfb1b3e47188ba307ad28 SHA512 b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a
 EBUILD cifs-utils-6.7.ebuild 3226 BLAKE2B 4d0edab2d12ea2d8046995001c8c2bdc2d7ad580d901743e5fb5e104ae706768dd8f9ff0534b2b82cd6c5f36edba92d45b955e9602496befdc7bb1f561b51f68 SHA512 11d2651a795e9ff441bb4f80d02a6b568ad566190390477cc67dc5baf92fec15f8a1e195b291b2828bdb30b5dece1236ecffa907d5ef8c86a728ca43a0ec63bb
 EBUILD cifs-utils-6.8-r1.ebuild 3038 BLAKE2B c716960106acaa8a7cad9f4cb74ef9d5ae1c7df906728afb557baf909415fa78952bb06b83009c14eac739b03300ba40e67e6f6931969171f66640d2cd5b67ce SHA512 d5fd7ff2d03f6e21c413011855b61a79a64c2f9bcc90a7db4e4d0b49e863bac42e56b656765a78d172bdbf1071d89220d9ddb43b2ccb4071e40c842a1004855d
-EBUILD cifs-utils-6.9.ebuild 3006 BLAKE2B da015779271df5eeb6e043c3fc1c8e664444d640fae362a38a3e94489bb6d27825786f642f54eb820b54eca42e74d82a196b375cd8e79bd36e1083be789781fa SHA512 59d26ea7a68cfea6c8cf0ce0954ca58a925098e0809ceb93c7e9e8d5c75ed68c71c671e7d94d7d5d8f0ed9adc67ef49dafdae5bc1903f47cbe43e5c4d56dffd5
+EBUILD cifs-utils-6.9-r1.ebuild 3004 BLAKE2B da554ee7993f08792fbbcd4289b7461ef1dc099536e3ad39fa76d0319fb6ee07b038a8fa8d5bd09d9922e6c0747c1dbfdbbf3dfd0af8e4f581f262f3dcc7b253 SHA512 eda03ebd93597be1e963ee545520f18c87dc389210fb163cf5630aebbc03e1692f6da3ac20af903372bf4327d49dd36d7abfd3dce93f5b8a3ea8a4cf4bbb4b5a
 MISC metadata.xml 889 BLAKE2B 45b3f5f6cac2ca247c9d3a73d4f0e2703187e4a4eab2f850ef2f228489e365ac30d67d35187fab993af7611109c0e2a33bf8336e37496a131b641abade642ca7 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66
diff --git a/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
new file mode 100644
index 000000000000..588254fd776e
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info multilib pam
+
+DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
+HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
+SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+IUSE="+acl +ads +caps creds pam"
+
+RDEPEND="
+	!net-fs/mount-cifs
+	!<net-fs/samba-3.6_rc1
+	sys-apps/keyutils:=
+	ads? (
+		sys-libs/talloc
+		virtual/krb5
+	)
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}"
+PDEPEND="
+	acl? ( >=net-fs/samba-4.0.0_alpha1 )
+"
+
+REQUIRED_USE="acl? ( ads )"
+
+DOCS="doc/linux-cifs-client-guide.odt"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
+		ewarn "You must enable CIFS support in your kernel config, "
+		ewarn "to be able to mount samba shares. You can find it at"
+		ewarn
+		ewarn "  File systems"
+		ewarn "	Network File Systems"
+		ewarn "			CIFS support"
+		ewarn
+		ewarn "and recompile your kernel ..."
+	fi
+}
+
+src_prepare() {
+	default
+
+	if has_version app-crypt/heimdal ; then
+		# https://bugs.gentoo.org/612584
+		eapply "${FILESDIR}/${PN}-6.7-heimdal.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-smbinfo
+		$(use_enable acl cifsacl cifsidmap)
+		$(use_enable ads cifsupcall)
+		$(use_with caps libcap)
+		$(use_enable creds cifscreds)
+		$(use_enable pam)
+		$(use_with pam pamdir $(getpam_mod_dir))
+	)
+	ROOTSBINDIR="${EPREFIX}"/sbin \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# remove empty directories
+	find "${ED}" -type d -empty -delete || die
+
+	if use acl ; then
+		dodir /etc/cifs-utils
+		dosym ../../usr/$(get_libdir)/cifs-utils/idmapwb.so \
+			/etc/cifs-utils/idmap-plugin
+		dodir /etc/request-key.d
+		echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
+			> "${ED}/etc/request-key.d/cifs.idmap.conf"
+	fi
+
+	if use ads ; then
+		dodir /etc/request-key.d
+		echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
+			> "${ED}/etc/request-key.d/cifs.upcall.conf"
+		echo 'create cifs.spnego * * /usr/sbin/cifs.upcall %k' \
+			> "${ED}/etc/request-key.d/cifs.spnego.conf"
+	fi
+}
+
+pkg_postinst() {
+	# Inform about set-user-ID bit of mount.cifs
+	ewarn "setuid use flag was dropped due to multiple security implications"
+	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
+	ewarn "You are free to set setuid flags by yourself"
+
+	# Inform about upcall usage
+	if use acl ; then
+		einfo "The cifs.idmap utility has been enabled by creating the"
+		einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
+		einfo "This enables you to get and set CIFS acls."
+	fi
+
+	if use ads ; then
+		einfo "The cifs.upcall utility has been enabled by creating the"
+		einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
+		einfo "This enables you to mount DFS shares."
+	fi
+}
diff --git a/net-fs/cifs-utils/cifs-utils-6.9.ebuild b/net-fs/cifs-utils/cifs-utils-6.9.ebuild
deleted file mode 100644
index c757b0aed04f..000000000000
--- a/net-fs/cifs-utils/cifs-utils-6.9.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info multilib pam
-
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
-SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
-IUSE="+acl +ads +caps creds pam"
-
-RDEPEND="
-	!net-fs/mount-cifs
-	!<net-fs/samba-3.6_rc1
-	sys-apps/keyutils
-	ads? (
-		sys-libs/talloc
-		virtual/krb5
-	)
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	acl? ( >=net-fs/samba-4.0.0_alpha1 )
-"
-
-REQUIRED_USE="acl? ( ads )"
-
-DOCS="doc/linux-cifs-client-guide.odt"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
-		ewarn "You must enable CIFS support in your kernel config, "
-		ewarn "to be able to mount samba shares. You can find it at"
-		ewarn
-		ewarn "  File systems"
-		ewarn "	Network File Systems"
-		ewarn "			CIFS support"
-		ewarn
-		ewarn "and recompile your kernel ..."
-	fi
-}
-
-src_prepare() {
-	default
-
-	if has_version app-crypt/heimdal ; then
-		# https://bugs.gentoo.org/612584
-		eapply "${FILESDIR}/${PN}-6.7-heimdal.patch"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-smbinfo
-		$(use_enable acl cifsacl cifsidmap)
-		$(use_enable ads cifsupcall)
-		$(use_with caps libcap)
-		$(use_enable creds cifscreds)
-		$(use_enable pam)
-		$(use_with pam pamdir $(getpam_mod_dir))
-	)
-	ROOTSBINDIR="${EPREFIX}"/sbin \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# remove empty directories
-	find "${ED}" -type d -empty -delete || die
-
-	if use acl ; then
-		dodir /etc/cifs-utils
-		dosym ../../usr/$(get_libdir)/cifs-utils/idmapwb.so \
-			/etc/cifs-utils/idmap-plugin
-		dodir /etc/request-key.d
-		echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
-			> "${ED}/etc/request-key.d/cifs.idmap.conf"
-	fi
-
-	if use ads ; then
-		dodir /etc/request-key.d
-		echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
-			> "${ED}/etc/request-key.d/cifs.upcall.conf"
-		echo 'create cifs.spnego * * /usr/sbin/cifs.upcall %k' \
-			> "${ED}/etc/request-key.d/cifs.spnego.conf"
-	fi
-}
-
-pkg_postinst() {
-	# Inform about set-user-ID bit of mount.cifs
-	ewarn "setuid use flag was dropped due to multiple security implications"
-	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
-	ewarn "You are free to set setuid flags by yourself"
-
-	# Inform about upcall usage
-	if use acl ; then
-		einfo "The cifs.idmap utility has been enabled by creating the"
-		einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
-		einfo "This enables you to get and set CIFS acls."
-	fi
-
-	if use ads ; then
-		einfo "The cifs.upcall utility has been enabled by creating the"
-		einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
-		einfo "This enables you to mount DFS shares."
-	fi
-}
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 34c40be3e212..c858622e929f 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -25,5 +25,5 @@ DIST nfs-utils-2.3.4.tar.bz2 906900 BLAKE2B 968fac7b37c7311bc8d29667c88db925aac0
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540
 EBUILD nfs-utils-2.3.3.ebuild 5534 BLAKE2B e70b34817cd313721687897c29622f66ac3c1c2e347f71a3ef6763d4693c121866e21dee282a9499661db2dfcf27a33a40a90cc80fe481859b402753c0ab1816 SHA512 f5afca6badb7be19d708632a624d535ffdd7abad2fac6ccc59295061f9354c5db66cacb841001dcc2039f5380a29e4f56450105311d42c38b7b2c60786a7373b
 EBUILD nfs-utils-2.3.4.ebuild 5274 BLAKE2B 8ac149fa4f44491d101a7fbdd283f7b0bfc1db7183c2622d54f0e39f1a3b477fc0ce52481d6ee13478e03e0f6dec08d04507e775a3851aab80c0f11586c18ad5 SHA512 97b33afd3742f740754502d991dbc2d99ddb4c361af497db0bc2c026315354bb45e82625c68a7ef198aa7f6dced68b325f82521a482a8d434bca24faa992aeb7
-EBUILD nfs-utils-2.4.1-r1.ebuild 5894 BLAKE2B f9568ff4f507190f60bfbf728b19f6809b5752f1089700b8d2dbc18a61af469962ab1044044f004bb2b2510bba6e32753d124a91bf5b93ff651795f4148951c2 SHA512 e8489c99b89fbf51163f94759541532d88edd4f72b020b2927922e8c1de1586653133d90702a7aeaf9a62acd9c872b2a824859a5325b6b1d9864c4b25f2cf753
+EBUILD nfs-utils-2.4.1-r1.ebuild 5885 BLAKE2B a10469ff0db08c9f593395e78653da622b9c06fb12592a0d0c5586e5c110ca3bdec60e9565b63415f7210387b5746ba1f6481003785aaed934f22df16fa1567f SHA512 e2f57b4c9761201305e8f70e161fb9704cd10899d8673ed643aa969a400e79d1022eab1053935f8bbfba9933d92d09fb027ef5003c19f1617907733eded72b9c
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
index 3bb65dad7568..f836166582d2 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 6e635cc35d1b..273379669d11 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/bitlbee-steam/Manifest b/net-im/bitlbee-steam/Manifest
index b29d3c882420..afb7eb1cf28b 100644
--- a/net-im/bitlbee-steam/Manifest
+++ b/net-im/bitlbee-steam/Manifest
@@ -1,6 +1,4 @@
-DIST bitlbee-steam-1.2.0.tar.gz 40277 BLAKE2B b3b6cf1b675e68d543f06f712bf96df147789ff3dc1cf2ded4ba7ebacafe632e6f992712abd6082d6237d33044b7b5939c9ffb48f05702982eaf6e95d6c1dd5c SHA512 706f22193d7a22dcbcaa6a07d2dcd4707b666d9a831a9864949ce9a6f2a1db33d3a07f94b3cde9a8d6042fd53caa07b1f87749f87b146d88793578cca997adee
 DIST bitlbee-steam-1.4.2.tar.gz 43003 BLAKE2B e1c24c59d1d18a839760274b4f812757b1d5d36be489b49dc3dd3370fe8eea6483b089f506c5127c3b01f4529c83817b53aec6751150eaca87204b30cbb791e1 SHA512 c8acf584052246112b76c433e26805ade204802173147b9f1b73778f1300557df41ab97562a1cfbc20ad1bb0288718d62c03f90b7d11a9faf4d647938009ee48
-EBUILD bitlbee-steam-1.2.0.ebuild 693 BLAKE2B cfba09a3739b91f3971f87e49caaf53242f7639c8cede5ba9d77714d397e57ac5dd1df9a018fb4ab530df1e1ddece066b562f290921622ccb17dd90de794c150 SHA512 672393b2657d2335b1b9247c399782477a95d542112bc4f16637d55fb72cd45a2b0ae064a558aa12f83a6d2918ef45cc78083bba716a8ba780c75d2e704b002c
 EBUILD bitlbee-steam-1.4.2.ebuild 724 BLAKE2B 066a757102e0cff1894e3492b0d4a1cc3e90d270aaef97eb77ab39d560507b84ff2a271af04ba359d74c9387b2ee7c15732c0dcb0ffb190d0f6470f469bf161e SHA512 f3be5373d7341d3f91f3ef95ae7584bbf9ed0cea266c54d8f2fefab9ecc9de629835d6e8172ad1e0a35e800ade338a1e9506c9482515ab519f0c9d03f14905f2
 EBUILD bitlbee-steam-9999.ebuild 724 BLAKE2B 066a757102e0cff1894e3492b0d4a1cc3e90d270aaef97eb77ab39d560507b84ff2a271af04ba359d74c9387b2ee7c15732c0dcb0ffb190d0f6470f469bf161e SHA512 f3be5373d7341d3f91f3ef95ae7584bbf9ed0cea266c54d8f2fefab9ecc9de629835d6e8172ad1e0a35e800ade338a1e9506c9482515ab519f0c9d03f14905f2
 MISC metadata.xml 713 BLAKE2B 8b8342c05230287c99ccf5cfd3e1b70e5d1cf3ec3b9355ca039bb8225b31d34e1243482ff614f66e28ce2c0b54ffba1e75a6a6a919af103b7556a3f3e9a9bab5 SHA512 d71529cbf289d2e88c558f2285d7b2872c050e8d7374e802ef24994128be7a92a4ce2e67ee83024db082c86d9202a509cd695898e7eb36137f2d18198ef12067
diff --git a/net-im/bitlbee-steam/bitlbee-steam-1.2.0.ebuild b/net-im/bitlbee-steam/bitlbee-steam-1.2.0.ebuild
deleted file mode 100644
index c1a67487c02f..000000000000
--- a/net-im/bitlbee-steam/bitlbee-steam-1.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="Steam protocol plugin for BitlBee"
-HOMEPAGE="https://github.com/jgeboski/bitlbee-steam"
-SRC_URI="https://github.com/jgeboski/bitlbee-steam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgpg-error
-	>=net-im/bitlbee-3.2.1[plugins]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		--enable-minimal-flags
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index 92c51ee72212..86575fe7fe9d 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,6 +1,4 @@
 AUX choqok-1.6.0_p20190726-missing-header.patch 2633 BLAKE2B 337a69d5addaf10e55cda74d40f0ebf7e768be12cf9b9315a29b622fddb5e2ae0ade9107907b8be495ab285f8cc94bb556c1103191b884620e4469f9ec43c390 SHA512 31b87f27d697afabbc41516715e35b5c28a884db454275c22cc5014af965bcd8ba5faac7ef029754a9c706052972fac39df6e4320f346e450bb808a2f409932c
-DIST choqok-1.6.0.tar.xz 1170748 BLAKE2B 11d1546d9bdad12012860ad4b21ea988d21ce822e7afb246d65b27b7fe28620f390ee97e00e594102b173ade304adcce208a9092909ab0d3801fecfdcc309e61 SHA512 78c03689e40978213f2f9462780fe47507a2778985d4d5b940cab004f0ac52becfa76d7dbaa886df958134c65b27255e49ac68ddbb2a434131fffe9ca9280cbc
 DIST choqok-1.6.0_p20190726.tar.xz 1184148 BLAKE2B c0c0459de362aa58337ab2d0c4ea03ff516de87bded48f73c47aa48ed791cfeb82c4085c4d333bff4ac1489a27e038da29d5419569aacb17366dc119e776dd67 SHA512 6471d9b37cc78fd3a14cc970512db3a8d44b21d49efb503917a57332f229c34ed735edfea6a74d6c25d8ab8d153331226effd677405d447c4a2faea3e396decf
-EBUILD choqok-1.6.0-r1.ebuild 1735 BLAKE2B cb9ae5dd3846ccbb97c824daa3ab91db4d86aff61b68d1e23965a05996262e9d904a1cab2bdccfcad2d9febed7d832554c94d2a9ddabab70f1ac11acc1fb849e SHA512 eac4fae6a896ab75befd548942d9b2f6350b44376e48e380d4e2047186f43e25049545a2e3fe5ca6025928d40e8a1c3d13ff3a553ba2e1d9fb56f290d68933ef
-EBUILD choqok-1.6.0_p20190726.ebuild 1711 BLAKE2B 19591c6e47c2f4386125e54ec2f3941e40e3286cb22f4b38e5b982e859da5a8a7bdd54f5eda46cbe9e040076f371b88ba5caaf54d9347b2c18445137f378a7ed SHA512 8a3443ba418b1a2f99d2217c29a0804e89cc71cdc0753ea3911bfc366985baf9031ab0b3de15802690cf5365f5d4f4266def36d78737ecec2179bbed4f33a532
+EBUILD choqok-1.6.0_p20190726.ebuild 1710 BLAKE2B c1b3b77f807ecd7f54edc5e14383ebea1ed71762e4c13c19bdb7c77a87e3806ac04765ede8ec475aaaa315d4af7fbc068188d0ea87b694f8cd12fb39ec382392 SHA512 e9d28f3ee7938bf26522767f8c885586eac73a6ca82225c29af865bbbfd44b9094fb39d343db53b933ba1f0fb3cce79652752a3acc0bca20c7e1a927ef4020be
 MISC metadata.xml 534 BLAKE2B 641e9a82e273a88f4ad7babec0ed86995e0a40a08a3b41207fb2139991857d6cb14392070cb7e81b89116b9e0cbc6a1fc7c2a4a4a9bd2e2a0d11489dc6ea03e9 SHA512 57e46f814444e2072218a78f3a668d50f8cc6f2e67a7c4560c9d06e03f6846c462186199b83dd008ca06c419e8c7b42654dec6cc782e19af188812b9020301bd
diff --git a/net-im/choqok/choqok-1.6.0-r1.ebuild b/net-im/choqok/choqok-1.6.0-r1.ebuild
deleted file mode 100644
index 48d6fd598f2c..000000000000
--- a/net-im/choqok/choqok-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Free/Open Source micro-blogging client by KDE"
-HOMEPAGE="https://choqok.kde.org/"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="attica konqueror telepathy"
-#qtnetwork
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca[qt5(+)]
-	dev-libs/qoauth:5
-	attica? ( $(add_frameworks_dep attica) )
-	konqueror? (
-		$(add_frameworks_dep kparts)
-		$(add_frameworks_dep kdewebkit)
-		$(add_qt_dep qtwebkit)
-	)
-	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
-"
-RDEPEND="${DEPEND}
-	!net-im/choqok:4
-"
-
-DOCS=( AUTHORS README TODO changelog )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package attica KF5Attica)
-		$(cmake-utils_use_find_package konqueror KF5Parts)
-		$(cmake-utils_use_find_package konqueror KF5WebKit)
-		$(cmake-utils_use_find_package telepathy TelepathyQt5)
-	)
-
-	kde5_src_configure
-}
diff --git a/net-im/choqok/choqok-1.6.0_p20190726.ebuild b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
index 85dc2f674376..4d597025108d 100644
--- a/net-im/choqok/choqok-1.6.0_p20190726.ebuild
+++ b/net-im/choqok/choqok-1.6.0_p20190726.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://choqok.kde.org/"
 SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="attica konqueror telepathy"
 
 DEPEND="
diff --git a/net-im/gg-transport/Manifest b/net-im/gg-transport/Manifest
index d1d84386bac7..7d6b14a18128 100644
--- a/net-im/gg-transport/Manifest
+++ b/net-im/gg-transport/Manifest
@@ -1,6 +1,4 @@
 AUX jggtrans-2.2.4 481 BLAKE2B f225a5239a4f622b61094c02cd3470e4c635391926af29fb956f979005d3a0a40aedcbc1cad0e1f419f89e45045929bf3a9f71a6ea6b9fd550d4821ac99ce796 SHA512 a560de48a612ed1df9e2bb83452cc769cd6b19b2e5ca66f7420107d8fa2344a957e1d3094a16dec7328d6ef3cb2b1f8f6689cc28be0c0f6e4bdc46141107de23
-DIST jggtrans-2.2.4.tar.gz 796625 BLAKE2B 9bd6925ca784324c25e3e476b4208bae47a118272c8c91774ab1e944d72594d58a829e5437731cf437abb580b1b14a46f9483d07c0798171977379ef7c07e23d SHA512 5487504bc307001bc6bce927cd32e46b126148423aac8fc59944af59c67c5fba68bce001b5321d80a5392758ea88d445f2b68133636afe1f218a4fb696e319bd
 DIST jggtrans-2.2.6.tar.gz 883775 BLAKE2B bc27dce3fb70e7a5a1d71e8b46f1acf2c21899b956e5fab4c1d85756356973492d1617bd66517052f2fcdd81ab27e8e330837ee01787180d5193e62255cbcba6 SHA512 9fa6beb03427dc29db6b1aa5707486b857d3f850ed4efc9f2a627cbec4a9e40c91a9092b42a4a338976659f6ebfa0ca6f69e194e51bc51744a7665494fc210e7
-EBUILD gg-transport-2.2.4-r1.ebuild 1170 BLAKE2B 1e12c8148a43a4d7e7325dde1de510934e92bad2ee36f795fa9415fa8ef7ac3503bbb2b318a89729d07b3b221e0361dd754387f89f655e67adbece8b6740788c SHA512 6e8e451412716c5e6c07c9ce68a7513c2a13dc2dd15a6558db097063f1eaf46ded197954a8fff8539cfa475a911a377d9bb9533a5c83ac3a66e37c9a21cedc97
 EBUILD gg-transport-2.2.6.ebuild 1198 BLAKE2B a4b4b5c87ffbbccb7e06f1afa6c9fbf7ea5c3c3d5d3491449e351e4f1c71b724ad0936f71de5c4aa502c0b79250f2b7d7b5e06567dbe03e7492333bd3ccd61be SHA512 d5159eae44806a1e2bf48a381c2466bc2e49b3a9ff85f7095fa138ec2bfec8fa501df8e8fe1444c463e45c2d9c8d20ba901fb8b370d49759de925626cabf5931
 MISC metadata.xml 419 BLAKE2B 4ae4ab6b9e284c7999272b63664ecb6991263d39a0bca1a8f43e441b2bc511172bbc7c35fdefb81e3d33d285d04c53c9e616d401d7e3e93c939f61061a5eb4c4 SHA512 ccd10d0be489555d379a71b089295753208d6097643d5b153eb9376951dc800f084b63b4d2801dd00b0be0d1d816d6388815dff2d6294c422bdedc94972bcddb
diff --git a/net-im/gg-transport/gg-transport-2.2.4-r1.ebuild b/net-im/gg-transport/gg-transport-2.2.4-r1.ebuild
deleted file mode 100644
index b32bdcc0f32c..000000000000
--- a/net-im/gg-transport/gg-transport-2.2.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Gadu-Gadu transport for Jabber"
-HOMEPAGE="https://github.com/Jajcus/jggtrans"
-SRC_URI="mirror://github/Jajcus/jggtrans/jggtrans-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=net-im/jabber-base-0.01
-	>=dev-libs/glib-2.6.4
-	net-dns/libidn
-	>=net-libs/libgadu-1.9.0_rc3
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/jggtrans-${PV}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	keepdir /var/spool/jabber/gg
-	keepdir /var/run/jabber
-	keepdir /var/log/jabber
-	fowners jabber:jabber /var/spool/jabber/gg
-	fowners jabber:jabber /var/run/jabber
-	fowners jabber:jabber /var/log/jabber
-
-	newinitd "${FILESDIR}/jggtrans-${PV}" jggtrans
-
-	insinto /etc/jabber
-	doins jggtrans.xml
-
-	sed -i \
-		-e 's,/var/lib/jabber/spool/gg.localhost/,/var/spool/jabber/gg/,' \
-		-e 's,/var/lib/jabber/ggtrans.pid,/var/run/jabber/jggtrans.pid,' \
-		-e 's,/tmp/ggtrans.log,/var/log/jabber/jggtrans.log,' \
-		"${D}/etc/jabber/jggtrans.xml" || die "sed failed"
-
-	dodoc AUTHORS ChangeLog README README.Pl NEWS
-}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 62057ce4c0ce..933ec4e09bd4 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.26.2_amd64.deb 94012202 BLAKE2B 6a9c75dfd91f968358e2b6bbfe0e97a823fb923204a61334f991d4f7b217de119a895c9ddd48c157e5222454536923d7fde3d63b43667f45f24021c7f6a5084d SHA512 3eaadbc5ae5b22153371f0781dc402a7df8fc7c7475566752050acc5a3bd7d982e11671116a03f3ad84d57b6a4c5a4152048bdef446b814cd77c31a624d308e5
-EBUILD signal-desktop-bin-1.26.2.ebuild 1659 BLAKE2B 16eb008581ec8ae0a5b81b0396d6fd87c8551316f8690f8652dbb20f865f738aeaef71f11ce9567ce545da96574c59c0b1be6de8346804b41086490e0f98c23c SHA512 f3aaae0317926ae5d570935cfef12bbd3d63f5514eb5a69354c5794a425e29ae26a8848cdbe4816b699d49a6a4a311cb680809f1d5f727cd1c5a40233b36a4f5
+DIST signal-desktop_1.27.2_amd64.deb 85528588 BLAKE2B a3ce3bb81e68c861a4f38a143213a427882f999016bd42bcc28b4d4ef587711b9ceb7e435c4dff317503fdd4ffddbfb0c423e48ce060a227e8f43f32df1871f4 SHA512 7cea89f403fb8edf6801ea387bb3efdb536534173e0e32009884f29f95bee294fad2b59e3d886406f87b1e1c529f6fb36f3aa7ba1cdab9ec5e41aaa3a21eb313
+EBUILD signal-desktop-bin-1.27.2.ebuild 1684 BLAKE2B 92219fd7bd3b7d7cee40d20bc5ce1e0b5d0ebed8b1b9917a73e9b0592433ef454ac60007840d0b11a9086172b2932ea57af0ad6aad6c7c2b3600d9d51c720bbb SHA512 4a9ad83073cbbb9e5badcc269c6a72ccca7655552b4458c52d34a0dcf04019ae26b51f2192226f785d95a175fe2c0064e0e8150b7254aa3e4c88adf7d8fb5fe9
 MISC metadata.xml 501 BLAKE2B 160ad95d95c3a77268358b27e8ec0050b74fc0fc3f817577f8883b8dcf647c1c8289059bedf2260d6338ba218f48bd116dd75e30b175e7290550d74f09fb32a7 SHA512 cafe6a933400547fa34405893240bd75b22e3f6fef8298d2693ffe073b1540dd1745f5314f35c3f12e72da062b327bbccf5c7bf6f5415a5c75666e90652c56a8
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.26.2.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.26.2.ebuild
deleted file mode 100644
index a65e2044f152..000000000000
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.26.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-bin/}"
-
-inherit pax-utils unpacker xdg-utils
-
-DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
-HOMEPAGE="https://signal.org/
-	https://github.com/WhisperSystems/Signal-Desktop"
-SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
-
-LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/nss
-	media-libs/mesa[X(+)]
-	net-print/cups
-	x11-libs/gtk+:3[X]
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	"
-
-QA_PREBUILT="opt/Signal/signal-desktop
-	opt/Signal/libffmpeg.so
-	opt/Signal/libGLESv2.so
-	opt/Signal/libnode.so
-	opt/Signal/libVkICD_mock_icd.so
-	opt/Signal/swiftshader/libGLESv2.so"
-
-S="${WORKDIR}"
-
-src_prepare(){
-	default
-	sed -e 's|\("/opt/Signal/signal-desktop"\)|\1 --start-in-tray|g' \
-		-i usr/share/applications/signal-desktop.desktop || die
-	unpack usr/share/doc/signal-desktop/changelog.gz
-}
-
-src_install() {
-	insinto /
-	dodoc changelog
-	doins -r opt
-	insinto /usr/share
-	doins -r usr/share/applications
-	doins -r usr/share/icons
-	fperms +x /opt/Signal/signal-desktop
-	pax-mark m opt/Signal/signal-desktop
-
-	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
-	dosym ../../usr/lib64/libEGL.so opt/Signal/libEGL.so
-	dosym ../../../usr/lib64/libEGL.so opt/Signal/swiftshader/libEGL.so
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.27.2.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.27.2.ebuild
new file mode 100644
index 000000000000..8bfabe9f8fa7
--- /dev/null
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.27.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin/}"
+
+inherit pax-utils unpacker xdg-utils
+
+DESCRIPTION="Allows you to send and receive messages of Signal Messenger on your computer"
+HOMEPAGE="https://signal.org/
+	https://github.com/WhisperSystems/Signal-Desktop"
+SRC_URI="https://updates.signal.org/desktop/apt/pool/main/s/${MY_PN}/${MY_PN}_${PV}_amd64.deb"
+
+LICENSE="GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-libs/nss
+	media-libs/mesa[X(+)]
+	net-print/cups
+	x11-libs/gtk+:3[X]
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst"
+
+QA_PREBUILT="opt/Signal/signal-desktop
+	opt/Signal/chrome-sandbox
+	opt/Signal/libffmpeg.so
+	opt/Signal/libGLESv2.so
+	opt/Signal/libnode.so
+	opt/Signal/libVkICD_mock_icd.so
+	opt/Signal/swiftshader/libGLESv2.so"
+
+S="${WORKDIR}"
+
+src_prepare(){
+	default
+	sed -e 's|\("/opt/Signal/signal-desktop"\)|\1 --start-in-tray|g' \
+		-i usr/share/applications/signal-desktop.desktop || die
+	unpack usr/share/doc/signal-desktop/changelog.gz
+}
+
+src_install() {
+	insinto /
+	dodoc changelog
+	doins -r opt
+	insinto /usr/share
+	doins -r usr/share/applications
+	doins -r usr/share/icons
+	fperms +x /opt/Signal/signal-desktop
+	pax-mark m opt/Signal/signal-desktop
+
+	dosym ../../opt/Signal/${MY_PN} /usr/bin/${MY_PN}
+	dosym ../../usr/lib64/libEGL.so opt/Signal/libEGL.so
+	dosym ../../../usr/lib64/libEGL.so opt/Signal/swiftshader/libEGL.so
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 903affc299ff..cbee3cb4d5e6 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/bnc/Manifest b/net-irc/bnc/Manifest
index ab3cc634b6af..55120a843276 100644
--- a/net-irc/bnc/Manifest
+++ b/net-irc/bnc/Manifest
@@ -1,5 +1,5 @@
 AUX bnc-2.9.3-64bit.patch 402 BLAKE2B 1221f1dfef7f1c8d5c1815ec61c859882bba466cba1e9f4a3a30dda3d22024105c5a25bf9ea9ec0d46d46abfe0549082316c17b2ab55dd876d4e27fbf9abe870 SHA512 e257416b88fa147ab532389893ecbf3ee5c47a3680bf8c3c54fb03408fb97b04ffd01222ce8e6c0a1257f9618c18dd95f3eb1799ae3a83922617a630b557604f
 AUX respect-cflags-ldflags.patch 2766 BLAKE2B dff6f29ca5bce13a033c261375463c3b5081f58b0724f48dc1400ea5845ed3d477f2fb6ad025b68f7f98aafd266e8eb5a60921880738c5e99dd80230c7233c96 SHA512 2b865f67d1999cc7c5ab85c828b8d442906306df23f48fdff17ffb7e7f4f5279a5f0aed0acce3708b558b4cd2e7d7885a585b0cae06b2a78425430ee786362ed
 DIST bnc2.9.4.tar.gz 76896 BLAKE2B fcb09e8c75986d51f69fa4b75458c95419da90789a81b5dbb2504f876d610ed72eb6a15aaae5b18eee03b77a7e374f4f88dc73b67e0daf20cb59d48a5a2dc77a SHA512 131c25624c2a72494f900c6247e5569df48700223664487944ac42b0d892ea62f7d0e67a9ba4609cd936718365075c428e756074e349e1e041186c43cd16da23
-EBUILD bnc-2.9.4-r1.ebuild 969 BLAKE2B 6329328f7723218c85dd9a5d1b30c630325ce0532d0d3ba9c1ac1a33416ae5883dca0311c5c761deaaafb2ca98d23d20d629a2ea2ddaff96a9b3bccf28f1bc40 SHA512 72b8f54014329394dabd78e2dc791e38143eeb37e7212cabab3338b1ed3d02ecfa761b9bbdb68fa8ef09f792c643e0d216b32f34c5994bc245e762c4d12288fc
+EBUILD bnc-2.9.4-r1.ebuild 968 BLAKE2B 68904952eefeb612f32ae08a3dcc60c724bb0158f62008b4e1490a11b674b5a3f456577d56ac1319037eec1f0c4486d67bf902b7fc44c44dae843f7abd348584 SHA512 351563cf687dbdea81222e808be0ab392fccfc46d43f0006ab6be41ee695e775082d2c8da03787d381dfceadf90af662eb7cf5188bc5d1398c82c67b8fec7ad8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/bnc/bnc-2.9.4-r1.ebuild b/net-irc/bnc/bnc-2.9.4-r1.ebuild
index 73bbb522e5cd..6d62da1735a2 100644
--- a/net-irc/bnc/bnc-2.9.4-r1.ebuild
+++ b/net-irc/bnc/bnc-2.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ppc ppc64 ~s390 sparc x86"
 IUSE="ssl"
 
-DEPEND="ssl? ( dev-libs/openssl:0 )"
+DEPEND="ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -35,7 +35,7 @@ src_configure() {
 
 src_install() {
 	default
-	mv "${D}"/usr/bin/{,bnc}mkpasswd \
+	mv "${ED}"/usr/bin/{,bnc}mkpasswd \
 		|| die 'failed to rename the mkpasswd executable'
 	dodoc example.conf motd
 }
diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest
index 8246e171ee1e..18818f7433ec 100644
--- a/net-irc/ii/Manifest
+++ b/net-irc/ii/Manifest
@@ -1,6 +1,4 @@
-DIST ii-1.7.tar.gz 10174 BLAKE2B 93af2dc182d77dbfca65cbee6c40aedabe9166be7abcb03c87e80e74273dea1e4dd875d86cf0e1dd04b4a10bfcd825ea9a8c109badb72cc877a484bdaea705d9 SHA512 1fa744bc9b4291b5c6c56e023d982aad59001137db6c7682284a2d63e649a32d558adbb85ae3407e312ae5436852b4278c2c522d4ef03f47cf54ea3a1f13ca90
 DIST ii-1.8.tar.gz 12326 BLAKE2B 7ae90d788aaec0a359ce46370f27c0ce62c6f77e8cda61d9d168d0ebd7de927a478b42a591631f2c193f3816b2a1b39cf79607326b073bcbeefe4291e0fb95f6 SHA512 2b41a0611ac76612c9333e8490709ee22d17506f0c5d7e680a0d8f3f8b511bd5b279555cf609c1543aba71948819369a3c306b1168086890aa49c145b7860e17
-EBUILD ii-1.7-r1.ebuild 740 BLAKE2B 2792190b5c90b7cefb8eaa1625c82ab68f5b66545e2a372337fa364c94d16d7a49557e5b0843c1ddba571d5822ec6ec33b2ab11b18d7b4415a2970531a9940c4 SHA512 a4ebf245df4485a7fc9ae75ebfa726b84d924640054a55f6fe79ee5f9224d06ff765033bd89bd4e248242b1afaab0a268f66547f78b9816b54b2cb1df5bb24df
 EBUILD ii-1.8.ebuild 683 BLAKE2B 4abf1f5f7258cb2593f68610684dcaca05c06e0e5f329fe2b51ca064f08c90adb7a293c5933660195861acff22e4122e4532478e899e73bf79de538fd13cb9dc SHA512 647c5cc8808374c1eb56fa0bc6c5a1721987cae9544ef8696b3b2e6ca94fe2cf0cf1d08d24d9f4e86fde95d7eb0ec9677cfb8fe6c19e2db8fa2d86dfa44b514e
 EBUILD ii-9999.ebuild 653 BLAKE2B bcefb912baa5b9f4484e9ae25db6561e141a7ce10d80cb673d655cfaaa637d90ec087a82943df8040115a9b7b2984bbbbd6a937df8ac89118c7cf8501441ebe4 SHA512 877ad3c2c18a1cf6a3b5c2bb82241ac52fb4a1aaa42e78b3b0167023f3a2c5171fc6a753e1fed7ecac8cac02f9821233c3e97db17391bf87763ba82be8156d84
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/ii/ii-1.7-r1.ebuild b/net-irc/ii/ii-1.7-r1.ebuild
deleted file mode 100644
index 4a1fce5af761..000000000000
--- a/net-irc/ii/ii-1.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fixheadtails toolchain-funcs
-
-DESCRIPTION="A minimalist FIFO and filesystem-based IRC client"
-HOMEPAGE="https://tools.suckless.org/ii/"
-SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
-		-e '/^CC/d' \
-		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
-		config.mk || die
-	sed -i \
-		-e 's|@${CC}|$(CC)|g' \
-		Makefile || die
-
-	ht_fix_file query.sh
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ii
-	newbin query.sh ii-query
-	dodoc CHANGES FAQ README
-	doman *.1
-}
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 9342a6b75011..10ae24e87c9e 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -2,4 +2,4 @@ AUX kvirc-5.2_pre20190628041642-python-3.patch 2036 BLAKE2B 71de965fcd6d3ff6ec74
 DIST kvirc-5.2_pre20190628041642.tar.gz 5967194 BLAKE2B b1a2e2775056e2db058f82656ac90e43828d497019e9c6ae0431a1092423425558c6eb91a3a8301616cc4cdc7ef1acbab3729702484d703e00dc8e09f7cf243f SHA512 5f532739d9837f357a36fa1df67db0fbf8d8eddb990e686224e53c5678d26ba18c6c7c60422cef4e08ee587156638b278f534b1be1d49251fdeea19858227a5f
 EBUILD kvirc-5.2_pre20190628041642.ebuild 4322 BLAKE2B 1ffc73c27abbcb7a101829cf4a8197713e48d5bb3bdba3584beee23ba57c5f4c8cde9df6da004b7885b617929d88cc04aa72e7ed94474ef691eea74a582741da SHA512 cbb66d43ce0c829f82edecd611f7fcdfa27863a67d89d053a53f4529985c3b822c663eb93df023ae59feab7339bdf71926f94a4c2fdf5b9a51a56fbc789d7340
 EBUILD kvirc-9999.ebuild 4261 BLAKE2B 796cbac383831084f9b9677d7888b02a394b9ab1d9d5720b3660193d9f3accb2a6c44d850ee4f1756fb75640cc85f08bec8d237da8c1901c0fce3fefb893f4cf SHA512 6136cbaf6f4dd7d1c4effb3fabe341d69a2cee6e802e44f46d3ad400c920860e631d1a12b6ca1a5c900a220334ab182a096d3f20a0d8195c7bb9e23f2e132918
-MISC metadata.xml 501 BLAKE2B f8d9ac4c9a0a596f619716b2df66a95367d6599b9651fdbc5fb9d933c986d0079903cf097ce824c6d43786937b8cd478380723c578f5f96af0931ed6604da561 SHA512 36053b960a07fdf5e1307ce1097d77620b8bc48864568244e011371f459dcd7fbf4e7fcc2cfc0331183fdd681765a1aa017d3a6c4fbc1259834ba88d2e44be03
+MISC metadata.xml 643 BLAKE2B 820a98f07a4cfb58e857d5c7b863ed7adc174497a7ea05e66245a2c40c328ee0bdb644b98ba1d923834ccf05f23f8128abfe462d433fe2136078225b152a633f SHA512 3dd50caac7ff50679cabad216d4ec28b60351febc419f5d32f60b785043eba6f2f379c06e5af28af26355845ebcfe8439bca9d141bc3b9d0401fb0ee0a0c704c
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index 3ef850bff6bd..2d32a6643ad3 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -5,6 +5,11 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 	<use>
 		<flag name="dcc_video">Support video connections over DCC protocol</flag>
 		<flag name="phonon">Support Phonon for audio output</flag>
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index a9f6df87e3ce..4b1834bed273 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,4 +1,6 @@
 DIST weechat-2.5.tar.xz 2067180 BLAKE2B 5ef2a20d0f4e72958f8523c46eac4acf8223d70efbadc78a1a5623b0e63e11acbe1c8e5ec739f56764c6825393902626e234269646031971a0f58fbd314f8918 SHA512 af0135009b799d40790c09da5419c950a6c750264a556de418b0ba4f396ecbde2aadeae5cbea3f2e98fc9926f07439e28beac00cb0019dc6752c1a5640a9834e
+DIST weechat-2.6.tar.xz 2080092 BLAKE2B e54d8493de7783e18e0de3a7280088a27a70b270a2d7a504ad35c4091e03a0d3c2f3fd19260b700bb115e3804ab4d6d8963bea46faad1368f3dd0569c0595add SHA512 cf56692e12b2e034675d4c15a8822836b2fcf93d584948e338d263f5a7207edf4599cc72bfb940427146f5f75e7239207cf54f5ed07dd5b6119f68c445725a2d
 EBUILD weechat-2.5-r1.ebuild 3952 BLAKE2B 26b66730ee624a14b9e13b7573021cc1101128565c763320f2475400288dbba0492510644c315505f5c2334de780ce1476cec0f9332c98c8348d9552edec7ce3 SHA512 bae88576c77f741460eb394febcaea23163911d02c40111bd4b5d530ce48b86d6512d6f1358bd0316dcd91bd4876154e2b67bb5a46cfb7115fcfd75e7e7a41df
-EBUILD weechat-9999.ebuild 3954 BLAKE2B 71baeb44920f8f18568c85833777c3e929a8a22926cb04cdcc247bd507fc14c039e453e364c7f7305db04bd68010d391032ff778cdf93cb676051c257b5b3e85 SHA512 c5bdab50fd43f20e21a2a6b78afba834604248f00b7439c4457ac0d21e71f633e2e135610900373fa9775eb7adb98c0dce50c52de1578be073bd11552898b83e
+EBUILD weechat-2.6.ebuild 3801 BLAKE2B db50a1a4273dc6b92332342e3cc9634683dafebe5ad4fc7740dd77f93a10985e13ac5dd85fee9bb26fc0101155d22452361246b697e9106f4c6b8f5bb242820b SHA512 f57d13e5c8a076db2e81abd8a61327bf0a0af95b8a47ee3bb07967702cbc46d62cd4b5c7736d1203345756089cf7ab0d9c35f5c20906e73031252c35b9a1375a
+EBUILD weechat-9999.ebuild 3801 BLAKE2B db50a1a4273dc6b92332342e3cc9634683dafebe5ad4fc7740dd77f93a10985e13ac5dd85fee9bb26fc0101155d22452361246b697e9106f4c6b8f5bb242820b SHA512 f57d13e5c8a076db2e81abd8a61327bf0a0af95b8a47ee3bb07967702cbc46d62cd4b5c7736d1203345756089cf7ab0d9c35f5c20906e73031252c35b9a1375a
 MISC metadata.xml 1069 BLAKE2B 4a71fbd264555e8439f6797370163ae05c3111e589d513ade407ebb5eb3b2c302d2afc46cd37d3707c85fc981ed26bfd23762b5f6f635b9f85b70d821919e2ed SHA512 dfb08a4660736e409b31088217bca60adc46c88b7e0b6e4a1b905de69262ae0cef172638f30b502e01fcb772a6d3cbb471805959ba8c6d78cb598b18640fe20f
diff --git a/net-irc/weechat/weechat-2.6.ebuild b/net-irc/weechat/weechat-2.6.ebuild
new file mode 100644
index 000000000000..024f0d1b0d09
--- /dev/null
+++ b/net-irc/weechat/weechat-2.6.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit cmake-utils python-single-r1 xdg-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
+LANGS=" cs de es fr it ja pl ru"
+IUSE="doc man nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-misc/curl[ssl]
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( dev-lang/lua:0[deprecated] )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:* )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) )
+	ssl? ( net-libs/gnutls )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cpputest )
+"
+
+BDEPEND="
+	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
+	man? ( >=dev-ruby/asciidoctor-1.5.4 )
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+# tests need to be fixed to not use system plugins if weechat is already installed
+RESTRICT="test"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in $(grep add_subdirectory doc/CMakeLists.txt \
+			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e '/add_subdirectory('${i}')/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDIR=/usr/$(get_libdir)
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_NCURSES=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_MAN=$(usex man)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_SPELL=$(usex spell)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_XFER=$(usex xfer)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 9ff15b1d86c5..024f0d1b0d09 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -135,14 +135,6 @@ src_configure() {
 		-DENABLE_XFER=$(usex xfer)
 	)
 
-	if use python; then
-		python_export PYTHON_LIBPATH
-		mycmakeargs+=(
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		)
-	fi
-
 	cmake-utils_src_configure
 }
 
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 35ad8e0b2170..66721042efa5 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ccnet/Manifest b/net-libs/ccnet/Manifest
index 2376736eba13..4a82cc7aa7f7 100644
--- a/net-libs/ccnet/Manifest
+++ b/net-libs/ccnet/Manifest
@@ -1,5 +1,3 @@
-DIST ccnet-6.1.7.tar.gz 179364 BLAKE2B 214284a5b04ee2c8a51f8479bee5bcc3d5b044ed0cd622b56ae5caf4fb2757bf28191ffedca9f76fce80b5c6da5a489207e1bdef3436e44dbe1841a69a82c448 SHA512 bac93c9987f434915f9d5b5f0cfc44d88471ae27896e89059f3c924182255d938fb6c87dec31354f256807d5e4274b6af2e3325e753d06cd8a5ea91caba9490d
 DIST ccnet-6.1.8.tar.gz 179374 BLAKE2B 8eb05a9d2c8830c501b63f939df56cb72a6b03f7dbdf511adf1a89eff86bdc85ad804de04a2ed57f235f76e95fe1a4ab317f415be0051024bfcd7d099e9e2cad SHA512 5eb3765969edd471a43575545f92f6317741a2099bb7af82851bfe726b0715420e5b946c63435c334c4447888f1454d7cd0703f29818571eaabc2250046c45f3
-EBUILD ccnet-6.1.7.ebuild 995 BLAKE2B 259e0ff75a805902d29bfe659510ebeb801c77894b3d863cecb3650312818c3fb4bf17c067f9ea1ddffb1bacb212022698420dda075ae42632402311621e59e1 SHA512 ed7642aa5269055f57612d853412a7ca99b808fc72bdb424a2b75e1c63caba7c5c744f09ea4bb0d47f22b82bfbb73641947a0be6b43d2c473fb71d0de93f0029
 EBUILD ccnet-6.1.8.ebuild 992 BLAKE2B 4793324c0cb4f581cb598fac1a13a5394a69990df05a16220b65110c1081a6d9f4cc511463d32e4b4b5bee7f065eedde9b2999ebb61e68ea30b17ea5961680a1 SHA512 34f4afe88309f9331ae8a5a8fd48a108f22ba956af0de0ef51a40112a280be1541fa311c486dca9b2aa1295a8e27a7e0978b2a00447cbd70ed94f0ea4084c1d2
 MISC metadata.xml 244 BLAKE2B 1493b7ed9db33a79674a643ebdf17ecaa25eb1ae07cd66eed506e5be57dc1ab624708a96e48e93746e967b0b9b36b58a1fb498e30a6823adaa74400aa8ff1d34 SHA512 79803b3a138023e170943c1446e54f3d310f91d16568c6a235627e456958a1531b8b236da8d3e961feefd75fc51837011904f8f3172c5cd520cb0136b9f9f660
diff --git a/net-libs/ccnet/ccnet-6.1.7.ebuild b/net-libs/ccnet/ccnet-6.1.7.ebuild
deleted file mode 100644
index 76149b4a86fe..000000000000
--- a/net-libs/ccnet/ccnet-6.1.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="Ccnet is a framework for writing networked applications in C"
-HOMEPAGE="https://github.com/haiwen/ccnet http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent:0
-	dev-libs/openssl:0
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" libccnet.pc.in || die
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index ccc8f49406c5..9d567eea4c7b 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -3,7 +3,9 @@ AUX davix-0.6.7-uuid.patch 1868 BLAKE2B 24d94348745db5a6b85acca3d050dd7bf44f5b7e
 DIST davix-0.6.7.tar 3346429 BLAKE2B 7510c628cd1d346ed5f4dca6100207e5e2efa3a98d0caf63dbe3ba39f58a9b11c330c95cd2d40d60d8f2497355d4cb2f2d7537babfef287a5905f32322363d90 SHA512 5cb830e415a4ab87b7b046fbd8ba615379766f4fa4b886a271b0c248c05968b9a3cb144751b44d5fd62f5e07bdb7610c0505e44f2702147f6f006b49a4b3d8ce
 DIST davix-0.7.3.tar 4341865 BLAKE2B 8ba2855f7170ca24f4a15edc32562e47711304f48eaeb1e2870e1325396ae2b664f8af7a482986da6883ab5c92ab6e61034e8840baf3f59c3bd691e7e483fc7e SHA512 b7e7814066ca53c44c2aa0a0d1d6a2d995ea44d3d122da1d19f12849d8c2d4e91eafb40c18d4d18d1736a7c5c5099972519c08a6c7ab5b32300fc8a1fcdc5bfd
 DIST davix-0.7.4.tar 4343614 BLAKE2B 0fd618a4575cfdcbb0142b26ed8bd5ea0b8d880706ec6ebcc8e9a8755a8f392c715e2bc3cb25dd316fa90f06e7223ecd3e8272a0e5867eb2f5d74eec3053ddf2 SHA512 835d49f1729be95b88c1c422723a2ac6fa9fa0c4a85089e67d68a365c482bf648471fea000b90e7797add0809a9262b5c7275a965fde437bb8206154266fd970
+DIST davix-0.7.5.tar 4343329 BLAKE2B dfb71e0524e47a2378cd8a49fa4c7d209b8b658e8515f4f0750c9c98cb03073e2ff82a5fbdb2f7fb563f31671789cd7e9cb1656a16dfd0811934730961695db4 SHA512 4be448d6d28f315c0d098d9cf2ddf95bbd818659821935571d83dad1b2724b8f90b87be298ca8a7984cb57a88b18b0253e23f6e8cb192cd1792472993da36bcc
 EBUILD davix-0.6.7.ebuild 1479 BLAKE2B b443682bf8396040d259a69f39a5b6d3c04e8bd96f315aff99e84cad4a8afa571b2d3aaca24310b7f632739e43db129c595ed6ac1c404ccf98d05cb178887ecf SHA512 7032a772e90ed906f446f6e9ce1104545c6bf38c433914936759864402526197cb9aa6dfa0d586984fa7b19865aa96cf9c8b801a85a48171885a4bd566c135f1
 EBUILD davix-0.7.3.ebuild 1595 BLAKE2B d4522abac211e65960947ada16a381768b26e5825a2b8f41fec90a5ae67406450e0e2a50e7876b0ca0d45e3b062280e1162c25580ebe224cd94d0f29452457a4 SHA512 673ec1fdedacb7006c90e8483031e89020032a94870a0f7e3d5c9a9c6c9fc4a48ff45d2c9712f6c0f4d5a34f0d736259da218377ea782df1e9849baf0dae55d1
 EBUILD davix-0.7.4.ebuild 1597 BLAKE2B 0bac6db2f4bbe6cbf4416011de19bec02176dbe2a330bf5bcc2898c8149d5ab602ef4ee4981a82a4e24756d2e74d878518723aa5630c882e92103d20637b41be SHA512 a0902984c48641530e929abf52babb06f0f5c9591a8971bd68db9b83fe5c13fa553517cc7fe405fc641a95990eb9425c441f9414b54cdaefa30bd1b0b877e441
+EBUILD davix-0.7.5.ebuild 1597 BLAKE2B 0bac6db2f4bbe6cbf4416011de19bec02176dbe2a330bf5bcc2898c8149d5ab602ef4ee4981a82a4e24756d2e74d878518723aa5630c882e92103d20637b41be SHA512 a0902984c48641530e929abf52babb06f0f5c9591a8971bd68db9b83fe5c13fa553517cc7fe405fc641a95990eb9425c441f9414b54cdaefa30bd1b0b877e441
 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0
diff --git a/net-libs/davix/davix-0.7.5.ebuild b/net-libs/davix/davix-0.7.5.ebuild
new file mode 100644
index 000000000000..448dc89c144a
--- /dev/null
+++ b/net-libs/davix/davix-0.7.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="High-performance file management over WebDAV/HTTP"
+HOMEPAGE="https://dmc.web.cern.ch/projects/davix"
+SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN}/${PV}/${P}.tar.gz -> ${P}.tar"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 kernel_linux test tools"
+
+CDEPEND="
+		dev-libs/libxml2:2=
+		dev-libs/openssl:0=
+		kernel_linux? ( sys-apps/util-linux )
+"
+
+DEPEND="${CDEPEND}
+		doc? (
+			app-doc/doxygen[dot]
+			dev-python/sphinx
+		)
+		virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="test? ( tools )"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	for x in doc test; do
+		if ! use $x; then
+			sed -i -e "/add_subdirectory ($x)/d" CMakeLists.txt
+		fi
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DENABLE_HTML_DOCS=$(usex doc)
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_TOOLS=$(usex tools)
+		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html"
+		-DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds"
+		-DSTATIC_LIBRARY=OFF
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cmake-utils_src_compile doc
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use tools; then
+		rm -rf "${ED}/usr/share/man/man1"
+	fi
+
+	if use test; then
+		rm -rf "${ED}/usr/bin/davix-unit-tests"
+	fi
+}
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 771bbf4bc7fb..9a8f5b124270 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -2,5 +2,5 @@ AUX 2.58.0-disable-failing-tests.patch 1879 BLAKE2B 6821bf4e1e18f085759c9ac19ff8
 DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
 DIST glib-networking-2.60.3.tar.xz 185132 BLAKE2B 8bbe2b8afb779bac99bd554c384bdbf9e197e9b71dc6fe213cdd4352d95ce19d1c9786747ba5c721fc35bdda3e1325e9620c1ef15ca1fa1e294aad9ab3f9a4bc SHA512 06a50aee1a563f5e992549e963d3980b02c9068976a244ce4a84eb0aca064b2ab7e8d50e3ef26dbd0d8d5edbddc82c5ce83d4a93bfaa0822b79465f0d3b8609f
 EBUILD glib-networking-2.58.0.ebuild 1952 BLAKE2B 3a801454107b9250a12912ecd5c82ff134558f853cd2a63081c449a5cb7fe47dcc475fb34ef10830bff4d4a0c5afde5753c894420a10b93ca1fd96eb999bbede SHA512 b0d2a0c4d7f654c955a6aa6f7979b6d81cc32217dd4a1f2dc6129cbe114a65e52c48ed7c068145f0d2ee2e8d6de072d869bac9c1b562b0d877ed2132e5fa0652
-EBUILD glib-networking-2.60.3.ebuild 1769 BLAKE2B e2d645fcd5ef3baf61253a4b1663ae2c0b6f5516391cb179f1219c2a166d00fca3a1ea5e1ee30e50bf85c5a8d4e3ef6906caa653edfeec916b10c9b422eb2fc9 SHA512 89a79ddd49eeebd6adb9b09e0706ac39c77f079c847a9311039c50290f1c60e0c47f2e3c6e8f186874a9d875dc18cb0ddd2ca471ba51d9e9350e88fdd485e874
+EBUILD glib-networking-2.60.3.ebuild 1768 BLAKE2B 95e22a8901007fd229abff9bbd9c3bf5247b3a3213e923458ad06aec9da91b2266a4c82b322bece5762746a72291c6cc3cca29bcf2c89b6284313a7063d6e5de SHA512 da68e2b8608e60b6567788bcd534d8ec244c9c1fa1a9516472f9487c3bf53262edd7424e2c78c1856ddb48d55da507fef951d33716855f5dba72d0ea077a2c22
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.60.3.ebuild b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
index 3840bd352f93..304bde51dc78 100644
--- a/net-libs/glib-networking/glib-networking-2.60.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.60.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index a96c40a43d67..3e16a4d508b9 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,5 +1,3 @@
-DIST gloox-1.0.21.tar.bz2 716449 BLAKE2B 9728b137b088e3ebd067dd88688474e37ec27108cc87ffe6d2d78b206c3215f36c072e333d04c659e5dc9db43c330bcac7ee7f495208bd8df1bbeb72db1e0792 SHA512 ee2c180e6a6e05955707fdd3e790c4c0e7be46fdf071201abd081b8620e3f664045f000804e1a30bddf8a3324e90f211ce5ee870fd5330ab87979dedfeb45575
 DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416
-EBUILD gloox-1.0.21.ebuild 1134 BLAKE2B 65f284fc562483195e09f8412d88876c602cc6ea25750eda6e32a3abc183e522c8427b1e5e62099aeb2d038f3bb60998f9cf249bfd879aab85c73168c6b64f04 SHA512 4a9d5d47ac2a3ec2ad0e103183b8d64f665100859bfa556c55adc659401141c6d84f84014e77a603858ce5b6cc876663f97494e0b1bde3595a642a9c26824d82
 EBUILD gloox-1.0.22.ebuild 1117 BLAKE2B cfe30d6bac3e249c88e6825390c504405eaaea78442359d4297c6a0a3cc4f167dd5c1eae12c6d34856a833b4a83247c16123e740b637dd2e7bc6b6c546c16492 SHA512 37ee7375502d50d168b2f79b4d8656424094741fe11c6c9b8d50ea8512fdd0218516c2644d57bbfe6aef4cfdd2f635539bae2c9add09a3cf0f2a0addb279893e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/gloox/gloox-1.0.21.ebuild b/net-libs/gloox/gloox-1.0.21.ebuild
deleted file mode 100644
index 3598babc2d2b..000000000000
--- a/net-libs/gloox/gloox-1.0.21.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="https://camaya.net/gloox/"
-SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gnutls idn libressl ssl static-libs test zlib"
-
-DEPEND="idn? ( net-dns/libidn:= )
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-# GnuTLS checks hang forever
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# Examples are not installed anyway, so - why should we build them?
-	local myeconfargs=(
-		--without-examples
-		$(usex debug "--enable-debug" '')
-		$(use_enable static-libs static)
-		$(use_with idn libidn)
-		$(use_with gnutls)
-		$(use_with ssl openssl)
-		$(use_with test tests)
-		$(use_with zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 2dd99e40d363..1da89605f067 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,4 +2,4 @@ DIST gnutls-3.6.7.tar.xz 8153728 BLAKE2B 993a45edff335e75f36de27373d5db01094c81e
 DIST gnutls-3.6.9.tar.xz 5773928 BLAKE2B 9dd7678fd7ea9f170816358a6ac385193fe4db8052e7a35d553e18e8618ea88aeed2b618b288f98f2f480cafd560d46de04234808560a8ec18028574bf26b706 SHA512 a9fd0f4edae4c081d5c539ba2e5574a4d7294bc00c5c73ea25ce26cb7fd126299c2842a282d45ef5cf0544108f27066e587df28776bc7915143d190d7d5b9d07
 EBUILD gnutls-3.6.7.ebuild 3908 BLAKE2B 4dbb2c896f38322dabb73e14629612fc1b3f2652db58461c0444380e24b5bb1a050b5d62d58e17e583bf17875ff58124d74fb392fe6b3b31cdf81128ba596a92 SHA512 e1aefd74b5a3bc2da84b1dbd7ef3315706ad6dfff6b5a20015c00a92458918645e6791163b03d8f1ed92dc525875c42f6646c40de5121650a0ef235822b70bfa
 EBUILD gnutls-3.6.9.ebuild 3928 BLAKE2B fac7d7e13b3ac5c53d600d9db5c5202d7296ecfa3a9e64e6d22eb8b723699256336374e5d365aed08c3b066957bef80e077cc74cf9fadfd0dd11ef3225c132f7 SHA512 baf3f6f4812963bc6e373d877c3a576c016588f986451084077a16a9fde8228549ae72e0219dcd4a60ae121f0d67a56dc2d0ba5bcacf40569d4d3aaaefb8c1e2
-MISC metadata.xml 1194 BLAKE2B 2f5c69b9b4ed31a5bf470451931963cac503fa11a8d3d575279d2b8002ed5b7d5bfdb4ca2f141b1f2d7c8f802d2d51ea9de0875d4f9dcdd7febcef200cb8a932 SHA512 fefa4338d539e248747ef69447b20b7d5b70fd814bd9daee6a659f09888c7ff90dfa6bfa1d8778383cf14fbd3b0bd919bdccac2f5adc9b2d2decb00211325b0d
+MISC metadata.xml 1277 BLAKE2B 08fd439ce197f1ce2b1fd5bdedf6e409410aeb45a473b2b81ab9316ef32b367d44d0c65f3e768fae9edba1a03f572417e3f7dd23ee73b700dd0798e3dca30292 SHA512 dc4e4e3a72732012cf37d21b881e44933d5e3720ee1f3dc2c5d88ae97e7e2cea79628282bebd7d58048db7edd0bb7be80ffca23d126f333600172f16473341f5
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index d90b1d71c770..20e6efaa6651 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -38,4 +38,7 @@
   <slots>
    <subslots>Reflect ABI compatibility of libgnutls.so</subslots>
   </slots>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gnu:gnutls</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index e4c5d6e34f1d..4e19a79de148 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -23,4 +23,4 @@ EBUILD grpc-1.20.1-r1.ebuild 2413 BLAKE2B 283f25fd00b590bcf935841f3f8ebbb3d955dc
 EBUILD grpc-1.21.1-r1.ebuild 2505 BLAKE2B 23b382c761d81822080ef873517dfece795056356a8da4218a7c82489525563caa5b660ac23d4a7b45b35648d7d6c0d8cc3a1d36454c2595fbd294802115ca61 SHA512 e162969923aa7c9e9ef27ce35b22a57d93f1cea297b4b4fe4667a912cbf9a953738da5beb223e36c041648ee809e3073e26b41a37b0242179cdc61fa0bf1e64e
 EBUILD grpc-1.22.1.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.23.0.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
-MISC metadata.xml 684 BLAKE2B e2a167f68e05a7dbcef3ad7fa58ebcbde529d28ee5d5ad5dd73b2ee66a1bf21bc5041bbde089c6439c5cd4e800ab77edf647d8cc629f051b1a489327cc000cac SHA512 d3a9fda12fc9009e675ac6ea5112b9f8c8c4a316a45623e8e536821144c886b48c9f28b1c7bcc6362bd7ae7d71d0eec36b442fed5360924d7424095b2afd38f7
+MISC metadata.xml 737 BLAKE2B de7262f1cccfe21d55f3ae0f744e067d54912995520b46b9fd3107abfed3c057082f91854f4bc4c399606a31200f0f2da468218b1d677de1aca1155532395d60 SHA512 dbc3dc0370c809f0ea1ad5f88dcef44b0ca5a2bbde47606acf85ec6149892f19990608da9b5fd4417e77a5b565a34fc481a9c7b27b00e11a5c0015ef04800a7c
diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index ccbc56aeed7b..6267f34d90d8 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:grpc:grpc</remote-id>
 		<remote-id type="github">grpc/grpc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 3edde641b7b3..3d516046dd5d 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -1,15 +1,9 @@
 AUX Makefile.Darwin.in 2074 BLAKE2B a1aeb0fb86fb24f1027c9ad9424b7004dff4c9f43c3e18fb4c5eab6938efa09d8ba9a25951073afe0446f342356cee31ca1345cc45a91f2f1764dd8496723707 SHA512 cf2a9cee280ada8a05d239da0284eb16323bb04985790da0c737d880488a28fc03fe59aa276092681d25a444bc532e57c20ed8f549804f125e9a20cdb3b59f22
 AUX liblockfile-1.06-respectflags.patch 665 BLAKE2B db252cf9257548591e0171167ff0af792f53b00af1ff227c8a1cbaba42595620250ff7c16ce3eb9f21489966b128615f532633cd66c92983657b3c0d712ee6ff SHA512 560aaf84c59c90b6c19f8cd8290e54bcbe7e1e5dad226b8c332be7a67789f68d29d19bd6110ffa907c587d80dc370f68fb4db88442015723a526cb77079441d6
-AUX liblockfile-1.13-makefile.patch 2368 BLAKE2B aa269b2ecc5aac3ef62fb716f4311f7a15089d46402cae106f5f24cadbd6320926140b0d20d36849a71dad62ed337a09aa20ac28eda009f6f3bd96f32b99711c SHA512 65c73a6717d466f60bee814920be455496ea958db86d0004c30a4bed1d5554a0b7e9917d8380dda097c38b2b91b2cdac08095cde2c48dbba85bd4a1920e980a0
-AUX liblockfile-1.15-makefile.patch 2655 BLAKE2B 16f079f138b98d927e6d421b5445210d8187a204eadd9ffacafa2923d55eb2e0f8d4406795ae1460d853d28a223322663eeb5933736af3b0c422db023fa24c4f SHA512 3e468cb22758910dc992c501321282f8bbfe533037fe2009928d537011662d8347ca28f53d8b8cd92040bfc90b481affb7edfdf06c7c8d1a3e2b2892f7d024db
 AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c067303c25d03095efb395e47d716b9bb0eb9a6affc7330d7537220f99afa64bb6ec14061de078f9313609d762bff066542c3ee SHA512 dd9cbf566ac8a933c4cee19a33cbe818904cf7be5aed05f2a17b87312267ac1716631c9fead4663b1979158363ff07218b0a486ee40c029fcd2a23142b59f275
 AUX liblockfile-orphan-file.patch 613 BLAKE2B fc1167d0daab5b561c6b148af7b0752ba8f6e4067802648212e7fb28bc59f55c4293bb319b6186251890c164739daf6076aa5bc4f8ba083c9f68c0115be8738d SHA512 e42d5db372211a1c685c75b68542ecc0a9aa0810620cfd82fc0e76769120a058c691d04d6217ec428f956b0c0789a61fd08bca793260edf081e711e7d8626b0e
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
 DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3 SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
-DIST liblockfile_1.14.orig.tar.gz 67856 BLAKE2B 1b83c79217c533ed3f5ef0e3ee33877d541670e14eaa2003b37b5a9b0ae544611f88beb28ecb527d82295e41744e1dfc653b7822436a314c25444a686f30b89d SHA512 d6d75a1ddb55bae8ee63bd0cbacf7ab8cd6d28b29a7d3c2e4a5c31c76c6743ed517cdebd42e3ef5c44698faebfd1537b023510c692b54a1275e7114605fe6550
-DIST liblockfile_1.15.orig.tar.gz 68238 BLAKE2B 3819e6f391467073836ed790ce9b8bbac8e9887d0aea19b1bb083c1020a2e18d3364a087a8c0e962aac66a904768dd843be28e6364b8b150049b6348cfaa944a SHA512 048bbe2c87e85e6ec9b0347809c07183e4210cd565b38653dd1d967106209ccef4146db97afe5a5b7a6d3c58579d4d17f7e241e87be085791bad65b9eeed23f0
 EBUILD liblockfile-1.09.ebuild 1235 BLAKE2B f94958382f638b3008f82463dcdb9f06a1a334037225bf9fd31ca8eade804c5388c04cb03a1870cc2ee5e79266d859bb069cd855b60946dbdc6e3ab31569bbcf SHA512 f00ce50747bb75a5818b95c4e7e87750d4b891c2e22d89e4c71c64bbef8b804836ce766cc30cc4fe4e29100fed1f3b781b5524e09528cc71cec29c35f2b45a73
-EBUILD liblockfile-1.14-r1.ebuild 1130 BLAKE2B 14451dec7293976ed3ccd58fbe675f6efc5f05bfae8d211c28b656c544d288c6f09cf40abbc0fbf1234784c24d85f78c589b7ecec4b5b4d0e620b2a57e014fcd SHA512 76f42e4476266e4b9d3d9e3717ac6299fc247bec1892121d515581ba9e476a2b3ae8cc669ea2bc412c02bb6e74d9f96e906628c667c6ccab3ab503e4a083fefc
-EBUILD liblockfile-1.15.ebuild 1165 BLAKE2B bef201605ed043612397ee0c2a5f8bbbc91cb70c945b6690a92b0897596c2df066f2f8eca6e5f9452fa4f78596abfdf69b5257fd8966b5b26f7670ec41aff7b3 SHA512 ed07cccd8be76c9677dc6083a31511aa17c52f8fb02629fc6b7ec962c0e202e55ea669a16cc538eead4564511e63d4c3eec34fa3403142fdb310c4367c30edd3
 EBUILD liblockfile-1.16.ebuild 1365 BLAKE2B eb781781e516595e90681c7b248dd6c9b6cbf1552a963c62a848ab826d8ca96856fe3d4271f9e9b07566264d0b6eed2e7189c4d7d53b8476fa24f8fc8c4ca80d SHA512 215232d3116f0ea65d44ba08e3f44fa284e8831b8e1e9592e09cea910efebb9fc022c84832f7a0f73dba5b7f8a0342a6ec27af04e162e7292190dd076965c40e
 MISC metadata.xml 251 BLAKE2B 40a09dc2a759fb83efc9e99d0165f78db9941c583d8063bfb4305a2f53e1fbe6a578bb333b488f82ff6d66c78d8816f8cc474350fb1adfb3caa4dccc3dc30de1 SHA512 45a605b4ec729f1fa1ef76330eb4b8427995af409786e0946ed79ef73f06e9c59ba89ddd34070db3cb600f113f05d5003a07bcc4e6ce70bfe699f0a10dbabe88
diff --git a/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch b/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch
deleted file mode 100644
index e14bf12ad313..000000000000
--- a/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- liblockfile/Makefile.in
-+++ liblockfile/Makefile.in
-@@ -10,7 +10,7 @@
- LDFLAGS		= @LDFLAGS@
- CC		= @CC@
- 
--prefix		= $(DESTDIR)@prefix@
-+prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
- libdir		= @libdir@
-@@ -49,34 +49,34 @@
- 		$(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
- 
- install_static:	static install_common
--		install -d -m 755 -g root -p $(libdir)
--		install -m 644 liblockfile.a $(libdir)
-+		install -d -m 755 -p $(DESTDIR)$(libdir)
-+		install -m 644 liblockfile.a $(DESTDIR)$(libdir)
- 
- install_shared:	shared install_static install_common
--		install -d -m 755 -g root -p $(libdir)
-+		install -d -m 755 -p $(DESTDIR)$(libdir)
- 		install -m 755 liblockfile.so \
--			$(libdir)/liblockfile.so.$(SOVER)
--		ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
--		ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so
-+			$(DESTDIR)$(libdir)/liblockfile.so.$(SOVER)
-+		ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so.$(MAJOR)
-+		ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so
- 		if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
- 
- install_common:
--		install -d -m 755 -g root -p $(includedir)
--		install -d -m 755 -g root -p $(bindir)
--		install -d -m 755 -g root -p $(mandir)/man1
--		install -d -m 755 -g root -p $(mandir)/man3
--		install -m 644 lockfile.h maillock.h $(includedir)
-+		install -d -m 755 -p $(DESTDIR)$(includedir)
-+		install -d -m 755 -p $(DESTDIR)$(bindir)
-+		install -d -m 755 -p $(DESTDIR)$(mandir)/man1
-+		install -d -m 755 -p $(DESTDIR)$(mandir)/man3
-+		install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
- 		if [ "$(MAILGROUP)" != "" ]; then\
--		  install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\
-+		  install -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\
- 		else \
--		  install -g root -m 755 dotlockfile $(bindir); \
-+		  install -m 755 dotlockfile $(DESTDIR)$(bindir); \
- 		fi
--		install -m 644 *.1 $(mandir)/man1
--		install -m 644 *.3 $(mandir)/man3
-+		install -m 644 *.1 $(DESTDIR)$(mandir)/man1
-+		install -m 644 *.3 $(DESTDIR)$(mandir)/man3
- 
- install_nfslib:	nfslib
--		install -d -m 755 -g root -p $(nfslockdir)
--		install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
-+		install -d -m 755 -p $(DESTDIR)$(nfslockdir)
-+		install -m 755 nfslock.so.$(NFSVER) $(DESTDIR)$(nfslockdir)
- 		if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
- 
- clean:
diff --git a/net-libs/liblockfile/files/liblockfile-1.15-makefile.patch b/net-libs/liblockfile/files/liblockfile-1.15-makefile.patch
deleted file mode 100644
index 952a5703b5d4..000000000000
--- a/net-libs/liblockfile/files/liblockfile-1.15-makefile.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -9,8 +9,9 @@ NFSVER		= 0.1
- CFLAGS		= @CFLAGS@ -I.
- LDFLAGS		= @LDFLAGS@
- CC		= @CC@
-+AR		= @AR@
- 
--prefix		= $(DESTDIR)@prefix@
-+prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
- libdir		= @libdir@
-@@ -22,7 +23,7 @@ MAILGROUP	= @MAILGROUP@
- 
- VERSION		= $(shell sed -ne "1s/^liblockfile (\(.*\))/\1/p" < Changelog)
- 
--all:		@TARGETS@ test
-+all:		@TARGETS@
- install:	@INSTALL_TARGETS@
- 
- static:		liblockfile.a dotlockfile
-@@ -51,34 +52,34 @@ xlockfile.o:	lockfile.c
- 		$(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
- 
- install_static:	static install_common
--		install -d -m 755 -g root -p $(libdir)
--		install -m 644 liblockfile.a $(libdir)
-+		install -d -m 755 -p $(DESTDIR)$(libdir)
-+		install -m 644 liblockfile.a $(DESTDIR)$(libdir)
- 
- install_shared:	shared install_static install_common
--		install -d -m 755 -g root -p $(libdir)
-+		install -d -m 755 -p $(DESTDIR)$(libdir)
- 		install -m 755 liblockfile.so \
--			$(libdir)/liblockfile.so.$(SOVER)
--		ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
--		ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so
-+			$(DESTDIR)$(libdir)/liblockfile.so.$(SOVER)
-+		ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so.$(MAJOR)
-+		ln -s liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so
- 		if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
- 
- install_common:
--		install -d -m 755 -g root -p $(includedir)
--		install -d -m 755 -g root -p $(bindir)
--		install -d -m 755 -g root -p $(mandir)/man1
--		install -d -m 755 -g root -p $(mandir)/man3
--		install -m 644 lockfile.h maillock.h $(includedir)
-+		install -d -m 755 -p $(DESTDIR)$(includedir)
-+		install -d -m 755 -p $(DESTDIR)$(bindir)
-+		install -d -m 755 -p $(DESTDIR)$(mandir)/man1
-+		install -d -m 755 -p $(DESTDIR)$(mandir)/man3
-+		install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
- 		if [ "$(MAILGROUP)" != "" ]; then\
--		  install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\
-+		  install -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\
- 		else \
--		  install -g root -m 755 dotlockfile $(bindir); \
-+		  install -m 755 dotlockfile $(DESTDIR)$(bindir); \
- 		fi
--		install -m 644 *.1 $(mandir)/man1
--		install -m 644 *.3 $(mandir)/man3
-+		install -m 644 *.1 $(DESTDIR)$(mandir)/man1
-+		install -m 644 *.3 $(DESTDIR)$(mandir)/man3
- 
- install_nfslib:	nfslib
--		install -d -m 755 -g root -p $(nfslockdir)
--		install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
-+		install -d -m 755 -p $(DESTDIR)$(nfslockdir)
-+		install -m 755 nfslock.so.$(NFSVER) $(DESTDIR)$(nfslockdir)
- 		if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
- 
- test:		test-stamp
diff --git a/net-libs/liblockfile/liblockfile-1.14-r1.ebuild b/net-libs/liblockfile/liblockfile-1.14-r1.ebuild
deleted file mode 100644
index d91ee8a4be5d..000000000000
--- a/net-libs/liblockfile/liblockfile-1.14-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib user
-
-DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="http://www.debian.org/"
-SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="acct-group/mail"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( Changelog README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-makefile.patch"
-)
-
-src_prepare() {
-	default
-
-	# I don't feel like making the Makefile portable
-	[[ ${CHOST} == *-darwin* ]] \
-		&& cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
-
-	eautoreconf
-}
-
-src_configure() {
-	local grp=mail
-	if use prefix ; then
-		# we never want to use LDCONFIG
-		export LDCONFIG=${EPREFIX}/bin/true
-		# in unprivileged installs this is "mail"
-		grp=$(id -g)
-	fi
-	econf --with-mailgroup=${grp} --enable-shared
-}
diff --git a/net-libs/liblockfile/liblockfile-1.15.ebuild b/net-libs/liblockfile/liblockfile-1.15.ebuild
deleted file mode 100644
index 4bd4389ffac0..000000000000
--- a/net-libs/liblockfile/liblockfile-1.15.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs multilib
-
-DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="https://www.debian.org/"
-SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="acct-group/mail"
-DEPEND="${RDEPEND}"
-
-DOCS=( Changelog README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.15-makefile.patch"
-)
-
-src_prepare() {
-	default
-
-	# I don't feel like making the Makefile portable
-	[[ ${CHOST} == *-darwin* ]] \
-		&& cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
-
-	eautoreconf
-}
-
-src_configure() {
-	local grp=mail
-	if use prefix ; then
-		# we never want to use LDCONFIG
-		export LDCONFIG=${EPREFIX}/bin/true
-		# in unprivileged installs this is "mail"
-		grp=$(id -g)
-	fi
-	econf --with-mailgroup=${grp} --enable-shared
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index 2c65425ae9fd..38f7bfb37c0c 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -2,4 +2,4 @@ DIST libmnl-1.0.3.tar.bz2 337375 BLAKE2B 7054b5f2eaff639bcf0bb836ce16d7787ea8842
 DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
 EBUILD libmnl-1.0.3-r1.ebuild 749 BLAKE2B f98f63db109dfd68c334dea46a6678dc631708d7c747be37d0424987adcde4ceaf1c2864e518468d45c6ae85935b786aef047f7b05da232a48c3dc0abb81c9d5 SHA512 ecb435192e6fa3681da974dc4f3013b30ae3bf4e6abe0eda5e260d90b87cf861380a7a09f5202069343938a10803fc892acf81318c022f9ad75cb411688b48d4
 EBUILD libmnl-1.0.4.ebuild 760 BLAKE2B cab49e4d3e5b3193531e2b8a133c1c2011f330d0153692d27b75f4bcf31cff9148a22fa376e7774a0cbba53f739024cde67083ba162ff8309ecac2139350924a SHA512 973e4f711700e5f76b291659bf9d23052f95dd2fcb60d806892c91282ea0d13a99dcc387d34a073efb694eefc98da7de6576ab6f307b3ee47dcde1e6b23f7c4d
-MISC metadata.xml 664 BLAKE2B 4245edfc6318a54d3ea1f1cb29113cf0a97be7303aa8861eac42b591a92f79372d771f73cc73f6820496444f05dfef8d798bd7b30adf5911b53b0d969b9eeba7 SHA512 92caf3829016e88cd6560da7ac0bf8140068b69abe8341b5a5c88ee353bdb9bcd5a5b5a1563cc9114d91529b8a134b42b685734e62127b2834393a76e01c5cd7
+MISC metadata.xml 746 BLAKE2B ee4224d1afd9af317a58360a189e8d3d97b2199c01b35883fb1644fc42518a7c79f0900d10aad99287a47e77767564f83e18ea3fa45e0678bf25f9b1e8588ad9 SHA512 f7e4824b61e60bdfa64e4d9db37051ac3240c6ce66518a2f74d643b49b2cd206daedd088eb9eba974b6a51f5195c8281742398428b1103a3b83beba869347bb1
diff --git a/net-libs/libmnl/metadata.xml b/net-libs/libmnl/metadata.xml
index 7d46164bb176..8e3ebff5ba46 100644
--- a/net-libs/libmnl/metadata.xml
+++ b/net-libs/libmnl/metadata.xml
@@ -12,4 +12,7 @@
 	library aims to provide simple helpers that allows you to re-use code and to
 	avoid re-inventing the wheel.
 </longdescription>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libmnl</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-libs/libndp/Manifest b/net-libs/libndp/Manifest
index bf56625e7e63..3dd6b48f50da 100644
--- a/net-libs/libndp/Manifest
+++ b/net-libs/libndp/Manifest
@@ -1,3 +1,3 @@
 DIST libndp-1.7.tar.gz 363502 BLAKE2B f9b4dc455a666fb8d7bbedd49ed2c66764eac0e886943647be906fbd2912379c8b0bcaf64460316417b9d13011c79f5cf6a79d0dae0af991b137cb69940e85c2 SHA512 4aadaf6d7d8b9e57983cba17ce92715cceef6635613c4c5326decb97fb575ce5f5d5586a629645e3605a03e385c6481bfb6c4458216be2bbd36959af62783790
 EBUILD libndp-1.7.ebuild 561 BLAKE2B c5338ef17843cac86e3f72a803e7f2b311da2bff20da3b36313d3fc97edd0c19b1bffe288479b1fa8c42dd976c2c5351c876d94c42924954bbc661256bb06f5d SHA512 3a1a4ef495a927f566f758bca34c3fe3a18c7c7fb1d6c16549d04af350168582d985b1d9b6108d5d04b5cdc4291d531f4b8deb5692fbaa4806a1fa4fb185a3ca
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+MISC metadata.xml 328 BLAKE2B daae7e3df86ad08016fd775c15491ac7d74f23b068d738ffc3ac73afe1be68567d488a007b49a2fe7c5c93b0fc06138838b3deede3b999728e9a597c3e7b0f9f SHA512 25b1bd4544967e35a6a9fe5f09992dd422f9f13203a81feca04db959bbc26bd1f1bb5b6be4642b97ae043c1998107fc54ab721778b2969c4652a90193eee4828
diff --git a/net-libs/libndp/metadata.xml b/net-libs/libndp/metadata.xml
index 39980802b1da..55c542b49523 100644
--- a/net-libs/libndp/metadata.xml
+++ b/net-libs/libndp/metadata.xml
@@ -5,4 +5,7 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:libndp:libndp</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index 5c681928e54d..c260192ffabb 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -6,4 +6,4 @@ EBUILD libnetfilter_conntrack-1.0.4.ebuild 968 BLAKE2B c1d3943def2e1b3d8eb61006a
 EBUILD libnetfilter_conntrack-1.0.5.ebuild 981 BLAKE2B a6cf9640745c047eb38ef0cbac268ef21e379289b6230d4042b10b040d8fb0faaecc1bd37a026356e6c2d28c5ba68f73c4172584b63db2eb0f19341c4a3538b4 SHA512 23b8a125ed2dbf01c324411085e8464e60d6eb03980a185b34ff6675065e5a1a6963c001f24d242746f8b8b54e02db20925543f853962dc18694246723b45af2
 EBUILD libnetfilter_conntrack-1.0.6.ebuild 968 BLAKE2B b4e9b7a61352bfe98370bc1279307663e22f0aa642f12a8b76a2cf662b30cb12a5daaae01f32ce6fa3cbf7f7697b49903c0022b925d1f4cfa9dfd60ab30403e3 SHA512 df358cda920583fae2ae4f6e5a02f5ef06aef910dbb37222751949ae3b28acb8cac2019b5658376ee237865a3597ea286b4fb1fe2fa7cdd9f484301c544b2931
 EBUILD libnetfilter_conntrack-1.0.7.ebuild 981 BLAKE2B c39e1a11445e87d8a4dfbfeafaa9a9e3c31903d4632161c7e40ffc5d23513f74d111536a2ff80e1d16bfb481deacd2a5dcc0dbf7f64d0174508617bfd16b792e SHA512 cb19e1486db81b3ed526053a2d2712545fb24160bd2f24da86d07862d79287eb4433b62d8cb5262b699acbdae3696a8b5c10f29b21f91a1e14c200866644f5ff
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+MISC metadata.xml 374 BLAKE2B 6717c595149f5ba96cab007d61021da51fa93da6cadc277ebe48cf56c89d0dc78a97b099084cb00879d5650993f1fef5bb57a591629d6773d572be065c75dc3b SHA512 25429c178b3bcac4773cb679c5609a97afbead92eb09292c174964ee6122593f16bf2aa586f5f70fec6dc47d1facb1f4b6f739c81439afac48f401eab0802c1b
diff --git a/net-libs/libnetfilter_conntrack/metadata.xml b/net-libs/libnetfilter_conntrack/metadata.xml
index 74c2baebb4ec..e5e613464dbc 100644
--- a/net-libs/libnetfilter_conntrack/metadata.xml
+++ b/net-libs/libnetfilter_conntrack/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libnetfilter_conntrack</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest
index 47ff8c775344..160192f34f60 100644
--- a/net-libs/libnetfilter_cthelper/Manifest
+++ b/net-libs/libnetfilter_cthelper/Manifest
@@ -2,4 +2,4 @@ AUX libnetfilter_cthelper-1.0.0-clang-export.patch 12273 BLAKE2B 644fed60ba6e7b3
 DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 BLAKE2B 622a4e27629d97a0ab2b5032e972914f2ab8764ab60ab7090b173ceabfe9648e09452e931dacb822090c5f816b553b8e73b8f8a4ee431db9f6dd092d9d4283ee SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45
 EBUILD libnetfilter_cthelper-1.0.0-r1.ebuild 765 BLAKE2B cf85b6675bd7f8bb6274587787073beb1e70ea7db14ee8ef76cb9070b1db0a5bb484289c22c255847df27e7d24cff6d8044ee8f2b6985668cf43611b7eb19024 SHA512 230a52abc9917748b59d8cc38ecba74f05f11aeb230c4165e8935c187c13d897ae7ae623539e52f09e67150d3f1e3749881e4f69f63153e31ad365cc0bbe75e6
 EBUILD libnetfilter_cthelper-1.0.0.ebuild 697 BLAKE2B 4b241ef9706daab8243b6d2ccd7fca50e31dd32cae3cb4d2d4f4b7d0c879639f1e893a5c2cdbdf229479ef6482d4b214a3c01f9ba6d7e3e64dacf92d4113f7fc SHA512 031daa0c68910d0f3119d3121137d4d829f4742f7944a4e5c217da11fcc98dd7035787512ad7463cc3b9d44e576f61d219eae62f778243778b3a23dd7ed85a7c
-MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
+MISC metadata.xml 380 BLAKE2B b3be5da421fcf323bc491a3d1d7d131c0c1ee03bd14929a3e577c6121dc135b89610967f2acb99f10be2eaf947cd45438328fa5391f38a7fbc49ac1e170876e6 SHA512 fa7fe723f37affb303cf3c826c5edbc75ae79b5b4da381f496e9b8fe5fc0071bf45fa8325f9e15e2e7c7f794060d8e924b1fc872acfe0d38426da5c80dec2a2b
diff --git a/net-libs/libnetfilter_cthelper/metadata.xml b/net-libs/libnetfilter_cthelper/metadata.xml
index 2c2a7923cfc8..ceb2db8aac8b 100644
--- a/net-libs/libnetfilter_cthelper/metadata.xml
+++ b/net-libs/libnetfilter_cthelper/metadata.xml
@@ -5,4 +5,7 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:netfilter:libnetfilter_cthelper</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libnetfilter_cttimeout/Manifest b/net-libs/libnetfilter_cttimeout/Manifest
index 0c41919e2776..50ca14d6861e 100644
--- a/net-libs/libnetfilter_cttimeout/Manifest
+++ b/net-libs/libnetfilter_cttimeout/Manifest
@@ -2,4 +2,4 @@ AUX libnetfilter_cttimeout-1.0.0-clang-export.patch 8628 BLAKE2B 8e0b283c0ee2b5a
 DIST libnetfilter_cttimeout-1.0.0.tar.bz2 275065 BLAKE2B 8b0f952bcd4184141a434abe25f807ad07bb74713a3506d335c5368ddce2809596c77e5e534337d897fb6268afa137f6d98cfd314b0b33b4996e4a0df4d8eba6 SHA512 d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85
 EBUILD libnetfilter_cttimeout-1.0.0-r1.ebuild 765 BLAKE2B bf865b336ce61e5471d34592fd37eaab5bc83dfaadc231637115a6b9a33c8d83fa2e3c0b5e8f8dc9c61689db6f819a833d7ef890a36f0e6a7c4104d522b2ace9 SHA512 e782ec61b8c9b06fd4d6e9519d001fd93ec5fe93590248fc41766d7c3af2aa5e4c6ff78404d68322ad247e0289e68efbc9d81e9f67efa52b4e56e3857af7e29d
 EBUILD libnetfilter_cttimeout-1.0.0.ebuild 697 BLAKE2B 0aaab17466c3a7ff511b65d12ea978f061e69b80710d092821da0c8ca6c78388ce90772670a5b798140a406c2fc103f3ecd2db7816360beb65e481ea28c09086 SHA512 7b724b75ee17c6e9928d4b7cc65efe252efb1cc628abb332f760cfee423c125c62db1cf79823b4321ccae79b05e5886a0336ed561a98594ce835df677bf9a6ff
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+MISC metadata.xml 374 BLAKE2B 93797c22573c07b7d3897cd10159b7cef6162c4483a13b93ddbe034cf883953c990ef6f649a177c252706306dcb716057ecd35167a35da1c3a955c586e33955f SHA512 7d6b4b79303957a1668019f24f08a0d116ddd21abdc387ca82ced9bed93b05fe5bd896fc4216d02961fc588204353204d1ea2c6d144efbdfe1cce44d7b26f143
diff --git a/net-libs/libnetfilter_cttimeout/metadata.xml b/net-libs/libnetfilter_cttimeout/metadata.xml
index 74c2baebb4ec..430482ee0ae1 100644
--- a/net-libs/libnetfilter_cttimeout/metadata.xml
+++ b/net-libs/libnetfilter_cttimeout/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libnetfilter_cttimeout</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
index 27d808929a98..2e3930429077 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -2,4 +2,4 @@ DIST libnetfilter_queue-1.0.2.tar.bz2 354201 BLAKE2B 5df5a94ca07a6fb919d8a153143
 DIST libnetfilter_queue-1.0.3.tar.bz2 314857 BLAKE2B c25b0395b13af3cecb960c39bcbc4f10a3f203aad7acaeb277346423310700d9abb5b8a65f27b008e5f45194aa6e0fd6a99c8ad25a1e3200904be70c5c6ddaa4 SHA512 1d9e0202878bc0ae26ceecd0f4fa4c21f89056e5671d46949f92f21c155d589958b7775760fc837547da34eb9a81e537e95c770d25c166e709dad16de4ca452e
 EBUILD libnetfilter_queue-1.0.2.ebuild 734 BLAKE2B d8d107fefaf2cadf8ab1d447a3057d4dcdb7761be47ab71165a0c7c47c132e75058f88856c957329ee18ae94ed940f222ca986b79f51aa8810da21ef8102b7a0 SHA512 7de798e5f3f7f0454df64bfda182a312a96f5b33b15b86380ea9e3f8d94140d6f8559df945dfb81de2768ab90ca54cd1ec1283ff7ce4620ed9f64057be4deaa8
 EBUILD libnetfilter_queue-1.0.3.ebuild 731 BLAKE2B af4d66659b119dbb220e8d01a735641447c01e1bfddb5359c9eac608b874264046597c28f9c98a3df9fbdf6eccf233e3a1701b6604851c62763ad6b4a96b7a05 SHA512 9dc9aa4d5041c691faf05cd855b60d5a60eb87632bb9f702ce768f79d761b305cdbc45f88f3e0fd440185a254f6ff440e72fe03a50e8045dd1237fdfa108c8e8
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+MISC metadata.xml 370 BLAKE2B 5ffcfd5d89a391b532e7d64188fe64b9a99a72c9072aa8bea89157a3b322b0f1ee0edab1ba3d2b088857748ab2e5402dc6ba0db514e9c1ba465bf0b6716b6fc9 SHA512 d81ab4bbba709f4b4dd90ba5029ed20471230817f7c538e502ce3cd533e1439326d101e8e7a34e81c8714699d87f195dd95c2157216f9926baafe7b5c8aeb213
diff --git a/net-libs/libnetfilter_queue/metadata.xml b/net-libs/libnetfilter_queue/metadata.xml
index 74c2baebb4ec..36c0581a520c 100644
--- a/net-libs/libnetfilter_queue/metadata.xml
+++ b/net-libs/libnetfilter_queue/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libnetfilter_queue</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index ef5bfcd864c1..283f9ee86a97 100644
--- a/net-libs/libnfnetlink/Manifest
+++ b/net-libs/libnfnetlink/Manifest
@@ -1,4 +1,4 @@
 DIST 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch 677 BLAKE2B 189c57ffc8eeb6a83e46fd1d53390e977294f7d3a269d3ffab07e1fce04083a7b4b956e93e02f4f81ce6db4ec5be785b16d1c75ed7e0b4fef9883154d9407e18 SHA512 fc452e2924fa4de66e104229bc05a663c253148fb1c0bd62e5454a907877ffb084ba6a04e38bf4ef71a4e58041f4a242001a8029aefbe97ccc00e3bfcb7bba41
 DIST libnfnetlink-1.0.1.tar.bz2 320641 BLAKE2B 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3 SHA512 2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104
 EBUILD libnfnetlink-1.0.1.ebuild 1490 BLAKE2B 00d5bb529d106ccce36e8ae5f702edb28abda84998b02aacf09e639fcb38d924977bf7746b480e43610cf4a757c4d50eef410a0b9f70f39199bd6c7ef9206cce SHA512 ad29e647e4d00cdda114b8579807ac3546431123008fe7b3f40260bd15fc5a530b5f97b242e31d1687322d11a5c278d9cb5f11730d5e8a419fb7b98f4b48dbb2
-MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
+MISC metadata.xml 364 BLAKE2B 688c9d5bb9c4fe16699fd7535d4201c069573e833f805a8321a30aed5d51cc988439d463d9b780387c641bdf477798673fdf3a92153b9f61760f5de79cad3843 SHA512 cde7260e5a76b9e921692fd265f3e5da028492bb920db58ef3b12dab29cfa402cab322b4f5f48f1949e37941a6d6065039f371861e5fa7fd1de56feff62c97bb
diff --git a/net-libs/libnfnetlink/metadata.xml b/net-libs/libnfnetlink/metadata.xml
index 74c2baebb4ec..4bdfc11bfc02 100644
--- a/net-libs/libnfnetlink/metadata.xml
+++ b/net-libs/libnfnetlink/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@gentoo.org</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libnfnetlink</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-libs/libntlm/Manifest b/net-libs/libntlm/Manifest
index fe4d345b0202..896afe94d77a 100644
--- a/net-libs/libntlm/Manifest
+++ b/net-libs/libntlm/Manifest
@@ -1,5 +1,3 @@
-DIST libntlm-1.3.tar.gz 518803 BLAKE2B 7cdb4a27c4598d935a7f4916359fc6b177eb6407f45d7b3832956fd9a0378cfa6c6e2e490577c843d3c92cdc283681b3b1fc796c4ae48b7f40a99b5a3551b5c9 SHA512 d375d472167e9c0f142e2415428f48ef692c9fcfe4d882ca442e0fbff86554a5bee23747ad1eb27f81d32ec2f3f5ff654e5c095e4b62dc25dc4918e6664966c0
 DIST libntlm-1.4.tar.gz 568414 BLAKE2B 2a622cd2d7b944128e29503845a3c9789efc9d14a93935ea24f9001d10b279969a8869f7ca68e6e36728638a32ce1ef693a5e8c28ab3bcaf702e114d4bf21dd3 SHA512 888ed2e9ee3e01a53bec951534966378a21c8a0baf555b65d97fed4408568c6b67f4199396cf3e61bb5a73b8e47dbe1333449369a92499e16478b0b60ac78274
-EBUILD libntlm-1.3.ebuild 544 BLAKE2B 53a01c011e1d72199e2ef85ddeb6c19c948b0efecad8644929d312fcb0c61c05c10d03d022c7adc240ebde6a1673ed0f583e9a3a42c15531fbc0b6f03f79fb51 SHA512 9dd07a7c1ae43e096cc74d52104cdd2bfcaeb1de12708ef60c23767d477ead55c369f2e02ac0ed07080a39910921224e2380b660aafc104ab673905a12755eea
 EBUILD libntlm-1.4.ebuild 445 BLAKE2B 53b25ce4fd6947072fb4bb4aa724ce2c06fb4966c195bb7d407b6ae55c09d9b2b9570447cb9a82cae61389c709f06764c385a8d5c6bb7929c9a2e46014684163 SHA512 6912b45ad4e81f059e58340b01d366c2381680b00387b9acb1cfc6f926118878a84bd1a55b7045a0d7cbefef16eb7eee0edadc0b7cfa3de22255408f5ee6854d
 MISC metadata.xml 561 BLAKE2B 400bca5cfe90103ba77808cdf4fbd777b3c19dfabff4336df9bde7e8529da948a4b48b06f1f5151e6f62aa45e5a4cad51b4af7dd2799c9aa8dea89f390936eab SHA512 60e06d45b1482e819824259dcc992d355961754d481700ab41f1e3050ec70893f9075c19bc846591f3aaba9a135de5610686cc82feff1b8119a1466865b08a94
diff --git a/net-libs/libntlm/libntlm-1.3.ebuild b/net-libs/libntlm/libntlm-1.3.ebuild
deleted file mode 100644
index b78348b90109..000000000000
--- a/net-libs/libntlm/libntlm-1.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Microsoft's NTLM authentication (libntlm) library"
-HOMEPAGE="http://www.nongnu.org/libntlm/"
-SRC_URI="http://www.nongnu.org/${PN}/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux"
-IUSE=""
-
-src_configure() {
-	econf --disable-valgrind-tests
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 912671aca81f..ee6c9ccb66fe 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -15,4 +15,4 @@ EBUILD libpcap-1.8.1.ebuild 1916 BLAKE2B 8e51e1f17444dad1614f3f182c0eaacef1ccdaf
 EBUILD libpcap-1.9.0-r1.ebuild 1850 BLAKE2B b58af5a4955c4476724d65f45c4adc44fb950cc327e282d6fb0cf4cb081624f7cbf5f931c557a6b14aaa9b0c992267031f7cb116b80fa0981450ba689d24ae12 SHA512 259c29e531b016747fb9b2ca02782c6e484068bb45b573adf6c4c878f10f056b859db669c63e9cff9ed141aed8e8401ea173452e9b03e424a58dff18e7133e10
 EBUILD libpcap-1.9.0.ebuild 1807 BLAKE2B ef1334b7356fe43b302f8526e70b8c244824ccd60b9e3825484f56f4d46a2f76d23dfac18d7f1c36aebfbba097252e6c27e8f706049cbe0b3c1985a8e938025a SHA512 31f6a00350d35015c7cd6de63715d0e5fcdb86be2aa81067d201c2a9b00196e0d23736969b1a1df7c915fffbbe9e524e57d35f1550ecb644f93659c728fe6116
 EBUILD libpcap-9999.ebuild 1510 BLAKE2B ca653872343d7f710dcf2ebfcf0a85f40fd82392cb030ba6ea0d1b01be98dfb132c748e7baf55c4556300634ee08836886f507b642b5172f6c3ba7ead3e84361 SHA512 472ada950b336389d86c12ef428636702e009a8a0e7fe63ecd0f3eb497a669b97e145b5cd91a4c3e04f1c803470a313502be2f89d400747c91fbc9023c9fcb8f
-MISC metadata.xml 475 BLAKE2B a914e052c15c557f921c504f0cf128704ed8854bd8107dd2019a5584dd86f80ad06545ef8780e01447c309801207e2f83e286a90ad755ddebd7447d27bba1336 SHA512 ff92cbd5725e74f72d117b57d85858851ddf3b27046bf7d5b9e29cac8e07c98bb21e2a81ff8ffcec08adb062a42deb051019d60911a8b86ecd232a37e1b88170
+MISC metadata.xml 532 BLAKE2B 849e5d71a36953d94f8fc4ccce028dea25038eeacf50cbfc45c390155ad84b87fdb217b1f2ec4284c331f98d72367b9e3e82283b3660805f506b9eda8cdfd236 SHA512 e71f06ad211b784c6a454411f54a0bb7575a934f86f345602d205fdfa56b609e4d2d0b5c907bad047793f3c7b4373e000f67e914c17c1f402cc267e7e7493f06
diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index 488e8703b179..241fb6113b5f 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -9,6 +9,7 @@
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.</flag>
 </use>
 <upstream>
+<remote-id type="cpe">cpe:/a:tcpdump:libpcap</remote-id>
 <remote-id type="github">the-tcpdump-group/libpcap</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 941c275d977b..4c431e19dbfc 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -8,5 +8,5 @@ DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f87
 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
 EBUILD libtirpc-1.0.2-r1.ebuild 1676 BLAKE2B 95d6e124b652527f41be0b9bd26bc7d0aa5e8771aa66d043296432d41ed5c140a523251dd6ab9666b63f273e4372fefc95d4c3316ab07180c0072a72e1cf0748 SHA512 c90f06a5ee77a4f051c7b6596ef0a6618c7d42fc50ea8874e3937a566902b14f9e841d59518322e082cc29ae23b627389bcd42dbaf22000f531f5dcad00862a7
 EBUILD libtirpc-1.0.3.ebuild 1551 BLAKE2B c390415aadfcd1eed82c0149eac08c8ec8d67ff72ca2ea1da6fd3fd95b0b8c82cc8de27117a1e0ad805e057ed076b8625c2ac7ccd379f3cc711cbd67843ce62f SHA512 2b7c8cf69aca75cdb96ba82334b47ec2a0527daab0da2de4cb59d1086b8598b49bd556efb323a8b4a8e3cdfb1737d06003b3326201f7c6855df30531fb37735a
-EBUILD libtirpc-1.1.4.ebuild 1555 BLAKE2B 8a7d487f856300242a18659e12974d84d51777f32c8c0d52a99ff3395d5329c7db00e8d329f3d04783779ccf3b803bde59e186ff98f08e390d723b7d3fa6aacd SHA512 3e4c49ada7c56d3c2d041d7e7551e563ca0bc4331287e987bd935063b3217103cf0f9d295c2641b3ece0af37a89776170c005637c9117638dc3a054f170b1951
-MISC metadata.xml 335 BLAKE2B 57eb0cadaa82d4fefb0adcbc01bc19d720ebd10256a7188a70e7ae69f147acba7370fcc07813352a067a181bb77321677713cd3ed4cf77f0c815a88a30abbf20 SHA512 d6dd857293827907e545dc6e8631d06682d20e13442f8ce6cbd2e2a789d885c8a788f4ed1d062a8c54c4165d22eb096279d4c2f598e462a57faaf8bec1e9777b
+EBUILD libtirpc-1.1.4.ebuild 1546 BLAKE2B 83b9f0c5042dd551b08c5f7418d6077ef48d0c22e85f7d1ffd0e6c9127adae3be340d42c18eb860fa47ac62f5ce8fda08ca99f631d5c3d9b180c356e4e474b65 SHA512 0c7b0826d1e23e23f6536c1e1a5666298ba82a2c9cdf9dee11d24d90b82e95a18707a6f025956b64a32bfa8afe981808286771891815c6531d6b222c78ed269c
+MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa
diff --git a/net-libs/libtirpc/libtirpc-1.1.4.ebuild b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
index 154c5fcdab39..c5248f9bf9b7 100644
--- a/net-libs/libtirpc/libtirpc-1.1.4.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0/3" # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 kerberos static-libs"
 
 RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/net-libs/libtirpc/metadata.xml b/net-libs/libtirpc/metadata.xml
index 36e84cdfa7e1..9034a1198e4c 100644
--- a/net-libs/libtirpc/metadata.xml
+++ b/net-libs/libtirpc/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:libtirpc_project:libtirpc</remote-id>
 		<remote-id type="sourceforge">libtirpc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 400a82269940..3882cec690d9 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -1,3 +1,3 @@
 DIST neon-0.30.2.tar.gz 932779 BLAKE2B 0536e4f1c8634ede9a1806180c315772a65b9cb1ead0ae3674d58aba855905b6a7c7684ef930ca1998c1163c662d642a687cc704922981dbc4a89efaa83f4cd9 SHA512 634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631
 EBUILD neon-0.30.2.ebuild 3428 BLAKE2B 0b6d26febcd80cc8289c51abbf7ceae84bd88622808fc0fca3da19131e6ce3ceef4e071b80815b8b6ab8a837c0b60133bd9239173ec3122da47864e35794b258 SHA512 e5b6370cae0b9cb4195cc52ade60e753309d7a3c558e1af5fcfdffcae221c80ff4076da6466e24fc2f1702ff491f7aa0c526809c76bffa8bb3dd898e10952c15
-MISC metadata.xml 1199 BLAKE2B 495e472125fe19c83d094194f31d428eb3dfa48ce15b643200235753e6b551b05c1b5f14f88454fa0dcd0364e3bf1f55ff4d1050d3954928f9398601860e2baf SHA512 623626ea62c3f7998122acbe60e36a67a3d5a5abb1c7239a03bf099b7ee7eceda14b16fd1384e303b9bc39d4b65d932d31c5f365a76b8c45fcb1407fdf80a455
+MISC metadata.xml 1341 BLAKE2B c2bec964f34a0d9be01935bd3d78d3e4afcc0101f9d31eefa44106c13d3e8c1f91b227b5f15449d71785a889dfe801768c8b2aee361b919aede85e0d41602a17 SHA512 9b40394e7a103b87d61c0ac004dbb7294bc977ccb69d2669f186ceb1980fca2e2def5ac097ae2364c4e2c762e5170d06a5b281bbd870ebe00559cb5cb17d87f8
diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml
index c22fbd8f2851..78e276ad6748 100644
--- a/net-libs/neon/metadata.xml
+++ b/net-libs/neon/metadata.xml
@@ -4,6 +4,11 @@
 	<maintainer type="person">
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 	<longdescription>
 		Neon is an HTTP and WebDAV client library for Unix systems, with a C
 		language API. It provides high-level interfaces to HTTP/1.1 and WebDAV
diff --git a/net-libs/ripe-atlas-sagan/Manifest b/net-libs/ripe-atlas-sagan/Manifest
index 80adf8aa2fe1..50abc19ebae6 100644
--- a/net-libs/ripe-atlas-sagan/Manifest
+++ b/net-libs/ripe-atlas-sagan/Manifest
@@ -1,7 +1,3 @@
-DIST ripe.atlas.sagan-1.1.10.tar.gz 128425 BLAKE2B ba2ec5c3c58d8ec4cfc03dad89d7b3d705796a3e8a37b518fb63cf32ace360c4790401c5ba384cd3ce6690cea30d83413472aeb26c32ba5dfe46908c5170b6ac SHA512 dab5aa200a77ca4f4a29b2cef79df7c12cee4e6ff2583e5cdf1e6e381b9ca4de2e4bf8c56e9856f9b79ed196f72304d62b8cbaa76b0aa9a5d5294559b8f6bbce
 DIST ripe.atlas.sagan-1.1.11.tar.gz 102136 BLAKE2B 21ca1745daa4073d392a50630355bf793e656efb24bb8c529222a5ce20ae209b886781fc51aff8b25b832e1d804ef10d55f8cb8d504021add93d0d23900a9489 SHA512 4c2ba0774be46cf9dc9eafe5904dd7915f21bfa047fcf5867d6e1a41a4370f70cc837d398368efa2f4b24750f655514287dcd5b97a1b47e725fba3f17f49d477
-DIST ripe.atlas.sagan-1.1.8.tar.gz 100037 BLAKE2B 1054dcedb7f31766fcb2dc388efd87c3a5ca12526757adfcf5b7a57a24caf84bbaa0f84c2377cab1877e95bda96b087f1139a950e5e6acb92f60b29fd9322396 SHA512 9e89eff270d58ac0d69abf5c589a129b468ad7adbe49144eae9e3ee1a73ada3278efbf395aea02b612fd3b3b3db2996d68587f5465b1cec29de79b112cb20b53
-EBUILD ripe-atlas-sagan-1.1.10.ebuild 823 BLAKE2B 46a65babb7ae9990bf2e020b12a70471a84fc48d13fd7cbc1c1e9ce55a50c889de10aaf4a7cfb49577fa3f9de61b19e53d07acee9756f1354a97cd1692f4f8ee SHA512 c4eee9830df50b841f944956896c1cc4766bda0adb68e2b3e0b920205a84671760a4bf64eeaa79e35d0654abb2a28e1f7f4d98e8c50b0814ffcb4e47b346662a
 EBUILD ripe-atlas-sagan-1.1.11.ebuild 856 BLAKE2B 45359fc23e6bd24a561ba5608209df99834a8c0fbd4e24215eded258744ebecb8d905472c3cbaeb310b25df903b4400aa8b6976d1b61532d8f005afa0f92d861 SHA512 799dde2d232cd25e6d695557b1e8c3202a98ffd123ae2673d6fdbc8b430768a0a3f84143c6b1995c754384eea50acc874c45c4dfa830dff372bb5aa3eee49092
-EBUILD ripe-atlas-sagan-1.1.8.ebuild 855 BLAKE2B 1c0b04f14a3aa18e1e3bff3ecba1bc6742455177c091ae92a1a6c1bb161c583d5002b60baa8aefe816e120c8dbd665b68175723cbf9df5774e06af36726977f1 SHA512 54e487101113b84f484c9596c6e95f509438c45d475fdd73eeea3102546e4113b2d430be9a4148c4af4b9e0c0fa1a497a6da0e0e043ba63c2a1066bb79b4fed9
 MISC metadata.xml 245 BLAKE2B 8861d59570b93b8a74d1547866a7bc2fe18de2b72b16cac928c367570770a591ba1b288080c32f0d6228628974fe707c80c5f236317b4c8d2681d496625b8897 SHA512 a18c8deae207bd61184671671720a29b821623c050edf253b37cdebb500ea1ee84f219baa503cee046b76fb6a8d5ad1ca18cbf646754490aadb040d9b32bdf96
diff --git a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.10.ebuild b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.10.ebuild
deleted file mode 100644
index 2acecbf72e02..000000000000
--- a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="A parsing library for RIPE Atlas result strings"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.sagan/ripe.atlas.sagan-${PVR}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		"${RDEPEND}"
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
diff --git a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.8.ebuild b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.8.ebuild
deleted file mode 100644
index c573da8f16f0..000000000000
--- a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="A parsing library for RIPE Atlas result strings"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.sagan/ripe.atlas.sagan-${PVR}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-RDEPEND="
-	dev-python/ipy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		"${RDEPEND}"
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index 994ab9262c16..0c473c7a47b6 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -3,5 +3,5 @@ DIST rpcsvc-proto-1.3.1.tar.gz 59174 BLAKE2B d50d958cfad79142d686ae6312cdaa6044f
 DIST rpcsvc-proto-1.4.tar.gz 59127 BLAKE2B 484c04d6a0f86d37c0057693771b7fe502166504fc419bce4dd182f76e349cf226307814a2c51b27fa0bc09e270b883cb40ae821f8bd7d7e0c9a120c4962ae34 SHA512 a29d7761ec9cca4d7d7aa6943a243771a6c7f35d303f01af84f390c8395dc5e543fad7ea28fec1be2f6ee8f2853bf22a157ad3b020057040685b6cbce9b09415
 EBUILD rpcsvc-proto-0.ebuild 481 BLAKE2B 4e507a8892c32f17d0852603b2828ca6b69621fc2686db96016b81f1112d1fd38ef6b83798800710fea95cc2bed21b95957c72c83dbbc2397a724c9907891d6d SHA512 9ca5e01d4aeb44b676f958b895a5bdb754ba88b2db19f4c8522408e073e1c901297c135391e1fd94368e9b1c87671e84523715458c98567d60ff3b037eca4cc5
 EBUILD rpcsvc-proto-1.3.1-r1.ebuild 688 BLAKE2B f86e886eb61a421f74c8373e41ee46a03cc8d92a5616d95cd463df808ea959b2af5e5c67894bce1386d129aaf0606bc1cdd4cf146762ebfb7184ed3bf0272170 SHA512 5a8fab744c86854f0924fb0532bd4c4cb023b83d128572ea440048923c213a5ca6f15df74dbb0537e81b157b6f57d60fba148cc7fd4d38c7df4f5bacbb880cd5
-EBUILD rpcsvc-proto-1.4.ebuild 647 BLAKE2B 274128c8e109224f042bebbaa6b19661fc937ba304a1825b703e783e11c74122b7cf9cb65ffed98188c1e6cf01bd9a2c35f8b7fb4ab5277b6391d7c809f2d21e SHA512 b7f0bf69bd1f36e03cad7aef88df7f860d31533755ae37f07c6e61aff540a0517cdb164e95af1895a8625551beaaab969edb75f52b84199dca8eed22610e4e74
+EBUILD rpcsvc-proto-1.4.ebuild 638 BLAKE2B 1f3e486c64757d266d5ebab2a14049dcdee7ebd0b885c8d758bb6f8ffa3fa2b1407240424f809a82f29d013c103b1714a1ac416d4967a434b65ff60ddd4c97a1 SHA512 aa2005572cc7679296be89a307db3a1486d41cd3a75e2c3f7e52b52e22b649f69aaaa0c78e3ea85def9c8ebdf9a3f42f1f3e9b77bc9d8f89347b2500f5465853
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
index 353734d0571a..15ca0b74ffe5 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-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=""
 
 RDEPEND="!<sys-libs/glibc-2.26"
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index fe49fb1c0cf5..2a032f979523 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -8,4 +8,4 @@ DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2a
 EBUILD serf-1.3.8-r1.ebuild 2125 BLAKE2B f8276c9af00f571b33933b2a6b2676694c8dfa7fdd1f465c3171997936468094a793ac747e419457addca1dd358983dcff2155cc72bfbb577d1c8f8b88eb85c1 SHA512 4db061cb8b0d4af9555eaef6ca6be13b2a731091974086cde09cd6f36b537047265fd56bff4cd46b1739915160a7705bca6e391045c5bc81628f3fe08b90d406
 EBUILD serf-1.3.8.ebuild 1512 BLAKE2B 79480348f4734e32d06e40f9ab7cdda4f464d9226b254d8f31a28f3468cef4af56f12c64e881b9bdc6b3aad0d926155706801729ad3645d70fad034fb33aba4d SHA512 92109ce007871baf0e52a100d8b88df475413b88e900beabb3598905ae41e8a4b8881ecebcd8788954a031c6c2c73742a43b4647aae46a713a0568083d4273a4
 EBUILD serf-1.3.9.ebuild 2127 BLAKE2B 419bc569c5160f8406ac098b959238a47230d0bf762f7644e420168dd6b252e835616a88598573e66e144747bea5923e5c5e49892a2644aab90bfe22939bce4b SHA512 23ba5aa3fbb59ce5b3140a1a281c3868dbf378c1dc93555ffa5634267ca89c9b0a1109aa8240fcca25ad6ae2178d00db7f4e41db7f9e4405429a6ad359e3e4cf
-MISC metadata.xml 222 BLAKE2B 94ebd170c2e2b56a2a280b892081f4a2b380a9dd63304df741df254293ac82054167980b6e986315718abdf0da5f6d26226df0d13c3f1eedc4ee2f32bdb5a798 SHA512 c4199e672c74e701df271dc48c920480d853cdc341936ef071bb5d1cd3a28127ff0fdf6a4e135ce7e805bcb99bebe93407dd2aa4dfda91a8c66d6cc2d2ae9a01
+MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml
index 58be4f4a109f..ca82cfff518d 100644
--- a/net-libs/serf/metadata.xml
+++ b/net-libs/serf/metadata.xml
@@ -4,4 +4,9 @@
 	<maintainer type="person">
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index fb2224464fcf..8a9e7d26c337 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 0e45dbdb9e3a..dfa4b762e529 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -8,8 +8,8 @@ DIST dovecot-2.3-pigeonhole-0.5.7.2.tar.gz 1857602 BLAKE2B 8de6200bb1ca99d25b48c
 DIST dovecot-2.3.6.tar.gz 6980135 BLAKE2B 59ce625aafb96092cbd687aa0d5ccc3d7697228606978efa89bbf50e608915e381abb79348197aaf3b3fa046618bcf88acdc77420f9f028035653b8cb9843009 SHA512 ec28af2efcbd4ab534298c3342709251074dcdb0f0f4bcad0d24b996b273387e2ce557d7ab54abafb69be3ed7dd61f25c82b9710d78156932e2eff7f941c9eb2
 DIST dovecot-2.3.7.1.tar.gz 7076500 BLAKE2B fba84e324de44a4f463769ee8b99ddc532f3ac3fad3c55a1035a367c7b186850cd49c3c45ecea439469e84abf2ae26dcfc8f454c3d2dab43be0fd89721c8053f SHA512 9addfe2be9ae745ac9164e1658e6638df96bd611d45f172e2cd1cb2c6596e4ce534674e9eea3c1d17f497555061031916e0fb9a9fbc6de0eb6034e2fd0bed3b9
 DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d
-EBUILD dovecot-2.2.36.4.ebuild 8567 BLAKE2B 4d29cba3ccfabee9a205074796fc7169eb6d0bd53d88a44262b7838b06252216aa0b37cb63d5fc88ae08c3b506d32752f6f6a61180d72ae1de7f745b3e352bab SHA512 77705e2406995c784460ff9cf71fcf605a4ec2f62721e8ab7280b1841b725971ab7d6d77e5ceddd31d7a6d715e515d07a1cac60b158296032b597df861b6bde6
-EBUILD dovecot-2.3.6.ebuild 8750 BLAKE2B c0a9f8e7c192bd05025514cea8afa1e25c9f7475aefba60868ecd2f72670036c6d489d67ae5ab1528647545c3a5dca687c916a51b1ea58ce28bbc3eacdce4efb SHA512 d4a86bea299e45614d3485695253676c4407e84f17c61da0959429b882161e51dc2886ffea19200fb581d4bac59e7013ae361e03c2fd6d3ec11e425bea5b867b
-EBUILD dovecot-2.3.7.1.ebuild 8687 BLAKE2B 0f9352889df0e72b8be0234df21909ec706a81cd666b5914253e16f39b0be4010da41d69f27c77c3368ef473692fefd4a9996abbe7cbf135f25ade3e4d803739 SHA512 f7ef9cc71b89a0f735554ee133ad29a25c40c634d9e664fd7427952451af3a1363e4f9ddb348a305cad28a94941f7c1f29b7b8a5244a44d6b439387847b5ebf4
-EBUILD dovecot-2.3.7.2.ebuild 8680 BLAKE2B 6cd1f0f0b1f35d915b16d7d4d06fa92ed1b668486628b82e21b9e15b2d79fe86cd7141c8a591e607574e7eba6a44cf6ecca25a8ed16b0626e8c7564fa12c2d90 SHA512 75a4a5dd9b55afbd751f5fb879c2b2e0ed53ea3202281138ecd348653d030d498c2642121fa75cd6868edda792cb2c6570f8dfdbaa7e98e4ed34a1658c81a90d
+EBUILD dovecot-2.2.36.4.ebuild 8571 BLAKE2B ffeffe8820f4ec9ab54828e260753ee2e77c7821bc8096e10b008f087d1781c8163256586c025e8177b0b8bf341026a0f37fe5d60bdfb2e01d463dda1f1f6214 SHA512 635117634a2a0437f6ae76da65b4b7d1534de6de71e493af7a4458ebeca1fbefea67b3839db76a9d9ecea0c7a623858c0efad21cfaf3819b50c3cbdb856b4643
+EBUILD dovecot-2.3.6.ebuild 8754 BLAKE2B 52759e8b747a23e38f12a0008f794eaafa07768614667cb1cd785bc7fc58b43d4ebbda0f9dcc9b045adb9eba7f6d249e4f2f8b5bb432325567956db8a5b4c002 SHA512 b2a8399c7222940aa3850e9836269b79865ec95e0febd3601587897ee73cc2a73b3428ae7121befc4c46fba656ef4811d34861db1b2aa5fe416c11af0c3cf403
+EBUILD dovecot-2.3.7.1.ebuild 8691 BLAKE2B c2631a55f3e71f20ec5acaddaf48fef086a35647994e1b77c2d331d1ce7ab528689a208f5484bb25c151b8a37294591a7b828cece6c0967a2c36ae757e1fde35 SHA512 1b69eee816ce3ad76a5c440db8998d1a6d995c9c93da9a1a1eeb5237fa3599bcbce1ea46bf3b80b093bc0b13658d50f2662f0812b8e85876a70589d3b5b00a03
+EBUILD dovecot-2.3.7.2.ebuild 8683 BLAKE2B 8bacc9251f1e1d86f8020b1c97c795e4ec81aac310d87008442215b9a870cb2a68e1b945a43f8b9bee5f139765af813164b295e7f192ddeafbb832b35e81713f SHA512 da83951d85ae21fc43eb14731ad70d208091637bfecbd34a0b59e51e2792477ae7810339c1093359cdc32450d4bac284f11795089a33551481a29073fd270a26
 MISC metadata.xml 941 BLAKE2B 8432d32315ba8c4ad55cdbc6cdfc85b9cbd2aab5928f8f3fbaa1e33093a272ee36abfaeb8d4e6f2a7658bdf9a9f481efe3ac18e5b5b901c74addc63979bcc312 SHA512 f8347117eb6039d0340ab53e0ccd82cd269a3f50d2747a780ccfee26b6e598347337f73b75c1e6f4f814c86918c4d0325c4c784a04a86b3d66ceb58bfe94d98d
diff --git a/net-mail/dovecot/dovecot-2.2.36.4.ebuild b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
index ddcf00b21ae2..10ac4e23aa58 100644
--- a/net-mail/dovecot/dovecot-2.2.36.4.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.36.4.ebuild
@@ -48,8 +48,8 @@ DEPEND="bzip2? ( app-arch/bzip2 )
 	selinux? ( sec-policy/selinux-dovecot )
 	solr? ( net-misc/curl dev-libs/expat )
 	sqlite? ( dev-db/sqlite:* )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	textcat? ( app-text/libexttextcat )
 	vpopmail? ( net-mail/vpopmail )
diff --git a/net-mail/dovecot/dovecot-2.3.6.ebuild b/net-mail/dovecot/dovecot-2.3.6.ebuild
index 7abeccbbadd2..ec42ee211e32 100644
--- a/net-mail/dovecot/dovecot-2.3.6.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.6.ebuild
@@ -51,8 +51,8 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	selinux? ( sec-policy/selinux-dovecot )
 	solr? ( net-misc/curl dev-libs/expat )
 	sqlite? ( dev-db/sqlite:* )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	textcat? ( app-text/libexttextcat )
 	vpopmail? ( net-mail/vpopmail )
diff --git a/net-mail/dovecot/dovecot-2.3.7.1.ebuild b/net-mail/dovecot/dovecot-2.3.7.1.ebuild
index 89f0139e20b6..490dc00193e6 100644
--- a/net-mail/dovecot/dovecot-2.3.7.1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.1.ebuild
@@ -51,8 +51,8 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	selinux? ( sec-policy/selinux-dovecot )
 	solr? ( net-misc/curl dev-libs/expat )
 	sqlite? ( dev-db/sqlite:* )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	suid? ( acct-group/mail )
 	tcpd? ( sys-apps/tcp-wrappers )
 	textcat? ( app-text/libexttextcat )
diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
index 8f049006a00a..94332fa22de7 100644
--- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sparc x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
@@ -51,8 +51,8 @@ DEPEND="argon2? ( dev-libs/libsodium )
 	selinux? ( sec-policy/selinux-dovecot )
 	solr? ( net-misc/curl dev-libs/expat )
 	sqlite? ( dev-db/sqlite:* )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	suid? ( acct-group/mail )
 	tcpd? ( sys-apps/tcp-wrappers )
 	textcat? ( app-text/libexttextcat )
diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index ab5771687931..9acadadc0d0a 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -2,6 +2,5 @@ DIST ezmlm-0.53.tar.gz 62693 BLAKE2B f417522da8d2b3ae7d0465e7226cd95dc85b55a397b
 DIST ezmlm-idx-6.0.0.tar.gz 659996 BLAKE2B bf5f7ac0a40d1167d42ef26c4b28f95899f5a72d4c969c975368f61902f5ce9b5721143c251cdcb70c58149e6d7eb28c834b26426d9611b4249a285b523c38d8 SHA512 547186a2e32f3861ef51a9012442e7d8b553d90f2af949bb51845c29178ee2a44760471852c7c23fbd241c14753f22357463c5d5f10b70eceb05603cc6d83d4a
 DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192266112da0516e936278610288dc11d44d1959cd135a90eacb4befa43d62f53b3bedb94e994afc13aed986834bce SHA512 c0fc35aef4a72aefa4cdaee4c1933cc00aab82ee81ad7577793952fbf57106c06e4a5844a2bbf3919ad2985d2062ba1edf8831e6aa66d7e762210e7e147210ef
 EBUILD ezmlm-idx-6.0.0.ebuild 1740 BLAKE2B 268ec06ad95ed38cdb4fe02d4c36a1a10f877603a6c629c67e205ab4664cf9dfeec45d1dd9998ebe382dce754105476db2dc951ebc7420951163c2c1d9090b16 SHA512 42ffd641cd6d754f898c6d66b4026b0ec5f6492ba52b4f6799b0ef60ff0b1050e86db44886cc487c263da1a7c1d575ec0cb33842d3c47ce9cb0db00cc8713bb3
-EBUILD ezmlm-idx-7.0.0-r2.ebuild 1534 BLAKE2B aacca11db0ff7d161a0c4313385c6ed2f4e5d7ce71f689ee31196a05dcba132124ac87bf399983bfd8017bce0886c2f897dedc817dc09836916e40167df2a7c2 SHA512 3fed930045f3451e4efa6fbd88ffab8b1e98f8dd2b366fbc21655194f94e3b00794c2ce57bc0bf42c84de12025f7c4172370b5658dd9a3dffe9dad5808c25474
 EBUILD ezmlm-idx-7.0.0-r3.ebuild 1429 BLAKE2B 9e5641fbaee2a744019f1fbf0882b51f27193e926facf733bb6d769b054cf91270ad1ff88304f4cad09158a1e8338664296987be248358ef39320cfd260caa43 SHA512 235a676ea6da184741f0c6d7241ac91b6489b60744673a02acef534bce02796aae3c021e3f98692f6e5f88345ff023ddcc856c80c301787d38e8338cce17f93a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild
deleted file mode 100644
index 4508667647a1..000000000000
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit qmail multilib
-
-DESCRIPTION="Simple yet powerful mailing list manager for qmail"
-HOMEPAGE="http://www.ezmlm.org"
-SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="mysql postgres"
-
-DEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )"
-RDEPEND="${DEPEND}
-	virtual/qmail"
-
-pkg_setup() {
-	if use mysql && use postgres; then
-		die "cannot build mysql and pgsql support at the same time"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-
-	echo /usr/bin > conf-bin
-	echo /usr/$(get_libdir)/ezmlm > conf-lib
-	echo /etc/ezmlm > conf-etc
-	echo /usr/share/man > conf-man
-	echo ${QMAIL_HOME} > conf-qmail
-
-	echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc
-	echo $(tc-getCC) ${CFLAGS} -Wl,-E > conf-ld
-
-	# fix DESTDIR and skip cat man-pages
-	sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
-		-e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
-		-e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
-		-i Makefile
-}
-
-src_compile() {
-	emake it man || die "make failed"
-
-	if use mysql; then
-		emake mysql || die "make mysql failed"
-	elif use postgres; then
-		emake pgsql || die "make pgsql failed"
-	fi
-}
-
-src_install () {
-	dodir /usr/bin /usr/$(get_libdir)/ezmlm /etc/ezmlm /usr/share/man
-	dobin ezmlm-{cgi,checksub,import,rmtab}
-
-	make DESTDIR="${D}" setup || die "make setup failed"
-}
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index 53ad4365a209..895ca96c7893 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,7 +1,5 @@
 DIST getmail-5.13.tar.gz 199073 BLAKE2B 94c73af47b95a0cc2d2eed64ac90b69829440c8209cb3b65e09d9f73d49f246650ec6760207a4717934cb39d1b9922cea73dee3ca64b87bc5096475d3b9e978d SHA512 398b1adf1bc4f90f98ca7154abad9d0769c4a6d0cccd6102ea992c97eff843f6a9f0a57f3a944bc17c3b664fe8d6c9d7f9da5be343be658afa36b1bb582ac347
 DIST getmail-5.6.tar.gz 197360 BLAKE2B 0833933c4dd4b0b7962070dd3d6738b2c7336f359ca9e40e6febbeaffc6cea6942e4271de6cd3053447af94cc7fd189a25beb99c81d2d1221f1c478807dd7c33 SHA512 7ee34f214ab4d98d1b34e46abba61561133f27edf1f64bb9c5d5f671e6944724d1773234bd8ab626607b732cc54fd335cbfcb69fdff8f4d8fcdb33108b25bafd
-DIST getmail-5.8.tar.gz 197874 BLAKE2B d5d236c03f1ea5620e773ff47203fe707e7c96bd4267b0267afc8681c3ab4015b291b08967ed0c05a2a1c82bca904236be550bd95d14f781445daf86a9ab6a87 SHA512 8469bc81fb0df4eeb27620b2cc472919bd441cbcb860a0f56b6d2433d22c85a0a326c86e1f566cd2a9d0acc0680d03b84f62cdfd5b92ae0e5bf7293dfdfe466b
 EBUILD getmail-5.13.ebuild 633 BLAKE2B 6c073c45a0a66f6806405b6f4fc17328d8bce8bca0056ce400de23b9a20201bcca2dae80585952e0fbe8040df36ac9228c6f80a97d92f89fd6ce3c387f357a12 SHA512 48eca60f09cb50e775b151a782a0c052b0cd65d4605c69c3f21c44306f676e8c6b1dd019ee4b8888c1aa7b42c696711a3c456a7fe8368acf06918960a960f741
 EBUILD getmail-5.6.ebuild 633 BLAKE2B 993e160d1203a4c51f04aa9337ac125afc61cf71adf40fe2bb9937292d869249eae532ec12e0475c4ae48aa78b36e972e2efb585fb8ac6c784197e8dae1249a7 SHA512 92fca063b145200af0e14cc21005be897914688cfce32b34b82302e3e528f12675342fb565fc4ca6d8cab2b442c5246e6c7ec1f4c0adb0f5b0099fb343168bd5
-EBUILD getmail-5.8.ebuild 633 BLAKE2B abb61d6ba2f1b1a70a7c8cbd46aa0e1711a46187176d752cbba72013c826b875eb353612f8a1cace2241a1f8135abbd75b8f8894bc4fc7c9c5dce77b99947ad9 SHA512 2b55155917e7b0dd6f2f19ab8d05f9837b74a9017715cf86d86268c118fa34110feff10f3fc43bb3014955521a90b9b6eb9c6699079d8c759fdd60f2573f4409
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/getmail/getmail-5.8.ebuild b/net-mail/getmail/getmail-5.8.ebuild
deleted file mode 100644
index bcefbf5318b0..000000000000
--- a/net-mail/getmail/getmail-5.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="A mail retriever with reliable Maildir and mbox delivery"
-HOMEPAGE="http://pyropus.ca/software/getmail/"
-SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris"
-IUSE="ssl"
-
-python_prepare_all() {
-	sed -i -e "s,'getmail-%s' % __version__,'${PF}'," \
-		-e "/docs\/COPYING/d" "${S}"/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/net-mail/gnubiff/Manifest b/net-mail/gnubiff/Manifest
index 02413a883c90..25d008ab519f 100644
--- a/net-mail/gnubiff/Manifest
+++ b/net-mail/gnubiff/Manifest
@@ -1,8 +1,6 @@
 AUX gnubiff-2.2.15-fix-nls.patch 427 BLAKE2B efc85599f1ff5f253fd4804cad09a7539b2713343d97c84e19ff28639f6f687674bdc3cba77d73b54b6d29cdcab97d5ba95d9e74ae80c194b0bcbb059566c1e6 SHA512 6eacfb95520449bc5ecb5183ffbf8e2362157dfd75af4ec749cd54fc75de38177d70a12ac446f1e1cba158d64b151b85ec37f011ad0822ea45659c21e8b9984f
 AUX gnubiff-2.2.15-gold.patch 511 BLAKE2B c0ef1cdecfcc91ead4d1adf5e3fdecee1b4d85af7f2c7a795996bcff401346c2f88552c4d9f9df641e8ef6110d94d538f104b2964f3bf6704b855e3754154b0b SHA512 3811028380a2a8d2cf641ec15c4a0645ead86008f478137767e8b9e6fd4ced2421050c3d9163b01a47830e2e09af62e0af6155d17e8a5f165baa4779a0ce02b6
 AUX gnubiff-2.2.15-underlink.patch 337 BLAKE2B ea045a75986fd13e63549b7f187315ac7979ddf71b0be7ad4bd6ab3300af7e74fe4f9ccf8be01753180949648c7018b23eb51f9fe67e34725eeed621658a6c44 SHA512 6d03040784eed725848cde01533304e33c8b0045e0488936a9782ec2edcb8492ebd47fb263ff142510e0e96c06e60c3de84bb074171e54ad2860e6b3c1d4eeb4
-DIST gnubiff-2.2.15.tar.gz 851638 BLAKE2B dd6d8527664470497d0f7eccd5f435f06f67935a831ace025152f717986c80bd39d49730f1f92b94ded4da8fd0d6aba30705f81b245c6a51dc8257bfe6c95238 SHA512 592a9934f34cec65869bef6bb7a488fd1a44515d513e47b440a36ef15ff9c44dbedb33c27e375ac6cc9590d9a0f02b315307913059f3d7e44ee64a87d95f52c4
 DIST gnubiff-2.2.17.tar.gz 897817 BLAKE2B 5ee58828211eb7b85ab017129feec48c6d2b2df4de862f7791f15f361bda7919cbdc7aa37403130da044a1f9e2068154ddc5ae8629eb9f4d38956d759477fb80 SHA512 2fe715d584fb057255d4922275de152ff5b1167abcbdd27d33124921a4c659c3db301944a73d58622ecd22f62615d44b5bebb83838bbd53c67a2dd8286592d89
-EBUILD gnubiff-2.2.15-r3.ebuild 1059 BLAKE2B ba64181ccd3184c06fbc75ced3bdc61fbaa06bcb2d1c83962460042b2682e4d950a384d0cb899d1d814673a183a95d1bc204f40fd50c9a32c6a5e18affccf451 SHA512 3b376e1bb8f474ee58d2c3e9e5f0fdddd56e9d7053290082839378e981d524f0f907d762788e4b80af71f00bea6309c1bdbe48427284af750134924ee2c86cd4
 EBUILD gnubiff-2.2.17-r2.ebuild 1105 BLAKE2B 37330335b960ea8423efec07780e5d8df3043fdfcec12ff38332203ac84cd604d244de01c666c51b03b50cbd363c20090dd6e49441a64b9f252b19a81af886b9 SHA512 bc3dcf0548693e0eea74fca7f2e47c752e837f22938b2c1a8952bd3a749d0879411d8d344f508598b6c4ab0c2700989d94c9d9c7e28232ef5e6d9ae4a4b8e03a
 MISC metadata.xml 359 BLAKE2B e503972d7cc44508b3f94842c9b57a15f3fdc4df89a2eed1ea968fb6033c96b56b59ec6bf5839fe7cb832a69b565c29f6b47552acb205fb9a030d5531ba22bfa SHA512 c1654b01e77115f9c8d3852da7f5951024d0f121a5b589197af6843e063df27dcec59457aec68babe6a8e14c81a307a78a0e34860799d5bec076e0c6bd0c18a1
diff --git a/net-mail/gnubiff/gnubiff-2.2.15-r3.ebuild b/net-mail/gnubiff/gnubiff-2.2.15-r3.ebuild
deleted file mode 100644
index b22d67e1a6cb..000000000000
--- a/net-mail/gnubiff/gnubiff-2.2.15-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A mail notification program"
-HOMEPAGE="http://gnubiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug fam nls password"
-
-RDEPEND="
-	>=x11-libs/gtk+-3:3
-	>=gnome-base/libglade-2.3
-	dev-libs/popt
-	password? ( dev-libs/openssl:0= )
-	fam? ( virtual/fam )
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/gdk-pixbuf
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-fix-nls.patch \
-		"${FILESDIR}"/${P}-gold.patch \
-		"${FILESDIR}"/${P}-underlink.patch
-	eautoreconf
-}
-
-src_configure() {
-	# note: --disable-gnome is to avoid deprecated gnome-panel-2.x
-	econf \
-		--disable-gnome \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable fam) \
-		$(use_with password) \
-		$(use_with password password-string ${RANDOM}${RANDOM}${RANDOM}${RANDOM})
-}
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index f16456a7cb30..a409a2041195 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -1,13 +1,7 @@
 DIST imapsync-1.592.tgz 906578 BLAKE2B 8048edddef4a3d9dad751b051c3e0d88eea883cbc57c0b31526ebe13cc818a5996fa07a746801c05aca8ae50429ad2aaee0983d6c4b9cef843a9169824ec293e SHA512 3d41b28396d9b8bf83200b324b2e312c76ef88e42f4ff8993c8d697b18f321400d7a157b1fee2d3ad4eae11400dc2186a18528bde50e370d856eac1b09c28f68
-DIST imapsync-1.607.tgz 973467 BLAKE2B 6be72efeca6797ae4ba823de0d9a763990fec25aed40341995d4e8d326e7e3c7a9e3227b430e9291c5465a6591b6fb99831dba49dbae7b4a8c6f46dd046bc258 SHA512 2630d32683f74ec260d322d2d9f13fb30938c077275cd43cece392b43bbdf8989f8ff6df648d520b785a568bf5d6f45d43761bf4fb94649e210611224ad43841
-DIST imapsync-1.644.tgz 972719 BLAKE2B ab1c36f465a941a2f42fd5ae7c4d56576e9fe2d8f0ba16638a7f9ff73bfbb9e04655dba18f04f870c7113d07aa0aa8c84746587a265473bd8683fc765c436121 SHA512 0e246b142e5e9066ce8a328ce57731c5c9006746bb58dff5c681dcc0596cea25f51bda3a50a7d3d4262efb2e720da3b380b68aa34c0db8f76fae7a6049f9fa2b
-DIST imapsync-1.684.tgz 1030626 BLAKE2B b229f8be4ed9dd0f3bd5ec838517031ec951cdb05012c1def4fc0c1005506bed81b85f089410eb3dad443623d1b13883311a741272a9297ed3e36e0852213818 SHA512 3c85d3c6252765a717386a8687a2bc15da4522219d67c09a2cf27b452623fd0e5f382c53473b9b628dae7fc261d8db99d54bd8dad9e656e29096c0f06f0867ca
 DIST imapsync-1.836.tar.gz 1741595 BLAKE2B 6502105147cf2f7d13c0af997cab05e3d65a75d54924c8100a82a322da31c8797710e5370a52998384270713ec7ade1c86e5c8c021b7e0937c188dfc1cf178df SHA512 f1ea1ef887ebcfa62c90254b3738602dc78275400a7d8dd5af33bc399c82c28d8567ee42d9ebf85735e7df857bf548608e09f01a06bd146f317faa3b4702cbeb
 DIST imapsync-1.882.tar.gz 1557501 BLAKE2B 92f37d0c6c64569016a15d71d1b95ca08e4a8bb2402a5151f1429260fb37db47ebfc273e2bb73b06ba77974100780924fa3f256565fcd3e77cbff4c7bbf7b56e SHA512 3953cb29b210c283be3fe72f1e1537594415bd5457b469b801625d6c857b982d2b2b3da9528dd1e6ccc6831c022ce495f7a5eaaea04d228bca374f185344f455
 EBUILD imapsync-1.592-r1.ebuild 756 BLAKE2B fd235050e9336afebd5c73044791cfafb258455cd022e627cf8611707244684ede95f0ebc28a27432cc7760f1256b4f79067b828f672678d13a09d04aff59f54 SHA512 e04c4ce91b7e9e44356ab9672848dfae3e5150c3a7d5d6be1441fa9691d664c62b3fac655f782b52964ef46c64cd306b57fd48c5ebb182168db1d05ff1cb3300
-EBUILD imapsync-1.607-r1.ebuild 784 BLAKE2B 815bc5222b7ca23748aa95e0e5865b794ae52abe0d69f777bd39ad3a0fb02cef83a62cc3b182c2a944a4ba08b595ec96897e990cea884c695f0014ab9c0a503c SHA512 1054903e5ddb44df2a80cf69e9c3757cf359e20ebae2fa064f331797e6965adbc3d13f7286c39be29759ada3bf6ba0f87cd008749ab0154451b1fc2849c6ccd9
-EBUILD imapsync-1.644.ebuild 784 BLAKE2B b29b0d59d6b6e91c3f90f56fa9553ccc49715e6c185935316d7afe692c245e5de4d3b48994e45fcf4c88b77e31237ee1e2eaab187a898f0f51a2c050b9939f95 SHA512 a1e581107f28d4b030f489dac3b5dfc87159b20f950d030e5112b6e0a6aaca194b958fbab946fcf72bbd46b6075b51379f1055c0f93e4aa7de6c200ab1d6e77a
-EBUILD imapsync-1.684.ebuild 785 BLAKE2B 510b45d577026bad26eed137c20475fc86cf6bf205f2f454478464f36e718084d996556ec90b14844c8d88a8ba16d5af7bbed847e976121d84ed8867415c948a SHA512 0f38b8221b85c460ba9a149ee5cec573143e2413d1fabbe26469d169052f82eec1dff823a9775d2afc93efec961e8d521100c889db3b11f4706446258587e540
 EBUILD imapsync-1.836.ebuild 921 BLAKE2B 4bdff06ddc043c38875613b673683f2d97b7d25055fb199e22463ca2feb2bad7bed7debaca1102c8141d0169a14033c2d5265748ebcefbd31138ad49e39fa295 SHA512 6e4c5c4bccc4810b379639edf16db43c997d1239a9ba8eb77f29a0ace593f40909039103bf9d0ef3adeda8064b708b05fca4c303b70a394ff0423723b755d481
 EBUILD imapsync-1.882.ebuild 1943 BLAKE2B 09891b19c95241c592ea38f048728be00d65bb862cf960557805abfb56a8883e241a5f0d484c6436866c15480e1fc7ea13920f646c714c674f1d0f02acd86bfd SHA512 71b0698544d99be72aff2b6aa9a9063d3aca64b99e5dc247b77a65e9b57d37d988463d5e2fa9a3887658177e5854be4fa6c2ab2d610fbe4c5f1b54584fa4f44b
 MISC metadata.xml 249 BLAKE2B 0bccb43703238e66606acc0f395e496ed36dc25e319354565dd990baa7ef595a42aa7f931d50b65e9cd77ee72103b8c0210c68fadd54ff8ff6bfaeff60850a9f SHA512 a5b4caa063a5e6f2d954e30608a5051b567fe1e869e1662282d6d12813105152833fb824043f7501d9fdc628cf2ad88c53c90c48798f27f8240e541956f63dce
diff --git a/net-mail/imapsync/imapsync-1.607-r1.ebuild b/net-mail/imapsync/imapsync-1.607-r1.ebuild
deleted file mode 100644
index b4513397c497..000000000000
--- a/net-mail/imapsync/imapsync-1.607-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another"
-HOMEPAGE="http://ks.lamiral.info/imapsync/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tgz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Digest-HMAC
-	dev-perl/File-Copy-Recursive
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tee
-	dev-perl/Mail-IMAPClient
-	dev-perl/TermReadKey
-	dev-perl/Unicode-String
-	virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -e "s/^install: testp/install:/" \
-		-e "/^DO_IT/,/^$/d" \
-		-i "${S}"/Makefile || die
-}
-
-src_compile() { :; }
diff --git a/net-mail/imapsync/imapsync-1.644.ebuild b/net-mail/imapsync/imapsync-1.644.ebuild
deleted file mode 100644
index c1758035bbcc..000000000000
--- a/net-mail/imapsync/imapsync-1.644.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another"
-HOMEPAGE="http://ks.lamiral.info/imapsync/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tgz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Digest-HMAC
-	dev-perl/File-Copy-Recursive
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tee
-	dev-perl/Mail-IMAPClient
-	dev-perl/TermReadKey
-	dev-perl/Unicode-String
-	virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -e "s/^install: testp/install:/" \
-		-e "/^DO_IT/,/^$/d" \
-		-i "${S}"/Makefile || die
-}
-
-src_compile() { :; }
diff --git a/net-mail/imapsync/imapsync-1.684.ebuild b/net-mail/imapsync/imapsync-1.684.ebuild
deleted file mode 100644
index 7520990085d4..000000000000
--- a/net-mail/imapsync/imapsync-1.684.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A tool allowing incremental and recursive IMAP transfers between mailboxes"
-HOMEPAGE="http://ks.lamiral.info/imapsync/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tgz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Digest-HMAC
-	dev-perl/File-Copy-Recursive
-	dev-perl/IO-Socket-SSL
-	dev-perl/IO-Tee
-	dev-perl/Mail-IMAPClient
-	dev-perl/TermReadKey
-	dev-perl/Unicode-String
-	virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -e "s/^install: testp/install:/" \
-		-e "/^DO_IT/,/^$/d" \
-		-i "${S}"/Makefile || die
-
-	default
-}
-
-src_compile() { :; }
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index 9052a6f28499..4332e64fa276 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -1,9 +1,5 @@
 DIST lbdb_0.41.tar.gz 160632 BLAKE2B 7cbb0178f2983255eef8ce86146e104e33a1d31b6fd5cf3e5dea69cad8fa485424a5d8b89d1e2024f34a688bfb018724b05bf8e5e57ab5338c9973b78d203d4b SHA512 c99d8c4549d781252192e07dfb89adbae6daae5a4f4c94de692c4289848ba8599c2b0aeb28bac69313e6828995eac32acf3fbc76b1695c6464c6339236cdb341
-DIST lbdb_0.42.1.tar.gz 158766 BLAKE2B a55d8c3be598e11ef2ed16f4f68aa8fb0a4abda8816488ad3968155aa7d2d8f471979d1c52ef48f7125b53e552a9e1f99932db6f810cf52dd10ec0b13fc03a91 SHA512 50c405bb05e38f5b23b05c27626262680bcacd6385b636a1e6bed0c3cf4c319a1cc19181587e390c04bb2e5b3a275a9e053c42536df6554b6f44d3b8496fabfd
-DIST lbdb_0.42.tar.gz 158714 BLAKE2B fcc47b7d5d175e6594664b0a84140098381c5e79ee5946bc1fc2a8935222231f2ea4acbe2b7e5419faa562929f7c708f00b68fa638c32590758f9876de44ed0a SHA512 d8d27450fab09ff41e592fb2ef9395b8ed30c2a925136184c0339574f3a58b7e54b5846c722d2e065da5a98b166497e148afd43592f80942cf4aeb35934e91d7
 DIST lbdb_0.47.tar.gz 182477 BLAKE2B 9ac0073ea4151ae84f9aeafb1a6bde52a39809987da87bd252665f9ef729ad1a5ee4cf91e4c1ebec1f8be17e1a9a3e31dbfda5484ae114fc99cd273f93b39cf9 SHA512 95cae9b108d875203dce2a8243c3dcb979606529202fd9b4d1ddd211a3d617a421440f6532abd38432607b39da84a6da4d09b15e95cddc01f94e018b9e712078
 EBUILD lbdb-0.41.ebuild 1362 BLAKE2B 87f3eaca4b680eb27ff7f24287317973a9aa93f95ebfe4a7770f5f73b4327f2ac6391084eb75aff85159fe73caacb19ea4fe8d1f459e405c0600be5a256b6077 SHA512 b483dfd7dd5207045a648283f1b7eda49aca430dac9a54001baf253856a277e6f358951b8d9268573716471b89440d26c338b4e7b5ec42ebf06f9b4f3505c029
-EBUILD lbdb-0.42.1.ebuild 1384 BLAKE2B 172aca3cad92694d81e8da8161a8d440ab84e0cc78fcb86d02e04344a6126c135d6a6a5be6331a596dfc7cb0ce21a5d8e172c3e10196d9d68f0c50c0b363ebf1 SHA512 106b457b72342cbc7ff825b4013dcac2ed61ad2e1da9e772aa2054d1c9cfb2d61acbcea3302b710dee1ca6e5aef0da4b8c04362bacae0e9ebddb5b668a42e644
-EBUILD lbdb-0.42.ebuild 1365 BLAKE2B a16f65e809aadd9fc7783296805b178d79d3b7e37f314a448f3dd6d83052fcdc50d2eb0b75b5a70d0a1777cbfeccb3fc998cc21a7c631c0154c6a5c6c3e694bb SHA512 1c278aa8206024695441843caf7c8f71d8b920981c3643a7da9c92a1c34693724b7e56a5cb5575f49c9403960512e4eac7b3ab3a47f853ebd6557b1900198930
 EBUILD lbdb-0.47.ebuild 1460 BLAKE2B 97d7aa58fdf3f8890b4469d434e995767f3d1ddb7ce96af59a3b1a50e70366c06f3df08f82034fabf6791b6802e610e4687aebbc69b4183ce92e181456a7d857 SHA512 c2f9ddef4676ed5dc67cf25888a671ee7577fc65d7dd5aaa0d5263eedc960937732a11a444d6f29bf8618673a70867676974a84d7d3976f8480fee949fd63c8b
 MISC metadata.xml 452 BLAKE2B fb14006c0ff46ee5b6e9c72682db885497f93a3b48e6852c87128a2b17b91a0459ccdb2d5fe94cf2e26459c9176251f79ac18ec31d3f03cf060c0ea2f8294c5f SHA512 38c22e435ea247d967a8d04092be6f0195436db16fc03d7fd7aa3cd0fe0f3dbfbda3ffe6a58cb7e8a5d1dfb18fb0a048b7d525300bd265a7d0522dc91d991a79
diff --git a/net-mail/lbdb/lbdb-0.42.1.ebuild b/net-mail/lbdb/lbdb-0.42.1.ebuild
deleted file mode 100644
index dc9aa2dc00bb..000000000000
--- a/net-mail/lbdb/lbdb-0.42.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_P=${P/-/_}
-DESCRIPTION="Little Brother database"
-SRC_URI="http://www.spinnaker.de/debian/${MY_P}.tar.gz"
-HOMEPAGE="http://www.spinnaker.de/lbdb/"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-IUSE="pda ldap finger abook crypt evo"
-
-DEPEND="dev-libs/libvformat
-	evo? ( mail-client/evolution )
-	finger? ( net-misc/netkit-fingerd )
-	abook? ( app-misc/abook )
-	crypt? ( app-crypt/gnupg )"
-RDEPEND="${DEPEND}
-	pda? ( dev-perl/Palm )
-	ldap? ( dev-perl/perl-ldap )"
-
-src_configure() {
-	local evoversion
-	local evolution_addressbook_export
-
-	if use evo ; then
-		evoversion=$(best_version mail-client/evolution)
-		evoversion=${evoversion##mail-client/evolution-}
-		evolution_addressbook_export="${EPREFIX}/usr/libexec/evolution/$(get_version_component_range 1-2 ${evoversion})/evolution-addressbook-export"
-	fi
-
-	econf $(use_with finger) \
-		$(use_with abook) \
-		--without-ypcat \
-		$(use_with crypt gpg) \
-		$(use_with evo evolution-addressbook-export "${evolution_addressbook_export}" ) \
-		--enable-lbdb-dotlock \
-		--without-pgpk --without-pgp \
-		--without-niscat --without-addr-email --with-getent \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/lbdb
-}
-
-src_install () {
-	emake install_prefix="${D}" install
-	dodoc README TODO debian/changelog
-}
diff --git a/net-mail/lbdb/lbdb-0.42.ebuild b/net-mail/lbdb/lbdb-0.42.ebuild
deleted file mode 100644
index 5ac47600a38c..000000000000
--- a/net-mail/lbdb/lbdb-0.42.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_P=${P/-/_}
-DESCRIPTION="Little Brother database"
-SRC_URI="http://www.spinnaker.de/debian/${MY_P}.tar.gz"
-HOMEPAGE="http://www.spinnaker.de/lbdb/"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-IUSE="pda ldap finger abook crypt evo"
-
-DEPEND="dev-libs/libvformat
-	evo? ( mail-client/evolution )
-	finger? ( net-misc/netkit-fingerd )
-	abook? ( app-misc/abook )
-	crypt? ( app-crypt/gnupg )"
-RDEPEND="${DEPEND}
-	pda? ( dev-perl/Palm )
-	ldap? ( dev-perl/perl-ldap )"
-
-src_configure() {
-	local evoversion
-	local evolution_addressbook_export
-
-	if use evo ; then
-		evoversion=$(best_version mail-client/evolution)
-		evoversion=${evoversion##mail-client/evolution-}
-		evolution_addressbook_export="/usr/libexec/evolution/$(get_version_component_range 1-2 ${evoversion})/evolution-addressbook-export"
-	fi
-
-	econf $(use_with finger) \
-		$(use_with abook) \
-		--without-ypcat \
-		$(use_with crypt gpg) \
-		$(use_with evo evolution-addressbook-export "${evolution_addressbook_export}" ) \
-		--enable-lbdb-dotlock \
-		--without-pgpk --without-pgp \
-		--without-niscat --without-addr-email --with-getent \
-		--libdir=/usr/$(get_libdir)/lbdb
-}
-
-src_install () {
-	emake install_prefix="${D}" install
-	dodoc README TODO debian/changelog
-}
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index 191fdaccba5b..f852149d874e 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -1,11 +1,7 @@
 AUX offlineimap-6.5.3.1-darwin10.patch 361 BLAKE2B 3331f6bde79b55792d7fbb6d3183c363a7142bb8abbb25c13b8cfe2b7e652c366aa2002b9e9995d6cc2e197a34315556e5db4586012ccd24fdf6d3faa1352956 SHA512 2183ae09cb9ed489ea447180f7b50e9e023a4630f8612b829e84499257590e9bb99ac0aa65cb45073c4a1ed5d537151df451b35aeaa45b5a1eb9e063246e5a02
 AUX offlineimap-7.0.3-darwin10.patch 316 BLAKE2B 3f9adc406881e43462aee6764ef7aafc69a94f7e744722856da04448e68972c9942f8b6a8e4eba84c7fe714be6cc3b7de25424984f21b96df24e22d2eff333ff SHA512 b195392db8e39264891b91c855cc0b1cfeb76e7b0a22281e509c17d4ae07458e980f7810c223f2a835f01f4ba63c1f9592c934121e763bb01846f20c51013186
 DIST offlineimap-6.5.6.tar.gz 187801 BLAKE2B 78561ffc0b0dcd3dcd3c75448f1e412661ac5061eebfae5796dffb3a6e8767b54138328aa0a8ab5a1745ed0690809965ea76b9b8e66ef250936b0b72cd07e337 SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e
-DIST offlineimap-6.7.0.3.tar.gz 679221 BLAKE2B bdc5013dff0a3dc1e79326d6c7bac6ebb524e6b1f2ea7f8492abaa54ec2436406ecbebe981e085e9f4ee572355b798806b76ea5998cbd0225db03c03d5fc9093 SHA512 21800eb14e814fa04b983e9718a5780deda4c99ae55ef900ccec9f1e65f9bb783c3469e00e6595c7dfddb60d760a6b3c98ae979da3219de51c8ae107ff1c077a
-DIST offlineimap-7.2.2.tar.gz 721359 BLAKE2B f59f26aa3cb7a3a5d994e5e9f48dd9de4f00193a71dbb2cd976dd6c8459b7dc6750c0a0bbcc8b954745ffe18e16cbeb6739f63ec9c4a530fbf2489db36771117 SHA512 de60472d24368ff4f5c43ecb50b021c671e6fe713220475da8bd900de6bfb6a10ec8c585f96f6091caea32344f65886e2870d097974ebef343b0ca56a81ddd7c
 DIST offlineimap-7.2.4.tar.gz 721887 BLAKE2B f5c7c8eb541167b3f0d46ee71be418d4697f89a1dc11a1c5c9840e5def09d108b7ab391d773dc79e0882ce0a9e21388e11217915112f476d384bf3018d5ea750 SHA512 837f822a08f5df59f5332c65b33e0186c215a633c5c17f08790f4c2128a4f6470a75eb02e883dd592b456dbc0ba2b32f670cb716eb602dd8a6bdf12ba2d72cd8
 EBUILD offlineimap-6.5.6.ebuild 2381 BLAKE2B f7ec4774682b618458484be57ba484d41d4c9df17517ce00ee1c8198a49580afba304d48371dd464d477698039edbfcb47dc93fee20239fa45780a248809b207 SHA512 083714ce7939b4d7c214bcde3e74ac8bb2050406c35f21ef2d5d5d658afbe6bdf84ff1dab87623e1c50c90cab2e7634a3c3590e91599e4217b55be09a1f1f5be
-EBUILD offlineimap-6.7.0.3.ebuild 1788 BLAKE2B 401360e6f39b200f26b39717af6e0fe3ee3f1f65dfb94a4238c19077959df016febd76f9fe74260e1781c2cb3792714a7b86e23e378bcab1a57da57e67094002 SHA512 8542909e6a463fcaba54f6c86101a4681328d12dd491624d7d2775ba92d8058775957f23f6b71332eed53f46bd04984179d96966c997c4de4005eb3008468dcb
-EBUILD offlineimap-7.2.2.ebuild 1639 BLAKE2B b97d8f3c6249086a47c6d628d055918db8298fedf9c5ba85b67b0df22c4a79456a399a3e247d19fe190537339b232c627b476c2bc8f732051e1e0ea940e98157 SHA512 a4a9177eaae725f07912a733164bf872aca4879cc9adb58ec35b8fb1aa5303279b2af3b1df9d37ae78ac6e8f3a4128fb2a03d14d92db332840240265319441ab
 EBUILD offlineimap-7.2.4.ebuild 1639 BLAKE2B b97d8f3c6249086a47c6d628d055918db8298fedf9c5ba85b67b0df22c4a79456a399a3e247d19fe190537339b232c627b476c2bc8f732051e1e0ea940e98157 SHA512 a4a9177eaae725f07912a733164bf872aca4879cc9adb58ec35b8fb1aa5303279b2af3b1df9d37ae78ac6e8f3a4128fb2a03d14d92db332840240265319441ab
 MISC metadata.xml 365 BLAKE2B 44c143951196526dbc7e8c23fe3719a33ecf633361b9aa5294dd4e61c1dd0aecca12159a33c3ef7e0706a5c57162f170559c44c554541754cf5049118c8d89c8 SHA512 ec19d9f99d945536a02dfd7d8c113c6a6337e80190ee60ab172ac9c248398f4faad49aabe4f56e5e4d5eb09ea35810a47ad263b8df59f7368e1f8bed6e780c2a
diff --git a/net-mail/offlineimap/offlineimap-6.7.0.3.ebuild b/net-mail/offlineimap/offlineimap-6.7.0.3.ebuild
deleted file mode 100644
index c2de9712b17a..000000000000
--- a/net-mail/offlineimap/offlineimap-6.7.0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Normally you need only one version of this.
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,sqlite?,ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="https://www.offlineimap.org/"
-SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc ssl sqlite"
-
-DEPEND="doc? ( app-text/asciidoc )"
-
-# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-PATCHES=(
-	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
-)
-
-src_compile() {
-	distutils-r1_src_compile
-	use doc && emake -C docs man
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc offlineimap.conf offlineimap.conf.minimal
-	use doc && doman docs/{offlineimap.1,offlineimapui.7}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
-		elog "Sample configurations are in /usr/share/doc/${PF}/"
-		elog ""
-		elog "If you connect via ssl/tls and don't use CA cert checking, it will"
-		elog "display the server's cert fingerprint and require you to add it to the"
-		elog "configuration file to be sure it connects to the same server every"
-		elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
-		elog "check SSL server certificate) in cases where you have no CA cert."
-		echo
-
-		if use sqlite ; then
-			elog "The sqlite USE flag only enables a dependency on sqlite. To use"
-			elog "the sqlite backend you need to enable it in your .offlineimaprc"
-		fi
-	fi
-}
diff --git a/net-mail/offlineimap/offlineimap-7.2.2.ebuild b/net-mail/offlineimap/offlineimap-7.2.2.ebuild
deleted file mode 100644
index 401eb0958288..000000000000
--- a/net-mail/offlineimap/offlineimap-7.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Normally you need only one version of this.
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,sqlite,ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="https://www.offlineimap.org/"
-SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc ssl"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="doc? ( app-text/asciidoc )"
-
-# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-PATCHES=(
-	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
-)
-
-src_compile() {
-	distutils-r1_src_compile
-	use doc && emake -C docs man
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc offlineimap.conf offlineimap.conf.minimal
-	use doc && doman docs/{offlineimap.1,offlineimapui.7}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
-		elog "Sample configurations are in /usr/share/doc/${PF}/"
-		elog ""
-		elog "If you connect via ssl/tls and don't use CA cert checking, it will"
-		elog "display the server's cert fingerprint and require you to add it to the"
-		elog "configuration file to be sure it connects to the same server every"
-		elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
-		elog "check SSL server certificate) in cases where you have no CA cert."
-	fi
-}
diff --git a/net-mail/ripole/Manifest b/net-mail/ripole/Manifest
index 84602c4be294..de8a2f7a8774 100644
--- a/net-mail/ripole/Manifest
+++ b/net-mail/ripole/Manifest
@@ -1,6 +1,4 @@
 AUX ripole-0.2.0-ldflags.patch 495 BLAKE2B 28c2a580563fd4de93199d8242b5f3673f9bc81247be65ce4a7136e28a3204dbd48553cdc6de4c7ef7f13c4332120dbb415320616e4b34656b5340d976714ea6 SHA512 749d9a864c1cbc4c28e6a8b8dfd69fddb72e4bd0150a143bd4398e4757edc8326c6c2c7da4d0ce3e17a212636b3894726a6488d8b03618b3d0641faff390d1d3
-DIST ripole-0.2.1.tar.gz 31031 BLAKE2B 21ca669aca3a27f68bd6090d68dfa1e1fcaa98d67c7f9de1cf8d3f037048ae182b9421102361eab12e2191ea0cf90b47c2d50d4ad9e4adb0ba324c3436466d36 SHA512 bec441ab80219bbd2f5032603a655a5211fbc046d1ea61d5d42ea9bc0e3d6cdd6ef1beb3bb51be4616c94d5cbb45c9e9f64cc3f1ada3733b7f850730d4df68fb
 DIST ripole-0.2.2.tar.gz 30629 BLAKE2B 63ff7c0d086861d8aa9c1fea7e69086874b90e3181898e36338cb3913e90c6ed7e6f222ff985d92386535a222e44e8a324658f0b4bd51de508f92a82f37f5eb1 SHA512 de3a4fe511e11d4ed8b5589aaf102c60c59c8a3cbbd1d988955b89d597ac7a5992f63a7ac36d8aad3916fa9f6311c5a0260136d534973fdf1b4a5fa5296b6b92
-EBUILD ripole-0.2.1.ebuild 584 BLAKE2B d4bd3636da6288f19089a6688f861a07b2069b3efcb043eb8d83bc9018e2aca09e700f60e2149cc6e33a13866e17e2b1ab8595a4bd42a0f3630a9003eef8056a SHA512 0fb1dd175d4314298735963c7c6d405df09a0003883bd4cbce3e9a0b9b50f342da6fb708d4eb4d05121ab75dd803ef9182409c33afefa4e78232fbb8755cbf02
 EBUILD ripole-0.2.2.ebuild 592 BLAKE2B 192db81496d03db1dc141b7180517edf4f039c839e239f3de274e5f5c615d6af142c601dc58206102eb56c7c60f5faec2f6bc569300a54bb7defc077109f3549 SHA512 de3169ace39c1389ee17c31d554dd5a3ad607c7e2e5bb7177181245047af31f43a5c1cea7136887a5f3681516e88d49c1762d68d96558d4a6fe780e7c0432c3b
 MISC metadata.xml 325 BLAKE2B edce91179b4c014b34923d673bd254b4e46e04362e7873b61660e69143cfaab7f5894ebf10858dc2028d3b8d866ead42411f90db2b11b5e4f6906a1cc806189a SHA512 fddd77a4694de0ec2c881c393854557ec48e5f6603c795f93467f700750386563c297302fbfaba72d4980b68fa1c5c0f000c292b9e59ac0463dcb079bbd3c035
diff --git a/net-mail/ripole/ripole-0.2.1.ebuild b/net-mail/ripole/ripole-0.2.1.ebuild
deleted file mode 100644
index 5e8fab2f787b..000000000000
--- a/net-mail/ripole/ripole-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Program/library to pull out attachment from OLE2 data files"
-HOMEPAGE="http://www.pldaniels.com/ripole/"
-SRC_URI="http://www.pldaniels.com/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 hppa ~sparc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.0-ldflags.patch
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin ripole
-	dodoc CHANGELOG README CONTRIBUTORS
-}
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index fe76205f227e..c810487dbf2e 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -5,7 +5,6 @@ AUX vpopmail-double-free.patch 395 BLAKE2B e17be028bf2ef0b4770c78bbfbeb6f8024db7
 AUX vpopmail-lazy.patch 324 BLAKE2B 171579db62d8582612c4b5a1bccdb57b4f08317b0c37ac66298717b1c175204de358c1299e380c191603538d3e6d795dbacde25ef672c6809d85bf7a055c7630 SHA512 42f1e24ee850b9e858a271d734246981c506d74556a62d0124ebe8e842553e32e57603975545d8f49d76e3cca832a73ef61ef191a0a1cf07f9343fe609ecc0c5
 AUX vpopmail-vpgsql.patch 2666 BLAKE2B cad5f0152a3d0a1bc83972aaea7dacf55f1e9f2f2e76e16da9a4cda0f7e9cc609c2d53edc91241566c68cb653910947c74387d23e6d59cd26f8322695c5bc9b8 SHA512 a8067aabfac181637f1366be0215c885ad380e44bbae1a69f9b0438b0a99cd194c2ce2068acf25142c9bfe6623ca8a77b1a9b82790f7faeb6e921c20cd1c1e20
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
-EBUILD vpopmail-5.4.33-r1.ebuild 8059 BLAKE2B f8933d6e46ae839bc4280f21013145c0d2d59dad9121028e0e7f2d331c2fa26eeb236f8491554e52ca7f7d8b82cef2a233c775dea853a29a51f508dd373cccba SHA512 4b922cfade81bb7fbc0d5123346d657873dc49dade23882a75faff2a4b81e220d16b661175f06524320ab78297f8066770a7a9201e235dc34ec021d174fe1408
 EBUILD vpopmail-5.4.33-r3.ebuild 9026 BLAKE2B 1abd3e4d464d12002f64b73a5b7339a202b2ebc4cfaa6df101054deed4fcec1308f20c9225c592dc77ba117fed5672d5dba125e699d59f038b41de6b0f33ab36 SHA512 63ad190248e31c47a1e872a3fc4b108ff6ff3c1c2124360e314c4b153ddf5aed1f46f1bc1d3a61077502b8ba9d2adbfd02d3371ff6f811b2b384e675a6378604
 EBUILD vpopmail-5.4.33.ebuild 7658 BLAKE2B 0c3d9c5736e549d84be9604ece0a11fb064b4966f600fea5c1456ac92ddc25a4488c0fe328b53d12869a229426d98f333170b703484286804db1962e1c72f358 SHA512 8ad7fed94d1cf598ff019c04363ad4d3262716c4d460597c3886826d12b746f1b4151813526c7923225adc29165ba91db2d98bc988b8545bc659df0f5fcee0f6
 MISC metadata.xml 603 BLAKE2B 65783ada89c16e0186dc1af9532d0dff0366beb62bcc935895cbeb174d8c7ebb3b4203fc2f2287390d764f9e26b53aac10b78cfbbd38f0d757613638e2d07efc SHA512 fbb42f6bb68c08a378846f9007cdbffe52b0f2fd042bcbe083ea307a2419b2036a0bb085573294d83a464a4aeea97012a966b3135d282912fae71fcc47c4a325
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
deleted file mode 100644
index 78bc92f714ee..000000000000
--- a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils fixheadtails qmail user
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
-REQUIRED_USE="mysql? ( !postgres )"
-
-DEPEND="virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:=[server] )
-	spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(egethome vpopmail)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewgroup vpopmail 89
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	epatch "${FILESDIR}"/${PN}-lazy.patch
-	epatch "${FILESDIR}"/${PN}-double-free.patch
-	epatch "${FILESDIR}"/${PN}-vpgsql.patch
-
-	echo 'install-recursive: install-exec-am' \
-		>>"${S}"/Makefile.am
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	# automake/autoconf
-	mv -f "${S}"/configure.{in,ac} || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
-	        configure.ac || die
-
-	# _FORTIFY_SOURCE
-	sed -i \
-		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
-		vlistlib.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	vpopmail_set_homedir
-
-	local authopts
-	if use mysql; then
-		incdir=$(mysql_config --variable=pkgincludedir)
-		libdir=$(mysql_config --variable=pkglibdir)
-		authopts+=" --enable-auth-module=mysql"
-		authopts+=" --enable-incdir=${incdir}"
-		authopts+=" --enable-libdir=${libdir}"
-		authopts+=" --enable-sql-logging"
-		authopts+=" --enable-valias"
-		authopts+=" --disable-mysql-replication"
-		authopts+=" --enable-mysql-limits"
-	elif use postgres; then
-		pglibdir=$(pg_config --libdir)
-		authopts+=" --enable-auth-module=pgsql"
-		authopts+=" --enable-libdir=${pglibdir}"
-		authopts+=" --enable-sql-logging"
-		authopts+=" --enable-valias"
-	else
-		authopts+=" --enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
-		$(use_enable spamassassin)
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	emake DESTDIR="${D}" install
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
-	dohtml doc/doc_html/* doc/man_html/*
-	rm -rf "${D}/${VPOP_HOME}"/doc
-	dosym \
-		$(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/) \
-		"${VPOP_HOME}"/doc
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		dodir /etc
-		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
-		dosym \
-			$(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf) \
-			"${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed -e '12d' -i "${D}"/etc/vpopmail.conf
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	ewarn
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables:"
-		elog
-		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
-		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
-		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
-		elog
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c85d41b19ff8..267ed6ffbbed 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index 21649ac305b5..206a599461fc 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -1,9 +1,13 @@
 AUX anydesk-4.0.1.service 276 BLAKE2B 1eb07a90a1e2369c42be849e9885d0696f1b68ff1f21bef3907e0772e930ba41dbed6228e7be62f1fb80bbcc02866294d6f0040e7d8a2928ad409d3bef78ae5d SHA512 af74f74030f6834dc85f0275a0a3f7ef8eafc902a5b8eb99197574c60de1658cd70f4e3152876a1e9c86349473c2e52bba98302d366fa1b1f2618373f90e0f78
+AUX anydesk.desktop 239 BLAKE2B 3e9c2d1b93b7efe9731ffb1ba1202620b71b4c2655d1b053cd303b4e122dac3423998c3bad3b41b491a820587cda5a959f260937f5b5c4ebeed27583d90d2caa SHA512 c6ec7c6022b7cd994d80fa8f3d4bc583e84dc616e0567e50b6a62145ac32d6157eb00a0202633148b00b15523473f3284ca698035ed55bfde9694e3407a8d25c
 AUX anydesk.init 291 BLAKE2B 5fa5d60240f3342e53fcf7aa17df6d658a98b6446887f73e04eed490824876cebe9fca7844c4e33737f6b4e01787a2134089de78152503130d4ef4a242bf3f12 SHA512 63e60d0442355f567e24bb6042710e998ac7ed09b4d970cd30bb6910955bc95e7629f63a4988c2b92067cf273aa04893510cc31971def96bf453c92b673254c2
 DIST anydesk-4.0.1-amd64.tar.gz 3663439 BLAKE2B 6d693262569708d0289f9e4b03e15a4d4b8d7eea5253a18c6694d720e916b9d3d2a6894db16e5e6a31ddc39bd87ef4e766244047761440f9245c5f563ccd8dd4 SHA512 df2d4ec945f77954b8548513052af4d4f16c904ba450f4560c9185e94c2d4e57dc5ffb865239d1082803e040a60775b78d9c09015932b0fa6159378475d73f10
 DIST anydesk-4.0.1-i686.tar.gz 3658518 BLAKE2B 39bcad58de9b5ae76da5e96e32a8799343e1b6f7f78b3db3d02e675acae1ebbfa5c2a47a043b9d88810644656bce027bc347a783fcccbf37cdf44f986f1a8548 SHA512 e922e296149811a7ef77ae642c9ba73ca9888be57f13b0616ba5008f6837c86245d4b8b3a4b8ab6739a97fffa9b397b20d572c1fae7d5a5b2d909e8ee07112cc
 DIST anydesk-5.0.0-amd64.tar.gz 4258837 BLAKE2B 1ebb7cb70226873e9a2207823a1d66eb6b2dda9846d2921fc4484638f1bb4b9bf1abe4897af38fe7fb4c1c585187121bcf54bda5bd33a48c052fa5021f5cac07 SHA512 f18a3374dfdc62fecb7d47cdc6d43f7ec71433ed06f4c7165056e9b9526acd624305b0409cf1140f85631f8d7b72cf032ff32298ea24781c8e48e58d7e50abf0
 DIST anydesk-5.0.0-i686.tar.gz 4259050 BLAKE2B 43eb38dda82e6846c3e3c47f28f2556d93a4a420ea82639c7be0fc122a4d1bfdeecc5bbe7088687a54a0cc992307bd0ca4502a9c46539e459cea2d362a962622 SHA512 bfe3b39540aec09432343c554ec761072dc688f271bf164c1b3d6cb54271336b5cf35b51a93902bfad2d92d530c186abe108cc250f2a7f88641c66abd42b3c6a
+DIST anydesk-5.1.2-amd64.tar.gz 4502952 BLAKE2B ff59e13161f58d63512da17162e32e52625ac7ab2698053e5183b10bf7971955797194962fa91d77a2f4d72fae4192811382f3c8664c859db637b6ab6adcd82d SHA512 e05fd51b77dbe5d4deace5dc245481a76e9c27f01ae8240da2eb510fb7c6685f5bb0cc6b89920dfb1aea10002f22f2a1e5bdd8d11a4a608224c2becded88f8e7
+DIST anydesk-5.1.2-i386.tar.gz 4498951 BLAKE2B c9e44513dd2c49fa9ac0312e5a91201161905d81a66f15ab3be0b3f65f3f2c638c584191b120998a8a3961528c185844a079461a8d273dac67f314acb7ac1108 SHA512 51cbd953a93591c7551ddcb17450aff43ddf3b93280f902326f43f9a07f5ed4fa7de1e6ea580b4d56bddfbcdd772c3cdfdf3c85233fe8b6783e7fe681a2095af
 EBUILD anydesk-4.0.1-r1.ebuild 2278 BLAKE2B 52408a66fb764f8286f4efdf25ecb63f0343bca3c19687fc54f91f0ed478d89e0a87a3c5db5b12df78fe962564ade248d87883e0edf1492448601c1db7592975 SHA512 1990f9f67117e25f46ccd4af5ad6d9a23a8854c226f0c808b2f0222b8845da5a750b6f796eb3460992577b654bd8fa8f777c5fbdbfcccac419b125414031399c
 EBUILD anydesk-5.0.0.ebuild 2259 BLAKE2B af0627e3eff482a7d4383244334775c08b1ecad8eb021fd161576f1357812794de6679c9da42a186d8d606c9658cb6d9715ec1d17459328bd0b327a21943a0f0 SHA512 b53cf1b2f63e9b6d7157a4cbcab416744716de1465a1a8f908575d0af8273fbc6ed9d2538fa40b6badee6f8a1bcbd507e85700943ccf481038cef0fbcf9f8124
+EBUILD anydesk-5.1.2.ebuild 2275 BLAKE2B f10cbc810ed587182af61c0a2175a7f34e01fa6aeac5bd4292119b032bfabd5d962029ae7da0f8375ad4bf6d0ba10818698ae1de7404242915516fc37fc77059 SHA512 c068f2b82c0d8feeda9972fbf19b3a04e8ce60e3262bc8aca615d624e8f8059104efdb4bd3134b4c46b275dc1eebb3139eb0ad09d4ae74e0dc247a64517eee4b
 MISC metadata.xml 782 BLAKE2B 4052c9f572568a3ab3a9c4bc1f567439cc7a4438a5f3fc1c4b14b0b7d4582d19d74ef106d5ad845e2f7549b734eeb539a3c79bc287f0359301c02d04083c303f SHA512 4c8eda43942444eeb6df7a19bb27528973a9efa412536b5b297640c77ae94065bd3b46e722289f1762494742d61ac6c9b47c5f967afa1c226a1daef30484fb03
diff --git a/net-misc/anydesk/anydesk-5.1.2.ebuild b/net-misc/anydesk/anydesk-5.1.2.ebuild
new file mode 100644
index 000000000000..a3bb4194a948
--- /dev/null
+++ b/net-misc/anydesk/anydesk-5.1.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop systemd xdg-utils
+
+DESCRIPTION="Feature rich multi-platform remote desktop application"
+HOMEPAGE="https://anydesk.com"
+SRC_URI="amd64? ( https://download.anydesk.com/linux/${P}-amd64.tar.gz )
+	x86? ( https://download.anydesk.com/linux/${P}-i386.tar.gz )"
+
+# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
+LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/glu
+	media-libs/mesa[X(+)]
+	sys-auth/polkit
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/pango
+	x11-libs/pangox-compat
+"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="opt/${PN}/*"
+
+src_install() {
+	local dst="/opt/${PN}"
+
+	dodir ${dst}
+	exeinto ${dst}
+	doexe ${PN}
+
+	dodir /opt/bin
+	dosym ${dst}/${PN} /opt/bin/${PN}
+
+	newinitd "${FILESDIR}"/anydesk.init anydesk
+	systemd_newunit "${FILESDIR}"/anydesk-4.0.1.service anydesk.service
+
+	insinto /usr/share/polkit-1/actions
+	doins polkit-1/com.philandro.anydesk.policy
+
+	insinto /usr/share
+	doins -r icons
+
+	domenu "${FILESDIR}"/anydesk.desktop
+
+	keepdir /etc/${PN}
+
+	dodoc copyright README
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To run AnyDesk as background service use:"
+		elog
+		elog "OpenRC:"
+		elog "# rc-service anydesk start"
+		elog "# rc-update add anydesk default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start anydesk.service"
+		elog "# systemctl enable anydesk.service"
+		elog
+		elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
+		elog "further information about the linux version of AnyDesk."
+		elog
+		elog "AnyDesk might require the following commands/packages"
+		elog "for some functions:"
+		elog "* lsb_release	(sys-apps/lsb-release)"
+		elog "* lsusb		(sys-apps/usbutils)"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-misc/anydesk/files/anydesk.desktop b/net-misc/anydesk/files/anydesk.desktop
new file mode 100755
index 000000000000..cd4c1e0089f5
--- /dev/null
+++ b/net-misc/anydesk/files/anydesk.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=AnyDesk
+GenericName=AnyDesk
+X-GNOME-FullName=AnyDesk
+Exec=/opt/bin/anydesk %u
+Icon=anydesk
+Terminal=false
+TryExec=anydesk
+Categories=Network;GTK;
+MimeType=x-scheme-handler/anydesk;
+Name[de_DE]=AnyDesk
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 4aade7c36f3b..ac8150b0b3cb 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,6 +1,5 @@
 AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec6925b7c8a1a0ef1ccd1a17f812d6289b2aa62a0cac5e12daeff442124a8eae7ceaafcaa9ea6420873d1fef060ae4263e3a0 SHA512 f49ae23e698acbc13c4455efa6edff4fb7f467b94711ed10ad34e8898d96985f401295d5402d66a410ad8e946a39d586f6d082f5393884963ddaf8fa10601af0
 AUX aria2-1.34.0-mask-headers.patch 1972 BLAKE2B 8efec9b9beeee5c763db29287931869cd69fde9883a7fab1f5f7fe48948ee62ef25df10fe855230fd082ce6a442f3eb00da8bf16b1f443573140868656f21969 SHA512 e81d6cf69652b4a2adb67a13434d3e37f1c69ce2a99a8d4b12f3e056c6c530218d6593aaeb1ca8b2691e4f28a0d53b29319d067c4f89eb0e4b2e8368f1c38319
 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
-EBUILD aria2-1.34.0-r1.ebuild 4439 BLAKE2B 95ceeb794a25162f1edaf2910117f093fdb06f4afa956b14a5fe8034440edc6f0ea7a91f18434cbf083505e7effedad47fcf68ee52286c931db73b9be29085b0 SHA512 2a9d7e9c963f3f8158727bafe5fb8895981bb3e81687bdfee36c23be097b7f3d452efb8e560dfaa540aa007368e386e04162c93ca651c405cf1c68386f9a8ff9
 EBUILD aria2-1.34.0-r2.ebuild 5014 BLAKE2B 11ade715c629821946b28812b7990918f0134093f3bbc374701a0ae196ca46ea569caa2d435f91250c07489603e3a222556a3eee30dc8c052aaf267802942ffd SHA512 ca8aa1ff070bb11b5d542f93e07b573eddbde3286f82101c3b2a2b65eccdb30872e66388185092fa1113bd41542e1645b213960cab5b15eeeab62f1ac9da992e
 MISC metadata.xml 1442 BLAKE2B 82e8426004e56ba96a5f8766a6d04325ea3919ecfa0996da1d767dc4f4fb2b3277d1b3e4b60d369bc7636eb557af336b890c4bde0b49ee39cc3352050a112fe5 SHA512 61da3c1c3cd1535d208e7ae1930fc2af16eb2080f99c923b9bc405decb50f09cf5acfbb1e922c3eb7edbb799f359e8e9762fe2e67ec24ae542613459250c6f7b
diff --git a/net-misc/aria2/aria2-1.34.0-r1.ebuild b/net-misc/aria2/aria2-1.34.0-r1.ebuild
deleted file mode 100644
index 39d7cfca73ab..000000000000
--- a/net-misc/aria2/aria2-1.34.0-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit bash-completion-r1
-
-DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
-HOMEPAGE="https://aria2.github.io/"
-SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
-
-CDEPEND="sys-libs/zlib:0=
-	ssl? (
-		app-misc/ca-certificates
-		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
-		!gnutls? ( dev-libs/openssl:0= ) )
-	adns? ( >=net-dns/c-ares-1.5.0:0= )
-	bittorrent? (
-		ssl? (
-			gnutls? (
-				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-		!ssl? (
-			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
-			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
-	jemalloc? ( dev-libs/jemalloc )
-	libuv? ( >=dev-libs/libuv-1.13:0= )
-	metalink? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
-	sqlite? ( dev-db/sqlite:3= )
-	ssh? ( net-libs/libssh2:= )
-	tcmalloc? ( dev-util/google-perftools )
-	xmlrpc? (
-		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
-
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
-
-# xmlrpc has no explicit switch, it's turned out by any XML library
-# so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use scripts && ! use xmlrpc; then
-		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
-		ewarn "and aria2mon scripts against the local aria2."
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-make_unique.patch
-	# https://bugs.gentoo.org/674622 (CVE-2019-3500)
-	eapply "${FILESDIR}"/${P}-mask-headers.patch
-	default
-	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
-}
-
-src_configure() {
-	local myconf=(
-		# threads, epoll: check for best portability
-
-		# do not try to compile and run a test LIBXML program
-		--disable-xmltest
-		# enable the shared library
-		--enable-libaria2
-		# zlib should always be available anyway
-		--with-libz
-		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
-
-		# optional features
-		$(use_enable bittorrent)
-		$(use_enable metalink)
-		$(use_enable nls)
-		$(use_with adns libcares)
-		$(use_with jemalloc)
-		$(use_with libuv)
-		$(use_with sqlite sqlite3)
-		$(use_with ssh libssh2)
-		$(use_with tcmalloc)
-	)
-
-	# SSL := gnutls / openssl
-	# USE=ssl
-	#  + USE=gnutls -> gnutls
-	#  + USE=-gnutls -> openssl
-
-	if use ssl; then
-		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
-	else
-		myconf+=( --without-gnutls --without-openssl )
-	fi
-
-	# message-digest := nettle / gcrypt / openssl
-	# bignum := nettle+gmp / gcrypt / openssl
-	# bittorrent := message-digest + bignum
-	# USE=bittorrent
-	#  + USE=(ssl -gnutls) -> openssl
-	#  + USE=nettle -> nettle+gmp
-	#  + USE=-nettle -> gcrypt
-
-	if use !bittorrent || use ssl && use !gnutls; then
-		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
-	else
-		myconf+=( $(use_with !nettle libgcrypt)
-			$(use_with nettle libnettle) $(use_with nettle libgmp) )
-	fi
-
-	# metalink+xmlrpc := libxml2 / expat
-	# USE=(metalink || xmlrpc)
-	#  + USE=libxml2 -> libxml2
-	#  + USE=-libxml2 -> expat
-
-	if use metalink || use xmlrpc; then
-		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
-	else
-		myconf+=( --without-libexpat --without-libxml2 )
-	fi
-
-	# Note:
-	# - always enable gzip/http compression since zlib should always be available anyway
-	# - always enable epoll since we can assume kernel 2.6.x
-	# - other options for threads: solaris, pth, win32
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/doc/aria2 \
-		"${D}"/usr/share/doc/${PF}/README{,.html}
-
-	dobashcomp doc/bash_completion/aria2c
-	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
-}
-
-pkg_postinst() {
-	if use xmlrpc; then
-		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
-		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
-	fi
-}
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index c0e417179d79..2c6245b8ba5a 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -16,6 +16,6 @@ DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfb
 DIST asterisk-13.23.1.tar.gz 33064056 BLAKE2B 7f531766df5f2db29b562e7c7d4e265d5cf610f192188691279c0294195b835bb62beef19d7e9554862e6b44764064b21d50a3e307bbf85dd12b67a2df8be459 SHA512 227bfc80b2e6382019d608296c4e1c8e992ba867636fa2c8ee578d0aa406b8828bf7962b24035d9b581c433afd18be7cbe98eb954112661b9759b6296ee686dd
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 DIST gentoo-asterisk-patchset-4.07.tar.bz2 2471 BLAKE2B d9026e7e8c12431496c24f204d117ed715741623195af10c838ec3ac5ce6a26fbb2d76d4c45c538881b532084e2ce74d2de83a27a0abaa5f65791be91416ef6d SHA512 73a9f92e6a737687c311941100c45bbc573f54fa79d0284318996c0d70274a4d2218693406d71b371496d27123d4d99bbc159974388e6547a682c06084d3b4c5
-EBUILD asterisk-11.25.3.ebuild 9606 BLAKE2B a9175fdf2e654f5306ca07c001810f17229904d7ae9c08913cb0910d20d7f9aa9d27d719e06b23faf57174708cebc1212b11887de89d02b7916694702123b93a SHA512 bce64dc6beca0a55b8c8a86186e98f7947ee3ac8ad42ca9efb1b7bcfea105ef8a0c663568bbec1b157e225a12df3e2782f7fd5b92a353dc01317c0c6c0806887
-EBUILD asterisk-13.23.1.ebuild 9717 BLAKE2B edd999c6abf4b83c3028d8c69f167e494f372f1b8b2e5640569adf0a212617d96bcfc326fcbf45cf8200a7f9a6fd1836d974c267ef10777f0cbd5fbe7499a75e SHA512 110828ccedecf0bd535357134ee51c860ece343e4116e81d6242a8b9098d01f7889d6b440ccf23c9d0fcfe036083edde0be23fa82049463553c6b9c24b8b76ef
+EBUILD asterisk-11.25.3.ebuild 9607 BLAKE2B dedc0fe6dc53dd63a674648fc309957416f6b0e1f6036803802831ec33754b0fada3af67264744274004c2d29b0b43c1d4ab430aec6c3d368aab024a02c92297 SHA512 90c7b637065abc7953bce1016eee9c3b9f94f3a30df593de81cd72e61afd217db62a505d059623f99f72be643ade955460dbd4138e5a98e979b924de5bbe2cc8
+EBUILD asterisk-13.23.1.ebuild 9721 BLAKE2B bb24fad06bea49534ead1bb19917842eed3e04c24b0a2f60ae2035544ba250d420c995134cbe221a51aa05327c45cfe5e44710539891966fb0af7d6e379876c6 SHA512 42df62f3e23ceef24fe934b2565bcb44fadbce1c69d9c6c17c14afea457418f250ad99e9969a4197ab28b208a48d7fb86ab4a2872d27a1fa1f00c01dcd86f41e
 MISC metadata.xml 1135 BLAKE2B c4572b7c187ff1e7ac66ad38c03a04b51b601990ad48563dbcfa046f03fe0f3587a1e58c1bed7abe6a13a7e2252526d03a0937b5ddbf1a2427ec14b3f115c58c SHA512 660666a8abae2edae04e3c32b272e4f1d509d18566c6c9eb0b0b8a93710d8a1284c68f7ee613ca70bf4c54779a1df1e29d9a56093212bc0fdf1c057450037ab1
diff --git a/net-misc/asterisk/asterisk-11.25.3.ebuild b/net-misc/asterisk/asterisk-11.25.3.ebuild
index 75bca5529286..dccee3d36f7d 100644
--- a/net-misc/asterisk/asterisk-11.25.3.ebuild
+++ b/net-misc/asterisk/asterisk-11.25.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,8 +32,8 @@ PATCHES=( "${WORKDIR}/asterisk-patchset" )
 CDEPEND="dev-db/sqlite:3
 	dev-libs/popt
 	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	sys-libs/ncurses:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
diff --git a/net-misc/asterisk/asterisk-13.23.1.ebuild b/net-misc/asterisk/asterisk-13.23.1.ebuild
index e55474c53fd1..4b4f8daa8ba3 100644
--- a/net-misc/asterisk/asterisk-13.23.1.ebuild
+++ b/net-misc/asterisk/asterisk-13.23.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,8 +33,8 @@ CDEPEND="dev-db/sqlite:3
 	dev-libs/popt
 	dev-libs/jansson
 	dev-libs/libxml2
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	sys-libs/ncurses:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index c76a980f609d..4cd10a6e1b21 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,5 +1,5 @@
 DIST bfgminer-5.4.2.tar.xz 1039200 BLAKE2B f63a7fa2c85d352a366794a39619599db6ccc3f98508ccd90387b315374227d74edfcfd2329db8b57c96539b194b0d2ee746cbea032c241dab1cf93e717b137d SHA512 b5ae8ae44df166d5576f89683ce9ee0832ca1f506b2522da7e3cd432abc5e218e9080e2a79f4da29e40db0d3179e63c9a8907d5d6b60d5d4895d6cac2b15d8ca
 DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb
-EBUILD bfgminer-5.4.2.ebuild 5117 BLAKE2B 9468e321a37398cc63cfcf01cb9e940e3cdb7acabd9681c5c41129172849cfa87eb68b73246e99d9b18172d4c62e5b6d0b774b54ccf22eb33637595fbb196016 SHA512 3dc376715f42147d016307e36c816a20b3b101ff135aecb1a9e9b3b3a8ffaf59f6cd2d721b7f6334b370090d612903e71ad4d839e48fc772b86401fba6a350fa
-EBUILD bfgminer-5.5.0.ebuild 5179 BLAKE2B 96f3419d43cb9da8a0acefb50d7db215884988233c99d8283495519286af8ece98bfaf8a08826fbd870e957d8275c15590b49fafe2433f1c73405e640219e053 SHA512 9ef2d514c5e80ed59a32a0f289e2b15ee8b64d9d14e1e2c173a62fd5bb431ef14388378c316639817d34e2e9ff202d072f1014f6b64059f7dd25cbd685fbb46c
+EBUILD bfgminer-5.4.2.ebuild 5117 BLAKE2B f1e985c58d4ab5c626b6fa67234a07f84b5302eef4599bf22b57ed77918e821b03a8c8735fe83466433ef17f186936bef52214a91436a0e8b86b68437a03f144 SHA512 5b96f640bca3d18ad5c75da5be5250c4a90184b69698723875a9ad0647bb803a3f13402a822d63c020bc006827f86512a399c1fe4beb34a44f0b8e816c48a7f9
+EBUILD bfgminer-5.5.0.ebuild 5179 BLAKE2B 179869f66f6495d1bd831f0777c9caa5665dbf1445fabbae1f93d90b15c5687d0385e0b90245f614977a691ebf9b10ad03be2474015aa72c32055c9f275eb794 SHA512 df5c9ba8b76775eab85b0b69f4245e570d295ab62f8c56542c6af06a5eaa3d3e08b47bb273f21ba35fd06812f12d153a0c3d2c2f8c59fd74012b73e9eb1f02ad
 MISC metadata.xml 4029 BLAKE2B b9ed1a1c14386e3c4c3d11d40ae60988e2d7170c2363418b1dd9f33e0e32516bcf45ea08c96310d598173b43cd0fa23d7c1f6033656c3914ded0e685f39b6de6 SHA512 17f36d0d7f9055d1860acf7fe83f036184303cfa095d872f40877fd2f78cfb3433bdb01eba6c39058117dcbdbe5c7645e6b5eb0d24922288d34256c80624fa21
diff --git a/net-misc/bfgminer/bfgminer-5.4.2.ebuild b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
index bb70a2cd1ca7..93d5146abac5 100644
--- a/net-misc/bfgminer/bfgminer-5.4.2.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 # TODO: knc (needs i2c-tools header)
 # TODO: kncasic & titan (need systemwide knc-asic install)
 # TODO: minergate (needs actual miner_gate)
-IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
 REQUIRED_USE='
 	|| ( keccak scrypt sha256d )
 	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
@@ -42,7 +42,7 @@ REQUIRED_USE='
 	keccak? ( || ( cpumining opencl proxy ) )
 	klondike? ( sha256d libusb )
 	littlefury? ( sha256d bitfury )
-	lm_sensors? ( opencl )
+	lm-sensors? ( opencl )
 	metabank? ( sha256d bitfury )
 	minion? ( sha256d )
 	modminer? ( sha256d )
@@ -78,8 +78,8 @@ DEPEND='
 	libusb? (
 		virtual/libusb:1
 	)
-	lm_sensors? (
-		sys-apps/lm_sensors
+	lm-sensors? (
+		sys-apps/lm-sensors
 	)
 	nanofury? (
 		dev-libs/hidapi
@@ -175,7 +175,7 @@ src_configure() {
 		$with_curses \
 		$(use_with udev libudev) \
 		$(use_enable udev-broad-rules broad-udevrules) \
-		$(use_with lm_sensors sensors) \
+		$(use_with lm-sensors sensors) \
 		$(use_with proxy_getwork libmicrohttpd) \
 		$(use_with proxy_stratum libevent) \
 		$(use_enable x6500) \
diff --git a/net-misc/bfgminer/bfgminer-5.5.0.ebuild b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
index b2dd3f03b1bc..6d7f7cea5ea7 100644
--- a/net-misc/bfgminer/bfgminer-5.5.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 # TODO: knc (needs i2c-tools header)
 # TODO: kncasic & titan (need systemwide knc-asic install)
 # TODO: minergate (needs actual miner_gate)
-IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
 REQUIRED_USE='
 	|| ( keccak scrypt sha256d )
 	|| ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
@@ -43,7 +43,7 @@ REQUIRED_USE='
 	keccak? ( || ( cpumining opencl proxy ) )
 	klondike? ( sha256d libusb )
 	littlefury? ( sha256d bitfury )
-	lm_sensors? ( opencl )
+	lm-sensors? ( opencl )
 	metabank? ( sha256d bitfury )
 	minion? ( sha256d )
 	modminer? ( sha256d )
@@ -78,8 +78,8 @@ DEPEND='
 	libusb? (
 		virtual/libusb:1
 	)
-	lm_sensors? (
-		sys-apps/lm_sensors
+	lm-sensors? (
+		sys-apps/lm-sensors
 	)
 	nanofury? (
 		dev-libs/hidapi
@@ -176,7 +176,7 @@ src_configure() {
 		$with_curses \
 		$(use_with udev libudev) \
 		$(use_enable udev-broad-rules broad-udevrules) \
-		$(use_with lm_sensors sensors) \
+		$(use_with lm-sensors sensors) \
 		$(use_with proxy_getwork libmicrohttpd) \
 		$(use_with proxy_stratum libevent) \
 		$(use_enable x6500) \
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 5cdeef55bd4d..1090b44bd489 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -3,4 +3,4 @@ DIST bridge-utils-1.5.tar.gz 33243 BLAKE2B 211ecb831f802c119f32c30621daa781056bd
 DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02
 EBUILD bridge-utils-1.5.ebuild 1281 BLAKE2B e6de8e0ad11732c63cf2d7ab327eedb2c64645ca17e716a334c31763283054df09b31fb4f25eb59ae3b168729ea6cdaede66d0f588ba023a7c38e755a92a5da6 SHA512 f2770626ffb714981d426b4d9f005922724389580d0dd3252c91123fdd94212b6aecaed5547c66a459dd1d1d6109d4f93453103c996e55a1659fa27e72c57636
 EBUILD bridge-utils-1.6.ebuild 1346 BLAKE2B c33c146b23adb59d332498b285f69c78aa7f6016c3272e32a4bf3119af297c008939eb0ca557dfe96b88c45d0279730097b7f7fe934f9f648d4b5953bc95a46f SHA512 405c661cba4d088ae986f75a1df0cf43efe623df0d0547242d05eab5575ba315a5f8e623725e7d59de59562bca86a65c4d789c80ee125c2364999041699bf08c
-MISC metadata.xml 426 BLAKE2B b5b760c60c84d9cfc3f941b1ec1fc8f8736f93fa479bd3f68c772aa0e0e8f6c0de30b55dd3a10010ee9845165d3075c439af72ab006f4924a422a28466c74ccf SHA512 b6d8f31496815fff6ee465b4eff20dba27a478e803c299e1d329ad33dd80493380b746fd0aba19d15a3780e4a4b37365829781cda5aaccfca2f044506b15c38e
+MISC metadata.xml 491 BLAKE2B bf2e6636e5cd672907c0fa7a57894aadd2a56c6a86243d6894567e5819684dba5ef73419b9796d3e8e30e5d9048e13f4a11f714400f4b71dc2a61b8fee81467f SHA512 ec5ffecc293290fa0931f16fc447b5f9537d86db112462f6f865b1e4714e95c10d22fef326692d4506958956c3148061beba187e19b8549608f02ef974302bee
diff --git a/net-misc/bridge-utils/metadata.xml b/net-misc/bridge-utils/metadata.xml
index 995aec82049e..4320f1c5d7c2 100644
--- a/net-misc/bridge-utils/metadata.xml
+++ b/net-misc/bridge-utils/metadata.xml
@@ -9,6 +9,7 @@
     <name>Gentoo Base System</name>
   </maintainer>
   <upstream>
+    <remote-id type="cpe">cpe:/a:kernel:bridge-utils</remote-id>
     <remote-id type="sourceforge">bridge</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index 3e4f963bd179..40139ba407d8 100644
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -1,4 +1,4 @@
 AUX cadaver-0.23.2-disable-nls.patch 324 BLAKE2B 5ae07a17eb6079f9801ece8b8a3b893c1d52e13d2cd3693a1e412a873329709b86b2eda9c2bb68d07f850708a49185e6c63602148f9530ab729a2b178fb52b31 SHA512 4c9d7d93af1d747432bfb393b33d5f575f7ad1c2dda1c88238cb40a274f979aee91b75c1cd5c2f91787156e3085df0864204989944be6cfe1b7013c61db25f4f
 DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41
 EBUILD cadaver-0.23.3.ebuild 1073 BLAKE2B dc2af096996fafb295055cf9843465c323ce5f04b97a42e7d2fc201c8ef34c5ca93c28c97723a3671abc968fec9adec094a69d0c9c812c3afde8857edf3952b4 SHA512 217e5a20da9bea6e7eb099b61b33447ef074596d53e45d0318712771596c00adda66e0546e1f15e9067c25b51a842697451219e4b843ab06b428f98f619156ae
-MISC metadata.xml 222 BLAKE2B 94ebd170c2e2b56a2a280b892081f4a2b380a9dd63304df741df254293ac82054167980b6e986315718abdf0da5f6d26226df0d13c3f1eedc4ee2f32bdb5a798 SHA512 c4199e672c74e701df271dc48c920480d853cdc341936ef071bb5d1cd3a28127ff0fdf6a4e135ce7e805bcb99bebe93407dd2aa4dfda91a8c66d6cc2d2ae9a01
+MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml
index 58be4f4a109f..ca82cfff518d 100644
--- a/net-misc/cadaver/metadata.xml
+++ b/net-misc/cadaver/metadata.xml
@@ -4,4 +4,9 @@
 	<maintainer type="person">
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+		<description>Proxy</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/calico-cni-plugin/Manifest b/net-misc/calico-cni-plugin/Manifest
index 4c7c516b70a9..109fd3b314de 100644
--- a/net-misc/calico-cni-plugin/Manifest
+++ b/net-misc/calico-cni-plugin/Manifest
@@ -1,16 +1,12 @@
-DIST calico-cni-plugin-2.0.1.tar.gz 59792 BLAKE2B a7ca4799030ae83bd96291c72d46b95efff9bcbf465da41b19fe54d61503b0a3efdaee55fa086ee154fa83b8b36725ec848145fba078f107a8d3807959d60a7d SHA512 1ca447e2e8a4f95254c5433ba39427014da40febb44c29969a9e81f8a7ae62f706d9cf6b116400b7a5372ebc91954d588916808d64d9b12fcfe25fff90feec9d
-DIST calico-cni-plugin-3.1.0.tar.gz 62358 BLAKE2B 04a435b427da12f6fcd01e8713bb42f094da8de54fa33982c9fc9d4d9ab71f3b5f23e6bb750eb5395d0cf5b8250057c9c670b89121456509b1f204230b3cead5 SHA512 44bcdbc91c56c7f1610261aaf6d6bd7f0ee32bd08501ac74cf980a91c5c126903eee5c2daf6c3ccedea6396f93c4b22df1c5de247acdefb47b49c0b9a2717e26
 DIST calico-cni-plugin-3.1.3.tar.gz 64054 BLAKE2B 782847ca79306b27fffd0426b9cd7c5b8e34f39634491beafc1c652d26dd0ebd84b46116b12b3f6e8ebdff4a8aa5db52966ac62e1bba595456f41bbdb3c48fd8 SHA512 d4c064d4f7b5e65c933d6b7866ffc077e20da35ae3af03d8b0175f01f9fb87857a5c891f8e15b877e6a1c238c894a8163458197f7921d866b7a180ed52eed527
 DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
 DIST github.com-containernetworking-cni-a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88.tar.gz 173167 BLAKE2B 9aad6388fd9c307a31a37a746684ed9fc52ff556ef5209e14c2afebf69af0abc28cb9d825245b87a49fd9947f638344b92143868fea7852db0bd2bc39239a2e1 SHA512 0607a4213f1291cff03d21d6860a8830ad998bcb4c6e3489bf0a8c207137fe9b958c3c453e9cf6fe0911a219d250d89f0e8b3c457900893b9ed8bd31dc696777
 DIST github.com-containernetworking-plugins-7480240de9749f9a0a5c8614b17f1f03e0c06ab9.tar.gz 789110 BLAKE2B b04688b90503cb01aa18d9c1227b7cb510846f8b42678729fb7a80bf914ef4a06c399a8f165b7f01d6a05aaf98d4e97c17675a3774745a7850862bdd609b5168 SHA512 2aa1a665531c2e6b7800d38abdec4f0b68e778ae27c638b4ab097abb720c66a4863fd1f4b59dc818b91bddbc5c7dce4e1fefddfda11881e2334d7b71122bd60e
 DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8
-DIST github.com-coreos-go-iptables-259c8e6a4275d497442c721fa52204d7a58bde8b.tar.gz 11294 BLAKE2B 2e95b4c7c9836d54a004da28f6abd09d3d165055d2d1d4f8e6a67d3389b7f93fee14f30c92096d2da6f7639a602bc163df40c1f817370c481ebbf63094d8b197 SHA512 58c5b995dc12a881820f5dccadcd75cb8e6d856f34c2d33c01ff8538c0a1451b75e14d3bc675fb008fe3c4e87d1d0bfd4a27443f19dfa8b53b4da02d3de9dfea
 DIST github.com-coreos-go-iptables-b5b1876b170881a8259f036445ee89c8669db386.tar.gz 13564 BLAKE2B 5d0227229ccb548a8978f0ff4f45d55437995ebf09d6af0f71f2fd6fb9ca6ebee58a75c0eb1b8badafd85dc79651672476b8298404dc13aaf8c602bd914a715c SHA512 df1a5c19ac8cd10602886f0adedce07629f56a055bd401caf64e9b330aa7dc40995d203b446bd5486f67c6f932bfcafe4e6af7ff6f9480ec815763bcccc374c8
 DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc
 DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa
@@ -25,8 +21,6 @@ DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz
 DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz 61555 BLAKE2B 824dd1ba4f97bc7b77f8e511bda1fdc7acbe1828d81d9c88f913f139b46ee0bfca6ec8b901d7b216023b987b28d98a848ccceb0f41bed1eca8004b5f5c71922d SHA512 dadcdf9c03528991672277ab8414e9f2a1b1868c855d80dcff16560c8d4a46ee6b4c17961e5d4dac7ebded3cd423b4ffbc6eb6ff0d05ea3a67e39c0eb4a1afb6
 DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
 DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459
-DIST github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz 248545 BLAKE2B f30fbefd0442e492a1435a415b8b70f19afbe13752779e80ce393ad3c01c478c0c975833c96291ddbcd3ce7086b0be8adb64dd96f16afdac2e5b784fa36eccfe SHA512 fb8a4e6b1689e8e6bec7fb9b4a4580892331322f144819fad96b7b5dd09fa89cfda45a8b4e1dfa25ee9f3bdb8a064705b05180efd1825fa8a3ea4f4cb93130e3
-DIST github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz 300759 BLAKE2B dfa857e9da660106f75869c3515305b6842e3d3ce60f92175ec2de3e9f08378c9340b25a656f71c2c9a1c4ad4ead41e3b2eadab9a47e7e5eb62d682ec648f320 SHA512 c874c819b5ad176574f9bf0459eb3797facd7a2b477d4db83353c690a279547bb9c0ea11fbc4bc74e010b20388b13e715be8f5053609efa98667b7ce29ccaffc
 DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455
 DIST github.com-golang-crypto-1351f936d976c60a0a48d728281922cf63eafb8d.tar.gz 860438 BLAKE2B a19c673d984177faf078a04b7351258fed56390d09bb74f715409e30a7c99b68ef1861f1890db0683370c290a4fcec8f2a1d82a01e9132160f5a3a2954b9cfe1 SHA512 693f3586a09e2149ceda3b6833154acdd7d924eb6e225697db4d103a9a907147a9b1860efbd0dcecf2db6b39f44b0e6e6414eff318ae4ccaaf36e18f505f438a
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
@@ -48,21 +42,14 @@ DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 72
 DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958
 DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
 DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
-DIST github.com-kubernetes-api-389dfa299845bcf399c16af89987e8775718ea48.tar.gz 599812 BLAKE2B 6763e5204c210f9c4762f659a863ca2333e49b3f35d516fbdcd9a68124bc2f69f464e20caecd6a84b67f4962c4325f41c52464613a687d3ed12d1c97934e790c SHA512 5533ff2a56b573b644f16c4e287d50c850203e79a82588df252df78dd3d0e8ba0bb691b7211c6e24f4ad3bf954e7941851e840fc279ab3f189f4d7096e4b8707
-DIST github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz 591475 BLAKE2B 7c66c79cbcbeaac326bc25110979279472749b59e4924714f65c42b5f55aa09700581a91bd77a21741be0238ae03f0f6b59d4cc39d2f0ea377ebbe31bc2974b3 SHA512 801ce8b413fabc176c61605fadf964bffb165f4ad66d3902c91930d2c5c09e711e14700fb9437722df509a26c93509de6c0bbf79918c35c37a6102135fe470b4
 DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b
 DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d
-DIST github.com-kubernetes-apimachinery-4972c8e335e32ab65ba45bde0a99c6544c8a8e4c.tar.gz 450402 BLAKE2B 422d64fd22f92c65f3ed41472e5a98b6197d32aa0b4fb19c7a487481e33738b65b807fa3af05e577641485a9702ce298e9741c57cdc9abba133a10d5a9d58de4 SHA512 628b11b308d8b76724f65e7d04570cd693a01368ea22ab556313ecd3af28e778c0bbf042a04f180bfa9c4b5188b437ae1bb5c0757fbd4d9602cae63f2fd37d36
-DIST github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz 436659 BLAKE2B 5985daae9aa7e1646753c90004dfda92b444d5ef4b93fa32815c3af010cf038601ab343278bbd53ab5cf0674d06f5b9c99b4eeb4167d30fa6396d0da7a1831e0 SHA512 be41916d67622289b23895b1bf12a7dc5c24503ecaaef9c5addaf400d561da9a6ba599703b81ba473cf4c189fac9062fed5e3c9838b4a0fb42edd9257ad41a03
 DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
 DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0
-DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
 DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
 DIST github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz 12403 BLAKE2B 2c800f93b933a49b292240eef973a01e54fc7e0a3d613629e6e2d506ffdf98c2430de7498adb4ea19b4faf433aff146f70b98e88bd7ce9404cf25c68246b3449 SHA512 ef192dd1239db964e3969fa45bd7f0032cd0d0141cf3af560f40c0a44ce5651101f518363cb7a4fe017375d7cd1ffb23da27b02e3f5805742bb3772bec19bf5d
-DIST github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz 125539 BLAKE2B 7f6c6218fe07985014f113ebfc53a3cf6f970950e8ba4ed56dc59da58dbe208b5cc3639bd17f7af3d99150d792988f63499c5cf7048b6888a8b5266f6754ae3c SHA512 a0656bd310cfe3fb734c39796a364de2766cf0accdaedb7c55eebba3d1713997ac288ffe52e0b1c9625e448e40c44e7583d29a6a2b9277246b809aabac138274
 DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010
-DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
 DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4
 DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
 DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
@@ -71,20 +58,14 @@ DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.t
 DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755
 DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e
 DIST github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9
-DIST github.com-projectcalico-libcalico-go-a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501.tar.gz 383022 BLAKE2B 04dffe36eeab8fc1407ff6345bf994f4d507aa462f70c55c27ae2f0a4044a5b2ee09ff36997cb6bee5bbbc5c8574d2cb7fc1b97b8d02fc9883ab28ab17356eb7 SHA512 9034dd3b0d0f088219a3e4b0a1c73b0fb7ede3d3d5f6dd2d61fd51d5705aa9d64ea27f1d40dc6b40bc5d4514b25da73e2baf45f83232658009fca1323066e4a9
-DIST github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz 405046 BLAKE2B 3e29de42c9f3d66dbbceb2f98557329ff3ae019b3a1d59ad8d693183cb5faec584ff2551c5ca2c946897b5f86d24c23dc837166ef2a7456a63c66dfd4d44c213 SHA512 9ff540f1d4db060eeaaa0e97999b33e031413a629a685fcc67ae1664c3e427c24ee7d572eefea5bec0e4561fc52da43a55f74dee76cb6a86080fe89ddf42ad77
 DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
 DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
-DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz 63007 BLAKE2B a62f727ef9dd42d52f495ab7449cbafbe7c7fcdb1bc171df97c40348dcb7fe12788223d7a2aea3398cae7dd17ec73ae6349b5e5f35f4785f2796cc9a16c2d420 SHA512 4f1ab6cffc309a00ed68959b9372e1d3ea4f8d597b8c462a4e365cf22737245e601b8bda0764bbd1f0172d773805d16e90a8aa90cb95e9462e35320043e04060
 DIST github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz 77798 BLAKE2B 3e8daf72d7ca8d702898349617c48a62d4dd7cc5ebeb65bd63d38978f5d8f05e6d0f02237e1fe285630da198aba90783e27eee69ac6a06f90e1a7be3fad50b4c SHA512 bdf0b2f818f9df4685ec7536a7478cb86ab8a8297081c618d92b14bc0296c2c66c9ccb403b2f4af42a7fed769f3ce2020082e2e983e3f2668e14776a6d26828b
-DIST github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz 62671 BLAKE2B ed69c90e91c3a219e9b037a416c730471729fd26498c0648793d54cad6b740a8f27f65371d6b2c8eddf67dda112706e9b166afbf122d0bfc0dc38aeecaf2b1ab SHA512 c12f04e6564bf370919e77fced2500ad09d5ff90a928b031838d73b62092a81d91ece808391d2864f08a7f2ead29087122baebaf8bc7294645997186691b5cb4
 DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507
 DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
 DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
 DIST github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz 85354 BLAKE2B e21e59ec6afe80055fc8e5b59405313afb4dae2dee1afb65f61f3d613b52ff2c3ce413dd40798b46030cca38da7ecfe3d17e17045c331061d48afb731cd64528 SHA512 a9ca7e3391ee1d2b1455f6357a557343a4e0d3800e40806fd20938a1669069228c3e8c273d0f968f3e551d230e93987fa8aac95d74bd838f8653db9824a6e730
 DIST github.com-vishvananda-netns-be1fbeda19366dea804f00efff2dd73a1642fdcc.tar.gz 7783 BLAKE2B afe0ea14577a220bd54eafa04abcef0ce7a7883637be10584d6b52727ecb60462648a54c5048dad1c6bb3202f6c3749b807ec59406e322f850063e79d8aa5cbb SHA512 c2d18179fb265e5fbf6c815797e374067e4dd09e47458908b5180768a4383f97b5599e927eba68905ef50c76e9b1819588256d1aa9a55cb40c05c8e20da0962f
-EBUILD calico-cni-plugin-2.0.1.ebuild 6365 BLAKE2B 26d3e32b88c6bc5236b42452eb80d034766188d5fe974be16f360209b7c02fded5ec2e0989aff8d8055a02eff236c7ef0fadadede52e684ca5d9807d3d1c55a7 SHA512 3edca428c969bc535592ce4cd6112945744e02b9e534490714112a9e08d276fd73ac8ab258242fd9c5db92c2b656f2abc44e7a91052edcfba1d1008519b93f46
-EBUILD calico-cni-plugin-3.1.0.ebuild 6365 BLAKE2B 03939f254629d3fdd82f2085665d1613ca650c0331654a7820f827e5d2045466a47169df41e7da6e2a29381d947f33d20ba5734b76bbbe6da5dec2b38c871608 SHA512 1c608f4b9e91bb64343c6c96300d760c8140fb3f6dd068d46f787b32e119eba97b209fe61aa28e88301a8211f47c762e11f38764ca36887f978ca162ca451965
 EBUILD calico-cni-plugin-3.1.3.ebuild 6365 BLAKE2B c562508cd4955695469bc41512377a8d1ed9105173929ea84d65e34ac0f30bd0bebabd8a08b30099a73bb24dd2b6e0d5f33521c58ded979a4bd8d5a3d5ef37d9 SHA512 fb7d14bf2625b002da53a52d475f5e32e9b005adbab272e8927ca4f7a6faed83187fafef70d42c63237669662b06a1146a81ac7e3f8679800aaafdd5f9692c9e
 MISC metadata.xml 262 BLAKE2B d956111dd23ecabf422e1d63d1544911922635562521b844bf87c64d14415748057fa5c10e0647a85aee501421e72dc539f589c2b96cb351ee80be27f67731a2 SHA512 383a23a695a1c63bcc045e62140dde337d7ad462d80ce195939b605f3a9d7c7ed037417002000c1eb0d2c72492162d8c4266c3549f5e7d61e530580d552c7080
diff --git a/net-misc/calico-cni-plugin/calico-cni-plugin-2.0.1.ebuild b/net-misc/calico-cni-plugin/calico-cni-plugin-2.0.1.ebuild
deleted file mode 100644
index 12702395ef9f..000000000000
--- a/net-misc/calico-cni-plugin/calico-cni-plugin-2.0.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/containernetworking/cni a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
-"github.com/containernetworking/plugins 7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
-"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
-"github.com/coreos/go-iptables 259c8e6a4275d497442c721fa52204d7a58bde8b"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
-"github.com/onsi/ginkgo 9eda700730cba42af70d53180f9dcce9266bc2bc"
-"github.com/onsi/gomega 003f63b7f4cff3fc95357005358af2de0f5fe152"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/felix fa15f1776244d1db9e30fcd99f51b8b99be509c8"
-"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go a06c8bdc578a0d64fd12fbb5a70bcc8fad53e501"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
-"github.com/prometheus/common e3fb1a1acd7605367a2b378bc2e2f893c05174b7"
-"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
-"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b"
-"github.com/vishvananda/netns be1fbeda19366dea804f00efff2dd73a1642fdcc"
-"golang.org/x/crypto 1351f936d976c60a0a48d728281922cf63eafb8d github.com/golang/crypto"
-"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 076b546753157f758b316e59bcb51e6807c04057 github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"google.golang.org/appengine 5bee14b453b4c71be47ec1781b0fa61c2ea182db github.com/golang/appengine"
-"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api 389dfa299845bcf399c16af89987e8775718ea48 github.com/kubernetes/api"
-"k8s.io/apimachinery 4972c8e335e32ab65ba45bde0a99c6544c8a8e4c github.com/kubernetes/apimachinery"
-"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
-)
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="Calico Networking for CNI"
-EGO_PN="github.com/projectcalico/cni-plugin"
-HOMEPAGE="https://github.com/projectcalico/cni-plugin"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="net-misc/cni-plugins"
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN} || die
-	sed -i -e "/calico-ipam:/ s/vendor//" -e "/calico:/ s/vendor//"\
-		-e "s/git describe.*/echo ${PV})/" -e "s/CGO_ENABLED=0//" Makefile || die
-	rm -rf vendor/github.com/containernetworking/plugins/vendor/github.com/vishvananda/netlink\
-		vendor/github.com/containernetworking/plugins/vendor/github.com/containernetworking/cni || die
-	popd || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}:$(get_golibdir_gopath)" emake binary
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	exeinto /opt/cni/bin
-	doexe dist/${ARCH}/*
-	dodoc README.md
-	popd || die
-}
diff --git a/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.0.ebuild b/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.0.ebuild
deleted file mode 100644
index 94c85194745c..000000000000
--- a/net-misc/calico-cni-plugin/calico-cni-plugin-3.1.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-"github.com/containernetworking/cni a2da8f8d7fd8e6dc25f336408a8ac86f050fbd88"
-"github.com/containernetworking/plugins 7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
-"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
-"github.com/coreos/go-iptables b5b1876b170881a8259f036445ee89c8669db386"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
-"github.com/onsi/ginkgo 9eda700730cba42af70d53180f9dcce9266bc2bc"
-"github.com/onsi/gomega 003f63b7f4cff3fc95357005358af2de0f5fe152"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/felix fa15f1776244d1db9e30fcd99f51b8b99be509c8"
-"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go ae021117ebb7c4d8067ea079706b718c6a88eb7f"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
-"github.com/prometheus/common 38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a"
-"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
-"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b"
-"github.com/vishvananda/netns be1fbeda19366dea804f00efff2dd73a1642fdcc"
-"golang.org/x/crypto 1351f936d976c60a0a48d728281922cf63eafb8d github.com/golang/crypto"
-"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 076b546753157f758b316e59bcb51e6807c04057 github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"google.golang.org/appengine ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4 github.com/golang/appengine"
-"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api 3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd github.com/kubernetes/api"
-"k8s.io/apimachinery ab7fc865fb0881d161f37adef3e5a67b89a18d05 github.com/kubernetes/apimachinery"
-"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
-)
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="Calico Networking for CNI"
-EGO_PN="github.com/projectcalico/cni-plugin"
-HOMEPAGE="https://github.com/projectcalico/cni-plugin"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="net-misc/cni-plugins"
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN} || die
-	sed -i -e "/calico-ipam:/ s/vendor//" -e "/calico:/ s/vendor//"\
-		-e "s/git describe.*/echo ${PV})/" -e "s/CGO_ENABLED=0//" Makefile || die
-	rm -rf vendor/github.com/containernetworking/plugins/vendor/github.com/vishvananda/netlink\
-		vendor/github.com/containernetworking/plugins/vendor/github.com/containernetworking/cni || die
-	popd || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}:$(get_golibdir_gopath)" emake binary
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	exeinto /opt/cni/bin
-	doexe dist/${ARCH}/*
-	dodoc README.md
-	popd || die
-}
diff --git a/net-misc/calicoctl/Manifest b/net-misc/calicoctl/Manifest
index fb8ab2e8ceb4..ecb0a969c26d 100644
--- a/net-misc/calicoctl/Manifest
+++ b/net-misc/calicoctl/Manifest
@@ -1,6 +1,3 @@
-DIST calicoctl-1.5.0.tar.gz 63645 BLAKE2B 583159a60d7b8ac02bd36d63579e216cb2a60cfad4305ba89997bb9e55568dfcb349edd9d2ef94525b2b71044a96fa5baa79c3f70a9eaf9b93f58ed949e967d6 SHA512 57bf1b9e008df0c652881f84e59cbfdb3bf6192ff0810ef068c16e7601a6da78e7d0c4bdd912606c2095059ced8e7fe820bbb42f328bf9e7a5404f773f4c883f
-DIST calicoctl-2.0.0.tar.gz 86002 BLAKE2B ec096880b6c6463364eca721693722d3dcd747a9f3f45af6188ad0d89d4ca2420cd9e5c9f6ed59d64842500887bf8849a7636846cf7ea84223503e333e20ab95 SHA512 d8c4f71c310ef8e2e41d51cc1ff02559cb85b1450e139dcf70aa4eee7989d2d4dfb6cf9c9dca88a6589e28f963e319835ba3542352670b14709812077473b133
-DIST calicoctl-3.1.0.tar.gz 87560 BLAKE2B ec9ccfc1b2fe03edb64372afd7caef7c96301a4a25909eac2bd2386112170262db4ddd017587c731a62fb0fdda18183a808634579a1e407bbe5e6f2b61edc00d SHA512 0cc60dfb635c3092ec998917ad564c7d7bba427fe2355d57fa53d6b050bbe54208b30412f6a5da5cd9c8e943abdf3e5ef264213643107919af70d0a2f142dc17
 DIST calicoctl-3.1.3.tar.gz 87574 BLAKE2B bd1c00f5ba084bb7bb49af64fed0dfd3cac8da921f8e33ecafea1329d7d09de3d2051680f8f0a3638d1cb98b90a9cddf0a88438844f365ffcc1fc6a9d50d656c SHA512 7369ecbdb4c7afb383e0e47ab088022b020665854a66400ee415dbc64a9ce7fba32ace67e202d13e8feaf2bde7c7e3544ea46e98ea0e2f9fc59c7def4a851479
 DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
@@ -8,19 +5,14 @@ DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
 DIST github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz 5943 BLAKE2B 35f99d69b58cbdf7b49d9aba5b8456c2702dd2fecec3da6e522e5d97e13b697037afe81c115a0a8980b25d99ad3216d3e07027c912a644a4efcb27c6c1404022 SHA512 431e41870728d86accd7ed78d1e16c92adebfe79cef59b7f656a395e4bf7727ae9521f7e9d291931590680fd32eaef26622d888f30a4a4511dbddcae8dda1c08
 DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
-DIST github.com-coreos-etcd-17ae440991da3bdb2df4309936dd2074f66ec394.tar.gz 2538523 BLAKE2B 8a7cc944e2eac99e549ef13e3630ab04d89579a59e8bfbc1629f1cbb350fe460aa02054c144275287192cbe956784d7758d5bfda2b642f7aee5ad6b1f6595bfd SHA512 9202595469d538328cd0ca57f08e29d66f93080592eb65fb32ae76c13a14dfaefdacb9d7b1aca8c069db52363e3d798b4882c5977bbcd600159d3d8cb65d5eeb
-DIST github.com-coreos-etcd-bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz 2890046 BLAKE2B da19c84834dd044a93274720437a068b36f97e859f6251af07252732b100297e28b8dd0ff350d8954290bdca50571a154b383f3cacec04f94f548332aa922bda SHA512 88a00ff578826bc7e06c6b88ca4ade468588e72ad4e33bdd8193dd942f1695cca285213ab40ce357f28f534a9d4ca50579f3d29183b468061500262e0441ce21
 DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8
-DIST github.com-coreos-go-semver-568e959cd89871e61434c1143528d9162da89ef2.tar.gz 7314 BLAKE2B 2bbcbf0a49820c6e5f5e236a844ddc7b78840c416e60c213a122aaf1415499e9f303935c834487b28462b555db33ffb47c63eb46614d36027e8ce10fd6223d0e SHA512 8e17cad3a52ffbdf658e71fbe97364a2a202ff6520baf25ce119d537f0d03c10b591772df4ed0e5da06665354c9deffcc06ffa3749c47d2042350d3ab1134940
 DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc
 DIST github.com-dgrijalva-jwt-go-d2709f9f1f31ebcda9651b03077758c1f3a0018c.tar.gz 33471 BLAKE2B bd97ffc4bdef9c3c7007d9af34c2e330d3068379f0718b3f0831379d1ff7fdc2ca63e5579542152d68d546a23e82baeb601cc796cc76a82154b2f488f789721f SHA512 12a26fd70674394fe5dc64695314d85c08370d134c8af0d8047363938c90c23f40e0f8f8b25e9288c40bdb28513cfe64fac738a6e557f5425531d7dac01586e8
 DIST github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz 23844 BLAKE2B 9c999258dde04fdaeb9dd4cab9d5aaa854f99d0bb2fb6d7e9fa67b829c0d5062139eba06abe3323c1c9d79093b45f8c29e33835797a693dd73c217309ef33286 SHA512 1d97e29b2dd84b3ccb619efbffa396ad0f988c5e09e18136edb64ed046d25512e31bd43f5586852d520ef2a38bd98ae2fd9c2e66c49bb52e828c386285bd9391
 DIST github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz 11711 BLAKE2B d024ead4af79692729ebf790a26e53ceefd005efc97017a9ebedfa345640c1f86cbaf1c61267abc478619b41c371887dcc363672a7d4a7cc61476997ca81864e SHA512 378d5ae07b41275c6a1633e26470255210ba62d6fdd6b926ae3f48e37160f659fc050e9866267cbfd86fe07a8c0ef3cd00eeda8cd9deb0ef66af697773d71601
 DIST github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz 3503 BLAKE2B 95a0030b182097aa1fb640f34b60fa094073f57ed576da5180b49e254e20f88a5b3980742b43d55e02c715a8dec9f0a58a5410ab91c88a19ebcf1584ab0f7216 SHA512 7aff388e6908911bee51e0c22be9252981c22980d78f911b96235e2ea0f8ddb38b80bc3c513dbd30f8514ab3012f83e688b0beb959c917b5b45d6db57c15a162
-DIST github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz 3504 BLAKE2B 3e0149532ffb89b5bd6ff3c53689e659f6d4bb9eec5d6b50b8afce2c56fcabfc4e3b3ccb5fe0a2b86adf5a758c1acb36ab733efc1dd10adaf47e4a80d594c88f SHA512 5641abf798c2e238885f692262d5b6932c41c770f9a2a6806c764a31a14e14b99eccc59d3571a83919aaeaa619fe1f8e5e492d245c6d6d41fdc03c45d2b69670
 DIST github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz 59771 BLAKE2B 91eaedb1f78485b68000b02a9ea86f86a156e8109ea173b3593407ff5779ac1f4652465bd617b13e7ff95ddd7d12d1d39a284fee2c59dcc53e63626b5e1680ab SHA512 c762005454ce5247941d86fb8587ed8229927c1ce81fdac8601ffe41d535d1b3d89f81366be2c0bff13c8fdf2750c7db4b913b0548f19b71e2ab7a7654ab8a71
 DIST github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz 21204 BLAKE2B 4179c708d75c58cfda85d463541055cd772caeeb67edc8446d068443bc5c7dc894e536a4cd3795c2104e4b3a891ac1f766a8c6ceaa4d000884bb3a529d3ae2ad SHA512 91e097bbf4711d203f6e31e73a1d67ca200a7ff707ab4f517f1f61fc2f6347fcd6aa7811bd4036a8f5211623cff45ca6acbb23330b4e453dbeb1f7aafc112fb6
-DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab
 DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
 DIST github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz 11681 BLAKE2B 324d15744ed3c966870108c6a55ad41a275c05457738dcf9be94e8be5c0a17d198a3347b858f788ec60ca1dca0bf0d5b65bca7010aac49cee90fe199f22bf5db SHA512 b8b3d46f3b3a6bb7c59db4623a44c938d6e9ccf521fe271342778261590c5f702af743a845c29d17d4e8c83e7c68228a7c93e3f43af536d6239ea6b4cfb7d2e0
 DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
@@ -32,20 +24,13 @@ DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c
 DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 5515 BLAKE2B 9ae2c00b43da5958392e0817f448d01374712ce7552c07be0de8204a7f16a7442b195695d51782a375da7aaa83019446438d52a8768317216a7812380be8c1b1 SHA512 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d
 DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
 DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459
-DIST github.com-golang-appengine-5bee14b453b4c71be47ec1781b0fa61c2ea182db.tar.gz 248545 BLAKE2B f30fbefd0442e492a1435a415b8b70f19afbe13752779e80ce393ad3c01c478c0c975833c96291ddbcd3ce7086b0be8adb64dd96f16afdac2e5b784fa36eccfe SHA512 fb8a4e6b1689e8e6bec7fb9b4a4580892331322f144819fad96b7b5dd09fa89cfda45a8b4e1dfa25ee9f3bdb8a064705b05180efd1825fa8a3ea4f4cb93130e3
-DIST github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz 300759 BLAKE2B dfa857e9da660106f75869c3515305b6842e3d3ce60f92175ec2de3e9f08378c9340b25a656f71c2c9a1c4ad4ead41e3b2eadab9a47e7e5eb62d682ec648f320 SHA512 c874c819b5ad176574f9bf0459eb3797facd7a2b477d4db83353c690a279547bb9c0ea11fbc4bc74e010b20388b13e715be8f5053609efa98667b7ce29ccaffc
 DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455
 DIST github.com-golang-crypto-9419663f5a44be8b34ca85f08abc5fe1be11f8a3.tar.gz 1435086 BLAKE2B 5c9cc162a9a3a17c4423a74717244fb2254db0e83408907a843b3cf684653d71ce4c33fcaca5dc8ca86f99a9b36a7147fced051778e9655f7e6acd01b09df603 SHA512 7335eca4fafdede3f5737900c46ba92ba598ec2e36534b5f507dc7684e5a68a1dc3dde6137172c6fab7445ee811612a5c1da3f8db180188fa4bc91935c9a489e
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
-DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 BLAKE2B d6e9cd2d0a0cdb59fc38f3ecbefddd289b3d78cc88c4b558c90ac27f75db7e59004d277e4194e5c9a0d56b5daa98e6e85d291f59ac79df314a53d803aa5a296b SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c
 DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3
-DIST github.com-golang-net-f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz 768453 BLAKE2B d65875956c833884b408e2515ba032ecf2138153e4ca71821fd48aea6603312a8a5c68a6212676cdd09255d19785aa4552c867383b157368b0dbf42e7f5b157e SHA512 ad0b00afcfd95101939ec307eb6413f638797ce464cd13c4b5810032f633538be297bb30a785bde7623da8eeb6007814f0531572acd67b1b5c5ce0aa1de819cf
 DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
 DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
-DIST github.com-golang-sys-314a259e304ff91bd6985da2a7149bbf91237993.tar.gz 769752 BLAKE2B 3d118ee77f7ff6ada9388fb3c569726aa00e77eb743ca38f51bcb4fbd1c31a8d43103b6cb2a5291224653c699d75143f3c449e84a4dac2b7dd2797e5a035e8e3 SHA512 91c2db2cb798fe0b185602e135b6acea6eaee1c5345581b14439197287ec2d7e9b9a57b951a6e033ff8c40ed8f8f4f8a8c5a68f29f25b048922001fa8290df42
 DIST github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz 801102 BLAKE2B d23a2bcfaa8fe92313f6e3fa577533e513181f40568c401918d4345c03434a39947e552b20165d4334c8aa981024e146a131a98e8ba9e0d622622e53bc578864 SHA512 7df873ade422b5d45271554325301620fed25a5658d1862d3a63222f406acf17bd39fb67d632387b9438e5291720dae4b086bd09810a8c897c457aba7a60fed0
-DIST github.com-golang-sys-8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9.tar.gz 598397 BLAKE2B 8cc77f2f7d3f4a3f42a472e5fd683be5030d2e6d26f49443891dce2a68d289d1e39d400c92a81027c76aa2514b445a183fbfdac0157694a98e12d4272407dac2 SHA512 d97b5d39302e52a7ffa337199137cefc91ada8c31135f4862b3aa09fe98ad2279f5d04874d3a53e64f6daa71cacefa8fdbbf29a1c6b86225844f3fdc65f86eb3
-DIST github.com-golang-text-19e51611da83d6be54ddafce4a4af510cb3e9ea4.tar.gz 4549757 BLAKE2B a2f26b79f19fef37ee517bbc725760f56e89bd08691ed6f19edd7e5cd75dd12b231d02f4efedf953aa44cdcf60983476d726c7afc2e77fd248a2048b4e892db0 SHA512 dc82a73eded06af2572d2906c8727467c0b330ddf9c0e21227253f55c1559796882124c6c689c6be5d0204a5141a782b00642dfdf0024a3d7a156df96e7ccad4
 DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d
 DIST github.com-google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz 12725 BLAKE2B d9db98b01c8b4b3e62fcd8f94e890c58ab80dce88f8a8b811eff9fcd9e35a76a53dabbe591f66b10e281c268806d69b29f558091d0e091612443197dd9ba5ca8 SHA512 16b23b56b7e99ef19b1e8251b646f13be1bac0f41df8077d80235434c1c3f187fec3782667eb7ff022442915ffeca1b28ff18b410bd7c6cb9db29a72beb168c9
 DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4
@@ -54,103 +39,49 @@ DIST github.com-googleapis-gnostic-68f4ded48ba9414dab2ae69b3f0d69971da73aa5.tar.
 DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc
 DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
 DIST github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz 335349 BLAKE2B b46ce36f6eb708cbc112a472ee094c9b2f624951fb35523fe2a5b3af224bff2c3264e9a457eb00379f1f0686c43509a6186c654eebf04f0c6dc8145ccc616b7d SHA512 dcde974ece3cdcf3f0ab70496c9fb704469b66a98b8d9f1b645f9c9b73fb2edb0116f04caa6af136250131e2875c06a61aca8c7ee0bb2f7a1640d1671f66526d
-DIST github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz 220340 BLAKE2B 788b394df3b791a558c5aeb0fc1e330053d0dcc58d47308d337498743284a7b0a01eb28a853d619ae0038b27db4c93883cef672f74d7a7442d856b19e3e1cfb2 SHA512 ca79d38bc7d68f1d98869bee21dcdc563c3fee1a8d28b77d474752376fb91cc7b368466dfac41ddebbec13c1560ac3c22257a52deb6d844add5d208646d2e3f5
-DIST github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz 253475 BLAKE2B f2bb0b7d82d804d8f3bbd21e656a909e6d9f4d2694a9d06e7dedb0640bba8f785790c679e03b1f477f891e2c918ec875f882757c972dfe2c93d6a5bff87925bc SHA512 a7f52c05e60f6c2f31fdd4947f94bee6562f51b27ce23a2e7feeb92160704c8db0c21961cfb2f5a8ad3d66aa7feac2d94fe877752ad72d9a307691260c0dcd8c
 DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
-DIST github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz 69787 BLAKE2B e1d034d5863ae8bca85736e971e613e6821665861e35954a067e5d659029a8680b6902387848a318aee374cd4f6b810ae160046979b5bc86e64df0e1ff5d08f6 SHA512 751ea2fcea04ab2a9b61a45443a71cdee9cd09c2576af048108ccb56027b34f46b00e14aa664b966165b7d8cbb994e49f128bf54e3469c627d73f7ee2809ebf8
-DIST github.com-hashicorp-hcl-392dba7d905ed5d04a5794ba89f558b27e2ba1ca.tar.gz 69703 BLAKE2B 14fd9a3a6796ceb6aa92aff2ab1fbadce6079084a168c7f9afab8d624da9b2b45237c7e27f77ffa40dc132bc06c28e73dde6c5d37a7a305ccaf973d98a432754 SHA512 07ac3405d91039471e7ff86ab21d832ba1da223a3e4a07a97b090d13d05b508fdd65c60350209db0f9731b3316b684303875af72e4db1c20c924bb16585b2692
 DIST github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz 70427 BLAKE2B 3b699fd5923ce6c823bed429fdbaecd0ea3f1a7518e37d7b4698b2b112e24c049a90994c1651fc66f0def3958865b88374ebb39e03618c09a49a5795661d3498 SHA512 d56f15b28e89c638d2d5c4f7859d3612ae7c7f981a6950ea59bb87987ac4db6a3582b00680ccd4f9e579b3d2c5e53958d89941270366e159772959a4c5b1e96f
 DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
 DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
 DIST github.com-influxdata-influxdb-0253f6fe05e8aa5d5382ef7a05d5c956a11fac94.tar.gz 1290543 BLAKE2B 6517450c7d4cdac1908ed0a498c4cf6c66ec5f64631edabd5293c3eacae02a4650affc4af80beecc024d34aaa629827b9d116974f2b2bbb978fa57c119b143f7 SHA512 ca66e7fb49c3525222a3dd90bc62cf835218d95018ce093a2464b42b70293c3a7203c9a930e92d788be6f67a90558def5d6c62802280fdf382874acf372ee8ac
-DIST github.com-influxdata-influxdb-38d2d29f79f249b4f7647b441355cbc03e9fec1a.tar.gz 1227453 BLAKE2B 6319911183f16e0a38afc5a5e88f122b17028e49dfd1c7a9457b4f4d821a6fc230ff901143aebf255cfe8b575708bbd9833ac895c7a9d3c09859fd6b5d4bc37d SHA512 a8583db6224bb4c821fdf807f1d9fe151ead3799bb1d69cc5449dc0f958e04ea41ed0d77e425314736cc34856b56a699bb37ea220969dc823eeea911f037d940
-DIST github.com-influxdata-influxdb-392fa03cf3cc98b78e606c34996976cea65b6814.tar.gz 1071651 BLAKE2B 036d9aec6ec0acf694e350fbf02ad3fa9c0f7cd030a3e6fe36e19d1acac643b34c2f2c2aba45526d606d26009a3e97fb3f2ac33194722864063222e3ea95b087 SHA512 615fac477fd2dbd7afecef1be0cdd222997ef977cf388d3c6ce856cafd5ccf62e35cd76c5a9bcc04d93370bd45035e0fb346d1099950768ea60eafb36c5e19b4
-DIST github.com-influxdata-influxdb-b287c191f362e7313aae0fa08c19b787076ad530.tar.gz 1165644 BLAKE2B 657eeb6a1dce77f712deff0294017f57952e3455e5c3dea7279358c170dce08708c51278517b11f2fd504572f526683108c72e7a7bae42528786120d4102c510 SHA512 268e4f119429d209942d054dd9457f88d0bb97ef7cbaf9e7550c9887c78c4bb9197b260bf763ece33e3ffa0e0cf33d41a5049a454118b2eefeb8062ef096c16e
 DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958
 DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
 DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
-DIST github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz 591475 BLAKE2B 7c66c79cbcbeaac326bc25110979279472749b59e4924714f65c42b5f55aa09700581a91bd77a21741be0238ae03f0f6b59d4cc39d2f0ea377ebbe31bc2974b3 SHA512 801ce8b413fabc176c61605fadf964bffb165f4ad66d3902c91930d2c5c09e711e14700fb9437722df509a26c93509de6c0bbf79918c35c37a6102135fe470b4
-DIST github.com-kubernetes-api-9b9dca205a15b6ce9ef10091f05d60a13fdcf418.tar.gz 599747 BLAKE2B a9d36fcc97232af6cae2558ef77caec625f790f75065ebbba3a94d61b9f06b68c3f5b7ed58f8fbf79b158905e849ce958b3b071a09e92a9d8bd46554fdf019d7 SHA512 99a1c84bad03df827288cd94665ccfd1c290945ec63787cd56f49ee27ecea8174fe5597d4c48367aec11f3ac18d1087a2cbfb7ed9a76906aabb31bd0199f5ddf
 DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b
 DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d
-DIST github.com-kubernetes-apimachinery-5134afd2c0c91158afac0d8a28bd2177185a3bcc.tar.gz 450287 BLAKE2B d311171547b907179e9edb85f1e688752d628fb00001abdb0106bec0ae9f66bbb569c627fcce656dc57538435a6cf18f0d2f426c4e98d12296240f4dfe96352b SHA512 a9559fe0b585499a3f142cc24fc850ae2bc05c3232861f7749dc7b01a82903d17cb8ca889d58e0a76e245d8e8809c3a45160c1f79101b407c9141d8a893574eb
-DIST github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz 436659 BLAKE2B 5985daae9aa7e1646753c90004dfda92b444d5ef4b93fa32815c3af010cf038601ab343278bbd53ab5cf0674d06f5b9c99b4eeb4167d30fa6396d0da7a1831e0 SHA512 be41916d67622289b23895b1bf12a7dc5c24503ecaaef9c5addaf400d561da9a6ba599703b81ba473cf4c189fac9062fed5e3c9838b4a0fb42edd9257ad41a03
-DIST github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz 1317793 BLAKE2B c495730d6f4a4f477513e06c242f4cf9b234f4300a6ea0407a9fd36e6307445794512d7f6002dbe0153113b69af18ea7e316232d0054b714c2552c31b9ce08b8 SHA512 f44fd60453259a050b591d198a6e64c0e8729065b3b3ba73bb36b22211428e2d9bbadc7a8286a31084f5253f9f8cf95aeb7d1ee4ad5eba870887a5f7787a81c1
-DIST github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz 2764746 BLAKE2B 6229eb3d5a0b66221189588f13be52b6ed2f1a76a065b6c003b4968ff684736138af88ce3bb8b958fcb9ee0272e5c02be939fddff21ca32876880e31cd8b78b4 SHA512 63e57485cf08a438d913ee221d95fe61eab33c66548a24cc3dda0d833cc49cd1a30ea75c1678c407384e7e7d6f23d8e4ef22c944f208676a9693affad57a5cfe
 DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
 DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0
-DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
-DIST github.com-magiconair-properties-2c9e9502788518c97fe44e8955cd069417ee89df.tar.gz 28780 BLAKE2B 70b3a20cb202e40873a3d68753c36765d09ec47da285bad924b68efe0eb1dcddd50bef0bcf20d3363d3a2912edc22fc528270868bcce8d83642efd1de71b7161 SHA512 492a1534467349e2aae5e49e286639ce711d3c6b94f97924ee4dc59cbcdca19fc519089a9226c142c69aedb0beb6dc2bbd570f0941998a1d94c57b074129949f
-DIST github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz 27761 BLAKE2B 0f39a63d3d19ad5d3ac367739d568dd3abe74a8a6aa0e60cf19ca8203412270fc45dd1fea07627290a85c42db6ead0229f72bfd845b9e4f645976db1585838e7 SHA512 493a7493e415b45abe2109c79e02ed7903de6a559911cff0323f9577fcf41134ab8f4ac26d776fdf9a891654f063bd2452c7e557c643d73de5f558b13533f62c
-DIST github.com-magiconair-properties-be5ece7dd465ab0765a9682137865547526d1dfb.tar.gz 27514 BLAKE2B 82a650e1641bfc98776fdbe39cd8a8afe777cf6d8af5c43bd52d0b26f089d59245d30bbb4da64caffdfd68921792d328f32cbd698068febf5a6acea3a02bc8a0 SHA512 63731f3772ec2f8b503824d9d7805d8f087c96f95c37ce15500fb6a528a1d3c09ab95f0d5fb86a6cccbca185a9c666c87a8130676a01e0c887b1ba57216c4b12
 DIST github.com-magiconair-properties-c2353362d570a7bfa228149c62842019201cfb71.tar.gz 29495 BLAKE2B f394e50ce58dfb59db8e8ef6364cdf494604cec2e042009a8a72250908102ce31bac173291f9c75ad585cc570fb7635b7146b1ec85daf01899945b5bbe1be621 SHA512 fe3e521365758b42df60acd8d582a080eb4828ef56cd20da57b6041074bc4b7673f01a6ee83d8271abf60609efd0c200149ccd7564da1b3a40bbf3e2c9967e66
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
-DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 BLAKE2B e9f1d0da4d69c110a9b9ef0ec640dcb53bcc101288b15411367760b5710808f64eb8fe6f0d61f77ba89cad2f965da2d4f72d92e42a07986e1cc39777a050a8f8 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70
-DIST github.com-mattn-go-runewidth-a9d6d1e4dc51df2130326793d49971f238839169.tar.gz 22882 BLAKE2B 4a9fb7eceb3bc3f32fac8bba304a971ba4387d3bb65799105682236b86a155c6921afb82f542bff4b90378bf6d47823f81a09999642d88b4f5e80521a1329674 SHA512 465b03ab84b9949d392ed8573dabb0b588fb92d410e027f45f4a58d9f9fbb8f9b03e33e5f9ed27f8d34146e9e26cbd8f229caa134278af203daef40859524202
 DIST github.com-mattn-go-runewidth-ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb.tar.gz 22988 BLAKE2B 3fb35426ba8d909d20a1fd939998685efc4b8ae684defe13b27d344350b7de366b05953eecf93ed192263e8d72380c7f4c644334f1192f1482393d8c7390b511 SHA512 1379124ce0f1c83d6677b110ff43ee6b8b003d125b311666de2fc029d25b59ea895dac1bfd812ceb360457379276650f62b8747d9fba15de78f3b57cf7d72af9
 DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
-DIST github.com-mcuadros-go-version-257f7b9a7d87427c8d7f89469a5958d57f8abd7c.tar.gz 12273 BLAKE2B e02e33c32147dcd94129b98b1e4f0e7e2864999844ce1c815e3acf448fb853f1094cc46b81310e2bf54ad2000006884412a72226322fbfa6eb32f1c21592d7e9 SHA512 68c62bd29ae3d1e67b626be39b4af69134ac973d75b880ba935315d4ea1b47769683ba50739b5d65e9a01022e2f9ed0f73a483a6023113eb762667636fe9a190
 DIST github.com-mcuadros-go-version-88e56e02bea1c203c99222c365fa52a69996ccac.tar.gz 12403 BLAKE2B 2c800f93b933a49b292240eef973a01e54fc7e0a3d613629e6e2d506ffdf98c2430de7498adb4ea19b4faf433aff146f70b98e88bd7ce9404cf25c68246b3449 SHA512 ef192dd1239db964e3969fa45bd7f0032cd0d0141cf3af560f40c0a44ce5651101f518363cb7a4fe017375d7cd1ffb23da27b02e3f5805742bb3772bec19bf5d
 DIST github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz 7591 BLAKE2B a5f8b5f65740ea93f2dcd753567885530c4ec9cde743780e74fe0fe08056f87464f398ee6fba37b26a2d74342d839df45c7fe649f3857018649c86d96c87ec67 SHA512 143b517ef8b5a8bda86dee77b573b12e051816bb6cd0ba962befa3fde4d849a4b95c02c76d36a08209fa29681bbb39fe28a69ba9fb326f218bb4f3ca70350496
-DIST github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz 18394 BLAKE2B 928baf92d3af36498a4fd74f23086dd4d759f72ebcfa18b49cda23e7fff719ae9fdba9576869ddf5e220f8f6cce61a9c5c772d34a0fba1cb96eb6e05dd9b916a SHA512 2b74b167940018f95f1e4767d44ff66d94b4bc8ccd97f98364e06bd1f6bc46006c0acfcd470567b6de8e357009f42e96b9058315cdbaa3254743480d2cbfd35b
-DIST github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz 15601 BLAKE2B c2212f4c34ae15eefa1a681b2beaa8cbf3f63fb2317a8fd95f21df54eb6a05b2d312d96848deb1afdd47aefdeecadd20920ae25a0d865f31c16b6a5da4ac6dbd SHA512 30b6f8f902ab7d4dad899c19687b6ec0e8c51655a04163c37ed1fa36cb420695631534097d4de0f342dbe649b412d38d0254b40bbb2970c3a70adc0244a6e800
 DIST github.com-mitchellh-mapstructure-bb74f1db0675b241733089d5a1faa5dd8b0ef57b.tar.gz 18671 BLAKE2B a06836438c27cd4386fe3d2fb234a4ecccbc011fefffb52f9cb71f55443360c186c48e603ae745a6266b7356fbfddd92465f246b73b2bd5b9fe233af979bb552 SHA512 b5740447fa3b81ff8b713f328dbbf866f01527ee71f23141595d0c0f39d865f9ea95a04bac118dc223a3ebfc3ebeb5b8f857fec66f4232ef7da8f292ac8cab59
-DIST github.com-mitchellh-mapstructure-d0303fe809921458f417bcf828397a65db30a7e4.tar.gz 15563 BLAKE2B 18413ac854e81ae19576dd7be5d6e2c09bdb6ec8c2c72770ccf1c3a4bca1d7c4f03065a94fc966a22800102c6aeafc43438c50aa8bd88785849316f2d8a5226b SHA512 f4a77684d2919f48c274df444525772e0714d600fa64523cbe0598ff6294e0806d7ce7cddd34b87b852526c0d7ddf9ac2b65e38ade9de8b86d7cf04165886287
-DIST github.com-olekukonko-tablewriter-65fec0d89a572b4367094e2058d3ebe667de3b60.tar.gz 15185 BLAKE2B ba0e6cb42e67fddde9d4454c5757128842290daf6356bf44e05112d3759ef9373ae6ac7b82909f3cef7a31ac2b2612fc222861ca3f65190b24f80da9e2e0fa8e SHA512 48aa8d3e5795dc1d16486a1c418b60e51da254091081bc82116a66a7eac277c34814e0d8e598a7946dfbbc851b94a31d6d7e8032eb427bd858a5c3f56d3edbfd
-DIST github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz 16790 BLAKE2B f69ec79cf7e3bfb6d7ee32139db6970b1f45edeb701bdb1b15de48f2a9b33a3eeab003e67e82de2c4b6597af4fd1d94064b7fd7d31b115491216d2e868ba6744 SHA512 697296bda248977a19c573ffe5ab8b2535becaf2d775229bab744b20f931e49ba83743b99201f2ac154ff2f8aab7ff1dae792d09e7be3b1d7e4963b5efffc53c
-DIST github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz 12269 BLAKE2B a67162f71bb88ce1100966805ed1ce71a500d3299fef06bce25590b1273b0e47139d952b499535fa3c1627bc5693f3d063f281818096d1520040d44f850ba1cb SHA512 444bf361e0b602fba43a4b0d991614f10ed79a105bbba30bf3054d0dec687de6e9f4583793d52d5e25c99d55f3d39c5121f60110f3a879cf0bbd37594834a929
 DIST github.com-olekukonko-tablewriter-d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz 17378 BLAKE2B 23cf5e288d72278f082e1b533ef8324abc268a317b7c11772af89f964e646b22fa246833eff4d0307a89dc89c0c304e3dcb3e37ac1f3252f7213655acdf887b6 SHA512 9418d06e67a72089f0b35f9f7eb1d0da68ee8c433e4577b798a6ba428233b2f9c3bec5723ed6620c5ed257ccb1a1f32262394f21d4d781c3d56e8b2034ac7111
-DIST github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz 125539 BLAKE2B 7f6c6218fe07985014f113ebfc53a3cf6f970950e8ba4ed56dc59da58dbe208b5cc3639bd17f7af3d99150d792988f63499c5cf7048b6888a8b5266f6754ae3c SHA512 a0656bd310cfe3fb734c39796a364de2766cf0accdaedb7c55eebba3d1713997ac288ffe52e0b1c9625e448e40c44e7583d29a6a2b9277246b809aabac138274
 DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010
-DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
 DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4
-DIST github.com-onsi-gomega-c893efa28eb45626cdaa76c9f653b62488858837.tar.gz 79917 BLAKE2B 4198339ce13c20b18749078bc24e455cca89c088b205b51c028c58bc0aab04854de41f28dd9b6132dcafd175b1eebafc670d4479b704778013cbcf3d751bc9cd SHA512 a26e64dd11ef98b02d5f85cdbcc6e0ebdd54ada1a689fa37a023122fc3bff0486bea060194c4725b5ab445e4533330f625655dc892d015a6b9399def3f402ba8
 DIST github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz 669740 BLAKE2B afecd69c02b30555625e96ae9fde583336620e2ba8129817bf4af60a1db4ce33c630e0d7de47d42996970ec94a781a895ba8a938a3132dca560e8d2c1a0529bd SHA512 5d9da0f1ccb9443e834d32662906c8cda0c4b0a780d61283a433e0a86af97579938ab5814e5c337c3febe57963256db0107564e73884eaf78edb2357fc4eb7b1
 DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
 DIST github.com-pelletier-go-toml-66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12.tar.gz 56998 BLAKE2B 3971cf040257c6daf6175f25ea01b8026a04b74d5a56dfa0a562fbd6e64ae7111aaf94080c141f2c595ebd38cc3f0611f7f05e419254fc40c63c4493f2a468c7 SHA512 3aa9af45b36d280637231fbab39584542ba0892cc0bab177add01254caf90a49d14c4131249e5615b8035cc61dbaff8b65da27148a1026fb36d32d4ac48dc13f
-DIST github.com-pelletier-go-toml-69d355db5304c0f7f809a2edc054553e7142f016.tar.gz 52209 BLAKE2B 6b4a09ceee871b06beb1a1ad1bb872422fcc5078186b5fe4ac6a2d78a1fa9c0c87c0194f305125831536380bcf28a4a021641010a36b4ced3a621a9a4b08d59d SHA512 5cf649a8c1883ce7c9e189f0518b0b364ecd314f77238783c95cb1a0cfd7c863f7209ea59a346927cc9ea67fc8a4dee77ce5e0248f0e8b0191a8a9097a2d336d
-DIST github.com-pelletier-go-toml-b8b5e7696574464b2f9bf303a7b37781bb52889f.tar.gz 55759 BLAKE2B 9896a0625ad091fa26dc8808324edf1fb66aa542d8acc18c1b1fe9ed8dab6187da71284c519100d8dadbe3c029a79dd2a52f2e2ab58a8e4199f0328c6fa6780f SHA512 cb4a170a9f1601e7a4b1e8a77766eaf9ba5c41dab3434999ce34203945930f5aabc0604494343516b46169406497a0c9daf7902af8237f867612233634be7627
 DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
 DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz 180822 BLAKE2B 17cec7cd807556c3524f8b54f8a6d70f969002b23ebbe588b86fc6a84d831f576b80bf36e9bb2827440890c9a9049759f812ed2e43609943411ccbd9d7013c8f SHA512 929a99796fe5addde9baeb151526d54d89a4f543563e0e4aaa4072b834f4fba6f2737cfe27a62010bdc8e439edb4c813d059cae3f4559537873f2d539fe16593
 DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755
 DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e
 DIST github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9
-DIST github.com-projectcalico-libcalico-go-25a8c377d7b3299a50197a92704d606f5f5ca691.tar.gz 196217 BLAKE2B 93c66ef3e4e4c13b7063a369dfa3a48fd94c62f04888238ad0980109f5894f1fd903a34ed959b286d7df81998e23db4a39b2f56ab6e21e4a84f9768b4b20b247 SHA512 15ad47cd54f4424eaf5300094d4b85760d344bf6f10bd01c6a165bc63dacbe09e08bccd727e03dbda9d0fbd00663f51a257a0e49b7fa94ba549d131f5e56c5ca
-DIST github.com-projectcalico-libcalico-go-7c2de5ed8c029f222d87fc849b54c4075ef3173f.tar.gz 382793 BLAKE2B 39b8355eb1b887328021c6b15c85e3a304e341b52f732b429562a7f0102eff00651091f1978efea0017512538669209e037694093e7482c3d2b2a6a4fbf59b89 SHA512 c411ebaf3c5e6e072b4c3fefac623e5cb7913ee8a58813827c090d1ea388a7b2023d98c56267e8755b2f97359a3c67d241b2e04630d3846cd514162fbcf351bc
-DIST github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz 405046 BLAKE2B 3e29de42c9f3d66dbbceb2f98557329ff3ae019b3a1d59ad8d693183cb5faec584ff2551c5ca2c946897b5f86d24c23dc837166ef2a7456a63c66dfd4d44c213 SHA512 9ff540f1d4db060eeaaa0e97999b33e031413a629a685fcc67ae1664c3e427c24ee7d572eefea5bec0e4561fc52da43a55f74dee76cb6a86080fe89ddf42ad77
 DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
 DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
-DIST github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz 54855 BLAKE2B 2a7fd47a9e1dbc794f5de84d5ee3512b282f5f94d044dd9b471ab5ad138ebf2940c4441e6b4d89404f3443f0ba466fdab8fcf58c92d9c85798f23b5a0c57a6fd SHA512 9d4d52142888edff091f23496aad70ab2924dff3a27930cb6df81c5452ca897b9d61eff74fbd092372ecb4bb005b4d362ea6b0602e1764ea4f2a30e23048a81d
-DIST github.com-prometheus-common-49fee292b27bfff7f354ee0f64e1bc4850462edf.tar.gz 59135 BLAKE2B 662b71c56b087e95ebd250c79adf15b7daacc4f48e315af64bdaebc8830e5c24e649af24531a65d5bb907146c91e1676e3af3a7114e11c7a8f5e88dc48a1ecb1 SHA512 5d01ad668eb6a15494fa207e85da558f7f8f1dbc89866db7d0c400ace81fc87b16a7cd105d167c2bd06150c33a356f5fe46d4cadd05d6dd2b3fac1e3c3b988ef
 DIST github.com-prometheus-common-e3fb1a1acd7605367a2b378bc2e2f893c05174b7.tar.gz 62671 BLAKE2B ed69c90e91c3a219e9b037a416c730471729fd26498c0648793d54cad6b740a8f27f65371d6b2c8eddf67dda112706e9b166afbf122d0bfc0dc38aeecaf2b1ab SHA512 c12f04e6564bf370919e77fced2500ad09d5ff90a928b031838d73b62092a81d91ece808391d2864f08a7f2ead29087122baebaf8bc7294645997186691b5cb4
-DIST github.com-prometheus-procfs-a1dba9ce8baed984a2495b658c82687f8157b98f.tar.gz 31620 BLAKE2B a9c539edddb87109abedd6d7f96ecb382d61420f585a4dbce97edaf67f2032551b468d762dd8c45dc03301e111d0880dac5c435bff5886c090ca9c77e163eff7 SHA512 55993efecd85d2efdfbac030731dc0f4174a76625a66edbea57e0358591b8fd998270961c6801eec6e3cf8fc1d622e5aef1b3d4867258b177359dc353f0d0fbd
 DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507
-DIST github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz 7607 BLAKE2B d0f59a0862b44a5c84b9f4dd65eda26facbab84f57508a346c060d6468fd6ce8cf5014d715a43ecd56135f101d9e7aa33714431cc4ce6fd809fa2a1cf865ea75 SHA512 2bbff9fa393814c4c31ce033d604d29b908b2b110b154a693968bc1f8859f8417c402a183fcfdf07c4732576f285df92b57b9ea954974ff8e6a753ab3d82fc39
 DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
-DIST github.com-sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz 26698 BLAKE2B 10f98819cf6e8e64e22ead564d8460414818cdfda5159a3e751a6457e531d8b8c34eee8fad5c35db187d52400a93ec7240bbea8821ac39360708b61940c33fcf SHA512 7152a9e355e21de7980a28e915b712103ae1eaaa4142a5c37db00d8d30415cb2ecacf53bbe178cce49a1b9c4ad57336e8438a40f0bb92dd20a2bcabb1980013b
 DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51
 DIST github.com-spf13-afero-63644898a8da0bc22138abf860edaf5277b6102e.tar.gz 45193 BLAKE2B 78dd065841571fee60c41a83af08a97478f8a47599eb4e451717a8460856fd20be7732761b8321514993b65477c92492e81eb69d2548bf2468b5e072b2d2d25d SHA512 c1e1e2af81d6474a0404c3d3152b1ba8b89e6f3f90234e2fe869ffad6003f44773ca9411d96e70c959ea8a5ac9d8ff8fb11360edda71eea2e4de96b815e06d51
-DIST github.com-spf13-afero-8d919cbe7e2627e417f3e45c3c0e489a5b7e2536.tar.gz 43475 BLAKE2B 024f8754e4ef6af0a2fd8ce274e82ab46c12ac4b81ebbfd5c93c1c44327ead58bf71242714eebaaca5f2adafed63ebf112ad5b2eae125895514bffe8e21b117c SHA512 900ce0ed04dab86bc7f33a0ec94f2b49a7d91dd1bbca65a6be50bd4575ff1ad5fcbb4f02bb0fb0b7b2d1b2473b3e6512fe5f8c877947c11819a4aa5d763a6d2c
-DIST github.com-spf13-afero-9be650865eab0c12963d8753212f4f9c66cdcf12.tar.gz 40637 BLAKE2B a430abade09ff9dc46d9ab8f59d6ae6af7fb469c12ebf6659927a070d3e2a353a2fecfa332fe29dfa0727573f9da02c6e26f48b39eb6b4b3cfcdd40d172164c1 SHA512 098a94d3c143170c2e06836c5f975acc49ec39c4225e6f4fd258648febe91ee4bb69ffe3ce9be53873184aaf7c34c5afcd2ad56969f576ada075f46cd8e8f66a
 DIST github.com-spf13-cast-8965335b8c7107321228e3e3702cab9832751bac.tar.gz 9864 BLAKE2B e2bca43b06e8cedc63504b716f052ae5d6da90d2336372bdcf1c7bd456e8e60c9f830fa1da6cc6602b4355196c8c0e74e480f55020ead5706f3e0bead1cba08d SHA512 96ed2d94c7e970c9894751245fe4a0b17b6fa2f0fc524d3c8a05463dc5bf81d48bba4d01c0c742ca492f756fd6f21034c2cd1be44047d79f7ab87d2e4c76f1d7
-DIST github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz 9594 BLAKE2B 4979fd23b48a6bcd2538357d33b7670326b9129b5de309548492d9597eace1320875e1b242b594c98777192c1e0c6abb0bda4ba946a43530cc68ec762d1949c6 SHA512 2b97f56aa83dd1302e02603a8fcbc8f2642ceff8bdc19cf8a26120801023c4a8a3fed689de0ac392f6a4144450ac85d32b00fbde200b22e972c31cbabd996cad
-DIST github.com-spf13-jwalterweatherman-0efa5202c04663c757d84f90f5219c1250baf94f.tar.gz 6340 BLAKE2B 85eb5f272705f860932e6c25e3783cf40a126bac57cf43e38cf502333b3e8f9e6e915c2ab8b1ceac41275634a05f05e89513f2bad2177823f15a6f2eeaa9c092 SHA512 e994187443d8c4f05e9864a9c6db52847f3459d4afb1b094bfd9ab6d9d374856028319f7b8a99e2483242a2decc6432e8fd85cb567b4f6dc76dc700900eb5ca1
-DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz 6347 BLAKE2B a1e62d37f3f736086ba5b198ca33e243f4650571d42448c593ba7c0970883aea401e8ddfc90975686bb5c992e5133294662a05b245620ca52c254b2a7e866d29 SHA512 04522be3439a2c3a06f38f764e275d8d093b935d610386bb99364f105d7d805a6a7e7a928796682955549a88d43b21f385404c1401ee66374d324f954bd4769c
 DIST github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz 6345 BLAKE2B dad5459a45bc35e28f9ed7473a02bbfdfcc8da06e17cee15a1876125829065fd4bcaad35b8ec489f3b308637a3fa9cd829c04836207620e61db1a7f706660c6c SHA512 f98c62d7e74ce3e35c29862244d46fb19fcd615e500713dd7c26b30ebedd7a846e419af6586031b748029b8b4d5e32baff6d36bb1ec35856bb6ad5625a407f14
-DIST github.com-spf13-pflag-08b1a584251b5b62f458943640fc8ebd4d50aaa5.tar.gz 28833 BLAKE2B 882202f5b6d96a2bfdeaf0723d782d08b96fb4afdf41786217a085e8941b0a1326ef8fa643c72e61346b335985c0bc6cfb88eceef284b43c96532f6ccbc677e2 SHA512 5bd4af9e36625b508b106ddc288c09d65735875fcb6a0235ab9eef99958fe4b4666037b63faab74c63a76bb7f4eb2ca2f60d53ece71e695bf6d73ce818c2bed3
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
 DIST github.com-spf13-viper-15738813a09db5c8e5b60a19d67d3f9bd38da3a4.tar.gz 32109 BLAKE2B 3d1f8c8d943766a7b7402f30ce80fe78a96b8455f901b6c3dab786682c84ba3a7515e62b1f62f5124564f6ea664abea1e2f77685e259f5e31db3241aeb89c826 SHA512 18fd5063350bec742ec85d7299c678d825be9f6745990264fe98c6b874ab3abe9bc478fb97059b2e675b78dc5bc3f12fc9ae65ce9e7c170f8abf9498b6e78071
-DIST github.com-spf13-viper-1a0c4a370c3e8286b835467d2dfcdaf636c3538b.tar.gz 32229 BLAKE2B 95b1ed58026f177674a452e531ad445582a8cdafc1e86293918e3b8a8e81f71644b66873c621621655eb87c0cfb67f8e2b089b02bb74bdb30a714b92fdae0cc3 SHA512 004f7cb37ce692cb86b3f793afe5ade9dd478ffdceb23ac8da667c626539503e199f424d6b3183c8907257186eb1a16552ba36979bcdaf363482a6f19cc98d89
-DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd
-DIST github.com-spf13-viper-8dc2790b029dc41e2b8ff772c63c26adbb1db70d.tar.gz 32064 BLAKE2B d80eae5064164c160d75a8c1fadbffb0a90e30446ff887c422685a5ca179ff7d14e4c3630c1cac0a93e71749180e3257e7b5079a40f71391500198a483bf261e SHA512 457a307ad389f7deaee7fc547376fdf618509460f57aa304fd144181c8138207703864e036615426e64cbe3d39735a38053c9e2401f026e081ac669edf00f4a8
-DIST github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz 11995 BLAKE2B cb880cb4ffd844c5dc86cfa2b1aee79b6ca7c7f527d3331b1bd8a85860cef203c6f4d4a85cbd6c55b3c160e2e121cf69c84de97fb77e3db0028662c15b7cc335 SHA512 e8aade384d3505c3bc9389c7215b789e013bc4088c1662e23170503876f2ad2ef97df63cfc6ed9b30c58b6287793e003d4c3a2e6250c0ea76aab807b2eb08ab2
 DIST github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz 3684 BLAKE2B 92a9f37acc2c3f497c432be4519edc02db7d5bb371309183a3a52034cf12e4626b8b018f7b17e3128a406edbce24db1d2c5a0176f8221907c27f198696a2d737 SHA512 b007be79389160c27a602f4ec35a969a408abb340ab9b3bd8f44578a6dd9ac95fcede4edc56b1c1c7a2a9f258c5cb448cda54bc91d6dd17f0464cb050b946769
-DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 BLAKE2B fe292aaad3f31173e1ed0e0d9dff74b9f5c46803acee9476f86a4822327296bfe52009d68c1b7bc2ed246596032e74a597eb951795a37eea9518a01ab4b3ad9e SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8
-DIST github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz 103396 BLAKE2B e0016e5a663157383ca37a99c32a1da395a9e6e53536acc6f03f25d9d347f1c4d8d1d00c8cfb02ba4f8ce69a5f7c06d9440fc177bd88e599678d67c18415cb82 SHA512 4e9f7d7017486160599aa6b98d32c41b135b74fdcc08f642dbb3ec9db83c21a94a2b4c9ff52ee78d0762468710c566c052e5b4fe7287e5ef99263136ae595184
 DIST github.com-vishvananda-netlink-fe3b5664d23a11b52ba59bece4ff29c52772a56b.tar.gz 85354 BLAKE2B e21e59ec6afe80055fc8e5b59405313afb4dae2dee1afb65f61f3d613b52ff2c3ce413dd40798b46030cca38da7ecfe3d17e17045c331061d48afb731cd64528 SHA512 a9ca7e3391ee1d2b1455f6357a557343a4e0d3800e40806fd20938a1669069228c3e8c273d0f968f3e551d230e93987fa8aac95d74bd838f8653db9824a6e730
 DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
-EBUILD calicoctl-1.5.0.ebuild 4548 BLAKE2B 552ba00a20c61cf2ceab79df6659e401da2d6d6028e41b9e079ed77c4ab3cc8148327879071b80462ccedf35ef6056ccc3f9462566c2a8e7e23b35ca753962d5 SHA512 d4f7b1c9440797478d7253f1e73d52c0e7b93520b11cac134c4840b73912ab4945aa48643c278a970bce924354d31df0c768c6fffd725cafa669d1bb5391a53c
-EBUILD calicoctl-2.0.0.ebuild 7370 BLAKE2B 521081083aacd60a72b6c1a18b1d37d9de8a7447f38ca6b12417a884df9a64cbfde747a3461eea18cd8fa88fcd8750dabeec7bc636f3bc3a21f1a443415aa476 SHA512 24f4c1c654d3d6416b730e6bfba3dbceb55733c2795afb22ec0c151f862d9f5f9f496915f64531851b3683a4cc502a158bb62823189bfe9349750fc47dc20961
-EBUILD calicoctl-3.1.0.ebuild 7470 BLAKE2B f94887743cecbd2314584f534514f0520fa13c88aab9314c4e061465a976b4f3564e3e0e7d66aba8642d9f4402dd01a8e52d2037da99d87d1d8988e11dddb6e5 SHA512 01746b4b4226c4ffff1571e110340ed807af89e2b2c7e8cfc2fbe6f4229258c1884ae1f9c2a6e3ca13cd0944c78e1dd893d90c2813e91d2b3114505b6ae257fa
 EBUILD calicoctl-3.1.3.ebuild 7470 BLAKE2B 4275c796f7818af1b086d771a46b60f8bbc95de348665ea705bca8ad9bb5decb12ee7a33c02097977f2fa4304be15bb827924c09e966c0362c8f4e99206837ce SHA512 c34b13ea76ef55bc0983fb61f4e938fd9aa33a6ff633f742e9c480ae5be2a41086b637f4cb19ab38336227cbda1c0d8290d8d036190b72a008644b95106549e0
 MISC metadata.xml 255 BLAKE2B 327b939e3f064ebf891076936ec8505f1c4c0aa4651c7afb71b78803ab7088b8212357e1c97295dbd51c7da2ea9bd5cbe1b6082b626d1b6b58c46368c05842a9 SHA512 b2eca26fa24e481e0129a8a44bea385892fa08b2c0997ac719bbfbe4119cb3c2b8a8ea36e4d714cf0143b18e3b1646f9408d4d668d1b7444519b8aed7541ee25
diff --git a/net-misc/calicoctl/calicoctl-1.5.0.ebuild b/net-misc/calicoctl/calicoctl-1.5.0.ebuild
deleted file mode 100644
index 45eb88efab70..000000000000
--- a/net-misc/calicoctl/calicoctl-1.5.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-	"github.com/mcuadros/go-version 257f7b9a7d87427c8d7f89469a5958d57f8abd7c"
-	"github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062"
-	"github.com/olekukonko/tablewriter be5337e7b39e64e5f91445ce7e721888dbab7387"
-	"github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
-	"github.com/osrg/gobgp bbd1d99396fef6503e308d1851ecf91c31006635"
-	"github.com/armon/go-radix 1fca145dffbcaa8fe914309b1ec0cfc67500fe61"
-	"github.com/eapache/channels 47238d5aae8c0fefd518ef2bee46290909cf8263"
-	"github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98"
-	"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-	"github.com/influxdata/influxdb 392fa03cf3cc98b78e606c34996976cea65b6814"
-	"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-	"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-	"github.com/projectcalico/libcalico-go 25a8c377d7b3299a50197a92704d606f5f5ca691"
-	"github.com/coreos/etcd 17ae440991da3bdb2df4309936dd2074f66ec394"
-	"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-	"github.com/coreos/go-semver 568e959cd89871e61434c1143528d9162da89ef2"
-	"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-	"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
-	"github.com/sirupsen/logrus ba1b36c82c5e05c4f912a88eab0dcd91a171688f"
-	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
-	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-	"github.com/hashicorp/hcl 392dba7d905ed5d04a5794ba89f558b27e2ba1ca"
-	"github.com/magiconair/properties be5ece7dd465ab0765a9682137865547526d1dfb"
-	"github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4"
-	"github.com/pelletier/go-toml 69d355db5304c0f7f809a2edc054553e7142f016"
-	"github.com/spf13/afero 9be650865eab0c12963d8753212f4f9c66cdcf12"
-	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
-	"github.com/spf13/jwalterweatherman 0efa5202c04663c757d84f90f5219c1250baf94f"
-	"github.com/spf13/pflag 08b1a584251b5b62f458943640fc8ebd4d50aaa5"
-	"github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c"
-	"github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
-	"github.com/vishvananda/netlink f5a6f697a596c788d474984a38a0ac4ba0719e93"
-	"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
-	"golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d github.com/golang/net"
-	"golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9 github.com/golang/sys"
-	"golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4 github.com/golang/text"
-	"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-	"google.golang.org/grpc 777daa17ff9b5daef1cfdf915088a2ada3332bf0 github.com/grpc/grpc-go"
-	"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-	"gopkg.in/tchap/go-patricia.v2 666120de432aea38ab06bd5c818f04f4129882c9 github.com/tchap/go-patricia"
-	"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
-	"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-	"k8s.io/client-go 4a3ab2f5be5177366f8206fd79ce55ca80e417fa github.com/kubernetes/client-go"
-	"k8s.io/apimachinery b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215 github.com/kubernetes/apimachinery")
-
-inherit golang-vcs-snapshot
-
-CALICOCTL_COMMIT="118b8ae1cbfb852f387c9066b5ae27633593a99f"
-
-KEYWORDS="~amd64"
-DESCRIPTION="CLI to manage Calico network and security policy"
-EGO_PN="github.com/projectcalico/calicoctl"
-HOMEPAGE="https://github.com/projectcalico/calicoctl"
-MY_PV=${PV/_/-}
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o dist/calicoctl -ldflags \
-		"-X github.com/projectcalico/calicoctl/calicoctl/commands.VERSION=${PV} \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.BUILD_DATE=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.GIT_REVISION=${CALICOCTL_COMMIT}" "./calicoctl/calicoctl.go" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "dist/${PN}"
-	dodoc README.md
-}
diff --git a/net-misc/calicoctl/calicoctl-2.0.0.ebuild b/net-misc/calicoctl/calicoctl-2.0.0.ebuild
deleted file mode 100644
index bd03e1baea07..000000000000
--- a/net-misc/calicoctl/calicoctl-2.0.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/armon/go-radix 1fca145dffbcaa8fe914309b1ec0cfc67500fe61"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/coreos/etcd bb66589f8cf18960c7f3d56b1b83753caeed9c7a"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go d2709f9f1f31ebcda9651b03077758c1f3a0018c"
-"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-"github.com/eapache/channels 47238d5aae8c0fefd518ef2bee46290909cf8263"
-"github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 925471ac9e2131377a91e1595defec898166fe49"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 68f4ded48ba9414dab2ae69b3f0d69971da73aa5"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/influxdata/influxdb b287c191f362e7313aae0fa08c19b787076ad530"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
-"github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062"
-"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
-"github.com/olekukonko/tablewriter 65fec0d89a572b4367094e2058d3ebe667de3b60"
-"github.com/onsi/ginkgo 9eda700730cba42af70d53180f9dcce9266bc2bc"
-"github.com/onsi/gomega c893efa28eb45626cdaa76c9f653b62488858837"
-"github.com/osrg/gobgp bbd1d99396fef6503e308d1851ecf91c31006635"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/pelletier/go-toml b8b5e7696574464b2f9bf303a7b37781bb52889f"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go 7c2de5ed8c029f222d87fc849b54c4075ef3173f"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common 49fee292b27bfff7f354ee0f64e1bc4850462edf"
-"github.com/prometheus/procfs a1dba9ce8baed984a2495b658c82687f8157b98f"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
-"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-"github.com/spf13/afero 8d919cbe7e2627e417f3e45c3c0e489a5b7e2536"
-"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
-"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/spf13/viper 1a0c4a370c3e8286b835467d2dfcdaf636c3538b"
-"github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c"
-"github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b"
-"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
-"golang.org/x/crypto 9419663f5a44be8b34ca85f08abc5fe1be11f8a3 github.com/golang/crypto"
-"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 314a259e304ff91bd6985da2a7149bbf91237993 github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"google.golang.org/appengine 5bee14b453b4c71be47ec1781b0fa61c2ea182db github.com/golang/appengine"
-"google.golang.org/grpc 8050b9cbc271307e5a716a9d782803d09b0d6f2d github.com/grpc/grpc-go"
-"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api 9b9dca205a15b6ce9ef10091f05d60a13fdcf418 github.com/kubernetes/api"
-"k8s.io/apimachinery 5134afd2c0c91158afac0d8a28bd2177185a3bcc github.com/kubernetes/apimachinery"
-"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
-)
-
-inherit golang-vcs-snapshot
-
-CALICOCTL_COMMIT="8006d58068c2a81d23977670e0c6061d959ba32c"
-
-KEYWORDS="~amd64"
-DESCRIPTION="CLI to manage Calico network and security policy"
-EGO_PN="github.com/projectcalico/calicoctl"
-HOMEPAGE="https://github.com/projectcalico/calicoctl"
-MY_PV=${PV/_/-}
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o dist/calicoctl -ldflags \
-		"-X github.com/projectcalico/calicoctl/calicoctl/commands.VERSION=${PV} \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.BUILD_DATE=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.GIT_REVISION=${CALICOCTL_COMMIT}" "./calicoctl/calicoctl.go" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "dist/${PN}"
-	dodoc README.md
-}
diff --git a/net-misc/calicoctl/calicoctl-3.1.0.ebuild b/net-misc/calicoctl/calicoctl-3.1.0.ebuild
deleted file mode 100644
index 9bd762db595e..000000000000
--- a/net-misc/calicoctl/calicoctl-3.1.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/armon/go-radix 1fca145dffbcaa8fe914309b1ec0cfc67500fe61"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go d2709f9f1f31ebcda9651b03077758c1f3a0018c"
-"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-"github.com/eapache/channels 47238d5aae8c0fefd518ef2bee46290909cf8263"
-"github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 925471ac9e2131377a91e1595defec898166fe49"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 68f4ded48ba9414dab2ae69b3f0d69971da73aa5"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/hashicorp/hcl ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/influxdata/influxdb 38d2d29f79f249b4f7647b441355cbc03e9fec1a"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/magiconair/properties 2c9e9502788518c97fe44e8955cd069417ee89df"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/mattn/go-runewidth a9d6d1e4dc51df2130326793d49971f238839169"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mcuadros/go-version 88e56e02bea1c203c99222c365fa52a69996ccac"
-"github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062"
-"github.com/mitchellh/mapstructure 00c29f56e2386353d58c599509e8dc3801b0d716"
-"github.com/olekukonko/tablewriter b8a9be070da40449e501c3c4730a889e42d87a9e"
-"github.com/onsi/ginkgo 9eda700730cba42af70d53180f9dcce9266bc2bc"
-"github.com/onsi/gomega 003f63b7f4cff3fc95357005358af2de0f5fe152"
-"github.com/osrg/gobgp bbd1d99396fef6503e308d1851ecf91c31006635"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/pelletier/go-toml 66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go ae021117ebb7c4d8067ea079706b718c6a88eb7f"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
-"github.com/prometheus/common e3fb1a1acd7605367a2b378bc2e2f893c05174b7"
-"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
-"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-"github.com/spf13/afero 63644898a8da0bc22138abf860edaf5277b6102e"
-"github.com/spf13/cast 8965335b8c7107321228e3e3702cab9832751bac"
-"github.com/spf13/jwalterweatherman 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/spf13/viper 8dc2790b029dc41e2b8ff772c63c26adbb1db70d"
-"github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c"
-"github.com/vishvananda/netlink fe3b5664d23a11b52ba59bece4ff29c52772a56b"
-"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
-"golang.org/x/crypto 9419663f5a44be8b34ca85f08abc5fe1be11f8a3 github.com/golang/crypto"
-"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 88d2dcc510266da9f7f8c7f34e1940716cab5f5c github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"google.golang.org/appengine ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4 github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
-"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api 3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd github.com/kubernetes/api"
-"k8s.io/apimachinery ab7fc865fb0881d161f37adef3e5a67b89a18d05 github.com/kubernetes/apimachinery"
-"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
-)
-
-inherit golang-vcs-snapshot
-
-CALICOCTL_COMMIT="a09fa70e0c24519356d0b619dc4c931c6e4fa735"
-
-KEYWORDS="~amd64"
-DESCRIPTION="CLI to manage Calico network and security policy"
-EGO_PN="github.com/projectcalico/calicoctl"
-HOMEPAGE="https://github.com/projectcalico/calicoctl"
-MY_PV=${PV/_/-}
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o dist/calicoctl -ldflags \
-		"-X github.com/projectcalico/calicoctl/calicoctl/commands.VERSION=${PV} \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.BUILD_DATE=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/calicoctl/calicoctl/commands.GIT_REVISION=${CALICOCTL_COMMIT}" "./calicoctl/calicoctl.go" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "dist/${PN}"
-	dodoc README.md
-}
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 08e4a9ea6105..eaebca8b9c2f 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -3,9 +3,7 @@ AUX chrome-remote-desktop.conf.d 579 BLAKE2B 30b23526aa888ffeaa4b4e3bb7ae642e550
 AUX chrome-remote-desktop.rc 1388 BLAKE2B 937378e8ad7bb295333dc537a9c333e1a1041a75333de142c8b2299ea1c2cd9c2deb82bdac7e49e075996d30c96c1cfccb7edf130c922491edbfd164ad1b77b1 SHA512 f5d0755bfa337b7f3bf7b9d58cd9bd820404e1257e2d64cf74a073afece6af4dcb00a46ee2192087870eadd768b85a0b5ebd2b50223f13d105496a3902d094c2
 DIST chrome-remote-desktop_49.0.2623.40_amd64.deb 20315570 BLAKE2B 03725450590fad81105ae5314f9a1c9c9acc1b3f2d294ee1401379c264d59d737c2c39333ab5cb7a77e5885855ca484db360f0936be6c5bc2c84aa0cb38afe72 SHA512 d936885a986a749a0b4ebb1bb68fe0bc14d10d21363a409abbbb224b4f3ee048ef030ee81469be9bbb8c3852d7c6793fcab1f51d52fcaf5b02cda07550b72330
 DIST chrome-remote-desktop_49.0.2623.40_i386.deb 20941574 BLAKE2B 7f86e734fdc9c95f8820912aa075d4be805896f4f045ba39fb1fedc9ba6e3b576d71ce67692f683009ff005c2c248ed067ef4980906ae9e158c107aa96b58470 SHA512 00cf6641ee993fb8c295ca99cb57cde42eb3dd6cc34ae4684f858279615695d5b1a257081e8988293f94e887986492e112bc0276f572cd592d9879dec88eace8
-DIST chrome-remote-desktop_57.0.2987.37_amd64.deb 15677362 BLAKE2B aa92ef2a6c89043ff7e1a39c186edc57dabd9b5a629391aa0603f51b527131a94cea501a9929a5cacd951b8204959ed93203b81bdadf677af5d937774d110f69 SHA512 df470d9f69545dd2793b5d97674bb8724f5ad3dfad05b4d5572b01a21443d79e6776fb72ca14044d7ee00660b7d040023c9716e2568551e2862bdfd3cff99d88
 DIST chrome-remote-desktop_63.0.3239.17_amd64.deb 19026074 BLAKE2B 9a62d317768d6c0ab3cf3c6e7c5dea074133cc7c5d2b04ffdc1e0f9877f5f606c044ebab7b230914eba2ade51d2805fb1267f7b1731fa36235495a8192eb3c48 SHA512 2843deb7817217c8b8e41931b1e9ef0fdfb40c6a4ceb1bc69499aed16cc729d7ed64f88200c9bb2366a768f294a164da2360ed2b9654d1626696bcf0403e347a
 EBUILD chrome-remote-desktop-49.0.2623.40.ebuild 3668 BLAKE2B f149fbab2512737be2bf8668ac1aa6b0c2873a23afcbbef60fbb7d67fafd3ce213496860ff4266a05527712a26f6f9cf964258f8c8b5bb5c6638034c4f19ff5c SHA512 7486227050481ba09ac2f5a0c1fa205d1461210354bbbd2b1fdcd40195fc223ed018b439ad421c1f93c825e67106042e867f57552b68c26134fd185daa4126be
-EBUILD chrome-remote-desktop-57.0.2987.37.ebuild 3825 BLAKE2B c5d0b10e2c3685b6152c5e35631d223e5993078365a9d54dbc336455d51c1c4d5d213db0b29f3cd4e84845fa0f35a1606a51aacc91b632ea651fb1322cfc8249 SHA512 0e275cce491f42c3ab65e9d3fce723bea92edfa6354ad20203f347e9b39c152deea52429bb3c055d02d8ac4d913d37c6ce1855bc7ad5db36afa851447a8ec42d
 EBUILD chrome-remote-desktop-63.0.3239.17-r1.ebuild 4080 BLAKE2B a0e1646c93031ae3a09b9bbd4e2ec2935498c9104354a8656acff039e1b726b222563e4c7385b44018f5bf974b4359ad68a19b285ecf5de854ff7d4592696f46 SHA512 26c40842a4d067e6690baccc0126379292dc2cfd6b555043fd961cd4152b69bfef7ff33841e5beebad3b0b05f0b926d2633b5b3f420fa880763fd5fe56b50874
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
deleted file mode 100644
index fc00cdec2c72..000000000000
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-57.0.2987.37.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
-# Fetch the Release file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
-# Which gives you the Packages file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
-# And finally gives you the file name:
-#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
-#
-# Use curl to find the answer:
-#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep ^Filename
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PLOCALES=(
-	am ar bg bn ca cs da de el en-GB en es-419 es et fa fil fi fr gu he hi hr
-	hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw
-	ta te th tr uk vi zh-CN zh-TW
-)
-
-inherit unpacker eutils python-single-r1 l10n
-
-DESCRIPTION="access remote computers via Chrome!"
-PLUGIN_URL="https://chrome.google.com/remotedesktop"
-HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
-BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
-SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE="${PLOCALES[*]/#/l10n_}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# All the libs this package links against.
-RDEPEND="app-admin/sudo
-	${PYTHON_DEPS}
-	>=dev-libs/expat-2
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-python/psutil
-	gnome-base/gconf:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	sys-devel/gcc
-	sys-libs/glibc
-	sys-libs/pam
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/pango"
-# Settings we just need at runtime.
-RDEPEND+="
-	x11-base/xorg-server[xvfb]"
-DEPEND=""
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
-	python_fix_shebang opt/google/chrome-remote-desktop/chrome-remote-desktop
-}
-
-src_install() {
-	pushd opt/google/chrome-remote-desktop/remoting_locales >/dev/null || die
-	rm -f fake-bidi.pak
-	local l
-	for l in "${PLOCALES[@]}" ; do
-		use "l10n_${l}" || rm -f "${l}.pak"
-	done
-	popd >/dev/null
-
-	insinto /etc
-	doins -r etc/opt
-
-	insinto /opt
-	doins -r opt/google
-	chmod a+rx "${ED}"/opt/google/${PN}/* || die
-
-	dodir /etc/pam.d
-	dosym system-remote-login /etc/pam.d/${PN}
-
-	dodoc usr/share/doc/${PN}/changelog*
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Two ways to launch the server:"
-		elog "(1) access an existing desktop"
-		elog "    (a) install the Chrome plugin on the server & client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) on the server, run the Chrome plugin & enable remote access"
-		elog "    (c) on the client, connect to the server"
-		elog "(2) headless system"
-		elog "    (a) install the Chrome plugin on the client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) run ${EPREFIX}opt/google/chrome-remote-desktop/start-host --help to get the auth URL"
-		elog "    (c) when it redirects you to a blank page, look at the URL for a code=XXX field"
-		elog "    (d) run start-host again, and past the code when asked for an authorization code"
-		elog "    (e) on the client, connect to the server"
-		elog
-		elog "Configuration settings you might want to be aware of:"
-		elog "  ~/.${PN}-session - shell script to start your session"
-		elog "  /etc/init.d/${PN} - script to auto-restart server"
-	fi
-}
diff --git a/net-misc/crossbar/Manifest b/net-misc/crossbar/Manifest
index a962a19ca198..b9953a5a5cf0 100644
--- a/net-misc/crossbar/Manifest
+++ b/net-misc/crossbar/Manifest
@@ -13,4 +13,4 @@ EBUILD crossbar-17.6.1_p3-r1.ebuild 6033 BLAKE2B f4ac47903acc228320c224a18c832f9
 EBUILD crossbar-17.8.1.ebuild 6435 BLAKE2B d2e41ff6f90579d152334152cb42cf50e3e48dd9b198642aa0a36f738797edec812f4fe51b311871e207022e4b2897c48bb958483f2d4f17c895468a8e287eef SHA512 b440f74d45b22312f5a97304d40dc4c2d36a534202de19e15a20698f8be5faaea85c31b05309a45116820c9d26f25819135e5613483486ec73567f51e5772364
 EBUILD crossbar-17.9.1.ebuild 6385 BLAKE2B 5e6e26cc376fe091a5ad2fced8cb2ccdcc8ef30a2581816468744325e616ed7c6847bbb905457b9ee811689385a79e2313a68bd11db0a1071b107b318a616339 SHA512 0dcb2623777b352e0f168a0c59fef1b50d441c7fa486ba1bbe81a2152e39e68d5a633b3fdf6948985d95b4579068ef0e062ea99f269ca546312593f622d464ac
 EBUILD crossbar-18.3.1.ebuild 6337 BLAKE2B e1e3cfab199e176033b539881e977cc40c63431b1a83fbf5708876234e3c5b72335cc08231e990f0c1399c57f9ade92546326b1e87659eace7eba0f733682446 SHA512 896b8831d12986807f355e7172738fb0e69c0ddccabd29ebb1c65dc783ce1837006c521537b939500aa22e8ad2b17be32db81cc571bad2631daa8a647fb7d353
-MISC metadata.xml 861 BLAKE2B acef636c9c51de3530425dcf3ab31afe8300c3fcbe1615d374c52610647086324887e2fb97b7a2fc9aeae73c48f5742b67ee9190abab5b01f3f7e762ae286851 SHA512 90ce37e4764583a09f90e99c7010de5c1f2abff6837cef4255eee5d83f7d9de2f641812700fa180cdb0e0511d401cb1e160a721600efabc787fc2a32ac0b83bc
+MISC metadata.xml 811 BLAKE2B 689aebe79e9e10ec110a4a5327245d727e3c6bb2e8e8dd3b0b07fefd8ab0032ec85a061309fc8fa8452e0c795c0a2fefed6ebd0091868c3815ab23d0e4a27c50 SHA512 f48554a367ca9b99176b6b3ed9b7322fd60ef4fe6ca78584263411a8e59fc9e89bccbca4c9484b1d267ed534ba6bab05750164f4802709795e1505e4ef276a41
diff --git a/net-misc/crossbar/metadata.xml b/net-misc/crossbar/metadata.xml
index 53363da49379..d9d6f959b0b7 100644
--- a/net-misc/crossbar/metadata.xml
+++ b/net-misc/crossbar/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dolsen@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<name>Crossbar.io Technologies GmbH</name>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 17b405c31d07..13e471845f1d 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,14 +1,10 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-7.64.0.tar.bz2 3012077 BLAKE2B 512edeaa7a4ff3a998903771307070b08f1dc53bf45b4f0c98edd78daa309877e1856e1253a3582b3db35d2ae877af5aeedf2fb2741bfd8faed3bc4525880581 SHA512 058da4c63a05f704de475271f37fb99ca90a67a919b168e07958ed45d10cb3d03898ea6e3452ffb1a1f1e5dd5915f08a2993024b12233919f3c46c036b9c07e3
-DIST curl-7.64.1.tar.bz2 3000536 BLAKE2B 787b9f9662dad4e3497357dc3f9cff0fb2c997e2603cf3c621633d9983fd011c346640be5227ddc4b363bdb7e1a64532a44ae9d5ccc27e405275e08f150d63fa SHA512 e04532d68896b79f28aea3b30aec2d5b53076d0d27c8f6404769618300828eed96633e7bd5945125bca76241bb1e169f5002ac9566108bcaddc8c51b513106b6
 DIST curl-7.65.0.tar.xz 2392324 BLAKE2B e5aec8c6cb6f6baabd035ce2ea159dba1541011658892bb883e917541aaffe6ebfb0d2b9f18e2357059a7bc1e3a8db47b2aed7a74597b21c14f0892ad6e9eb68 SHA512 032c065c1d4bd07ba028625f8fab6a09e7cb8505a5f19339b3abdee5a9cda7d091c11f075fe3fc227d082690a66c558c770a4cd9fb17b52acc13794976a770c5
-DIST curl-7.65.1.tar.xz 2392672 BLAKE2B 96519ad3b342944d2e6ae645a8435ba902e319830a95a2f873f4ab71cf2585daf98b5e44509dd394eaa6db71ac3d2cc6dd9e45deead7021e5d2e96db5de295ab SHA512 aba2d979a416d14a0f0852d595665e49fc4f7bff3bee31f3a52b90ba9dc5ffdb09c092777f124215470b72c47ebca7ddb47844cbf5c0e9142099272b6ac55df4
 DIST curl-7.65.3.tar.xz 2392472 BLAKE2B 25726e1f1568fad6a8419b29dde41bed4d9de4be70740119879beeb08ff2a6ace7737efe1fb6d96ecaacaf8f90dc0142ceede2b90c84275ea8f72bcd09f21dba SHA512 fc4f041d3d6682378ce9eef2c6081e6ad83bb2502ea4c992c760266584c09e9ebca7c6d35958bd32a888702d9308cbce7aef69c431f97994107d7ff6b953941b
-EBUILD curl-7.64.0.ebuild 6857 BLAKE2B 768a2b4559ba419b7211ae44edb63eca018f2bb98a078c05c9eae2f5be74c76501dbe78eee0372e64bcbb5a462a698959533b57d944cf83d40c8140e59b07b02 SHA512 2aa729057a5fca87b89cc412a157c67a02fefc172b374592ffdf832cc8fe88f9648958abb7534bf57e96fab8f14c5f3034688c242d5c660d8d7841112d727cda
-EBUILD curl-7.64.1.ebuild 6976 BLAKE2B 703d33296158e3e7514588080c11308926d9ae246c416e993a23e623ea6c846e8ad50dff2624e4c9e7d2c228dd165716909c009a5f9a11243589f13d19dfa499 SHA512 5eac3bf04054a2b7bceb22a7840cad1b6c04743bf02d468e5ae9789318f3dd087ae0f8dd3dc6da0ce23c48261cb62d756c1b75cb92cc83f9ea22d21bfb0b4052
+DIST curl-7.66.0.tar.xz 2414840 BLAKE2B f5d731c304c826442a8509016d00b9c68438ef9102b3c844c15315181c307e338f79930dc548d7f189b944dd74cc7eeb19d130b5a967ea2efa9862d15ae78bab SHA512 81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35
 EBUILD curl-7.65.0.ebuild 6975 BLAKE2B 3ba830aa65b0c9e98f5128289a7c8cef5c3cbc2ee91881f47bb9318c2fe82f5121942c4263cbcef5d6ab26c602e4a2b1ffca795e8253800c5318a3c4f6c16f23 SHA512 fef5557f9175b3a8c6240e6a89dfb994412948a6e44ec356e308f4fdafd0362df2f63400048c9ea0d6cece07240370965ba51d39424c3014ee761db1d799bc15
-EBUILD curl-7.65.1.ebuild 6986 BLAKE2B b060aef8e919418996ed1815507b500c93dfb886565e184414ce968515f5ef8316cafb4232228fa6b3466583adc613f1fd6f55e83580d64862aff4e94c84fdad SHA512 ea65a7aaa2ba8b3f2931a4726cb3756fe14adcb8a44293ca3bd09d4b2482c272470e5f7b89f818a9a88866e81b1602049a0cd34678f7a4599c0705b383d3ae3b
 EBUILD curl-7.65.3.ebuild 7160 BLAKE2B 2dbbba6596cf5d1dde4e0a85f992327379043508bc78b1e2bb10dd29c2738a9505abdda5cd991ec36b9b56aeae3f13b5d5088429cd136185d9383956d80241db SHA512 2f4bde9132616c39f053e81cd068ad7529fa6baf68eb96f9da55b9308f49e51321bf458023df445b3d0eeebc13394cccc20ad2b902fc8dbe34b80863f3a421ea
+EBUILD curl-7.66.0.ebuild 7160 BLAKE2B 2dbbba6596cf5d1dde4e0a85f992327379043508bc78b1e2bb10dd29c2738a9505abdda5cd991ec36b9b56aeae3f13b5d5088429cd136185d9383956d80241db SHA512 2f4bde9132616c39f053e81cd068ad7529fa6baf68eb96f9da55b9308f49e51321bf458023df445b3d0eeebc13394cccc20ad2b902fc8dbe34b80863f3a421ea
 MISC metadata.xml 963 BLAKE2B 5bec839fdacef23398bbdf097aa8d25dae2579501d2f4a385c251ff4b37e246bb762c30ebc5f24e0fdafc65a11ff7a58406777f44071b10f43203ea6c68a5508 SHA512 d70b0f5aee074f53272cd6292503f4705142d4e9cc274e4e13228dda30bd6357618af3b70601ef9624bf98522525cde011d6c756faf24563cbf8953f9683400d
diff --git a/net-misc/curl/curl-7.64.0.ebuild b/net-misc/curl/curl-7.64.0.ebuild
deleted file mode 100644
index c648fbabaec8..000000000000
--- a/net-misc/curl/curl-7.64.0.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-cyassl \
-		--without-darwinssl \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-schannel \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.64.1.ebuild b/net-misc/curl/curl-7.64.1.ebuild
deleted file mode 100644
index fd9bb539f92e..000000000000
--- a/net-misc/curl/curl-7.64.1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-alt-svc \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-amissl \
-		--without-cyassl \
-		--without-darwinssl \
-		--without-fish-functions-dir \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-schannel \
-		--without-secure-transport \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.65.1.ebuild b/net-misc/curl/curl-7.65.1.ebuild
deleted file mode 100644
index 3c1b6b01820d..000000000000
--- a/net-misc/curl/curl-7.65.1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-alt-svc \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-hidden-symbols \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-amissl \
-		--without-cyassl \
-		--without-darwinssl \
-		--without-fish-functions-dir \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-schannel \
-		--without-secure-transport \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.66.0.ebuild b/net-misc/curl/curl-7.66.0.ebuild
new file mode 100644
index 000000000000..85324e17a3e7
--- /dev/null
+++ b/net-misc/curl/curl-7.66.0.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-alt-svc \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-dateparse \
+		--enable-dnsshuffle \
+		--enable-doh \
+		--enable-hidden-symbols \
+		--enable-http-auth \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-mime \
+		--enable-netrc \
+		$(use_enable progress-meter) \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-amissl \
+		--without-cyassl \
+		--without-darwinssl \
+		--without-fish-functions-dir \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-schannel \
+		--without-secure-transport \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/dhcpd-pools/Manifest b/net-misc/dhcpd-pools/Manifest
index dd6a4f64e9e2..f74c43c92e84 100644
--- a/net-misc/dhcpd-pools/Manifest
+++ b/net-misc/dhcpd-pools/Manifest
@@ -1,3 +1,3 @@
 DIST dhcpd-pools-2.21.tar.xz 544940 BLAKE2B 22c6fd4f461480f95b0671309389dd90a5d1ae6cc64e1a61a6c450f1a861855b682a8c276ebc4517cf627ca7cb435cf6f4917d25c86c3bc40396b92ad8ae156d SHA512 33c89dd7eb23b3df6e454cd75051f3d842cc265e8596f5657a9e72ae485befbe78655eb682cab10c14973286b85f2b174c2f23b88c5142b63589ca9ec0a9d975
 EBUILD dhcpd-pools-2.21.ebuild 466 BLAKE2B d9070f585907274444d3266eb8cf87e993883757bafbf5afe0216bb355d3c0ce968dd0f08eb4f276c6b703677259ba21f858e2ecf04f300eb28a1bbb4f7be6f5 SHA512 5af5975d4ee19f1127834f3757efbd6938776694f56f20622c4d7689c65f88c1a7b05cc7248ccca0b70558e688312cbe6a3e3465961a8cbb312948cb30d68269
-MISC metadata.xml 328 BLAKE2B b32035d6f000ac6b66930a548b0df67027579d632b605266f2aa70c104b341de667b8f5a3c119288669283db3e21839d678c550ebcc0e0119805bc78d4dd31eb SHA512 19d9fe46aaa5e2e71587e28bc964194f6699b36782588cb384290646b208941320afc00512082bd216f43370a7df5313e96a99783c843d12c6f53f813875744f
+MISC metadata.xml 248 BLAKE2B 08f96609f1f2f9710137b80ba66301f51be6775ad5a8d0325485cbf61d5fe5cdcf7d8fa7a3883e95747f859f453fdbac7d96c87f6a5898c3c6c7917a434dee52 SHA512 fa1880b28830d7288b9905ffba62f3aed001698fcf05b86e8eb66683008f60d3451b1e8d749faf6acab2acfa0ea3641ec232171e903fdd20dfc04f2f6903f4cc
diff --git a/net-misc/dhcpd-pools/metadata.xml b/net-misc/dhcpd-pools/metadata.xml
index 8577945b03ba..dbb5930ad32a 100644
--- a/net-misc/dhcpd-pools/metadata.xml
+++ b/net-misc/dhcpd-pools/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">dhcpd-pools</remote-id>
 	</upstream>
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 5a96691f3448..3afbe890e435 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,11 +1,5 @@
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
-AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
-DIST Electrum-3.3.4.tar.gz 8606286 BLAKE2B a815a577509cc7d31f02347b5ce52d0fe9fd52ddbe4b60200a02423f8e6bf43a6c24d3c1db6ab265a69f6f3891db63886fe6c138d601bc48c0c8fdb66191e941 SHA512 297eb757dccb166d40a652be2c1c058e42f16416b586b69f32223966ff1e92a34e5d01822d71bd063bfa72b7bbbcae4251a63f7373600d0eeb139e923d17a2b3
-DIST Electrum-3.3.6.tar.gz 8789792 BLAKE2B dcac9a317364780a7dc3ae1083e6ba7fd3a4559d0b7f6375197bdf639143ab9da2c5a001605af5a0590fb900de2e98999aea171c6dcec390a47beb610af3b490 SHA512 b25fc67883b7a90bf902f62d07574f283c4c04b3c6dfbb4e890448ddb938d477e036470f82b45e426aa581a1da2425e13e6974a730b18b130fd265b8d01d0d91
 DIST Electrum-3.3.8.tar.gz 8911228 BLAKE2B af24f44f5805a5722d0b9500776ae1ea4f70e0869045535ea3bf27d24a61013ba718230e6292061581f55a4fae655cbacae9024a321efe655eb9816bae11ae75 SHA512 5f756da4d2df59c69997925c69f651011def07bfbdbc582f492ecc19386eee7d79b9951732a792e6041da902d776052d6590cbd2d7004bc93c8406bcf9093fe6
-EBUILD electrum-3.3.4.ebuild 4638 BLAKE2B 6c7e2c95d7be76e496d49aea1e2b6ac691c2b72336f155cda5643824ccdb51ee27f7c5c8a15d90fc1d464de0e8e504ffe0efbe1c3c652101efc611bf3fa520ab SHA512 60c252dbb9ac4c8f2f31713c1c4ff7086c6c62193fc59f000ab4a0e7b7ea7523b30587bf78318d80e950d28fd07574f414211e0b126cf0ecb8fc97aaab8d4ee3
-EBUILD electrum-3.3.6-r2.ebuild 4483 BLAKE2B e091135eb705c26e15822a0368d8523464ca973e4822c531c1ac7c1f023b97c365808a685610239add5b6365c4e8ea13664e2451c6f23a4e85be8128bfd9dc5d SHA512 1a2ef4689c4e786e20a56f288778ea6eef9557cdbc4955ca029782cfa67951b0eef8bc1cf9528b60cf23c5a1a9cd802c36f19ed001545deb93a05d1f5624b77d
-EBUILD electrum-3.3.6-r3.ebuild 1985 BLAKE2B 0c7ce770601e51f7acd6486ace1b16391db55837f37bec1efccc5ce9790afa5ef5cf6a4262c3b0775cd5dda6de9f335d44c8e16e27109dff74a59416219955e1 SHA512 e01f79da37cf2050992a21e4ed5c215c2d2bd7cc4074f50e70293fe6c174f0c34816ac2758d7bf2b3554d6fb5c76d779b2cf8b359320d8a1439565455a8ff14c
-EBUILD electrum-3.3.8.ebuild 1984 BLAKE2B 7b21baafee7ecd511fb62cf5966b094b24d1c7ae6bc22d160301c168ce9ad68a539f38f18574f01b7b079d60d102ea6e99feab200e21f361824e2ae697722f8c SHA512 3186355d2502da16753b69d0ad9481b92c9c330ec20dc3199f6be00ec0710eb1a492e114c546418cbf84a855cc67e280fb4069b95373242a13f55db380db1c8f
-MISC metadata.xml 1572 BLAKE2B 4681012dbca54a822c32dcbb5eab12718294c138343ac2469426678a85647dedc892a14e2287d0aaf2291e9d9b029796a29f32f6ae82ac6b56d7a9acb49295f3 SHA512 83bedb1cbb9c5260c7260b7e83c2105742c0403ceafae9857b4491abfd070ec3248f918d3a11bb7c93973714fb46af3864bdd85075d075bfb94f2ec6b9aca82b
+EBUILD electrum-3.3.8.ebuild 1982 BLAKE2B c1db2a13135b445b0ffd37779025868fc2446039a527988052d10dd48e0e5fff86e0e04f6373ff4d12a3e0946493c1496677404e8b35643a1847da149cf2db9d SHA512 9f9844b2ca4b8a76d3de83684860c9f840d4da10787478c579d3cebc1d026c8d4989ec0ce8de0a976d46771597723653485604d4eb85427987cba2c3364f3e61
+MISC metadata.xml 629 BLAKE2B f1a4cf6cae2c3471b946b9a2966b0b3c8e7c2d39ce124fc100142b5d79d27377939094bb5b3ae9a7ff6c947b93ce12a38e3075e77110f1cad9a246e03159fed6 SHA512 c8e37976ca6a16a8d7f2326ff6d276814b5c4f5b7c1f39becb7a800f10b0c6aa7333d15f0d208a1ffd592b46db887dc77e95ffb5d1e01eea1ebfe6c478c8dfc6
diff --git a/net-misc/electrum/electrum-3.3.4.ebuild b/net-misc/electrum/electrum-3.3.4.ebuild
deleted file mode 100644
index 72ad9942454a..000000000000
--- a/net-misc/electrum/electrum-3.3.4.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA be_BY bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	dev-python/aiorpcX[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "${PN}/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "${PN}/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" ${PN}/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm ${PN}/gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex coldcard        '' coldcard             ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex safe_t          '' safe_t               ) \
-		$(usex sync            '' labels               ) \
-		$(usex revealer        '' revealer             ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r ${PN}/plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.3.6-r2.ebuild b/net-misc/electrum/electrum-3.3.6-r2.ebuild
deleted file mode 100644
index a66c1036b967..000000000000
--- a/net-misc/electrum/electrum-3.3.6-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-MY_LANGS="ar_SA be_BY bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	~dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "${PN}/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "${PN}/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" ${PN}/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm ${PN}/gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex !qt5     qt   '')  \
-	; do
-		sed -i -e "/electrum\.gui\.${gui}/d" setup.py || die
-	done
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex coldcard        '' coldcard             ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex safe_t          '' safe_t               ) \
-		$(usex sync            '' labels               ) \
-		$(usex revealer        '' revealer             ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r ${PN}/plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.3.6-r3.ebuild b/net-misc/electrum/electrum-3.3.6-r3.ebuild
deleted file mode 100644
index 06e13125923f..000000000000
--- a/net-misc/electrum/electrum-3.3.6-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	~dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.3.8.ebuild b/net-misc/electrum/electrum-3.3.8.ebuild
index 3a3dda96aa67..21549110f526 100644
--- a/net-misc/electrum/electrum-3.3.8.ebuild
+++ b/net-misc/electrum/electrum-3.3.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 
 REQUIRED_USE="|| ( cli ncurses qt5 )"
diff --git a/net-misc/electrum/files/3.2.3-pip-optional-pkgs.patch b/net-misc/electrum/files/3.2.3-pip-optional-pkgs.patch
deleted file mode 100644
index 6d62f5675764..000000000000
--- a/net-misc/electrum/files/3.2.3-pip-optional-pkgs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/setup.py b/setup.py
---- a/setup.py	2018-09-17 12:56:34.000000000 +0100
-+++ b/setup.py	2018-10-14 14:46:16.524385198 +0100
-@@ -72,7 +72,6 @@
-     name="Electrum",
-     version=version.ELECTRUM_VERSION,
-     install_requires=requirements,
--    extras_require=extras_require,
-     packages=[
-         'electrum',
-         'electrum.gui',
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index 4f3345beaed9..f341e55ffeb6 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -15,17 +15,6 @@
 	</maintainer>
 	<use>
 		<flag name="cli">Enables the CLI interface</flag>
-		<flag name="audio_modem">Enable plugin to support Audio Modem</flag>
-		<flag name="coldcard">Enable plugin to support Coldcard Hardware Wallet</flag>
-		<flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
-		<flag name="digitalbitbox">Enable plugin to support Digital Bitbox hardware wallet</flag>
-		<flag name="email">Enable plugin to support emailing invoices</flag>
-		<flag name="greenaddress_it">Enable plugin to verify GreenAddress.it instant transactions</flag>
 		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
-		<flag name="revealer">Enable revealer plugin for extra security. https://revealer.cc/</flag>
-		<flag name="safe_t">Enable plugin to support Safe-T mini Wallet</flag>
-		<flag name="sync">Enable plugin to sync wallet metadata across multiple Electrum clients</flag>
-		<flag name="trustedcoin_com">Enable plugin to use two-factor service by TrustedCoin.com</flag>
-		<flag name="vkb">Enable plugin for virtual keyboard</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
index 493c18b04897..cc87e7761f20 100644
--- a/net-misc/felix/Manifest
+++ b/net-misc/felix/Manifest
@@ -1,7 +1,5 @@
 AUX felix.confd 111 BLAKE2B ea790c8b649f58bc8b4cbef2c91dccdbd7ba2bff9db80d45b677ef1a7948252c5175f2d96257d7ce5d7fbf2c5e5543da7bc0345176808e02323d109aeacbe17f SHA512 b922e79f5cffff9ee72ca6b24c8eef13eef08ec5e0a5815665e784b89b7548b9154f5e5d31865aa3fbe964abb76efe4a93331ff2513ddf1fbd2a71f6d815be25
 AUX felix.initd 522 BLAKE2B 1250ebaa33bec5c85ae6489bdeabef8e36bec949c18072235cebb0b5811a89ae061659dc868e804a5f9f069b2829eadd2921313aaad95cb6f7b86cee34d4defe SHA512 c5393cfcf94303fb02e7c2aea7992cc3969437d5f39674f243a800ad2d0659fbc6e42a411aec20d6477774353b125c7a8ffacc510dffb20442eba81e88582ee9
-DIST felix-2.5.1.tar.gz 331705 BLAKE2B b8ed9b2355fd7ed6af95421d863f52f0553db5b2b7043095075231fe79d7500ce94c1ceb33614cdcdf715ba275ec254c605622eeae83486d8861a6449ba0c2bd SHA512 60bea2115164b0c75b08ee5011e6754a5173c5e360215b71483fac2f26f1a57223df6ccfcd226e542335be5aec886d9e4f379353f3d57f11f9ec0098b98b393c
-DIST felix-3.1.0.tar.gz 465717 BLAKE2B 07df31c230a377cc8f9f46a5c6d49ff98fb4292bada3713aaa71a73b309d2a661c9a0904cb67897ceafa767fc38ad8fc53cfdb6048e4d92a02ea08c005e8f88a SHA512 1633b9748334bb7e9044554c258130037bbffea5ca132235cb63cb061c3fd5b17f143cb85b815e321c936f31e501e2b4e089c896b1a9a5b5765e3cf354041170
 DIST felix-3.1.3.tar.gz 467553 BLAKE2B 80fc599d5b2d6f57a251b6d679cd7b3ea461827e8f37fd3c798f1b8bbfd319449d037c0a5a6b7dcc77594a8f557897f7a228567fca8f95c00c028a8c4433e425 SHA512 2ba79babd27016a83ad525611917f1ed43707ccbdfda80bf40973698ac343255896aa978a38be58b58e13ecf6956a028caa5c2d0f1cbbef8a088961f449646ff
 DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
@@ -10,43 +8,29 @@ DIST github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.g
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 BLAKE2B 057738aefe26d3d42ba1bc0906675403512a7bab1161bc1015f6d833296778f2236cb2b99bbebd5c7db2384634fef62d2afbfc8dd59bfb1320bc6184105aa437 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32
 DIST github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz 804453 BLAKE2B 6dff8674476a5667ce4b43922acc1ba752a64d26f720c3554c73b88d5114d211a93fb994bba161911732a61d279b7f5610b5fc218b2985b87ef8a8353e3ca658 SHA512 13716991e01d8192137fa5551607f7320b7a369a5ca7ae29110060a5d9116a0d1c147b9f1fe6539eacbdf331bea2c6abb64c9da4bc921c3621e49e8bc397590e
 DIST github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz 3366245 BLAKE2B 9d3f9ff34b8e8ee603377dc4cdb84e9995fd23e275b67a5d528281e03951fe4716af29726d9cdec48bd2f31cb05521ec5caaec6295e4f992133a7ef1647cf065 SHA512 653d4bafbcbe9f95ce80a5d265aaf4d4568f3161846f412af9c52a6786c05b2b9ecc815126bd0b360d1ec2b53388412fbaaba97315db236cc8b628e3bb4818a8
-DIST github.com-coreos-etcd-d267ca9c184e953554257d0acdd1dc9c47d38229.tar.gz 2527242 BLAKE2B 7ce3619ba5e18414e3732dc4ce608122df130dfe9a61cd2aa6cd573f9010954ab0d352d5660a74032a0d078f040c383eeb0c8eac5022965f7781fa8f152946c0 SHA512 ace63a7e909629993d1b5038460848cecc1aecb024bcb6f35738f3ad36933e564da80f7faafb9b0d6a3e9149e37d34b86913219ce068b17a8adc643aa3099d86
-DIST github.com-coreos-go-systemd-2688e91251d9d8e404e86dd8f096e23b2f086958.tar.gz 28165 BLAKE2B 9433c3db4fc8ca8555d6f0d5aee6a47d5bb238d8fb28d69935a126aa5e223a59d35df6bf8cfe2bbc6cef85afa71c63c30ac027f9e551280f6d5f5b5d2248d6ff SHA512 29d6ee973c1752a661ee78869ff26873c2ae6684ea77612c2516b0ccfc9dd00ead885a6b87c1fb9be2ac74ae3381be1893cdb143b6fa18a19b6450f8733fe549
-DIST github.com-coreos-pkg-fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8.tar.gz 30353 BLAKE2B 5dc99a86cb95a8336c05380b0895844d27b79ad6c6e0d1223a3ec25f9cd5a39f0374c5826ff5a97c0472ea4538ad427997c95eea075feefa0a7703224e6a5035 SHA512 f1247031ebd00d6b5c5039dd3e66734035c761c39f7a7f333727248a9a78894b121f1cd18d06c58965292e9b95db2369219adeaf3bf0c63efbc90a6a6004b04b
 DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc
 DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa
 DIST github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz 23844 BLAKE2B 9c999258dde04fdaeb9dd4cab9d5aaa854f99d0bb2fb6d7e9fa67b829c0d5062139eba06abe3323c1c9d79093b45f8c29e33835797a693dd73c217309ef33286 SHA512 1d97e29b2dd84b3ccb619efbffa396ad0f988c5e09e18136edb64ed046d25512e31bd43f5586852d520ef2a38bd98ae2fd9c2e66c49bb52e828c386285bd9391
 DIST github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz 74285 BLAKE2B f2fe94848736a4f798e3ea31bc8a4e7259c11da56ab2811f47faf0d510ea66888e18ea9b805aa51b58f356809c3208dfd39be075b06811d0d40d1d289808709d SHA512 2ecce57da67d149e3329d76b6f811097760c42de3346c4353b1932af293cef32cb5b9913ec385619e932e632416f44b878aa621665a4cd6db0293e951ee2bb97
 DIST github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz 21204 BLAKE2B 4179c708d75c58cfda85d463541055cd772caeeb67edc8446d068443bc5c7dc894e536a4cd3795c2104e4b3a891ac1f766a8c6ceaa4d000884bb3a529d3ae2ad SHA512 91e097bbf4711d203f6e31e73a1d67ca200a7ff707ab4f517f1f61fc2f6347fcd6aa7811bd4036a8f5211623cff45ca6acbb23330b4e453dbeb1f7aafc112fb6
-DIST github.com-gavv-monotime-47d58efa69556a936a3c15eb2ed42706d968ab01.tar.gz 5945 BLAKE2B c57ad94b089601faeaab532e503a73fe1868cc5d165c7594e96bad34b5e2ee474ba9ff59418ab8b4c7e877cb3ec59d54114711304a797c712468a20f14aa8e4d SHA512 b736e2f99b44ecf3876faf1243374885048084ea61786e77bc17a866f2f27ac14dc3b4d032e5968489a08044321ef32b0bca020db453a6315e3696e063b6bf11
 DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e
 DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
 DIST github.com-go-ini-ini-06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz 34203 BLAKE2B 8eda5e022be1507d92f17ef3d2ca9f02df7a63d4bdae14d3486af05981d4007be0f32d1930341d5a724d20fd6f37d19dbfa9f1a703c14a86923f2940a5b3e2a6 SHA512 fdeb9b80afb13697b9b3084ea17e92fe2c528fec57bc4a18beafa18160201c94a9e31f85751d8eac836f2e41f818e547f5f2038c3a001c3f91a1187e1ba7846f
-DIST github.com-go-ini-ini-20b96f641a5ea98f2f8619ff4f3e061cff4833bd.tar.gz 38030 BLAKE2B b7fd1f9a6f028a68b07ad71c2edaae3050dda90585053273ac8112e9fbcbc66af7cfe675687ff52dc5dbe16c3567b4cbae8ea902066ad4122b9f7e4e36a17a78 SHA512 9de56f22a8b4ffcc8d64ebba79e2a4aac796f4d2edf475dc506a45e155a3a5bd27bf4dc7c7b5745be585ae69f3ba1394d1f6f14812b7c3a338125a5b0c315b40
-DIST github.com-go-ini-ini-5e9692864e22d02ac79e2fa499cffb00520b4fea.tar.gz 31516 BLAKE2B 25846eeaaac2c159820aec06fb0a270d5099b7f0950cd6cfa8611e449fd5a961b3a72d6ee4ae5a03a86a7638c41dc61c287fa15abe87a24f72323a4880f7f546 SHA512 3237eb68ef882515e9de916b0d959920021f8a1b5eb156847441a36f43efabcddf929dd17ca608f66ea405c923e5561f8220fbbc7a7a55b80775b5502cecafaf
 DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
 DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
 DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe
 DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab
-DIST github.com-go-playground-validator-5f1438d3fca68893a817e4a66806cea46a9e4ebf.tar.gz 61584 BLAKE2B d07460bbad50eeb4ece9c25dec0a0074d730a32d9c340ea42bf33b72c8b1175555df38d1af273c9547f02cd2a826888bfec71efb3f46c4474ffcd896b1caf4e8 SHA512 86721164b62d3bda80683bbfe578e48e5842cf10ea9236fe56b2db49617afe17a5faa6b85b7be87be34d4a77c3acdf6de6d200e3176a5a46f8b929546602622d
 DIST github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz 61555 BLAKE2B 824dd1ba4f97bc7b77f8e511bda1fdc7acbe1828d81d9c88f913f139b46ee0bfca6ec8b901d7b216023b987b28d98a848ccceb0f41bed1eca8004b5f5c71922d SHA512 dadcdf9c03528991672277ab8414e9f2a1b1868c855d80dcff16560c8d4a46ee6b4c17961e5d4dac7ebded3cd423b4ffbc6eb6ff0d05ea3a67e39c0eb4a1afb6
 DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
-DIST github.com-gogo-protobuf-100ba4e885062801d56799d78530b73b178a78f3.tar.gz 2432841 BLAKE2B 744f754476b0ae957d9874c4d06956057006ffcfd2d75ca50dc22b94eee967010b941f205b816216af58a19e8d3405d499d43a4199b5be172ccec6d4f2ece443 SHA512 6047875c5488d943a9f63776a4b55f71ab335344f6e99e76861240ad152db018b13ea52c18ff4db21c932090a50d32659643e0737c3290f18e945a352e450f3f
 DIST github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz 1732674 BLAKE2B 2dfc3538a0f7e4b77f90795a6e76a0c962bcfdb7fe557e64484481cb6ad053ddd738abd1415cea69fc1305dd2d4e2301510c6715243c76e2251304b6f74d6649 SHA512 2b40b3eed0fe85fb111d49b0eaea33be382539c1829ab43da6da0cbe3f5f7db44422ee38e425d660e85d0541031364a8def3b2e4589cad326c29a1bc4ed8a6a6
-DIST github.com-golang-appengine-ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4.tar.gz 300759 BLAKE2B dfa857e9da660106f75869c3515305b6842e3d3ce60f92175ec2de3e9f08378c9340b25a656f71c2c9a1c4ad4ead41e3b2eadab9a47e7e5eb62d682ec648f320 SHA512 c874c819b5ad176574f9bf0459eb3797facd7a2b477d4db83353c690a279547bb9c0ea11fbc4bc74e010b20388b13e715be8f5053609efa98667b7ce29ccaffc
 DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455
 DIST github.com-golang-crypto-ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz 1611750 BLAKE2B 510395566152cfb558ad71d8c5e9ad5821948265d58bf6e7943fc4889e92b6a6c95f627feab2750c119d5b303588152772cc5005e0d83fdfdba96256f7c513c5 SHA512 21ef1940bc1f1f854fa9497eb27a87b554e38d608e1ce5e0884fbf7203591f2fd52127062e85c50cbd366edceecbd226d4f75e96bb0014603200ada7d268abd5
-DIST github.com-golang-crypto-b2aa35443fbc700ab74c586ae79b81c171851023.tar.gz 1456586 BLAKE2B bdcbb114281611c90e441ab14786336f6352818fa766b6f3f8c62a6988fed3923dee618005cde1e17799272192cb06d1a8a176abfd3504bd7616e3596dd3345b SHA512 30a455f428011f4ab6b6528c8b3d882ed988d43f9e08cda3730b56b3174e674330df9610c48d839f81ec564a03cce5ffad60aed652cd04159a24b999750d81c1
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
-DIST github.com-golang-net-3da985ce5951d99de868be4385f21ea6c2b22f24.tar.gz 899847 BLAKE2B 0ac617849aaf70cc78ebeb0b68cd8ed9b866ea15381eb31f233c2afb351c3ed90169311cf5105a961fc6a844434b55aecfc00e26e136a430481f86f3eaa394fb SHA512 9b98953b1cd4a0382175b4299cf605b3a41f758054a167bc764c324c4c5c8ba7205760113c44666f77d447804f7f1a6d3b34a334859cf9528b19161f77baf075
 DIST github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz 917754 BLAKE2B df07520df49ebca5be2002ccbad68d4d27de392f94344ff0ae64cf22cd542055d5ba401c3402b6d303c977f1c9cdd85380f27b4f09c81e79633b9044a7e9aba1 SHA512 65b7d18e220e84fc588e0485f083473a91f939ec566b48d53668e337056950e1f40b19346bdbadc483dc57072096aef0508254a7148354f5234e26ac8c0063c3
 DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
 DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
-DIST github.com-golang-protobuf-8616e8ee5e20a1704615e6c8d7afcdac06087a67.tar.gz 217385 BLAKE2B 067df31ef043c798835c173eef23fc6dae18c30899752fed1ea776b35f54be63d144616a98230782fba1ef0812dbe02398fc50d196c48035f4d26c77baa1bf45 SHA512 bd5531821feea03d7bb273daf81ed648cf15c1573e70701f0e05c65995cef0030a927980447a5b9e52cfabd6049df9c3f3d9c7736157d994b3b38d4eef026a2c
-DIST github.com-golang-sys-43e60d72a8e2bd92ee98319ba9a384a0e9837c08.tar.gz 761710 BLAKE2B c3ef495f2d2695da0dc9ce5c015d42ac0bd7d8f7d097cbbf0e4601b784da07610545bca2cf8673a6f3e0ea1f326424de697e642af29d43e256f5306ad8dda342 SHA512 9b2bc7a6fe78d4c7c4a6d4cb533be483c7f6b3b0f0821452cdcb0f015bf1f07d649d4d562c44d7bfc65d63cc1c2f8def2e7274a02e6f11ad41cdffaa1edc82f5
 DIST github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz 801102 BLAKE2B d23a2bcfaa8fe92313f6e3fa577533e513181f40568c401918d4345c03434a39947e552b20165d4334c8aa981024e146a131a98e8ba9e0d622622e53bc578864 SHA512 7df873ade422b5d45271554325301620fed25a5658d1862d3a63222f406acf17bd39fb67d632387b9438e5291720dae4b086bd09810a8c897c457aba7a60fed0
 DIST github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz 4549739 BLAKE2B a124e96048fe4bf231b3e87e012d40f84de8541eefc4b3136451c75b6d45991b20893656fb920d014cb53a8ab5177a877c5ca48fc0dc43f92e50aa50d20d7ade SHA512 a4542d75a6326255d2cdfa48a454dcabf577fc04527973b6de00abb6d8bd4b04cfa4e6cf6b26fd3b2a546e6b4de7a36eaae409981dfe790b88a841a85348c83e
 DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
@@ -61,7 +45,6 @@ DIST github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz 280
 DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
 DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
 DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
-DIST github.com-ipfs-go-log-4b54e7d2460df21c1c2d345af2337f91bfc938ca.tar.gz 11316 BLAKE2B e8aca3cbfc22c76e16c87c3ba3efa8903a7a378b485845831b9d3eb2deff4e637ffa67a490f144966987c9ac133903466a6ae17b5f9ab7ec87bff9ec73d55244 SHA512 5eca2b00b16ff94327b47505426f62c913ab3e0485f18a1d2a30e0a15afbccede8914a7ad10cddc8b0745deab70be4abb650a71c05659874c3900b3b9da26580
 DIST github.com-ipfs-go-log-b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz 28143 BLAKE2B a2ef3db0067c5cf86ad17376c08f28efdc2d735a62dd10aec5b55ef5e4b711f0f6b281fbd6916a0f91fc9ef1e26415bac3d1184f6281c478506a17b4e6f31ba4 SHA512 e01209547e95f45d51d3794e912fe0a4343c61d54c3fca5f7ec6c13d859aeb7a2eab61b14ddeaa451acd8c7aa6f57bb000cf9b9c77c53a8fd0212be5e5df4687
 DIST github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz 12680 BLAKE2B 852a4445fa50334de624395ea375945e273b7bfdc2a2dccf677e75a18bde34408ddfc9c0f4329edadec31cbe148cb139cd8659b4e7ba5dde829c58e39228de9f SHA512 729b41f0302aeb23b077a7ad913cb70f06982c243a37ccc264d5475d3db693c6e019c5cf9eb6307d809c2c99a4d68d711d4e11fe062e907750247d3f3e1d519d
 DIST github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz 5584 BLAKE2B 60e968bab9171dc1f09dfa3bfbe98324b4a536fc7664465154173a97f3a4a28a1adb1b8f659c5494b15c03ab8c788e8f9459fca2d6f0b37b7815da20d74e2072 SHA512 055351c704c9227b8d6cbb95177c2dbd554d582cc0ba4dfb5f8f0f550f80cfbd264c82b2a84010b8b1e9f02d9c759b4317f277f0f1b873a5eeb181cd0b672284
@@ -69,26 +52,17 @@ DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz
 DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
 DIST github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz 4860 BLAKE2B 8f5958f711e86899267876fa27d534a34e8d48d07eddb14a82cdad1bd4056e525e74e41161be398e7da9c8c4bf7e03a1dd90e897bda7463dd7c425a20b94c8f3 SHA512 924fb47d68a300e7a17e67259c1ca6f395c23a2d630cabccdcea7ff76a9087597b317c2cdc9cecc42d885ce1e8faab338539f210681f02c695657d7b17039bc7
 DIST github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz 12417 BLAKE2B b3b86a419454a43e752a443c91f65e6a68ae7bc853efc45b7f705c557c2d5ca02c91d9ff40b546e4fb87ef830097e647c4acbf2f1bac02005bf9696a48dfdc93 SHA512 1ddee98c35a7355b0cc2005a18fc3dc65f4eecf1f50b417f39e40f87c79e510b2cfa9efd4a47c2860d0fdbf9f87f1c3780bf29cbff4f1c253372654088517dcf
-DIST github.com-kubernetes-api-3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd.tar.gz 591475 BLAKE2B 7c66c79cbcbeaac326bc25110979279472749b59e4924714f65c42b5f55aa09700581a91bd77a21741be0238ae03f0f6b59d4cc39d2f0ea377ebbe31bc2974b3 SHA512 801ce8b413fabc176c61605fadf964bffb165f4ad66d3902c91930d2c5c09e711e14700fb9437722df509a26c93509de6c0bbf79918c35c37a6102135fe470b4
 DIST github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz 591490 BLAKE2B f4eccb5a531799c958b9d812403b89e5d106b6aeccf6060b3e206928bc663d84e5c496e4290a3f11602c3c6582ebac94647c75ed3682c552e9405163dc04dc71 SHA512 2a76c7c6ed44ed037d4d369fc32ef4e31ebf768f415fe7591484533263ac3f5405bd0699e8c8f373c2195e699f682f2ad24bd8ecd21fdf3b26416116fdbbe92b
 DIST github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz 436650 BLAKE2B 85d7709ccd606e3fe762132ef88b7cba60617cdb36cf60e1c41a64b0320cca9b050bbebe357a693af349d1acfd2e861da9aaad0e32a16a9d6864fdc10c07fb20 SHA512 d7130b3326a8025547e16e42a93baeaab9379bca835ee19283b6adf83eb8259cc993aa25edb8dd0fab7dd30800cfb12c5a4927f295fbbd8edd7852acd8b23b8d
-DIST github.com-kubernetes-apimachinery-ab7fc865fb0881d161f37adef3e5a67b89a18d05.tar.gz 436659 BLAKE2B 5985daae9aa7e1646753c90004dfda92b444d5ef4b93fa32815c3af010cf038601ab343278bbd53ab5cf0674d06f5b9c99b4eeb4167d30fa6396d0da7a1831e0 SHA512 be41916d67622289b23895b1bf12a7dc5c24503ecaaef9c5addaf400d561da9a6ba599703b81ba473cf4c189fac9062fed5e3c9838b4a0fb42edd9257ad41a03
-DIST github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz 1317793 BLAKE2B c495730d6f4a4f477513e06c242f4cf9b234f4300a6ea0407a9fd36e6307445794512d7f6002dbe0153113b69af18ea7e316232d0054b714c2552c31b9ce08b8 SHA512 f44fd60453259a050b591d198a6e64c0e8729065b3b3ba73bb36b22211428e2d9bbadc7a8286a31084f5253f9f8cf95aeb7d1ee4ad5eba870887a5f7787a81c1
-DIST github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz 2764746 BLAKE2B 6229eb3d5a0b66221189588f13be52b6ed2f1a76a065b6c003b4968ff684736138af88ce3bb8b958fcb9ee0272e5c02be939fddff21ca32876880e31cd8b78b4 SHA512 63e57485cf08a438d913ee221d95fe61eab33c66548a24cc3dda0d833cc49cd1a30ea75c1678c407384e7e7d6f23d8e4ef22c944f208676a9693affad57a5cfe
 DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
 DIST github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz 27347 BLAKE2B 15d6a8e072d90a35780be09bd12dc2074795442972d674a16bc536dbee15dee05af71dc1e5b0b9e8a8c688580c31549e651f4972dc514ee7bbaee57a26234219 SHA512 1afda82fd79bf2e4f3a72a273a1240bef8be972a20a469a9304a1e1120a4b47a0c57d07a37800ca46f3bb55966173b73d936b3249be61d0a9c1aebe30a675bb0
-DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
 DIST github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz 8208 BLAKE2B 4cd558c21bd893f17280c05550015f2f8148344d50dbd958f7cc7fa68d06223d0e732ace81c445f0091357d6d0a1564efd7d246af5cf432de0d8728f5cb1d250 SHA512 fc274e5699b637e953b31e5014b759f0367d925c289f9eabd7538eaf916ec8a7613e3eaf6d8f9294869f54e943448cca21130daccf1717525aa123761026902e
 DIST github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz 3383 BLAKE2B 2034048312c4abc88a813d8ad83013f57e9a23477ecd847e92c3cf30e909e209f9a65acacf41d80b3569770c1400e338115c42fd48d358b66f68ccde69a9008d SHA512 1714a9e9ac7ad2ff30825328723b4c9a5c5f7544e876c6fe79b84c72ba1dd9bfcd6ded2308f6fcae8f1c893d22b84d6c72dfd30742edaa2a5b0d8e88eee27421
-DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
 DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
 DIST github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz 3009 BLAKE2B b68ad69058837306d4988760ab7a052d988a9ea8c297001698aadff3eb0c404b3f0953faca4b2f12a174aae9e5b6f77dbb793b44b356cb9a420bfdabd72d76b0 SHA512 21392e0a444215f0345548e38e5bd439c1d97742fe705060c9e6dd41c0646d4cffb2932b886f7080c4b849fa4f075a8496328f37112dbf87a81967b229f255c9
-DIST github.com-onsi-ginkgo-9eda700730cba42af70d53180f9dcce9266bc2bc.tar.gz 125539 BLAKE2B 7f6c6218fe07985014f113ebfc53a3cf6f970950e8ba4ed56dc59da58dbe208b5cc3639bd17f7af3d99150d792988f63499c5cf7048b6888a8b5266f6754ae3c SHA512 a0656bd310cfe3fb734c39796a364de2766cf0accdaedb7c55eebba3d1713997ac288ffe52e0b1c9625e448e40c44e7583d29a6a2b9277246b809aabac138274
 DIST github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz 131061 BLAKE2B 125023ad75acf77a29b13442693f98f8561416148d11860e6b90756daa5d7d6751a80c31d5657b5c315d1e22b353dd02d707dbf462deed9c31fceab9f266c30b SHA512 31d85ead950c0379353b098a0c5dd47aee818dd1a1ebb3eb28a5aad16752e7061b19559baf44ce293f944bf8e8bc6828971c73295cd9e38322521131b27e0010
-DIST github.com-onsi-gomega-003f63b7f4cff3fc95357005358af2de0f5fe152.tar.gz 81972 BLAKE2B 3850ad70883ccfd0644865951f5ec8844cfbe4951caaa48f4db1c141056d9eeceed284ae614e0c58bee684cb863f53e0ea0ab98bb3773870965f32f255c89ba0 SHA512 10d5cce762d2f75b352ae41c588203e6d7114baf32c5bf67321807073570b66357efad1117fc982b64e29a3ca233767a25d1737522646b6bbd61c3c5ce881541
 DIST github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz 83070 BLAKE2B c1ab5620aab30e5f518547c286db937b63755737ad6c23b5cddf64098e87de21eb777fddf1739ccea03900f171137aa4cdafa131a932b7c66f9b77aaf339d215 SHA512 7a089d1f2c4179b8ee77e0106794f228cb9f269a83150c39c9518a8e7d2afd83bb0e54beec828431ab6c1e30f6b366a7185a7fff9ca88b312f3354ba36deaef4
-DIST github.com-opentracing-opentracing-go-328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz 28604 BLAKE2B 9507aaac97438b1331fd190a1ef2a260b9125ae25e5fba57898ec421bfd97c592f0f8c92b12759d57969365273383d8d92a0a153ecdbf758ece6b7559e8b931d SHA512 01fa40a812f568208aa4cc603fb61444b1699bf8f7f7caed538c36051d12aa2f863c6815044760109ab4e4d14e9c777695e5c66ea76d9473c928fb321d87c1bd
 DIST github.com-opentracing-opentracing-go-6c572c00d1830223701e155de97408483dfcd14a.tar.gz 32162 BLAKE2B 4e7a0c8e4f84c6495f866f12f1da176c99d5ed7bed65238585b177a8edaaadc5981748b2d1c16fe9c8d9b4ec3d065212584462635ef3b25574c859834769adb8 SHA512 1e90f596f2888de1f61247d3f8ea084dd1248f17552408f14fc1dc7b794ddf547c288858d920b43fa5b340703a5385489ecde7b9065392324d457499560f07a7
 DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
 DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
@@ -96,33 +70,16 @@ DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.t
 DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 BLAKE2B 6b86517b1d42c1f5e464f33ec9256348053f3d752e03b693f396f372ce488c146157c8d5587dd975b2599e2e39b5265d9901783e73bcb41f72e014d8e0623c75 SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755
 DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 BLAKE2B 77288a4237d6b430197edf74e2b6986b07d8eb6b71b4e858566adadc6712c54e5bbdd1bf61b11323183cb88473d65c638ff323cf66a5cf5dd0a6f65fd8800820 SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e
 DIST github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz 406325 BLAKE2B 1d5313d69ba68efb76ae5227a64fb7b10d74e0741f8fcc218c0fd286cd5251a073cc5bf34518d030eb19d2a3c69ab7d4b3d59e8ed8f97580a96787e1171f9ac8 SHA512 f13616bc8873e47ebb9c5ba1a08ccec5545daf4f821859218cf53cebc089c806d4064456755acc966d0c0b310228da927e0041039c2ef3c7c7478f8e79cbfae9
-DIST github.com-projectcalico-libcalico-go-ae021117ebb7c4d8067ea079706b718c6a88eb7f.tar.gz 405046 BLAKE2B 3e29de42c9f3d66dbbceb2f98557329ff3ae019b3a1d59ad8d693183cb5faec584ff2551c5ca2c946897b5f86d24c23dc837166ef2a7456a63c66dfd4d44c213 SHA512 9ff540f1d4db060eeaaa0e97999b33e031413a629a685fcc67ae1664c3e427c24ee7d572eefea5bec0e4561fc52da43a55f74dee76cb6a86080fe89ddf42ad77
-DIST github.com-projectcalico-libcalico-go-fc4a3648215b9beda5d08e26d76e91f12fb45079.tar.gz 198156 BLAKE2B 58eb1a2e617260d1b61582a12d6ae01f7eeb9caefe4c8d6c4276a95d277e1d25242fe6975394c83d1e6bf39375f77dcccf37a77262f56dfc344d15f29cfe4b7d SHA512 0cab2d2d14205b184dba501fd171897117f0dbc2cb42ab121e789c20d46c3e2e6c71fcea4162646432726379322d332a841866101cf32ae51e698fdd92b54c1f
 DIST github.com-projectcalico-typha-5374e9f32bde159a4aa19c821618920f491004be.tar.gz 231051 BLAKE2B 0d799bcfa6396dc264bcfe1d90343f35444c6f21a5efad57e3358815c939fff4a6af587e75250f259ea243337fa27f2d0405163b002b2a05708016b663c17767 SHA512 c89213b92b36d509714be314bbe4db171e5682afb3ca69d771b4b53ead24e7105b03420040b6d57a7a5836a22f9dd1ef87da28b08e4726eef65ee5987385c4ec
-DIST github.com-projectcalico-typha-6913426bf2b4ce2a6d24c9fed5e97539b9f7dacf.tar.gz 230984 BLAKE2B aa385de599b109ac0fdd2cd8f87e8a9c753bbc60474c8b85d2f4b6a286bd375f0b0ad0c1399292abd4417e2db6cfefad5b11cb3e49c484f13f13b001ed6fa2c6 SHA512 cb857385d2e3ce262615d24149b635d2d84430eb0a5201f7dd7c746b1c2a335a19bd94c2050d1f4f74746eda4f3e9521e4025fe2469aa3fefc0ce148fdfde76f
-DIST github.com-projectcalico-typha-71413e6c4e8f903f899429329cf3e38e17633ba5.tar.gz 227211 BLAKE2B 41857009f54f2f1dd4b2532cb06e14356990caffca4995020cf311278ad3990719b34add9024a39be513cc1f6491d3a57c2850f5d8990698e7b66eaac5c228d3 SHA512 100d53dc3164008d6f5e701193ea1860a266e2321da585bff2a083a7853224ce866ff5cd1a64be0fd6530101bf0cc6c98fa366df331336023c4fc6f140649e6f
 DIST github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz 93776 BLAKE2B b8ab679f2f23e3d8d06c84a35b56b27c2a3f03b251dc50d07ea04217eb2bebc90417529a475df9d632cf2a0a390a2f763bfd83d464b780e908443e3afdeff103 SHA512 d5fcd58556eb5ad2a130b1668e05c38938034dcd90f0d7cc3c6f5b852a61cc0d2f62b6c15b9900e69978b75c44aff32e550015cbf79a260f1de248234683b13a
-DIST github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz 75589 BLAKE2B b739cbfdbdc070aeae55f25d263ae74fa07cb4af0b8d7b9504ccb954c4df7c8bd40f6e2392f16f63cb0f3f41c282e16655ab0d04ffddab241e3472cb6ef04faa SHA512 5fe34c1cbd9aee1d1e50424aec83a1e72d834b25208e35c1af8b30519f6db26a6d54adeacf40006f4d04539c1d2e8f577641c8d796314cd71e9b87b20847b2d7
 DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 BLAKE2B dec697d268b2bc8a2c6f9bb939e702fdc49e887fbe16a5f648f637e0ff425731ef4363707ea7732be27c2dff899d494f61aedd87232f90cdd97383033f4d833e SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
-DIST github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz 63007 BLAKE2B a62f727ef9dd42d52f495ab7449cbafbe7c7fcdb1bc171df97c40348dcb7fe12788223d7a2aea3398cae7dd17ec73ae6349b5e5f35f4785f2796cc9a16c2d420 SHA512 4f1ab6cffc309a00ed68959b9372e1d3ea4f8d597b8c462a4e365cf22737245e601b8bda0764bbd1f0172d773805d16e90a8aa90cb95e9462e35320043e04060
-DIST github.com-prometheus-common-61f87aac8082fa8c3c5655c7608d7478d46ac2ad.tar.gz 61732 BLAKE2B e0e16b1f12d62cb2c4618e37022aff054215b5910389505788bd671d6f29e2e8dac39ead98d590a75b4b07840d7667b293ad43096bc1e285e2b55137d3bcc796 SHA512 8dd198db3ee1f9708684ce25b3afa6e3202c9144537302d21dd34474d56163ceb429bd9372619d025d06a31f712feb2374b14d4053ba83355ff3b193e232c9b1
 DIST github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz 77798 BLAKE2B 3e8daf72d7ca8d702898349617c48a62d4dd7cc5ebeb65bd63d38978f5d8f05e6d0f02237e1fe285630da198aba90783e27eee69ac6a06f90e1a7be3fad50b4c SHA512 bdf0b2f818f9df4685ec7536a7478cb86ab8a8297081c618d92b14bc0296c2c66c9ccb403b2f4af42a7fed769f3ce2020082e2e983e3f2668e14776a6d26828b
-DIST github.com-prometheus-procfs-e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2.tar.gz 43889 BLAKE2B 046b59464a287395f73c756a3addcf319a437f4d5594e56d91ebe4fbc86ff5e6db92c87d7bfcd49b87606d1b2a4b3378a49f39a4989be55021da1e4e1834c7bd SHA512 c31a595327ee82e4f5fdd9f58f395261cd9a290e2bfd9115593b20508966ad529a31322b228736c7fa6eb0cc74d81c6f298bfd17450e534ffe1a8bd74633b325
 DIST github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz 43938 BLAKE2B 2c3823adb59aa35ddecb95a8a4561b2a64a1bfcfeec400eb839042a8fa9e926b2e29ff2042094670a441e735d3afc172e9931146a7c752bbb2721ea4f0e5c4c5 SHA512 2c9f1fe1994aebe88115d8437a9054dc99caeb3fc1948a9f47db157da1f8fc2f443baf1f8fa0bee76465690224a45c6479b265b6c6e081dd57d116e3b18d5507
-DIST github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz 7607 BLAKE2B d0f59a0862b44a5c84b9f4dd65eda26facbab84f57508a346c060d6468fd6ce8cf5014d715a43ecd56135f101d9e7aa33714431cc4ce6fd809fa2a1cf865ea75 SHA512 2bbff9fa393814c4c31ce033d604d29b908b2b110b154a693968bc1f8859f8417c402a183fcfdf07c4732576f285df92b57b9ea954974ff8e6a753ab3d82fc39
 DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2
-DIST github.com-sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz 26698 BLAKE2B 10f98819cf6e8e64e22ead564d8460414818cdfda5159a3e751a6457e531d8b8c34eee8fad5c35db187d52400a93ec7240bbea8821ac39360708b61940c33fcf SHA512 7152a9e355e21de7980a28e915b712103ae1eaaa4142a5c37db00d8d30415cb2ecacf53bbe178cce49a1b9c4ad57336e8438a40f0bb92dd20a2bcabb1980013b
 DIST github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz 28434 BLAKE2B c557d695fcb49d1ab2f391b8a40fdd7fc07b5da7023349302eb0a82b8e13fef71cfc15bc765785a126866ef26601e8f0f5278e1a79023caa96316638d995fe77 SHA512 540b5720775e6f50089f619f93720729a998653868acfeea47de43668057ed16543861065278cf5211b22f2d66edeaaed5dbc0a7523ec2474c37484563b29b51
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
-DIST github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz 11995 BLAKE2B cb880cb4ffd844c5dc86cfa2b1aee79b6ca7c7f527d3331b1bd8a85860cef203c6f4d4a85cbd6c55b3c160e2e121cf69c84de97fb77e3db0028662c15b7cc335 SHA512 e8aade384d3505c3bc9389c7215b789e013bc4088c1662e23170503876f2ad2ef97df63cfc6ed9b30c58b6287793e003d4c3a2e6250c0ea76aab807b2eb08ab2
-DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 BLAKE2B fe292aaad3f31173e1ed0e0d9dff74b9f5c46803acee9476f86a4822327296bfe52009d68c1b7bc2ed246596032e74a597eb951795a37eea9518a01ab4b3ad9e SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8
-DIST github.com-vishvananda-netlink-85aa3b74a43a9fa174a588ce9a042c9b71b0842c.tar.gz 121969 BLAKE2B fe1d28a8249065955a1812e59279d823418af7c437683ba8a65d69339d6acb37ac9c5fb95d927314e0e461512958a2302cd8bde4b643d3ff95894aff374dfc1a SHA512 c5b7586e23a93022e52da1b570747ba2b24c43554ebe3836f93b3cb63e52f059bc300152015ba11d25a0573f03453da30e148933aa5a7db15cd26eecfd9456d9
 DIST github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz 122308 BLAKE2B 3b7e1486b64c0dfd9658b7e7e631b1fc4ae19155dee5392ab57929a51e0734b744399c7902ff558091046ea64f5f1ecacfb2594011d3077880356d659a42c9c7 SHA512 65251591bec228edadf1b0193d4b47f97cefd8eac1a54edd623d20186c70dbf49631562826bc193e81f3af3262a0211dde9b9638ee5a9ca7ded6841a2ebe65ec
-DIST github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz 103396 BLAKE2B e0016e5a663157383ca37a99c32a1da395a9e6e53536acc6f03f25d9d347f1c4d8d1d00c8cfb02ba4f8ce69a5f7c06d9440fc177bd88e599678d67c18415cb82 SHA512 4e9f7d7017486160599aa6b98d32c41b135b74fdcc08f642dbb3ec9db83c21a94a2b4c9ff52ee78d0762468710c566c052e5b4fe7287e5ef99263136ae595184
-DIST github.com-vishvananda-netns-86bef332bfc3b59b7624a600bd53009ce91a9829.tar.gz 7753 BLAKE2B c251f716c79fd6c94204c1d0a7e99d58b964fa9e9664a80ce4d8045a433e8d7af91fc99ceb0d7d00bed26bb65ff22dc9f0527f4001d9bf71ed8996d5caf2ad4f SHA512 7298f8ff33c14faca3cd57f68de676049eee8aad6891f5ac03427b63f3554c666bf27896801a8528d9483b469df14040116fa52d263d851c7a9766577728b0fe
 DIST github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz 7725 BLAKE2B 360167d6e282d32331b580218a63e934b85a61e23f728e6393459f7d58e85fe97a070e6e5e476e34a19190606581dcfaedd844898415ebba9557afb75a4b1d0c SHA512 420f4acbc26c04defcf279dfe3a754964087ec3eb6daa563a2054fa31a1b9ede67531bbe26a9dd2d358012adf30cec66db1ee1eae8cf75062ffe7b3a5a40be86
 DIST github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz 34843 BLAKE2B ec139b3eb8f034ca9243c99497380097056a19e3fa8541e2075c1c7e108c96b4e97004fd47f1590dad0ad155db6c33ecdb5ea1162498f343c9c07c2f73d3476b SHA512 29ac7f9ebc485fd09d1c65c71457add052c7faa975591a0be1ffb20608cdcad61ed427b284d99340d1ac647d0a3bf99938522d90299a26172e74bac2d7f3e498
-EBUILD felix-2.5.1.ebuild 3998 BLAKE2B 13f283532d310dc707daaea73c428a66232c2450a4374d9740fcb8161a310333e6eaa823c5cde65477516725ee357b46d96f2b3fa055b442e74414f175ee70d7 SHA512 3d8f122b1c6214dc60cc47659d44d17aae7da4d14db083eba8d57a08c8c506a8f7086e4a350de2e518df91a96c4f42b8ff75cfb5339c755a950d93c63b4b4cb3
-EBUILD felix-3.1.0.ebuild 7540 BLAKE2B 8b10b3463d5bcebe8810044c302f2aa75169345d42ce3c03c2fab20c17539854622ace8d0e156ca356bfae56a4539b885bd8ba5afa48dc3b3ed92a6a9cb7a212 SHA512 e77f909b0902c10d3f8bf193dcd9e6c82697e400327236489b601afa489bfe953332a5e7c73534f2e1158067a62eaa010c6b53f533ace23265a215d6be689369
 EBUILD felix-3.1.3.ebuild 7540 BLAKE2B 1cd40ccecd40be6f6bc9aff34776571b99c229b8ea44b803f820ad6f60b86c5828e41e7535357079bb95b281ddfd2d74a2153c36be1519044474031255e46e45 SHA512 4a5c4b808b405c34dacf87a629b6ae58d610a8c172dd91621c1f8979967a7100998a84b926bea3f32c5d2adc6a160df481dc08259dcd7835eaf22d2fa60d89eb
 MISC metadata.xml 328 BLAKE2B 8c882f303485c68cd1b46cf55f194d15b2e6e191de8ccbeec7756ef43485e868b950b6138e196b465cbfa07da1df0ff5d7dc9441b349485b6cc55334add26f4d SHA512 39c22655bf9f27a303631f7640be0d375bcd3c25b82df94da86d814614b16b94b7237bbc112e3deadb6489d090dcc59060c6d186a9790d29886744942b5b156f
diff --git a/net-misc/felix/felix-2.5.1.ebuild b/net-misc/felix/felix-2.5.1.ebuild
deleted file mode 100644
index 970b4349f1b8..000000000000
--- a/net-misc/felix/felix-2.5.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-	"github.com/gavv/monotime 47d58efa69556a936a3c15eb2ed42706d968ab01"
-	"github.com/go-ini/ini 20b96f641a5ea98f2f8619ff4f3e061cff4833bd"
-	"github.com/gogo/protobuf 100ba4e885062801d56799d78530b73b178a78f3"
-	"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14"
-	"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852"
-	"github.com/projectcalico/libcalico-go fc4a3648215b9beda5d08e26d76e91f12fb45079"
-	"github.com/coreos/etcd d267ca9c184e953554257d0acdd1dc9c47d38229"
-	"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-	"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-	"github.com/projectcalico/typha 71413e6c4e8f903f899429329cf3e38e17633ba5"
-	"github.com/coreos/pkg fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8"
-	"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-	"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-	"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
-	"github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
-	"github.com/coreos/go-systemd 2688e91251d9d8e404e86dd8f096e23b2f086958"
-	"github.com/golang/protobuf 8616e8ee5e20a1704615e6c8d7afcdac06087a67"
-	"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
-	"github.com/prometheus/common 61f87aac8082fa8c3c5655c7608d7478d46ac2ad"
-	"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
-	"github.com/prometheus/procfs e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"
-	"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
-	"github.com/sirupsen/logrus ba1b36c82c5e05c4f912a88eab0dcd91a171688f"
-	"github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
-	"github.com/vishvananda/netlink f5a6f697a596c788d474984a38a0ac4ba0719e93"
-	"github.com/vishvananda/netns 86bef332bfc3b59b7624a600bd53009ce91a9829"
-	"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-	"golang.org/x/net 3da985ce5951d99de868be4385f21ea6c2b22f24 github.com/golang/net"
-	"golang.org/x/sys 43e60d72a8e2bd92ee98319ba9a384a0e9837c08 github.com/golang/sys"
-	"gopkg.in/go-playground/validator.v8 5f1438d3fca68893a817e4a66806cea46a9e4ebf github.com/go-playground/validator"
-	"gopkg.in/tchap/go-patricia.v2 666120de432aea38ab06bd5c818f04f4129882c9 github.com/tchap/go-patricia"
-	"k8s.io/apimachinery b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215 github.com/kubernetes/apimachinery"
-	"k8s.io/client-go 4a3ab2f5be5177366f8206fd79ce55ca80e417fa github.com/kubernetes/client-go")
-
-inherit golang-vcs-snapshot systemd user
-
-FELIX_COMMIT="53553b4f7ff80d193e8550ee3b31704da5349d42"
-
-KEYWORDS="~amd64"
-DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy"
-EGO_PN="github.com/projectcalico/felix"
-HOMEPAGE="https://github.com/projectcalico/felix"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=">=dev-libs/protobuf-3
-	dev-go/gogo-protobuf"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	protoc --gogofaster_out=. proto/*.proto || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \
-		"-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \
-		-X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "bin/calico-${PN}"
-	dodoc README.md
-	insinto /etc/logrotate.d
-	doins debian/calico-felix.logrotate
-	insinto /etc/felix
-	doins etc/felix.cfg.example
-	newinitd "${FILESDIR}"/felix.initd felix
-	newconfd "${FILESDIR}"/felix.confd felix
-}
diff --git a/net-misc/felix/felix-3.1.0.ebuild b/net-misc/felix/felix-3.1.0.ebuild
deleted file mode 100644
index 4274011e8140..000000000000
--- a/net-misc/felix/felix-3.1.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
-"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-"github.com/containernetworking/cni 137b4975ecab6e1f0c24c1e3c228a50a3cfba75e"
-"github.com/coreos/etcd c23606781f63d09917a1e7abfcefeb337a9608ea"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
-"github.com/emicklei/go-restful 777bb3f19bcafe2575ffb2a3e46af92509ae9594"
-"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
-"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
-"github.com/go-ini/ini 5e9692864e22d02ac79e2fa499cffb00520b4fea"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/gxed/eventfd 80a92cca79a8041496ccc9dd773fcb52a57ec6f9"
-"github.com/gxed/GoEndian 0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/ipfs/go-log 4b54e7d2460df21c1c2d345af2337f91bfc938ca"
-"github.com/jbenet/go-reuseport 7eed93a5b50b20c209baefe9fafa53c3d965a33c"
-"github.com/jbenet/go-sockaddr 2e7ea655c10e4d4d73365f0f073b81b39cb08ee1"
-"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
-"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
-"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14"
-"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade"
-"github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/Microsoft/go-winio 78439966b38d69bf38227fbf57ac8a6fee70f69a"
-"github.com/Microsoft/hcsshim 34a629f78a5d50f7de07727e41a948685c45e026"
-"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852"
-"github.com/onsi/ginkgo 9eda700730cba42af70d53180f9dcce9266bc2bc"
-"github.com/onsi/gomega 003f63b7f4cff3fc95357005358af2de0f5fe152"
-"github.com/opentracing/opentracing-go 328fceb7548c744337cd010914152b74eaf4c4ab"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
-"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
-"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
-"github.com/projectcalico/libcalico-go ae021117ebb7c4d8067ea079706b718c6a88eb7f"
-"github.com/projectcalico/typha 6913426bf2b4ce2a6d24c9fed5e97539b9f7dacf"
-"github.com/prometheus/client_golang 967789050ba94deca04a5e84cce8ad472ce313c1"
-"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
-"github.com/prometheus/common 38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a"
-"github.com/prometheus/procfs f98634e408857669d61064b283c4cde240622865"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
-"github.com/sirupsen/logrus d682213848ed68c0a260ca37d6dd5ace8423f5ba"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/vishvananda/netlink 85aa3b74a43a9fa174a588ce9a042c9b71b0842c"
-"github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
-"github.com/whyrusleeping/go-logging 0457bb6b88fc1973573aaf6b5145d8d3ae972390"
-"golang.org/x/crypto b2aa35443fbc700ab74c586ae79b81c171851023 github.com/golang/crypto"
-"golang.org/x/net 66aacef3dd8a676686c7ae3716979581e8b03c47 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 88d2dcc510266da9f7f8c7f34e1940716cab5f5c github.com/golang/sys"
-"golang.org/x/text 4ee4af566555f5fbe026368b75596286a312663a github.com/golang/text"
-"google.golang.org/appengine ad39d7fab7c60b2493fdc318c3d2cdb2128f92a4 github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"google.golang.org/grpc 5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e github.com/grpc/grpc-go"
-"gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api 3c2a58f9923aeb5d27fa4d91249e45a1460ca3bd github.com/kubernetes/api"
-"k8s.io/apimachinery ab7fc865fb0881d161f37adef3e5a67b89a18d05 github.com/kubernetes/apimachinery"
-"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
-)
-
-inherit golang-vcs-snapshot systemd user
-
-FELIX_COMMIT="dba3279377fd6ec7baf0ee560bcaec685f25fa86"
-
-KEYWORDS="~amd64"
-DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy"
-EGO_PN="github.com/projectcalico/felix"
-HOMEPAGE="https://github.com/projectcalico/felix"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+bird"
-
-RESTRICT="test"
-
-DEPEND=">=dev-libs/protobuf-3
-	dev-go/gogo-protobuf"
-
-RDEPEND="net-firewall/ipset
-	bird? ( net-misc/bird )"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	protoc --gogofaster_out=plugins=grpc:. proto/*.proto || die
-	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \
-		"-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \
-		-X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \
-		-X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die
-	popd || die
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "bin/calico-${PN}"
-	dodoc README.md
-	insinto /etc/logrotate.d
-	doins debian/calico-felix.logrotate
-	insinto /etc/felix
-	doins etc/felix.cfg.example
-	newinitd "${FILESDIR}"/felix.initd felix
-	newconfd "${FILESDIR}"/felix.confd felix
-}
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index b8ef84f9d748..310151818355 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -2,7 +2,7 @@ AUX 2.0.0-rc2-primitives.patch 1493 BLAKE2B 6799a594c5e88ef92893d490137be0d5414b
 AUX 2.0.0-rc4-libressl.patch 1770 BLAKE2B a0f9c5938ecc9ee6f7ec3d67f0a285285c5dc42b95b7c452f461d4fe96cd9ab26c3062426d2cf22e5ebe72d26befab25730573c22419020176cbabd97e8e35aa SHA512 c27ebee51e88e94b845f633d1c4c6eeff19bda977ac98cd25ae1e9eb589c68499e97eb2fb4fdfdb1f5dbbaf71653d657b3dfe8805c78460c6fdcdf80261ebb0d
 DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3 SHA512 cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589
 DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20
-EBUILD freerdp-2.0.0_rc2-r1.ebuild 2664 BLAKE2B 8612caa8fd82f99e1e6369ea991dd25270b9d7d104825038d6f0bc11983d43b84ac0ca15b02ad112072ab654b10f68372bd949b171ca0f9282dd0971be6b6389 SHA512 0c17d9a07ef8a13bfa8462eac1b3f19c3741e156e1dfd4e5fad41158cbd65bd18403b55cef9a04d0f3f5fb4c53a75c1f34b3405e86210823916eb2a10d6510be
-EBUILD freerdp-2.0.0_rc4.ebuild 2702 BLAKE2B 2835c11a2dca2c6b28670867343fc387eb10b2c19cc8111574fe2e9c9d2a3adf5d025f95e1672414687973fdbcee0e1ebcef62e5622896248998ae4e0f6d87cd SHA512 fa1c1f485c5fb3368975794e22334f93e921c1000f5bbad0590e7b59d2566163bb626c628af9bc3cc33c3dd347def778bc1aeded490b4df0a89547601ad140a1
-EBUILD freerdp-9999.ebuild 2650 BLAKE2B 9366eac7edf2dc9ab3ce1b7bab9804bca0faf93822e2f4263d94ef49fe23125e0404b940234f8ecbb2b43da9e9e4ba02260cf8aabc826c61c580031db60203f0 SHA512 f462a8d947212addd7e406992f1ee5d09a65ff7cdfb2aa5156012c715149f5a0e7fedbf18da5ab1633ae0794426c081387717357cf4d5c25fabbb895a7fc664b
+EBUILD freerdp-2.0.0_rc2-r1.ebuild 2689 BLAKE2B 7f94bd2bcf14b1a0b73e5180bb11bd85dc86e0dab5af329944ecf3772b52c73c49731f8e6166afc1f69090d4adee586575e11caed0462f0b40a89d58761a31cd SHA512 b33ff3f59ac78245b34cedff771fb211c9bdeb99964391e9f722c3cecbc153b30e6e4d63e9c36fd993c945ef52e9b21ee5616a7c1eb06814727f805e7555d16e
+EBUILD freerdp-2.0.0_rc4.ebuild 2730 BLAKE2B d9660b2e33919b12f95e807ae7eee4135d9aabb619c485a354023300bd757244bd7083685279875b23be0cb8e65af42da22260e6c67ae8a86462e6adf1f21949 SHA512 d2e26777016b350ff4afc6e2300964d38edf75ddf4b9c034492ac125ca487d3467e5c6b7a4cae9a6308c1b61d1a5d03eac24e1877a80ba36d1827ea77ca8efd7
+EBUILD freerdp-9999.ebuild 2675 BLAKE2B 062df07d0bd6c7274aa1433c8c2067e653cbd5e563956e226bcdd97012bc9b938667970e2d74e5f3ef06a6a056b855745cfb77e38fd2de9c5b21d98f4c301659 SHA512 f8f5458aedbf4fb7693c8b2630078c43473d1b088c6aecd9ce8ed553b95783d67575893d1acf8eddc4fcdc42a607e26a722b1f213bbe01479f913850fa086d73
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
index 9b4af99905b1..7e5cfb6e5906 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
@@ -104,7 +104,7 @@ src_configure() {
 		-DWITH_FFMPEG=$(usex ffmpeg)
 		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
 		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex neon)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon)
 		-DWITH_OPENH264=$(usex openh264)
 		-DWITH_PULSE=$(usex pulseaudio)
 		-DWITH_SERVER=$(usex server)
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
index 772d36f98fa8..51108006d581 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
@@ -105,7 +105,7 @@ src_configure() {
 		-DWITH_DSP_FFMPEG=$(usex ffmpeg)
 		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
 		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex neon)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon)
 		-DWITH_OPENH264=$(usex openh264)
 		-DWITH_PULSE=$(usex pulseaudio)
 		-DWITH_SERVER=$(usex server)
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 0d86ec929470..78014fa99063 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa +client cups debug doc ffmpeg gstreamer jpeg libav libressl neon openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
@@ -101,7 +101,7 @@ src_configure() {
 		-DWITH_DSP_FFMPEG=$(usex ffmpeg)
 		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
 		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex neon)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon)
 		-DWITH_OPENH264=$(usex openh264)
 		-DWITH_PULSE=$(usex pulseaudio)
 		-DWITH_SERVER=$(usex server)
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index c71459e6fa68..3447dcae4736 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,16 +1,5 @@
 AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c15579b7f2603cc547f55f97ad053027aef670616e2e8c65c0c932ca930cb2a59de1428c62c3887 SHA512 9e420dde9d7e8e9fe2513529fd2681994763e8b9069ae9911c56a3ee72d77e40a8e5c8b0e7c006fe5c336ccb78935d908b20bd1bd275dded317a0c5d2b7bc97d
-AUX gsutil-4.27-use-friendy-version-checks.patch 745 BLAKE2B 71c404d864f38528836c635b36a49dfa67b7d0370da5ed5486539a8bf5a79130bee1c950d012053fd610ea101be16ce120468221a343e893cbaa6a6507c95d8c SHA512 ed060d08fe58c171df591c010aec1c597a4ba2f08ecf4d5806a78437b90aedd9309f16f48a7cc24143c508b9cac44d865aa3b4499cd11ab8fa1cc0c6196796ad
-AUX gsutil-4.28-use-friendy-version-checks.patch 750 BLAKE2B a4b2e54e3d0d983f5ed2ed41ae092b2ef398a8702830a890c97aef4f6ac1655689f96537c0cf6c99dfb4e2fdca29537aabc09cab2a9a772e5d71c3f303c82aa9 SHA512 461668e10d4480f21144af93f14d4059a2cdfc15b739bc58f7fe9547a96dd38a8bf0f6c7f10b9928fdc1c5e1e402292eaabbbcfb808a4b5dae09cfac1c797e27
-AUX gsutil-4.30-use-friendy-version-checks.patch 759 BLAKE2B 10f482f828c53f4f569a097bbe6e77734b9df697c0280da1cadbf4cbb7e52965dc89d08e4831963e740d8a3a52ebe9082ed58d6363dab70e823de1a8ddcdcfdf SHA512 3d1afc9568d5fb50ffd154352e5e92941000852a64ece5c1e0e4f86835f7b7d2f1d04e1c7e0c115d89a0c6e4214d7f18464153213d5fbec26d5b8cb0d2a98412
 AUX gsutil-4.41-tests.patch 810 BLAKE2B 93a2e7163d0684c8ad03ce03ae94aebc168922861ac89958e0a13a1fc3e53635b03d08531bd29b8301772c0a724647c33e5091af47e1c4bcf4c0478b4487fad6 SHA512 85fad475926755f32c4d08eaad9b023c9808c4ef696a2a7da4c61a68101d781c207c4f5817cda286f123e0c50477e8f7bf032a03d40420004d1aee412ef8375a
-DIST gsutil_4.27.tar.gz 3107288 BLAKE2B 4322335779645caf8d1ce717140a92a2173871e3c572c70a1a07cfe3f2c3b054becb74a3b4cdd2cfac912b3f84758b1b40e65223cc9e3582653392bc3fc180d5 SHA512 0c05e3f1baa8e11e89fc5af2a42474984fc4d5b3cfbd28f3a0efd7603aeee9062f55899c8325579a10e37a6b70a2ad770daf03589f43d0a8a696595c1cdf7b57
-DIST gsutil_4.28.tar.gz 3410500 BLAKE2B ef6d5460f9f04d27c0f172db5880e02cc88f461455ca05c3eb125656f80c29cba9fcf96ceb0c5958f14a7dc1ac85fcae3a2234a2876c7757ece5e756e910da08 SHA512 fbba505f58bc46a737ae8c02aa6a112f71f2543e3aaa4d45afd8e81cda0850c7180216827f3510858b90dfcad85c2d4b54a8c74a04c9b4ab580e966fee7bde0a
-DIST gsutil_4.30.tar.gz 3549515 BLAKE2B e6ef7e3832922d0ac1dafee27d56ce810fb6daab0ffb19e3c5644c9f6b71c3a68490c809fce101c723a15a2124013691321c1cf5a6e5be0970bb8f9cb8878ead SHA512 504f21e3a79695959b128aac9c1b53fda8a5752c813b81edeff3d435c95e5cf269c75e682467a615e093a00ae2b52a6c9c7f0fc2a2fd49440f633124d47f197c
-DIST gsutil_4.32.tar.gz 3644450 BLAKE2B 0e8667504d2bcb499723cf55e6bf825cf555609209c73efaf544183d01a2a5e696ee7c4968f87ded36158a517abf397a295a770d8b9e230695720e90ce52f2d9 SHA512 9000d67cc29af6e28b6210edee3e2143bd382ff7fbea76bd75dabfd0caaafe82832c86e4148005edd1d9f986127f573d16b8a3387747bc28a6091ff189829e8a
 DIST gsutil_4.41.tar.gz 3685987 BLAKE2B 7586d6c64c87c27e4c5f3e86372bfe6d7fdfbdcbe4146308ed497d86b6e3fb984a79d3f07ba3ed055ac09bfe70eef893b8b764a46921703c48c8e54e49cac7eb SHA512 f96500a4761cb244039ba20ccb328b143134a74822990538585116fe6afa6f9e23cfecc9958e34d5deb4291edc9cbe97c6176b3a0f0136ed6e8e81303b5b8c4a
-EBUILD gsutil-4.27.ebuild 1783 BLAKE2B 528b5d30dc29765fa28807f4f2ac059dfb5060684a88acb1cd258e1fbe004f9bfb9315d158049c7fd97cf20bf128a0a055fc20a7c57e16a0cdb966ed7687673c SHA512 afc5055223dfd3c2ef7bdd1c4681ebec2f81cfbcae9e6c06a4ca8abe887c020050ef261e2e047160bdb0f3f49da57ae67e9e6dc75928a886eb25cc696e5488bf
-EBUILD gsutil-4.28.ebuild 1787 BLAKE2B 8f310bf7a9f0f318a2a7a018c27259f76d0d5bebde508880f83fa72932b062d4453a25ea819a183ae439614be57c4d1ee54faa80cb0ef0608b6f7f2fcef7ad31 SHA512 95c1a8b2a379a1efd1ae6cc1816bb799dace33b88bb5983e2c98165df118360e4174a7561a357ca8accec6520f13909ec53b0b7289185f909ce72fe9aabe97ad
-EBUILD gsutil-4.30.ebuild 1789 BLAKE2B 088ae1fa8dccdc6144597d7101517373075b853fce3068d4493af5a840088886f10324f1864e2bc7173b1dbc8cab4324b0c18f3692a14f791b16ccf440480bd8 SHA512 382ac24aa1093c90c64ad3c4d1e059bfe83f37c098810ee93a46325025dae125a3b80a552659b766642fc748a8792944e394dfe8921a73855f201a9727ad85e2
-EBUILD gsutil-4.32.ebuild 2547 BLAKE2B 3a5caf6b54cb38b7d615b20bf1909a289b13c4ec3e632565da07e830a5956e57c8495eed4d55781b4643e2ae199464670fee1efb82513d3dafe93d2a54c2ee14 SHA512 47f01bfce6091f5f7911663fd71fb7cef7e6f0cd5434607cd669c0d7b757003c6f7b1f3dc68b88ff18f00334e14a1b4c18e52136f554260b7f2a62347bc9b3bf
 EBUILD gsutil-4.41.ebuild 2613 BLAKE2B 2c08175115e2db69fd50b9e1695374ed5feb1df7a0e42ca2366ae67109ed0d13301f229a814497213dd2f9894454a7df068c465b01ecfe98f66fc581c48ac8b5 SHA512 61a9a371ea6aee9f4448a359d6ac9f06ba4c3ae2b0a0c1ade10b0e229256d7cd2e7c48101964d49c17983bea5cdb021c6a88a22568ac6106cf162ca2621e5a7d
 MISC metadata.xml 309 BLAKE2B 2e96100ac1f7d7ec8002836564ada61c1f60527f13dedb03063940bbed304147766406ad2dfe3269385320f1f81d3f7ce0979077c6f43ec49d6e8f99d5913cd7 SHA512 9ef28b80fa82fb11b954bdaf65bb385203f18a44dcfa53f2f8cdf47f62ece37eea0ecec1c83e067485d16fc0dd6b8bfb8a0fe625b5af8e5d07cb48a1e52b3178
diff --git a/net-misc/gsutil/files/gsutil-4.27-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.27-use-friendy-version-checks.patch
deleted file mode 100644
index c02e567989f3..000000000000
--- a/net-misc/gsutil/files/gsutil-4.27-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -36,21 +36,21 @@
- 
- requires = [
-     'argcomplete>=1.8.2',
--    'boto==2.47.0',
-+    'boto>=2.47.0',
-     'crcmod>=1.7',
-     'gcs-oauth2-boto-plugin>=1.14',
--    'google-apitools==0.5.3',
-+    'google-apitools>=0.5.3',
-     'httplib2>=0.8',
-     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
--    'mock==2.0.0',
--    'oauth2client==2.2.0',
-+    'mock>=2.0.0',
-+    'oauth2client>=2.2.0',
-     'pyOpenSSL>=0.13',
-     'python-gflags>=2.0',
-     'retry_decorator>=1.0.0',
-     'six>=1.9.0',
-     # Not using 1.02 because of:
-     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--    'SocksiPy-branch==1.01',
-+    'SocksiPy-branch>=1.01',
- ]
- 
- dependency_links = [
diff --git a/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch
deleted file mode 100644
index 93b529a3003b..000000000000
--- a/net-misc/gsutil/files/gsutil-4.28-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -36,21 +36,21 @@
- 
- requires = [
-     'argcomplete>=1.8.2',
--    'boto==2.48.0',
-+    'boto>=2.48.0',
-     'crcmod>=1.7',
-     'gcs-oauth2-boto-plugin>=1.14',
--    'google-apitools==0.5.16',
-+    'google-apitools>=0.5.16',
-     'httplib2>=0.10.3',
-     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
--    'mock==2.0.0',
--    'oauth2client==2.2.0',
-+    'mock>=2.0.0',
-+    'oauth2client>=2.2.0',
-     'pyOpenSSL>=0.13',
-     'python-gflags>=2.0',
-     'retry_decorator>=1.0.0',
-     'six>=1.9.0',
-     # Not using 1.02 because of:
-     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--    'SocksiPy-branch==1.01',
-+    'SocksiPy-branch>=1.01',
- ]
- 
- dependency_links = [
diff --git a/net-misc/gsutil/files/gsutil-4.30-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.30-use-friendy-version-checks.patch
deleted file mode 100644
index 5cf7c42274da..000000000000
--- a/net-misc/gsutil/files/gsutil-4.30-use-friendy-version-checks.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -36,23 +36,23 @@
- 
- requires = [
-     'argcomplete>=1.9.4',
--    'boto==2.48.0',
-+    'boto>=2.48.0',
-     'crcmod>=1.7',
-     'fasteners>=0.14.1',
-     'gcs-oauth2-boto-plugin>=1.14',
-     'google-apitools>=0.5.22',
-     'httplib2>=0.10.3',
-     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
--    'mock==2.0.0',
-+    'mock>=2.0.0',
-     'monotonic>=1.4',
--    'oauth2client==4.1.2',
-+    'oauth2client>=4.1.2',
-     'pyOpenSSL>=0.13',
-     'python-gflags>=2.0',
-     'retry_decorator>=1.0.0',
-     'six>=1.9.0',
-     # Not using 1.02 because of:
-     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
--    'SocksiPy-branch==1.01',
-+    'PySocks>=1.01',
- ]
- 
- dependency_links = [
diff --git a/net-misc/gsutil/gsutil-4.27.ebuild b/net-misc/gsutil/gsutil-4.27.ebuild
deleted file mode 100644
index cb2c309ec5f9..000000000000
--- a/net-misc/gsutil/gsutil-4.27.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# The oauth2client-2 dep sucks.
-# https://github.com/GoogleCloudPlatform/gsutil/issues/355
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.47.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.3[${PYTHON_USEDEP}]
-	=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.md CHANGES.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.27-use-friendy-version-checks.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-
-	# Package installs 'test' package which is forbidden and likely a bug in the build system
-	rm -rf "${S}/test" || die
-	sed -i -e '/recursive-include test/d' MANIFEST.in || die
-}
-
-python_test() {
-	export BOTO_CONFIG=${FILESDIR}/dummy.boto
-	${PYTHON} gslib/__main__.py test -u || die "tests failed"
-}
diff --git a/net-misc/gsutil/gsutil-4.28.ebuild b/net-misc/gsutil/gsutil-4.28.ebuild
deleted file mode 100644
index 85dfba63c0dc..000000000000
--- a/net-misc/gsutil/gsutil-4.28.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# The oauth2client-2 dep sucks.
-# https://github.com/GoogleCloudPlatform/gsutil/issues/355
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.10.3[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.16[${PYTHON_USEDEP}]
-	=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.md CHANGES.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.28-use-friendy-version-checks.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-
-	# Package installs 'test' package which is forbidden and likely a bug in the build system
-	rm -rf "${S}/test" || die
-	sed -i -e '/recursive-include test/d' MANIFEST.in || die
-}
-
-python_test() {
-	export BOTO_CONFIG=${FILESDIR}/dummy.boto
-	${PYTHON} gslib/__main__.py test -u || die "tests failed"
-}
diff --git a/net-misc/gsutil/gsutil-4.30.ebuild b/net-misc/gsutil/gsutil-4.30.ebuild
deleted file mode 100644
index c956e6c8793f..000000000000
--- a/net-misc/gsutil/gsutil-4.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Python 3 depends on google-apitools being updated.
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.22[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.10.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-4.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.md CHANGES.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.30-use-friendy-version-checks.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Package installs 'test' package which is forbidden and likely a bug in the build system
-	rm -rf "${S}/test" || die
-	sed -i -e '/recursive-include test/d' MANIFEST.in || die
-}
-
-python_test() {
-	export BOTO_CONFIG=${FILESDIR}/dummy.boto
-	${PYTHON} gslib/__main__.py test -u || die "tests failed"
-}
diff --git a/net-misc/gsutil/gsutil-4.32.ebuild b/net-misc/gsutil/gsutil-4.32.ebuild
deleted file mode 100644
index c22ead4ade73..000000000000
--- a/net-misc/gsutil/gsutil-4.32.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="command line tool for interacting with cloud storage services"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
-SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
-	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/gcs-oauth2-boto-plugin-2.1[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.22[${PYTHON_USEDEP}]
-	dev-python/google-reauth-python[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.11.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-4.1.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( README.md CHANGES.md )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e 's/boto==/boto>=/' \
-		-e 's/mock==/mock>=/' \
-		-e 's/oauth2client==/oauth2client>=/' \
-		-e 's/SocksiPy-branch==/PySocks>=/' \
-		-i setup.py || die
-
-	# For debugging purposes, temporarily uncomment this in order to
-	# show hidden tracebacks.
-	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
-	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
-	#	-i gslib/__main__.py || die
-
-	# create_bucket raised ResponseNotReady
-	sed -e 's/test_cp_unwritable_tracker_file/_&/' \
-		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
-		-i gslib/tests/test_cp.py || die
-
-	sed -e 's/\(executable_prefix =\).*/\1 [sys.executable]/' \
-		-i gslib/commands/test.py || die
-
-	# IOError: close() called during concurrent operation on the same file object.
-	sed -e 's/sys.stderr.close()/#&/' \
-		-i gslib/tests/testcase/unit_testcase.py
-
-	# Package installs 'test' package which is forbidden and likely a bug in the build system
-	rm -rf "${S}/test" || die
-	sed -i -e '/recursive-include test/d' MANIFEST.in || die
-}
-
-python_test() {
-	export BOTO_CONFIG=${FILESDIR}/dummy.boto
-	${PYTHON} gslib/__main__.py test -u || die "tests failed"
-}
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 0c93de0412e1..7b908427a4cf 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -3,9 +3,7 @@ AUX hylafaxplus-conf 572 BLAKE2B cd2b237704e0607565c16cf81593654d266c212810d0dcb
 AUX hylafaxplus-init 3150 BLAKE2B 67b27c9e773d141c462b62882fa1ec592bdd30397c21c0dc0ef55384ac0d448803a8984c35eb22185c0aa315019eea1588829717b170f0b6168b549a270f2570 SHA512 6bc4db4597ef55aaf01bff66dfe7e9b3ce23d51e8d165f635ad49d9971260f8f131d386869787b2cd0de612d8ee784fb8f4e44fa8b8deb4eabf1aeab441e68f5
 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c
 DIST hylafax-5.5.5.tar.gz 1353495 BLAKE2B e1b41a5cf5502ad28467625495171c085f43f4352b73bfd633da851a1366502aca04a157790ad4a7f3d634a6adbb5dab4c1eeb294283352e9eedaf03c565cb42 SHA512 ee6225ae044c567093103f35c30d848db757636c1d8db78e8f7cb43eb01ea34ab229a81ca4175e2bf30d3c87b598d5b5797b7d92b0dc852bf4b69c697baca8cf
-DIST hylafax-5.5.9.tar.gz 1364807 BLAKE2B 1e63d28dbe42170af65369ceab6b76b30fb264515992bb7f3561722eccae21e2d790e50eab3f1f9bdbb8c48e369166c90271aa8cf37c1905fda44c3b31b18b71 SHA512 67ac84df2619db7fb88cd7ad3af4beff9918b2481fc8edf7cc7574941161dd7aa6186cfc49c6cdb2a1f073f6cbf2f2a4ed084ca70ebe288bf7cd8e752cd56b2d
 DIST hylafax-5.6.1.tar.gz 1370677 BLAKE2B bd93d54f2c3e2c5c4c33617a0d95569c82bcbd32f669fb2ea513b86e112a5743ae6b4ddc8d43f3bd4af6006517e8787392c84bf60e715c104ddb0d819b22985a SHA512 c86c33dc9e8feec4e265156fa3bbda18cf187feeef5c812ff3d3c7857de048a688bb979fcd3494ee8fe58a004a384a2a161d05245c86d0c304311d63f62a9eb1
 EBUILD hylafaxplus-5.5.5.ebuild 4715 BLAKE2B 9d6ca4008ad1c725374ea961f7573daa2ec4fff75506b5d131a6680ba95dfdae6bbd734e1d003f07093d47bbfe07fd5db0b7001bf226e50360968e1deae3cf82 SHA512 e3b531d0ea6ed7039abbf2488f8ac5955b41691d1fa47da7182c06e7f44ec2f59082f8b3a1b7493c6129859e477bc72c2b8f21dfc795530fcf5e89de01bab05f
-EBUILD hylafaxplus-5.5.9.ebuild 4293 BLAKE2B 5c3e2ba530b2f8ad984f3db95189f77194fe1bfdd529c3ab5ece560c1fcf0ae97eba2fb56f20f1313ec2ee0c5ba960341acd2d29b8704f27a86d0329d078dc8d SHA512 4b19d97455b3679981d316dbb5f063df8056b4a95e8cb229978bb06e62e43e79ac8af018c79faa5d4f8e175ded1b490b6bc657a2ab876adc175902707af22665
 EBUILD hylafaxplus-5.6.1.ebuild 4293 BLAKE2B 5c3e2ba530b2f8ad984f3db95189f77194fe1bfdd529c3ab5ece560c1fcf0ae97eba2fb56f20f1313ec2ee0c5ba960341acd2d29b8704f27a86d0329d078dc8d SHA512 4b19d97455b3679981d316dbb5f063df8056b4a95e8cb229978bb06e62e43e79ac8af018c79faa5d4f8e175ded1b490b6bc657a2ab876adc175902707af22665
 MISC metadata.xml 604 BLAKE2B 012e03ab403ae6f27142ac9394736f1ad10bd049e5403e673259371d39119162ad5c61bd84248f1a1ec4f659f20c879e5682b0855d54f096b51c75688975e835 SHA512 bcaa18269a7ece318c970552134c79f89eb41c76a7e471e430d72ad9a8dc4ea10fa57d6b89434759f6cd1aa22db6ad8b5fb8933b7e65ffcdab11275cfce14593
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild
deleted file mode 100644
index 18d1e65d47a1..000000000000
--- a/net-misc/hylafaxplus/hylafaxplus-5.5.9.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit pam toolchain-funcs
-
-MY_PN="${PN/plus/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems"
-HOMEPAGE="http://hylafax.sourceforge.net"
-SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="hylafaxplus"
-KEYWORDS="~amd64 ~x86"
-IUSE="jbig html lcms ldap mgetty pam"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	app-text/ghostscript-gpl
-	virtual/mta
-	media-libs/tiff:0[jbig?]
-	virtual/jpeg:0
-	jbig? ( media-libs/jbigkit )
-	virtual/awk
-	lcms? ( media-libs/lcms )
-	ldap? (  net-nds/openldap )
-	pam? ( virtual/pam )
-	mgetty? ( net-dialup/mgetty[-fax] )
-	!net-dialup/mgetty[fax]
-"
-RDEPEND="${DEPEND}
-	net-mail/metamail
-	!net-dialup/sendpage
-"
-
-S="${WORKDIR}/${MY_P}"
-
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog"
-
-PATCHES=( "${FILESDIR}/ldconfig-patch" )
-
-src_prepare() {
-	default
-
-	# force it not to strip binaries
-	for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \
-		hfaxd sendfax sendpage ; do
-			sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \
-				"${dir}"/Makefile.in || die "sed failed"
-	done
-
-	sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed"
-
-	# Respect LDFLAGS(at least partially)
-	sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed"
-
-	sed -i -e "s|-fpic|-fPIC|g" \
-		configure || die
-}
-
-src_configure() {
-	do_configure() {
-		echo ./configure --nointeractive ${1}
-		# eval required for quoting in ${my_conf} to work properly, better way?
-		eval ./configure --nointeractive ${1} || die "./configure failed"
-	}
-	local my_conf="
-		--with-DIR_BIN=/usr/bin
-		--with-DIR_SBIN=/usr/sbin
-		--with-DIR_LIB=/usr/$(get_libdir)
-		--with-DIR_LIBEXEC=/usr/sbin
-		--with-DIR_LIBDATA=/usr/$(get_libdir)/fax
-		--with-DIR_LOCALE=/usr/share/locale
-		--with-DIR_LOCKS=/var/lock
-		--with-DIR_MAN=/usr/share/man
-		--with-DIR_SPOOL=/var/spool/fax
-		--with-DIR_HTML=/usr/share/doc/${P}/html
-		--with-DIR_CGI="${WORKDIR}"
-		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
-		--with-PATH_IMPRIP=\"\"
-		--with-SYSVINIT=no
-		--with-REGEX=yes
-		--with-LIBTIFF=\"-ltiff -ljpeg -lz\"
-		--with-OPTIMIZER=\"${CFLAGS}\"
-		--with-DSO=auto
-		--with-HTML=$(usex html)"
-
-	if use mgetty; then
-		my_conf="${my_conf} \
-			--with-PATH_GETTY=/sbin/mgetty \
-			--with-PATH_EGETTY=/sbin/mgetty \
-			--with-PATH_VGETTY=/usr/sbin/vgetty"
-	else
-		# GETTY defaults to /sbin/agetty
-		my_conf="${my_conf} \
-			--with-PATH_EGETTY=/bin/false \
-			--with-PATH_VGETTY=/bin/false"
-	fi
-
-	#--enable-pam isn't valid
-	use pam || my_conf="${my_conf} $(use_enable pam)"
-	use lcms || my_conf="${my_conf} $(use_enable lcms)"
-	use ldap || my_conf="${my_conf} $(use_enable ldap)"
-	use jbig || my_conf="${my_conf} $(use_enable jbig)"
-
-	tc-export CC CXX AR RANLIB
-
-	do_configure "${my_conf}"
-}
-
-src_compile() {
-	# Parallel building is borked, bug #????
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man
-	dodir /var/spool /var/spool/fax
-	fowners uucp:uucp /var/spool/fax
-	fperms 0600 /var/spool/fax
-	dodir "/usr/share/doc/${P}/samples"
-
-	emake DESTDIR="${D}" \
-		BIN="${D}/usr/bin" \
-		SBIN="${D}/usr/sbin" \
-		LIBDIR="${D}/usr/$(get_libdir)" \
-		LIB="${D}/usr/$(get_libdir)" \
-		LIBEXEC="${D}/usr/sbin" \
-		LIBDATA="${D}/usr/$(get_libdir)/fax" \
-		DIR_LOCALE="${D}/usr/share/locale" \
-		MAN="${D}/usr/share/man" \
-		SPOOL="${D}/var/spool/fax" \
-		HTMLDIR="${D}/usr/share/doc/${PF}/html" \
-		install
-
-	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
-	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
-
-	generate_files # in this case, it only generates the env.d entry
-
-	einfo "Adding env.d entry for ${PN}"
-	doenvd "${T}/99${PN}"
-
-	newconfd "${FILESDIR}/${PN}-conf" ${PN}
-	newinitd "${FILESDIR}/${PN}-init" ${PN}
-
-	use pam && pamd_mimic_system ${MY_PN} auth account session
-
-	einstalldocs
-	docinto samples
-}
-
-generate_files() {
-	cat <<-EOF > "${T}/99${PN}"
-	PATH="/var/spool/fax/bin"
-	CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
-	CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog"
-	EOF
-}
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index b475f118a072..158453bf0091 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -13,4 +13,4 @@ EBUILD iperf-2.99999.99999.ebuild 711 BLAKE2B 569294c8cfae197a94563320c64cd477c9
 EBUILD iperf-3.6.ebuild 996 BLAKE2B dd68b976f0bd58179a934c33f07591633f85a6509ea24e7fa80a6f79191c40257784bf47325a0b4b88df061a8f84e29f55e8b53d314518a73fe42627fe766a00 SHA512 d070a0944b3a3a3c1085b457944ed0417ab8a65a571dd92f43132d527c1f6a8fd14d967188768766f84d7e8eedfbdca0195dac3a07d25945bd99c357d71af359
 EBUILD iperf-3.7.ebuild 953 BLAKE2B 30d7abc4c2ad9c667323c0fe8073bae77bc0071827e3eab301a7f986fb76d08204bb50bb6c99793c5c827034794ab181bd8c37d2c97a69633aa365adf1a2cd2d SHA512 aa817ef5584a9914151bffb399a77eec290b8e171596dfc424b0a962cde13e1dbba45695ef50c7dd6c00edbfeef40ba1cf0c53f077da4a177d0f7527e719b752
 EBUILD iperf-3.99999.99999.ebuild 803 BLAKE2B 586514d1fb209fccbd940bca4a5e37c0c4e12778f6caf493e959a2acc7bf86c979f4f0b2f47b963446208aa681b900fb5d044a4ff2c827f21a796b79c7b1e052 SHA512 96794cbc42db4da3b6e8bcc8e700f9809f0992f399d1efcbdba304090943321815b83180360eb2286877ce769873a28b51c13025ad4c129a590f3eedea054826
-MISC metadata.xml 483 BLAKE2B 4ea7f7c86966199a3bfc78cb2f8312696a0aab08f97d03f84eafe1c418d849bc69ad5bf89d07125d47677436f666748e09820f119b5ca77e5f8e10d4d97b40a3 SHA512 0d0792352d95821b0d603f0628fca7e447ba9c9b1eb9fc119d58d45de1970dc4dc512a132867eb6bcab3725e1b724594f807461dc2fccfd8308bd2043196ce22
+MISC metadata.xml 544 BLAKE2B 8713c1d580ce8846e9d6d6c3920b473511808a2c9f14fe7b321964d45a72538905dcd18d3ed95f4f67580987b83db2d80cc00437b27d122281d7251778a21a2c SHA512 2a950c2d89b316964f0feb58f58748a1455a9e465e5fc0d0fbb1b4946c5571cf919c3ddcd3ba6040f79521d14cc76ac7ea9e97a7daf0f4f5b74425b2d78f422b
diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
index 344d7ddf0bf3..6941792a1185 100644
--- a/net-misc/iperf/metadata.xml
+++ b/net-misc/iperf/metadata.xml
@@ -6,6 +6,7 @@
 <name>Gentoo network monitoring and analysis project</name>
 </maintainer>
 <upstream>
+<remote-id type="cpe">cpe:/a:iperf_project:iperf</remote-id>
 <remote-id type="github">esnet/iperf</remote-id>
 <remote-id type="sourceforge">iperf</remote-id>
 </upstream>
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 49e9f74c2b4a..a335374c0a31 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -4,5 +4,5 @@ DIST kea-1.5.0.tar.gz 7395257 BLAKE2B dfc28916166a732714253e1e7458076643e1a40e9f
 DIST kea-1.6.0.tar.gz 7154301 BLAKE2B b05bd6cbf53140e10da2614917d2f314a048035f1ba5b33bc260166d203c3c99c1aa6438f886569aa5a809f705572096834dbb0ccea67eee1a93c1ed61fc0d9c SHA512 09e670996ad3dbfc523ad7639e3cfd43147bf370069cec80a6ba6af4c45264f33318594a20073f1c5d75bd19bcaa275e3167b243e13c5a6c151c10d634f338af
 EBUILD kea-1.5.0.ebuild 1620 BLAKE2B aa8f2a332a2387db5d86cdb04d5d81974cb2940b78e37a9d1fa046d84af7481b74e5e922e9a02e8304079ef422b59e20f8f6bdc8ebc97099e6ce44167522dd25 SHA512 9e4d61c89e66dd06c58b5db9a6ad4daf29bccf39172ea6123c876d53211cd5a73cb54352b9865bbd19934023777a625573fc3f7f4c15e5cb2e5881e6a2a49921
 EBUILD kea-1.6.0.ebuild 1750 BLAKE2B a4d18a5a46923bddac174ed443d03c838cd6d6bbc253683a890f921ff11683ba2566fcbaf18d6004505132e738da9f54fd2dcda2d0df666707337339c76fb52a SHA512 64c24cf23105b94a1df01bcac4ed3fbb8a70c4ea2507becfa58a75e9951161ac3280a8e62b261b532fec733fb30185c9169b0dc2e66fc7c2c6295d8d56c0d588
-EBUILD kea-9999.ebuild 1750 BLAKE2B a4d18a5a46923bddac174ed443d03c838cd6d6bbc253683a890f921ff11683ba2566fcbaf18d6004505132e738da9f54fd2dcda2d0df666707337339c76fb52a SHA512 64c24cf23105b94a1df01bcac4ed3fbb8a70c4ea2507becfa58a75e9951161ac3280a8e62b261b532fec733fb30185c9169b0dc2e66fc7c2c6295d8d56c0d588
+EBUILD kea-9999.ebuild 1751 BLAKE2B 85d329a3c2dde5181f930e3b4c89da49ceed7848c0f3548e1c2eaf63fd54d1c9886bb84f9da070258ffd6556a523e92046fdec467ad6a93a7bd76a066f79c862 SHA512 f27916bb53e83b4d7370bee5721df36327202ee6de1751181cf7e482d33ccea8a301ed5baf91de14665edcda927bc6e6c2e5cbc3e2721d0299b7900cec9a7ccf
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index 2d0234c2da44..16b905261783 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-IUSE="mysql openssl postgres samples"
+IUSE="mysql +openssl postgres samples"
 
 DEPEND="
 	dev-libs/boost:=
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 424c565fc86c..c4f11e04970c 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -1,7 +1,5 @@
 AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46764c5b7b59a62776c16c93d4112821159835e9d9f174f2af443c0d07a10823b41182910d12899947 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296
 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade
-DIST minissdpd-1.5.20190210.tar.gz 37227 BLAKE2B a273c35bb332e50f5c528cc395b257de7761fbec2cdef910018b0c751026ca4f3fc9fce60485c4209488574d3130a3c8a6d2755ae4114d2f4e2c0316491be021 SHA512 1902c3c396cdcec90af0638305224f77871bd7f70057ac8a1ff59b3ab6da168ee17eb52a5bee87eb85c8d759d02112225876e38c254ad521396eca9c4884686c
 DIST minissdpd-1.5.20190824.tar.gz 37300 BLAKE2B 3a04f6af0af8ce5d26e4860ceafe2c52f1ee562f179094fbcba3485c85ae75b7374fd7fa8f89ec6d9ce2a10bb94120618de40e0191fc7ecdd1e813a2b9c5d6af SHA512 79a14482b69a88b778e484a3b3e98964c420ff7576ac818ba60fd5e07f5b31754cdef3ee00d9189ba0a33f0268f11acd1f7c4222d8d0958920d1f568ec7755e2
-EBUILD minissdpd-1.5.20190210.ebuild 676 BLAKE2B 1d2e443df9406d31e7942c150b430eee7c68e3550f434b8fc4732db1c593335266864408ae93bb669d769dcfc83a9a1524d234a5bafca2446fc06fab63cb410d SHA512 f3429b14b6e2e7d019c582e7354f073159526299c3638e20622a5030cc49a2756d098356facd4974be82f14260e84775fd598e23ad05a0b2ce49c4728a94550e
 EBUILD minissdpd-1.5.20190824.ebuild 676 BLAKE2B 1d2e443df9406d31e7942c150b430eee7c68e3550f434b8fc4732db1c593335266864408ae93bb669d769dcfc83a9a1524d234a5bafca2446fc06fab63cb410d SHA512 f3429b14b6e2e7d019c582e7354f073159526299c3638e20622a5030cc49a2756d098356facd4974be82f14260e84775fd598e23ad05a0b2ce49c4728a94550e
 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855
diff --git a/net-misc/minissdpd/minissdpd-1.5.20190210.ebuild b/net-misc/minissdpd/minissdpd-1.5.20190210.ebuild
deleted file mode 100644
index 35c0a1f9b2be..000000000000
--- a/net-misc/minissdpd/minissdpd-1.5.20190210.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-inherit toolchain-funcs
-
-DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-libs/libnfnetlink"
-
-RDEPEND="$DEPEND
-	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install () {
-	emake PREFIX="${ED}" install
-	# note: we overwrite upstream's init.d
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	dodoc Changelog.txt README
-	doman minissdpd.1
-}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 650c9f0f9462..32e2abe1683e 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,9 +1,5 @@
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
-DIST miniupnpd-2.1.20190630.tar.gz 240466 BLAKE2B fe4d4e59a7dad32bef9ed9b4c58b52e378ec9b26ea2439e84284630a7ef7269c6cd53cabdc632ff274cae88aea2552a8808af2ea349138f8b8ed667baf9e87ee SHA512 cd6006e5487652a258f7320e1e28fea7b0790528cc014071109a1abd0f6c249237cf8d0620987c14ee0ce1cca14f4bb4abd439b1d422e0e49a398cd485eaf970
-DIST miniupnpd-2.1.20190824.tar.gz 240490 BLAKE2B c2eaf08b18d4cd27a18a71232fd8d972ced799a68b0e6f3ff1b3d155ab0e27047153dcd81a0c89806f74a6c09c303eb3255825f6fd4083f1ec77605ee4f0d1b3 SHA512 f3e591e10b33d2459e55118db11f6692bafd75ae867f934f4a5c6ccf6c9cf21363d0a746d1b319a08381119f382d5941af84c5bfb5c54b97f8945aa9d7372987
 DIST miniupnpd-2.1.20190902.tar.gz 240742 BLAKE2B 0b880b1e8a96c56af92726d3fe81da0a26de83861efe4dc266e287623dcac4c6bd4c4ac8d2c6ef7724c1055933d5138e7c86da5c8e3852f2022f69697505f231 SHA512 0abeb9df088ecd57909106fbb43de14d90eebd351a466477777f413f40c49bc432050bc8ea0d655d2eea0bfcedbdb97719ea2476a8bd9170ef9b74ad97217d26
-EBUILD miniupnpd-2.1.20190630.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
-EBUILD miniupnpd-2.1.20190824.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
 EBUILD miniupnpd-2.1.20190902.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
 MISC metadata.xml 1037 BLAKE2B 9fa42839f13b135ac2b69091b9d0ba1d3749f3b9903bcaa209c0d23ff981615c58df027725a536b4e268c53eb285ab6750bbeb7e0bc8e668dfca61b787ec9c60 SHA512 536ef1fce9d3d76eb33a88707c5750fc0b014cf29b4c20d3459bc0116a68234667689a297e8aae35507f1b6b9fde7590d14b3763f2813c485478e18f396bfeb8
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190630.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190630.ebuild
deleted file mode 100644
index 07c804f35640..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190630.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-
-	# Prevent overriding CFLAGS.
-	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
-
-	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190824.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190824.ebuild
deleted file mode 100644
index 07c804f35640..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190824.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-
-	# Prevent overriding CFLAGS.
-	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
-
-	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index a694bfeda162..1f65707a71d1 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,6 +1,6 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 DIST ModemManager-1.10.0.tar.xz 2201468 BLAKE2B 4a572feba7d62269ed9d6066565e1b7d41db3bece5d450796ee18f43a9a91a886f76dfe0db4887c9ca13643f72f4460c93b3dd2ae7643eb4c37b01905a3ff3c4 SHA512 676b11892b284c2da587895e71903f80ec96978c66eafae5e2d90e5c0f1dae18e50efc68b704c7907f01f208d585f5a8140316cf83e093df3f782c80949c33bc
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
-EBUILD modemmanager-1.10.0.ebuild 3651 BLAKE2B c60944e83a7d6066957eea5bdec781575d546bb163debc0cdfda317e21bf2625aa588e636fe8b0dc13f511605e95c6f742f335958f325733b7faa2e1bd8982db SHA512 cfafb4251886b39bc10eac948f7686bc3540740737624abfc0e469a20e3f74e523b15ce76a159b3216926015fcf6ae1bce9783f7498e8db9899c0b8cea264699
-EBUILD modemmanager-1.8.2-r1.ebuild 3645 BLAKE2B 3f0e68549417041d6f625fb986a32976ecfe66b6ee3364a978fced73dd5573f2a643c6ee4d2c84c555903aad8d4b5e338463a99712d866e5cd6e0e06eef8c63a SHA512 3916fa42c70eb157888cbbd13fdf076148efd7f25ec3168d1947c804d52f74a9b471682ccadfa9a4884d1b50ce72835299d35ca7b9b2277aeb612f3854396e7c
+EBUILD modemmanager-1.10.0.ebuild 3665 BLAKE2B d91a7604aaf597bc6f25c4a4db6122cf8f83cdc0ad0352e52542459ee9db7e199c226952e9953b399f2689f75dd9ed4a06518f3ff35df848ed1b28b40e4196ab SHA512 e9f25dbd713a28a8281e6f1c01ae91e1e07155358e64408ccaccd79cab51bdfb2957c0c42bc854cff0ce79baf8e74e1a49a041bcd3accb7dc3555da55d898269
+EBUILD modemmanager-1.8.2-r1.ebuild 3659 BLAKE2B 6ef3bbe4362f5432ba5366051f512b036f74fa349b457deb2ca24fab4e308dea6d2a66afaef79eb233436950698e6f15b0f549b64c6464a24546c280535abb45 SHA512 4cc03cfc6776aa6a716fed0773a6e35d013fecc1925a093ecce31d01e37bc02d70bc8d3b47377becdb984e35fe7d81989bf6c1c05785656ff1f42624d0c796f3
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.10.0.ebuild b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
index f7ea0d8471dc..3f68591007d6 100644
--- a/net-misc/modemmanager/modemmanager-1.10.0.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 user readme.gentoo-r1 systemd udev vala
+inherit gnome2 readme.gentoo-r1 systemd udev vala
 
 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
+RDEPEND="${RDEPEND}
+	policykit? ( acct-group/plugdev )"
 
 S="${WORKDIR}/ModemManager-${PV}"
 
@@ -97,8 +99,6 @@ src_install() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	use policykit && enewgroup plugdev
-
 	# The polkit rules file moved to /usr/share
 	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
 	if [[ -f "${old_rules}" ]]; then
diff --git a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
index 52d42ead5c7b..7457b97ba8a4 100644
--- a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 user readme.gentoo-r1 systemd udev vala
+inherit gnome2 readme.gentoo-r1 systemd udev vala
 
 DESCRIPTION="Modem and mobile broadband management libraries"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
+RDEPEND="${RDEPEND}
+	policykit? ( acct-group/plugdev )"
 
 S="${WORKDIR}/ModemManager-${PV}"
 
@@ -97,8 +99,6 @@ src_install() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	use policykit && enewgroup plugdev
-
 	# The polkit rules file moved to /usr/share
 	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
 	if [[ -f "${old_rules}" ]]; then
diff --git a/net-misc/mulk/Manifest b/net-misc/mulk/Manifest
index 19ca9c0ce441..28e9ab696ed3 100644
--- a/net-misc/mulk/Manifest
+++ b/net-misc/mulk/Manifest
@@ -1,6 +1,3 @@
-AUX mulk-0.6.0-large-file.patch 867 BLAKE2B 2ebf6dd4ddd4e4bfb0e8ced95844064d956f67374177ad11e0d8795176755523e35bf81110087fe9bf34594aab785878992f76d277178e657ab2c2a02f501516 SHA512 8018cacc3713474c5033aaafbae314136a448a10c13e4b49630a1808c2f1a14d3b22c79229a54e661cebfb59051cdbf29ccede72f2dc3265614d635d1ada16ae
-DIST mulk-0.6.0.tar.gz 459141 BLAKE2B f63d2d78128e9f9cfa39107ec294d49d401fffe37883be41b9bab391c70751de1fdb955683c85f9491b0739c3e99fcde3525c54fcb3beb2e280851eac0c98d29 SHA512 9e42add34305b071ac5132c645be75d3666e2a47b6b3a7c7eb46b1fbc130db85bccdd31dd54586b20c4d3629f000219c630511d6f2a59d241d60afce2cfeee37
 DIST mulk-0.7.0.tar.gz 487995 BLAKE2B 446cf6652f7a1736dc1fbadf7a4fca8941507fa02abdc6ff3871e1cbb7dcd341e00be03c0e0b860f4cfe70ce1241a90adbae15e947e958fe37fd206863aaa01e SHA512 e1c6cf14b0ee2e42d83c8ad33d011feec9eb192ea4f8495cc67926db934d7ac132dfea66e40c47844965321573bd5b0734e4b19fe34c97c38170ee0cf4643499
-EBUILD mulk-0.6.0.ebuild 808 BLAKE2B 0f74eac84b91c0fd46504130291bc32c1717907e2f2412e46cd945231e6683e40a2648a07a8ddeb6c977c3bb7979c769b681ed48f05fb8b3b3dc47e0040a74bc SHA512 b19c6d6ac579f72fb128cae2ff6c7b39718942945866e1e2c84bcfeb513eb361895e10ccefe6e32151b87baff5bbe7c1830b03a2b2a900a6740c27ced35ea445
 EBUILD mulk-0.7.0.ebuild 758 BLAKE2B 1bc5c95884921369679b10ac05a639997fe76ada83803eaffb397c3826bb49f985b579f7263b202a84228615e7c5e7395f404868e541237360c0db86c1e314a2 SHA512 8cbd690937d3e4447e3b86a2667d89c740d59463c74578654cd52863b6dcbb2a2ef9e6091700a59996c688a0328d5500be1e80a737a18f0c6908f53faee71faf
 MISC metadata.xml 446 BLAKE2B f58d02b9addd2437ec243d741627a52a72192583a4f2b99df560d9681d6486811c52149678161f5bdb8055b071fb1565cdc52fd07c136854a4c7180f764e2cb7 SHA512 8d36ae10e4da6a5a6aab41ac25d6e85dfd9b2dd1e976f771a330aa175a30e932d6e40e86ca32751e9c89b227a173757da647465c59f3de5659abaeae66e1fb20
diff --git a/net-misc/mulk/files/mulk-0.6.0-large-file.patch b/net-misc/mulk/files/mulk-0.6.0-large-file.patch
deleted file mode 100644
index 801433080e46..000000000000
--- a/net-misc/mulk/files/mulk-0.6.0-large-file.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: mulk-0.6.0/lib/defines.h
-===================================================================
---- mulk-0.6.0.orig/lib/defines.h
-+++ mulk-0.6.0/lib/defines.h
-@@ -41,6 +41,12 @@
- #include <stdio.h>
- #include <string.h>
- #include <time.h>
-+#ifdef HAVE_STDINT_H
-+ #include <stdint.h>
-+#endif
-+#ifdef HAVE_INTTYPES_H
-+ #include <inttypes.h>
-+#endif
- #include <curl/curl.h>
- #include <curl/multi.h>
- #include <uriparser/Uri.h>
-Index: mulk-0.6.0/lib/m_malloc.c
-===================================================================
---- mulk-0.6.0.orig/lib/m_malloc.c
-+++ mulk-0.6.0/lib/m_malloc.c
-@@ -34,10 +34,6 @@
- 
- #ifdef MULKDEBUG
- 
--#ifdef HAVE_STDINT_H
--#include <stdint.h>  /* for uint32_t */
--#endif
--
- #define HASH_TABLE_SIZE 131072 /* 2^17, use always power of 2 */
- #define HASH_CHUNK_SIZE 2048 
- #define INC_INDEX(i) i = ((i == HASH_TABLE_SIZE-1) ? 0 : i+1)
diff --git a/net-misc/mulk/mulk-0.6.0.ebuild b/net-misc/mulk/mulk-0.6.0.ebuild
deleted file mode 100644
index af8c80b6d579..000000000000
--- a/net-misc/mulk/mulk-0.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit base
-
-MY_PV=${PV/_beta/}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Download agent similar to wget/curl"
-HOMEPAGE="http://mulk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="checksum debug metalink"
-
-DEPEND="net-misc/curl
-	app-text/htmltidy
-	dev-libs/uriparser
-	metalink? (
-		media-libs/libmetalink
-		checksum? ( dev-libs/openssl )
-	)"
-
-REQUIRED_USE="checksum? ( metalink )"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-large-file.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable metalink) \
-		$(use metalink && use checksum && echo --enable-checksum)
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index c0db81594cf1..637a5430677d 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,10 +2,6 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
-DIST NetworkManager-1.16.0.tar.xz 4793620 BLAKE2B 554559eefbfa489cf01067bd2c32e4b06fed076d38920b41f2d0005873ff913c0af2babcc3d9b463a4b636ca82e5c27ee20ab5768fcfb2c6b79e003d7fdc224d SHA512 e9d8365d8e59e5bc7c0bc13482139fb96b1d87183c8884e71e84eaf05fe121f2bcac519edd916bd242be4e9a9e2d2140a1065f529a9a02bda87b6d2bd4192584
-DIST NetworkManager-1.16.2.tar.xz 4820392 BLAKE2B f85fa4ff27cb2f0fc7d58052c810d4c20ca51d6e77e400c44270f941de6b4878b0c645053b9ffb02c3587b6c7b17631f9a6c6c15b630da4747051e1745d1dae8 SHA512 b3e874786d0bce58b967677fe82980aac58023fd4e913345acb63d7a7f253cd8fa6c044e788dd337a52f0fb026ce5fbd333d738dc9c3644d696e85498120f6d2
 DIST NetworkManager-1.18.2.tar.xz 4872252 BLAKE2B 8a3fa74837a6cf2a09af807b9bd164c949d31efb81fc212485f49e24f0a215ff06db10c4259712f6c51d7480bda1b53457bf50bda9b2df8330891e8c8ba394c8 SHA512 a220d856632693298af0bd23ae4393ee597684fcae400c8ed35bae5e543bcdbd0b0e879f4a7587b674ae86c5fdfbee955acd0fb6226cb95ed31372cb7c222814
-EBUILD networkmanager-1.16.0.ebuild 11106 BLAKE2B 2ad8ff5ee0069946ed60b644ac8beb24167ba6da6bb5d8ddcef09d7b4187974efb62ef867d98b746b7910005a3dc89ffba5b263ffdcb2260a92463658b4fefcf SHA512 db17cab0f2ae56802f57e5f785ba11f5b3391a6a595c9ff773ace9b75d0d36df260fd5ef1ba6ec5d5f3539645bc2c5c03af628df89cb830861526da078b6e619
-EBUILD networkmanager-1.16.2.ebuild 11131 BLAKE2B 0ce19eba230f3608d09c4a6664e4d877711e683b6fecdabfaf5876ebfe924f6ced3445881f99cd90003e17482f90cd6d8ef24d3c0b1541afe5cc9ee510ec1c47 SHA512 40f15c6ed60d0c931b8b882e99a32a4daf795f40939a8e8b8826ede4fdacfd204efbbc4e3f82ffec4e5ee6d4ad0c54b435e5d3301cf7c6486663ad3ce65b6a62
-EBUILD networkmanager-1.18.2.ebuild 11126 BLAKE2B 0490cfa37f7423edc94e7b5b650c6d1986c0dd450413bd5031add0b6585e134a26f29f3306ee6198feba3b22191d774cfba7bd73cabc87e359be2bfe8678ad74 SHA512 0f041e6faa53cd4ecd6a07c0b8aa7e4d43594d9a89d96115265a9198be5449e2cb3bbe8312f01237b7aabad5cb6853d8d56ef1803ce119f76c7b8d68f3c7a318
+EBUILD networkmanager-1.18.2.ebuild 11121 BLAKE2B 1599674ae5a7eba5a71051cb407389426861ebe5028fa495bc069a2cd7e0921d380356b3a9a648dc4f83c3a2c86edf88cc945ab986a29c6c45346f646597d8cc SHA512 00ae391ff577b8b0c74db9ff0603e54a643c9f3eeb462266f413470bfdc7744bfb460bdbd4ce8555428202529be909578760dbbce46362a2d24854eca9cb356f
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.16.0.ebuild b/net-misc/networkmanager/networkmanager-1.16.0.ebuild
deleted file mode 100644
index 4ab48bffe5d5..000000000000
--- a/net-misc/networkmanager/networkmanager-1.16.0.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
-	user readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		linux-info_pkg_setup
-	fi
-	enewgroup plugdev
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--disable-lto
-		--disable-config-plugin-ibft
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
-		# still not ready for removing that lib, bug #665338
-		--with-libnm-glib
-		--with-nmcli=yes
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	if multilib_is_native_abi && use policykit; then
-		myconf+=( --enable-polkit=yes )
-	else
-		myconf+=( --enable-polkit=disabled )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-			libnm-util/libnm-util.la
-			libnm-glib/libnm-glib.la
-			libnm-glib/libnm-glib-vpn.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libdeprecatedHEADERS
-			install-libnm_glib_libnmvpnHEADERS
-			install-libnm_glib_libnmincludeHEADERS
-			install-libnm_util_libnm_util_includeHEADERS
-			install-libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmvpnHEADERS
-			install-nodist_libnm_util_libnm_util_includeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.16.2.ebuild b/net-misc/networkmanager/networkmanager-1.16.2.ebuild
deleted file mode 100644
index 777cf71c6036..000000000000
--- a/net-misc/networkmanager/networkmanager-1.16.2.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
-	user readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=[${MULTILIB_USEDEP}]
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		linux-info_pkg_setup
-	fi
-	enewgroup plugdev
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--disable-lto
-		--disable-config-plugin-ibft
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
-		# still not ready for removing that lib, bug #665338
-		--with-libnm-glib
-		--with-nmcli=yes
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	if multilib_is_native_abi && use policykit; then
-		myconf+=( --enable-polkit=yes )
-	else
-		myconf+=( --enable-polkit=disabled )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-			libnm-util/libnm-util.la
-			libnm-glib/libnm-glib.la
-			libnm-glib/libnm-glib-vpn.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libdeprecatedHEADERS
-			install-libnm_glib_libnmvpnHEADERS
-			install-libnm_glib_libnmincludeHEADERS
-			install-libnm_util_libnm_util_includeHEADERS
-			install-libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmvpnHEADERS
-			install-nodist_libnm_util_libnm_util_includeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.18.2.ebuild b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
index 0e98e4e8353b..4342ec029bab 100644
--- a/net-misc/networkmanager/networkmanager-1.18.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
@@ -7,7 +7,7 @@ GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd user readme.gentoo-r1 vala virtualx udev multilib-minimal
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
 
 DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
 HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
@@ -26,7 +26,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
@@ -70,6 +70,7 @@ COMMON_DEPEND="
 	)
 "
 RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
 	|| (
 		net-misc/iputils[arping(+)]
 		net-analyzer/arping
@@ -141,7 +142,6 @@ pkg_setup() {
 		CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
 		linux-info_pkg_setup
 	fi
-	enewgroup plugdev
 	if use introspection || use test; then
 		python-any-r1_pkg_setup
 	fi
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index f91a837c1056..d544e9202ddc 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -5,7 +5,7 @@ AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b454
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
 DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67fd9fd16564323ce825cb9e36d7d5fb48a38b734600286cbd039f41f296d9e488e25d2680f08412aa983101987b SHA512 1b74e7cb87e189137e1b66b52ce89498e0061a10abf017c36bfdecb4aefe9c3fb6e8fd7819a9f822fb946dca6ae20ee724b2aed35e03d73f8e3015d8818d02db
 DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941
-EBUILD ntpsec-1.1.4.ebuild 4190 BLAKE2B 640c6715ce923db7dee32faeb37a25263a84b09400a46c3700cf3a6b4ab6fe8433f14beccbd848d159b1a80659b472213f4d1733c4f6c3cbf046269f2cf1afb0 SHA512 7956cdb4e185ed50a6ee96d1d9b56b512e0b1be7af21020b97ece7c8663f048bf2fa89f466429e58785523708d48e308ffbb15e3c0490a104323005f67e145a8
-EBUILD ntpsec-1.1.6.ebuild 4148 BLAKE2B 576f7c59c43afffb32920db2726aeae99b723c071ffa2cf2a567718896a1c65b8bba6d7aba8df2f9e60e53500ed8e9e1e589bc5b144d2ea40d8dac86a4cb9f66 SHA512 276f3cc96dcc1be5f85477860b139fe8b7e663cda04eeb3dbfa2aeb75124ef9b263fdeec88db1090b8547b65a4e0a83a98944df761754f88c07ce76281330c3e
-EBUILD ntpsec-9999.ebuild 4148 BLAKE2B 576f7c59c43afffb32920db2726aeae99b723c071ffa2cf2a567718896a1c65b8bba6d7aba8df2f9e60e53500ed8e9e1e589bc5b144d2ea40d8dac86a4cb9f66 SHA512 276f3cc96dcc1be5f85477860b139fe8b7e663cda04eeb3dbfa2aeb75124ef9b263fdeec88db1090b8547b65a4e0a83a98944df761754f88c07ce76281330c3e
+EBUILD ntpsec-1.1.4.ebuild 4130 BLAKE2B c14e7e7d1bf4d4f840b9e555cfe13b967824901ce1b5dc021be0fb9d0cdb53a358e1e73037bab9e251400238d99a9f2fac69c48232df2d8c49bf105927b363c5 SHA512 a40332b0d7621e905099dbffe43e336a8b32e842d888c15eac07e87de9bc89cedf23eef2e04681704a8011b84965b9a6c294eba7dfb5df5b10883b973e322984
+EBUILD ntpsec-1.1.6.ebuild 4088 BLAKE2B 80075131dd2cae62f97508c4e54e51a89c819616f487e7e3d63103d3deef03ad7e5fe09742a2230a30d8d817061da0551eb15cb802d9f2bddcfadb88868ae427 SHA512 728819a43dc5bfa8815cec23deeeeb81f5a54cc3d9c870b1d6050970225aa643fb19165e6dc9d5ae051ed40e3bdaaf9fc41aced473a193c576e8c4ff4525b885
+EBUILD ntpsec-9999.ebuild 4088 BLAKE2B 80075131dd2cae62f97508c4e54e51a89c819616f487e7e3d63103d3deef03ad7e5fe09742a2230a30d8d817061da0551eb15cb802d9f2bddcfadb88868ae427 SHA512 728819a43dc5bfa8815cec23deeeeb81f5a54cc3d9c870b1d6050970225aa643fb19165e6dc9d5ae051ed40e3bdaaf9fc41aced473a193c576e8c4ff4525b885
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/ntpsec-1.1.4.ebuild b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
index ed5401217aaf..fdf4cc4b9cc2 100644
--- a/net-misc/ntpsec/ntpsec-1.1.4.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
@@ -32,7 +32,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
@@ -41,8 +41,7 @@ CDEPEND="${PYTHON_DEPS}
 	sys-libs/libcap
 	dev-python/psutil[${PYTHON_USEDEP}]
 	libbsd? ( dev-libs/libbsd:0= )
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
+	dev-libs/openssl:0=
 	seccomp? ( sys-libs/libseccomp )
 "
 RDEPEND="${CDEPEND}
diff --git a/net-misc/ntpsec/ntpsec-1.1.6.ebuild b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
index cbf16e45b9f8..7cc6f74f6d34 100644
--- a/net-misc/ntpsec/ntpsec-1.1.6.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
@@ -32,7 +32,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
@@ -41,8 +41,7 @@ CDEPEND="${PYTHON_DEPS}
 	sys-libs/libcap
 	dev-python/psutil[${PYTHON_USEDEP}]
 	libbsd? ( dev-libs/libbsd:0= )
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
+	dev-libs/openssl:0=
 	seccomp? ( sys-libs/libseccomp )
 "
 RDEPEND="${CDEPEND}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index cbf16e45b9f8..7cc6f74f6d34 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -32,7 +32,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
@@ -41,8 +41,7 @@ CDEPEND="${PYTHON_DEPS}
 	sys-libs/libcap
 	dev-python/psutil[${PYTHON_USEDEP}]
 	libbsd? ( dev-libs/libbsd:0= )
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
+	dev-libs/openssl:0=
 	seccomp? ( sys-libs/libseccomp )
 "
 RDEPEND="${CDEPEND}
diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest
index 15c751660560..bc12e2937132 100644
--- a/net-misc/nxplayer/Manifest
+++ b/net-misc/nxplayer/Manifest
@@ -1,10 +1,4 @@
-DIST nomachine-enterprise-client_5.0.63_3_i686.tar.gz 28334138 BLAKE2B e90a6babe93a25da1a86d7a06bf0b6371857042fa9e1a97c5b18e7b7e8b2161be4a87d8b9e7068f1efe48406987c1f361fc579d28a69fa919a258c02a9fe6188 SHA512 27cde31a8805862617e898bf27eec99c9d848d455aea5e021e99da5cf920baf45d487bbeef75cd98142c6e65fa299ce6fc8c40ce8370f69698db6e0d6f00d937
-DIST nomachine-enterprise-client_5.0.63_3_x86_64.tar.gz 29300554 BLAKE2B bab6a47216207cd6a9e4705cec7829bfb504ca0b8fa29eb5a5941eec24df5c8456e8aa7704c91cc44b113de2609ae3229e698f90c96090c016586da9e14734f7 SHA512 aa9e37b4a9b52e534289f4879be2c98ee7db6aa0379270a1a757bfc6bc3550a258987c365329732f162ebd26d0b442649756c33426e28bb2c84c041d88f3eea0
 DIST nomachine-enterprise-client_5.1.24_1_i686.tar.gz 28378074 BLAKE2B a377dca915d6955d10d517754675a85a674e12088c1205adc6b99cc86685ec3551221cdd897f51f7f9da519388f9bd214c9828e530555202e1dd7506f1a02f42 SHA512 9ac3ee63a2c9dd7d6a110924a92718c7a9738e5bfbc7a3a30b2060a64c5eaeab3597e0d0532890e0e463869e47781528b6c7006d96634bf819cdd2415e35015c
 DIST nomachine-enterprise-client_5.1.24_1_x86_64.tar.gz 29381273 BLAKE2B 491224421978a687a65a440ac069dfdef23cb8802872d51b1d2ae2e729696d85f082cfb6faf04e5dabf1bacb05849423003424738c755c1e043292d7b678d2f6 SHA512 18bbba7d729fd1ade04ad2d4812bd4b1bbe806036b44cbb8f9648e8bfa32008d72bc85d380fe1fc352ce92de50104fc43da030d56349502ac46a7ed6fa6afc42
-DIST nomachine-enterprise-client_5.1.7_6_i686.tar.gz 46115 BLAKE2B 36680839be172741405cad06d33bef6d9ea69360dd26c88b84bdaa15c9efc57ba934378277a7d9725f96bf70db1e6eda23b43f72417aefc10290804832bb26dc SHA512 97cc898063a4c27ec0eb6924fa0b778b4a7844b7bb9884477fc42c7407ada16182b2e48e0d45c5e21405afaf092a7fd9934446e7d15d63b35ff59e476d90c79e
-DIST nomachine-enterprise-client_5.1.7_6_x86_64.tar.gz 29373847 BLAKE2B d725a695b6c46630898ec8728750ce59103e5f6f763ee3c4d2d2448c44b70ca99d1c29945dbaa7fa32d899c43f3cff9a922d868bbb87e830a715b93f78ed4b45 SHA512 a297fae2a81ce0add4042caba05e2f5d0779f312a91ad9bc71e6498363fad2ec45f40a638b9b6dc1daea986f30dd6bff27896b74ae7ebf3a4cb37abeda126b2e
-EBUILD nxplayer-5.0.63.3.ebuild 1075 BLAKE2B 42b10a0a6c1459edd1863c2d5c90f3bbb5e6754e38d56921cf0bf7f5feaccc1e325a5a148bdca2b3c6dae8b599051534228989a0950332804019929d1946f4eb SHA512 50e8e4cfd30bc2b41a3ef5f5ca57b67b31f36b80f95ffd972034efbd25c999ba22112632760a5456c195ea30af78f1270b9b9f4be6d016dc54cce12de9e0f7be
 EBUILD nxplayer-5.1.24.1.ebuild 1075 BLAKE2B d4a0e827478a0d1be055e79724801cd5d3b779f04e727db79fb0434c609eaaf4a7cb78d65ccf0fd0c7c244e6ad7a57b9de68acfe3d4fcbba9ba5a4ff8bb4db44 SHA512 0a2defd467a465d57ddcf7aace9089997a236fe5a8a46e8733073532bd534f55ace6b8712ac78b52318fc5a05dd19a5fc4f83ca27475aeb4f4c0f073eb1f7a97
-EBUILD nxplayer-5.1.7.6.ebuild 1075 BLAKE2B d4a0e827478a0d1be055e79724801cd5d3b779f04e727db79fb0434c609eaaf4a7cb78d65ccf0fd0c7c244e6ad7a57b9de68acfe3d4fcbba9ba5a4ff8bb4db44 SHA512 0a2defd467a465d57ddcf7aace9089997a236fe5a8a46e8733073532bd534f55ace6b8712ac78b52318fc5a05dd19a5fc4f83ca27475aeb4f4c0f073eb1f7a97
 MISC metadata.xml 665 BLAKE2B 273027a6bd397147d76478c2822ab78a6fdd381074e34af1d410b68fbcbb12d0ca65b3f4ccbac09c7b9582630cd4345724b1b669eed16d1e94ba567d99344472 SHA512 7c07aeac4fd7ef22c8ffbb383715c0cc56643345a789cf01f9f436db667ae1ee06a3261f81137101cbdd1275ea8f3b09c440cf10e4b1b88f09e1e1a8be5db6f0
diff --git a/net-misc/nxplayer/nxplayer-5.0.63.3.ebuild b/net-misc/nxplayer/nxplayer-5.0.63.3.ebuild
deleted file mode 100644
index 2b4388cdf433..000000000000
--- a/net-misc/nxplayer/nxplayer-5.0.63.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator
-
-MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)"
-
-DESCRIPTION="Client for NoMachine remote servers"
-HOMEPAGE="https://www.nomachine.com"
-SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz )
-	x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )"
-LICENSE="nomachine"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="dev-libs/glib:2
-	dev-libs/openssl:0"
-
-S=${WORKDIR}/NX/etc/NX/player/packages
-
-QA_PREBUILT="*"
-
-src_install()
-{
-	local NXROOT=/opt/NX
-
-#	dodir /etc/NX/localhost
-#	echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg
-
-	dodir /opt
-	tar xozf nxclient.tar.gz -C "${D}"/opt
-	tar xozf nxplayer.tar.gz -C "${D}"/opt
-
-	make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin
-}
diff --git a/net-misc/nxplayer/nxplayer-5.1.7.6.ebuild b/net-misc/nxplayer/nxplayer-5.1.7.6.ebuild
deleted file mode 100644
index 67c1b6331100..000000000000
--- a/net-misc/nxplayer/nxplayer-5.1.7.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils versionator
-
-MY_P="nomachine-enterprise-client_$(get_version_component_range 1-3)_$(get_version_component_range 4)"
-
-DESCRIPTION="Client for NoMachine remote servers"
-HOMEPAGE="https://www.nomachine.com"
-SRC_URI="amd64? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_x86_64.tar.gz )
-	x86? ( http://download.nomachine.com/download/$(get_version_component_range 1-2)/Linux/${MY_P}_i686.tar.gz )"
-LICENSE="nomachine"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="dev-libs/glib:2
-	dev-libs/openssl:0"
-
-S=${WORKDIR}/NX/etc/NX/player/packages
-
-QA_PREBUILT="*"
-
-src_install()
-{
-	local NXROOT=/opt/NX
-
-#	dodir /etc/NX/localhost
-#	echo 'PlayerRoot = "'"${NXROOT}"'"' > ${D}/etc/NX/localhost/player.cfg
-
-	dodir /opt
-	tar xozf nxclient.tar.gz -C "${D}"/opt
-	tar xozf nxplayer.tar.gz -C "${D}"/opt
-
-	make_wrapper nxplayer ${NXROOT}/bin/nxplayer ${NXROOT} ${NXROOT}/lib /opt/bin
-}
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 9a00e1ec9706..22fb99bff23b 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,12 +1,9 @@
-AUX change-umask-from-002-to-022-in-CreateDir-macro.patch 1985 BLAKE2B a3254e101ed22afc6ee75c680442e59f29f5df65a1cf3a75f21500c4aaa65a28506cd037ce4d6402837a12c948c17b56b9a79255458a197464370ce0a1735f0b SHA512 cc2fb4c3bc9e10aea73b65623b679f930a668ef758392e0d67a0a0a7e46b15df788fa7668b788d0b356fe367399f70f0012e1ca99b0a9e7452608d07d8db9e05
 AUX ldflags.patch 452 BLAKE2B c2adba2e1cb395eb2261397acc879ab8cb82ef776cfd5e53411761d1ebf91017cd5bbe14654d814798149d2838efc90979273a406d8ab8c72b343e8453d8ec5d SHA512 472d66b3071de94d4753773092c4781f5b4419041dc23b777bc13e8e4f4a1a40f245931479fc294c43a9e73f322e93b2055fb52a1070423d58dd32f23b0f61ca
 AUX omniNames 571 BLAKE2B d1a151abb6faf582478e3892b7b057f92263fa0278cb3f3fb82fec20ba60b3e40733fcc2b223286466c9f4eb60fbe49cd9ce239f95e7e1cccb5b5b1df2e88893 SHA512 98f08cd0bef699bdd8da026efbf211c5bf8dfa5bb24bd4438581dd4acf6cbabdb42e19de5a5d8ae9db74bafea86fb316ff75f3278c255cab7277f95681578044
 AUX omniORB-4.1.4-format-security.patch 557 BLAKE2B 3aef2fdebedfdaf91cac169aa04715c37509e6d86bfc03a0171af238e232f3d2b9b59e69f2a01c6b35d291a4dba199ec6cf2c80203ee58478318ca0fb5a89f58 SHA512 f2d9ca53f9dcdac7fc0224e435ee7d4eecaf5c948d406f94e81a9ae7770d192b18e846ddd245c5b74e77efb7030902b9f2817b13349f2a685caadb05633e14ee
 AUX omniORB-4.1.4-openssl-1.patch 770 BLAKE2B ffdb15d5e48ae4cad6ee0c75334c48634f450a9f128fe84b3a345ce72f4be551e203ed21978dbd0381b610b98cc64375dd4bd873a33b9403374980b7e17b1264 SHA512 b43adc69ec30a3a1cf6581e050ca93927b267c67623aafdb53db0135a8d4164c779a9d54249c8672e5d8f1c761681092be3c2908cb772820d019db1e2b1ba396
 DIST omniORB-4.1.4.tar.gz 3093814 BLAKE2B 6f85ff31f55533eac779554a165346fa693c41e261650f22c5d1889de731a5ca3b09d178945dee89b80553a81e7a9db3286efd465b4aafcb7c19e5dc5de5d105 SHA512 0ed989dd9a8c024a575ebbe1def137d11c4e52297727883d26cb1fdc87d2965e6d0152ee4b7b90097f2d97eb22501bb968eff0d070e88f80a9fef6b7439e1a1c
-DIST omniORB-4.2.1-2.tar.bz2 2663504 BLAKE2B 3a5a48e7d85b5815b576067f16cf602ff9a44e547e4350d25d8ae43d8063e1bccb3da88eed09328224c88420870a64f331e6198f2f8911f4a718322ffcd3a8e0 SHA512 574bbc66f9eee87f06500c798e034a289e6104b3a921c8e956231c5c042a3306016b2aa69699eadef25edb97bed7580f7f27beec3893582a1ba16bb01f934fd6
 DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11943a54c20d53987d9775f04833d5d2dbeb99e5bdcc59d56f116cfb14b9ae92399323e3980a44d9cef47a012c24f SHA512 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad
 EBUILD omniORB-4.1.4-r2.ebuild 2184 BLAKE2B b35249c5020bb321c91e7327edba33f7325a93352eba985cb695c0d62cf5fd13ed62529900197c43c5eb7aaa7c5ec8a901e67766c2ddae65eb687334ece63c8a SHA512 a4d08d26cdf8b7fbee13bed2a92eee52190ccdba863a46f8b87cd210fb212ef2eb85a0a84ec1e6895f360d3b1ae76d91c2f15a322bf85e0e35759d4c659185af
-EBUILD omniORB-4.2.1_p2.ebuild 2868 BLAKE2B 9e04f87b95f12c8c07910bc56a25a69d7896b655283d9e0197b43672ea8138b7cd4bd81997c8aa3e5a8ce2294f3cd70b26b5cbe80abc76eef3c1a3655e7f2214 SHA512 cd5b8534d4a9c6a745e2c6d3d51c69b7c9521ff8d46a93461f09cc5b113645357496ab42f597bc3de45c642c523bb512a70150a336c33c499127864c4f4bda60
 EBUILD omniORB-4.2.2.ebuild 2715 BLAKE2B 82966544593b19da2b9db6c8eb723f51d423cc26e2f4b6cae90779c9b8f45078660dd14848993cd78ee4bc8f7b303d868160e5485edca03e96861be39ec91b88 SHA512 6a35c3279d3ce09f462f166cc3c761fc36dae0fa6c30b632af4beebf944a3f4e47699b082696a2dc044982504f94000f3d28a62aaa80af4750a99e3a771a5002
 MISC metadata.xml 247 BLAKE2B c2c840442760456aa29eeda2b225baa3eca5af75444074a09d500b1063f59ce978b5053c0d79fb7cd3717a477ef8e8e343dcf731a5a99e27058b0528c5066a4f SHA512 d76af24fd2513c0ed4a1f3066c9e9b9eb6407d1c013f22b3bcc9646fb771560c45c42c3851075ce9aa32bfe6ef68534cf1ccd3fefc9657fdb0b2794424ab8d1f
diff --git a/net-misc/omniORB/files/change-umask-from-002-to-022-in-CreateDir-macro.patch b/net-misc/omniORB/files/change-umask-from-002-to-022-in-CreateDir-macro.patch
deleted file mode 100644
index 2aaab59ef201..000000000000
--- a/net-misc/omniORB/files/change-umask-from-002-to-022-in-CreateDir-macro.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2a0ea5621ef7cd9303e49657166dfd04ffa624d7 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 16 Aug 2016 13:55:08 -0400
-Subject: [PATCH 1/1] mk: Change umask from 002 to 022 in the CreateDir macro.
-
-The build system has a macro called CreateDir that does more or less
-what you'd expect. But before it creates the directory given to it, it
-sets the umask to 002. This can be a vulnerability, since we don't
-know who the end user will be building the software as; there may be
-untrusted people in his default group. In that case, one of those
-people can overwrite the scripts in the directory created by CreateDir
-before the user executes them.
-
-There is a kernel-level workaround for these types of vulnerabilities
-in the Grsecurity project called Trusted Path Execution (TPE). When
-enabled, users are not allowed to execute files in directories not
-owned by themselves or root. When that restriction is enabled, omniORB
-fails to build (due to the aforementioned umask).
-
-This commit changes the umask to 022 in CreateDir. This should not
-cause any problems (ha ha), and is safer than the previous umask of
-002. It also fixes the build on systems where TPE is enabled.
-
-Gentoo-Bug: 576040
----
- mk/beforeauto.mk.in | 2 +-
- mk/beforedir.mk     | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mk/beforeauto.mk.in b/mk/beforeauto.mk.in
-index 83d544c..9f65c69 100644
---- a/mk/beforeauto.mk.in
-+++ b/mk/beforeauto.mk.in
-@@ -167,7 +167,7 @@ unexport SUBDIRS
- 
- define CreateDir
- if [ ! -d $$dir ]; then \
--   (umask 002; set -x; $(MKDIRHIER) $$dir); \
-+   (umask 022; set -x; $(MKDIRHIER) $$dir); \
- fi
- endef
- 
-diff --git a/mk/beforedir.mk b/mk/beforedir.mk
-index f804ed3..855bc4d 100644
---- a/mk/beforedir.mk
-+++ b/mk/beforedir.mk
-@@ -187,7 +187,7 @@ unexport SUBDIRS
- 
- define CreateDir
- if [ ! -d $$dir ]; then \
--   (umask 002; set -x; $(MKDIRHIER) $$dir); \
-+   (umask 022; set -x; $(MKDIRHIER) $$dir); \
- fi
- endef
- 
--- 
-2.7.3
-
diff --git a/net-misc/omniORB/omniORB-4.2.1_p2.ebuild b/net-misc/omniORB/omniORB-4.2.1_p2.ebuild
deleted file mode 100644
index 46b2de01bec8..000000000000
--- a/net-misc/omniORB/omniORB-4.2.1_p2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# The build system picks one version of python and sticks with it. It
-# tries to guess your version (based on /usr/bin/python), but for
-# consistency we have to force it to use one that we specify. The
-# highest version the configure script will accept is python-3.3, but
-# that's on it's way out, so we prefer to stick with python-2.7 for now.
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-MY_P="${P/_p/-}"
-DESCRIPTION="A robust, high-performance CORBA 2 ORB"
-HOMEPAGE="http://omniorb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc ipv6 ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${PV/_p2/}"
-
-PATCHES=(
-	"${FILESDIR}/omniORB-4.1.4-format-security.patch"
-	"${FILESDIR}/change-umask-from-002-to-022-in-CreateDir-macro.patch"
-)
-
-src_prepare() {
-	default
-
-	# The OPTC(XX)FLAGS variables aren't present in these files, but we
-	# will set them when we call emake.
-	sed \
-		-e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
-		-e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
-		-i mk/beforeauto.mk.in mk/platforms/i586_linux_2.0*.mk || \
-		die 'failed to switch CFLAGS variables in the makefile includes'
-
-	# The out-of-source build is suggested by upstream.
-	mkdir build || die 'failed to create build directory'
-}
-
-src_configure() {
-	cd build || die 'failed to change into the build directory'
-
-	ECONF_SOURCE=".." econf \
-				--disable-static \
-				--with-omniORB-config=/etc/omniorb/omniORB.cfg \
-				--with-omniNames-logdir=/var/log/omniORB \
-				--libdir="/usr/$(get_libdir)" \
-				$(use_enable ipv6) \
-				$(use_with ssl openssl "/usr")
-}
-
-src_compile() {
-	cd build || die 'failed to change into the build directory'
-	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	cd build || die 'failed to change into the build directory'
-	default
-
-	rm "${ED}/usr/bin/omniidlrun.py" || \
-		die 'failed to remove redundant omniidlrun.py'
-
-	cd "${S}" || die "failed to change into the ${S} directory"
-
-	dodoc CREDITS doc/*.html ReleaseNotes.txt update.log
-	dodoc -r doc/omniORB
-
-	if use doc; then
-		dodoc doc/*.pdf
-	fi
-
-	cat <<- EOF > "${T}/90omniORB"
-		PATH="/usr/share/omniORB/bin/scripts"
-		OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
-	EOF
-	doenvd "${T}/90omniORB"
-	doinitd "${FILESDIR}"/omniNames
-
-	cp "sample.cfg" "${T}/omniORB.cfg" || die
-	cat <<- EOF >> "${T}/omniORB.cfg"
-		# resolve the omniNames running on localhost
-		InitRef = NameService=corbaname::localhost
-	EOF
-	insinto /etc/omniorb
-	doins "${T}"/omniORB.cfg
-
-	keepdir /var/log/omniORB
-
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/omniidl
-}
diff --git a/net-misc/pmsvn/Manifest b/net-misc/pmsvn/Manifest
index 85517e9b411d..b06348cb1cad 100644
--- a/net-misc/pmsvn/Manifest
+++ b/net-misc/pmsvn/Manifest
@@ -1,7 +1,3 @@
-DIST pmsvn-1.0.5.tgz 5867 BLAKE2B 13077a64affb6118d8f3761b2052bfbfce62c2e346735ba2d88695653ed92cb38c6f3fc738eedc56f90010e44351d1de7aba695ef01475f0e95d4d8d2dd510cf SHA512 0fc9d06a2911d361d004e7f809bce7292f4fb1ba79152defcede426a15a7792d70c05d527d7b1627c4094bcb3e180d77684e9c55aea7df5e4e1e821d943d0221
-DIST pmsvn-1.0.6.tgz 22021 BLAKE2B 7b9a71c0816694d617f1ad31f2a799d487ebe800f7c42e5d059b76a565fe80c2a3af791dfc8eda44f31c3e8128b8035906526262220b20ba599e073d6603db82 SHA512 e06ee3f43468a0fd71799b08ba3f1dc8dd26cfb1ea8d1409674418bfa27db0f095edb2b60f61ad6aeb68a9a3f76e987b52fb9b0c3d9d54d82c790668af68b541
 DIST pmsvn-1.0.7.tgz 7565 BLAKE2B 2af33cd57312ef9b6d3f46f429fe5ba9e103dba0b984a8c1901f52fcc26abd0fda0c23ca57272f73795529372531a219be85733c7c18fbd5e3273ef9ad2e4257 SHA512 1bf205ec142c6ea018b9f606a67fb97c87aaefa56e0dbd848db6c09f6ce6115856b94c2b75cc4e923be8d66b322ffd8adeca88bfe1d3cdcc72377adfed3976d4
-EBUILD pmsvn-1.0.5.ebuild 893 BLAKE2B 87b8c381bc1e48796c0b04858a9f8db77a7a9d5f85e8955a7deae624727125df018be21c233d974b442d66d909e14e067e00083c20d5db52aa79a23ff4ca6db3 SHA512 79218d8b8fb8bfbcbb2d752ca5fac74a8c6abc44443ae43d9e7b163c61ff0b4e1c88c2104abc614524e9f9c373b315f25bb538a574346ef112f353add5751ce7
-EBUILD pmsvn-1.0.6.ebuild 846 BLAKE2B 7a1312790142dd0875256315b84ab28813adc10d0d284b9b78db5d90a33d1f187967ada1e5a79e93d27ea657cffcbdfb921c07ec8d8a33dea7eed1e24a8cf1ef SHA512 a3f698fe2a94a8ea97ef77b53e2dcf4bf6561d94e0e25e7b7694e4cb09f88042ab2a9211bf555d9f6ea17d1550e8beced4a516fd37acca20718e81ad5f419097
 EBUILD pmsvn-1.0.7.ebuild 782 BLAKE2B af5fdce97b76f4c25b9fe39dbbe812c9b93b9913f3ee73bb2caa993e4c8df584ea33698101fbbdc0d3c7b04b0e0ac1b53f0d1b03bb3a12237ad5edde36be8638 SHA512 d3ebefd72550e338c5d67f9bcede8a339f528744da2de3e62fbb9f03f07b66987fd34a354fcc19f700c92ce310486466544a260c2b2f0d7be37f63f8c8ebaab2
 MISC metadata.xml 242 BLAKE2B 33fe71c26297e4323da4bc063f8eb4578e77d7bb1a8c7f2044f4624680a2efb008596d45780c2abfbb867258c42051f955798279d57f51ee7083a25fc15549d6 SHA512 4b9a6787713f824e4d7b7f54a8c4031c97b519fc2d92856486799a8e6ca0c5231cbf2c781723d79a5a736949ebe7c81c667af61a64aba3483b3dc4c3d55c2465
diff --git a/net-misc/pmsvn/pmsvn-1.0.5.ebuild b/net-misc/pmsvn/pmsvn-1.0.5.ebuild
deleted file mode 100644
index 10ce2da7ad48..000000000000
--- a/net-misc/pmsvn/pmsvn-1.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Server's configuration management and monitoring tool"
-HOMEPAGE="https://sourceforge.net/projects/pmsvn/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="net-analyzer/nrpe
-	>=app-shells/bash-4.0_p37
-	>=sys-apps/sed-4.2
-	>=dev-vcs/subversion-1.6.9"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	# move configuration file from /etc/${PN}.conf to /etc/${PN}/${PN}.conf
-	sed -i "/etc\/${PN}.conf/s:etc/${PN}.conf:etc/${PN}/${PN}.conf:" ${PN} \
-		|| die "failed to fix path for configuration file"
-}
-
-src_install() {
-	dosbin "${PN}"
-	dodoc README
-	insinto /etc/${PN}/
-	doins pmsvn.conf.sample
-}
-
-pkg_postinst(){
-	elog
-	elog "A configuration file sample is located at /etc/pmsvn/pmsvn.conf.sample."
-	elog
-}
diff --git a/net-misc/pmsvn/pmsvn-1.0.6.ebuild b/net-misc/pmsvn/pmsvn-1.0.6.ebuild
deleted file mode 100644
index 844512be8fff..000000000000
--- a/net-misc/pmsvn/pmsvn-1.0.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Server's configuration management and monitoring tool"
-HOMEPAGE="https://sourceforge.net/projects/pmsvn/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="net-analyzer/nrpe
-	>=app-shells/bash-4.0_p37
-	>=sys-apps/sed-4.2
-	>=dev-vcs/subversion-1.6.9"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	# move configuration file from /etc/${PN}.conf to /etc/${PN}/${PN}.conf
-	sed -i "/etc\/${PN}.conf/s:etc/${PN}.conf:etc/${PN}/${PN}.conf:" ${PN} \
-		|| die "failed to fix path for configuration file"
-}
-
-src_install() {
-	dosbin "${PN}"
-	dodoc README
-	# No sample file anymore. Autogenerated on first execution
-	# insinto /etc/${PN}/
-	# doins pmsvn.conf.sample
-}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 75ab6b0d7029..8cf4444eadf4 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -6,13 +6,15 @@ DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a
 DIST rabbitmq-server-3.7.10.tar.xz 2569968 BLAKE2B 90a0162c9e573f1b99526c7a6cdec38061c3e6f355377b51b920a62b0d61c5f13a21b69d627b49c4c6702e517dfba4c856664e9741d9ad2d21171a3b46770799 SHA512 092df82ac00397fc90ecd69c712985f055ec25fd0ba427fce9330df75f5fe6d788aabc9e25ccbf63c8c3cbe111816a226fb63479a16d8530a53b23ab23b2598e
 DIST rabbitmq-server-3.7.11.tar.xz 2593632 BLAKE2B 4455b47a36ed4b642f0c30a34d018f76ade7153ec8eb872728f0b6baf6d431dbac71b3e27e2661924155950836be80faee23d4fd663d0f852740c143ac24658c SHA512 a54034ebc919be0c6f58832ea5d47f8e3964e30ca9185c59bf882c3dc17d1df5b6e1ab0460f75e8cf0cc325504cc3a674f7cb44a5d7613e16a5ad8b721a286a4
 DIST rabbitmq-server-3.7.13.tar.xz 2595904 BLAKE2B 3dce5af3b63d84e1ab8ee02ba3f55560087e5f72532e693b483e8083e25d540406d696873b291dd715c45aae1e15945e76fcc33bdd77503c6517860b45f7e7b9 SHA512 33cc3682214782152e4e1270d1011e94df79b454abf6fcf9d56b73be1f8cf42ce0a4a559f243b4721ae25b10897c756960c655909bee2b427395d0f0b63a2fb9
+DIST rabbitmq-server-3.7.17.tar.xz 2808260 BLAKE2B 45a77ebb81d1199219b3638f03698d147b5dd43160647f829163ee35607a3d7ada281b7156f555614b1eec7295e32d241410b8a691bccab2f40f1c548d2e0b51 SHA512 33af52a3f95854e7b3e067308181e37c7b9715b24e0ceb690d606f3e69a8be9cab258a18b68681350c31a01e4fa530825473bf652c7ac10894d36af4fa573a38
 DIST rabbitmq-server-3.7.3.tar.xz 7382708 BLAKE2B 66d4c2fcb80ba5a851fb5d2bee91d41b04a05e70e74ac2b3adae8aebcaaa01de7ca47772c38deb4e9c25c19f67c2bbd6c4fb3b71480d73986540c60ab6dac02c SHA512 337edddceb66c44b5cc3cec710918385306d9db97ae340752bc39a1be39229a58b3bb1c96763a2ce441a6d46135f2aac8cec09fc33591d0e14e7571c9507d79b
 DIST rabbitmq-server-3.7.9.tar.xz 2551456 BLAKE2B b64037481254f39300fecf53c1f8eda69df3fdc92bbacc6f6edc9d89e167e4cdd0708482b0daf680366986a28f4a3562d4af7dcf427604acc79145d24ca41bd2 SHA512 4a9fd452ad878f20c3a269d2dc0fa63ef7dcf99d2ee1ca46ff693df8d92ae0ef5a05453a6aaaeb00db643b2209770b15216fdff109f27d1e531e363a99bd4a2a
 EBUILD rabbitmq-server-3.6.14.ebuild 2866 BLAKE2B 0750fb1c6968b6c97471a940ab2010c44cf4cb831ae06effdec756df77e72fd1a9a0557de56e89daa0ae65097ee6a39ca3f779f9ad3c7b94175a6800ec6cdc06 SHA512 c5804a6938ae7d9f429e9bcfc0325ae276e3deecf9329a850111f099c1206587954a47daee906848dfa0569caa220fe9afd3e43b7823b4db65d353ffd7cd427a
 EBUILD rabbitmq-server-3.6.9.ebuild 2861 BLAKE2B efc0b3acca1f57d4116a18475c923502febd6ecb4a95030be05bdf94bd726c2cb90a8a95a7a47cc390da3c6c66f84af1eec14279f235b6547d247d2a8437e4c0 SHA512 ebabcbe717134e17d16a1623ff05a7700d7825de626c25c4b2ad8510f0ac42ede1a37ddbfd367c198d6cb4b550f30294c64fd7cbebe64bf6ac0244c9de4dee50
-EBUILD rabbitmq-server-3.7.10.ebuild 3002 BLAKE2B 79711c2a8713661373d6bb34c91a5580255676d067c770073c77eb99ee3bf441a1416e64daff3acccdbec839864d694e6c9aba246bdc18529c65b203c6a91610 SHA512 8e4e02f70bd52215fc8d3a46510c2293607d9badc4f0e1ec9ca04a5825de84c7eafca5647cb63ea2d66fda615ddfb91654ad7948aacccd800ffd82380e1a9043
-EBUILD rabbitmq-server-3.7.11.ebuild 3002 BLAKE2B acf516d61dcf314336818dc5773e3248622e8a242afe65d48d075ecd25e3627d5f6aca7fac34f372fb66d08ce1c1d7874b1e06b9e7b183ff1e2dbeed2a17c27e SHA512 e5045a138bb87d96cffbf39b82baec2865f326ccb2b77d19cddf7e5b36378c67eeaeb31d09dad99aa5887c591aa67c7ceb8a53424f98fdc463991ca11a4bc4d6
+EBUILD rabbitmq-server-3.7.10.ebuild 3005 BLAKE2B c6a3f5d0161ff227f8b76e130b690010df3710b2952795b55a19e3081a0e293113fd534f10bf598c93ae517631e9c5971fdfc79586d0536f0d6e5656f1a2c241 SHA512 f61267f217f0271f05519aefff7f04992f93532818282cb65c1d2e0a7132cd51a44ae56aa085931ddd620304268cd5cf99381cfb4e0279dad13b521bcbb1c583
+EBUILD rabbitmq-server-3.7.11.ebuild 3005 BLAKE2B 7a297aaac0f5a47a8f6dc18b07751d04c83155409dd89e8a749c5b07b4df8d45c30e13a598fb5ec9fd106577b976bf4b6619e05e4b8eddb32a11e6ed81c2c0b4 SHA512 c1c67b2d603d69735d0ac8cac4431f909dc014642875c498a4aa9cd833ba1e0b840aa9c9cad58a31ca7c7179c2f89f21d705e0d08eff4f787db74393fa30d05f
 EBUILD rabbitmq-server-3.7.13.ebuild 3105 BLAKE2B 61175864b1b7eab693fdfcf16ff1178c87d37e966a44ed29e08d01242d16af099ef492eeb527e8181b06ceb2222736c354df34cb510dbcce6a929eba63696b05 SHA512 5896fa3e7a2865e42a3f5c485c55504ead488115334e220b489db9dec55d2537d2e12266d8507f6b73ef76b1dadab6ba56a86a092c590e0627478207cbc7f6bf
+EBUILD rabbitmq-server-3.7.17.ebuild 3107 BLAKE2B 9addb1aa27f75285878de8689555b079fc9a603c93b22226aa06cb84d9b9185ef5ed26fe8740a5cd776526c68b96792bf338494b5dabd5f80d1b749359bc58e8 SHA512 5f1da605aca09ab102cf3343b96c6db5a2b9cbc2b54f5ffedd547db1ee581b297b3955e668d497e7dc6842e56753be6e96af6b09c368e4d8df8e0d6e852ea64c
 EBUILD rabbitmq-server-3.7.3-r1.ebuild 2978 BLAKE2B 6f240a3325c446277a3779721dde982daa2528697118290c48d2ab108369fb781c538b19029662e6de632ace9d00d9c2f0df4e9686064af4174617efe71c27e9 SHA512 63f9528982875d523b2ef4f9c5a064b647c0edba6385ffe27372989cc962bae4167c60ab647eea338bebc7e4fc52b9063d477c5db5c83ad757e8432dc883aee2
 EBUILD rabbitmq-server-3.7.9.ebuild 2998 BLAKE2B 7c77aa3c5bde60e8ba67529591a9883337b30691a08d8256e168b2dc3bb95eb7d87645db57f065f47ffbc34036c519250a5261cf5f7db1fd9b8667f0fd8bd640 SHA512 9d3b4f8c4256433dc69ea6f3ff0968640a810cad780cb8bb971f76615248374f20b5eac129e0ddafde845a97430f7a7676243d5f6fb43879560e56edfe14a53a
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
index 7fd02de44fd3..a6aca3854916 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
-RDEPEND=">=dev-lang/erlang-19.3[ssl,smp]"
+RDEPEND=">=dev-lang/erlang-19.3[ssl,smp(+)]"
 DEPEND="${RDEPEND}
 	app-arch/zip
 	app-arch/unzip
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
index d1d04cce6ec2..edaf30210192 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
-RDEPEND=">=dev-lang/erlang-20.3[ssl,smp]"
+RDEPEND=">=dev-lang/erlang-20.3[ssl,smp(+)]"
 DEPEND="${RDEPEND}
 	app-arch/zip
 	app-arch/unzip
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.17.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.17.ebuild
new file mode 100644
index 000000000000..c403645186f1
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.17.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+# dev-lang/erlang-20.3 cloud be used but 21 is easier to specify as it always includes the smp stuff now
+RDEPEND=">=dev-lang/erlang-21.0[ssl]
+	<dev-lang/erlang-23.0[ssl]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	>=dev-lang/elixir-1.6.6
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	rm -v deps/rabbit/scripts/*.bat
+	exeinto /usr/libexec/rabbitmq
+	for script in deps/rabbit/scripts/*; do
+		doexe ${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/lib/rabbitmq{,/mnesia}
+}
+
+pkg_preinst() {
+	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "RabbitMQ is now running as an unprivileged user instead of root."
+		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+		elog "Please run the following commands as root:"
+		elog
+		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
+		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+		elog
+	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "Please read release notes before upgrading:"
+		elog
+		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+	fi
+	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
+		elog
+		elog "This release changes the behaviour of the default guest user:"
+		elog
+		elog "https://www.rabbitmq.com/access-control.html"
+	fi
+}
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index c7c4d9db513a..1593ed5ee445 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -12,4 +12,4 @@ EBUILD radvd-2.14.ebuild 1763 BLAKE2B ffe1ecff2d2fa70d7bfb9e8dd20fc7e15a017d8ce3
 EBUILD radvd-2.17-r1.ebuild 1575 BLAKE2B 327a7eb2dc9a567145a14f556e4e4bb7d35e0184b83d7336d963f3754c96cfc4d1bd8db85b074c6ccf547cf4331b2260ace20a05ee085eea895fd5088cd16e2d SHA512 d4df95d439844c4be3dd7df39609c762acb27a8f3b6db1dba081c1961e03289cf0fdb795bf1d10f20053bac9e587995944a70efa5c9d6e53ab0e7cc88c1d86b8
 EBUILD radvd-2.17-r2.ebuild 1628 BLAKE2B caaaedd5d8d132165e080f1ad9888c629a2cc44f7a75a0213cbd1ffa32fd50725ded8366eeb5ecf08ce2d3d5a8873730dca7f7aff7931e3aa2ea67dbaab4ef9c SHA512 7b1ca29b1537e18c66dcd7e6bf764df08e350b9006e589de9e5388684d12ff7532e1d4b86c36d1981da8760b766916ae33a010a1052c52d51010a4e3dd3a6206
 EBUILD radvd-2.18.ebuild 1585 BLAKE2B 4b7ee406b6a20b3ad44e1dbc01d47db91af0d6ea623e1939d6030c46aeeeb651a7d1e40ea1dc9a611c907ac77c7db34b0ec130b8946078c2bc6ab59d3fb568e9 SHA512 b715af5af67cb90b30e43f79392db9942124e099151c2411a885809f586eff843428a0546e7783971e9c535aba7d3e6131986cee511fc72d4f3ab3874f2c549e
-MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
+MISC metadata.xml 357 BLAKE2B 7a671f4f2fc8439f4fb80a70b5e436e9002464600ce9ad0c9aacdc22d7c3d090e26ac30431d39107ab1081f6238528b91e67d3e1e59a7ba64a85e92c584bc4d8 SHA512 d81daf7b68978a8012b5c5de47074fa35bfcd457f99ef873f0ac46409022d93c41eac5bd7492f7af1b9f7b1bae94da7eb8e6fa537414b6371ca77ba13b70e1c1
diff --git a/net-misc/radvd/metadata.xml b/net-misc/radvd/metadata.xml
index 3ffdeb4af3b5..a0f2278d1ed5 100644
--- a/net-misc/radvd/metadata.xml
+++ b/net-misc/radvd/metadata.xml
@@ -5,4 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:litech:router_advertisement_daemon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/rwhoisd/Manifest b/net-misc/rwhoisd/Manifest
index 3fea1b7dac61..cba64fa2679f 100644
--- a/net-misc/rwhoisd/Manifest
+++ b/net-misc/rwhoisd/Manifest
@@ -1,8 +1,5 @@
 AUX rwhoisd 280 BLAKE2B 8d2e54026175bb53897e69a61abf83b5c7548acbe52555f6adbdc88a07f94a88e3486aea81dd2d3043a99b83b5bc7b4255014f3df2687d463ab60a86ef2a37b5 SHA512 cd278c6dd828d7f07c50147e5dedad7cf8c8e44926b4717fec442b91d891838b59f61dc2a51968df5b4b1dfe181958148a9a7f9e93e65fc815b69c6219dabd6d
-AUX rwhoisd-destdir-1.5.9.5.patch 1007 BLAKE2B 3e7ca5d13ceb724ab212b7a6b2d4186e15b2a524b07fdd40268f8eb1ec7983270ad6240c1eea2ce212353bab7ba94d71a947bef4cd5a31879ad7506d823ce4f8 SHA512 9fc08f639cd087c1cbbc3139eb648fc4afed1c8aa299fcec867c3938a773e8c0ca9b1be40acdc61026ded1f012df9eea2bb713ec1207464f1cd66d215c2fa221
 AUX rwhoisd.conf 154 BLAKE2B 1f80fde2a8ed3066c4c5b5a3a17ad735a6bef56bb897cb41bbc7d3e314803a9e3b06dc957077b28b3590435b7a18a0827f3f4554247509ea21bc0d5048b08cf2 SHA512 882d93ddf72f6a909ab6a33a6f5026e35f52ae025a9e4653cc0449c4b0ab1b2fda5799e1b44b19c620eb98337270a7a1c1eb9cff66af49832adf9726f4713bb8
-DIST rwhoisd-1.5.9.5.tar.gz 491600 BLAKE2B 3e6857e7aa260fb6d714d53b63279517e15fede29be0113541213bf1a9f70bf160486fa42561fb551e019dbd6d5d773fb01a67d3da794dd17dc5978f9d3f2335 SHA512 d9227cd700cb14e0c83003c7a8dff43f859eba58390f4ba74b03c58fe629bcc9e8a39f2aaf7ce9b55aa4f17f43fc54fed9ba05a29bcbe1df5fc1340202d7b04c
 DIST rwhoisd-1.5.9.6.tar.gz 491955 BLAKE2B 97587fc6a728cde58bc5049a9bf27ec1673ce7beb751aa0de7c787d08185b597e16a4920e89fa5aaabc6e7e1b5dfecedc50aaf55cbdbe7f85a43d6a125848cb9 SHA512 ab5674d9ed9f9c5fc00b2859b1336c766c546ca067ddf9d3863a0728c6d0eac11be3a9cd22dce8c25999ed8c8e5377e6da4aa1252e396d5b3c8e959794903c52
-EBUILD rwhoisd-1.5.9.5-r3.ebuild 892 BLAKE2B f35bbf5a22077d8cde0661adafb72d93f77b898627e16cdab220f06cb6cff593ffd7d28fc436b16edbb3d1bf7c9882984885b4ba97f591d56d18bce552dcef84 SHA512 ba47902133b686606c3aa64571ca7d9bf8530201971fe7f8abd750714dced074e4365e2c2418238f88b62bc3a40884462cd67e6a44d56d8b756f5ba0b9df40a0
 EBUILD rwhoisd-1.5.9.6.ebuild 873 BLAKE2B afb247fb325e53dd810912b5334cb9ec239a8e41008b49d7b8bcf425010664c7489be82c02f5c4a53598fde731af6a36fab822519a295f8d2d5f39be92c8b2ea SHA512 8959505ad0dff653851c312c6be15302163d5ba0b9190ec339a9f6180f2ccd838d5e520018463a0fb0b94567d9722ec2a06fdff3950e17444d40e6ab724acf67
 MISC metadata.xml 225 BLAKE2B 19246ee217a79a478dded3e88f6eb021a574016a0bb6dc118ee6dbece7b9cbc5df12e36d8585c71416cb4e3d5533edc652d686674044b188a7457094f53a5fa4 SHA512 0b610f2ab50e3c82c7e3fb9bbe1af0ce84851de95ad8b8caec506e4d8260e3bd64995e7d51d447c29bbd4696285a67d14fc1f10ceab9185e4501802986e27980
diff --git a/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch b/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch
deleted file mode 100644
index 6cd6b28f2e51..000000000000
--- a/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/tools/rwhois_repack/Makefile.in
-+++ b/tools/rwhois_repack/Makefile.in
-@@ -52,9 +52,9 @@
- # procedural
- 
- install:
--	if [ ! -d $(exec_prefix) ]; then mkdir $(exec_prefix); fi
--	if [ ! -d $(bindir) ]; then mkdir $(bindir); fi
--	$(INSTALL) rwhois_repack $(bindir)
-+	if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir $(DESTDIR)$(exec_prefix); fi
-+	if [ ! -d $(DESTDIR)$(bindir) ]; then mkdir $(DESTDIR)$(bindir); fi
-+	$(INSTALL) rwhois_repack $(DESTDIR)$(bindir)
- 
- uninstall:
-	$(RM) $(bindir)/rwhois_repack
-
---- a/sample.data/Makefile.in
-+++ b/sample.data/Makefile.in
-@@ -10,7 +10,7 @@
- prefix      = @prefix@
- exec_prefix = @exec_prefix@
- bindir      = $(exec_prefix)/bin
--etcdir      = $(exec_prefix)/etc
-+etcdir      = /etc
- 
- srcdir	    = @srcdir@
- VPATH       = @srcdir@
-
---- a/sample.data/Makefile.in
-+++ b/sample.data/Makefile.in
-@@ -17,7 +17,7 @@
- 
- DESTDIR =
- 
--RWHOIS_ROOT_DIR = $(DESTDIR)$(etcdir)/rwhoisd/samples
-+RWHOIS_ROOT_DIR = $(DESTDIR)/var/rwhoisd/samples
- 
- FILES = \
-         a.com \
diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild
deleted file mode 100644
index 0ff7fbf1072d..000000000000
--- a/net-misc/rwhoisd/rwhoisd-1.5.9.5-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic user
-
-DESCRIPTION="ARIN rwhois daemon"
-HOMEPAGE="http://projects.arin.net/rwhois/"
-SRC_URI="http://projects.arin.net/rwhois/ftp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	sys-devel/flex
-	virtual/yacc
-"
-
-pkg_setup() {
-	enewgroup rwhoisd
-	enewuser rwhoisd -1 -1 /var/rwhoisd rwhoisd
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-destdir-${PV}.patch
-	append-cflags -DNEW_STYLE_BIN_SORT
-}
-
-src_compile() {
-	emake -C common
-	emake -C regexp
-	emake -C mkdb
-	default
-}
-
-src_install () {
-	default
-	doinitd "${FILESDIR}"/rwhoisd
-	newconfd "${FILESDIR}"/rwhoisd.conf rwhoisd
-}
-
-pkg_postinst () {
-	einfo "Please make sure to set the userid in rwhoisd.conf to rwhoisd."
-	einfo "It is highly inadvisable to run rwhoisd as root."
-}
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 2989f1b23261..eacadd020f5e 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,8 +1,4 @@
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
-DIST seafile-client-6.1.7.tar.gz 2260217 BLAKE2B 96d032d5d9332cd40fabc135a132ad96e74520e677ab3071c3bb5765d17fb2ec0f7e243a8110e482137ce599672b5513b3e83d1d2ebb0cf4be66149a2891e068 SHA512 545f47a93c16fff9c000add19f55784c08878cf3b1448a8307fc0d25f7f5c35d671dd20940842c4f9e97df3ae3754fbbf170d0669097d67484226aad60ba09da
 DIST seafile-client-6.2.11.tar.gz 2346059 BLAKE2B 107ed7af53a8e0244a9d9805d3c84f66e273f00d306663cfaa07983f94ed98f0dc23cce7d1ff7592bdb64915d1e7dd32cb5a2e9bb10f4b36b87bd28f8f3a9082 SHA512 4ba39c33c41cb95e2ff5bb9704cdac1f95561bb4ff0b59d0993364070c5ee10284c51d640591195b7361b595221fd899a4aeafcac1c917625b175e98b9a894a2
-DIST seafile-client-6.2.4.tar.gz 2345481 BLAKE2B 7efc25830c6d4b2203390ae453d2e9162b62e477cc12f58a03c9fed0730630c8c077f37aff2b467dd960671a3ab9f41b18be32283bcc3e6b597b9a4f1cb99688 SHA512 754d317e812d340c1a3d4eddeede6d8fe535b02c2f0aca4bda07c020389dad3bd7bc937b1c13ea7ac8ee3e833c8e2fe8f7b74f1051395b5a35deda46d727beeb
-EBUILD seafile-client-6.1.7.ebuild 1333 BLAKE2B e43343c956390b439e47bf7738b2fb9999b451e6e51c3db0bed3cf05e9d1c9628bf2c6a307663fe182b4db60151da302c250537f1dd0cd145bc6384f8eea878b SHA512 99e4fa02aa9270e7467a7c719f527a8bd892d56fa99fe011fe198fe9d61c652ad62ff4ab3723ab1484821a997d282dcaa9acbbb30bcac5936961e93ac8d6e121
 EBUILD seafile-client-6.2.11.ebuild 1079 BLAKE2B 1c0063f8e7a59724543578fd7b86afba18d613d310713446790c4fd01e5f0a0d0a15f0329dfa60e55c80b0cec8f190ff137ebf3bb533fee5a003e60385521e93 SHA512 7fd40b48cbf3fc6533c56450f8fea78aa3685ebe9c04e40172ae18a5ac8f2a25d6e05567d6b35385485e64a3dd51336b2fc69f6baa9381d302d0a9f1410f60e5
-EBUILD seafile-client-6.2.4.ebuild 1310 BLAKE2B 04ca777eb8579e5f9a03cfada1364606cacf6cb0b27268bfdcc9fb11074e66faadcfb64f2d835eceaa4b2cf1b6b3cd63b89e6637e44776025c211d1f2be3f83c SHA512 d1054c6d049d25bcaf5d172d7707b5b06cdc670aed8c0cac5f0f083cbb1bda7ceab7c5ba22c30b55ce8b62ae9a27c9be51bdd847412250080270be732450d305
 MISC metadata.xml 345 BLAKE2B 5bb1b4c7f29473d3796c8c466c2ed836b01251edcbabe2b1800e19be723e206810ea9fd9f1ae9426d7bade242c31c677c9ccffb9c0fa2874c0f852c194980710 SHA512 6365751dd09e9f9caf9441e3c9235e39a47c80daa36697aa8c96ab9015029565ac0ae308916625549115a9a8ed0e5544e584e46928ae44a55aa9d88e5d00c1cb
diff --git a/net-misc/seafile-client/seafile-client-6.1.7.ebuild b/net-misc/seafile-client/seafile-client-6.1.7.ebuild
deleted file mode 100644
index 08b04cd8efc6..000000000000
--- a/net-misc/seafile-client/seafile-client-6.1.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-
-RDEPEND="net-libs/libsearpc
-	=net-libs/ccnet-${PV}
-	=net-misc/seafile-${PV}
-	dev-libs/libevent
-	dev-libs/jansson
-	dev-libs/openssl:0
-	dev-db/sqlite:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
-	shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	cmake-utils_src_prepare
-	if use shibboleth ; then
-		if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then
-			sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/seafile-client/seafile-client-6.2.4.ebuild b/net-misc/seafile-client/seafile-client-6.2.4.ebuild
deleted file mode 100644
index 8e68d960c5c9..000000000000
--- a/net-misc/seafile-client/seafile-client-6.2.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
-
-RDEPEND="net-libs/libsearpc
-	~net-misc/seafile-${PV}
-	dev-libs/libevent
-	dev-libs/jansson
-	dev-libs/openssl:0
-	dev-db/sqlite:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
-	shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	test? ( dev-qt/qttest:5 )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	cmake-utils_src_prepare
-	if use shibboleth ; then
-		if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then
-			sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index ff463161f5d5..f292b1fdaaa9 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,7 +1,3 @@
-DIST seafile-6.1.7.tar.gz 825734 BLAKE2B 204ede4870f15cbfa9da7e51f565078290b4d03d36a0f8f7a35d54ca1f26c414c350ac05628054d290723b067dfda45aeec1777a2d32e1b376654323106083a4 SHA512 5ae27b2f8e84d57ecd9d81a42fab9611d56a260adb027fba427a700d0d17cd215b3c5b5b37df7e14181bb9ae7df611df9895181de135425ec42da44511d2545e
 DIST seafile-6.2.11.tar.gz 703739 BLAKE2B a072b103875e3a90a9c457079d3101262abc826659c604130f7c3e9d1b129e7d806b687a5673109b37cf040bba02a0a862374997a819cf384ecf2bd3bb6af058 SHA512 90ff1ca4c2a75da9a44d7833209800629c7bec3e8d5b651a820d158261bee77a3b7e599748e6ed350fe919fb67685882a215c18720b0a9702d56e384b8561985
-DIST seafile-6.2.4.tar.gz 705760 BLAKE2B 2fc0d0c370f3a3de11cbee017be3599aa2b099c08de75b23a86a0b586ab83d928d4305f2e2c0571b3b6b1f7de1eaf23a1868febcc3db9e65f08072826a5dd480 SHA512 f9d95990e913ff63835c83d429df6be66f78c993df0c38bb029090a20dfbb4d789e18e679450634f0c6d918c7ff824347301412805b86f797b81719aafa43f9a
-EBUILD seafile-6.1.7.ebuild 1091 BLAKE2B dab7de91b98b99108a2aed235ccfdb5b72e3a3aa5fb56f0ae8cdd5611b6c0b72656a80bf02de318f5ee5656591e73c734417dc4df70db37cc63a710e459f15d6 SHA512 bc9b4513c3c7217c26a0a71dbd140197fd4c762e3718796e1a9a3f871d7a2e838e59525cfff0ea52e0687c8b7ff30b924a6e082eac2dd1617b4b6638259ba290
 EBUILD seafile-6.2.11.ebuild 1048 BLAKE2B 8427d6e2fbaf0c0cd07539c75b2710773f802bbf64b47cc19c5278faa767f8ec8ebd6b48d81410f1ec9960bac6baaf1eaa6d432f36629572db510cb055d2f2b2 SHA512 8bb17b48494317a758d414c56db5751a229859072aa6634cc826208eae48c4cd21c1659b86064100032f1d685140fc3c55e2df623ac5aa5f3bb29344075e29ea
-EBUILD seafile-6.2.4.ebuild 1092 BLAKE2B d6d273f7665619cca3214411dba88c36fbe6e601b81dff00decaeef82e35f598956e52b816712ccfd46d4dccc9c5cdf34676115e1d8958a687906409c4915b2b SHA512 0c1f06cb14353dfb65d21387d6803834d47807ca6b305fc4a754caab706084d91404c41d0510175f04024d9f6048b121ca782d32e4ac239eeaefaab7bd6d2ac9
 MISC metadata.xml 246 BLAKE2B 982e99661e8894a8808c39c6ee396fbe1fcf4430ad6a4c820b357c5e96f45e008d92d3319734f94c7403b926bc7befaf231037e832bc3521952ecf9bc42f51bf SHA512 71bf99d5820faaf9004a517dffec80e1a2240e31b0db7449f672b68926c0e229cd710670468e95cf305d6136edc5e2d825e597d4648a90f68929bf8d82a1d61a
diff --git a/net-misc/seafile/seafile-6.1.7.ebuild b/net-misc/seafile/seafile-6.1.7.ebuild
deleted file mode 100644
index 5e871abceb5b..000000000000
--- a/net-misc/seafile/seafile-6.1.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	=net-libs/ccnet-${PV}[${PYTHON_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent:0
-	dev-libs/jansson
-	sys-libs/zlib:0
-	net-misc/curl
-	dev-libs/openssl:0
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
-	python_fix_shebang "${ED}"usr/bin
-}
diff --git a/net-misc/seafile/seafile-6.2.4.ebuild b/net-misc/seafile/seafile-6.2.4.ebuild
deleted file mode 100644
index 2d7f5c030463..000000000000
--- a/net-misc/seafile/seafile-6.2.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 vala
-
-DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
-	~net-libs/ccnet-6.1.7[${PYTHON_USEDEP}]
-	dev-libs/glib:2
-	dev-libs/libevent:0
-	dev-libs/jansson
-	sys-libs/zlib:0
-	net-misc/curl
-	dev-libs/openssl:0
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-
-src_prepare() {
-	default
-	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
-	eautoreconf
-	vala_src_prepare
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-misc/ser2net/Manifest b/net-misc/ser2net/Manifest
index 326557a04591..aab5dc56c3d0 100644
--- a/net-misc/ser2net/Manifest
+++ b/net-misc/ser2net/Manifest
@@ -1,10 +1,5 @@
-AUX ser2net-2.7-b230400.diff 754 BLAKE2B b6f876fed39de8ce88eb9df89d25e2975fb5a9a1d511434a0adb5493e67cf0fba24652738310fb3a3d6661714f0d26b2717d0deea1bc0ceff965a6cb13b4b615 SHA512 47f369b23c6f75421ed143abb75a0d9b46e7ca1ee2c59f17e6d75f98bb61d9fdf4e0792367e732ad60fb0f6804af6f316b291d7743d7807df8192bbdef3363ca
 AUX ser2net.confd 879 BLAKE2B 41e159da088c7db25415da24f545435e4e1ee94af9f922ddb3accc392a5fd9ec0517e79a6a37d9dcfae6911739306e02711580ce1c0059fb1f5e38495ebe929b SHA512 15054f7aa604f93bd5a54c2bb96c9a3168905be5ace50bcd2ebeeaf9dc9ae19426388e6118e9e4850125349090ee29542c24487e64c349593a76366be4a5e501
 AUX ser2net.initd 1528 BLAKE2B 509df2c77f6c8495a669aaf017c9809f342ec9bb50033461f94a5a4c729d7be49e8ef3cfca2fcefa49769ba98e5c53b743dfe67b58ae1189ec8d75e957716fa1 SHA512 d98032d8de463d2023f087106ff68367077dcd4680c673e41e50e42c91578925c72f741508e2b36b0711478e9bc12c61efef76d57c578bc726950c9d6fd2f5c3
 DIST ser2net-2.10.0.tar.gz 364322 BLAKE2B db041297069ea0a111ed73d6b1fc8a639971f113952fbcd499a81671bbd873ee3e1724146bfb5c6975d1812acd8e545e9df2bde445f4a86af57a0ae5b9b19ec1 SHA512 dd3e37619b10d8bf20d738e90c253bc2d109e0a57ee9f3a8b2a85a69399afa5a8459a4602b2856f0b655427023a36c78330851bf7f8d8da0f28d1fe22c1d5e10
-DIST ser2net-2.7.tar.gz 355064 BLAKE2B 682210619b26d6d34b8ad26559fc20f73febdf8c106afa7cd64c272af5ed9353186db2dcc899f58cd93ae82f5df45b66d025c3f3e88cee0ae1a25252e5be2d8a SHA512 39ee99031fad45ea8eeeb9e8bec343e8d6bd58c818f56ec01a05c50ef6d8ed845c6521a6d4a306671ed26959bd2df5c0b29a6b4399103815923cf958c1891c16
-DIST ser2net-2.9.1.tar.gz 357820 BLAKE2B 2068d9aabad23e647d71baa2951ebf882e2575e457606b15c18ac8a2cf5ea55a251f19b553fe926f37ace51de4b4d33de4a32a0ebd5f33a88c0a231f5e1c6ed0 SHA512 9fd0efc853993b70c0c632a7059df7a04c832f85491194c49dd8b384e1bb1a576ed9cfe28088cc181a2f7084c88dc6ef6dabbc4ead5ad9339a7becebaa6fb8e7
 EBUILD ser2net-2.10.0.ebuild 622 BLAKE2B 22edbf4209bf735f55b5c31adef27d77e82b11ddaa9cd1e19c274d47e498d84d71767d93b8889a9b45ff515343614d797230222e8fb79bdb7c80e830718a2991 SHA512 9d6f473e03ec1d181dceb261e98324db26a1cc78006ba8c66e74bb733115bd1db3cec19fcb8986323aeeba7fecdeb874d727c51624fb42064dd62649d61cdb1b
-EBUILD ser2net-2.7-r1.ebuild 847 BLAKE2B e3fc02c86a660671e5767c89296ea2852a68db014552ef12a6b01b79f6119c1e83f1c901ad78eeb84255e2332f7dd4beed1e25620a2243726c8173ec2b500aae SHA512 f2acf54587c7791b9516db5488eaef6f5fba022a5d43ab6451dae3fda14a190dde790eba2ebce0d1bac488eeb4a90e0496663b243f19d80b5422a3f9583a7345
-EBUILD ser2net-2.9.1.ebuild 626 BLAKE2B 4a8ceeb1f02be88b95ce5e62feb0170d74043a3abfcac79242b373b25aa3a14ac52c8446fbf4509ef0ec5a18b933980a0f5954c48d71ce0e2196c0e4837b2ff2 SHA512 5c401b1795a2b2a46af9af947891702d1074a8edc6f3e252874531b8325d1a0474871e5f35a2c3684a4d311c06cda74fa57ffc66594fcd7c7d010e52e8ae90c3
 MISC metadata.xml 244 BLAKE2B 31c4948eba2d8d59d90f9f49328291d0d678db43eadabae9c482ccc82e2343160809308451a5f014180a4e017eb85afd24e64b6f630219987b3bbb4df45fd170 SHA512 c026f437d46c264d228d51fe7e6d9fa32e7647aad09124fdb77b2c602885609135c63f2b8fae8092b5c68ba62cf4bda87bc3c321f2918bc2f3e77c4fb42a10c0
diff --git a/net-misc/ser2net/files/ser2net-2.7-b230400.diff b/net-misc/ser2net/files/ser2net-2.7-b230400.diff
deleted file mode 100644
index 5e567c118eac..000000000000
--- a/net-misc/ser2net/files/ser2net-2.7-b230400.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- ser2net-2.7.orig/devcfg.c	2009-10-23 14:23:25.000000000 +0200
-+++ ser2net-2.7/devcfg.c	2012-07-17 21:03:49.708603108 +0200
-@@ -113,6 +113,9 @@
- 	} else if (strcmp(pos, "115200") == 0) {
- 	    cfsetospeed(termctl, B115200);
- 	    cfsetispeed(termctl, B115200);
-+	} else if (strcmp(pos, "230400") == 0) {
-+	    cfsetospeed(termctl, B230400);
-+	    cfsetispeed(termctl, B230400);
- 	} else if (strcmp(pos, "1STOPBIT") == 0) {
- 	    termctl->c_cflag &= ~(CSTOPB);
- 	} else if (strcmp(pos, "2STOPBITS") == 0) {
-@@ -190,6 +193,7 @@
-     case B38400: str = "38400"; break;
-     case B57600: str = "57600"; break;
-     case B115200: str = "115200"; break;
-+    case B230400: str = "230400"; break;
-     default: str = "unknown speed";
-     }
-     return str;
diff --git a/net-misc/ser2net/ser2net-2.7-r1.ebuild b/net-misc/ser2net/ser2net-2.7-r1.ebuild
deleted file mode 100644
index 06e6708100e1..000000000000
--- a/net-misc/ser2net/ser2net-2.7-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base autotools
-
-DESCRIPTION="Serial To Network Proxy"
-SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/ser2net"
-
-KEYWORDS="~amd64 ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}"
-
-IUSE="tcpd"
-
-PATCHES=( "${FILESDIR}/${P}-b230400.diff" )
-DOCS=( "AUTHORS" "NEWS" "README" "ChangeLog" )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myopts="$(use_with tcpd tcp-wrappers) --with-uucp-locking"
-	econf ${myopts} || die "econf failed"
-}
-
-src_install () {
-	base_src_install
-	insinto /etc
-	newins ${PN}.conf ${PN}.conf.dist
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
diff --git a/net-misc/ser2net/ser2net-2.9.1.ebuild b/net-misc/ser2net/ser2net-2.9.1.ebuild
deleted file mode 100644
index 315fc015e035..000000000000
--- a/net-misc/ser2net/ser2net-2.9.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Serial To Network Proxy"
-SRC_URI="mirror://sourceforge/ser2net/${P}.tar.gz"
-HOMEPAGE="https://sourceforge.net/projects/ser2net"
-
-KEYWORDS="~amd64 ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}"
-
-IUSE="tcpd"
-
-src_configure() {
-	econf $(use_with tcpd tcp-wrappers) --with-uucp-locking
-}
-
-src_install () {
-	default
-
-	insinto /etc
-	newins ${PN}.conf ${PN}.conf.dist
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 601c953fda61..37348928f827 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -9,4 +9,4 @@ EBUILD socat-1.7.3.2.ebuild 1525 BLAKE2B 8ade6fec17362a75b0e56798dc9496058e39cbe
 EBUILD socat-1.7.3.3.ebuild 1475 BLAKE2B 38a503d4a6d738e70a61f4643951426ccd70ea80d08135500560563bc18b7c55fa5c7aef45aaa66ac2bf1a90151535b9aa208253b3d10367125a326cc5387578 SHA512 01874d51215e91181226e8ff8586a3e2ab398e39b8c46191d7f44bb3a3a92b98d7462ae9e6703f4cf2a01a509fc62aa6326423788dfd5c4467553e1e9825718f
 EBUILD socat-2.0.0_beta9.ebuild 1512 BLAKE2B 7f8c902a4637d6fb404c8dfc5e06b31c1e7235ed7e0d174f61d961a50b68b1cdb1b5d74bf93834a1595a794776f989a277b66a4b9da3598145b6fa9c311025df SHA512 859b4a4732bf418f5e517e6345b484c6fcb2ff2e4b42f59824dbfe51943c5432ba7fdce610501bc673c7b51399115b3b60af78441c5932739c5597219fed8705
 EBUILD socat-9999.ebuild 1337 BLAKE2B 63b3a50ba7f79887bd0769cde62604b61322c8f8ff0ec14dddc6cd6a7e271600914f6ef17ba37f68677f247e4567343b0f18ca4ffe757416f190ba703ea1dbd0 SHA512 d3153b16916abff983b91525eea488945585a6817561aa5471528741af6ef0cbdc440ddbce3086ef238f7056d053e209b451daab098299b98d185b6df3037c8c
-MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
+MISC metadata.xml 367 BLAKE2B bcbf5f31a96ed1a9a966131bd0e9ba1baa1ef371c4cfc8c6ad623884cf23773ee1987a590381a6edb0671ea32ad34834fd3a3d23ae123bdb86eb8a9f3e28de78 SHA512 d3960b46fbdd0bac70f454d2ecb2fc033ff508e8752e42e2cfbdbe4f49b21e1f818a404b0b4187a72c79f0d717ef5ed4cac657e5fe58879fa90123d26c1c7601
diff --git a/net-misc/socat/metadata.xml b/net-misc/socat/metadata.xml
index 2c2a7923cfc8..70bb6410439c 100644
--- a/net-misc/socat/metadata.xml
+++ b/net-misc/socat/metadata.xml
@@ -5,4 +5,7 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:dest-unreach:socat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest
index 071a5f05af4f..9fad75fd6b87 100644
--- a/net-misc/taylor-uucp/Manifest
+++ b/net-misc/taylor-uucp/Manifest
@@ -1,6 +1,5 @@
 AUX taylor-uucp-1.07-fprintf.patch 188 BLAKE2B 13900fdaffd964d5e38a4bc3d2acce2675ba74ee008676d97313b4b75ee5625aeff5b56fbdb1a89909fa4cb006102e43f65a2832a1805fb747608eb13054ebfe SHA512 468870a9e64f0ace876bc1254e264e634fc07011b9ffa5ca0ccecb23c925e2a4a5c4463e6741b265bc8df17d0a578710cc8ea135461a1dfcd1c782e991bc7623
 AUX taylor-uucp-1.07-gentoo.patch 5049 BLAKE2B 3d010ff0841df59196d38e7450b85c4d36c2ccd770a4c31d29962e3c3f87d5a264977fa2f715a9bb91fec44f60dd5e045eed440e0fb482be525702497f3ad2a1 SHA512 8d259ddf10c80ff6c349d3bec531f858d561f3f488fd6066d69ddb8d2242e9f22ff8781ce47dcdb10f3dbf4a073bc4bf3492f6fced30d8d129e6f81e860f971a
 DIST uucp-1.07.tar.gz 1013234 BLAKE2B 5734bd1b8afcc9cb9b0dcc25afe73ee89b6007249a73d286bc39975bc0cd7a1907e360dfaa050175d87e34a7d468a70a7cae75124c920f00f03ff52f16629bb3 SHA512 13d215890234e638bed53dce7bab6eb78e0ce6b658f23ac1d7f8abc6e1d97963bef76aa4148ca644f450d5a1678fac940b73fbcd5845d7f5bea3afbd8055229b
-EBUILD taylor-uucp-1.07-r2.ebuild 1336 BLAKE2B 4ab6366c61aa8c1ea815a3c5a02616ca0d7a08b496d114efedf78069f2f632c9908dfcd7f93bdda6c36c2ac905f5886b85ef7f2fd7f4436b8a2c34931393239c SHA512 e499cea422bb755a588a98991bb00acb466db6b55d85a8b8d495c1fab2c5cbb6d70b527df95ec9914f2c773c05b5e804f86ecfecf3cf540099434f5143447194
 EBUILD taylor-uucp-1.07-r3.ebuild 1369 BLAKE2B 7b9f6ad62d03d980157178077e02388596121728c346c18f75d740f89ecb8f64a76b15367dde165a8eeb4b4cdc05bbefbd19c8107ec3ef8a8b32d322195420f5 SHA512 87e29758cdcdd4badc190e18643a1b0e668c60254d9f27df9262daab34f643605219e5100d989169d13f684a5d6d4e5c3122979cef7c242b0e8c4c87a5d26217
 MISC metadata.xml 319 BLAKE2B f7bd226c6082b2d19d38b6d20aa6d859e6076e226cf2ae3a4013ee5ff558f7dba27cee1fcd159785679fe03b37082d57232d7ecf6f86e832a60e3d8c4f528d57 SHA512 14fddbb3e6a6f0defe184c909d8ae29072782e3060dd5c91f852572039ca81be95f9cae98f6a4a011711cd991bcfa886638d725372463b3af4ee7f15654ad22d
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild
deleted file mode 100644
index e4402f3f88a0..000000000000
--- a/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="Taylor UUCP"
-HOMEPAGE="https://www.airs.com/ian/uucp.html"
-SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
-IUSE=""
-
-S="${WORKDIR}/uucp-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	mv configure.{in,ac} || die
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -D_GNU_SOURCE -fno-strict-aliasing
-	econf --with-newconfigdir=/etc/uucp
-}
-
-src_install() {
-	dodir /usr/share/man/man{1,8}
-	dodir /usr/share/info
-	dodir /etc/uucp
-	dodir /usr/bin /usr/sbin
-	diropts -o uucp -g uucp -m 0750
-	keepdir /var/log/uucp /var/spool/uucp
-	diropts -o uucp -g uucp -m 0775
-	keepdir /var/spool/uucppublic
-
-	emake \
-		"prefix=${D}/usr" \
-		"sbindir=${D}/usr/sbin" \
-		"bindir=${D}/usr/bin" \
-		"man1dir=${D}/usr/share/man/man1" \
-		"man8dir=${D}/usr/share/man/man8" \
-		"newconfigdir=${D}/etc/uucp" \
-		"infodir=${D}/usr/share/info" \
-		install install-info
-	sed -i -e 's:/usr/spool:/var/spool:g' sample/config
-	cp sample/* "${ED}/etc/uucp" || die
-	dodoc ChangeLog NEWS README TODO
-}
-
-pkg_preinst() {
-	usermod -s /bin/bash uucp
-}
diff --git a/net-misc/tipcutils/Manifest b/net-misc/tipcutils/Manifest
index 123f5ce03e78..866482b50155 100644
--- a/net-misc/tipcutils/Manifest
+++ b/net-misc/tipcutils/Manifest
@@ -1,6 +1,3 @@
-AUX tipcutils-2.0.0-rename_configuration_message_field.patch 510 BLAKE2B e6149e5421feafda1ce94978e143e37c37b718d1e15cd1e4f45829151661b301ebbf69b226d23607b000e18000fae27e36d8908a2d55b21a35050a9607d896d2 SHA512 0ec3e56cf79482a8c4f99d3eb5a7c984022c1ae934a2b4bb1f2c8acfeddabbf7f85559b503125bd439aa3040be7c7a6f6703736286897b0f66855d9cb9354c2d
-DIST tipcutils-2.0.0.tar.gz 66495 BLAKE2B 2c0116ce8a59ba6dfeec0061109c003c6eb73ed54ee5e75bbca31abb2f9a92e9312f71ddd9116e706e7b76130a86b7ef63915a0530da9ddcd4d30b38e66c6956 SHA512 40d25d7bb23359ef1c5caeef30f15166deb24772034ec34a69600764c0445d9e7023254e19a2a76e75a46643f5c710b881341d3f32e42e2d9c58d4a94e17c49a
 DIST tipcutils-2.0.3.tar.gz 166337 BLAKE2B 70a06e0f71550123da9b10cc9330e89e2f0722614f00ab93d229baa78f189b3ae03a9aa70722245886e6dee4b9ebf9f95b9ecc06c4c552096afdf54cf28fab0c SHA512 7f07b4729dbd2c0c93cd69ffe6d2d082cd10f8de8bda335555548d14bd6287229da3686d288be3c10024cc6b607e6e4be983716f734f2d049352f924409511ec
-EBUILD tipcutils-2.0.0.ebuild 815 BLAKE2B a641d072a85f4595ab518d8a8c0680b0c1e38601c5e141cc145247ba86a4f4ff3d9fc4478abda87ac8df078aecc7f6dd34a732a982b8513290572c7f80565cfe SHA512 3eaf4ec70c756f43780d2cef705a72ad9722445b294052c753edc99818e1a985b2f0593a92cede845e749d368e9e160154d15aa3bd97a3f03b238238223d02a5
 EBUILD tipcutils-2.0.3.ebuild 449 BLAKE2B 8dd589c389b293bf4c9c79bb5069d5e3a3c1ef2f261808637634072a6d8dcc3bdda71705ff6f0cf5b6a9c310b2b0eca2d4de9e01c7f3f15042a1620e4f966f1c SHA512 6b805810c2ccfdbacfff7015e09956dee32be3ae598f5eaa15ceeadef794cba1b7781eedcc0bd935d0ea86bfa0664eff08de6bf95d7dc1471ebed3adc3acd715
 MISC metadata.xml 241 BLAKE2B eb3c33457610df6ba6f6698f73504e0ce94c5538fc2432c3b2555b4c8e0f6a1b9d2c54806aba3a5aff5f74c2f62f2b8a4151a6f214282b666041cfaf1fe788b2 SHA512 ff2c5ffaf00fa30dd4ed38f986992dfd88a006a63a07c836efbd00dc682f5ad708c8640007c4e8b7b4aab46a7dbcbfbca501aae31f8c73936b7ca9143fafe4a8
diff --git a/net-misc/tipcutils/files/tipcutils-2.0.0-rename_configuration_message_field.patch b/net-misc/tipcutils/files/tipcutils-2.0.0-rename_configuration_message_field.patch
deleted file mode 100644
index e5dacb485f67..000000000000
--- a/net-misc/tipcutils/files/tipcutils-2.0.0-rename_configuration_message_field.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/383807
-http://tipc.git.sourceforge.net/git/gitweb.cgi?p=tipc/tipcutils;a=commit;h=44efb87cb453c16a31ceef27164b0f0394ae4433
-
---- tipc-config.c
-+++ tipc-config.c
-@@ -1150,7 +1150,7 @@ static void enable_bearer(char *args)
- 			a, for_dest(), addr2str(domain), pri);
- 
- 		req_tlv.priority = htonl(pri);
--		req_tlv.detect_scope = htonl(domain);
-+		req_tlv.disc_domain = htonl(domain);
- 		strncpy(req_tlv.name, a, TIPC_MAX_BEARER_NAME - 1);
- 		req_tlv.name[TIPC_MAX_BEARER_NAME - 1] = '\0';
- 
diff --git a/net-misc/tipcutils/tipcutils-2.0.0.ebuild b/net-misc/tipcutils/tipcutils-2.0.0.ebuild
deleted file mode 100644
index 4cb376facabb..000000000000
--- a/net-misc/tipcutils/tipcutils-2.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs # linux-info
-
-DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)"
-HOMEPAGE="http://tipc.sourceforge.net"
-SRC_URI="mirror://sourceforge/tipc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${P}/tipc-config
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-rename_configuration_message_field.patch
-	sed -i -e '/OFLAGS/s:-O2::' Makefile || die
-}
-
-src_compile() {
-	tc-export CC
-	# inherit linux-info and add IFLAGS="${KERNEL_DIR}/include" below in order
-	# to build against headers in /usr/src/linux
-	emake EXTRAS="${CFLAGS}"
-}
-
-src_install() {
-	dosbin tipc-config
-}
diff --git a/net-misc/trackma/Manifest b/net-misc/trackma/Manifest
index 9148ba197fce..5ecee12e9a82 100644
--- a/net-misc/trackma/Manifest
+++ b/net-misc/trackma/Manifest
@@ -1,6 +1,4 @@
-DIST trackma-0.7.3.tar.gz 142450 BLAKE2B 27ec903e7372d18349bdc978cf1b72c501bd028cb00b9e8e1facde367c9b6041b87561370351eb21ffba9ac23ac40dd370e2aa74b0ebe8b9142f870f4f7e018a SHA512 73a7caa1e740e96f29edfcdfc5dbcaf26f280371c176bba69947fff37ca935d56e280a6d3e12c0a7f6283fecdad3d8e8e82c0d45a75d1962e58fdd7458630791
 DIST trackma-0.7.4.tar.gz 143814 BLAKE2B 8fafa53b4af94a1078e2343b1b309efe8caa058809309ddbdae618b2b3d85fbf001cb73c2556fd50b8946c9d61ddb32d74c3bb5be9bb2c2501b29265a587e2d4 SHA512 88b7eacc6a60fec5b022787337274b95d0fb972dbdd8ffa1a000806612403d8f84a2317e5903ec1ffcdbac91132a960670855991c0885f526fdbc4a1033c3364
-EBUILD trackma-0.7.3.ebuild 1973 BLAKE2B 70527b22320658ce358fe9ac31d3ffe24c6194af220f0da890bcbc80606f846fe5ce03fbedc368436356c9ff66424d95b58eb9cd5060fd8618f50efeb8e890ad SHA512 b98fa9fe204d76f996946e6d48d853885badc3fb6a77fbc9aca9990cf72bc876d6fba955ed811259b31e51d8e514afbd449566fb6f3d145cf1c4d849cecb975d
 EBUILD trackma-0.7.4.ebuild 1979 BLAKE2B b5a0190c8d128cf6c6419d06ae0cbfacd05ab2102ff6613ddff338da2bbc3e7936eeaf435171731e7b41a75668c8b8e9c8f5608b11efc091fb515a11d9d84b2f SHA512 034a2bff20f856767d08939cf1f151d71e4351bc118be26b086b4bfb64eb681cb0cc6ee44265f8be713c9d975d75e7650340e1f1fac8c9ef1f5c48958760dd2c
 EBUILD trackma-9999.ebuild 1931 BLAKE2B 3b52f598487bb469a890a96d978d31a4d796459da3908a28ce17994e0ad9a39709431152eb26bce72f4006449ed4c4582bb5d5422c4366f0e14877a5e06e7c23 SHA512 d953512cb15a9f05dd972487cc9f19a88b69b0f9810aee3755bd51b64e46965e22859832c97c57cdaa5518a3a3ddf34106398f443cd864f6f793db109a7ef9f9
 MISC metadata.xml 579 BLAKE2B 246c639d17e6a69b309624da7ca46720c19f7226b770012bd7d020cb409b842d90d3ada211934062f65202798031dcc667e6801720e588b604b69b71ed0fa34f SHA512 0cc21a27e6dfe16172926c5a0b61b4349c6e68a538e32c041d259c4ada8c147040595c782c8d2ef9e1054edb72c8475f9e1b4d0d3544f277e805d681401d46bf
diff --git a/net-misc/trackma/trackma-0.7.3.ebuild b/net-misc/trackma/trackma-0.7.3.ebuild
deleted file mode 100644
index e1a4538679a3..000000000000
--- a/net-misc/trackma/trackma-0.7.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Open multi-site list manager for media tracking sites"
-HOMEPAGE="https://github.com/z411/trackma"
-SRC_URI="https://github.com/z411/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+ncurses cli gtk inotify qt5"
-REQUIRED_USE="|| ( cli gtk ncurses qt5 )"
-
-DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] )
-	gtk? (
-		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)"
-RDEPEND="sys-process/lsof
-	inotify? ( || ( dev-python/inotifyx dev-python/pyinotify ) )
-	${DEPEND}"
-
-python_configure_all() {
-	sed -i -e '/trackma-qt4/d' "${S}/setup.py" || die
-	rm "${S}/trackma/ui/qt4ui.py" || die
-	if ! use qt5; then
-		sed -i -e '/trackma-qt/d' "${S}/setup.py" || die
-		rm "${S}/trackma/ui/qtui.py" || die
-	fi
-	if ! use gtk; then
-		sed -i -e '/trackma-gtk/d' "${S}/setup.py" || die
-		rm "${S}/trackma/ui/gtkui.py" || die
-	fi
-	if ! use ncurses; then
-		sed -i -e '/trackma-curses/d' "${S}/setup.py" || die
-		rm "${S}/trackma/ui/curses.py" || die
-	fi
-	if ! use cli; then
-		sed -i -e '/trackma.ui.cli:main/d' "${S}/setup.py" || die
-		rm "${S}/trackma/ui/cli.py" || die
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newicon "${S}/trackma/data/icon.png" trackma.png
-	use cli && make_desktop_entry "${PN}" "${PN^} (cli)" "${PN}" "Network" "Terminal=true"
-	use ncurses && make_desktop_entry "${PN}-curses" "${PN^} (ncurses)" "${PN}" "Network" "Terminal=true"
-	use gtk && make_desktop_entry "${PN}-gtk" "${PN^} (gtk3)" "${PN}" "Network" "StartupWMClass=trackma-gtk3"
-	use qt5 && make_desktop_entry "${PN}-qt" "${PN^} (qt5)" "${PN}" "Network" "StartupWMClass=trackma-qt5"
-}
diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
index d4b256da40a4..a440e0bbc28d 100644
--- a/net-misc/x11-ssh-askpass/Manifest
+++ b/net-misc/x11-ssh-askpass/Manifest
@@ -1,3 +1,3 @@
 DIST x11-ssh-askpass-1.2.4.1.tar.gz 29229 BLAKE2B 0b49f8eeb568ccba9843e216a688cc64f3ec4799efae0c0f870803c166e40d5f5d52a9eb45a5d3e5475bbf461e5898feda0b2c91c91c61bf984b81ec89839abe SHA512 879887cc1d6eb26662494e3a6b59b79a8d153b354abf86e8e8667940545c8e07d0aa051491f5ba6ca5273e3a7fcc367edb4cc79bb2e4bf1bdbd0e234690ad6b9
 EBUILD x11-ssh-askpass-1.2.4.1-r1.ebuild 923 BLAKE2B 0c58c634c173af9549c4c68e6496455bf39f5414a3fb7b387d139a03f9d2d5ff90bb1e446d9861b58cb2593c21c2e4f6f375e258259094f72f3ff6c83819e192 SHA512 52d0706cdb99e3c68ec624f82c816da9dd7a7e84329788335c13fe54a9000dfa02430a2a9f43c0f1f051b11b54d53835b912935513bae98f9698107c81b39f43
-MISC metadata.xml 291 BLAKE2B de0c3922a209acaecab21089d401dd41170260f8fea60da6afa7f02a096bdee50d3663dc947223b66429a3fbab6b5534e0afdbf174a66b5f429f48976faba570 SHA512 ff2abca93c49335572d3b78875cb835aad5d469d01c36f93a0e713962616cc1cc4fcb5e5a6c358616c47ee16d461b0db767dbdf64caadc3f7595e69b822fc989
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/x11-ssh-askpass/metadata.xml b/net-misc/x11-ssh-askpass/metadata.xml
index 0c1e85ee38ec..6f49eba8f496 100644
--- a/net-misc/x11-ssh-askpass/metadata.xml
+++ b/net-misc/x11-ssh-askpass/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>cardoe@gentoo.org</email>
-  <description>I guess I'll maintain it since I fixed it last</description>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index b2fe6fc5e186..f869e7df1d1c 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,6 @@
-DIST youtube-dl-2019.08.13.tar.gz 3177273 BLAKE2B 927b7bfe128738efbb5023817ccbcf635b6f7f3741f3f794bd8af377cd7c203ae4466818d03ee717f5196124c3a46c5bf9c1e1a92438a295a453786bd8ec3ee5 SHA512 0b5066f3ce93bc0ffa3f9c3aefe4154daae38e78449a8b5825ecf032252f8fafde893f1325809b3d9fecf28ca1c2539d941b90acf204c5bf68783e79fcd28c61
 DIST youtube-dl-2019.09.01.tar.gz 3179376 BLAKE2B 422e7f7f86d6486c45c2638b81a107c1fbf1aac4c05819b5d98185a403b9ed75be520e5711f42393ed4560b5828d10b6a55a633b55fa84d110f0c323bb159374 SHA512 327ef44180e2048045884d79de20541f81a4dbcee415c3fa15bcf333674f2b6e6c6663efa532b64e4f7078449af946479c98464ff9b54642e886f8c792f0b82f
-EBUILD youtube-dl-2019.08.13.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
-EBUILD youtube-dl-2019.09.01.ebuild 2130 BLAKE2B a6b9c8c31b6c7631f19183fccd1adf7b4c3ae5f5bc3108549803c83df78b66c2af9e04e1549a70b6f3bcca4cbc78a6e279f8aa063259c63e2fa464996ee69bcd SHA512 84f330ea104602ecd898906b7d33c98bd254715fc9feb5e71d35e34ac32466b56f178d22fe72dbea83f78ba45ffcd5fe73952c6d508dfc99bccec9a237daa155
+DIST youtube-dl-2019.09.12.1.tar.gz 3180312 BLAKE2B 0fb4f6fdba490407c655645823ebdabff443e8bc0490a0c54865cc4e0d2da0fe27a9eb297e521084a412b1dacd6afb988f5c167f3643a6783bf9d4f52a49b980 SHA512 8177165cab21e83d1e1012c3d56e5182816f2367322eeea526c6d18aa74d35271a4625c6663204c0a5206976dbe32c97cdcd22b000e4e8e23a1073b474345eb3
+EBUILD youtube-dl-2019.09.01.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
+EBUILD youtube-dl-2019.09.12.1.ebuild 2130 BLAKE2B a6b9c8c31b6c7631f19183fccd1adf7b4c3ae5f5bc3108549803c83df78b66c2af9e04e1549a70b6f3bcca4cbc78a6e279f8aa063259c63e2fa464996ee69bcd SHA512 84f330ea104602ecd898906b7d33c98bd254715fc9feb5e71d35e34ac32466b56f178d22fe72dbea83f78ba45ffcd5fe73952c6d508dfc99bccec9a237daa155
 EBUILD youtube-dl-99999999.ebuild 1997 BLAKE2B 7b5974dc4df22cbb2fb7d87f60e73b2fddc7117331a6a81e8e9f0efef84788211d5fdefb1c96e9d4df0677fda2d264ef2846f36e60a890233fa79b06722b2abb SHA512 71019b536d5301dfbd5e9cb8085d1a001854f5bf204c0e76866c16a9553516a55081c17396bcc89c0128e44116b6e2dc451541b7e89d677822f3d541b316d5c5
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.08.13.ebuild b/net-misc/youtube-dl/youtube-dl-2019.08.13.ebuild
deleted file mode 100644
index 8b7913f66a7d..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2019.08.13.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
-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"
-RESTRICT="test"
-SLOT="0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-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-2019.09.01.ebuild b/net-misc/youtube-dl/youtube-dl-2019.09.01.ebuild
index 89ac8f636eea..8b7913f66a7d 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.09.01.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.09.01.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"
 RESTRICT="test"
 SLOT="0"
 DEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2019.09.12.1.ebuild b/net-misc/youtube-dl/youtube-dl-2019.09.12.1.ebuild
new file mode 100644
index 000000000000..89ac8f636eea
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.09.12.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+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"
+RESTRICT="test"
+SLOT="0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+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-nds/389-ds-base/389-ds-base-1.3.5.19.ebuild b/net-nds/389-ds-base/389-ds-base-1.3.5.19.ebuild
deleted file mode 100644
index e36a909ca910..000000000000
--- a/net-nds/389-ds-base/389-ds-base-1.3.5.19.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOMAKE="1.13"
-
-inherit user eutils multilib flag-o-matic autotools
-
-DESCRIPTION="389 Directory Server (core librares and daemons )"
-HOMEPAGE="http://www.port389.org/"
-SRC_URI="http://www.port389.org/sources/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise presence kerberos selinux"
-
-# Pinned to db:4.8 as it is the current stable, can change to a later db version < 6 when they stabilize.
-# The --with-db-inc line in econf will need to be updated as well when changing db version.
-COMMON_DEPEND="
-	sys-libs/db:4.8
-	>=dev-libs/cyrus-sasl-2.1.19
-	>=net-analyzer/net-snmp-5.1.2
-	>=dev-libs/icu-3.4:=
-	>=dev-libs/nss-3.22[utils]
-	dev-libs/nspr
-	>=dev-libs/svrcore-4.1.2
-	dev-libs/openssl:0=
-	dev-libs/libpcre:3
-	>=dev-perl/perl-mozldap-1.5.3
-	dev-perl/NetAddr-IP
-	net-nds/openldap
-	sys-libs/pam
-	sys-libs/zlib
-	kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-dirsrv )
-	virtual/perl-Time-Local
-	virtual/perl-MIME-Base64"
-
-pkg_setup() {
-	enewgroup dirsrv
-	enewuser dirsrv -1 -1 -1 dirsrv
-}
-
-src_prepare() {
-	# as per 389 documentation, when 64bit, export USE_64
-	use amd64 && export USE_64=1
-
-	eautoreconf
-
-	append-lfs-flags
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable pam-passthru) \
-		$(use_enable ldapi) \
-		$(use_enable autobind) \
-		$(use_enable dna) \
-		$(use_enable bitwise) \
-		$(use_enable presence) \
-		$(use_with kerberos) \
-		$(use_enable auto-dn-suffix) \
-		--with-initddir=no \
-		--enable-maintainer-mode \
-		--with-fhs \
-		--with-openldap \
-		--sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		--with-db-inc=/usr/include/db4.8
-
-}
-
-src_compile() {
-	default
-	if use doc; then
-		doxygen slapi.doxy || die "cannot run doxygen"
-	fi
-}
-
-src_install () {
-	# -j1 is a temporary workaround for bug #605432
-	emake -j1 DESTDIR="${D}" install
-
-	# Install gentoo style init script
-	# Get these merged upstream
-	newinitd "${FILESDIR}"/389-ds.initd-r1 389-ds
-	newinitd "${FILESDIR}"/389-ds-snmp.initd 389-ds-snmp
-
-	# cope with libraries being in /usr/lib/dirsrv
-	dodir /etc/env.d
-	echo "LDPATH=/usr/$(get_libdir)/dirsrv" > "${D}"/etc/env.d/08dirsrv
-
-	if use doc; then
-		cd "${S}" || die
-		docinto html/
-		dodoc -r docs/html/.
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "If you are planning to use 389-ds-snmp (ldap-agent),"
-	elog "make sure to properly configure: /etc/dirsrv/config/ldap-agent.conf"
-	elog "adding proper 'server' entries, and adding the lines below to"
-	elog " => /etc/snmp/snmpd.conf"
-	elog
-	elog "master agentx"
-	elog "agentXSocket /var/agentx/master"
-	elog
-	elog "To start 389 Directory Server (LDAP service) at boot:"
-	elog
-	elog "    rc-update add 389-ds default"
-	elog
-	echo
-}
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index 201364ce727c..23788d525e83 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -1,9 +1,7 @@
 AUX 389-ds-base-1.3.6-backport-invalid-password-mig.patch 14710 BLAKE2B f24eb143f304923fd9d1c4deac139d13bef55212a1e3a6935b3c5f0c702b09f143021139e25f70c85c39917bdc98f0a0d2fdeb451a6cea542ba8def532794767 SHA512 b8802724887df00f202fe59b36112c77fb7d2ac0df7373e739f02dca6850d455129637a3c84e6e329c37466589785c6afb05d7ff704c77abe8295197b87a217f
 AUX 389-ds-snmp.initd 960 BLAKE2B cb5b19fb168bb810aff2d4955a3a87b6dfdef6591e2a97182dd84f102ae9214760726d9a56b29d227f2fb4b109be04f81072a6b82106b9f73298b47735a0f360 SHA512 bb76a068aa5422664c3fc87d5c28124b26d6dbc88cd88856826ae905a4149a6a1d03ec562dcace1cebc6caaa0ca3c6e9346c1af5703d89e1da600df8ca4a4ba8
 AUX 389-ds.initd-r1 2366 BLAKE2B 563dabc9ba0d3720956811ac52f85f9257e588953e3b1bfde3fc4ca7749b72604ee5a608c050cdc5222691f541bfd691c5259ac9e60194a669cfa06cd6c76794 SHA512 530316eccf25196453a51398b810dc6ca14a9bf6f8e4487cfd42d00df190653a197b1effae357c6d9e5d00cd51e8e7d47092d0ecddf2d71d6fa100b58d19b6d7
-DIST 389-ds-base-1.3.5.19.tar.bz2 3588794 BLAKE2B f3341c8ec4d1b612babe83fd0cc8a4ef43b7a05d8ab5585dceefe39caaaa8182af0d6c8de3b0e7bd867bfd02863a70d09ea0058613b3bfdffcf1140f4cb69c2d SHA512 897f59fe23a9d5a784df7a255dc300805c8f00b754d4976f8637a61954ffe2de59da09ee700dc5047b406196deb28e9647ec50c0b06c0d34371a418c126c8b7d
 DIST 389-ds-base-1.3.6.8.tar.bz2 3440164 BLAKE2B 20ff28fc1d59452e48ec6684f844dd2dec2f33492aa142c915029dfb6b0535860f4f598872d2de5d33ed8cb9b5a0d3ae47b1666cac54a4b38f0f4f954cdaf85f SHA512 b08a87bffbdf8e4c6bf6b4f87394aa0a12b8b44fcadec2f97c146b3a21ff89f5f547080aacb0ecda9b91aca83f8bf093b64c2569b2d8be84ffe22439be446234
-EBUILD 389-ds-base-1.3.5.19.ebuild 2957 BLAKE2B d949b7a77c8e037d11d667bc35f290bc855b99724ed9c28bd52e2fd70973eec54c69b722a3fd9f86a91e5f8ec453cb609a503dd92fea74a44903eab1c0e4e68d SHA512 facd2e4180ecd5da4ec7c55d30d44cd3963e3a52de68cea5664d0f6ca7bdf2f7f06cfcaeff6718d0e5d97a935564990eae51c1f245f039fd62426b2de81d9a4d
 EBUILD 389-ds-base-1.3.6.8-r1.ebuild 3034 BLAKE2B 77277e1a31d2e0e718060a4ce007cc601fd48c0f813525c15d6437e1f05821197a6307be8e070af0a69253cd3cabd288ce81d640111a4feb2f708f67a7034ead SHA512 77af6cfe40c112c496c527fe5766430812e2da9d440eef15d155196d5e09b9c69473038e34a736a052e5ba7f3d046d088e8198a47e6991cadc2b7d3a8109a16c
 EBUILD 389-ds-base-9999.ebuild 3083 BLAKE2B 45a20a14951c11131a0ca5fc899e4166eda69611f4f8c7bb9619f9d5d5ad9cd2d846b01c8fc6aba385605e30b455a9344fb9dce27563558141f4bad5f7018dc0 SHA512 a86fa6972731f3e7e3aad42fec4ab14378537e1173f35a18873a38dc78459b2723b7a348333499557fa007677a97c4c2bf748dd3b2fc1bb92131853f5f73102e
 MISC metadata.xml 1019 BLAKE2B 0258798048756a11ef38481a5abbe2c3e80d186bc3d4474771232397e4ec48a270fed6a0867efafb31c4261caf130511083e65f434f03e8486713a710bd2c470 SHA512 d63ffd88de13739f9889f064cdc135ca0f82e0ecde52617e8bbe477049f0e911e3d79514dbef3ff5913b1760889a20035f89118b760ab241fe864b0d07f694a3
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 11fd5af8b4f1..ccaa6a2394c0 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index 779a2a0d36d9..ed6dcf8f8cdf 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -4,6 +4,6 @@ AUX rpcbind.initd 414 BLAKE2B 38636c24567ab930a5222711112bb197f7bdf2289773adda1e
 DIST rpcbind-0.2.4.tar.bz2 122781 BLAKE2B ac1c374a1081559bf09bc209256daa1bb530d71f0c7fe45cec4c9b87cf110c15251a05dce2cf2b78ffa4d902f817efed30350ad08a23e12a7f219f10fe626aa8 SHA512 f3966a7284e94bdf120a9b3f0dd66efa1fe8761df2313545a031f77b7c06e27d7955d2780469943deb537d34f95c4cf3f30de523ec9fab9f571322d7224b210c
 DIST rpcbind-1.2.5.tar.bz2 123502 BLAKE2B de0d10406aeffd75195c1fa1d0179b2c7c0ba54c3f3ac58ce9d7e9448d1dbe91a296ad69c45dee115e0a739aa9cfec53b750d3a5ca405e16605a92bbb2006859 SHA512 e884c4757950ccead0f9a07f50625a63e6f18f9bfae9fcfffa3e5fa4b7a66c3a99d9fa303061848fe8211509d5456f24ff26e4579af6e161a35522268f3ef3e4
 EBUILD rpcbind-0.2.4-r3.ebuild 1384 BLAKE2B 43fa1418a4a836cb1c76bf14c57ebfb801a6c5919d82e3d1bb07265438410869ee5b65d9eb384b93cd6d3b393dc79412df143496db70a669bb507c4ba03bde12 SHA512 389d0073ed7613e57655a38da3b6efc75f1e114eb50b203811fe78075fa4eca04b03064c3355dd7cd407fcaefc5139242dd68a3d1add874681b9057066f08de2
-EBUILD rpcbind-1.2.5.ebuild 1405 BLAKE2B 249cf0afd77692b6e8e4fc3af84ace87971cd25b5c962dcbf146b5b0b0d1e63c115fe6143770954726cf1cbca3de605205a6a3293a82fd08fb9bae5c5535bf45 SHA512 795a7c81de7fcdbb52275c169129fd1a04334dd20e8ec02b1e47c5747448727e74125f54f102d9595bccbe3a9838a2541fc2ee2e2e3f56904a0842a8467b873b
+EBUILD rpcbind-1.2.5.ebuild 1396 BLAKE2B 0a902a1fd52baed15b004d1f9fe9f814f6a5206b7d2833fe1433852a3e79db083583e5854c50dcced5f1080f50b50a636d921f2685b01f18d24ad622e3521198 SHA512 2b5cad5632ddbb752c4e7096fba2959537023524681d0ae930380a3b1818a5751c71e3345fed43c9144b9d9416046e555f6597bc2a7f9fe6aae7ac7d56cfc8d7
 EBUILD rpcbind-9999.ebuild 1401 BLAKE2B 12e7b0b777f3e77b94ad59073031c61d69ca485ab83221d54e992bdcd1a8da162cc7d19a340271bb9dcb04e08d869d902fa1f2e14710691a669fcb1f48553646 SHA512 155442d872e210f34ee2de90413c8f60d9ce8adae234df72e7df5193162678bd5316549e28cf275ab98cfe143d3b0ba503b7afa7543ecee11913b144aa2fff19
 MISC metadata.xml 459 BLAKE2B d3625a12679bb29b5402e397618cb007079ca84ada8ef79ced347338a6dacb4473a58fcdf7350e16f8623442f601563acaa247f5f605df1d289876cb3fc4dde1 SHA512 1aa9e72521a4c4c22c78e5a5e9f32c89d66b50079b9e42dc4cb4a043561d6a48e9e76ab52c2803609479161bfd7b21c18689d5088594762c4e09fa1fa58dd3b1
diff --git a/net-nds/rpcbind/rpcbind-1.2.5.ebuild b/net-nds/rpcbind/rpcbind-1.2.5.ebuild
index 9178ff90a0bf..87d988934b8d 100644
--- a/net-nds/rpcbind/rpcbind-1.2.5.ebuild
+++ b/net-nds/rpcbind/rpcbind-1.2.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="portmap replacement which supports RPC over various protocols"
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 87b47225bec6..3d155c95f7e0 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index b7f87f7222a6..1c7ee445f515 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -6,5 +6,5 @@ AUX ktorrent-5.1.1-singlefile-torrent.patch 4654 BLAKE2B 8bef064068df9db5b82eb16
 DIST ktorrent-5.1.1.tar.xz 2049392 BLAKE2B 09ad841e1b6d7f332b19e2a660130b1f2b998cd6839614800cde7c99c8ec7f119f2adbdc3d9e06c8525e2dde534d73dab521c7df1d01b2fd0eb6b11fbb868d8f SHA512 bbe744853018380e30efc6ef95916a9b6f0ebec812d70d7970e5e7183d860d147b0693dd0107b146a5987aa27f30cd335fad73c8967839d53eee1c5b63a53c06
 DIST ktorrent-5.1.2.tar.xz 2048604 BLAKE2B 761df1e0aab5c4457311ae821a47ebf7b5b82b2839b4bf238491231caa213370cc649a1c0cafd332b42bbb84230f4a313e5172db722ff3c7af81c0daba450a98 SHA512 b62d05650216721299dc9db23da1a2d6ae5d3b77583ad4bd99ac032d7b135cce567feff3b66d27ac001d77e30517112e4e8c8bf8e83c1106a79509ec45498621
 EBUILD ktorrent-5.1.1-r1.ebuild 3192 BLAKE2B 5d0e9eb5e8a38f4f81c1928158f96973695f179fe7e423317e00959627ea2b66547d1ad043297898dd06ddb230735c1999180c3b43e7385d44689b4b74053ace SHA512 ee10006a6f529e1860f9499cf85df90e19ec8f2c39d03c714465e8a72104bfd82ee09b062f56307c9483f579d1df646549d2bd17df4a77f62e4b9ad3cec31899
-EBUILD ktorrent-5.1.2-r1.ebuild 3056 BLAKE2B 7bce29b1c9ef8cb43e30df074abe8539df270172f2a2828397c19c1c6422acaad0a2ddae59b9b3ab645e4dd57e9fc5827167df3d1599df8729ed2681264f12a1 SHA512 aa6d6ed75b45f3526807ddf39bba2859c42c2b3e35d0c5f436e0b5592c4e96d5db7421076f7dee765f41b519e09c32fa4da0f8d3ba34b4758272420339d3eb75
+EBUILD ktorrent-5.1.2-r1.ebuild 3063 BLAKE2B 2cdcf72ed9b3d6193d289d1630c9c79c6c75fdebda904c010a39600babe1567f5d81e7d8a5a6855e49cc2903ee0bfb86a94b810680de2e7023e5b0fc8cc42827 SHA512 4ce7cfe84a0136e7bbadd2ffd08239b9eb064a00ba05066ff7e2dc0643ed69507119b9e29d3a5922814754fbee6f5ea12e33a257142e8bb2a5dff043a5d0bb75
 MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80
diff --git a/net-p2p/ktorrent/ktorrent-5.1.2-r1.ebuild b/net-p2p/ktorrent/ktorrent-5.1.2-r1.ebuild
index 6de16c595265..af5cd52308e7 100644
--- a/net-p2p/ktorrent/ktorrent-5.1.2-r1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-5.1.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/internet/ktorrent/"
 [[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV/%.0}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +magnetgenerator
 +mediaplayer rss +scanfolder +search +shutdown +stats +upnp +zeroconf"
 
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 7d81abafd03e..aca5a71612cf 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index cb01e3e69549..035834bf0706 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -9,4 +9,4 @@ DIST cups-2.3.0-source.tar.gz 8129049 BLAKE2B 738dbc7ee5ddcc9ffee44083cd93d8a0e7
 EBUILD cups-2.2.12.ebuild 9775 BLAKE2B 37d41f1388d74dcad7e71aa401593bd6e46f57ef9c257c177b83159a95804e357d773ef108fb69ef6ce5effff8e5f60b1d1bd78cdb4792834ecb6006840b89e7 SHA512 f2be9a200c0faaf11b35c19945dc18ed35ce90918357e1b680e09bd760b1f48fc9ea0f187d71064226daf0c78955794e342ac560b9d51b9260ddac08cb4d4200
 EBUILD cups-2.3.0.ebuild 9633 BLAKE2B 2b62636ffa95594e5b3985c3649120fc5deaea937035225ed5f70a4a3f3ceecf21b7eb1ab90a8568c6de0711c169131117de03f8c9ceac32a4493c9eec4494cb SHA512 26221b3b0b98c65dbda3820ccd7a5b88318bacca52d79af37d7cdc35efa441de6696f7082206f716a29001853960ca3f4e6a8ce8e6ef031e4b6025068dea57e1
 EBUILD cups-9999.ebuild 9633 BLAKE2B 2b62636ffa95594e5b3985c3649120fc5deaea937035225ed5f70a4a3f3ceecf21b7eb1ab90a8568c6de0711c169131117de03f8c9ceac32a4493c9eec4494cb SHA512 26221b3b0b98c65dbda3820ccd7a5b88318bacca52d79af37d7cdc35efa441de6696f7082206f716a29001853960ca3f4e6a8ce8e6ef031e4b6025068dea57e1
-MISC metadata.xml 677 BLAKE2B ca19e7bd0d56a0a78771a30efcbd867cd0ab1eba7aaf3add8d384721ac70ed8809bc8a171df43887d772f81dcfd54f31bc13267a9a3a88da44b51322aff87c15 SHA512 f7ed769c4f662ea52ed9e24702b91948a376e7d5a59b305f6d89950d0ea40130e6d471cc0bee373a63338f590bce3b6df5a09e56a166ba7fdd960f82e7648717
+MISC metadata.xml 733 BLAKE2B 2014cd9267e3f7f1a4f73124ab6bb9f4ba80b95ef08c9a781a03a95bbb3f97dadeb9e1a239d8dea5a6f6678d99eb906a2835df0168c13ba5456baff8ab3c6e0f SHA512 e4e2342cb4b0598fc23486753d9296254da78eb7d448fbdc250a2ba181e5692002e1e671799971c9cfaf25d40e034e3e2752836067b1b24813cfb3ed1b682e22
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index 50dcb809dbb0..eefca8bd29d2 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/metadata.xml
@@ -17,6 +17,7 @@
     </flag>
   </use>
   <upstream>
+    <remote-id type="cpe">cpe:/a:apple:cups</remote-id>
     <remote-id type="github">apple/cups</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 45e76264e689..42d2a3957c41 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -5,4 +5,4 @@ DIST hplip-3.19.8.tar.gz 25473983 BLAKE2B 8778b1b66164e38c1593c55b1a5b762679e82e
 EBUILD hplip-3.18.12.ebuild 7738 BLAKE2B 3a7f56fbf029ad197d8c3f5b20883cf387da98368564a0c76bc349440f9aee55a87c1a0ee71c07b8b6e5cab377432f2e13252aaea6d03c0252a1ad3b68490f43 SHA512 2904fd13f3b168a2c4dd8807a9f665e75cdbd9d2de36acc7bbbe49864764012e37ad1f47b1fc402d397c3e4bcd18d6946484aba1b4708e3f39396b5c4ffb47e1
 EBUILD hplip-3.19.6.ebuild 7743 BLAKE2B afd1f59ad7c15e2801d2cdaaac099061606ca22e1a229c391c46c7ec35220b894512d75e611671f16657db5d8cecf8d8fabb195277cfe898b713d9eaa8c9f904 SHA512 d283fc0e5784e9f9d3e298ab186d97692bf071bc2c12c5bec53ebe0c26094252f036858186e395f0a9e1c346407c53d21c3ca5c49e231884293e1039346ec62f
 EBUILD hplip-3.19.8.ebuild 7748 BLAKE2B 2bab14cdb4593b7cb0f5bd0eef84d098eb2c24db84e112941647c52e163eb375df884fc4c060e9385103c1d389f3cac857e9fb387f6bc843430464be5b57e691 SHA512 9ec707ecb7060d671f3b45e77d6870a37138ccffc820101af7966cf73d55def19748b5c2e89820dbe85e8b15522375e49824c603dba4aa1ddc120e8c872c103b
-MISC metadata.xml 1829 BLAKE2B 614757c5958bb24f223c75a252beb06014bfe7f47cfe58feb88be89918394224b7075e0d444d7bb898f9f478c2ae5cf572df3f905ff110ec1153cf1849cc8e46 SHA512 c6aae86cd5a200b7d42336f0884b87dc0b74d2b2216b8002929a56a53f42ec02447684eb8d0411e30ef707e01d930aac446866796c781f95a3463f84901666f6
+MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index 52a5e27617f0..26f82b7f1847 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -24,6 +24,7 @@
 		<flag name="X">Enables scanner GUI dependencies with USE="scanner" where <pkg>media-gfx/xsane</pkg> is preferred over <pkg>media-gfx/sane-frontends</pkg></flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:hp:linux_imaging_and_printing_project</remote-id>
 		<remote-id type="sourceforge">hplip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 8039c31d267c..7d2b0fa704ce 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 4374609dec35..4e8aa50de6d0 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,25 +6,23 @@ DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c2
 DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
 DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561abecc78b2b58b285ebb4b0ae498753d236f3a243d3b5c1115a9ff6e5fe9392d428314a6342e2c1907d6886e09e4 SHA512 48ee30a1057e92971c041b088b6aef16d6843da9ecee9b738aaa64bb55d3c3b0be090a37bb5fc63ac42fe34ce994820349cc770756136c823051039fa6d01f74
 DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
-DIST haproxy-1.8.19.tar.gz 2080757 BLAKE2B 46a97620f3b5c3f205e8b9d6e49acca8e107a1e6918ac18c036b9c3408666348400f8d9f6f4a4103e7f206c6373b25a224536c0969e2dad1013c2320b07b0ced SHA512 f62b0a18f19295986d26c5c60b6b1ad55850a175bed67a359282cc37a4c630a0c2be51d608226b4316f2e69c3008c20a1cb91ce10f86311219355973a050e65b
 DIST haproxy-1.8.20.tar.gz 2083917 BLAKE2B a73e01bacd6c3d256f92bba3dc5f1d38feea686d92d9ba2d93c33c082b10f84e0f150b3ce3e98cddaa664443c3661220f2993fea2d52bc3d6c32d5c913e70471 SHA512 c288ccf223da71a29ae0f08f3c9753002735816229ea83ca497d46c860fb8a4bd422077a94652aa475e48aefb78787979cdce7f1bd0b5919dc671ba25212c133
+DIST haproxy-1.8.21.tar.gz 2097089 BLAKE2B 359dba31685d4213721deb7bd553f2e037b960522e6b7727af45b87f4161b52bd02f47e5337e8003e5ae78dfcf1b0de1626af55dc1d177e98608c5d9799e8756 SHA512 a5244146150fd0e6d00eab3b1be0b778a242b393d72b09033d8edd99c434c4c8a25c326bf639ca7f7f7387a5cecd5033bd6e7159eca4c6dc18b580e893d2d274
 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
 DIST haproxy-1.9.10.tar.gz 2386066 BLAKE2B 4dea3f42686cd41d9f6f6849c42f9cf604b26f33925747ec5311243117bcf51729d16e5c09c5eb2cfc9fea88cf49c976a0542dcd90ddee4016b467de699e8bdc SHA512 b204c91633949d20dd06c29c69d2c783134819493f132430aaedddd2aad74eac08da7de7ddc1c45b250446273c35b268ab37fcb3b98eaa6b97b6caf5530ed628
-DIST haproxy-1.9.9.tar.gz 2383704 BLAKE2B 1596d6a96ba8d4b61343ede78e39b7a08b34619396a81ebfa44e42df26770ee3d425e8c091918af1471e7687d52b88131cc67f3de2c58af456b619638eb48985 SHA512 96d650097ef4840634987b31df181848e4940fc9a27a1d92f09c9ed304da299811c1b6592cb7e502c500607a7a0450c1fc50831168d44bf14492ed73b6e75ae5
-DIST haproxy-2.0.3.tar.gz 2534678 BLAKE2B 1753c1ac1cabbe50bd8c20a9b95ac317b9f726ae20bd22e402936b5cb4ee69bbe554b85331c8268704a564f437b1990d831a3e21737df2f9b6c709fb58f638ec SHA512 dd7eaf7e05c9b3ee162fcc17bc116f81184523437d6f4dbd940b0a6a8e4d01e1984fc8fabafcfc20261203e60e8bd0bc5b0bf813f5eff47b9ba364465bd0633c
 DIST haproxy-2.0.4.tar.gz 2538442 BLAKE2B 95dd770d1424a7d783a2bcbdc4b2a39271b633826e458edf8e9323a20422e25ebeaf4d866195f9bafe464cb457f62d7a4ea50ba03821a0910d81e02513a73135 SHA512 38b5dc86b2947418b4af0bb746958abb1b40dec64f1f6969e8643f3e6ac7f553c9ea2b37ef21086f5c795834c0943feedee31cc4498b095037630bb16987ac75
+DIST haproxy-2.0.5.tar.gz 2539226 BLAKE2B 63218261ff4c5b4efb26ec1d255270d1c5cfca6744c325dbe5c65fff09bf922f6623702b67ca0253791a6fe626170008cb6dbc70c7e8547733006a1cc784b871 SHA512 501de6d81e0d07dbe5f57f416d485ebe125144745441c0f5341d6000c92514f723f35a7402f2cb7b404e1d6e6b4ba4148ef7360799b2ecf3bd6b1e3d6805097b
 EBUILD haproxy-1.6.11-r2.ebuild 4672 BLAKE2B 74b3adb390a7fa1d596e8e91f4ca5fbb46d7dfd201527956a514a3f0855f575b2fc1115b388126d8e54a1a80f13b5b62acb59f53eb92a5bd9ef3f02ab3867c38 SHA512 843c39796ab641d5036dc2f1d151da41acc5820713dd2c2857c551d684b0a5922abead4e9c2afb031bb75635842e9ead645ced6d9cebfa97ccc2f719caed8c58
 EBUILD haproxy-1.6.14.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5cc71412be2c7430cf769c091f75030d678bf29f56d3bbb432c04f26fd45686333c8b2e282c25ae2dee7eceeb00 SHA512 32ae8badac30ea423613301815c4ccb07a6b81368dc92dc561f13d7432cde041048735cc4790659b4f1827a77e7009120e7977a54a15d164229a41d54d1b1e1b
 EBUILD haproxy-1.7.10.ebuild 4628 BLAKE2B 267e5228e4c1eb2386ab13a6f21d018e8f8643d9adcdb61851d150b281e2241eda97c701b4577fef8feee00c01409f8f2fc715a9681874fc05fc3f89c09da440 SHA512 941f9c3e0982ee44d51339b3feef43d93c7259413f2d77f8919e63056a0d0504468bd0637965141842af6c8dbb223f23155ffc0728f54bc1bbf539eef678c235
 EBUILD haproxy-1.7.11.ebuild 4632 BLAKE2B 06dd613111ce7410ce9190b2cbd825f4b9acd16d3c9995ca507fda90a77696e6c931b2f2caeb916ed0f6894110edaa056df5923c204107230af6a4f596c061ab SHA512 bb080ed92cbef8e2851262648519b5e0563749e3bd92396707791775801bf19f029e57fbe4fa029ea240cbc8f55b14e91d5656e85101fb2dc1e8ae219d111d51
 EBUILD haproxy-1.8.13.ebuild 4886 BLAKE2B 61bc37ea42b0dd5bc447b68cb45532c184f14ad40461faddb940e041682e88ac81af36ce44d961d1011bc54b788ad9baa4c9447950a97708ea33dcb9d677fc32 SHA512 5dad241368a64aba2b07e429ab82adff67df556fc2b5a447d4863a12d50098545127f30725887b447e6ed583e39177458267777c5b321636211aab5a61b85a65
-EBUILD haproxy-1.8.19.ebuild 4886 BLAKE2B 94d1654d71261f4d4e3d4984cf2afae1721c3f5d85f5caec1f7ba7be2a2f3c0889a2de02fd542b18f8a2fe0222debfd35f47c3fdcde0cbb8122dc493fec021a5 SHA512 a006987c4cf8f56bca0347537cf86e9282d5f0b5cb1864665104d1e93da53084711bac338dce99b1f6cdccfa1fec7534dc58cb7139c126fcc3b6131d371b7dce
 EBUILD haproxy-1.8.20.ebuild 4886 BLAKE2B 94d1654d71261f4d4e3d4984cf2afae1721c3f5d85f5caec1f7ba7be2a2f3c0889a2de02fd542b18f8a2fe0222debfd35f47c3fdcde0cbb8122dc493fec021a5 SHA512 a006987c4cf8f56bca0347537cf86e9282d5f0b5cb1864665104d1e93da53084711bac338dce99b1f6cdccfa1fec7534dc58cb7139c126fcc3b6131d371b7dce
+EBUILD haproxy-1.8.21.ebuild 4886 BLAKE2B 94d1654d71261f4d4e3d4984cf2afae1721c3f5d85f5caec1f7ba7be2a2f3c0889a2de02fd542b18f8a2fe0222debfd35f47c3fdcde0cbb8122dc493fec021a5 SHA512 a006987c4cf8f56bca0347537cf86e9282d5f0b5cb1864665104d1e93da53084711bac338dce99b1f6cdccfa1fec7534dc58cb7139c126fcc3b6131d371b7dce
 EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8
 EBUILD haproxy-1.9.10.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d
-EBUILD haproxy-1.9.9.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d
 EBUILD haproxy-1.9.9999.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d
-EBUILD haproxy-2.0.3.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
 EBUILD haproxy-2.0.4.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
+EBUILD haproxy-2.0.5.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
 EBUILD haproxy-2.0.9999.ebuild 5095 BLAKE2B d61671818bd8045a2f3330c4bc2b99cbfcac57ea17beb9047de23dcbbd9b91cf617e00043845900da2c3e9c085c398b1ab9be7295e3c9e77e84907b5b79f80f2 SHA512 ce7ed08cf23efa5898c4ba3179c2b7ff0c1612a0b1d2c1a7811a0514c711ba0c4a06c0cdb80a88707d36e7fccc3b4e42a4163b4bcf89ef4fbc589a99eb8fc936
 MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-1.8.19.ebuild b/net-proxy/haproxy/haproxy-1.8.21.ebuild
index be9a23a9cd27..be9a23a9cd27 100644
--- a/net-proxy/haproxy/haproxy-1.8.19.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.21.ebuild
diff --git a/net-proxy/haproxy/haproxy-1.9.9.ebuild b/net-proxy/haproxy/haproxy-1.9.9.ebuild
deleted file mode 100644
index 0eacacdc48d8..000000000000
--- a/net-proxy/haproxy/haproxy-1.9.9.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
-systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	pcre2-jit? ( pcre2 )
-	pcre? ( !pcre2 )
-	device-atlas? ( pcre )
-	?? ( slz zlib )"
-
-DEPEND="
-	pcre? (
-		dev-libs/libpcre
-		pcre-jit? ( dev-libs/libpcre[jit] )
-	)
-	pcre2? (
-		dev-libs/libpcre
-		pcre2-jit? ( dev-libs/libpcre2[jit] )
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[zlib?] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	slz? ( dev-libs/libslz:= )
-	zlib? ( sys-libs/zlib )
-	lua? ( dev-lang/lua:5.3 )
-	device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux2628
-		USE_GETADDRINFO=1
-		USE_TFO=1
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE) )
-	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-	args+=( $(haproxy_use pcre2 PCRE2) )
-	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-
-	# For now, until the strict-aliasing breakage will be fixed
-	append-cflags -fno-strict-aliasing
-
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-	emake -C contrib/systemd SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for contrib in ${CONTRIBS[@]} ; do
-			# Those two includes are a workaround for hpack Makefile missing those
-			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd" $PN
-	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
-
-	doman doc/haproxy.1
-
-	systemd_dounit contrib/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc ROADMAP doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc examples/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.0.3.ebuild b/net-proxy/haproxy/haproxy-2.0.5.ebuild
index 06e10c936692..06e10c936692 100644
--- a/net-proxy/haproxy/haproxy-2.0.3.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.5.ebuild
diff --git a/net-proxy/http-replicator/Manifest b/net-proxy/http-replicator/Manifest
index e9d7d1636578..4dc74aabb5cd 100644
--- a/net-proxy/http-replicator/Manifest
+++ b/net-proxy/http-replicator/Manifest
@@ -1,18 +1,11 @@
-AUX http-replicator-3-missing-directory.patch 1776 BLAKE2B 66b3b0190512b77a62487f8a2828a46de8af27bce4393d14152de3542a4e9eac61855d2d9e5da196f7f4271a9432cc2b8bb599215d7fdc2012ce0c498dcca346 SHA512 8c4d9f563bb73ee2b237fadc7c062c8cfbc1510c9f7fc597974fbc727f61fffc9b3d79285904fcac755dc12c7603d7d4efd1d25978df6ddfc797b44c6c17570b
-AUX http-replicator-3-unique-cache-name.patch 1195 BLAKE2B c988c7f5f2beaa480ca01a46bc6f28a8158d975b8951c8373be23b64d12a3c141c0d87bd603439ae21788c64f315c64b1b313f36907ddfa890cf54540e294445 SHA512 c1fd6d4c5e7dee1e58b6289dee5b7aa97c577ccf0099b02dc99b6a80a64b25f5e2f5321563fac9fa86beeb51b77edce321b9997144a0bf23104560577b857291
 AUX http-replicator-3.0-callrepcacheman-0.1 86 BLAKE2B 70095254d21cdbf403cc81998c879b80fa6df52c8a4e8be677dfa1960d0faa044eadfc44948c699d5dcec1a481275a8c5527f600e322a8b06dcd63531654a2a2 SHA512 144490fd854e22fce95e6a6891a3e65e8af001b5e421bec39b20ee4cf39709424a922f7852bf48ecf43b5b9755213e7149a2a3784bbc3a3e5542072d8d3bda3d
 AUX http-replicator-3.0-repcacheman-0.44-r2 5337 BLAKE2B 3b6c8b16b34cb3ef9b98408cb0272aa2fec51b87d011dc9de7014e6d7fc5e995343a7447ca79a8b951544a642e38d685ec0ac7f0137a1975780686a6e4a62791 SHA512 c917d47327a55699deb346e53aef1ba9a5eda81f6947ac4efe8422422a2cba668a3ed12c0f89bf840e4ad94dd6272b3d6eb705d1e78e58ddef90b21307ff8d15
-AUX http-replicator-3.0-sighup.patch 993 BLAKE2B 82709484ea1f5e63ae5eb883339f4561f7ed05625453c18c8d74207c8ea33b5a6bcc6aab69b9e1e8fd86e2d49e4b4d94fe0a438f1939cc34e6ec60543894e43c SHA512 25da23acd8c235f2b0dbe2f424a92a161d3f4e96e5bea67973004c7bb0642640b73d528b1675174a611bef35f34cc18de08d78c3464cb6080f4f44f833173aee
-AUX http-replicator-3.0.conf 1704 BLAKE2B d496ff21d492ca89fdfb64467de902481fe2c7bbec96227cac6ade3dd05850c74875062058dba491778fb06409b396cad7e4876106cc521bc642268976129479 SHA512 c56031c303f79a44a006781b3796abaae24f1b8ea368eb0436a7ada8defe0f92382649098aef7c41372bfbf1889a17468af201669756912e0c55985c5981fb4c
-AUX http-replicator-3.0.init 620 BLAKE2B 48e44e912233e58e598d9c041e6f1ad4bea48fb67cceb41ae13c008067e28bef2b4a6c35205b0f274c5124a54d48fb32f3334e12716b33c0bf2a29c1c5bc84f8 SHA512 e69143963155cdc03874b51dc0eef8a46bee3d7828bf20bdb50b4ea9ea6bb2e4fd705e1d9ee4864e53488e4035aa91ebd47f02a597bfa1ee6d5b7121ac5fd68d
 AUX http-replicator-4.0_alpha2-ipv6.patch 2266 BLAKE2B c5f7f87346adc5c237eb34a7cb1497eac2de58388c296eaf00d80a02f0d0bd34619e0044fb4674065e43489461d506c76dc52b04b80c1be2ea92a52b21eed4eb SHA512 70793ee864630156cd25453c2bae4c1bde40b7378d938f45e39b94e8ac8fa1e7a779d6535fbe3a5a5f1b44a4297c6910ac51ce4cb80321f96d26a08559b1f22e
 AUX http-replicator-4.0_alpha2-r2.conf 1440 BLAKE2B 1ab4c03ff638ec90c6c29884713522c4b7f2092618752309e66ae93d4e7955e09bb9f9941e87d6b14223f7b27edb0cb8c29510ce259437719099d3ad11cb1e29 SHA512 e6237c8b7eeb319615d45abdef4feaca6bbeb741bc75e80173e42328e4eb5f4192edfbf42c7e6e307c14d258e7ec67a0ae6451ff7daef631b2d1e39fe17a48fb
 AUX http-replicator-4.0_alpha2-r3-pid.patch 2681 BLAKE2B 4ae5e263c5476f402dde1bcb2f1b668e648611c46a785bbdeb58dfc75abab4ddabf95783848eb20c3d447448b1c9c5aa210601669de2a4926aba9ff08ee04103 SHA512 9ceb6ede3ec31fd7f702ac77a51897301fd7b16baee869a82180f388949ff7388f0917d667786b45643603c0e9d655cd8686948d5e34896c1fe5932fd76e42b5
 AUX http-replicator-4.0_alpha2-r3.init 644 BLAKE2B cf017fcd078532960e16e4c9735ab4df62d65794ac961798ffd39760fb860199d87322e0792ec759f48d2e9ddaa3134bbc52d9ed39c6d4f564b981d6873cdb72 SHA512 b1a8bd956d35cc536b835aac6cb82202f0b6b775d7eae81ac30f501d1c72877d093711e0f00a28eb7645a383e211d3196379b37da1e0421773c1b91ed6d3837b
 AUX http-replicator.service 258 BLAKE2B 15b50f430e58794115060e37350c5e6cc18225a0fbe27b07fc71a12979e3420cf5029554ee031bed8762af883a165d2b27f3f1c661124410569231fe16437102 SHA512 0da767205c21c226563eb2210a12d92d7933431245fad9bf8766eda59b1f4a16905cadcfb796b3aef86978eb06b153eb976b12f4f7e19d468654c1722e266352
 AUX http-replicator.service.conf 164 BLAKE2B 28006ec4c4b27eb1f75276432e30c0f9b33cb432ea0123794db0b25c5f36d4fd9f771c23d6852b8e061a9d30ab0ed2b86b42b0cdf3d8b2f29be0ac6cf4276c35 SHA512 0a1854ddb9f5b8631bdf6a837f1c91b895652803b3e1b6b98fba8f67dba0488a61f8864ddd4128d8072353a38349d9848e91a5109b317c37e1ca2598d0ac2333
-DIST http-replicator_3.0.tar.gz 39291 BLAKE2B a97d8b6b32f5d4ca4feefa9abaa7da7cb6570f76566c79d7371134c0edd74b2333a02480deff02fa1bf5b6cd6f2bfbfe4aaa649633d70bd2efbdd22701422651 SHA512 d98a608c38201db6f2d8ba809a4777ab5588f5ed395882bdf542c2788df1770c61a2de160604c09297d847f2c73463ba0530d7f2c2e482467f8e8f35be068d57
 DIST http-replicator_4.0alpha2.tgz 27575 BLAKE2B 48138bc8fa9695ddb31ce89c4638adda4a1d1b58c904cd98d0ee1dbab006f79ef7d19495db8eb4de0113f8e45da425950524c48ec9e3e864d8595ccdef9f7cfa SHA512 437e0cc881af0cb8f84bfd1366bb6edeee4f76112c4b2ac2af4bcb8809462852b96e9c99e04c8f370492c9e1eb33ddc68a85c4f09b073694242cd6c05b4d3a6c
-EBUILD http-replicator-3.0-r8.ebuild 3440 BLAKE2B b248cb96be039e50c74700c71432255868e909947f3b574181e0f60bc504d390e25492aee3b6b6b3ec8c893a12b67e66102aa9e3eaec1c54f093919852aac177 SHA512 566f524981543de73a1b9f878b49a547b41b618130a950ba7b92b12590eb191fc79468d23fd659f414dd0fdabf1f1b0aff9b873b88a0686cb1fef231f463acb4
 EBUILD http-replicator-4.0_alpha2-r7.ebuild 2043 BLAKE2B cbd3074454afce3164e8ee2fc81a8af29c9b991ea8c3098a2f2fa482165e3dac4bcc9745e07fd6c55361c8c0294d00d0f0f1f1d91516b4cdad29a0db0c6fa705 SHA512 16231c53131e94f63fe401acfb155354e83313895dc0596ab5d945f8f6fac6fbbb57bd257db0763e9a285afb5cc5ca8149e4c10f6a570f9e3688862b2f95f385
 MISC metadata.xml 252 BLAKE2B 5386635b038f2498cadf1730fa7ae823427900b961296f4acca678ea12eb7c66ed7ad6cbca15afd26042c7af8d687958c702a9c48fc00856b460e2b49e55b2ac SHA512 ffd7c4cd77545f753618c9e9cfeba05b557044879ce332c01deaad820e184329cf383c8488ba777e9653029d3f75e5c99936ca225ebc4a5fb9b4d4e257ba8e7d
diff --git a/net-proxy/http-replicator/files/http-replicator-3-missing-directory.patch b/net-proxy/http-replicator/files/http-replicator-3-missing-directory.patch
deleted file mode 100644
index 37c2ce2361f3..000000000000
--- a/net-proxy/http-replicator/files/http-replicator-3-missing-directory.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Author: Matthew Ogilvie
-Date:   Sat Jan 17 09:24:34 2015 -0700
-
-    add some suggestions to the missing-directory error message
-    
-    Also wait until directory confirmed before forking.
-    
-    See gentoo bug 502574 and bug 442874
-
-diff --git a/http-replicator b/http-replicator
-index bbc163c..81e254d 100755
---- a/http-replicator
-+++ b/http-replicator
-@@ -636,13 +636,6 @@ def main ():
- 				parser.error('user %r does not exist' % options.user)
- 			except OSError:
- 				parser.error('no permission for changing to user %r' % options.user)
--		pid = os.fork() # fork process
--		if pid: # parent process
--			pidfile.write(str(pid)) # store child's pid
--			pidfile.close()
--			return
--		else:
--			signal.signal(signal.SIGHUP, signal.SIG_IGN)
- 	else:
- 		handler = logging.StreamHandler(sys.stdout) # log to stdout
- 		handler.setFormatter(logging.Formatter('%(levelname)s: %(name)s %(message)s'))
-@@ -651,10 +644,22 @@ def main ():
- 	try:
- 		os.chdir(options.dir) # change to cache directory
- 	except OSError:
--		parser.error('invalid directory %r' % options.dir)
-+		parser.error('invalid directory %r\n' \
-+		             'Try running repcacheman, and/or see\n' \
-+		             'http://forums.gentoo.org/viewtopic-t-173226.html' \
-+				 % options.dir)
- 	if not os.access(os.curdir, os.R_OK | os.W_OK): # check permissions for cache directory
- 		parser.error('no read/write permission for directory %r' % options.dir)
- 
-+	if options.daemon:
-+		pid = os.fork() # fork process
-+		if pid: # parent process
-+			pidfile.write(str(pid)) # store child's pid
-+			pidfile.close()
-+			return
-+		else:
-+			signal.signal(signal.SIGHUP, signal.SIG_IGN)
-+
- 	sys.stdout = sys.stderr = open('/dev/null', 'w') # redirect all output to bit bucket
- 	logging.root.name = 'HttpReplicator'
- 	try:
diff --git a/net-proxy/http-replicator/files/http-replicator-3-unique-cache-name.patch b/net-proxy/http-replicator/files/http-replicator-3-unique-cache-name.patch
deleted file mode 100644
index 3ad0529ed16a..000000000000
--- a/net-proxy/http-replicator/files/http-replicator-3-unique-cache-name.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Matthew Ogilvie
-Date:   Sun Dec 28 20:14:15 2014 -0700
-
-    honor x-unique-cache-name header in flat mode, if present
-    
-    This allows things like different versions of the adobe-flash
-    downloader that are given different names in a flat download
-    directory (like in gentoo) to work in an http-replicator cache
-    as well.  As long as the fetcher passes the custom name through
-    the experimental header...
-    
-    See gentoo bug # 442874
-
-diff --git a/http-replicator b/http-replicator
-index 19ae427..befe9f2 100755
---- a/http-replicator
-+++ b/http-replicator
-@@ -311,7 +311,12 @@ class HttpClient (Http):
- 			self.log.info('requested range: bytes %s to %s' % self.range) # log request
- 
- 		head = ''
--		for tail in self.path.split('/'): # iterate over items in path
-+		adjUrlPath = self.path
-+		if not self.direct and self.flat:
-+			uniqueCacheName = body.get('x-unique-cache-name')
-+			if uniqueCacheName:
-+				adjUrlPath = uniqueCacheName
-+		for tail in adjUrlPath.split('/'): # iterate over items in path
- 			head = os.path.join(head, tail) # build target path
- 			if head in self.alias: # path up till now hos an alias
- 				head = self.alias[head] # replace by alias
diff --git a/net-proxy/http-replicator/files/http-replicator-3.0-sighup.patch b/net-proxy/http-replicator/files/http-replicator-3.0-sighup.patch
deleted file mode 100644
index 969bbc91f9da..000000000000
--- a/net-proxy/http-replicator/files/http-replicator-3.0-sighup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/http-replicator	2007-07-09 20:09:44.000000000 +0200
-+++ b/http-replicator	2007-07-09 20:11:48.433913445 +0200
-@@ -5,7 +5,7 @@
- #  Because of this the server runs as a single process, multiplexing I/O with its various client and server connections within a single process/thread.
- #  According to the readme <http://www.nightmare.com/medusa/README.html> this means it is capable of smoother and higher performance than most other servers, while placing a dramatically reduced load on the server machine.
- 
--import asyncore, socket, os, time, calendar, sys, re, optparse, logging
-+import asyncore, socket, os, time, calendar, sys, re, optparse, logging, signal
- 
- #  LISTENER
- #
-@@ -636,6 +636,8 @@
- 			pidfile.write(str(pid)) # store child's pid
- 			pidfile.close()
- 			return
-+		else:
-+			signal.signal(signal.SIGHUP, signal.SIG_IGN)
- 	else:
- 		handler = logging.StreamHandler(sys.stdout) # log to stdout
- 		handler.setFormatter(logging.Formatter('%(levelname)s: %(name)s %(message)s'))
diff --git a/net-proxy/http-replicator/files/http-replicator-3.0.conf b/net-proxy/http-replicator/files/http-replicator-3.0.conf
deleted file mode 100644
index 35671fd262c0..000000000000
--- a/net-proxy/http-replicator/files/http-replicator-3.0.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-## Config file for http-replicator
-## sourced by init scripts automatically
-## GENERAL_OPTS used by repcacheman
-## DAEMON_OPTS used by http-replicator
-
-
-## Set the cache dir
-GENERAL_OPTS="--dir /var/cache/http-replicator"
-
-## Change UID/GID to user after opening the log and pid file.
-## 'user' must have read/write access to cache dir:
-GENERAL_OPTS="$GENERAL_OPTS --user portage"
-
-## Don't change or comment this out:
-DAEMON_OPTS="$GENERAL_OPTS"
-
-## Do you need a proxy to reach the internet?
-## This will forward requests to an external proxy server:
-## Use one of the following, not both:
-#DAEMON_OPTS="$DAEMON_OPTS --external somehost:1234"
-#DAEMON_OPTS="$DAEMON_OPTS --external username:password@host:port"
-
-## Local dir to serve clients.  Great for serving binary packages
-## See PKDIR and PORTAGE_BINHOST settings in 'man make.conf'
-## --alias /path/to/serve:location will make /path/to/serve
-## browsable at http://http-replicator.com:port/location
-DAEMON_OPTS="$DAEMON_OPTS --alias /usr/portage/packages:packages"
-
-## Dir to hold the log file:
-DAEMON_OPTS="$DAEMON_OPTS --log /var/log/http-replicator.log"
-
-## Make the log messages less and less verbose.
-## Up to four times to make it extremely quiet.
-#DAEMON_OPTS="$DAEMON_OPTS --quiet"
-#DAEMON_OPTS="$DAEMON_OPTS --quiet"
-
-## Make the log messages extra verbose for debugging.
-#DAEMON_OPTS="$DAEMON_OPTS --debug"
-
-## The ip addresses from which access is allowed. Can be used as many times
-## as necessary. Access from localhost is allowed by default.
-DAEMON_OPTS="$DAEMON_OPTS --ip 192.168.*.*"
-DAEMON_OPTS="$DAEMON_OPTS --ip 10.*.*.*"
-
-## The proxy port on which the server listens for http requests:
-DAEMON_OPTS="$DAEMON_OPTS --port 8080"
diff --git a/net-proxy/http-replicator/files/http-replicator-3.0.init b/net-proxy/http-replicator/files/http-replicator-3.0.init
deleted file mode 100644
index 7fc3d5e108da..000000000000
--- a/net-proxy/http-replicator/files/http-replicator-3.0.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Http-Replicator"
-	start-stop-daemon --start --pidfile /var/run/http-replicator.pid --name http-replicator \
-		--exec /usr/bin/http-replicator -- -s -f --pid /var/run/http-replicator.pid --daemon $DAEMON_OPTS
-	eend $? "Failed to start Http-Replicator"
-}
-
-stop() {
-	ebegin "Stopping Http-Replicator"
-	start-stop-daemon --stop --pidfile /var/run/http-replicator.pid --name http-replicator --signal 2
-	eend $? "Failed to stop Http-Replicator"
-}
diff --git a/net-proxy/http-replicator/http-replicator-3.0-r8.ebuild b/net-proxy/http-replicator/http-replicator-3.0-r8.ebuild
deleted file mode 100644
index 28f535c83dca..000000000000
--- a/net-proxy/http-replicator/http-replicator-3.0-r8.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 ) # not 2.6 bug #33907, not 3.0 bug #411083
-
-inherit eutils python-single-r1 systemd
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Proxy cache for Gentoo packages"
-HOMEPAGE="https://sourceforge.net/projects/http-replicator"
-SRC_URI="mirror://sourceforge/http-replicator/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ~sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/http-replicator-3.0-sighup.patch"
-	"${FILESDIR}/http-replicator-3-unique-cache-name.patch"
-	"${FILESDIR}/http-replicator-3-missing-directory.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	# Daemon and repcacheman into /usr/bin
-	python_scriptinto /usr/bin
-	python_doscript http-replicator
-	python_newscript "${FILESDIR}/http-replicator-3.0-repcacheman-0.44-r2" repcacheman.py
-
-	exeinto /usr/bin
-	newexe "${FILESDIR}/http-replicator-3.0-callrepcacheman-0.1" repcacheman
-
-	# init.d scripts
-	newinitd "${FILESDIR}/http-replicator-3.0.init" http-replicator
-	newconfd "${FILESDIR}/http-replicator-3.0.conf" http-replicator
-
-	systemd_dounit "${FILESDIR}"/http-replicator.service
-	systemd_install_serviced "${FILESDIR}"/http-replicator.service.conf
-
-	# Docs
-	dodoc README debian/changelog
-
-	# Man Page - Not Gentooified yet
-	doman http-replicator.1
-
-	insinto /etc/logrotate.d
-	newins debian/logrotate http-replicator
-}
-
-pkg_postinst() {
-	elog
-	ewarn "Before starting http-replicator, please follow the next few steps:"
-	elog "- Modify /etc/conf.d/http-replicator if required."
-	ewarn "- Run /usr/bin/repcacheman to set up the cache."
-	elog "- Add http_proxy=\"http://serveraddress:8080\" to make.conf on"
-	elog "  the server as well as on the client machines."
-	elog "- Make sure FETCHCOMMAND adds the X-unique-cache-name header to"
-	elog "  HTTP requests in make.conf (or maybe portage will add it to"
-	elog "  the default make.globals someday).  Example:"
-	elog '   FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" --header=\"X-unique-cache-name: \${FILE}\" \"\${URI}\""'
-	elog '   RESUMECOMMAND="wget -c -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" --header=\"X-unique-cache-name: \${FILE}\" \"\${URI}\""'
-	elog "- Arrange to periodically run repcacheman on this server,"
-	elog "  to clean up the local /usr/portage/distfiles directory."
-	elog "- Arrange to periodically run something like the following"
-	elog "  on this server.  'eclean' is in app-portage/gentoolkit."
-	elog "    ( export DISTDIR=/var/cache/http-replicator/"
-	elog "      eclean -i distfiles )"
-	elog "- Even with FETCHCOMMAND fixing most cases, occasionally"
-	elog "  an older invalid version of a file may end up in the cache,"
-	elog "  causing checksum failures when portage tries to fetch"
-	elog "  it.  To recover, either use eclean (above), manually delete"
-	elog "  the relevant file from the cache, or temporarily comment"
-	elog "  out the http_proxy setting.  Commenting only requires"
-	elog "  access to client config, not server cache."
-	elog "- Make sure GENTOO_MIRRORS in /etc/portage/make.conf starts"
-	elog "  with several good http mirrors."
-	elog
-	elog "For more information please refer to the following forum thread:"
-	elog "  http://forums.gentoo.org/viewtopic-t-173226.html"
-	elog
-}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index dcf2362385e4..01de0d1bada1 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 90d2db5e5baf..38f60e8ee447 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -10,6 +10,6 @@ AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a591
 AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e5990750674cfdf6fd7395db3c0bf4520f4d81896d802cf62a25d1abbf46784f09c581a1fb0b72ef8a27131d4cf65d8 SHA512 a1af572809ec71a1796ec66fa1d2fcea6fb7624bdb9a629791707b182310bf41d1a109cc19e0fe034f4b4ae5e5816d809ece2eb4410e7f47827ec1b86c82b3a1
 DIST bluez-5.50-fedora-backports.tar.xz 32232 BLAKE2B 35244036bbe18481e32bef2dcd4a223d44442ce28cee85a3a736bfbf5ee9d74372fa6366dc1102bf86babada608966a8c30b1c2537859a3741c289cabbc76026 SHA512 6d33e8bc67e50dc0d4cee3fa080402a51ddc8b6549f19b6c272de7dc51604eab23f909322f01aaca8a834abdc3cfd0bf24bb8623071af0cf0611d7427c9d8e9a
 DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45
-EBUILD bluez-5.50-r2.ebuild 8157 BLAKE2B 8156c32dd8c0df0f84e48971a23f1bfabcbee9dee023390d4e8b0747ef2cf895811fb097242e3eb7402f1b716b2f18b5ed5eefd8929e1e2f5df46c0f401630cf SHA512 ef118fbbedad97e9a99601f60cdd32c02eab7ae782ab875c8126ed921a00ff8117cc3f31628605b08ff1169ebe1858b26b80e9b3ff36ca0c3216cc7ca9acdc7f
+EBUILD bluez-5.50-r2.ebuild 8152 BLAKE2B 9a5973bb8fade0c504fcbc425d79c895a4c86122b4eb91fd77b03a8b11f3db70dd72a264c82e2f3c8b13a89d2e54b6bad51b3b257665f30ad9c4878ee9c3f8c6 SHA512 c22e0b7230c3b8ec1c30eb6b1df3e2323379aa453206afebb146338c60a8e695f37b2dc4778a733262fa9068664a4e07f5f8cd26347d758384f047fd8201d0fa
 EBUILD bluez-5.50-r3.ebuild 7990 BLAKE2B a909e6b969f90d3602db76fbf1614df14507cce2ca6b131f36fd5617033083b7a7fbe3f97bf315d85d9438b9b5f30d5ed82f1ad2601707378c19204af3f85ebc SHA512 b0d65fa1383bbb03dfa5db4c5b24880ddace37b200bb00fd68c49d3609c6505b4f502fdaab0d56576b05f4f75278372932de98f70b00f11c9ba26e317d911ceb
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.50-r2.ebuild b/net-wireless/bluez/bluez-5.50-r2.ebuild
index 5415ba0b6795..4c335870096f 100644
--- a/net-wireless/bluez/bluez-5.50-r2.ebuild
+++ b/net-wireless/bluez/bluez-5.50-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 readme.gentoo-r1 systemd udev user multilib-minimal
+inherit autotools python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
 
 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
 HOMEPAGE="http://www.bluez.org"
@@ -53,6 +53,7 @@ DEPEND="
 	udev? ( >=virtual/udev-172 )
 "
 RDEPEND="${DEPEND}
+	acct-group/plugdev
 	selinux? ( sec-policy/selinux-bluetooth )
 	test-programs? ( ${TEST_DEPS} )
 "
@@ -86,8 +87,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	enewgroup plugdev
-
 	if use test || use test-programs; then
 		python-single-r1_pkg_setup
 	fi
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 5bb74f966c88..6e5f06cf16ff 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,4 +1,4 @@
 AUX 61-gnome-bluetooth.rules 399 BLAKE2B ba3dd9fdc3834ce6a3460d8abff179d08c1258f7ba43e2350ed2c7e88aaf6fef4b06c51b6212650523c4de577cb3a85946bae9b955cf6c17a0c984431abd5d2b SHA512 74fd95e2afb3d3f13df72bb593ae6644a3a4975e43f5f50c622f14f756861596ef92aa331200d9fce6ff3976e8a1ed57e4053186b7a9716039ace971a6dfed0d
 DIST gnome-bluetooth-3.28.2.tar.xz 349456 BLAKE2B 24a8adbbd37a6a7338a10bb84fd113c3a65bb9c5ef277c9df082f10f52b9d9dc2bc3ff6182993fd85fb5f5f8269a965f0aba864f73ed8595a700a51e59242fc1 SHA512 03f66f8c5c195b10cf2c13dc93191b9f2f79adae099ddb8037ef1277731f37b8f0a42b603e8aacbe2fb108be6abf7a77a823d86d5fac62a42a53e3498d53d87e
-EBUILD gnome-bluetooth-3.28.2.ebuild 1439 BLAKE2B c9833e1a82c420c0a8073abbdb5841bc6ee2e5ba7104fec68d74c916907fe8995cbfa00fbbff3439923a65ab5ea3d538c6305ecd65715d7f95496da85b077760 SHA512 1e65c3c9a0c92fd81551218611ccbfc34fa7cba3b2b8ac602552414a5541b92aed0dbbd5069a1b03ff1ef4f0d29ec5f072f6793de7948fcb643a9be09b16246c
+EBUILD gnome-bluetooth-3.28.2.ebuild 1422 BLAKE2B 3cc1a98ac82cecaeb19a6ccafcff223da18b52187295d8122b185942146f10cc59fc91af72278f8ed33d2411f576dcdccb821a95e16d299ddd9b7b6109fe2d5a SHA512 0899e136be0a00ccb890ce076426bfbb5689cccdada82e1831b851a8cc09ff1b191db3e94031a3eaacf5eb1940d37c7165499cdbcfefff48d9506c81c5ce7c6d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.28.2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.28.2.ebuild
index 9cbfd6f8efd0..67dc1ab5ae02 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.28.2.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.28.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome.org gnome2-utils meson udev user xdg
+inherit gnome.org gnome2-utils meson udev xdg
 
 DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
@@ -21,6 +21,7 @@ COMMON_DEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 "
 RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
 	virtual/udev
 	>=net-wireless/bluez-5
 "
@@ -33,10 +34,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
-pkg_setup() {
-	enewgroup plugdev
-}
-
 src_configure() {
 	local emesonargs=(
 		-Dicon_update=false
@@ -53,7 +50,7 @@ src_install() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	if ! has_version sys-auth/consolekit[acl] && ! has_version sys-apps/systemd[acl] ; then
+	if ! has_version 'sys-auth/consolekit[acl]' && ! has_version 'sys-apps/systemd[acl]' ; then
 		elog "Don't forget to add yourself to the plugdev group "
 		elog "if you want to be able to control bluetooth transmitter."
 	fi
diff --git a/net-wireless/gr-scan/Manifest b/net-wireless/gr-scan/Manifest
index 5ffdc5620078..7cce3e2f662f 100644
--- a/net-wireless/gr-scan/Manifest
+++ b/net-wireless/gr-scan/Manifest
@@ -1,3 +1,3 @@
-DIST gr-scan-20160104.tar.xz 17804 BLAKE2B c7b2a4d77e9ddbbb0a1fb81b8c4da0f61b9a8bcb516c3ad1e53a46b98d045f61c09da85761300fc11551827a07077296f04faa7f0b675587d455e84af745aecb SHA512 e19a2053b5fe6c4db6f397cfce6313306f4357964dc32ee6c41a7aaec9a36407d06d90cf32d3fc916ac04f74dc76d75c7b20502227559a489a99d323ea585b50
-EBUILD gr-scan-20160104.ebuild 474 BLAKE2B 589dd4f244707962ab112ef0d0feebb330a2e60f158bbacca2302aa410bdd88c290082696d2d6170df8189bb11d921f4f2dc244a88730740a49c85c64d9bcc7d SHA512 304d5c68d90ad150fcb21114af610c26b0ce8c61202347b97b3951a841295f4b850535b9515682769894c305ab96bf9b41352d0688a86abec33a56add559311c
+DIST gr-scan-20160211.tar.xz 17872 BLAKE2B 4dc4d579e4ac3b6e713f577201fb5a0fdedceff98464cebaa4188a3d4c719660dbebbd5a2167fda6a30f3cd82a209699e4be438406bd150fc5e18119cf36599e SHA512 218c39f2143050a7315b01cac723880ef9153165bf2257ec1cb2df4837920f2609d6de98a9dd28b058528a598c4fd1f60c14d0e4ff44f021742e55c9ad50e890
+EBUILD gr-scan-20160211.ebuild 733 BLAKE2B e03c659751421054bbed7e09e6b8023873cc9d8889330633cfc5845e90f9f19100e9bda90b94380c468b404db1dc95221c4476d7ebcb54f99ef6a8e5d5c768a9 SHA512 4fd0562a0a74c1a6e14c905779b7c9d6e188b5c470a3229103aa3edae0dde33b1d169acf00f716061f234199ddffac6a205643379f2de1a4e4f80b0eaa033d97
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/gr-scan/gr-scan-20160104.ebuild b/net-wireless/gr-scan/gr-scan-20160104.ebuild
deleted file mode 100644
index 7221db020de9..000000000000
--- a/net-wireless/gr-scan/gr-scan-20160104.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Frequency scanner for GNU Radio"
-HOMEPAGE="http://git.zx2c4.com/gr-scan/about"
-SRC_URI="http://git.zx2c4.com/${PN}/snapshot/${P}.tar.xz"
-LICENSE="GPL-3"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	net-wireless/gnuradio
-	net-wireless/gr-osmosdr
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/gr-scan/gr-scan-20160211.ebuild b/net-wireless/gr-scan/gr-scan-20160211.ebuild
new file mode 100644
index 000000000000..8ac634e2728f
--- /dev/null
+++ b/net-wireless/gr-scan/gr-scan-20160211.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Frequency scanner for GNU Radio"
+HOMEPAGE="http://git.zx2c4.com/gr-scan/about"
+#SRC_URI="http://git.zx2c4.com/${PN}/snapshot/${P}.tar.xz"
+COMMIT="25030f6063e796e5cb048ffc1ec7e1914192146b"
+SRC_URI="https://git.zx2c4.com/${PN}/snapshot/${PN}-${COMMIT}.tar.xz -> ${P}.tar.xz"
+LICENSE="GPL-3"
+
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	net-wireless/gnuradio:=
+	net-wireless/gr-osmosdr:=
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	sed -i 's#install -s#install#' Makefile
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
diff --git a/net-wireless/horst/Manifest b/net-wireless/horst/Manifest
index 3d88c73da495..3db101ac0e04 100644
--- a/net-wireless/horst/Manifest
+++ b/net-wireless/horst/Manifest
@@ -2,11 +2,7 @@ AUX horst-5.1-CC.patch 252 BLAKE2B 433c63fee4a658b36e9569496e83c7c9fc0700604d65e
 AUX horst-5.1-pcap_bufsize.patch 872 BLAKE2B 8a6efdf7becf69b161cb582dd3d1331eb0288f74217a6c4451917b79f7469b03837efed00ae390c08c1f2da16b12bdfeca97c714aa0a849b22d2526881be5933 SHA512 52581262e9d3527c2db42935e74b328a41e3bfc6ebea6687053b82a230b223fe7fdea2e8cf8287caa921de0e95bfd04e0086046049882ba4c68b8b91013a4130
 AUX horst-5.1-tinfo.patch 263 BLAKE2B 94082bdde6de7ebf957628b963e25189c2db0c37cbc96f1d7854b9c35139ce9c8c942e9a70ce0f49b99687253d484c371cacd8d0d823649de7a0768fa197bbef SHA512 955491bbbe5c997b941e0654d028fd8aefd9e789f2ec57204b0e5a11d1cac0a83f0101ea73182b4be9d4690e891bea097b37f29d506ae3eeb90d7da6f7c41d76
 AUX horst-9999-tinfo.patch 244 BLAKE2B 87be3426db885f2ba8256faa7ee44c6d33b897dfdd59462f6dae311b82556004065df7b6177d8e1a506a1fabb92454f70f379bfce334234374ad01a300c2b7ae SHA512 54990da3d2825f2ff128379c81aa3f396f8b57429b73ee7301cb57f67f7bc90726980e4db78be95fd8372d6158ff8df9a68db13d9f76994502a95941d27aac17
-DIST horst-4.2.tar.gz 97976 BLAKE2B 9f59e2dd6f67b50d0d6c67ff269f327e073edbfa87db5d3d63621116123cdcda3d85759e47bcd26344f750f87b0516589aff140542f2ef36cd12dddd048be60f SHA512 a6fa50d6eb0d2c2ae83dfccf59359f8cd74334dbc2362f01f1a3787ebb3d34bcdb76c34899cb048e4a4abc7353d72e8dd846b567ba228f9930e3f418b3656c0a
-DIST horst-5.0.tar.gz 115572 BLAKE2B a7702fe05a706f3f9cfd0545850451e1035840503c1fdf9377594d883095e41acaf89dca4ef9433f3a0109491932612e657dce8054a9f28c2bd725d230588bb1 SHA512 d2df54fade3d62b91482fb16e34f9b03567285880eceb5baea3f76b46caf1763909f3999b2924e210eb0ab0d9fd9f6444f31d2b06ea1a3b73a9f54e257cfd989
 DIST horst-5.1.tar.gz 117392 BLAKE2B 4e21a1cb4d508c8ed6e63fe975a30299452c706aec1a83125acabc547ab8718bbae66d546d973bc10af1f0b6c885a20193c584312c30f5ecaef9d86156c0b12b SHA512 d2889a8c42c31bea72d4e0efd7141ca56c96953b37d2476793ef52d019720059eb57e48b72fa5d720e0c5518a9b0b8dee1a105828d581655c0fbf4dfb29698c4
-EBUILD horst-4.2.ebuild 685 BLAKE2B ec04008d3e20a19b4ce054448eb16b9239e80fb831d4d97954458e2e646064ef03b33d91b171f6a9240ee8451f0e0d9940c3857128bf8d25003d8fa2618f6c34 SHA512 4eb7dddc151955b926ac4d61cdb8a433d8746272bb1c446bdabf0dfda5d86ac90758668f09bcf4c188341d3a658f77517ed67949b878f991daae4fdfb45ef4ad
-EBUILD horst-5.0.ebuild 727 BLAKE2B c680e63fd2044c4766e4a405f0329916578cdff4091c7d341c26b528532166c790f87e9ee1b6d719e9fdff890e91c2722ef3ae1f0e02ab1dbef588ee85864e36 SHA512 57001845bfcac12b7e1583e51edc8f2d7602c48788a6b83facb0bfab2c94a3afbce75a389322dd6fc11c4ff9235388017c1bbb4bcdf75e86e17222856bb80de6
 EBUILD horst-5.1.ebuild 902 BLAKE2B a8a17629fbe942b75f755d860ec2c2ddc6524bf626d757f11bc273b7deaf4efbde1d782c0dc71171b402a0fde88a88ecc8ea679530851336ffedfb7773bb4c70 SHA512 c6042e1dd4c75fd41e94687a1231921b42883c35fb56ff97b5361a5c51b2876ab7b65026a1524a7603b6cabf719ec719bfe5957ae7cc7c55f8d065ea54e1ee48
 EBUILD horst-9999.ebuild 810 BLAKE2B a2fae8554af5eca1c8b62593a617f0a49b20fb736dbe3c6f0580ed05865de1ef569dd4f01298dc8dbcdd13cced825d9a218886952290416d0469c2f12e1dc79c SHA512 cb82f22c69fdaaf1343c4bc0df6c82eb48c3380bbe289988a8b805d4b892af7e7b65a873187a1bcbcee23d745773d21427f8e4580ae5836ae6dc9411cbd4db1a
 MISC metadata.xml 345 BLAKE2B cfd5f56689aa8af1450eeeadb90726bf94db301545fc4ec3f02bca2b6f2b53dcb2013c272530747bc6f42575c2cf92164b60091bb07cd819da2197c283a5fd98 SHA512 ad77a1b246b65a97abcedf9f80c8f37fba7081a4b3466ed734eb57042129d492c2851d13b7768f11dc412c9316d1ccb6f91575d11f6aed806a6972141057f653
diff --git a/net-wireless/horst/horst-4.2.ebuild b/net-wireless/horst/horst-4.2.ebuild
deleted file mode 100644
index a799b0945eb4..000000000000
--- a/net-wireless/horst/horst-4.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Small 802.11 wireless LAN analyzer"
-HOMEPAGE="http://br1.einfach.org/tech/horst/"
-SRC_URI="http://br1.einfach.org/${PN}_dl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +pcap test"
-
-RDEPEND="sys-libs/ncurses:0
-	pcap? ( net-libs/libpcap )"
-DEPEND="${RDEPEND}
-	test? ( sys-devel/sparse )"
-
-#just semantic tests, no functional tests
-RESTRICT=test
-
-src_compile() {
-	tc-export CC
-	emake PCAP=$(usex pcap 1 0) DEBUG=$(usex debug 1 0)
-}
-
-src_install() {
-	dosbin ${PN}{,.sh}
-	dodoc README TODO
-	doman ${PN}.1
-}
diff --git a/net-wireless/horst/horst-5.0.ebuild b/net-wireless/horst/horst-5.0.ebuild
deleted file mode 100644
index c06fc8f45db0..000000000000
--- a/net-wireless/horst/horst-5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs vcs-snapshot
-
-DESCRIPTION="Small 802.11 wireless LAN analyzer"
-HOMEPAGE="http://br1.einfach.org/tech/horst/"
-SRC_URI="https://github.com/br101/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +pcap test"
-
-RDEPEND="sys-libs/ncurses:0
-	pcap? ( net-libs/libpcap )"
-DEPEND="${RDEPEND}
-	test? ( sys-devel/sparse )"
-
-#just semantic tests, no functional tests
-RESTRICT=test
-
-src_compile() {
-	tc-export CC
-	emake PCAP=$(usex pcap 1 0) DEBUG=$(usex debug 1 0)
-}
-
-src_install() {
-	dosbin ${PN}{,.sh}
-	dodoc README.md
-	doman ${PN}.1
-}
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index cc74e57e67ca..f3fc8a024b8b 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -4,4 +4,4 @@ DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803c
 EBUILD hostapd-2.8.ebuild 6682 BLAKE2B f7b0f129334d7d784f89de6fbcc2086f347ad740ba2daec570f721c109871239cbf6fd4f2d894d358b128cc497d368046aa05a6e0a6705f7ba79d5ca98a69416 SHA512 e23c2e753f91b69da5e4b5fa49b9683c92c8df5af17f5d457f2e8639fb0cee1f96490a81d914d592dc3fb74ad61d0e79528045edb401d33c8828045ebc4f7e08
 EBUILD hostapd-2.9.ebuild 6683 BLAKE2B ae53db361d4e846f2c1f08960235d69dda3d4162c9a261fa144dcb623751c9dec68285d00821e40afa707cffc08fc2474d47f7e28fee4fb1dc01425237a21571 SHA512 7912df1d03950951f7c5b80eaa262717939ac6347ecb0becf3e71bd81aa891a57ad16dec174c86d8a34cc2e5253d27cb9f7e4beb42887f784b9d05f733d484ee
 EBUILD hostapd-9999.ebuild 6687 BLAKE2B d9c80e418f9f19e44afe890ab9251ea0b3eba6e4c852ba2bb25ad17466801de9c4e52f960f3baa13be1b3de49a7cb7188ca9c23fe1b2128fdbd74e2e6a9e03f0 SHA512 f8f78876354cd9501d4260309b526c61c1e2d6b501f27fd539ff50a6c651f5fbf482be730360fffd4c8d168096349e15053eb8d21939f7dc5c4e33568af2b5ea
-MISC metadata.xml 973 BLAKE2B 009e9b39aa6c7d1d6da4421ec1d0c4610a64b136b497f92dc5a822ab54449720cfacb9ce898fc2015cdcf741939acb46aa8797e13c80079ce424f5f6bfbde8be SHA512 19a5d72d11eee955856bde7065a784d1942b2c55adbb154e1af432c693763beedb1541d119ba6c0d7b5e2f37e13a3aa915b13def6c9ee651b6f4f7f8e85a57e5
+MISC metadata.xml 1055 BLAKE2B f04ae6c0be8dbf9385cc0ce306a3aee69c0c07370e6574a88804ba0ed4cef38c81ec61ca6cac9b1810ce5d07ce6bd97f0dfec23b4737c4b092a12cda95799994 SHA512 afc6a14a55d177190797a6483fde1e6ea397ed43b60faf9d3bb919e5c9c68aaa75238d73a8e15d3a3450d916c6b5d9bc2cd8cf75fc4592cc99220128152a5867
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index 7cce4a9bd8db..b06f07f2352a 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -22,4 +22,7 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:w1.fi:hostapd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 9ea3b735f2f5..4ab0fb6b1b18 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -6,4 +6,4 @@ EBUILD iw-4.14.ebuild 771 BLAKE2B bdf9689a1784e513ba927bf4674abbb060f0065b066ef5
 EBUILD iw-4.9.ebuild 764 BLAKE2B e8fc3877f5f708350de7dd4ecb9bc457f066e898d8a30580842e13f651af755e1911d05ef695f3ba7ab9ebd98974788a5ada1ae793ef17a221b2ff44dd2a31b9 SHA512 c5e3fd7b855b8d3fcb5613e793f0278036fe1ebee2c40a41dc6aa9bddaf9176e3d8cb2d26fb951f721fdb5acfbc5ef1e6e85e0c9983b2c54cf69e74ae8493d0f
 EBUILD iw-5.0.1.ebuild 865 BLAKE2B eb0ecd9f2b4cb9310f4a49f33f85e348945d2ad4d666b3c0cd0bd4b5e43d6f4205f911341a7f9dff3638e20f7cdd8f270785722236573c1684742f0e1fa78469 SHA512 da9f4cbd8642006cb3cbc94cd6c35e0f188f967990f79f2e17669d74e7415d804867784ea64611fc461fa8ffdbcca18e1e65cc0675874a38a9e13e84871f0528
 EBUILD iw-5.3.ebuild 869 BLAKE2B 441f9cc4a8eea707fe8c714e49f611c10f90ffa11a9966c46cb738847c653feebbe9ffd8db3899e7e3932a934857d1872bc8949e0d51e1e1cc847562c4f78f7e SHA512 8defb95178b71d16f5b880e63d1cc378ba99fcf874152ac4652d30cc82a131f5a608dbeccd94b817c59c31ef82e03e8c128c8a742bb6f805d439f068a1cd6b8f
-MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
+MISC metadata.xml 325 BLAKE2B 4081db738ce07e18a087d3517e082f3aca70e17aa3e7fe371795cac7fead6fcd6a8226817fc0d995a8be9e43cb56617c345b64abbaf806ced7a96246538db9a5 SHA512 4d4ca6e03b9d43532e35b043873f134e47176b9e22b9c61e19a129726e2685218beecf31148ec5d3eba6cd02a0f818c1e2032e5bda247a1e51bafcbd7b951cea
diff --git a/net-wireless/iw/metadata.xml b/net-wireless/iw/metadata.xml
index 2b9b4266ca5b..7b261cf7822c 100644
--- a/net-wireless/iw/metadata.xml
+++ b/net-wireless/iw/metadata.xml
@@ -5,4 +5,7 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:kernel:iw</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 45331b6f70d2..f04e51e8433b 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -7,6 +7,6 @@ AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2019-09-R1.tar.xz 3034832 BLAKE2B 9f7818549e5260dc081ac39ea8323c70f2e4d0b959bc42dacc253c9d72bf72c2547f7c6d65d84ee7d0ca4a41068f5973028e48f6f9f3c5a7cd50c35246570814 SHA512 eeaf069718206f2b6d292c41792217afc9c72c10ffa014c8c670de64195bd28d44f33364dba7d338610f17a5af2be3c125ccd1297cce362159a4968c9ddabb88
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
-EBUILD kismet-2019.09.1.ebuild 4694 BLAKE2B 5203e6f7cc6149e1272f97155aa62b157c8ecded4ff86c76f12ff4f0c5912b0f09ed361f7d265b89601c8a2c9cfcc4026f43ce785b4a8697ccc5fc8fe6d4b709 SHA512 438d2ea946ece4ba71cc60927f93da3f86e9fb91f7da70fbd3f13aade8b95b5f5982aa9930a626ed933fa9234bef719bee90506c66170bb8bced2faae35c13e6
-EBUILD kismet-9999.ebuild 4694 BLAKE2B 5203e6f7cc6149e1272f97155aa62b157c8ecded4ff86c76f12ff4f0c5912b0f09ed361f7d265b89601c8a2c9cfcc4026f43ce785b4a8697ccc5fc8fe6d4b709 SHA512 438d2ea946ece4ba71cc60927f93da3f86e9fb91f7da70fbd3f13aade8b95b5f5982aa9930a626ed933fa9234bef719bee90506c66170bb8bced2faae35c13e6
+EBUILD kismet-2019.09.1.ebuild 4694 BLAKE2B ecd5c2939a343e49db435ca704b147679df0ee8ea8fa73bae5eacda8ebf522e455e2044d413775073d241e6f78ca1633dfa92610a306c17d2fdfa57f1293624c SHA512 1f7b25ab6ac85e71c4e88aa5ce453de8b1a1f79bfe299999484fb919edbe65d8a12588c0b21ac98d2903551967870ca773235dcf56ac83df5cf6a7b47e386fdb
+EBUILD kismet-9999.ebuild 4694 BLAKE2B ecd5c2939a343e49db435ca704b147679df0ee8ea8fa73bae5eacda8ebf522e455e2044d413775073d241e6f78ca1633dfa92610a306c17d2fdfa57f1293624c SHA512 1f7b25ab6ac85e71c4e88aa5ce453de8b1a1f79bfe299999484fb919edbe65d8a12588c0b21ac98d2903551967870ca773235dcf56ac83df5cf6a7b47e386fdb
 MISC metadata.xml 1259 BLAKE2B c9c91a87613a3126a81c28e768dbcf37422e04c8679d991ed2149361bf07d43a1dc17e5eaffebbb77bb9e92f2fd316192745e8b3cde04729db12b7dbefd33d26 SHA512 777ea0bad8a04dc4ac303eee0006692aa0107a7c38322b890565fab59288d84932b531145445623af1fa594b762aec627dd00f659b90f1fb595d7b49f6ab20a0
diff --git a/net-wireless/kismet/kismet-2019.09.1.ebuild b/net-wireless/kismet/kismet-2019.09.1.ebuild
index f6b223f22b1e..491e99e9a65b 100644
--- a/net-wireless/kismet/kismet-2019.09.1.ebuild
+++ b/net-wireless/kismet/kismet-2019.09.1.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="https://www.kismetwireless.net"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid"
+IUSE="lm-sensors mousejack networkmanager +pcre selinux +suid"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 CDEPEND="
@@ -53,7 +53,7 @@ CDEPEND="
 	dev-libs/protobuf:=
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	sys-libs/ncurses:=
-	lm_sensors? ( sys-apps/lm_sensors )
+	lm-sensors? ( sys-apps/lm-sensors )
 	pcre? ( dev-libs/libpcre )
 	suid? ( sys-libs/libcap )
 	"
@@ -89,7 +89,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable pcre) \
-		$(use_enable lm_sensors lmsensors) \
+		$(use_enable lm-sensors lmsensors) \
 		$(use_enable mousejack libusb) \
 		$(use_enable networkmanager libnm) \
 		--sysconfdir=/etc/kismet \
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index f6b223f22b1e..491e99e9a65b 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="https://www.kismetwireless.net"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid"
+IUSE="lm-sensors mousejack networkmanager +pcre selinux +suid"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 CDEPEND="
@@ -53,7 +53,7 @@ CDEPEND="
 	dev-libs/protobuf:=
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	sys-libs/ncurses:=
-	lm_sensors? ( sys-apps/lm_sensors )
+	lm-sensors? ( sys-apps/lm-sensors )
 	pcre? ( dev-libs/libpcre )
 	suid? ( sys-libs/libcap )
 	"
@@ -89,7 +89,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable pcre) \
-		$(use_enable lm_sensors lmsensors) \
+		$(use_enable lm-sensors lmsensors) \
 		$(use_enable mousejack libusb) \
 		$(use_enable networkmanager libnm) \
 		--sysconfdir=/etc/kismet \
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index d61c00dfc105..48a2661bcdb6 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -4,8 +4,12 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.11.39.zip 112221641 BLAKE2B 33acc8ba7e31dc0e4bc768f26dbb9d995d42a5f9bf58b4671c5a3c973c575c3ca232781e6747ad82ff808df44dbbe71a75a340f738461f1e21a069d144440176 SHA512 2c2e5a4216b916905666b6d0585458d2dba8cfe5a60e183b95406361b39a97cd9c7243faaaecb439db77cf7e2751941c729c2d0bc4d0807aad18706e10e696ff
 DIST unifi-5.11.45.zip 112350672 BLAKE2B add0446bb39c169d988395f47e418ea63428bee8c5effa98d021128219f313572ac8763f26ffea7d5b051f9c7e4e0e2b6848d499fb2c68a8869e195d99d35e67 SHA512 e5a72a784ae7f6e829204fb39f7f7daef00dd30b59e7d8c2ddd7a20a302ad43c45bf7ad680cd824cf8a28d7017a05dbbc11c0c24a65d6a8980f86739785121c9
+DIST unifi-5.11.46.zip 112381219 BLAKE2B 7f73cf5db1d132af85fd54dda36cb82cedddae1d3c8e84282f9dcfe0766a839f165d17a8292096bfe976ccced1e29173476de9042f96cdc2c15c4edf24ee9c65 SHA512 41b03ebbbb49089bd40e3e715d7c9a447b42a6df61a2d3551175ae55b85010fd896318909f394bb166bd7a8e9fd7611439158a8141df349acf3b4980bbe9dd6b
+DIST unifi-5.12.5.zip 113544662 BLAKE2B 7b79a1b107927fbb6ee2c7bb531901b5cedef0768146b369e8653e0e34e41758914b5108a01681e806c117dd80561091b6064bffe779e913774d61ff2fba369d SHA512 ff3ab833ce13889f1f6c2d1ee71f28bf8d48789c053c84b1f427e95e09aedb4d9f66a640a1891262f31300af50859581dc874a613f5f92b3bcf18b05c0140052
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 EBUILD unifi-5.11.39.ebuild 1832 BLAKE2B 7c40929311169e488fca0f551e8636222bf15e8f7e180bca177fe7b1e3e1d217071689951676a7cc90fe106de74b08be430ac9731843390eedef700bfb2d0445 SHA512 aa414683457d916af76f22ae2004bccc79610f8522005202d0c43367227f5a6d46e1fbdf506993c7c20098a4b6d697824fab7d23088e73ba929727067465caca
 EBUILD unifi-5.11.45.ebuild 1833 BLAKE2B adf52bdbd0c09b41feedaa66635b7ae771c784efae0615f5adb40a03e7a3c5defdcbcbe40282ac91b4905f3a85825288a9914d6a773830ba515b406b3f257ca9 SHA512 ff34c8cbebc2ecf0307d459c551900b771b3ab452bdc9ab5fb9189aa612667116f47c40b1797a402200f7dbae7d465b74b68c069029975151aa8b2f1ff1ec42c
+EBUILD unifi-5.11.46.ebuild 1833 BLAKE2B b92cabb1ef13bb7070df55fc6a5d89864debed1f988124d0553644358ad11fea51b90bba105b89d1aedfd203ae309fbaf7f660b2121fbeb813238b0e72c3c00e SHA512 410792f35aff9d6569d1e53c94a2cac7646348dd0b5f554f7b53640d6e311fadf602d09cdcee57e2430acda10ee9d2b99a37fccea8bb2e3a3cf905119b27d9a0
+EBUILD unifi-5.12.5.ebuild 1833 BLAKE2B f9e7cae98e23b3525c628d0e987884f2e211d806073a97824bed45e4fb43dd131a849489d5c0bbb64cd7b865db71e600b9926a7b8ab38c70f2aa7e37e90dbb01 SHA512 46c149a06ee68e3e89a2ec3404c8eb501299649c2fd58a33a053d72caa85fc66cb1c6334e338d4aedcc3c3bee4bb18ae6468a2cdd882e46a213bb578cfc05d8d
 EBUILD unifi-5.6.42.ebuild 1721 BLAKE2B 04efda4b528074a4b01f11d9cdb45237d64ec6af9846f8d30e2c5fe1564990467f6e0e6c4fa76e77e06007239f1f338d509f5759ed9baccd93ee8f2f70b39a63 SHA512 6e1b3ae4df8cb47c142ee14e5bb92a3c21dd5a97caeaa665bba0e201a9ffefb913f24420967944c09e3dcf516c667af566ecbd7404a254146fa2022a496f6788
 MISC metadata.xml 802 BLAKE2B cf4248b03b6b0f5ecee40ab09e9d7fe718c8a3478aeb5814faa489b74080b19fa20b0db05b7910523c68297d2fc00a56d4b16822367811b52fbdbd2cf707962a SHA512 8071155df75634be1db52068b17960b194f47c8a1ca38f23fe4397df8c3156123c6023cab0d33db4dce1b0763beaa096ba6f745671c3078be637dad6ef63abf5
diff --git a/net-wireless/unifi/unifi-5.11.46.ebuild b/net-wireless/unifi/unifi-5.11.46.ebuild
new file mode 100644
index 000000000000..221ef9e70a72
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.11.46.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Set this var for any releases except stable
+RC_SUFFIX="-a5113ebc10"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.11"
+IUSE="systemd"
+
+RDEPEND="dev-db/mongodb
+	virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+	enewgroup unifi
+	enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+	exeinto /usr/lib/unifi/bin
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/unifi/unifi-5.12.5.ebuild b/net-wireless/unifi/unifi-5.12.5.ebuild
new file mode 100644
index 000000000000..545a8e5589ea
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.12.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Set this var for any releases except stable
+RC_SUFFIX="-802c4da1a2"
+
+inherit systemd user
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.12"
+IUSE="systemd"
+
+RDEPEND="dev-db/mongodb
+	virtual/jre:1.8"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+pkg_setup() {
+	enewgroup unifi
+	enewuser unifi -1 -1 /var/lib/unifi unifi
+}
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+	exeinto /usr/lib/unifi/bin
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index cf60bd9ef0d8..ef5807adf6cf 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,4 +1,4 @@
 AUX wireless-tools-29-asneeded.patch 478 BLAKE2B 0006e74821cc068918450ed6598ec8dbb00bba9b5b232c866f54569609001f245e004cf377be9fb355850f8d9df2ba5f7fc47b33b8aeeb45fa9e4315a69a51fc SHA512 1b1d7e0f833fd0f6587f7d175d7d8597c637782bf37b4800e5d8e3c736a0755c0073b8f9876ea75b95be3735116f051ca40dc617818d5b7f8de61a54d66dc48d
 DIST wireless_tools.30.pre9.tar.gz 348477 BLAKE2B 7ff1f14b464aac6204e86c3f1dcd0f8acc4ea89d11feaf4700e75518dc990945a18a931a9dad76f12dd796c983aaf9b766fd57e9cdcfac57f71dcc3bbe332aa7 SHA512 0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1
 EBUILD wireless-tools-30_pre9.ebuild 1768 BLAKE2B fe847c9861b38e619b5fe2496fea5d1e52e841d479b302faf7a2c1cf39b2c2330414b8a9128e7a7aca9d53fc0de855ab62d72219457842c8d17c07caae341056 SHA512 ae7bf5bbff8a2b1cb077c6b380895be7feea8f80a84b0c93b91ce787fa5cb20bb6aabc9b6ce8cee8fe70bac9e005e626b33604a4f4bb603d8e151be52956f7e7
-MISC metadata.xml 598 BLAKE2B 0085b4ab932754c0859d4596502bf01926536f85d772e8b8029909a6677ea154309bbf1573fdb8da48f8e89f360c1de6ae4231e3863e678123f11f7c37381a0a SHA512 98a55c6dc07509ff2917df4bfbf0fc3203ce0b3674f47f44002e7955d6374be28b8ecf32e657a4fe3dcb1e0496060ba31c4933b08b129186784fa2eeac26eedc
+MISC metadata.xml 696 BLAKE2B 2c86a6b20efe956414c0715a4ee1155554bd0c7a95bd5e7707890dbecc54e174929a54d009ba18ebda191ff36d0ed88b477cba50076566ea77ed5cac704bf576 SHA512 1884e22d6147a86977b30f4e95751498ce92306fd807a7f4a1187181ffa7b76f896eca921af26fa0ecab74fedccded36a1c103135d0282ca47263b3a637f777c
diff --git a/net-wireless/wireless-tools/metadata.xml b/net-wireless/wireless-tools/metadata.xml
index 994039f32211..b6db26b52827 100644
--- a/net-wireless/wireless-tools/metadata.xml
+++ b/net-wireless/wireless-tools/metadata.xml
@@ -14,4 +14,7 @@
 		<flag name="multicall">Build the most commonly used tools as one
 			binary</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:wireless_tools:wireless_tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 3c09e3bbc6bd..65a5bc3f2fa2 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index e12df6de1f98..a4c95382078b 100644
--- a/profiles/arch/alpha/use.stable.mask
+++ b/profiles/arch/alpha/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
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
+# Dependency not yet stable (dev-libs/libappindicator).
+ayatana
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-07-22)
 # sys-auth/elogind is not yet stable here. bug #682158
 elogind
@@ -24,7 +28,7 @@ webkit
 
 # Pacho Ramos <pacho@gentoo.org> (2014-04-17)
 # Dropped stable keywords after the discussion caused by
-# Gnome 3.8/3.10 stabilization on this arch   
+# Gnome 3.8/3.10 stabilization on this arch
 colord
 devhelp
 dia
diff --git a/profiles/arch/amd64-fbsd/use.mask b/profiles/arch/amd64-fbsd/use.mask
index 4da55885f761..3dfab0817e61 100644
--- a/profiles/arch/amd64-fbsd/use.mask
+++ b/profiles/arch/amd64-fbsd/use.mask
@@ -33,6 +33,10 @@
 #-video_cards_vmware
 -input_devices_vmmouse
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
+# Dependencies not keyworded.
+ayatana
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not keyworded here.
 elogind
@@ -113,4 +117,4 @@ jemalloc
 
 # Benda Xu <heroxbd@gentoo.org> (2019-06-26)
 # Not tested
-eselect-ldso
-\ No newline at end of file
+eselect-ldso
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 5ceb9b4d20e1..3a3a5d0d7113 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -163,7 +163,7 @@ media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (2017-08-08)
 # Requires USE=opencl that is masked in this profile.
-net-misc/bfgminer adl lm_sensors
+net-misc/bfgminer adl lm-sensors
 
 # Michał Górny <mgorny@gentoo.org> (2017-06-28)
 # dev-tcltk/tcllib is not keyworded, and tests are restricted anyway, so
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 18f0f7b726f7..2f3ff24cd5eb 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# virtual/jdk is not stable here.
+sci-mathematics/z3 java
+
 # Mart Raudsepp <leio@gentoo.org> (2019-08-27)
 # Missing stable net-libs/webkit-gtk
 dev-util/glade webkit
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 7433f4959664..abc7267ea52b 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -16,10 +16,6 @@ python_single_target_python3_7
 # No ACPI support on arm. Bug #657332
 acpi
 
-# Patrick Lauer <patrick@gentoo.org> (2015-04-28)
-# Dependencies not keyworded
-ayatana
-
 # Andrey Grozin <grozin@gentoo.org> (2014-05-16)
 # gcl keyworded ~arm, bug #509842
 -gcl
@@ -77,7 +73,7 @@ gphoto2
 afs
 mono
 lirc
-lm_sensors
+lm-sensors
 xemacs
 scanner
 sid
@@ -154,4 +150,3 @@ numa
 
 # toolkit for nvidia binary drivers
 cg
-
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 3c11f961a4dc..08dc0f3696fe 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/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
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
+# Dependencies not yet stable.
+ayatana
+
 # Hans de Graaff <graaff@gentoo.org> (2019-07-17)
 # Temporary mask for stable bug 688976
 ruby_targets_ruby25
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index d525c9227459..693fa4127847 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -26,6 +26,10 @@
 -neon
 -armvfp
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
+# Dependency not keyworded (dev-libs/libindicate).
+ayatana
+
 # Mart Raudsepp <leio@gentoo.org> (2019-01-07)
 # Does not work on arm64 until dev-lang/luajit-2.1
 # https://github.com/LuaJIT/LuaJIT/issues/26
@@ -98,7 +102,7 @@ libproxy
 darcs
 afs
 lirc
-lm_sensors
+lm-sensors
 scanner
 zvbi
 fluidsynth
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 3c99ab4cf5d1..12eaca127e4c 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
+# Dependency not keyworded (dev-libs/libappindicator).
+ayatana
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not yet keyworded here. bug #681200
 elogind
@@ -244,8 +248,8 @@ video_cards_radeon
 video_cards_radeonsi
 
 # Guy Martin <gmsoft@gentoo.org> (2005-07-25)
-# lm_sensors not supported on hppa and ieee1394 not tested
-lm_sensors
+# lm-sensors not supported on hppa and ieee1394 not tested
+lm-sensors
 iec61883
 ieee1394
 
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index f8db01005e76..d80d41906d52 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -3,6 +3,10 @@
 
 # This is a list of USE flags that should not be used on ia64.
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
+# Dependency not keyworded (dev-libs/libindicate).
+ayatana
+
 # Michał Górny <mgorny@gentoo.org> (2018-07-16)
 # Python 3.7 support requires fresh versions of packages which are stuck
 # at keywordreqs.
@@ -46,7 +50,7 @@ wifi
 # Hardware not available on ia64
 apm
 battery
-lm_sensors
+lm-sensors
 pm-utils
 
 # Stuff that doesn't work on ia64, or not tested
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index 833297a10352..c83a23bed8f5 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -m68k
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
+# Dependencies not keyworded.
+ayatana
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not keyworded here.
 elogind
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 38cd86ebc6c6..13a251b7f9e9 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -27,7 +27,7 @@ media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (2017-08-08)
 # Requires USE=opencl that is masked in this profile.
-net-misc/bfgminer adl lm_sensors
+net-misc/bfgminer adl lm-sensors
 
 # Michał Górny <mgorny@gentoo.org> (2017-06-28)
 # app-misc/dtach is not keyworded, and tests are restricted anyway, so
diff --git a/profiles/arch/powerpc/make.defaults b/profiles/arch/powerpc/make.defaults
new file mode 100644
index 000000000000..8613dd7619ee
--- /dev/null
+++ b/profiles/arch/powerpc/make.defaults
@@ -0,0 +1,9 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# All extra USE/etc should be specified in sub-profiles.
+# DO NOT POLLUTE USE ON THIS PROFILE.
+
+# Georgy Yakovlev <gyakovlev@gentoo.org (2019-08-30)
+# Unhide PPC specific USE_EXPANDs.
+USE_EXPAND_HIDDEN="-CPU_FLAGS_PPC"
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 036de06eeaf0..fd21d01a649e 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -106,7 +106,7 @@ media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (2017-08-08)
 # Requires USE=opencl that is masked in this profile.
-net-misc/bfgminer adl lm_sensors
+net-misc/bfgminer adl lm-sensors
 
 # Jason Zaman <perfinion@gentoo.org> (2017-05-09)
 # x11-libs/libXpresent is not keyworded on ppc
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 911a017daa97..2fe615c7a405 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -69,7 +69,7 @@ klibc
 #
 3dfx
 acpi
-lm_sensors
+lm-sensors
 rar
 hdf
 xvmc
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 5806afdc7ab1..cdac340949c4 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -15,7 +15,7 @@ dev-vcs/git pcre-jit
 # do not support python-3.7 yet.
 
 app-admin/syslog-ng amqp dbi geoip geoip2 json kafka mongodb python redis spoof-source smtp snmp
-app-admin/sysstat lm_sensors
+app-admin/sysstat lm-sensors
 app-arch/libarchive lz4 lzo zstd
 app-arch/unzip natspec
 app-crypt/gnupg smartcard tofu wks-server
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index 91f43a4762f2..323eff42aa35 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -31,3 +31,7 @@ slang
 sqlite
 systemtap
 X
+
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
+# Dependencies not keyworded.
+ayatana
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 491c1dee8a5c..96177705207c 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -7,6 +7,10 @@
 # Unmask ABI flags for this arch.
 -abi_s390_32
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
+# Dependencies not keyworded.
+ayatana
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not yet keyworded here. bug #681200
 elogind
@@ -86,7 +90,7 @@ motif
 mono
 ocaml
 sdl
-lm_sensors
+lm-sensors
 wxwidgets
 
 # Many X drivers make no sense on this platform.
diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask
index ed8deae11c86..4b2e55f73197 100644
--- a/profiles/arch/sh/use.mask
+++ b/profiles/arch/sh/use.mask
@@ -1,6 +1,10 @@
 # Unmask the flag which corresponds to ARCH.
 -sh
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
+# Dependencies not keyworded.
+ayatana
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not yet keyworded here. bug #681200
 elogind
@@ -53,7 +57,7 @@ diet
 lirc
 afs
 mono
-lm_sensors
+lm-sensors
 qdbm
 fftw
 eds
@@ -101,7 +105,7 @@ video_cards_r600
 video_cards_radeonsi
 
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-03-07)
-# Modular X: mask for architectures lacking direct rendering      
+# Modular X: mask for architectures lacking direct rendering
 dri
 
 # nspr isnt ported to SuperH which means no seamonkey/firefox/etc...
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index a5963370adbb..cbc5338bebdf 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -6,6 +6,10 @@
 
 # This file contains a list of useflags that cannot be used on sparc.
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
+# Dependency not keyworded (dev-libs/libappindicator).
+ayatana
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2018-12-12)
 # mongodb is not keyworded on sparc
 mongodb
@@ -148,7 +152,7 @@ zmq
 ifp
 chipcard
 hbci
-lm_sensors
+lm-sensors
 openct
 bluetooth
 dmraid
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index 9d4081792d4b..e5aaf9470aa2 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Hans de Graaff <graaff@gentoo.org> (2019-07-17)
-# Temporary mask for stable bug 688976
-ruby_targets_ruby25
-
 # Ben Kohler <bkohler@gentoo.org> (2019-06-11)
 # Pulls in net-libs/axtls which is not stable for sparc
 curl_ssl_axtls
diff --git a/profiles/arch/x86-fbsd/use.mask b/profiles/arch/x86-fbsd/use.mask
index bdecee028a03..385830faf29d 100644
--- a/profiles/arch/x86-fbsd/use.mask
+++ b/profiles/arch/x86-fbsd/use.mask
@@ -5,6 +5,10 @@
 -x86-fbsd
 -abi_x86_32
 
+# Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
+# Dependencies not keyworded.
+ayatana
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not keyworded here.
 elogind
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 485f9a085eab..0ff8ea4e2409 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -12,14 +12,6 @@ dev-qt/qt3d gamepad
 dev-lang/rust-bin -doc
 >=dev-lang/rust-bin-1.37 -clippy -rustfmt
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-08-18)
-# media-video/pipewire is not keyworded yet
-dev-libs/weston pipewire
-kde-apps/krfb wayland
-kde-plasma/xdg-desktop-portal-kde screencast
-sys-apps/xdg-desktop-portal screencast
-x11-wm/mutter screencast
-
 # Thomas Deutschmann <whissi@gentoo.org> (2019-08-03)
 # Early microcode loading is supported on x86
 sys-kernel/linux-firmware -initramfs
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 01a5ca12941c..070c71c1d613 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2019-09-13)
+# media-video/pipewire is not keyworded yet
+dev-libs/weston pipewire
+kde-apps/krfb wayland
+kde-plasma/xdg-desktop-portal-kde screencast
+sys-apps/xdg-desktop-portal screencast
+x11-wm/mutter screencast
+
 # Brian Evans <grknight@gentoo.org> (2019-05-22)
 # Allow python-exec to install all targets
 # Ack by mgorny
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 298897cef62c..2eeffdf3ff59 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -13,11 +13,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86"
 
 CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 74ca2ddea0b2..83f2781aa51a 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# LLVM 5 is being removed.
+~dev-ada/gps-2018 gnat_2017
+
 # Michał Górny <mgorny@gentoo.org> (2019-09-07)
 # media-libs/libnut is slated for removal.
 media-video/mplayer nut
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index bc7a936405e3..645eae301301 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -14,7 +14,3 @@ python_single_target_pypy3
 # Hans de Graaff <graaff@gentoo.org> (2018-12-25)
 # Currently in testing and not ready to go stable yet.
 ruby_targets_ruby26
-
-# Patrick Lauer <patrick@gentoo.org> (2015-04-28)
-# dependencies not stable yet
-ayatana
diff --git a/profiles/default/bsd/use.mask b/profiles/default/bsd/use.mask
index 6629ace9a073..76347096232a 100644
--- a/profiles/default/bsd/use.mask
+++ b/profiles/default/bsd/use.mask
@@ -18,7 +18,7 @@ fbcon
 gpm
 lirc
 multilib
-lm_sensors
+lm-sensors
 caps
 filecaps
 vidix
diff --git a/profiles/desc/cpu_flags_ppc.desc b/profiles/desc/cpu_flags_ppc.desc
new file mode 100644
index 000000000000..cddd07f17069
--- /dev/null
+++ b/profiles/desc/cpu_flags_ppc.desc
@@ -0,0 +1,6 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+altivec - Use the AltiVec/VMX instruction set
+vsx - Use the Vector Scalar Extension instruction set (POWER7 and later)
+vsx3 - Use the Vector Scalar Extension v.3 instruction set (POWER9 and later)
diff --git a/profiles/package.mask b/profiles/package.mask
index a3f108563dd2..24d40d50d64d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,610 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Last bumped in 2017.  Newer version fails to fetch.  Pending bump.
+# Unresolved license issues.
+# Removal in 30 days.  Bug #694264.
+dev-util/idea-ultimate
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Unmaintained.  Last bumped in 2017.  Unresolved license issues.
+# Removal in 30 days.  Bug #694274.
+dev-util/webstorm
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Unmaintained.  No reverse dependencies.
+# Removal in 30 days.  Bug #694260.
+sys-libs/libmath++
+sys-libs/rvm
+sys-libs/system-config-base
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Unmaintained.  All look pretty dead.  No reverse dependencies.
+#
+# x11-libs/gtkhotkey: 2009
+# x11-libs/libaosd: 2010
+# x11-libs/libproplist: ancient?
+#
+# Removal in 30 days.  Bug #694258.
+x11-libs/gtkhotkey
+x11-libs/libaosd
+x11-libs/libproplist
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Unmaintained.  Not bumped since 2011.  Fails to build due to broken
+# build system.  No reverse dependencies.
+# Removal in 30 days.  Bug #500616.
+net-libs/nacl
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Unmaintained.  No reverse dependencies.
+# Removal in 30 days.  Bug #694256.
+net-libs/ccnet
+net-libs/ccrtp
+net-libs/dslib
+net-libs/libgmail
+net-libs/libs3
+net-libs/libyahoo2
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-13)
+# Unmaintained.  No reverse dependencies.
+#
+# media-libs/libbmp: 2010, homepage gone.
+# media-libs/libmkv: 2011.
+# media-libs/sampleicc: 2014, last upstream 2016.
+#
+# Removal in 30 days.  Bug #694254.
+media-libs/libbmp
+media-libs/libmkv
+media-libs/sampleicc
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Current version from 2016, needs bump.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694242.
+dev-libs/xmlwrapp
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2011.  No reverse dependencies.
+# Removal in 30 days.  Bug #694240.
+dev-libs/xmlrpc-epi
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  No reverse dependencies.
+# Removal in 30 days.  Bug #694238.
+dev-libs/xml-security-c
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 1998.  No reverse dependencies.
+# Removal in 30 days.  Bug #694236.
+dev-libs/syncdir
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Current version from 2011, latest upstream 2015.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694234.
+dev-libs/stlsoft
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2005.  No reverse dependencies.
+# Removal in 30 days.  Bug #694228.
+dev-libs/socketstream
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2014.  No reverse dependencies.
+# Removal in 30 days.  Bug #694228.
+dev-libs/sblim-sfcc
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Development stalled in 2009.  No reverse dependencies.
+# dev-libs/libvterm is the upstream recommended replacement.
+# Removal in 30 days.  Bug #694226.
+dev-libs/rote
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Added in 2008.  Live ebuild only.  No reverse
+# dependencies.
+# Removal in 14 days.  Bug #694224.
+dev-libs/polylib
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in <=2004.  Reported to fail to build.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694222.
+dev-libs/pcre++
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Added in 2005 and not bumped since.  Homepage gone.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694218.
+dev-libs/mdsplib
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last bumped in 2009.  Homepage gone.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694216.
+dev-libs/mapm
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last bumped in 2011.  Homepage gone.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694214.
+dev-libs/ltxml
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  EOL-ed upstream.  No reverse dependencies.
+# Removal in 30 days.  Bug #694212.
+dev-libs/log4shib
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last bumped in 2014.  Homepage gone.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694210.
+dev-libs/libwbxml
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Old GNOME library, last release in 2000.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694208.
+dev-libs/libunicode
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Current version is from 2015, and is pending bump.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694206.
+dev-libs/libucl
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Added in 2002 and not bumped since.  Homepage gone.
+# No amd64 keyword.  No reverse dependencies.
+# Removal in 30 days.  Bug #694204.
+dev-libs/libtrain
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last bumped in 2011.  Homepage gone.  No amd64 keyword.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694202.
+dev-libs/libsqlora8
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2009.  No reverse dependencies.
+# Removal in 30 days.  Bug #694200.
+dev-libs/libproccpuinfo
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Current version from 2015, last release in 2016.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694198.
+dev-libs/libntru
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2014.  Declared obsolete upstream.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694196.
+dev-libs/libmongo-client
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2009.  No reverse dependencies.
+# Removal in 30 days.  Bug #694192.
+dev-libs/libmail
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2010.  No reverse dependencies.
+# Removal in 30 days.  Bug #694190.
+dev-libs/liblzw
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2009.  No reverse dependencies.
+# Removal in 30 days.  Bug #694188.
+dev-libs/libidmef
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last bumped in 2005.  Homepage gone.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694186.
+dev-libs/libhtmlparse
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2009.  No reverse dependencies.
+# Removal in 30 days.  Bug #694184.
+dev-libs/libhome
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Both fail with modern versions of dev-util/waf
+# (#664762, #663712).  No reverse dependencies.
+# Removal in 30 days.  Bug #694182.
+dev-libs/libcxml
+dev-libs/locked_sstream
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  No reverse dependencies.  Its presence breaks
+# pulseaudio (#672468).
+# Removal in 30 days.  Bug #694180.
+dev-libs/libcli
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release in 2010.  No reverse dependencies.
+# Removal in 30 days.  Bug #694178.
+dev-libs/libcaldav
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  The driver is now included in the kernel,
+# so the package installs only a header file.  However, according
+# to upstream this file violated Lego Mindstorms SDK license.
+# Removal in 30 days.  Bug #694176.
+dev-libs/legousbtower
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  No reverse dependencies.  Multiple alternatives exist,
+# most with less restrictive licenses (e.g. dev-libs/glib).
+# Removal in 30 days.  Bug #694174.
+dev-libs/hashit
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Last release from 2010.  No reverse dependencies.
+# Removal in 30 days.  Bug #694170.
+dev-libs/fampp2
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  The current release is from 2005, pending version bump
+# since 2012.  No reverse dependencies.
+# Removal in 30 days.  Bug #694168.
+dev-libs/elfio
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Current release is from 2014, and needs version bump.
+# No reverse dependencies.
+# Removal in 30 days.  Bug #694166.
+dev-libs/cgicc
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-12)
+# Unmaintained.  Fails to build against current version of boost.
+# No reverse dependencies (last one removed in April).
+# Removal in 30 days.  Bug #691264.
+dev-libs/actor-framework
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-11)
+# Unmaintained.  Last bumped in 2016, many versions behind now.
+# Has test failures reported.  No reverse dependencies.
+# Removal in 30 days.  Bug #694056.
+dev-libs/gecode
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-11)
+# Ruby 2.4-only.  Requires old version of dev-libs/gecode.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #694040.
+dev-ruby/dep_selector
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-11)
+# Both packages are unmaintained, and are many releases behind.
+# hadolint is reported to fail to build, and requires old version
+# of language-docker.  Newer versions of language-docker have
+# no revdeps.
+# Removal in 30 days.  Bug #674660.
+dev-haskell/language-docker
+dev-util/hadolint
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-11)
+# Gentoo/FreeBSD project is effectively dead.  The core packages are
+# outdated and vulnerable.  We do not have a fully working install,
+# and I have not been able to find anyone knowing how to create one.
+# Leaf packages are failing to build more and more frequently, some
+# simply because of our outdated base system.  The profiles were marked
+# exp two months ago not to stall other developers, core packages are
+# masked for at least two months, and nowadays they have unsatisfied
+# dependencies already.
+#
+# If anyone wishes to take the effort over, please consider it urgent.
+# If not, I will slowly start removing remaining parts of FreeBSD
+# after this batch, and checking which packages can be salvaged.
+#
+# Removal in 30 days.  Bug #683284.
+sys-freebsd/boot0
+sys-freebsd/freebsd-bin
+sys-freebsd/freebsd-cddl
+sys-freebsd/freebsd-lib
+sys-freebsd/freebsd-libexec
+sys-freebsd/freebsd-mk-defs
+sys-freebsd/freebsd-pam-modules
+sys-freebsd/freebsd-pf
+sys-freebsd/freebsd-rescue
+sys-freebsd/freebsd-sbin
+sys-freebsd/freebsd-share
+sys-freebsd/freebsd-sources
+sys-freebsd/freebsd-ubin
+sys-freebsd/freebsd-usbin
+sys-freebsd/ubin-wrappers
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-11)
+# Unmaintained.  Ancient.  Carries a lot of patches, and has even more
+# bugs reported.  Last rites were cancelled due to Gentoo/FreeBSD 1 year
+# ago but that project is dead nowadays.  Many alternatives exist,
+# sys-process/cronie is probably the closest one (it's a fork).
+# Removal in 30 days.  Bug #693946.
+sys-process/vixie-cron
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-11)
+# Unmaintained.  Last bumped in 2013.  No apparent advantage over
+# the two other implementations in Gentoo (dev-util/pkgconfig,
+# dev-util/pkgconf).
+# Removal in 30 days.  Bug #694034.
+dev-util/pkgconfig-openbsd
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last bumped in 2009, last upstream release in 2014.
+# EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693944.
+www-client/ck4up
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Last bumped in 2006.  Homepage gone (domain taken over).  EAPI 0.
+# No amd64 keyword.
+# Removal in 30 days.  Bug #693942.
+www-apps/metadot
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  EAPI 0.  No amd64 keyword.  Does not support most
+# of the modern browsers.  Obsoleted by x11-misc/xdg-utils
+# and desktop-specific tools.
+# Removal in 30 days.  Bug #693940.
+www-apps/browser-config
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Added in 2005.  Last upstream update in 2003.  EAPI 0.
+# No amd64 keyword.
+# Removal in 30 days.  Bug #693938.
+www-apache/mod_diagnostics
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Last release in 2005.  EAPI 0.  No amd64 keyword.  No reverse
+# dependencies.
+# Removal in 30 days.  Bug #693936.
+sys-libs/lrmi
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Added in 2006 and not updated since.  EAPI 0.  Keyworded only for dead
+# x86-fbsd.
+# Removal in 30 days.  Bug #693934.
+sys-fs/scan-ffs
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Added in 2005, not bumped since.  Last upstream release in 2007.
+# EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693932.
+sys-cluster/ocfs
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Added in 2005, no upstream releases since.  EAPI 0.  No amd64 keyword.
+# -master is reported to fail to build.
+# Removal in 30 days.  Bug #693930.
+sys-cluster/feedbackd-agent
+sys-cluster/feedbackd-master
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last bumped in 2009, last upstream release from 2005.
+# EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693908.
+sys-boot/raincoat
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Added in 2006, no new releases since.  EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693906.
+sys-auth/icmpdn
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Not touched since 2005.  EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693904.
+sys-apps/netboot-base
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Added in 2005 and not bumped since.  Homepage gone.  EAPI 0.  No amd64
+# keyword.
+# Removal in 30 days.  Bug #693902.
+sys-apps/fwcrv
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Added in 2004 and not bumped since.  Homepage is gone.
+# EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693900.
+sys-apps/checkservice
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last bumped in 2012, last release in 2007.  EAPI 0.
+# No amd64 keyword.
+# Removal in 30 days.  Bug #693888.
+net-wireless/orinoco-fwutils
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last release in 2004.  EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693886.
+net-p2p/xnap
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Added in 2004, last release in 2002.  EAPI 0.
+# QA issues.  No amd64 keyword.
+# Removal in 30 days.  Bug #693884.
+net-p2p/smet2html
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Added in 2004 and not bumped since.  Homepage dead.
+# EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693882.
+net-p2p/myster
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last bumped in 2008, last upstream activity in 2010.
+# EAPI 0.  QA issues.  No amd64 keyword.
+# Removal in 30 days.  Bug #693880.
+net-p2p/mktorrent-borg
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Added in 2002 and not bumped since.  EAPI 0.  No amd64 keyword.
+# Sources are no longer to be found on the homepage, and upstream
+# explicitly points to third-party applications.
+# Removal in 30 days.  Bug #693878.
+net-misc/shout
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last bumped in 2003.  Homepage gone.  EAPI 0.
+# No amd64 keyword.
+# Removal in 30 days.  Bug #693876.
+net-misc/hlfl
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Last bumped in 2003, no new releases since.  EAPI 0.
+# No amd64 keywords.
+# Removal in 30 days.  Bug #693868.
+net-mail/gensig
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Both added in 2003, no new releases since.  Homepage dead.  EAPI 0.
+# No amd64 keywords.
+# Removal in 30 days.  Bug #693866.
+net-mail/qmail-lint
+net-mail/qmail-qsanity
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-09)
+# Unmaintained.  Added in 2001, no new releases since.  EAPI 0.
+# Multiple QA issues.  No amd64 keywords.
+# Removal in 30 days.  Bug #693864.
+net-mail/fastforward
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Suite of NIH libraries.  Only dev-libs/vanessa-logger has external
+# revdep of net-misc/aggregate-flim.  All others only revdep between
+# themselves.  Almost all packages are EAPI 0, and date back
+# to 2002-2010 (one is EAPI 5 / 2015 but has no revdeps).
+# Removal in 30 days.  Bug #693820.
+dev-libs/vanessa-adt
+dev-libs/vanessa-logger
+net-libs/vanessa-mcast
+net-libs/vanessa-socket
+net-misc/aggregate-flim
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  Added in 2004.  Upstream is gone.  EAPI 0.  No amd64
+# keyword.  No reverse dependencies.
+# Removal in 30 days.  Bug #693812.
+net-libs/roadrunner
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  Added in 2006, no newer releases.  EAPI 0.  No amd64
+# keywords.
+# Removal in 30 days.  Bug #693812.
+net-dns/tinystats
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Last bumped in 2009, last release in 2010.  EAPI 0.  No amd64 keyword.
+# Removal in 30 days.  Bug #693808.
+net-dialup/dgcmodem
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Added in 2000 and not bumped since.  EAPI 0.  No amd64 keywords.
+# Homepage and SRC_URI dead.  Original xanim was removed in 2016.
+# Removal in 30 days.  Bug #693804.
+media-video/xanim-export
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Last bumped in 2007.  EAPI 0.  Multiple QA issues.  x86-only.
+# Homepage is long gone.
+# Removal in 30 days.  Bug #693802.
+media-sound/imp3sh
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Last bumped in 2007.  EAPI 0.  Known to be broken on amd64.
+# Homepage dead.
+# Removal in 30 days.  Bug #693800.
+media-sound/hearnet
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Added in 2004 and not updated since.  Incorrect license.  EAPI 0.
+# Proprietary 32-bit x86 executable.  Homepage and SRC_URI are dead,
+# and we shouldn't be mirroring distfiles in the first place.
+# Removal in 30 days.  Bug #693798.
+sys-boot/psoload
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Added in 2003 and not updated since.  Unclear license.  EAPI 0.
+# No amd64 keywords.  Homepage and SRC_URI are dead, and we probably
+# shouldn't be mirroring distfiles in the first place.
+# Removal in 30 days.  Bug #693796.
+net-misc/netprofiles-ims
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Added in 2004 and not updated since.  Unclear license.  EAPI 0.
+# Homepage and SRC_URI are dead, and we probably shouldn't be mirroring
+# them in the first place.
+# Removal in 30 days.  Bug #693794.
+media-video/maven-poke
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Last bumped in 2009.  EAPI 0.  Keyworded only for the dead x86-bsd
+# port.  No reverse dependencies.
+# Removal in 30 days.  Bug #693768.
+dev-libs/libvolume_id
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  Added in 2002 and not updated since.  EAPI 0.  No amd64
+# keywords.  Apparently the only revdep was Stratego which was removed
+# in the past.
+# Removal in 30 days.  Bug #693760.
+dev-libs/cpl-stratego
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  Added in 2004 and not updated since.  Homepage dead.
+# EAPI 0.  No amd64 keywords.  No reverse dependencies.
+# Removal in 30 days.  Bug #693758.
+dev-libs/asyncresolv
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  Last release in 2004.  EAPI 0, no amd64 keywords.
+# Removal in 30 days.  Bug #693756.
+dev-lang/gwydion-dylan-bin
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Both packages are unmaintained, EAPI 0, not keyworded on amd64.
+# Both were last bumped in 2010.  Tinycobol had one release afterwards,
+# after which it has been declared dead (in 2011).  It is the only
+# reverse dependency of vbisam, and it has no reverse dependencies
+# itself.
+# Removal in 30 days.  Bug #693752.
+dev-db/vbisam
+dev-lang/tinycobol
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  EAPI 0.  Added in 2003 and not updated since.
+# Apparently FreeBSD had a 1.4.4 but upstream homepage is already gone.
+# Not keyworded on amd64.
+# Removal in 30 days.  Bug #693750.
+app-text/freepwing
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Added in 2008 and not updated since.  EAPI 0.  Upstream homepage
+# disappeared.  Not keyworded on amd64.
+# Removal in 30 days.  Bug #693748.
+app-emulation/vov
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Does not start.  Last bumped in 2012, numerous releases behind
+# upstream.
+# Removal in 30 days.  Bug #609652.
+net-p2p/saku
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Last bumped in 2008.  Needs porting out of games.eclass.  Apparently
+# does not work in testing mode, and requires rare hardware and media
+# for normal operation.
+# Removal in 30 days.  Bug #654290.
+games-emulation/daphne
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-08)
+# Unmaintained.  EAPI 0.  Homepage gone.  Potential netqmail maintainer
+# indicates that it can be replaced by running one daemon from normal
+# qmail install.
+# Removal in 30 days.  Bug #693746.
+mail-mta/mini-qmail
+
 # Michał Górny <mgorny@gentoo.org> (2019-09-07)
 # Unmaintained.  Beta version from 2012.  The ebuild is currently
 # broken, and since it relies on CD install, so it needs someone with
@@ -558,28 +1162,6 @@ dev-lang/php:7.4
 # Requires >=dev-lang/lua-5.2 which is masked
 >=app-admin/conky-1.11.4
 
-# Michał Górny <mgorny@gentoo.org> (2019-07-04)
-# The core FreeBSD packages are outdated, and have not been subject
-# to FreeBSD erratas for quite some time.  As a result, at least some
-# of them are vulnerable (especially the kernel).  The Gentoo/FreeBSD
-# project is on life support, and we can't provide quality packages
-# at the moment.  Use at your own risk.
-sys-freebsd/boot0
-sys-freebsd/freebsd-bin
-sys-freebsd/freebsd-cddl
-sys-freebsd/freebsd-lib
-sys-freebsd/freebsd-libexec
-sys-freebsd/freebsd-mk-defs
-sys-freebsd/freebsd-pam-modules
-sys-freebsd/freebsd-pf
-sys-freebsd/freebsd-rescue
-sys-freebsd/freebsd-sbin
-sys-freebsd/freebsd-share
-sys-freebsd/freebsd-sources
-sys-freebsd/freebsd-ubin
-sys-freebsd/freebsd-usbin
-sys-freebsd/ubin-wrappers
-
 # Miroslav Šulc <fordfrog@gentoo.org> (2019-06-12)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.21
diff --git a/profiles/prefix/windows/winnt/use.mask b/profiles/prefix/windows/winnt/use.mask
index 727eb842a440..7c916bb3e37c 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -35,7 +35,7 @@ ibm
 ieee1394
 ipod
 ipv6
-lm_sensors
+lm-sensors
 ncurses
 opengl
 oss
diff --git a/profiles/updates/3Q-2019 b/profiles/updates/3Q-2019
index ae1058e25a1c..d0ddf612e155 100644
--- a/profiles/updates/3Q-2019
+++ b/profiles/updates/3Q-2019
@@ -3,3 +3,5 @@ move media-plugins/kipi-plugins kde-apps/kipi-plugins
 move kde-misc/yakuake kde-apps/yakuake
 move kde-apps/kjots app-text/kjots
 move app-arch/upx-ucl app-arch/upx
+slotmove app-text/docbook-xml-simple-dtd 0 4.1.2.4
+move sys-apps/lm_sensors sys-apps/lm-sensors
diff --git a/profiles/use.desc b/profiles/use.desc
index 0ca431225e04..136d86900685 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -178,7 +178,7 @@ libsamplerate - Build with support for converting sample rates using libsamplera
 libwww - Add libwww support (General purpose WEB API)
 lirc - Add support for lirc (Linux's Infra-Red Remote Control)
 livecd - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used during livecd building
-lm_sensors - Add linux lm_sensors (hardware sensors) support
+lm-sensors - Add linux lm-sensors (hardware sensors) support
 lua - Enable Lua scripting support
 luajit - Use dev-lang/luajit instead of dev-lang/lua (ineffective with USE=-lua)
 lzma - Support for LZMA (de)compression algorithm
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 9ee36dc79afd..112da19b9d8b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2,6 +2,8 @@
 # your descriptions to your package's metadata.xml ONLY.
 # * generated automatically using egencache *
 
+acct-user/git:gitea - Set home directory for git hosting via www-apps/gitea.
+acct-user/git:gitolite - Set home directory for git hosting via dev-vcs/gitolite or dev-vcs/gitolite-gentoo.
 app-accessibility/brltty:api - build brltty's application program interface
 app-accessibility/brltty:beeper - support the console tone generator
 app-accessibility/brltty:contracted-braille - support in-line contracted braille
@@ -66,7 +68,7 @@ app-admin/elektra:yajl - Enable yajl support
 app-admin/gkrellm:X - Build both the X11 gui (gkrellm) and the server (gkrellmd). Disabling this flag builds the server only
 app-admin/gkrellm:gnutls - Enable SSL support for mail checking with net-libs/gnutls (overrides 'ssl' USE flag)
 app-admin/gkrellm:hddtemp - Enable monitoring harddrive temperatures via app-admin/hddtemp
-app-admin/gkrellm:lm_sensors - Enable monitoring sensors via sys-apps/lm_sensors
+app-admin/gkrellm:lm-sensors - Enable monitoring sensors via sys-apps/lm-sensors
 app-admin/gkrellm:ntlm - Enable NTLM authentication for mail checking with net-libs/libntlm
 app-admin/gkrellm:ssl - Enable SSL support for mail checking with dev-libs/openssl
 app-admin/glance:swift - Adds swift storage support
@@ -1940,8 +1942,6 @@ dev-lang/crystal:blocking-stdio-hack - Keep STDIO file descriptors in blocking m
 dev-lang/crystal:debug - Build each module as a separate object file. Speeds build up.
 dev-lang/crystal:xml - Use the dev-libs/libxml2 library to enable Crystal xml module
 dev-lang/crystal:yaml - Use the dev-libs/libyaml library to enable Crystal yaml module
-dev-lang/erlang:compat-ethread - Enable compatibility with pre-pentium 4 CPUs in the ethread library.
-dev-lang/erlang:dirty-schedulers - Enable dirty schedulers
 dev-lang/erlang:hipe - HIgh Performance Erlang extension
 dev-lang/erlang:kpoll - Enable kernel polling support
 dev-lang/erlang:pgo - Build erts with profile-guided optimizations
@@ -2427,6 +2427,8 @@ dev-libs/libverto:glib - Support event loops using dev-libs/glib
 dev-libs/libverto:libev - Support event loops using dev-libs/libev
 dev-libs/libverto:libevent - Support event loops using dev-libs/libevent
 dev-libs/libverto:tevent - Support event loops using sys-libs/tevent
+dev-libs/libvoikko:expvfst - Enable experimental features of VFST morphology backend
+dev-libs/libvoikko:hfst - Enable HFST morphology backend
 dev-libs/libxmlb:stemmer - Enable language stemming support
 dev-libs/libzia:ftdi - Enable support for FTDI USB chips
 dev-libs/libzip:mbedtls - Use net-libs/mbedtls as TLS provider
@@ -2908,6 +2910,7 @@ dev-qt/qt-docs:webview - Install documentation for dev-qt/qtwebview
 dev-qt/qt-docs:widgets - Install documentation for dev-qt/qtwidgets
 dev-qt/qt-docs:x11extras - Install documentation for dev-qt/qtx11extras
 dev-qt/qt-docs:xmlpatterns - Install documentation for dev-qt/qtxmlpatterns
+dev-qt/qt3d:gamepad - Add support for gamepad hardware via dev-qt/qtgamepad
 dev-qt/qt3d:gles2 - Use GLES 2.0 or later instead of full OpenGL
 dev-qt/qt3d:qml - Build QML/QtQuick bindings
 dev-qt/qtbluetooth:qml - Build QML/QtQuick bindings and imports
@@ -2920,6 +2923,8 @@ dev-qt/qtdeclarative:localstorage - Build the LocalStorage import for QtQuick (r
 dev-qt/qtdeclarative:widgets - Enable QtWidgets support
 dev-qt/qtdiag:network - Report network information
 dev-qt/qtdiag:widgets - Report widget style information
+dev-qt/qtgamepad:evdev - Enable support for input devices via evdev
+dev-qt/qtgamepad:qml - Build QML bindings
 dev-qt/qtgui:egl - Enable EGL integration
 dev-qt/qtgui:eglfs - Build the EGL Full Screen/Single Surface platform plugin
 dev-qt/qtgui:evdev - Enable support for input devices via evdev
@@ -3690,7 +3695,6 @@ gui-apps/swayidle:man - Build and install man pages
 gui-apps/swaylock:fish-completion - Enable fish completion support
 gui-apps/swaylock:gdk-pixbuf - Enable additional image format support via the x11-libs/gdk-pixbuf library
 gui-apps/swaylock:man - Build and install man pages
-gui-apps/waybar:libcxx - Build with Clang's libc++ instead of libstdc++ on Linux.
 gui-apps/waybar:mpd - Enable support for the Music Player Daemon
 gui-apps/waybar:network - Enable libnl support for network related features
 gui-apps/waybar:tray - Enable support for tray
@@ -4044,8 +4048,8 @@ mail-client/thunderbird:system-libvpx - Use the system-wide media-libs/libvpx in
 mail-client/thunderbird:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
 mail-client/thunderbird:system-webp - Use the system-wide media-libs/libwebp instead of bundled.
 mail-client/thunderbird-bin:crashreporter - Enable crash reporter for bugs
-mail-client/trojita:addressbook - Build kde-apps/akonadi addressbook plugin
 mail-client/trojita:password - Store passwords securely via dev-libs/qtkeychain
+mail-client/trojita:pim - Enable support for KDE PIM resources integration via kde-apps/akonadi addressbook plugin
 mail-filter/MailScanner:exim - Set mail-mta/exim to used MTA
 mail-filter/MailScanner:postfix - Set mail-mta/postfix to used MTA
 mail-filter/MailScanner:spamassassin - Enable usage of mail-filter/spamassassin for spam protection
@@ -4375,7 +4379,6 @@ media-gfx/povray:mkl - Enable support for Intel Vector Math Library, part of sci
 media-gfx/pqiv:archive - Enable support for images in archives and cbX comic book files
 media-gfx/pstoedit:emf - Enable media-libs/libemf support
 media-gfx/pstoedit:pptx - Enable support for generating PowerPoint pptx files
-media-gfx/qimgv:video - Add support for gif/webm playback via libmpv
 media-gfx/shotwell:opencv - Enable face detection via media-libs/opencv
 media-gfx/sigal:s3 - Enables support for the Amazon S3 service.
 media-gfx/slic3r:gui - Enable GUI
@@ -5532,6 +5535,7 @@ net-analyzer/net-snmp:elf - Enable the use of elf utils to check uptime on some
 net-analyzer/net-snmp:kmem - Enable usage of /dev/kmem
 net-analyzer/net-snmp:mfd-rewrites - Use MFD rewrites of mib modules where available
 net-analyzer/net-snmp:netlink - Use dev-libs/libnl to fetch TCP statistics instead of using /proc/net/tcp (Linux only).
+net-analyzer/net-snmp:pcap - Install snmppcap which reads from PCAP files and writes to the SNMP transport
 net-analyzer/net-snmp:pci - Use libpci (from sys-apps/pciutils) to look up network interface description. This feature is only available on Linux.
 net-analyzer/net-snmp:rpm - Enable monitoring of app-arch/rpm. This flag requires the bzip2 and zlib flags to be enabled as well.
 net-analyzer/net-snmp:smux - Enable support for the legacy smux protocol (superseded by agentx)
@@ -6623,19 +6627,8 @@ net-misc/electron-cash:email - Enable plugin to support emailing invoices
 net-misc/electron-cash:qrcode - Enable QR code scanning with media-gfx/zbar
 net-misc/electron-cash:sync - Enable plugin to sync wallet metadata across multiple Electrum clients
 net-misc/electron-cash:vkb - Enable plugin for virtual keyboard
-net-misc/electrum:audio_modem - Enable plugin to support Audio Modem
 net-misc/electrum:cli - Enables the CLI interface
-net-misc/electrum:coldcard - Enable plugin to support Coldcard Hardware Wallet
-net-misc/electrum:cosign - Enable plugin to support multisig wallets between multiple Electrum clients
-net-misc/electrum:digitalbitbox - Enable plugin to support Digital Bitbox hardware wallet
-net-misc/electrum:email - Enable plugin to support emailing invoices
-net-misc/electrum:greenaddress_it - Enable plugin to verify GreenAddress.it instant transactions
 net-misc/electrum:qrcode - Enable QR code scanning with media-gfx/zbar
-net-misc/electrum:revealer - Enable revealer plugin for extra security. https://revealer.cc/
-net-misc/electrum:safe_t - Enable plugin to support Safe-T mini Wallet
-net-misc/electrum:sync - Enable plugin to sync wallet metadata across multiple Electrum clients
-net-misc/electrum:trustedcoin_com - Enable plugin to use two-factor service by TrustedCoin.com
-net-misc/electrum:vkb - Enable plugin for virtual keyboard
 net-misc/electrum-ltc:audio_modem - Enable plugin to support Audio Modem
 net-misc/electrum-ltc:cli - Enables the CLI interface
 net-misc/electrum-ltc:cosign - Enable plugin to support multisig wallets between multiple Electrum clients
@@ -7690,6 +7683,7 @@ sci-libs/symengine:mpc - Add support for multiprecision complex arithmetic(dev-l
 sci-libs/symengine:mpfr - Add support for multiprecision floating point rouding(dev-libs/mpfr)
 sci-libs/taucs:cilk - Enable multithreading using dev-lang/cilk
 sci-libs/tensorflow:cuda - Enable support for nVidia CUDA
+sci-libs/tensorflow:xla - XLA (Accelerated Linear Algebra) Optimizing Compiler for TensorFlow
 sci-libs/trilinos:adolc - Add support for adolc (sci-libs/adolc)
 sci-libs/trilinos:arprec - Add support for arprec (sci-libs/arprec)
 sci-libs/trilinos:boost - Add support for boost (dev-libs/boost)
@@ -8063,8 +8057,8 @@ sys-apps/kmscon:pango - Enable pango font rendering
 sys-apps/kmscon:pixman - Enable pixman font rendering
 sys-apps/kmscon:systemd - Enable multiseat support via systemd
 sys-apps/linux-misc-apps:usbip - Include USB/IP binaries to replace net-misc/usbip
-sys-apps/lm_sensors:contrib - Installs user contributed configuration files so you don't need to find settings on your own for your system if somebody else has already created such a configuration for sensors/mainboards you are using.
-sys-apps/lm_sensors:sensord - Enable sensord - a daemon that can be used to periodically log sensor readings from hardware health-monitoring chips
+sys-apps/lm-sensors:contrib - Installs user contributed configuration files so you don't need to find settings on your own for your system if somebody else has already created such a configuration for sensors/mainboards you are using.
+sys-apps/lm-sensors:sensord - Enable sensord - a daemon that can be used to periodically log sensor readings from hardware health-monitoring chips
 sys-apps/man-db:manpager - Enable manpager wrapper for colorizing output
 sys-apps/mawk:forced-sandbox - Always enable -W sandbox mode for simpler/secure runtime
 sys-apps/memtest86:serial - Compile with serial console support
@@ -8130,7 +8124,7 @@ sys-apps/superdiag:usb - Install all files, which are needed for an installation
 sys-apps/superiotool:pci - Support for PCI-attached "Super I/Os" (e.g. in VIA VT82686A/B).
 sys-apps/systemd:apparmor - Enable AppArmor support
 sys-apps/systemd:audit - Enable support for sys-process/audit
-sys-apps/systemd:cgroup-hybrid - Default to hybrid cgroup hierarchy instead of unified.
+sys-apps/systemd:cgroup-hybrid - Default to hybrid (legacy) cgroup hierarchy instead of unified (modern).
 sys-apps/systemd:cryptsetup - Enable cryptsetup tools (includes unit generator for crypttab)
 sys-apps/systemd:curl - Enable support for uploading journals
 sys-apps/systemd:dns-over-tls - Enable DNS-over-TLS support
@@ -8377,6 +8371,9 @@ sys-cluster/pacemaker:heartbeat - Enable sys-cluster/heartbeat support.
 sys-cluster/pacemaker:smtp - Enable SMTP support via net-libs/libesmtp
 sys-cluster/pmix:munge - Enable authentication via munge
 sys-cluster/pmix:pmi - Build PMI1 and PMI2 interface
+sys-cluster/rdma-core:neigh - Enable iwpmd support
+sys-cluster/rdma-core:python - Enable pyverbs support
+sys-cluster/rdma-core:valgrind - Enable valgrind notations
 sys-cluster/resource-agents:libnet - Force use of net-libs/libnet
 sys-cluster/resource-agents:rgmanager - Install resources for rgmanager
 sys-cluster/slurm:html - Build html documentation
@@ -8695,7 +8692,6 @@ sys-libs/libcxx:libcxxrt - Build on top of sys-libs/libcxxrt instead of gcc's li
 sys-libs/libcxx:libunwind - Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependence on gcc.
 sys-libs/libcxxabi:libunwind - Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependency on gcc
 sys-libs/libcxxrt:libunwind - Use libunwind instead of libgcc_s for unwinding. This should allow avoiding relying on sys-devel/gcc but for now clang is setup to use libgcc_s.
-sys-libs/libhugetlbfs:perl - Install the cpupcstat tool and some perl modules
 sys-libs/libomp:cuda - Build CUDA offloading plugin (only with USE=offload)
 sys-libs/libomp:hwloc - Enable CPU affinity support via hwloc
 sys-libs/libomp:offload - Support offloading OpenMP using libomptarget
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index c29f75789a55..58e636e73b74 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/bioruby/Manifest b/sci-biology/bioruby/Manifest
index 086ac10cb1ff..074f6e0d532d 100644
--- a/sci-biology/bioruby/Manifest
+++ b/sci-biology/bioruby/Manifest
@@ -1,5 +1,5 @@
 DIST bio-1.5.1.gem 1445376 BLAKE2B 4de704293ed1c4dee7edc9c86df4ddd35f66eb4433a339fadb58c3f877206e240a8b1dfe6aa8ccd92f0edf9d0f28825cc2b58e33f817fec6bab39e3162f179cf SHA512 822ac6c3d85847193fc1992087abc868e4d1a7cfca82da6ab1830af2927a2a582c3993bc681e129a6aac224ed1cb0b33056d8cc02d3e36d68c9d6a4153c321ca
 DIST bio-1.5.2.gem 1447424 BLAKE2B 6377f7c546faef188d43b1e612f1924f5ab2db3a0017fac1f1b124b6cdf7caf4b66dde53d957d0a733601e3c928f0a84b18ae9da930f4a4908ab236f9365d385 SHA512 a0c4be950ef2983f07e8b9d0ac217310d80d91139ca0edb0263d8ae0a35e62fc07a21861ab26d8bace40003f0d9de4dce1be8f02c7d6d0f4afe3eb3debe3d5cd
 EBUILD bioruby-1.5.1.ebuild 431 BLAKE2B 1f9a60a70312debc75c6eb47bc66e8eaa350fdd8898991bb2c8c0ef59ceb4364c6be308e4bb09f5ba1f641bab824795fdb22a77c22f38754d6e18b9094e3a081 SHA512 b039590a84df3d382f1d0eab42c9a0c6fc7752403a6b158b316746d872cc924a698f80350ddf3decca3641f9c549921d40d23e72798d2d73f4a3fcfbcebe005e
-EBUILD bioruby-1.5.2.ebuild 429 BLAKE2B 24abc977ac78c36d42f49a463ae697b9d005011c9511e4ca6970c364f773ea3d966eebf30fcb45b76aca802e4c6f48a03cc6e0d1faa7ece228f88a274164d3cf SHA512 86a1f916d056bedac296c16e98c0b367df18ca5c424365cbd9fdd71169b68c09ce5ba2f3479a735aca57a0cc47177101c0e75e847467189855ef949e1318c1a4
+EBUILD bioruby-1.5.2.ebuild 428 BLAKE2B 30a8bf534852ae88ea37edc4494a1b10c1d6a454306b437c6dde169c322f9175cadff5397934d6a13bd67848591d424beaa9ac2d563a8d5ff95005dcb7569932 SHA512 f01f0361e95660090d0127289e8c3a61c5581cc60cc1c1c82fe25a7b934760ddb965eeb81aca44b265995e135ee6d2f9be755d1bb52aa9ae29df78b400d0aa6a
 MISC metadata.xml 261 BLAKE2B 3768c926bca545090342a947ba83e706a8954c51b99a5e7b3476ba5198cd326fe1c3b8efb51dfd6be1800682556b8ceea065e388981463ab32f3d687951872f3 SHA512 537da0d3aa2741ebe4442d5dd9b53409decfc9d12ca8e5af8e737c4deb2910c884207e2d441025d19469816100889f04c11038bdffd6a1a15c6217495445090a
diff --git a/sci-biology/bioruby/bioruby-1.5.2.ebuild b/sci-biology/bioruby/bioruby-1.5.2.ebuild
index 3ef1921ce4d1..7977f4073da5 100644
--- a/sci-biology/bioruby/bioruby-1.5.2.ebuild
+++ b/sci-biology/bioruby/bioruby-1.5.2.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="http://bioruby.org/"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 ruby_add_rdepend "dev-ruby/libxml"
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 76b38bced164..c06707c2d17c 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 89b401950af8..b02003b7d9e3 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,5 +1,3 @@
 DIST gnome-maps-3.30.3.1.tar.xz 2175840 BLAKE2B 0c2f44ec3262715d98e1a0412ca305e15916cdb92df5fc5b04df34b65a7b9c55d4f5dd9c54f9f9dc34f8e6dd889f60d7993b59ca0cd92e4e60b22b506877b24c SHA512 02d3b1b305c1011a60a34566847962ec3c32ee3563ce2c327b810fae24c2df08354d8420f1986645d861cfef7a35f336d67d4576a3e2f61eabdd972b8d070a8e
-DIST gnome-maps-3.30.3.tar.xz 2176712 BLAKE2B 8595643ddf3f6c419fdc053561e49e62d6bd6e3713d3d809d3fe73cd1aecf3361e3f6592fb53d6963cbdd5fc3edaf1dcb616059da9e5e506a3399d00a9a65de7 SHA512 f3481266c6cf792da71ef40ce489c13fdd807dab91238e02b815b25e29119ffb56212fb03078e14004cca27e24906af1b94f7f3c4325bbf4f332c782c79d8203
-EBUILD gnome-maps-3.30.3.1.ebuild 1371 BLAKE2B e21171e674c9aac5754c4d32b1bbcdbf4b5ed108787a78e4702764f65506a2a2424baf58d0ab7a808b4948fd8b5f47977832d299985bb93177120ca862e2b273 SHA512 3eac7d2475cfc32138e72fa025f65117726a2ee47e91e841e9352cc7fe8ecfb0283293625f293f14bd655b2624398f1034094f3001ab2d8504a8fb77bb9cba19
-EBUILD gnome-maps-3.30.3.ebuild 1359 BLAKE2B dfa98ca4eed766532f6008528d72cd0788323cbd8f5a575869cca613d35aca73a9a61fbf5d2f86e9bbbfd5e7f3f2471ebf86ea36e9876a07545191007b4f5d7f SHA512 955e664deb35e95f3d2c2bc0329dd252b41dd9167d1c6b69a59313853b84a651c3749f1960df8c164d26d9c5b2af4bbeee63c337920536f79f9951c106e6fcf1
+EBUILD gnome-maps-3.30.3.1.ebuild 1370 BLAKE2B 5434f28013128cc139a5f4b9cff7c5d80a627bb29fed3444fd2637d1d8ebd50412e377207e4ec1f1bf018829c0892a0c97daf54ff82a6031fdfa1a1ea8bcf1d3 SHA512 d803255db05419c8c8ec3fa2ae50787c53b81fee53fa8483898958e27514ff3379a546145caa0e79d5d20b68462082d5e3a6d09fd04a70d8e02e445bd35adff4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild
index 801d1c7091bb..1bf085287517 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.30.3.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Pure introspection dependencies found by grepping imports.gi in ${S}
 RDEPEND="
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild
deleted file mode 100644
index 33d1cef5ba9c..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-3.30.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="A map application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-# Pure introspection dependencies found by grepping imports.gi in ${S}
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/gjs-1.50.0
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=x11-libs/gtk+-3.22:3[introspection]
-	>=app-misc/geoclue-0.12.99:2.0[introspection]
-	>=dev-libs/libgee-0.16:0.8[introspection]
-	>=dev-libs/folks-0.10
-	>=sci-geosciences/geocode-glib-3.15.2[introspection]
-	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
-	dev-libs/libxml2:2
-	>=net-libs/rest-0.7.90:0.7[introspection]
-
-	app-crypt/libsecret[introspection]
-	dev-libs/libgweather[introspection]
-	media-libs/clutter-gtk:1.0[introspection]
-	media-libs/clutter:1.0[introspection]
-	net-libs/gnome-online-accounts[introspection]
-	net-libs/libgfbgraph[introspection]
-	net-libs/libsoup:2.4[introspection]
-	net-libs/webkit-gtk:4[introspection]
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postinst() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 950d1f5a241f..69fd9df573ed 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,9 +1,12 @@
 AUX gpsd-3.17-do_not_rm_library.patch 630 BLAKE2B ca14382bd2a15a6dad255d52484fb3b4cfaa33e6d4d452d1f205e8854e4d7c2e2804dced5617fb2e3f6c207676bb7e0c30ec243d2ad718c2a3458739c4dbeda2 SHA512 70a1db3b2f478885fd0035a8c812f9ddf5230de4ede77c12a6bf3d81d744a902a4c5e14b788f97d9c653e1384653af1cdf849f72b0eb2f49030776c413c60d42
+AUX gpsd-3.17-scons-print.patch 2793 BLAKE2B 6b475dced3a034ee28d4b85c5897f598af02b795b407ec92b5c9938dc45d760cc5a7806e9ece477378462cb2285ae0089a2ef1c23119030e9ca79534c02e40e5 SHA512 1a4883241b0f0126311921ea552d4b090dd5e4e51b42ef865a5afeae4732b27f6057d9389ab6319c9e62d096f26533c28096ac71fb481f478a3bb3b70ffc6d63
+AUX gpsd-3.17-scons-py3.patch 5575 BLAKE2B 7c666c5cc155a95c93e9c871d6233db698cea37a8dde64de39dfdf1fa1a166224d5ed5e72a664c98a363717084a22c9d7359eaa7e13f8fcb11c1225127b7c421 SHA512 091cf7b6c3b283cb5ccdf293f50df639358c7c7ca501cab813cc8439285fc54fd6adcf6b4ae557c1ceeed07dc96e762ec4a8ca703988289885c6a06c205c1859
 AUX gpsd-3.3-setup.py 448 BLAKE2B 159a212afe7600a9835a03bd87130820a154147aab83c32500108df1d81726d571c7d21e3ac7729c0054859297b71ab42f6cb6c6e487242a46f8d0d91f7c5b0f SHA512 4036bac7c095ba89795b565461bda8f282b7e1476867437db2beabeb1ba3a2a1b5a5b748acaa9ee1a2df693d854654e07f86610f387995abd0b057d3684b651b
 AUX gpsd-9999-do_not_rm_library.patch 630 BLAKE2B ca14382bd2a15a6dad255d52484fb3b4cfaa33e6d4d452d1f205e8854e4d7c2e2804dced5617fb2e3f6c207676bb7e0c30ec243d2ad718c2a3458739c4dbeda2 SHA512 70a1db3b2f478885fd0035a8c812f9ddf5230de4ede77c12a6bf3d81d744a902a4c5e14b788f97d9c653e1384653af1cdf849f72b0eb2f49030776c413c60d42
 AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35e82f543265cd457646405b00bd15e45b4a131c5f8d0efefb910be6013476ba7b052650298934 SHA512 75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef
 AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea
 DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1
 EBUILD gpsd-3.17-r3.ebuild 4686 BLAKE2B 08fc309754775187a06dda2072599c48db1dfe95d0c7737f2669d20d2ee533a2397451f1aee44c23ef2717efb9d5e36528e7590a033fb97b002120ab69b3ce61 SHA512 a39aaa74cef796e1e55e893e6232f502ae034822d0ce8b5017824b301e0db7508af8308be7c80670c31cfa71d9b89644b844296cb51a3d4b5b84bb89b8b6ef12
-EBUILD gpsd-9999.ebuild 4797 BLAKE2B cc5f7bfd79b65ce4e90205c8a18732ca5c874f3bf2fede97e15cbcab6f02a65e51a4cea1d539be4a5d308164d026084b7914b289e0b37a76ba8f1958591c01ae SHA512 3c90e51a6533a472126eb87ff6f6a6909f5545944ca0399103ce87980a1308d3f27fff97a571a1ef320847f779ecbd3e722a8eb7069d1ce5ae5b1ab3f5d75e81
+EBUILD gpsd-3.17-r4.ebuild 4867 BLAKE2B f36679ef973b89804c6d19dbea466b972c0e9cbba3597e221427be32945810e51865a117fde5b174b2a6eed5d23be19571dbebb522c68a824eac6b2c4fbc3b9d SHA512 dd817ff67680e5b6d95ca751e8281115ad23a031d4ecbaad5830c8b50895bcf3b38346977577faefd246a5939de4d0125828ebfb0db2bb20141d24ad1e342b34
+EBUILD gpsd-9999.ebuild 4887 BLAKE2B fbc20e843de1755a67038b3fef2fc1e5e7593d16ffff0e3e8c20236dbb59852777b77b7cbcca70c92890d5f70043d60c4f04d589d7fdecdf8993774195a6c477 SHA512 66563daebdc8400a8b5003af0c212fd343b81e608a59e0242ba4f8d681a83d75cac7f6b6c9e76a3667877e55f2fdd6f8c9b40045e19e2c5e7a3aa05b9040ab94
 MISC metadata.xml 950 BLAKE2B a2250377cdd4f1e827e7fe7dd5f8707316e8cbe9552f4ca2e56828e138d2d2b31d5c6cc930247c8666c9546fbe8dad618b2c38a34b6caac7f9e82ca620806ef3 SHA512 a5e8e60afc8c02e769cf496caa30003173455d82554378457ee7350bcc64b57a88b697cf2284a7a56f008461a33d260d167ce866bde0710e235f684e201a5bf8
diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch
new file mode 100644
index 000000000000..4d94d05f4284
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch
@@ -0,0 +1,73 @@
+From ed205512dd05a7dd4b0dab8af760d13e9efbbb25 Mon Sep 17 00:00:00 2001
+From: Fred Wright <fw@fwright.net>
+Date: Sat, 7 Oct 2017 19:54:55 -0700
+Subject: [PATCH] Fixes SConstruct for SCons 3.0.0.
+
+SCons 3.0.0 introduced a bug where the print_funtion future import is
+inflicted on the SConstruct script, making 'print' as a statement
+illegal.  This is expected to be fixed in SCons 3.0.1, but in the
+meantime it's necessary to switch to the print_function mode for
+compatibility.  Fortunately, there were only three print statements in
+the whole file.
+
+This is not a complete Python 3 fix; it simply restores correct
+operation when running SCons under Python 2.
+
+TESTED:
+Arraged to test all three print() instances under OSX.
+Tested "scons build-all check" under OSX, Ubuntu, CentOS, Fedora,
+FreeBSD, OpenBSD, and NetBSD.
+---
+ SConstruct | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 4923ad8cdae3..040103cff387 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -23,6 +23,13 @@
+ # * Out-of-directory builds: see http://www.scons.org/wiki/UsingBuildDir
+ # * Coveraging mode: gcc "-coverage" flag requires a hack
+ #   for building the python bindings
++# * Python 3 compatibility in this recipe
++
++# Since SCons 3.0.0 forces print_function on us, it needs to be unconditional.
++# This is recognized to be a bug in SCons, but we need to live with it for now,
++# and we'll need this for eventual Python 3 compatibility, anyway.
++# Python requires this to precede any non-comment code.
++from __future__ import print_function
+ 
+ # Release identification begins here
+ gpsd_version = "3.18~dev"
+@@ -375,7 +382,7 @@ if env.GetOption("silent"):
+ 
+ def announce(msg):
+     if not env.GetOption("silent"):
+-        print msg
++        print(msg)
+ 
+ # DESTDIR environment variable means user prefix the installation root.
+ DESTDIR = os.environ.get('DESTDIR', '')
+@@ -1546,8 +1553,8 @@ def substituter(target, source, env):
+         content = content.replace(s, t)
+     m = re.search("@[A-Z]+@", content)
+     if m and m.group(0) not in map(lambda x: x[0], substmap):
+-        print >>sys.stderr, "Unknown subst token %s in %s." \
+-            % (m.group(0), sfp.name)
++        print("Unknown subst token %s in %s." % (m.group(0), sfp.name),
++              file=sys.stderr)
+     tfp = open(str(target[0]), "w")
+     tfp.write(content)
+     tfp.close()
+@@ -2191,7 +2198,7 @@ def validation_list(target, source, env):
+         if '-head' not in page:
+             fp = open(page)
+             if "Valid HTML" in fp.read():
+-                print os.path.join(website, os.path.basename(page))
++                print(os.path.join(website, os.path.basename(page)))
+             fp.close()
+ Utility("validation-list", [www], validation_list)
+ 
+-- 
+2.19.1
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch
new file mode 100644
index 000000000000..d6154c47687b
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch
@@ -0,0 +1,143 @@
+From b2ba8d5ade0f9d55c2b51ca41d9c9604662452ad Mon Sep 17 00:00:00 2001
+From: Robert Norris <rw_norris@hotmail.com>
+Date: Mon, 12 Feb 2018 14:16:17 -0800
+Subject: [PATCH] SConstruct: Allow building for Python 3
+
+Still usable with Python 2
+
+Tested:
+scons build-all check
+
+Debian Unstable with python 2.7.14
+OpenSUSE Tumbleweed with python 3.6.4
+---
+ SConstruct | 30 ++++++++++++++++--------------
+ 1 file changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index c6a309ec3c30..17b47e21342f 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -370,7 +370,7 @@ for flag in ["LDFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
+ 
+ 
+ # Keep scan-build options in the environment
+-for key, value in os.environ.iteritems():
++for key, value in os.environ.items():
+     if key.startswith('CCC_'):
+         env.Append(ENV={key: value})
+ 
+@@ -476,6 +476,8 @@ if env['sysroot']:
+     env.MergeFlags({"LINKFLAGS": ["--sysroot=%s" % env['sysroot']]})
+ 
+ # Build help
++def cmp(a, b):
++    return (a > b) - (a < b)
+ 
+ Help("""Arguments may be a mixture of switches and targets in any order.
+ Switches apply to the entire build regardless of where they are in the order.
+@@ -859,9 +861,9 @@ else:
+         "dbus_export": ["libdbus-1"],
+     }
+ 
+-    keys = map(lambda x: (x[0], x[2]), boolopts)  \
+-        + map(lambda x: (x[0], x[2]), nonboolopts) \
+-        + map(lambda x: (x[0], x[2]), pathopts)
++    keys = list(map(lambda x: (x[0], x[2]), boolopts))  \
++        + list(map(lambda x: (x[0], x[2]), nonboolopts)) \
++        + list(map(lambda x: (x[0], x[2]), pathopts))
+     keys.sort()
+     for (key, help) in keys:
+         value = env[key]
+@@ -998,7 +1000,7 @@ else:
+ if env['python']:  # May have been turned off by error
+     env['PYTHON'] = target_python_path
+     env['ENV']['PYTHON'] = target_python_path  # For regress-driver
+-    py_config_vars = ast.literal_eval(py_config_text)
++    py_config_vars = ast.literal_eval(py_config_text.decode())
+     py_config_vars = [[] if x is None else x for x in py_config_vars]
+     python_config = dict(zip(PYTHON_CONFIG_NAMES, py_config_vars))
+ 
+@@ -1387,7 +1389,7 @@ else:
+ 
+     python_objects = {}
+     python_compiled_libs = {}
+-    for ext, sources in python_extensions.iteritems():
++    for ext, sources in python_extensions.items():
+         python_objects[ext] = []
+         for src in sources:
+             python_objects[ext].append(
+@@ -1417,7 +1419,7 @@ Platform: UNKNOWN
+     python_egg_info = python_env.Textfile(target="gps-%s.egg-info"
+                                           % (gpsd_version, ),
+                                           source=python_egg_info_source)
+-    python_built_extensions = python_compiled_libs.values()
++    python_built_extensions = list(python_compiled_libs.values())
+     python_targets = python_built_extensions + [python_egg_info]
+ 
+ env.Command(target="packet_names.h", source="packet_states.h", action="""
+@@ -1624,14 +1626,14 @@ if env['xgps']:
+         "xgpsspeed.1": "gps.xml",
+         "xgps.1": "gps.xml",
+     })
+-all_manpages = base_manpages.keys() + python_manpages.keys()
++all_manpages = list(base_manpages.keys()) + list(python_manpages.keys())
+ 
+ man_env = env.Clone()
+ if man_env.GetOption('silent'):
+     man_env['SPAWN'] = filtered_spawn  # Suppress stderr chatter
+ manpage_targets = []
+ if manbuilder:
+-    for (man, xml) in base_manpages.items() + python_manpages.items():
++    for (man, xml) in list(base_manpages.items()) + list(python_manpages.items()):
+         manpage_targets.append(man_env.Man(source=xml, target=man))
+ 
+ # Where it all comes together
+@@ -1682,7 +1684,7 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip']
+ if not env['python']:
+     python_install = []
+ else:
+-    python_module_dir = python_libdir + os.sep + 'gps'
++    python_module_dir = str(python_libdir) + os.sep + 'gps'
+     python_extensions_install = python_env.Install(DESTDIR + python_module_dir,
+                                                    python_built_extensions)
+     if ((not env['debug'] and not env['profiling']
+@@ -1695,7 +1697,7 @@ else:
+     python_progs_install = python_env.Install(installdir('bindir'),
+                                               python_progs)
+ 
+-    python_egg_info_install = python_env.Install(DESTDIR + python_libdir,
++    python_egg_info_install = python_env.Install(DESTDIR + str(python_libdir),
+                                                  python_egg_info)
+     python_install = [python_extensions_install,
+                       python_modules_install,
+@@ -1712,7 +1714,7 @@ if qt_env:
+ 
+ 
+ maninstall = []
+-for manpage in base_manpages.keys() + python_manpages.keys():
++for manpage in list(base_manpages.keys()) + list(python_manpages.keys()):
+     if not manbuilder and not os.path.exists(manpage):
+         continue
+     section = manpage.split(".")[1]
+@@ -2198,7 +2200,7 @@ htmlpages = Split('''
+     www/writing-a-driver.html
+     ''')
+ 
+-webpages = htmlpages + asciidocs + map(lambda f: f[:-3], glob.glob("www/*.in"))
++webpages = htmlpages + asciidocs + list(map(lambda f: f[:-3], glob.glob("www/*.in")))
+ 
+ www = env.Alias('www', webpages)
+ 
+@@ -2376,7 +2378,7 @@ if os.path.exists("gpsd.c") and os.path.exists(".gitignore"):
+     if ".gitignore" in distfiles:
+         distfiles.remove(".gitignore")
+     distfiles += generated_sources
+-    distfiles += base_manpages.keys() + python_manpages.keys()
++    distfiles += list(base_manpages.keys()) + list(python_manpages.keys())
+     if "packaging/rpm/gpsd.spec" not in distfiles:
+         distfiles.append("packaging/rpm/gpsd.spec")
+ 
+-- 
+2.19.1
+
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
new file mode 100644
index 000000000000..5ffc9c07ef39
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 )
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
+	inherit git-2
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0/23"
+
+GPSD_PROTOCOLS=(
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+	gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver
+	oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt
+	tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
+REQUIRED_USE="X? ( python )
+	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( cxx )"
+
+RDEPEND="
+	>=net-misc/pps-tools-0.0.20120407
+	bluetooth? ( net-wireless/bluez )
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	ntp? ( || (
+		net-misc/ntp
+		net-misc/ntpsec
+		net-misc/chrony
+	) )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+	)
+	python? ( ${PYTHON_DEPS} )
+	usb? ( virtual/libusb:1 )
+	X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( sys-devel/bc )"
+
+# xml packages are for man page generation
+if [[ ${PV} == *9999* ]] ; then
+	DEPEND+="
+		app-text/xmlto
+		=app-text/docbook-xml-dtd-4.1*"
+fi
+
+src_prepare() {
+	# Make sure our list matches the source.
+	local src_protocols=$(echo $(
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+	) )
+	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+		eerror "Detected protocols: ${src_protocols}"
+		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
+		die "please sync ebuild & source"
+	fi
+
+	epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
+	epatch "${FILESDIR}"/${P}-scons-print.patch
+	epatch "${FILESDIR}"/${P}-scons-py3.patch
+
+	# Avoid useless -L paths to the install dir
+	sed -i \
+		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+		SConstruct || die
+
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	python_export_best
+	# Extract python info out of SConstruct so we can use saner distribute
+	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+	local pybins=$(pyvar python_progs | tail -1)
+	# Handle conditional tools manually. #666734
+	use X && pybins+="+ ['xgps', 'xgpsspeed']"
+	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
+	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
+	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
+	sed \
+		-e "s|@VERSION@|$(pyvar gpsd_version)|" \
+		-e "s|@URL@|$(pyvar website)|" \
+		-e "s|@EMAIL@|$(pyvar devmail)|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
+		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
+		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		libdir="\$prefix/$(get_libdir)"
+		udevdir="$(get_udevdir)"
+		chrpath=False
+		gpsd_user=gpsd
+		gpsd_group=uucp
+		nostrip=True
+		manbuild=False
+		shared=$(usex !static True False)
+		$(use_scons bluetooth bluez)
+		$(use_scons cxx libgpsmm)
+		$(use_scons debug clientdebug)
+		$(use_scons dbus dbus_export)
+		$(use_scons ipv6)
+		$(use_scons latency_timing timing)
+		$(use_scons ncurses)
+		$(use_scons ntp ntpshm)
+		$(use_scons ntp pps)
+		$(use_scons X python)
+		$(use_scons qt5 qt)
+		$(use_scons shm shm_export)
+		$(use_scons sockets socket_export)
+		$(use_scons usb)
+	)
+
+	use X && myesconsargs+=( xgps=1 )
+	use qt5 && myesconsargs+=( qt_versioned=5 )
+
+	# enable specified protocols
+	local protocol
+	for protocol in ${GPSD_PROTOCOLS[@]} ; do
+		myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
+	done
+}
+
+src_compile() {
+	export CHRPATH=
+	tc-export CC CXX PKG_CONFIG
+	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+	escons
+
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	DESTDIR="${D}" escons install $(usex udev udev-install "")
+
+	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+	use python && distutils-r1_src_install
+}
+
+pkg_preinst() {
+	# Run the gpsd daemon as gpsd and group uucp; create it here
+	# as it doesn't seem to be needed during compile/install ...
+	enewuser gpsd -1 -1 -1 "uucp"
+}
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 84668fd1c77f..5b3bca138d44 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -93,6 +93,8 @@ python_prepare_all() {
 	# Extract python info out of SConstruct so we can use saner distribute
 	pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
 	local pybins=$(pyvar python_progs | tail -1)
+	# Handle conditional tools manually. #666734
+	use X && pybins+="+ ['xgps', 'xgpsspeed']"
 	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
 	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
 	local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
diff --git a/sci-geosciences/libtcd/Manifest b/sci-geosciences/libtcd/Manifest
index 51a7982a1106..af227216622f 100644
--- a/sci-geosciences/libtcd/Manifest
+++ b/sci-geosciences/libtcd/Manifest
@@ -1,7 +1,5 @@
 DIST libtcd-2.2.5-r2.tar.bz2 294449 BLAKE2B 82c91beab6f4fe5d6c4ddfdca043a83db01508fca9475576c2f4174d14928acd7c5c56afd2dce2fc741bb2bf61244ed65f63e9298ab5e6d2b3520622b283aa68 SHA512 125b8f4258c576d82f86f75c9dec4e6e0dba8d46e897835ff8ee57cb58495c3f2ae42040719aa8a6f0fa70be40dbc3eb082250cfa197f15f0b23d2ee37a47fbd
-DIST libtcd-2.2.6.tar.bz2 300738 BLAKE2B 321ef152e68bc6a333590bc2675890a04ea2e6e5f776bc3f3744bef8dfc5367bc0625f65cef522a59c715123f5c1ee84e8142464e520e1b70958f6cbaf40e6a3 SHA512 e0c5c35a72617c013fa2cfe94c0aff16c9d14870aa1b3ab14bf1a01715df8f8d9e9acbfa07c60275ea95266f1debbe1b61aa46e47344bba38ec64286bf2ca1eb
 DIST libtcd-2.2.7.tar.bz2 306184 BLAKE2B 77d942adb822d96c86dbda2141acf1e2e30551b70e24bc325f412691149d2dd28a862592d8c0f57a0d528bcfee991613ff81f654a3541be341145a02e5af0164 SHA512 3347539a186c13fd9713752e4c9bb75c50eeee74f85a9126d7ed376f927675af6943fc486ff9396b5504b9d1aa8e33ebdd41663fc1ec5ed8babf4c207be3ce3f
 EBUILD libtcd-2.2.5_p2.ebuild 689 BLAKE2B 383c4c6c1b0872e109818135f702df76d45625437a3ee0fcb5a2d02bebccebf65817d2b84d179be1ed88a92dab9e2edac974cdbdb9d527dc6831bbc0a2daa43e SHA512 bd438dec387875b6f3839d3edad09e9881c40885454cafcc92dfc35c0c2af17d6b33b3f12bdf7a7425350dc3f20d9231137e8996b51d85474cffef9415c1ebac
-EBUILD libtcd-2.2.6.ebuild 693 BLAKE2B 8c98e42c0bd182d101e01e6c02a9ff7bd74004b376757fa97b3a4c8c3f8f0c8d68a1f435f91eb239151f8e3c1f1ae42cbb40ca2e6724452e58598956bc439def SHA512 80d1e23f29446b3a9bf1cd157706466a83cdb17728ba424a9412477f335c05313b33710d47fcd6a77d4978da5f9fe338af131b71e359b623535f5f1a33713581
 EBUILD libtcd-2.2.7.ebuild 693 BLAKE2B 06deba6073910d5e7fb9475f16bc36c97f0ce908d035ba70e681c16a27aedab9c18beb339ba9cd2164306cfea6160cf972e9f4f10277adcfe61d02767082c7c3 SHA512 06d15d9289312e2f7b3d36b1bbd8dca2daa9ae82c516c9f2aba2b96ef32ca4e63bdb1a177570dc393c3f51632dc5ecc54a6a75e3e175025b582453ae06008732
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sci-geosciences/libtcd/libtcd-2.2.6.ebuild b/sci-geosciences/libtcd/libtcd-2.2.6.ebuild
deleted file mode 100644
index ac79514bf6d8..000000000000
--- a/sci-geosciences/libtcd/libtcd-2.2.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_P=${PN}-${PV/_p/-r}
-DESCRIPTION="Library for reading and writing Tide Constituent Database (TCD) files"
-HOMEPAGE="http://www.flaterco.com/xtide/libtcd.html"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-DEPEND=">=sci-geosciences/harmonics-dwf-free-20120302"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${P%_*}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files
-	use doc && dohtml libtcd.html
-}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 44755f1d951f..2e2441c37149 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest
index aa9f8a79e0cb..3583c2bc3fc8 100644
--- a/sci-libs/keras-applications/Manifest
+++ b/sci-libs/keras-applications/Manifest
@@ -1,3 +1,5 @@
 DIST keras-applications-1.0.7.tar.gz 289570 BLAKE2B 5f6fe2419b2de41f718e6beae56c8c4910efe0e6c282ad32b792f50a8b9ebc88c866eed84fb8c7dcbbd1680de605036a0012458af6d14250b1f8624ead5013b7 SHA512 5f2c5fb7b7f644a881f8cc9040633a69d3a72562206dd0601c8b31bf4fd3bb2aeee07a0d7040311f0fd42f16330bc249d306cdfa01c7b60717b05726040a0b78
+DIST keras-applications-1.0.8.tar.gz 288909 BLAKE2B 41d70552f5dfdd0c1385a7ca0b527ce0e0c3441c1ee3f72c90569f3e43e6a82485d0d4affee83afc645f3b99a519facb41d11a3fc1384c98f44182dddbea02bb SHA512 58af0d8e0289d97b416559bf235deeb9a5405d50f2a2c93612cdbde36e4d6d006db5c570acb814c209414a4b61c2310a99257aa0e2feaf24e5260d549b8b94f6
 EBUILD keras-applications-1.0.7.ebuild 559 BLAKE2B 02d3a8c28c3a4d732ab235befe91277af16b355041d90044b1da26ec3a084fa8283904e398bf484938562293acd9d2a61af8ab7bb5c8d308008e73f363cfbb83 SHA512 b7587035aab92fadf125e29c78158b8fd16838588fcb06828798809ed1699286aae1655c509bf6df8b1e234f087e1e15c8c32bae642fc3078d4d3d7faac76e81
+EBUILD keras-applications-1.0.8.ebuild 561 BLAKE2B 428e826b883af98b9e27abb6d26afffd0f6dc0c8777f0d2e4bdd70917c1448f890e81ec1281ba9c683cea8024d880ea8e21aedde5dd457b204a7ca05d1ffb1b2 SHA512 a3a2ebf399cdfaad7a8e51992171f66570f7f42025c6f60f1d101611582396e9685570d4b1cedbbec2ce5c10d8e79fd16062f6e01b4d437e2043e009759d0cd3
 MISC metadata.xml 621 BLAKE2B 4f375ddfcfed6172df186350f7bd3dbfbcacea34f555b14719af43f58b140d73e378cd0a5efd8438ed2a0006f3552febc684b4fce85aeb88fb2c9bf819c06c4b SHA512 9dbb366d483843279cc7532b56a877313a7c39de25c93c313a2957092f9766ce5715a83dd87ef116d1733a7cc399319025ce1eb0e7ad174e2b7441360a9f5560
diff --git a/sci-libs/keras-applications/keras-applications-1.0.8.ebuild b/sci-libs/keras-applications/keras-applications-1.0.8.ebuild
new file mode 100644
index 000000000000..dcf6a0b2bd09
--- /dev/null
+++ b/sci-libs/keras-applications/keras-applications-1.0.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="Keras deep learning library reference implementations of deep learning models"
+HOMEPAGE="https://keras.io/applications/"
+SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest
index da70a1f974cb..eb3a53da0dfd 100644
--- a/sci-libs/keras-preprocessing/Manifest
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -1,3 +1,5 @@
 DIST keras-preprocessing-1.0.9.tar.gz 46476 BLAKE2B af80a6647bb56f8c4dba93120bc2b70db36d2c6a0e36c3be9a4843e5c36c9ffe50db1cd9396eecd47f6c0595c110825d70d2e6b28a29a0a199b5cfcc499e4440 SHA512 93ef9b294638bfeaea82170b323f08b261a2519f5ee8b9aac7d88e5b32c6486646d91075cea71bfbc27780c8af55125319873361f0431d48b451e574d1e7a400
+DIST keras-preprocessing-1.1.0.tar.gz 50631 BLAKE2B 235a1a7d296684e5405c6472026a53b1930923e74065529ba6921e91bf8849d35c02378f8eeabc4f532a4e25937e8fd8f712a59067c5b358afe10b88e1531fcb SHA512 68c71e82ea2139d3db4142c86a2c404e4d65a9a881f72b07b4ccf28733b93a9e4837f91534a20c3ca5128600d8b885cc8723181d96c9045d5280ad7f84091cbb
 EBUILD keras-preprocessing-1.0.9.ebuild 607 BLAKE2B 114021d956911f44d328bb0404ea39aedd2adc8026a385562752811a3dc8949db3f0d746eb83f0befe71ab0c6b3f1d38eb164ecd9ac664e69455a7c4f3d79541 SHA512 fe830bc4dac0cf7730914de5cb2080f5e2ad4b8d375d051e9a8d34fd491df0f948ac5a93e7e103337ba4b8042d72b3a77f531f4424b5dc064a7d050e9a21e398
+EBUILD keras-preprocessing-1.1.0.ebuild 609 BLAKE2B 6eb32367a3e9cbfecd7c211b2378d48d68afcb8801314dacd2d168fddf285cfa5aa3d10b66f15f670947efa0f0a13c89290cb0e65c649bec257ef274ddaf5f6a SHA512 198cf1d5796e5d727abd898e8f96a8ecca2cecfd8e26cd88e22f8e04c02800601cf7ccfa7076b84e8c8dd88dacef6173a52791ae66b19efd513162ffbd76e3bc
 MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
new file mode 100644
index 000000000000..51974c566595
--- /dev/null
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models"
+HOMEPAGE="https://keras.io/"
+SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index 0e002ff60ead..2c718977e4b1 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -1,6 +1,8 @@
 AUX 0001-pip_package-modularize-build-script-to-allow-distros.patch 4250 BLAKE2B 79702d82e629e2159cbe33efe8dd91536d904536f4bbf3d4ad02186916a09786cde6ce29a63acaafe3169dbd7904448461f2b557f33218651351fd87d42ed613 SHA512 42bb57433f61b3a9b1a93c897202bacdf44a8277ea0e64257ac3b60c9b964a6441345c9b222fb26afb1d66a53323fe38c29811adfd6354032cb5d3f85dde0816
 DIST tensorflow-estimator-1.13.0.tar.gz 530871 BLAKE2B 4f208ed20e10fa68e06d21c9865cd07623e14362bdcff456bc9b412431c8f12f289c8a8f8ad89cb1f0ec98b1432844632d7e1097ea29d40bf6f67b90b4968f93 SHA512 e4be92b805776d2be5f391f737f1043b994f42721173c4d4a7dbf3fac9b00121cb072091a474bf71c7dcd952fc8b330cf9254c7a5ad9d096ba1cdc12ba12078b
 DIST tensorflow-estimator-1.14.0.tar.gz 670750 BLAKE2B d24bba87131605f965be05cd76103e77c45c606af685f08d478cf4acaf2975aba6134bfe9ea51d1837297cf4ce5339bad761af6c00077193ccbae3f1bbcaa667 SHA512 65d21f4d275edc57feb0b36775f275d7b7adc1f5c2958b8269dcf61bed0189570adcb2eaf981e2ae4ba7e6ccec6d4d467384a267a6a29c325dc8126b1bdced5a
+DIST tensorflow-estimator-1.15.0.tar.gz 696331 BLAKE2B 67aac4adb05149de13d68595e3520f4b843dedd48b58b0b0bea920767f04f64291842b9931f2540b6c6e997bbd01f8e23f64da9ea02ee295f57c777186e5ab19 SHA512 ea0f0c9f74db3d7bed5ee2b38a8eafbeae8fddd824c410461a88ecebc3e11ad6f885cc7404b3af8c7751562bbc2b71fb7e0e5627cb5dea05617ec1a383279bee
 EBUILD tensorflow-estimator-1.13.0.ebuild 1336 BLAKE2B 8cb7993e004e31435ee8878335696befd20dc7e90f9156dc2c17a3e3668bdd63c14891b4960ace13d1c2e1da66f3580c4634f75de69ef2095d0f6566bfacc5f5 SHA512 9d7b99123345ae85268b8676d91aa34f62ba4e2fd8131630f26b1dc3bb969cbd40e37c2ac054800f48fd1df02a77cfd724d50bef9e787bbe1316225c9c484cc9
 EBUILD tensorflow-estimator-1.14.0.ebuild 1245 BLAKE2B 4d7a31587186446be9d72524801d95c193db6561558403c0c5b5b8e694b84955792c96e6fc81b2bbba3df2db88f1ffd954d2a028692375549639bb8bfcfd8eb3 SHA512 42259cdced6aabddc930dc07121e9b5f87639e4fb3fb9223c8123dc02f508f5393345873ee11f866b3c859466fdcec2b402d2f303fb8fb4c643edb2c93275e6f
+EBUILD tensorflow-estimator-1.15.0.ebuild 1342 BLAKE2B dc05278c1422a7f7bb51ef7a27e71074593c4e89fd12b0be5ac89b52dfa38ea33c3a109744a398a41c05c27f1112df8dc86be3d5f60e6757298a3e46eec0d205 SHA512 4c3ae397917543760fb2677760c50c556671739717f779340335abc6b3c7f7ce6c37cd7cdb293a0266ee62586b7c594ef8abf6006e69cfd1285a2a0fca5dcd0d
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.0.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.0.ebuild
new file mode 100644
index 000000000000..736ba39f9e55
--- /dev/null
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-1.15.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+MY_PN="estimator"
+MY_PV=${PV/_rc/-rc}
+MY_P=${MY_PN}-${MY_PV}
+
+inherit bazel distutils-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-java/java-config"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+	sed -i "/^_VERSION/s/'[0-9.]*'/'${PV}'/" tensorflow_estimator/tools/pip_package/setup.py || die
+	bazel_setup_bazelrc
+	default
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home)
+
+	ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
+	ebazel shutdown
+
+	local srcdir="${T}/src"
+	mkdir -p "${srcdir}" || die
+	bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
+}
+
+src_install() {
+	do_install() {
+		cd "${T}/src" || die
+		esetup.py install
+		python_optimize
+	}
+	python_foreach_impl do_install
+
+	cd "${S}" || die
+	einstalldocs
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 74e292c51993..f548338eb7f7 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -3,34 +3,52 @@ AUX tensorflow-1.14.0-0002-install_headers-fix-paths-of-generated-headers.patch
 AUX tensorflow-1.14.0-0003-systemlibs-jsoncpp-update-header-symlinks-for-jsoncp.patch 792 BLAKE2B c51b247be2d9bc2f124c0dd07d48fa7f3685cda148b050328e45521b2eb6da555e59f89ff554057db777ec435daa58ddb786e9ef44779fcaed5cf29f76686031 SHA512 d5266f79efa9402de4cf53803d532711af8db8b40d2964ef1a6b27f6e7ac3ac95e112590c39fbd84873d9459367485e10b351f45e703ab7e095661683e5ba341
 AUX tensorflow-1.14.0-0004-pkgconfig-generate-tensorflow_cc-pkg-config-entry.patch 1420 BLAKE2B 528c26f6be43a3ecec5acbc932916a286086775deca66ccf4e87a46b63d49b0c67b787a0823ee5f5cf222e4c4e06a9b8e6d09048353c6b475efe8af945a0522d SHA512 de764fcacb035c2ffb7b02c583c5cee9297fb53ad3203bbaffbfb3cc63d3d48674c7a99a624cc77e1bf58cd70026fea5de8404a04ba6e7a0c61f2f108ddf639d
 AUX tensorflow-1.14.0-0005-gen_git_source-builtins-does-not-exist-in-python2.patch 865 BLAKE2B 3adb6688478452b6e8e093128a7ed50db5d10efa31192f0fa41d5adca1dc44004ec388171fc09a1a0579e116dd5816eabaec6431961e93719705b0186853b15b SHA512 ada76bfc06c56b19f1f2b7e88979d2dfea3bcac9a91a79e4d0dacaad3bdbf0ff4f450670ff26e49cdd6bf39062c7dfdfb17a61bc92c35a7bc748a42bedec23e0
+AUX tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch 1188 BLAKE2B dcebed9a89be6ff70f073c432e5e02ab80c0fc9e69cea2b1255a5620d456eec39f717fef3dec062a7dee5d33ce2eb45712d578de9f5ecb00360bb26004cc949c SHA512 d47a98015c424fd61adea6c8f5ed5115ca35c807636530e737963f002f02380d80d30e0f0cf3c6cf3e00914157fce62739da60ae30a4fb533321822a4fa45b2d
+AUX tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch 2370 BLAKE2B 87c60e70e929ade64cae24ae6f6d2d9168b0f5b93093206755fb66033b198e7226b7157a6aa15cb051cd9cd42bec8743ec7b96334ea3b9184445afff5e61c257 SHA512 2469fc0f9c9365c2e1191c68b61ba9ed54f0d240e34bb431ba6efadb9a4a63ae5b579e22b693df41fbbee55e4119bf8dcbdcdec6d7be81e36d1b48da8ff88c7b
+AUX tensorflow-1.15.0_rc0-0003-python-deps.patch 588 BLAKE2B edff0b2a3355f812ab7cc42ceecfdcb22a52e6947c75829d001a8db3b1c7de954948f71a9df3c98b69f4988b8bdaf03babaef9f3e38af28d25a26e754713ae9c SHA512 ba813aee0beb164d3b47a2041ff9ff47b195447d00c5cb61189ac2a05189cb85914d08be4ffe2bd1497aca85db18b111c75deec72e44fce01f6189d661adf77e
 DIST ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz 100612 BLAKE2B 84f81072d3298dde613b4c1ebabf852c67e04b5882a4ca0ed6f218b42e8fa3ea9598140b0c0009e8d6b62d08902622a6d57ee005ec3ad8a808c9fb21aa53430c SHA512 03a289d8099a5c4a5298cba8f516d2edb41220935d8db750970113ca7513372c78241c2c948d0ffcd60e84686e50ba1d7fd0b46efea6881dd320435eca92a7b9
 DIST abseil-cpp-389ec3f906f018661a5308458d623d01f96d7b23.tar.gz 1180190 BLAKE2B beec1338bf8cfa99d0de3bdb1631da5385317e68bf87f5da154ceab9455af7221f140838e41f4087d7d0064c22f93dce5860c484a8e4026b46efa103a52db307 SHA512 20d2cc8d23eb729607692d861049dccbd6b4af56fc4ed7733492348e3fe879d7acc6316f0d6e1c683f98188f028d460a40cab35667856cf334aa5f00fc830911
+DIST abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz 1281523 BLAKE2B 955802c74ed9baf222dcd824d2940147ae89edbc88f12bb8f54839776fe18bb18c0fde23b0d3142bb3be65a57930c96d03fdd243e8da07435eeb04329c31483d SHA512 c2ae1bd789251ec70cd0baafd92521e48fb1648aee8d9d84a8269436300848b6a9d7aead6bef8a12d3a9040f19535ac725ae961f12566500d309bc13dfee26a4
 DIST abseil-cpp-daf381e8535a1f1f1b8a75966a74e7cca63dee89.tar.gz 1275955 BLAKE2B eb6e0f9d55458a4ae6e8b86be89add9b0cc44d1ff5a11f6fa1ec93e2f46885c8ff87b8c1e674e1ba5ac13556ed303963864057f0e258fce41fa753d891846996 SHA512 56a827296e2948b90922766369f2040e04abd03320375240ad32fcc2925cdd1ffea312edcef1009a0c8abd79f521a61e433b7651dd4c2721d2b1ad13f48256de
 DIST backports.weakref-1.0rc1.tar.gz 7761 BLAKE2B 4cb2554a4b71bb1f8c41a790268511e4b382effc7e0328f74346d086de539a177111de9e2dabac19a44b2a1cdbf59a7425e30eee4caa4bfe66b0ca97f1f460a9 SHA512 f37e9eb0d9060d2e1588a941f623460bd4477d7e180b38b5cd46d9c1db1ee094ae63e4f5eeeb422823bf3d067f46c4124cb124a9e4ddb795bc0bfbc4802ab826
 DIST bazel-skylib-0.6.0.tar.gz 29330 BLAKE2B 53d23a81203c08cb5ab4adbd308bb6c9875df0f2d27c6f8832a27397578e9214ebcd95f63bd6c539d534ecb5f2316116063e3e5d1a36986cf94d167d7823234d SHA512 14ce6782509be7d3cb0fe438aaad579ad23bf328d566cab06a2008990041ee098b4602542cb67961d757573a8c272e5dddb143efd756cd6ec40486159329fa91
+DIST bazel-skylib.0.8.0.tar.gz 72941 BLAKE2B 1928989d3e5dc338fee974c5592a524adb492db172b1d2a849ed5f14f91dbb76606335d369e4b15c4eec41adfe3a23cdc5b4f3b2f1351a5e9c25103c002b96a2 SHA512 4729941cedca8ddb876a621b28221d3c17dbb5dd72af27e55f48274208f21db986c5e7cb8adb742c42124bfa8073eb782b49e2557cb3f3f95ca56833fef925c0
 DIST bazel-toolchains-3f8c58fe530fedc446de04673bc1e32985887dea.tar.gz 416360 BLAKE2B 4d7960302cb70247f8166647b991d74aa0514d218c9de4c97fe267ecb789e9966cfd8e546fe11661c92034df7a8de72596c5c5ddea10d145d6783cdc5aba2f9b SHA512 9a810b0a70f81fe3b9a1f23b2d171bbe723f7a33374b2caf7ce398572965f21b9de00791122c32b36e68a572b1b8982be378730f1c9f22bc375ae5f5c1c32873
+DIST bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz 660374 BLAKE2B 549292aa3ad8a6e01c29391a123f3cbc84d1f714ff9c68bfc6c8df07fa0ba3b19c22e61627f227a8a484f6d7d6c59935fd7560c447559ff5e774ddf1437eefe1 SHA512 83531a2646a9f63557eff6fefaf551ee7e9f0ccdb31374d7a17c35b9f9d844b9b405597972fcd31b2b68e9da312511bbfd9c8fbb75222f5924e1d2500cd1c2a6
 DIST bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz 505681 BLAKE2B f16225eb11859f487335bddca115c9c2a05731f4bfe4240609a47e17b706d9a25b6b363b61404b4d5df0471e4dd9b4b9befbf78dbcb1c7c11e3f590039ff92b2 SHA512 7723baf2c710adb063375a33fd64e3941fae7e98c824764c266d5554cc0b0cbb1c91a5c2a9058bb4c8766ec404ca556199ce22965a6de4baee09cb740b7671c9
+DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 464906 BLAKE2B 033d76b8081f4f987e64875ad5c8e7b8f894ec6be58c52ee02c4d31d4480fee02f3f432ea9c4630ad3f5d1163f820aff37f6493da797ec51b148b361ab3c8b25 SHA512 2cd841f4530503ed31fa6425cb749ef29f8a1071b5d55594644303233e58455783cb02402bc23d7104ef036745733087d43075a1fcdab2ac96cd1a9872a6ea4a
 DIST bazelbuild-rules_closure-cf1e44edb908e9616030cc83d085989b8e6cd6df.tar.gz 462798 BLAKE2B f461635702cd881828cf401c78fe0e64398c015d7f7824b369b0808d54224c633b6d8b699000e9e481ba094a93e01c33cc4360a541b2d520db10d3e9ef81007e SHA512 e85b13a50cbec60e4e574de9a3d3b646ca4bf045c55afcb41f2fd671202aac9e6d3e91c618f8923986ae142e615624718f3df0d1edb33a90e334f29667888d39
 DIST bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz 435984 BLAKE2B 1ec325861e5e5292b2153119beff3b3be743b4833adf3571eab1a066fef06a61131ef0a761e6f8ba4bf978e7c1c073f197f48a507cd1259ee346d4209129211d SHA512 13991822624e5bdcc2424299acb1b9ce12880f46ebbf2065d7d19a66c77f1a6802862a7ea96334fc91a1c85cff516fd32a493320f0a4d98f19e9d33e5f887986
+DIST bazelbuild-rules_docker-v0.10.0.tar.gz 549649 BLAKE2B e7a537b21138a5c5d9ce360e46238f57c917d2dbf5dd17887607402227cbe7c5d68aead9db0ecdb74c09eed9dac26eb86e004a9020c251152d15beb48be0e0d7 SHA512 7802107f8520c88646728800637cce54dbcefc54aa4361288a5b46e403e41998bc23e16fbe94f23a2ca52e5c33fc255af65846963c2fd0139ca1195435ce1b03
+DIST bazelbuild-rules_swift.0.11.1.tar.gz 107453 BLAKE2B 8cd686b945b5c9de9c8bfcaca38cd7c513bb8b55b4584bc569463997e7c5abcac3be4a5a31ccf95a494d17f3078ec9b1052497dba228fa3159a0c0be2a83eb88 SHA512 3479d6d8ce9111a39b9ef2e014399abc904e432841570dd0380104d80e4d3a74b6ff5cc6d2b250bcd15b152efa29d08f9ed092f70fd8bafa6deaa6f847d7f626
 DIST bazelbuild-rules_swift.0.9.0.tar.gz 105918 BLAKE2B 8f1bd8f5a468e3b37c614cf498a6cd8ceca55b255d6f096ebf88cd77e95148eab3fb5a128ed93b40f6d1ee8988b8dfd300fdf7061fc4ed4f1fb4ab25446ebe58 SHA512 68e985fa30b865317ccf59473cb52873d65159b866a54e35b3fbf83c135f3c750752663e962decbc8ebcd17b5784867d4d4767dd0b706f1182d4715291d8268b
 DIST cub-1.8.0.zip 602396 BLAKE2B a5e302a52e04f85ae8e1836c59e799532a8b961a8d10c08fe1241c9045f88e31f1ebda6d26124b85c6df40968e1c7b3985a39961bf7614535aafcab2da1a576a SHA512 6167c5be94989f88e05a07508cf69cf2c6b22a5ac733804043daa46bd86a44a15a758b1ffb811bab28b82039d027516ed85b3d9f7677a740a7e00ec9c2f81aed
 DIST double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip 7071029 BLAKE2B 722c190c941b169a3292ce2141c59b8eb1bcc5edd2ed09669592dddb9354e4c6c094dafe02e5a154f215aec776f9f7cebae36b9b0317b10b707282b1ca9449a5 SHA512 1db0d4805c80e9a08d9a581051d8708ddbfe1d74fd820dccde2c2405c45c06a861bd5b535b25d191cd01064e268f3fe71e58bef16fd39471812aea6c2f97da43
+DIST eigen-8071cda5714d.tar.gz 2486211 BLAKE2B d5c2bc19d66b4e8508e260ba34a7ebf64c605d0eba3363bf853baaf1329ded80511ee36d54db3e8921eb62a0eab3c3ad2a2d4eac39b5108c2415b20812d998c0 SHA512 364691a5db9d2bd4285e5d5d9b9b2326ffd2138868c33bc2b98975da2aeee03bec7b40654ecc20e0ecc34b2a6d45257c7b9f0055b7310c590cac4c951c2aa635
 DIST eigen-9f48e814419e.tar.gz 2430237 BLAKE2B 2d9df1a23ae049e57366fa6838ee8d4b3cecf2d859ec5ffa07bf18878976a2bd99d7dd94bb08f484a8941b5cf8ac091f837a533f081232c70a45ee0583143ba3 SHA512 ee6d8773d910dbf6798cb849ef7611f0f7aaef9ed68216e91c65bd996b8a92b6c107454f6d8599d83bfa6dede7144c83924de8479a9138c7b456b086cd527ebf
 DIST eigen-a0d250e79c79.tar.gz 2468318 BLAKE2B 8799adc1a13612820251cd22a7ddc347ee4711d583561a5df9735bd22ab727c0d8e7fdc894cd7e83b3b972d5adcb86f033bc089e1a4de5fe4e6257f78df88957 SHA512 864646a0b3fd8287fbf6943f4cc7f692a883e6164add21c97e98372641b32e5ceffadc825178b9d11e9504377b837d0e54a264b7a53b28e4f9fc2a23c616d2b3
 DIST farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz 467122 BLAKE2B 8b9dd426f4b9f732df6c8c09d868d1b1cc006c395b1525c46ea91c75318b723358c8e64bb0d86a73aace2032eded93f0d80cc7c2c77fddd6a39e3402ab4f2cb7 SHA512 7f5110514a8cdc7ce48d33fd94ad67d96a24e42e11b203e4d0986f4190545f051b2a63f8e09f2ac38c3aa4a5c62d9a0e02cd8ce02045037381fb62a99f0dcd00
 DIST gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip 935628 BLAKE2B 09bd1dd1e367b1e5c4fe9a9525449c09460f19168bc03c57ad563aa27ec74a18f08b620a3dab6da4fa1a1448cdc7ce8bc8a089becc033b53fff4cc07593315ce SHA512 bd42a364f718f3b077cd9c840d626bfc1fd92ace98ce43329d8fa54700c9d28cb47568b6567e9b081b340af7be621c44be1ce06d4b8dccc4fb5d82c35b12f951
 DIST gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip 916632 BLAKE2B 0bde9faf0e185fc69999173eb0b5a2e106d252ee1bc6caf38b1adc27bde96e4e2b52a3d723c8b1af922386c0e933bfcc674be974cee059c1d9b16ff6ac631c3e SHA512 eb141182dff058048c559723e6aa7127244dcc6a5a0bfd1250bbb262f34378dccf15b1b930cf46dcb6ac22ac16e3fa2781cca63cd93865506a36ab7e463aa537
 DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f
+DIST kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz 44744 BLAKE2B aeea5d23c122417ddb70a44354890242c4fb61c456fba9af79054293a1355939af51a681760ac27be55423f888649fd2826e634422c7e9cb3749a9d7f50ef990 SHA512 30f4fcd351bbcb950a27e2a77ca100ccdfd37deb17a05e7e31c3e8f1c56d7c626ab81bbd7497484e6b512e41f7b1bed714722a194b2218c669b297911101df7b
+DIST llvm-7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz 50144723 BLAKE2B b744756c9782e5506fd6628531409e305bd9ce9a79f1776c4fe674cec5b01a86ab1793dc602f704d295587c3d769d622402a4fe07c0d66269c7f610178693bce SHA512 43f185c8dd38ae7cb048bb9c98fb94e1f43ce66764b43a7141a06a1a0b011389fa139f34b7eaee72c39b8f44aeeff3e7a2189c11d10f8f8a93e9792a1acf2b5f
+DIST nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz 107044 BLAKE2B fd018b1d40977add357e98382f41e3fa6456bdc9a181e2d6cc7a3bc7fb98d242b3216b5ed0c40323bbcc006ab5221b49819ebc1dccd0c8dd700d9504f085eed1 SHA512 e66f323abb68feeec41927cc23e3a85d82fd1b7105a6232626edba95acb9eb22b3fb8b28d1a7adb536c47c936f68271fe5d8f66d3059e3128608ad826dd7622e
 DIST nvidia-nccl-f93fe9bfd94884cec2ba711897222e0df5569a53.tar.gz 95617 BLAKE2B 023788db444b1a50f01ab16f126c920f530a6ff5bf2a9327626db45f985b4093c1024d16d43cdee9f0b3ee5c8b7d104f2a6b1dab0460c6b1998b42a0354f6f27 SHA512 d6b4dd4d6c7c9ca2dcf0699055c9193d4b46c0c5155e0108db38094577c92f954f604b2e83ca320873288e0010eaa3c5812f05f7fafe5112bebbca78e56cb279
 DIST oourafft-20061228.tgz 72213 BLAKE2B 4a3ac2b4c0bc3275b5743df59241e1cdbd0200371c153ddf54ef6c7c4ec523ee6560547e2d5ef9f3200037c0635bf41c18991ac35f271b1e600d0dbd65d1a9a7 SHA512 f1ceac00cb7b9eb8f625eee7f1f5eea8af363343589a344226628d68baf668c176e6c23b7f904c4e682330352eaa0cd5d00731340d208e94c9657b8f85ae2240
+DIST oourafft2d-20061228.tgz 54434 BLAKE2B 382dd5787155b877a2ad1d624596afb5dbbe146a7aedf044d7f016949deedac871a512a030b5e6ac9ea5310e216788ffb99af1dd9d2a0de3f1ad72d9e5e7a3db SHA512 af993f68e8e1eb3cb927a51e86da8f74cfafc912a7cd055515e50fe543dd19ab5a6f7b1c2be4a55d6f4a0e5d766ead34c3be4c5705be6353f78cb2a55bd5cf16
+DIST pybind11-v2.3.0.tar.gz 564520 BLAKE2B a7c1485aa8f63a00eccd3103cf9f531a080b049be02e6182b30503ae6dd6c55fc517684ed9d92aaec244efd5f77336c68d1ea546833f7f0ae2fd7b090c19a02d SHA512 04542fe9dca2ffdb86c15698a4bbc041446a9f11970092e89a482ae0ff64c932f62fff8f437b98bdaa006c1fccabddd79f0c7e376f27daed2150b1d2f988e8aa
 DIST rules_docker-a9bb1dab84cdf46e34d1b34b53a17bda129b5eba.tar.gz 446437 BLAKE2B 070e1028625c74e6fbd092a3f8c6cf6de3b98d8999fdd69527674cfc55f00bd7638f7cb1eba41d496d1de3307b81b9dfd832d7d4bc65f9d98cd53714cb24bb02 SHA512 e43c013027a7235e85c263d8cfc40f9af77f54d054665116bb8641ed7f60d077b9107aa97da5b7e102077b68be7d2cbe401091016bd46f8828ae159659ce9608
 DIST rules_docker-b8ff6a85ec359db3fd5657accd3e524daf12016d.tar.gz 460121 BLAKE2B bca31bbdd9069647fa9560002e63a404e2bd4d4ebd19d90e28d08f797f8f63157cc127dab26b996bb976e50f099928a91c1d6343427cb85048c6ca2b47c0c7e2 SHA512 461a663189e5995e31ee8175ee260e1ad06b00ee8a7548b9d3a946a2de693311031ec6eba89e3bad527f5d8f76ed25626ef4ea05a8d6e7579932dc1be3b0a6ba
 DIST tensorflow-1.13.1.tar.gz 31614228 BLAKE2B 3e78309744747afd5a0929eebccb414efe51320f9291424ef6e3cb848f265aaac5ff16a7064c7aac8094f06b1edb61aa9fe22a55c28c23cfc4e2a6f640f4f12d SHA512 1e5c020a82b0b502c9c6fc9439905e19e8f1fb07e32740a5e2c70f4a3565c8c87053ccdcad360e95550dad648154e399ca8e352fb97a1788acfec3b87bf323bb
 DIST tensorflow-1.14.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
 DIST tensorflow-1.14.0.tar.gz 41335204 BLAKE2B d91d84c5d86c838cc659c45e28cf3c8a9ec9a02f5854a1826680806dae41cdd00ea49a6d2c04f2019b3400c6e267c6ca6f3b28e43b244569dca174ff7f2c59d6 SHA512 ac9ea5a2d1c761aaafbdc335259e29c128127b8d069ec5b206067935180490aa95e93c7e13de57f7f54ce4ba4f34a822face22b4a028f60185edb380e5cd4787
+DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
+DIST tensorflow-1.15.0_rc0.tar.gz 46177850 BLAKE2B a4cb339018d04da26993400e99bacbe8c88dd68e17158b3effac125ee90b73d441084d530359912c40d1981c7688511ad41117067428233e9310c1fc8617f1d0 SHA512 f9ba5f2c952b7d8be0f3e2b78336513efa07d5323bc28217335391538577ba2b91687cf92f759d4ec03b02dd1c2961de4b54df205e7952c706f5b632029b7c7d
 DIST tensorflow-patches-1.14.0-r2.tar.bz2 7213 BLAKE2B 51719fc02049d564b7e5c00a76375af9a7e8dfc73753ba5f0d53163dc1fa00d23bb7ed03553a0bce68b8b90cd5bfe21d29e7a57a827db2c68ceef65f3cb0e925 SHA512 35e1a410060cdde99df148bfd06f042b91e021f7a692ae9c0100c67555de553bc248d73db762ed0239117296fb1147e2b67cdf0dd3dc94dee6fe9804c08a7360
 DIST tensorflow-python-license.rst.txt 45132 BLAKE2B 770ddd87adc745a021daac01a284131825a33f176002a28b20a2251246183bf7ab4686305620678285e4a216a37f01b3ad953fe7864fa79611cccde156d69ab6 SHA512 2d5a3783ec340f24797e89c78007ee95ab753eb5ee8198c739544f9e1159895f7abe816d6b3c66620f8d7b64641d2a7f44ff0a5b4f2f941928f4733157c7995e
 EBUILD tensorflow-1.13.1.ebuild 10011 BLAKE2B 8b151edc20f6b80ccaac0e6c99f2414b484eb23ec2e1706736e90f355c8e5d960d8bb5beb00adf54238243e192832f6765d0edab1a6a14d18b888a34d2be343b SHA512 d3aefaeca59c6ee8ad58c0cf0830dc1334d0c0d12d602bbb6fea3f6030d002e918414fb0a5eb900a0ad199012c454d6dba8bda889b218fe6da4daa1e55a6d95e
 EBUILD tensorflow-1.14.0-r1.ebuild 10688 BLAKE2B 272c017503db3301e972242af8e0b66aaf7e81befe37ece9dc39696dec838b139d873c79e6db4f19fdf91f1af968475848bd4176155fcf5df403b6ebea108b79 SHA512 015fc7b2a664d7b8617da22139e8a87cca5bb6f876ded8fdc441ad68c5456ab9d7c7d5ca624031bec0d38e35e39fee69db8e5a38fdfe9ff23cdb8377fd9df66a
 EBUILD tensorflow-1.14.0-r2.ebuild 10387 BLAKE2B e96b62c51ecddfd883dafe6e43612c490f082cb220eed052239d0bb5743bd899762c7308f9021d7a980a6b080b3930eea7520f257d23a420f53868c7b2606988 SHA512 0805d3024a2cd5fde6bf057bfda691710256639982e9281e4e6e57ab70e13f5069bcdcb232354e87edc8c99e1af9723a63ef2c5f5dee9e83424df5320ba707c4
-MISC metadata.xml 512 BLAKE2B 39a7fc6dc76945448a9f0e8e9d79866f364d0df5036500a2ab981b6ab6f1170ef8a15e29e3a5a3d39edc0dc441985feaa45ce8069fdfb815ca1419721ba9d870 SHA512 a6dc893a523fa7dab319173914e8602434b8247aee2af6a4adbde29be440097901b0e40193e5592f3849340414a4debce1218ae3895c2c6e7d5af171c463c82b
+EBUILD tensorflow-1.15.0_rc0.ebuild 11300 BLAKE2B 458b1a16c85fe0df4927b526ef2f9f724c0ebb4354b4e68f4b9441ef5c2b861fc8832a9d3487c272f78082c53833113543312874e1a972efbbc302cca74a9960 SHA512 a5c7fc1f5d7ee3ac4541ec68188d542ff4cfe8a54f1736e03d8f658fcbbdf01467d8f8366925cdbc81330e4fc213a54d56a117c78e9116fc97b2226882e6b003
+MISC metadata.xml 606 BLAKE2B 910509df7310f05e34bbdd7223a9ad64e4f67c67174d3868629d594022aeab23fb9631fb17782b5787e7880cb2990ffed7d14c030ab86a25c23c8118330bc690 SHA512 ffc3f68be38618f77b7d31406292e3a4ead2819d19aa7c8b1eb779e03027b9220cc248645cad44e31a6f0c113f4aeeed2a45060617b1bb03695bd2c684262b30
diff --git a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch
new file mode 100644
index 000000000000..08c7458f7700
--- /dev/null
+++ b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch
@@ -0,0 +1,38 @@
+From 9a44d8e10d726cae992e611575b9dcb1627beede Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Wed, 11 Sep 2019 12:08:34 +0800
+Subject: [PATCH 1/2] WORKSPACE: add rules-docker http_archive,
+ bazel-toolchains uses git_repo
+
+git_repository() rules cannot pull from --distdir and fail when building
+without internet access. Use http_archive instead and pin the sha256
+hash as well.
+
+Signed-off-by: Jason Zaman <jason@perfinion.com>
+---
+ WORKSPACE | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/WORKSPACE b/WORKSPACE
+index 74ea14d0fd..ccff2ba30f 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -12,6 +12,15 @@ http_archive(
+     ],
+ )
+ 
++http_archive(
++    name = "io_bazel_rules_docker",
++    sha256 = "7d453450e1eb70e238eea6b31f4115607ec1200e91afea01c25f9804f37e39c8",
++    strip_prefix = "rules_docker-0.10.0",
++    urls = [
++        "https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz",
++    ],
++)
++
+ # Load tf_repositories() before loading dependencies for other repository so
+ # that dependencies like com_google_protobuf won't be overridden.
+ load("//tensorflow:workspace.bzl", "tf_repositories")
+-- 
+2.21.0
+
diff --git a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch
new file mode 100644
index 000000000000..f8b72daddfc4
--- /dev/null
+++ b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch
@@ -0,0 +1,61 @@
+From 05f57f785aeb58146b3873d4a0c614d897c56293 Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Wed, 11 Sep 2019 18:18:42 +0800
+Subject: [PATCH 2/2] systemlibs: unbundle functools32
+
+Signed-off-by: Jason Zaman <jason@perfinion.com>
+---
+ tensorflow/workspace.bzl                     |  1 +
+ third_party/systemlibs/functools32.BUILD     | 15 +++++++++++++++
+ third_party/systemlibs/syslibs_configure.bzl |  1 +
+ 3 files changed, 17 insertions(+)
+ create mode 100644 third_party/systemlibs/functools32.BUILD
+
+diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
+index d9fadc1030..760b7cd905 100755
+--- a/tensorflow/workspace.bzl
++++ b/tensorflow/workspace.bzl
+@@ -325,6 +325,7 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
+         build_file = clean_dep("//third_party:functools32.BUILD"),
+         sha256 = "f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d",
+         strip_prefix = "functools32-3.2.3-2",
++        system_build_file = clean_dep("//third_party/systemlibs:functools32.BUILD"),
+         urls = [
+             "https://storage.googleapis.com/mirror.tensorflow.org/pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz",
+             "https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db/functools32-3.2.3-2.tar.gz",
+diff --git a/third_party/systemlibs/functools32.BUILD b/third_party/systemlibs/functools32.BUILD
+new file mode 100644
+index 0000000000..5567ef6943
+--- /dev/null
++++ b/third_party/systemlibs/functools32.BUILD
+@@ -0,0 +1,15 @@
++# Description:
++#   functools32 provides a backport of the functools module for Python 2.
++
++licenses(["notice"])  # Python 2.0
++
++package(default_visibility = ["//visibility:public"])
++
++filegroup(
++    name = "LICENSE",
++)
++
++py_library(
++    name = "functools32",
++    srcs_version = "PY2AND3",
++)
+diff --git a/third_party/systemlibs/syslibs_configure.bzl b/third_party/systemlibs/syslibs_configure.bzl
+index f83c0dd3d5..0884be8416 100644
+--- a/third_party/systemlibs/syslibs_configure.bzl
++++ b/third_party/systemlibs/syslibs_configure.bzl
+@@ -22,6 +22,7 @@ VALID_LIBS = [
+     "double_conversion",
+     "enum34_archive",
+     "flatbuffers",
++    "functools32_archive",
+     "gast_archive",
+     "gif_archive",
+     "grpc",
+-- 
+2.21.0
+
diff --git a/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0003-python-deps.patch b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0003-python-deps.patch
new file mode 100644
index 000000000000..39fc269b73bc
--- /dev/null
+++ b/sci-libs/tensorflow/files/tensorflow-1.15.0_rc0-0003-python-deps.patch
@@ -0,0 +1,15 @@
+diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
+index fec08f66d7..9d5d1f2a3f 100644
+--- a/tensorflow/tools/pip_package/setup.py
++++ b/tensorflow/tools/pip_package/setup.py
+@@ -62,8 +62,8 @@ REQUIRED_PACKAGES = [
+     'opt_einsum >= 2.3.2',
+     'six >= 1.10.0',
+     'protobuf >= 3.6.1',
+-    'tb-nightly >= 1.15.0a20190821, < 1.15.0a20190822',
+-    'tf-estimator-nightly >= 1.14.0.dev2019090401, < 1.14.0.dev2019090402',
++    'tensorboard >= 1.15.0',
++    'tensorflow_estimator >= 1.15.0',
+     'termcolor >= 1.1.0',
+     'wrapt >= 1.11.1',
+ ]
diff --git a/sci-libs/tensorflow/metadata.xml b/sci-libs/tensorflow/metadata.xml
index e7d7916b7516..6161514c67b7 100644
--- a/sci-libs/tensorflow/metadata.xml
+++ b/sci-libs/tensorflow/metadata.xml
@@ -10,6 +10,7 @@
 	</longdescription>
 	<use>
 		<flag name="cuda">Enable support for nVidia CUDA</flag>
+		<flag name="xla">XLA (Accelerated Linear Algebra) Optimizing Compiler for TensorFlow</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">tensorflow/tensorflow</remote-id>
diff --git a/sci-libs/tensorflow/tensorflow-1.15.0_rc0.ebuild b/sci-libs/tensorflow/tensorflow-1.15.0_rc0.ebuild
new file mode 100644
index 000000000000..e9f0fe1e0ab1
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-1.15.0_rc0.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python{3_5,3_6,3_7} )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda mpi +python xla"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+	IUSE+=" cpu_flags_x86_$i"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+bazel_external_uris="
+	http://www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz
+	https://bitbucket.org/eigen/eigen/get/8071cda5714d.tar.gz -> eigen-8071cda5714d.tar.gz
+	https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz
+	https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz
+	https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
+	https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
+	https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
+	https://github.com/bazelbuild/rules_swift/releases/download/0.11.1/rules_swift.0.11.1.tar.gz -> bazelbuild-rules_swift.0.11.1.tar.gz
+	https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
+	https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip
+	https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
+	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
+	https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz
+	https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz
+	https://github.com/llvm-mirror/llvm/archive/7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz -> llvm-7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz
+	cuda? (
+		https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.tar.gz
+		https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
+	)
+	python? (
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
+		https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt
+		https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		${bazel_external_uris}"
+
+RDEPEND="
+	app-arch/snappy
+	dev-db/lmdb
+	dev-db/sqlite
+	dev-libs/icu
+	>=dev-libs/jsoncpp-1.9
+	dev-libs/libpcre
+	dev-libs/nsync
+	dev-libs/openssl:0=
+	>=dev-libs/protobuf-3.6.1:=
+	>=dev-libs/re2-0.2018.04.01
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	>=net-libs/grpc-1.22.0
+	net-misc/curl
+	sys-libs/zlib
+	>=sys-apps/hwloc-2
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
+		dev-libs/cudnn
+	)
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-1.8.0
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
+		dev-python/gast[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
+		dev-python/google-pasta[${PYTHON_USEDEP}]
+		dev-python/opt-einsum[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-1.22.0[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
+		>=net-libs/google-cloud-cpp-0.10.0
+		>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
+		>=sci-libs/keras-preprocessing-1.0.5[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-1.15.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' 'python2*')
+	)"
+DEPEND="${RDEPEND}
+	dev-python/mock"
+PDEPEND="python? (
+		>=sci-libs/tensorflow-estimator-1.15.0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.6.0
+	dev-java/java-config
+	dev-python/mock
+	dev-lang/swig
+	dev-python/cython
+	|| (
+		=dev-util/bazel-0.24*
+		=dev-util/bazel-0.26*
+		=dev-util/bazel-0.27*
+	)
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
+	)
+	!python? ( dev-lang/python )
+	python? (
+		>=dev-python/grpcio-tools-1.22.0
+	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/tensorflow-1.15.0_rc0-0001-WORKSPACE-add-rules-docker-http_archive-bazel-toolch.patch"
+	"${FILESDIR}/tensorflow-1.15.0_rc0-0002-systemlibs-unbundle-functools32.patch"
+	"${FILESDIR}/tensorflow-1.15.0_rc0-0003-python-deps.patch"
+)
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="5G"
+
+get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+pkg_setup() {
+	local num_pythons_enabled
+	num_pythons_enabled=0
+	count_impls(){
+		num_pythons_enabled=$((${num_pythons_enabled} + 1))
+	}
+	use python && python_foreach_impl count_impls
+
+	# 5 G to build C/C++ libs, 5G per python impl
+	CHECKREQS_DISK_BUILD="$((5 + 5 * $num_pythons_enabled))G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	append-flags $(get-cpu-flags)
+	bazel_setup_bazelrc
+
+	default
+	use python && python_copy_sources
+
+	use cuda && cuda_add_sandbox
+}
+
+src_configure() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_configure() {
+		export CC_OPT_FLAGS=" "
+		export TF_ENABLE_XLA=$(usex xla 1 0)
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_ROCM=0
+		export TF_NEED_MPI=$(usex mpi 1 0)
+		export TF_SET_ANDROID_WORKSPACE=0
+
+		if use python; then
+			python_export PYTHON_SITEDIR
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
+		else
+			export PYTHON_BIN_PATH="$(which python)"
+			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+		fi
+
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export TF_CUDA_PATHS="${EPREFIX%/}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
+			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+		fi
+
+		local SYSLIBS=(
+			absl_py
+			astor_archive
+			boringssl
+			com_github_googleapis_googleapis
+			com_github_googlecloudplatform_google_cloud_cpp
+			com_google_protobuf
+			com_googlesource_code_re2
+			curl
+			cython
+			double_conversion
+			enum34_archive
+			flatbuffers
+			functools32_archive
+			gast_archive
+			gif_archive
+			grpc
+			hwloc
+			icu
+			jpeg
+			jsoncpp_git
+			keras_applications_archive
+			lmdb
+			nasm
+			nsync
+			opt_einsum_archive
+			org_sqlite
+			pasta
+			pcre
+			png_archive
+			six_archive
+			snappy
+			swig
+			termcolor_archive
+			wrapt
+			zlib_archive
+		)
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+		export TF_IGNORE_MAX_BAZEL_VERSION=1
+
+		# This is not autoconf
+		./configure || die
+
+		echo 'build --config=noaws --config=nohdfs --config=noignite --config=nokafka' >> .bazelrc || die
+		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
+		echo 'build --incompatible_no_support_tools_in_action_inputs=false' >> .bazelrc || die
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	if use python; then
+		python_setup
+		BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}"
+	fi
+
+	# fail early if any deps are missing
+	ebazel build --nobuild \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so \
+		//tensorflow:libtensorflow_cc.so \
+		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+	}
+	BUILD_DIR="${S}"
+	cd "${BUILD_DIR}"
+	use python && python_foreach_impl run_in_build_dir do_compile
+	ebazel shutdown
+}
+
+src_install() {
+	local i j
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	do_install() {
+		einfo "Installing ${EPYTHON} files"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		cd "${srcdir}" || die
+		esetup.py install
+
+		# libtensorflow_framework.so is in /usr/lib already
+		python_export PYTHON_SITEDIR PYTHON_SCRIPTDIR
+		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}/lib${PN}_framework.so* || die
+		rm -f "${D}/${PYTHON_SITEDIR}"/${PN}_core/lib${PN}_framework.so* || die
+		python_optimize
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir do_install
+
+		# Symlink to python-exec scripts
+		for i in "${ED}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
+		done
+
+		python_setup
+		local BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}" || die
+	fi
+
+	einfo "Installing headers"
+	ebazel build //tensorflow:install_headers
+	ebazel shutdown
+	insinto /usr/include/${PN}/
+	doins -r bazel-genfiles/tensorflow/include/*
+
+	einfo "Installing libs"
+	# Generate pkg-config file
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc ${PN}_cc.pc
+
+	for l in libtensorflow{,_framework,_cc}.so; do
+		dolib.so bazel-bin/tensorflow/${l}
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1)
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3)
+	done
+
+	einstalldocs
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 881e568d8da4..f39528e531b5 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index 80d4490bdd89..0a38fb3830be 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -1,5 +1,5 @@
 DIST alt-ergo-1.30.tar.gz 380329 BLAKE2B fab16757ed110474cf8f9d01ab53f76b6a300eb478b32bbfd6bb79d7603b1f5c2fc5c97bf44358eb138283f3487ef90febd23865723a4721b01bd870cfdd6507 SHA512 6ac6abdc6602b0ba89ee58eb96c66ac93e8195e0b4f75595381eded86365c2dd881251de2b77e2f1137684651ddc7fd94f922509de0be2964d81f52a6fb0f2f2
 DIST alt-ergo-2.3.0.tar.gz 455577 BLAKE2B 1836782be452df5147fc3041517fd267f3ce7facd15ad460c3e1dfba2b6ea455fee79ad8264ccb12cf21622c21a54c186c9943e7bffb392daab15d046ff93863 SHA512 a2f209b62b8494bfefe84328cdc786185e0534c5e224e212b83045b078352a51d2ab02622f72c22c74c7de95c7a554cbdae2a9a8a0c41f3f26c841f8c72f6b21
-EBUILD alt-ergo-1.30.ebuild 735 BLAKE2B e875147f8814ba6b81a8cd4c352691289002129d34be71fdd89d758a99b136b37acdce1f38f52cc9c2d7ad74cff8bf548fa4384e7b529a2ec2b4aa7cf2174fe3 SHA512 8acf024245c85c16d6d74a6400a1fcc5b7c7c17fdfaf713f77e8c1de0b9f29e615a1085c283f064c0f22de2e0c0dc0625a1d430ef89506d3976da6b1c0d414ca
-EBUILD alt-ergo-2.3.0.ebuild 983 BLAKE2B 382b1d63af728d71131ecd0316bf90e70ee90b84890dad3f635d8258b2c8363eaf04008edad7ab538e825a42a8bfc37e16dbf72ba435a3562ab61a383fa1344e SHA512 659a53155ee477d82c7578f61f910ef5c90e434a1d72d359e3c20255882bf7fde3955b59920dc95a80cc1adbf866b0b61f6a1e84e1d90d6e7e537fe321b9b76f
+EBUILD alt-ergo-1.30.ebuild 705 BLAKE2B 2ed4bdb55ba084ae8364cf49200a61b9b4c64941817acc1a448ebb5124eaaac264c8d895e5d98e4093fca05a9b7d6db638cf89a808d95af313c49a79cc94f9b9 SHA512 aa1f48cb7fb8d99d7745d77edbc9f69f9f591029c354018243d309f6d27be7e595758ae2f46a7854e82b456afc5405205e31d5f84e974949ad6e9248dc48cd39
+EBUILD alt-ergo-2.3.0.ebuild 953 BLAKE2B 57167b799798d30aba892a81065c79d4dbe947c0e3e49ddbfb6105fd88d015a089fb572e0b0b9317ec570a334324cdf4d6e0677fc1fa5d4aef77ac77b06f59e2 SHA512 69225db4ee2a093e46baebaa95dd757bb2355937cabcaab337d48dca32f2acc6b0a58f29dd983e1fbf069f024b28cd64ea9927da2aeb244c8c9dcb7591b7a695
 MISC metadata.xml 670 BLAKE2B 5f03c359cb298cc9a0fea6ef3a5deb092e5ccca7acfb2b7a5630303659bfd853fe86277ebbfb1fb7b6677d45dde2d5c68d55fffa8d3d8187acac3765f52df7c9 SHA512 9e514e4da2b92aa1e8e8e084450f478b51947172b689664dfe6c0fe0eb139e278e13689c8ba53825cb3bc32140cfd4cd7a68fede0d013cd065d5339d34931e8d
diff --git a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild b/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
index 80b72760c868..197ea8a7f2dd 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-1.30.ebuild
@@ -29,6 +29,5 @@ src_compile() {
 src_install() {
 	default
 	use gtk && emake DESTDIR="${D}" install-gui
-	insinto /usr/share/doc/${PF}
-	use examples && doins -r examples
+	use examples && dodoc -r examples
 }
diff --git a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild b/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
index 321faff324c8..e3bbcdb317f1 100644
--- a/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
+++ b/sci-mathematics/alt-ergo/alt-ergo-2.3.0.ebuild
@@ -37,8 +37,7 @@ src_compile() {
 src_install() {
 	default
 	use gtk && emake DESTDIR="${D}" install-gui
-	insinto /usr/share/doc/${PF}
-	use examples && doins -r examples
+	use examples && dodoc -r examples
 	mv "${D}"/usr/doc/* "${D}"/usr/share/doc/${PF}/ || die
 	rmdir "${D}"/usr/doc || die
 }
diff --git a/sci-mathematics/e/Manifest b/sci-mathematics/e/Manifest
index 1444fdcb9d47..af90697a4bc0 100644
--- a/sci-mathematics/e/Manifest
+++ b/sci-mathematics/e/Manifest
@@ -1,7 +1,6 @@
-DIST E-1.5.tgz 1689077 BLAKE2B cff108cae0924d288227e106e9798d204ce5334b7cc9be67763980b26389c4dae735592f06d5f4a9f29bf1e6cf7e281a3d3cd4de9f7222596ad714ff163c3230 SHA512 a2534c9e278741fed2f0005f5fa2b4ea60d71babd4e38c207a48f496df6916bf9ff4bf0ba41ae899eaeeeec7235ff1d759629dbcb627dd8766168f9bc98a4894
-DIST E-1.6.tgz 1627003 BLAKE2B 3c2ee24d716968802dff81f749a0b8425bbb836823aaf6609804866af417b06ce0042bceb5d2d9399a7eb26c155832d51658af5a1deccd49bcec8ae6380fdc9b SHA512 769aa4d04595181285be49c1f21d7e8a47936fab78b5d6f2975910a64d4928cd2be97d781c4092dadab48d213a6bc788b8247a2310cf71042b1339129fe0cdf2
+AUX e-2.3-build-system.patch 212 BLAKE2B bd42870773da66d9b466e98c70a0f7fcad56e630645879a9e4438c4e418cace391e978385c3a1390e014360b42cd24eb08c9bf5ac9fbbd3c81c13933c5f7d167 SHA512 4e0362620ce014588841b18ca74555d16cac940a5619c46a46d3672570afac477e99067c7af701b14d0b58633422b37c0f5714ad910349852d1c8b7ae99b7706
 DIST E-1.8.tgz 1832975 BLAKE2B ebac17f157f591874107009d1ad45d03449c8d440f3ad6dabda308193775cd69d01f6ffb159ef8acbc73fbd41e5b38f2eb61a1c734d638d4a045e068cc63fc90 SHA512 1b4358c636e8ea564ca942e1221e78234a9f0f793991f637bd7ec4d92eb9aa4a408a14c707405271fc017a9d63884d70bdfb0ed1b878383a1a44cfa57a7bdd51
-EBUILD e-1.5.ebuild 3351 BLAKE2B 1e5ccec6ef815a1d102333da7afecd4a252b8b47e234b81d296e391e9bf002796448983902615118cb0a92e8dc8c02135d22717752086d19d32696dac822232d SHA512 076d4b17661ed30e3321dd9312fcb4a7904a98d69a61bbf6cf9718ba55422048a861e54e1780513b7fb4384a3ea6a3a05d8f6c79c43ff051f06e7a301612573e
-EBUILD e-1.6.ebuild 3351 BLAKE2B a92fde5209ec23fd45574c3f82527549aa18e5dac9ae2247a1d68d17ae7e96c0a19e8a54c5c685c505cfc07dfe977b64a634454ee7cf1f16072c08c7cb52aee5 SHA512 07ae850f91c1406369fbd89ed5a12205da41bccb762af521b88bec2557a30c87d8ce332353e5f9f124ecfb9bde23343665d90464ce41d211c341c205454779ed
+DIST E-2.3.tgz 2176351 BLAKE2B cb234d5d6ed9d098b9f1b3def44de570c2014dd017e2e39de58bfe8ea47f539008e30213eab78c61e042d04529cfdbc647706ae71707e306cf51f5189c5dad30 SHA512 9e0f22a174f9f0fae401d8556d0b825c17d06e48e40d027003a89ff8cc637e3a14e14af70e6a65ecf2a11a52d59388c6c36b129a123511b958c152f58fd06a16
 EBUILD e-1.8-r1.ebuild 3172 BLAKE2B b7e844811d5e81724af7b6b6c14d0cab271cda71a66d60086d639ebd31ac216ac55e67a2d34245e67499eb0f40644cecd5295636fe1bdd22c83fde0c7ac8b6ba SHA512 ca65245640594ff13a36e6350b91229835e21fe8a9a1841d3168007899fcf4e9db25c36901008d4fba1250e948635001322e2a9b3408b79fae1d126913a4733a
+EBUILD e-2.3.ebuild 1533 BLAKE2B a00f7ab909309d0f22a5f6f88c8d9a696e4f3e632c8e95af8263592345e0e3af9dc2bf8762f7fcdfd386f18b2b8b2aa5b3366b2917248e0cf50fbd0e2f91941d SHA512 67cc912a601c7ff9f10d31d99039350a022d8253891f115b844b527badf9a4522d2d97095396aebe8a6a5b1e3708e8f7065e3aafbd2c77de03cbac9b63451ab2
 MISC metadata.xml 1462 BLAKE2B 3b2783ef3103c8a0f8606b0553e89b5265867b2b3272dd28530f5a8e8a745240726c937db655a31cc6ba923b579da8ba33a180c6f745a45e238b28b7a688a173 SHA512 635575800430295b5110104d38cbab61277b8d32acd23b883053a3092df0ea6531bac0fbae8a402cc9af0e11d7095959f44bee989050e4123ea7400c4c671e23
diff --git a/sci-mathematics/e/e-1.5.ebuild b/sci-mathematics/e/e-1.5.ebuild
deleted file mode 100644
index 82fd6f490d9a..000000000000
--- a/sci-mathematics/e/e-1.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN="E"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="E is a theorem prover for full first-order logic with equality"
-HOMEPAGE="http://www4.informatik.tu-muenchen.de/~schulz/E/E.html"
-SRC_URI="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_${PV}/${MY_PN}.tgz -> ${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples isabelle"
-
-RDEPEND="isabelle? (
-			>=sci-mathematics/isabelle-2011.1-r1:=
-		)"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-
-src_configure() {
-	./configure --prefix="${ROOT}usr" \
-		--man-prefix="${ROOT}share/man" \
-		|| die "E configure failed"
-
-	sed -e "s@CFLAGS     = @CFLAGS     = ${CFLAGS} @" \
-		-e "s@LD         = \$(CC) @LD         = \$(CC) ${LDFLAGS} @" \
-		-i "${S}/Makefile.vars" \
-		|| die "Could not add our flags to Makefile.vars"
-}
-
-src_install() {
-	for i in "${S}/PROVER/eprover" \
-		"${S}/PROVER/epclextract" \
-		"${S}/PROVER/eproof" \
-		"${S}/PROVER/eproof_ram" \
-		"${S}/PROVER/eground" \
-		"${S}/PROVER/e_ltb_runner" \
-		"${S}/PROVER/e_axfilter" \
-		"${S}/PROVER/checkproof" \
-		"${S}/PROVER/ekb_create" \
-		"${S}/PROVER/ekb_delete" \
-		"${S}/PROVER/ekb_ginsert" \
-		"${S}/PROVER/ekb_insert"
-	do
-		dobin "${i}"
-	done
-
-	for i in "${S}/DOC/man/eprover.1" \
-		"${S}/DOC/man/epclextract.1" \
-		"${S}/DOC/man/eproof.1" \
-		"${S}/DOC/man/eproof_ram.1" \
-		"${S}/DOC/man/eground.1" \
-		"${S}/DOC/man/e_ltb_runner.1" \
-		"${S}/DOC/man/e_axfilter.1" \
-		"${S}/DOC/man/checkproof.1" \
-		"${S}/DOC/man/ekb_create.1" \
-		"${S}/DOC/man/ekb_delete.1" \
-		"${S}/DOC/man/ekb_ginsert.1" \
-		"${S}/DOC/man/ekb_insert.1"
-	do
-		doman "${i}"
-	done
-
-	if use doc; then
-		pushd "${S}"/DOC || die "Could not cd to DOC"
-		dodoc ANNOUNCE CREDITS DONE E-REMARKS E-REMARKS.english E-USERS \
-			HISTORY NEWS PORTING ReadMe THINKME TODO TPTP_SUBMISSION \
-			WISHLIST eprover.pdf
-		dohtml *.html
-		insinto /usr/share/doc/${PF}/html
-		doins estyle.sty
-		popd
-	fi
-
-	if use examples; then
-		dodir /usr/share/${MY_PN}/examples
-		insinto /usr/share/${MY_PN}/examples
-		doins -r EXAMPLE_PROBLEMS
-		doins -r SIMPLE_APPS
-	fi
-
-	if use isabelle; then
-		ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)" \
-			|| die "isabelle getenv ISABELLE_HOME failed"
-		[[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
-		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		cat <<- EOF >> "${S}/settings"
-			E_HOME="${ROOT}usr/bin"
-			E_VERSION="${PV}"
-		EOF
-		insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		doins "${S}/settings"
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [ -f "${ROOT}etc/isabelle/components" ]; then
-			if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then
-				sed -e "/contrib\/${PN}-[0-9.]*/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-			cat <<- EOF >> "${ROOT}etc/isabelle/components"
-				contrib/${PN}-${PV}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [ ! -f "${ROOT}usr/bin/eproof" ]; then
-			if [ -f "${ROOT}etc/isabelle/components" ]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new E being installed during an upgrade.
-				sed -e "/contrib\/${PN}-${PV}/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/e/e-1.6.ebuild b/sci-mathematics/e/e-1.6.ebuild
deleted file mode 100644
index 39cde267248b..000000000000
--- a/sci-mathematics/e/e-1.6.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN="E"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="E is a theorem prover for full first-order logic with equality"
-HOMEPAGE="http://www4.informatik.tu-muenchen.de/~schulz/E/E.html"
-SRC_URI="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_${PV}/${MY_PN}.tgz -> ${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples isabelle"
-
-RDEPEND="isabelle? (
-			>=sci-mathematics/isabelle-2011.1-r1:=
-		)"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-
-src_configure() {
-	./configure --prefix="${ROOT}usr" \
-		--man-prefix="${ROOT}share/man" \
-		|| die "E configure failed"
-
-	sed -e "s@CFLAGS     = @CFLAGS     = ${CFLAGS} @" \
-		-e "s@LD         = \$(CC) @LD         = \$(CC) ${LDFLAGS} @" \
-		-i "${S}/Makefile.vars" \
-		|| die "Could not add our flags to Makefile.vars"
-}
-
-src_install() {
-	for i in "${S}/PROVER/eprover" \
-		"${S}/PROVER/epclextract" \
-		"${S}/PROVER/eproof" \
-		"${S}/PROVER/eproof_ram" \
-		"${S}/PROVER/eground" \
-		"${S}/PROVER/e_ltb_runner" \
-		"${S}/PROVER/e_axfilter" \
-		"${S}/PROVER/checkproof" \
-		"${S}/PROVER/ekb_create" \
-		"${S}/PROVER/ekb_delete" \
-		"${S}/PROVER/ekb_ginsert" \
-		"${S}/PROVER/ekb_insert"
-	do
-		dobin "${i}"
-	done
-
-	for i in "${S}/DOC/man/eprover.1" \
-		"${S}/DOC/man/epclextract.1" \
-		"${S}/DOC/man/eproof.1" \
-		"${S}/DOC/man/eproof_ram.1" \
-		"${S}/DOC/man/eground.1" \
-		"${S}/DOC/man/e_ltb_runner.1" \
-		"${S}/DOC/man/e_axfilter.1" \
-		"${S}/DOC/man/checkproof.1" \
-		"${S}/DOC/man/ekb_create.1" \
-		"${S}/DOC/man/ekb_delete.1" \
-		"${S}/DOC/man/ekb_ginsert.1" \
-		"${S}/DOC/man/ekb_insert.1"
-	do
-		doman "${i}"
-	done
-
-	if use doc; then
-		pushd "${S}"/DOC || die "Could not cd to DOC"
-		dodoc ANNOUNCE CREDITS DONE E-REMARKS E-REMARKS.english E-USERS \
-			HISTORY NEWS PORTING ReadMe THINKME TODO TPTP_SUBMISSION \
-			WISHLIST eprover.pdf
-		dohtml *.html
-		insinto /usr/share/doc/${PF}/html
-		doins estyle.sty
-		popd
-	fi
-
-	if use examples; then
-		dodir /usr/share/${MY_PN}/examples
-		insinto /usr/share/${MY_PN}/examples
-		doins -r EXAMPLE_PROBLEMS
-		doins -r SIMPLE_APPS
-	fi
-
-	if use isabelle; then
-		ISABELLE_HOME="$(isabelle getenv ISABELLE_HOME | cut -d'=' -f 2)" \
-			|| die "isabelle getenv ISABELLE_HOME failed"
-		[[ -n "${ISABELLE_HOME}" ]] || die "ISABELLE_HOME empty"
-		dodir "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		cat <<- EOF >> "${S}/settings"
-			E_HOME="${ROOT}usr/bin"
-			E_VERSION="${PV}"
-		EOF
-		insinto "${ISABELLE_HOME}/contrib/${PN}-${PV}/etc"
-		doins "${S}/settings"
-	fi
-}
-
-pkg_postinst() {
-	if use isabelle; then
-		if [ -f "${ROOT}etc/isabelle/components" ]; then
-			if egrep "contrib/${PN}-[0-9.]*" "${ROOT}etc/isabelle/components"; then
-				sed -e "/contrib\/${PN}-[0-9.]*/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-			cat <<- EOF >> "${ROOT}etc/isabelle/components"
-				contrib/${PN}-${PV}
-			EOF
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use isabelle; then
-		if [ ! -f "${ROOT}usr/bin/eproof" ]; then
-			if [ -f "${ROOT}etc/isabelle/components" ]; then
-				# Note: this sed should only match the version of this ebuild
-				# Which is what we want as we do not want to remove the line
-				# of a new E being installed during an upgrade.
-				sed -e "/contrib\/${PN}-${PV}/d" \
-					-i "${ROOT}etc/isabelle/components"
-			fi
-		fi
-	fi
-}
diff --git a/sci-mathematics/e/e-2.3.ebuild b/sci-mathematics/e/e-2.3.ebuild
new file mode 100644
index 000000000000..2b9f7875941d
--- /dev/null
+++ b/sci-mathematics/e/e-2.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="E"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="E is a theorem prover for full first-order logic with equality"
+HOMEPAGE="https://wwwlehre.dhbw-stuttgart.de/~sschulz/E/E.html"
+SRC_URI="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${PV}/${MY_PN}.tgz -> ${MY_P}.tgz"
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( dev-texlive/texlive-latex )"
+
+S="${WORKDIR}"/${MY_PN}
+
+PATCHES=( "${FILESDIR}"/${PN}-2.3-build-system.patch )
+
+src_prepare() {
+	default
+	rm -f DOC/eprover.pdf
+}
+
+src_configure() {
+	./configure --prefix="${ED}/usr" \
+		--man-prefix="${ED}/usr/share/man" \
+		|| die "E configure failed"
+
+	sed -e "s@CFLAGS     = @CFLAGS     = ${CFLAGS} @" \
+		-e "s@LD         = \$(CC) @LD         = \$(CC) ${LDFLAGS} @" \
+		-i "${S}/Makefile.vars" \
+		|| die "Could not add our flags to Makefile.vars"
+}
+
+src_compile() {
+	default
+	use doc && emake documentation
+}
+
+src_install() {
+	default
+
+	local DOCS=(
+		"README.md"
+		"DOC/ANNOUNCE"
+		"DOC/CONTRIBUTORS"
+		"DOC/DONE"
+		"DOC/E-REMARKS"
+		"DOC/E-REMARKS.english"
+		"DOC/E-USERS"
+		"DOC/HISTORY"
+		"DOC/NEWS"
+		"DOC/PORTING"
+		"DOC/ReadMe"
+		"DOC/THINKME"
+		"DOC/TODO"
+		"DOC/TPTP_SUBMISSION"
+		"DOC/WISHLIST"
+		"DOC/eprover.pdf"
+	)
+	local HTML_DOCS=( "DOC" )
+	einstalldocs
+
+	if use examples; then
+		insinto /usr/share/${MY_PN}/examples
+		doins -r EXAMPLE_PROBLEMS
+		doins -r SIMPLE_APPS
+	fi
+}
diff --git a/sci-mathematics/e/files/e-2.3-build-system.patch b/sci-mathematics/e/files/e-2.3-build-system.patch
new file mode 100644
index 000000000000..8031c20e026e
--- /dev/null
+++ b/sci-mathematics/e/files/e-2.3-build-system.patch
@@ -0,0 +1,8 @@
+--- E-orig/development_tools/e_install	2019-03-13 04:55:13.000000000 +1100
++++ E/development_tools/e_install	2019-09-11 21:11:37.628045114 +1000
+@@ -13,4 +13,4 @@
+     fi
+ }
+ 
+-testinstall $1 $2 
++install $1 $2 
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index db799a1e2e67..b05854ab47ca 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -4,5 +4,5 @@ DIST z3-4.4.1.tar.gz 3347371 BLAKE2B 57f090b891618613c4647a89620d12f2ac05ea11026
 DIST z3-4.5.0.tar.gz 3573695 BLAKE2B 285cc4d1f998d61ddb0b854044b7c79c1bb4cccf51bbdcba7c4a45698d74d9591f84d0aa74c5ef7c8aea2c6539ac987f29e326b44037e954108df67644dff594 SHA512 1ebc2c908d90b6b879f1e819c864ff894613276af47a440f27cf94968c195656952434754c3eb20f4bdbdd8497d227d22e1b4821c0d320b11052b5648d9e2dc7
 EBUILD z3-4.4.1.ebuild 4306 BLAKE2B 7e81603d96667c8e5748467668615f07a9e2194be963b67ae94eb90b29252d7fb53be373df21efbbea007aa8671609f2199fcb8a5f866b1f284228ad0d6e9d00 SHA512 1a370b019b33e83d5984b6abf321b39ff25f3b633ca60b2c48ddf9e33b30252389b5cb6f2e34e0dc1103730c9e5bf60ac688d67914d9c5dae52cf5fc5354620c
 EBUILD z3-4.5.0.ebuild 4721 BLAKE2B 8d0dab01c8c06bb07462bb51311520bb9f600b64ab43dd1ad5975c39554416d1a019665d30079535f5e20cefa5d65c6e6eb7140fd2ebc90cd2c363e9c732421c SHA512 e52d01917d884d10c24bf081303bdef7b1efa3b042f838ebc7de678a473fdd01d7738a216c9e14c4929b847fe7e5c3abe7a92bdafc827a1c1aa54b86abe46664
-EBUILD z3-4.8.5.ebuild 2643 BLAKE2B 0016ba725593c1d850833b3aa3339b644d5defa96075b520a452e4fb77780c275db4134f64b1fcebd292e4bd0222556e9eb5e062446d69f1b898a71f9f0005e0 SHA512 24576c9210d1e85840fffb56f5cd6b3b47155b9b667c8d25c827d5698a978b02bee2f5314737a961828059454b8a8dc774f42af297f792df46902eec7f00a9a5
+EBUILD z3-4.8.5.ebuild 2639 BLAKE2B b6cb4b0e12c118d3fc32be1b0bc52a94c636350a2df7a317f82c01fb9ee9a9a227887a2435268eabbdb034decac0c0266e7912115f7f820fe758a6533ab9b73b SHA512 13a82e86b4d931bd64511ceafef315232c9c9fe5af2fe3c4aa323dd2d5b5accbf2d0e57efb502c1da1e8ac5e1b0f6557eebcdc71698687ca1d054aa5ceb0a0cb
 MISC metadata.xml 862 BLAKE2B 1d219fcfb0772a48ec398a51b8916748db336730b91b66e336e8df0b8522b9a47df718d6303aff5f305b699e9297aaad9b352c69d529a93f66cf2a1b76c8f094 SHA512 2a5cc11ae87199a23c72ffb7366c65cbb33683bb6ad142d1df84a65b56bd69f50907bca69f066a1c860947254c241089521c026bac9ff92bd405038c266907ef
diff --git a/sci-mathematics/z3/z3-4.8.5.ebuild b/sci-mathematics/z3/z3-4.8.5.ebuild
index 7b359b0b167f..e21797494393 100644
--- a/sci-mathematics/z3/z3-4.8.5.ebuild
+++ b/sci-mathematics/z3/z3-4.8.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Z3Prover/z3/archive/${P^}.tar.gz"
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86"
 IUSE="doc examples gmp isabelle java openmp python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 8febcca3a63f..30fdf6f9afee 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 61a1c2fa9bba..aa0109057aab 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -8,10 +8,10 @@ AUX root-6.16.00-disable-header-search.patch 1670 BLAKE2B cc9fda55bc867585432d9a
 DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
 DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
 DIST root_v6.16.00.source.tar.gz 164836293 BLAKE2B 9d8f02631bdc1fa1775cbdaf50dd1feacd9b3c86b81d679ba6f0ca3c5787cd1d22ef7c33358b608361a01ad4f0aff3e8c749649d24773a35c52ce87f808d08f5 SHA512 17e5b9815973773e30ff83c2f4028e9e93691c1ecb824c162c8b3e02d1f6666fb8e0b72a5d0652a90032af146d92d271cbffcd634fb6fe6a63bdf46d672789bf
-DIST root_v6.18.00.source.tar.gz 165917160 BLAKE2B 8c83f4dc7a7af8f8627e7711792d09800d3b426ce9ca338aad3bc65c9c307723bd97ca84f0e1790fb844f80be80c8cea9e58c1a6b469880752439db21f7d34cd SHA512 abc4630b773f979e01e0ede7bee095fa3f0f8172218538b37e68230dfce6f0623f24a9567bd40cf1e72ccb4e3398cec858fdfd53ba246ca3615fefd9e5a0d0cd
+DIST root_v6.18.02.source.tar.gz 165926001 BLAKE2B 72f41a191a6041cb90efbda9d632e676840946a15e5d04a5ac99c041122e4c14636a5e669b0848124eceed784bf2ccff2cefe7da6d78394bd4d22b2391cb22f9 SHA512 0643453a4b2c86ee8b6c1da8b8eaaadea096a9688dd46aa721e56a9d19529d0dc41ea1e0e148eb6bcc20bd28e906daf75b96da8c363fabdc2a58479c66f8af9f
 EBUILD root-6.12.06-r11.ebuild 7866 BLAKE2B e12510ed1d12803dd4bac0ad21616aa3d1ce01ee95e74857ff2bc69d6085957d116e5418d5aba030ff9c036e3e3330bb084de4af342c84a59063b1f309e8efac SHA512 a5322adba20a8ac7d68219e63f3c78c1a438a078bca3ef73f47132a7034844bb2781747cf5c6b83b962cd3423b67c6dbd2d2f695873347639bf24fec03c1ee22
 EBUILD root-6.14.08-r4.ebuild 8052 BLAKE2B 82c9067edf53e5102ccbe89c63e3ab122d17dacf2cc686e0c7450238b110fb796490dc8887d59b2c7287f4a74fc05d773fdfab11aa7a6d932b82993349699105 SHA512 5027873eefb0f5655f8d990ed434a84a0a72f39561fca2e6537b9248406c48ad8636f46942680c62d47665629fc80bcd54092852ea6b954946b3ac980efa1dbb
-EBUILD root-6.16.00-r3.ebuild 8138 BLAKE2B f87aa6680d0ff4887ae4149e16d38dd525056441f8465d4375059eec662de50cecb9eb64d00e76f4895d11bafb2dbbd2f47113e7b5cd008d6f25f67b78a7c0d0 SHA512 1e3d0a46d8b3198fe6334a9f8ebfe47144da445042e9fb43a53328c42bfa29e246347586861a83fd594000af458ad2db52f8950fd309547b4b71f7c6f6d6d967
-EBUILD root-6.18.00-r2.ebuild 7600 BLAKE2B 7522424247f422a763fb957948bc4e39a8121daaa79476b1d14d849afb7856ea1df18a6bf2f900b37add07cdadc4779808f70cbaed2123385759187163339a03 SHA512 f3d7fc72787d547382487d0496729f392af6617372a73acf0d6b7cec16faa8c029d739e61ad0a198cb95299b959ca0efbc75552e6ccd24bc98b1ac1016bcc81a
-EBUILD root-9999.ebuild 7517 BLAKE2B 6cee68b58c2e6fe2d30ffbb08af824a40e2b815aff1980c8d4d39f80579749d9f92b2e3eab3628bd368d5b3fa624d368d0f1657610a04d580cae3fa1f0a7cd49 SHA512 bd21527629e472f870036afea07d4222a03ab69e9238d8201c5eacdc2ce3025561be636aa430d6530bffdb8d7f66c193a657ba39d870eab7aae01614516d6350
+EBUILD root-6.16.00-r4.ebuild 8028 BLAKE2B 4eecb5d2b3ad942c45a7230c3b4e2851d28912da697d704a8a536cb254419e98dd13ec2d8a0cf53020c141871eb27c9823dd031b564462312146cb27d80bb6fa SHA512 f4d38ade420b6c519b3788239e18bf4d11dafb5ffa49b5d2d1bd6979a37d6b74486b572f2a0216db0fb0cca6c8eced7f18ae9957e95ca3519d0cac6bbd6975a7
+EBUILD root-6.18.02.ebuild 7446 BLAKE2B d8a68eba5d85162ad003342adda8ea8d8dd6f420301c8d7291b5e6813add0c51d4bc6d0f1e2b7ac6604571ea6adf5a6af31f65aa025967b7c5763507767759cd SHA512 7631e9f06f616ce9be79569fde356920a9de5c8d400046582e5419e819bbc4eb6d41aa58adc61c770c4fadc59078eae74f757ef04f2a281a2f31270a7e18e428
+EBUILD root-9999.ebuild 7407 BLAKE2B 30bf6f8a3a7044d785429710cfcb00b0a1ed422ddf3bb7800a586558df962147d37f65e15dc6cd038cf6184070f9b153359d5c7743be7f5de57e7970b630a0bd SHA512 521dba55c6cad1d40fee56ad2eb1e020cc35241f92f2117d92b3057af7bd920821bda286140601528716ec478a0f4cb8d98bc5db8f74dc8737e4279acae19a33
 MISC metadata.xml 3218 BLAKE2B f23175b1a5998bbecdcdb6e5f42d08bd8e16aaeee79f43d30e0906977f389e18a19ddceeba24009360c2f717c29162c8e30b807bda993492f27429802dc62883 SHA512 d3bdc5bce1d1ac904e5a7a9f21bca65deb480ecbd1362a3251c93e09ab07fdcdd6dfd8900e62df3853b7e200880850d9010122500a081fdedb6b43adae25a6bd
diff --git a/sci-physics/root/root-6.16.00-r3.ebuild b/sci-physics/root/root-6.16.00-r3.ebuild
deleted file mode 100644
index c57209cefee7..000000000000
--- a/sci-physics/root/root-6.16.00-r3.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ninja does not work due to fortran
-CMAKE_MAKEFILE_GENERATOR=emake
-FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
-	llvm prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="https://root.cern"
-SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
-
-IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
-	+examples fits fftw fortran +gdml graphviz +gsl http jemalloc
-	kerberos ldap libcxx memstat +minuit mysql nosplash odbc +opengl
-	oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7
-	shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc
-	xinetd +xml xrootd zeroconf"
-
-SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="
-	^^ ( c++11 c++14 c++17 )
-	cuda? ( tmva !c++17 )
-	!X? ( !asimage !opengl !qt5 !tiff )
-	davix? ( ssl xml )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( root7 )
-	root7? ( || ( c++14 c++17 ) )
-	tmva? ( gsl )
-"
-
-CDEPEND="
-	app-arch/lz4
-	app-arch/xz-utils
-	fortran? ( dev-lang/cfortran )
-	dev-libs/libpcre:3
-	dev-libs/xxhash
-	media-fonts/dejavu
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sys-devel/llvm:5=
-	sys-libs/ncurses:=
-	sys-libs/zlib
-	X? (
-		x11-libs/libX11:0
-		x11-libs/libXext:0
-		x11-libs/libXft:0
-		x11-libs/libXpm:0
-		opengl? (
-			media-libs/ftgl:0=
-			media-libs/glew:0=
-			virtual/opengl
-			virtual/glu
-			x11-libs/gl2ps:0=
-		)
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwebengine:5[widgets]
-		)
-	)
-	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
-	davix? ( net-libs/davix )
-	emacs? ( virtual/emacs )
-	fftw? ( sci-libs/fftw:3.0= )
-	fits? ( sci-libs/cfitsio:0= )
-	graphviz? ( media-gfx/graphviz )
-	gsl? ( sci-libs/gsl:= )
-	http? ( dev-libs/fcgi:0= )
-	jemalloc? ( dev-libs/jemalloc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:0= )
-	libcxx? ( sys-libs/libcxx )
-	unuran? ( sci-mathematics/unuran:0= )
-	minuit? ( !sci-libs/minuit )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:= )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	python? ( ${PYTHON_DEPS} )
-	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0= )
-	tbb? ( >=dev-cpp/tbb-2018 )
-	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vc? ( dev-libs/vc:= )
-	xml? ( dev-libs/libxml2:2= )
-	xrootd? ( net-libs/xrootd:0= )
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
-	"${FILESDIR}"/${PN}-6.16.00-disable-header-search.patch
-)
-
-pkg_setup() {
-	LLVM_MAX_SLOT=5 llvm_pkg_setup
-
-	use fortran && fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-
-	elog "There are extra options on packages not available in Gentoo."
-	elog "You can use the environment variable EXTRA_ECONF to enable"
-	elog "these packages. For example, for Vdt you would set:"
-	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
-
-	# CSS should use local images
-	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
-	if use nosplash; then
-		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
-	fi
-
-	hprefixify core/clingutils/CMakeLists.txt
-}
-
-# Note: ROOT uses bundled clang because it is patched and API-incompatible
-#       with vanilla clang. The patches enable the C++ interpreter to work.
-#       Since ROOT installs many files into /etc (>100MB in total) that don't
-#       really belong there, we install it into another directory to avoid
-#       making /etc too big.
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS}"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
-		-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"
-		-DDEFAULT_SYSROOT="${EPREFIX}"
-		-DCLING_BUILD_PLUGINS=OFF
-		-Dexplicitlink=ON
-		-Dexceptions=ON
-		-Dfail-on-missing=ON
-		-Dgnuinstall=OFF
-		-Dshared=ON
-		-Dsoversion=ON
-		-Dbuiltin_llvm=OFF
-		-Dbuiltin_clang=ON
-		-Dbuiltin_afterimage=OFF
-		-Dbuiltin_cfitsio=OFF
-		-Dbuiltin_davix=OFF
-		-Dbuiltin_fftw3=OFF
-		-Dbuiltin_freetype=OFF
-		-Dbuiltin_ftgl=OFF
-		-Dbuiltin_gl2ps=OFF
-		-Dbuiltin_glew=OFF
-		-Dbuiltin_gsl=OFF
-		-Dbuiltin_lz4=OFF
-		-Dbuiltin_lzma=OFF
-		-Dbuiltin_openssl=OFF
-		-Dbuiltin_pcre=OFF
-		-Dbuiltin_tbb=OFF
-		-Dbuiltin_unuran=OFF
-		-Dbuiltin_vc=OFF
-		-Dbuiltin_vdt=OFF
-		-Dbuiltin_veccore=OFF
-		-Dbuiltin_xrootd=OFF
-		-Dbuiltin_xxhash=OFF
-		-Dbuiltin_zlib=OFF
-		-Dx11=$(usex X)
-		-Dxft=$(usex X)
-		-Dafdsmgrd=OFF
-		-Dafs=OFF # not implemented
-		-Dalien=OFF
-		-Dasimage=$(usex asimage)
-		-Dastiff=$(usex tiff)
-		-Dbonjour=$(usex zeroconf)
-		-Dlibcxx=$(usex libcxx)
-		-Dccache=OFF # use ccache via portage
-		-Dcastor=OFF
-		-Dchirp=OFF
-		-Dclad=OFF
-		-Dcling=ON # cling=OFF is broken
-		-Dcocoa=$(usex aqua)
-		-Dcuda=$(usex cuda)
-		-Dcxx11=$(usex c++11)
-		-Dcxx14=$(usex c++14)
-		-Dcxx17=$(usex c++17)
-		-Dcxxmodules=OFF # requires clang, unstable
-		-Ddavix=$(usex davix)
-		-Ddcache=OFF
-		-Dfftw3=$(usex fftw)
-		-Dfitsio=$(usex fits)
-		-Dfortran=$(usex fortran)
-		-Dftgl=$(usex opengl)
-		-Dgdml=$(usex gdml)
-		-Dgenvector=ON # genvector=OFF ignored
-		-Dgeocad=OFF
-		-Dgfal=OFF
-		-Dgl2ps=$(usex opengl)
-		-Dglite=OFF # not implemented
-		-Dglobus=OFF
-		-Dgminimal=OFF
-		-Dgsl_shared=$(usex gsl)
-		-Dgviz=$(usex graphviz)
-		-Dhdfs=OFF
-		-Dhttp=$(usex http)
-		-Dimt=$(usex tbb)
-		-Djemalloc=$(usex jemalloc)
-		-Dkrb5=$(usex kerberos)
-		-Dldap=$(usex ldap)
-		-Dmathmore=$(usex gsl)
-		-Dmemstat=$(usex memstat)
-		-Dminimal=OFF
-		-Dminuit2=$(usex minuit)
-		-Dminuit=$(usex minuit)
-		-Dmonalisa=OFF
-		-Dmysql=$(usex mysql)
-		-Dodbc=$(usex odbc)
-		-Dopengl=$(usex opengl)
-		-Doracle=$(usex oracle)
-		-Dpch=ON # pch=OFF is broken
-		-Dpgsql=$(usex postgres)
-		-Dpythia6=$(usex pythia6)
-		-Dpythia8=$(usex pythia8)
-		-Dpython=$(usex python)
-		-Dqt5web=$(usex qt5)
-		-Dqtgsi=OFF
-		-Dqt=OFF
-		-Drfio=OFF
-		-Droofit=$(usex roofit)
-		-Droot7=$(usex root7)
-		-Drootbench=OFF
-		-Droottest=OFF
-		-Drpath=OFF
-		-Druby=OFF # deprecated and broken
-		-Druntime_cxxmodules=OFF # does not work yet
-		-Dr=$(usex R)
-		-Dsapdb=OFF # not implemented
-		-Dshadowpw=$(usex shadow)
-		-Dsqlite=$(usex sqlite)
-		-Dsrp=OFF # not implemented
-		-Dssl=$(usex ssl)
-		-Dtable=$(usex table)
-		-Dtcmalloc=OFF
-		-Dtesting=$(usex test)
-		-Dthread=$(usex threads)
-		-Dtmva=$(usex tmva)
-		-Dtmva-cpu=$(usex tmva)
-		-Dtmva-gpu=$(usex cuda)
-		-Dunuran=$(usex unuran)
-		-Dvc=$(usex vc)
-		-Dvdt=OFF
-		-Dveccore=OFF
-		-Dxml=$(usex xml)
-		-Dxrootd=$(usex xrootd)
-		${EXTRA_ECONF}
-	)
-
-	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# needed for hsimple.root
-	addwrite /dev/random
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
-	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
-
-	cat > ${ROOTENV} <<- EOF || die
-	MANPATH="${ROOTSYS}/share/man"
-	PATH="${ROOTSYS}/bin"
-	ROOTPATH="${ROOTSYS}/bin"
-	LDPATH="${ROOTSYS}/lib"
-	EOF
-
-	if use python; then
-		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
-	fi
-
-	doenvd ${ROOTENV}
-
-	if use emacs; then
-		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
-	fi
-
-	pushd "${D}/${ROOTSYS}" > /dev/null
-
-	rm -r test emacs bin/*.{csh,sh,fish} || die
-
-	if ! use examples; then
-		rm -r tutorials || die
-	fi
-
-	# create versioned symlinks for binaries
-	cd bin;
-	for exe in *; do
-		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
-	done
-}
diff --git a/sci-physics/root/root-6.16.00-r4.ebuild b/sci-physics/root/root-6.16.00-r4.ebuild
new file mode 100644
index 000000000000..ba820931192f
--- /dev/null
+++ b/sci-physics/root/root-6.16.00-r4.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
+	prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="https://root.cern"
+SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+
+IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
+	+examples fits fftw fortran +gdml graphviz +gsl http jemalloc
+	kerberos ldap libcxx memstat +minuit mysql nosplash odbc +opengl
+	oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7
+	shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc
+	xinetd +xml xrootd zeroconf"
+
+SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
+	cuda? ( tmva !c++17 )
+	!X? ( !asimage !opengl !qt5 !tiff )
+	davix? ( ssl xml )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( root7 )
+	root7? ( || ( c++14 c++17 ) )
+	tmva? ( gsl )
+"
+
+CDEPEND="
+	app-arch/lz4
+	app-arch/xz-utils
+	fortran? ( dev-lang/cfortran )
+	dev-libs/libpcre:3
+	dev-libs/xxhash
+	media-fonts/dejavu
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-libs/ncurses:=
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11:0
+		x11-libs/libXext:0
+		x11-libs/libXft:0
+		x11-libs/libXpm:0
+		opengl? (
+			media-libs/ftgl:0=
+			media-libs/glew:0=
+			virtual/opengl
+			virtual/glu
+			x11-libs/gl2ps:0=
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwebengine:5[widgets]
+		)
+	)
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
+	davix? ( net-libs/davix )
+	emacs? ( virtual/emacs )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:0= )
+	graphviz? ( media-gfx/graphviz )
+	gsl? ( sci-libs/gsl:= )
+	http? ( dev-libs/fcgi:0= )
+	jemalloc? ( dev-libs/jemalloc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:0= )
+	libcxx? ( sys-libs/libcxx )
+	unuran? ( sci-mathematics/unuran:0= )
+	minuit? ( !sci-libs/minuit )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:= )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+	shadow? ( virtual/shadow )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0= )
+	tbb? ( >=dev-cpp/tbb-2018 )
+	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	vc? ( dev-libs/vc:= )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	xinetd? ( sys-apps/xinetd )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
+	"${FILESDIR}"/${PN}-6.16.00-disable-header-search.patch
+)
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+
+	elog "There are extra options on packages not available in Gentoo."
+	elog "You can use the environment variable EXTRA_ECONF to enable"
+	elog "these packages. For example, for Vdt you would set:"
+	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
+
+	# CSS should use local images
+	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+
+	if use nosplash; then
+		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
+	fi
+
+	hprefixify core/clingutils/CMakeLists.txt
+}
+
+# Note: ROOT uses bundled clang because it is patched and API-incompatible
+#       with vanilla clang. The patches enable the C++ interpreter to work.
+#       Since ROOT installs many files into /etc (>100MB in total) that don't
+#       really belong there, we install it into another directory to avoid
+#       making /etc too big.
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-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"
+		-DDEFAULT_SYSROOT="${EPREFIX}"
+		-DCLING_BUILD_PLUGINS=OFF
+		-Dexplicitlink=ON
+		-Dexceptions=ON
+		-Dfail-on-missing=ON
+		-Dgnuinstall=OFF
+		-Dshared=ON
+		-Dsoversion=ON
+		-Dbuiltin_llvm=ON
+		-Dbuiltin_clang=ON
+		-Dbuiltin_afterimage=OFF
+		-Dbuiltin_cfitsio=OFF
+		-Dbuiltin_davix=OFF
+		-Dbuiltin_fftw3=OFF
+		-Dbuiltin_freetype=OFF
+		-Dbuiltin_ftgl=OFF
+		-Dbuiltin_gl2ps=OFF
+		-Dbuiltin_glew=OFF
+		-Dbuiltin_gsl=OFF
+		-Dbuiltin_lz4=OFF
+		-Dbuiltin_lzma=OFF
+		-Dbuiltin_openssl=OFF
+		-Dbuiltin_pcre=OFF
+		-Dbuiltin_tbb=OFF
+		-Dbuiltin_unuran=OFF
+		-Dbuiltin_vc=OFF
+		-Dbuiltin_vdt=OFF
+		-Dbuiltin_veccore=OFF
+		-Dbuiltin_xrootd=OFF
+		-Dbuiltin_xxhash=OFF
+		-Dbuiltin_zlib=OFF
+		-Dx11=$(usex X)
+		-Dxft=$(usex X)
+		-Dafdsmgrd=OFF
+		-Dafs=OFF # not implemented
+		-Dalien=OFF
+		-Dasimage=$(usex asimage)
+		-Dastiff=$(usex tiff)
+		-Dbonjour=$(usex zeroconf)
+		-Dlibcxx=$(usex libcxx)
+		-Dccache=OFF # use ccache via portage
+		-Dcastor=OFF
+		-Dchirp=OFF
+		-Dclad=OFF
+		-Dcling=ON # cling=OFF is broken
+		-Dcocoa=$(usex aqua)
+		-Dcuda=$(usex cuda)
+		-Dcxx11=$(usex c++11)
+		-Dcxx14=$(usex c++14)
+		-Dcxx17=$(usex c++17)
+		-Dcxxmodules=OFF # requires clang, unstable
+		-Ddavix=$(usex davix)
+		-Ddcache=OFF
+		-Dfftw3=$(usex fftw)
+		-Dfitsio=$(usex fits)
+		-Dfortran=$(usex fortran)
+		-Dftgl=$(usex opengl)
+		-Dgdml=$(usex gdml)
+		-Dgenvector=ON # genvector=OFF ignored
+		-Dgeocad=OFF
+		-Dgfal=OFF
+		-Dgl2ps=$(usex opengl)
+		-Dglite=OFF # not implemented
+		-Dglobus=OFF
+		-Dgminimal=OFF
+		-Dgsl_shared=$(usex gsl)
+		-Dgviz=$(usex graphviz)
+		-Dhdfs=OFF
+		-Dhttp=$(usex http)
+		-Dimt=$(usex tbb)
+		-Djemalloc=$(usex jemalloc)
+		-Dkrb5=$(usex kerberos)
+		-Dldap=$(usex ldap)
+		-Dmathmore=$(usex gsl)
+		-Dmemstat=$(usex memstat)
+		-Dminimal=OFF
+		-Dminuit2=$(usex minuit)
+		-Dminuit=$(usex minuit)
+		-Dmonalisa=OFF
+		-Dmysql=$(usex mysql)
+		-Dodbc=$(usex odbc)
+		-Dopengl=$(usex opengl)
+		-Doracle=$(usex oracle)
+		-Dpch=ON # pch=OFF is broken
+		-Dpgsql=$(usex postgres)
+		-Dpythia6=$(usex pythia6)
+		-Dpythia8=$(usex pythia8)
+		-Dpython=$(usex python)
+		-Dqt5web=$(usex qt5)
+		-Dqtgsi=OFF
+		-Dqt=OFF
+		-Drfio=OFF
+		-Droofit=$(usex roofit)
+		-Droot7=$(usex root7)
+		-Drootbench=OFF
+		-Droottest=OFF
+		-Drpath=OFF
+		-Druby=OFF # deprecated and broken
+		-Druntime_cxxmodules=OFF # does not work yet
+		-Dr=$(usex R)
+		-Dsapdb=OFF # not implemented
+		-Dshadowpw=$(usex shadow)
+		-Dsqlite=$(usex sqlite)
+		-Dsrp=OFF # not implemented
+		-Dssl=$(usex ssl)
+		-Dtable=$(usex table)
+		-Dtcmalloc=OFF
+		-Dtesting=$(usex test)
+		-Dthread=$(usex threads)
+		-Dtmva=$(usex tmva)
+		-Dtmva-cpu=$(usex tmva)
+		-Dtmva-gpu=$(usex cuda)
+		-Dunuran=$(usex unuran)
+		-Dvc=$(usex vc)
+		-Dvdt=OFF
+		-Dveccore=OFF
+		-Dxml=$(usex xml)
+		-Dxrootd=$(usex xrootd)
+		${EXTRA_ECONF}
+	)
+
+	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# needed for hsimple.root
+	addwrite /dev/random
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
+
+	cat > ${ROOTENV} <<- EOF || die
+	MANPATH="${ROOTSYS}/share/man"
+	PATH="${ROOTSYS}/bin"
+	ROOTPATH="${ROOTSYS}/bin"
+	LDPATH="${ROOTSYS}/lib"
+	EOF
+
+	if use python; then
+		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
+	fi
+
+	doenvd ${ROOTENV}
+
+	if use emacs; then
+		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+	fi
+
+	pushd "${D}/${ROOTSYS}" > /dev/null
+
+	rm -r test emacs bin/*.{csh,sh,fish} || die
+
+	if ! use examples; then
+		rm -r tutorials || die
+	fi
+
+	# create versioned symlinks for binaries
+	cd bin;
+	for exe in *; do
+		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
+	done
+}
diff --git a/sci-physics/root/root-6.18.00-r2.ebuild b/sci-physics/root/root-6.18.00-r2.ebuild
deleted file mode 100644
index 18d23f22fd53..000000000000
--- a/sci-physics/root/root-6.18.00-r2.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ninja does not work due to fortran
-CMAKE_MAKEFILE_GENERATOR=emake
-FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
-	llvm prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="https://root.cern"
-SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
-
-IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
-	+examples fits fftw fortran +gdml graphviz +gsl http jemalloc
-	libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres
-	prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite
-	+ssl +tbb test +threads +tiff +tmva +unuran vc +vmc +xml xrootd"
-
-SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="
-	^^ ( c++11 c++14 c++17 )
-	cuda? ( tmva !c++17 )
-	!X? ( !asimage !opengl !qt5 !tiff )
-	davix? ( ssl xml )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( root7 )
-	root7? ( || ( c++14 c++17 ) )
-	tmva? ( gsl )
-"
-
-CDEPEND="
-	app-arch/lz4
-	app-arch/xz-utils
-	fortran? ( dev-lang/cfortran )
-	dev-libs/libpcre:3
-	dev-libs/xxhash
-	media-fonts/dejavu
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sys-devel/llvm:5=
-	sys-libs/ncurses:=
-	sys-libs/zlib
-	X? (
-		x11-libs/libX11:0
-		x11-libs/libXext:0
-		x11-libs/libXft:0
-		x11-libs/libXpm:0
-		opengl? (
-			media-libs/ftgl:0=
-			media-libs/glew:0=
-			virtual/opengl
-			virtual/glu
-			x11-libs/gl2ps:0=
-		)
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwebengine:5[widgets]
-		)
-	)
-	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
-	davix? ( net-libs/davix )
-	emacs? ( virtual/emacs )
-	fftw? ( sci-libs/fftw:3.0= )
-	fits? ( sci-libs/cfitsio:0= )
-	graphviz? ( media-gfx/graphviz )
-	gsl? ( sci-libs/gsl:= )
-	http? ( dev-libs/fcgi:0= )
-	jemalloc? ( dev-libs/jemalloc )
-	libcxx? ( sys-libs/libcxx )
-	unuran? ( sci-mathematics/unuran:0= )
-	minuit? ( !sci-libs/minuit )
-	mysql? ( dev-db/mysql-connector-c )
-	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	postgres? ( dev-db/postgresql:= )
-	pythia6? ( sci-physics/pythia:6 )
-	pythia8? ( sci-physics/pythia:8 )
-	python? ( ${PYTHON_DEPS} )
-	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0= )
-	tbb? ( >=dev-cpp/tbb-2018 )
-	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vc? ( dev-libs/vc:= )
-	xml? ( dev-libs/libxml2:2= )
-	xrootd? ( net-libs/xrootd:0= )
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
-)
-
-pkg_setup() {
-	LLVM_MAX_SLOT=5 llvm_pkg_setup
-
-	use fortran && fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-
-	elog "There are extra options on packages not available in Gentoo."
-	elog "You can use the environment variable EXTRA_ECONF to enable"
-	elog "these packages. For example, for Vdt you would set:"
-	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
-
-	# CSS should use local images
-	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
-	if use nosplash; then
-		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
-	fi
-
-	hprefixify core/clingutils/CMakeLists.txt
-}
-
-# Note: ROOT uses bundled clang because it is patched and API-incompatible
-#       with vanilla clang. The patches enable the C++ interpreter to work.
-#       Since ROOT installs many files into /etc (>100MB in total) that don't
-#       really belong there, we install it into another directory to avoid
-#       making /etc too big.
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS}"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
-		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
-		-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"
-		-DDEFAULT_SYSROOT="${EPREFIX}"
-		-DCLING_BUILD_PLUGINS=OFF
-		-Dexplicitlink=ON
-		-Dexceptions=ON
-		-Dfail-on-missing=ON
-		-Dgnuinstall=OFF
-		-Dshared=ON
-		-Dsoversion=ON
-		-Dbuiltin_llvm=OFF
-		-Dbuiltin_clang=ON
-		-Dbuiltin_afterimage=OFF
-		-Dbuiltin_cfitsio=OFF
-		-Dbuiltin_davix=OFF
-		-Dbuiltin_fftw3=OFF
-		-Dbuiltin_freetype=OFF
-		-Dbuiltin_ftgl=OFF
-		-Dbuiltin_gl2ps=OFF
-		-Dbuiltin_glew=OFF
-		-Dbuiltin_gsl=OFF
-		-Dbuiltin_lz4=OFF
-		-Dbuiltin_lzma=OFF
-		-Dbuiltin_openssl=OFF
-		-Dbuiltin_pcre=OFF
-		-Dbuiltin_tbb=OFF
-		-Dbuiltin_unuran=OFF
-		-Dbuiltin_vc=OFF
-		-Dbuiltin_vdt=OFF
-		-Dbuiltin_veccore=OFF
-		-Dbuiltin_xrootd=OFF
-		-Dbuiltin_xxhash=OFF
-		-Dbuiltin_zlib=OFF
-		-Dx11=$(usex X)
-		-Dxft=$(usex X)
-		-Dalien=OFF
-		-Darrow=OFF
-		-Dasimage=$(usex asimage)
-		-Dastiff=$(usex tiff)
-		-Dlibcxx=$(usex libcxx)
-		-Dccache=OFF # use ccache via portage
-		-Dcefweb=OFF
-		-Dchirp=OFF
-		-Dclad=OFF
-		-Dcling=ON # cling=OFF is broken
-		-Dcocoa=$(usex aqua)
-		-Dcuda=$(usex cuda)
-		-Dcxxmodules=OFF # requires clang, unstable
-		-Ddavix=$(usex davix)
-		-Ddcache=OFF
-		-Dfftw3=$(usex fftw)
-		-Dfitsio=$(usex fits)
-		-Dfortran=$(usex fortran)
-		-Dftgl=$(usex opengl)
-		-Dgdml=$(usex gdml)
-		-Dgenvector=ON # genvector=OFF ignored
-		-Dgeocad=OFF
-		-Dgfal=OFF
-		-Dgl2ps=$(usex opengl)
-		-Dgminimal=OFF
-		-Dgsl_shared=$(usex gsl)
-		-Dgviz=$(usex graphviz)
-		-Dhttp=$(usex http)
-		-Dimt=$(usex tbb)
-		-Djemalloc=$(usex jemalloc)
-		-Dmathmore=$(usex gsl)
-		-Dmemstat=$(usex memstat)
-		-Dminimal=OFF
-		-Dminuit2=$(usex minuit)
-		-Dminuit=$(usex minuit)
-		-Dmonalisa=OFF
-		-Dmysql=$(usex mysql)
-		-Dodbc=$(usex odbc)
-		-Dopengl=$(usex opengl)
-		-Doracle=$(usex oracle)
-		-Dpch=ON # pch=OFF is broken
-		-Dpgsql=$(usex postgres)
-		-Dpythia6=$(usex pythia6)
-		-Dpythia8=$(usex pythia8)
-		-Dpython=$(usex python)
-		-Dqt5web=$(usex qt5)
-		-Droofit=$(usex roofit)
-		-Droot7=$(usex root7)
-		-Drootbench=OFF
-		-Droottest=OFF
-		-Drpath=OFF
-		-Druntime_cxxmodules=OFF # does not work yet
-		-Dr=$(usex R)
-		-Dshadowpw=$(usex shadow)
-		-Dsqlite=$(usex sqlite)
-		-Dssl=$(usex ssl)
-		-Dtcmalloc=OFF
-		-Dtesting=$(usex test)
-		-Dthread=$(usex threads)
-		-Dtmva=$(usex tmva)
-		-Dtmva-cpu=$(usex tmva)
-		-Dtmva-gpu=$(usex cuda)
-		-Dunuran=$(usex unuran)
-		-Dvc=$(usex vc)
-		-Dvmc=$(usex vmc)
-		-Dvdt=OFF
-		-Dveccore=OFF
-		-Dxml=$(usex xml)
-		-Dxrootd=$(usex xrootd)
-		${EXTRA_ECONF}
-	)
-
-	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# needed for hsimple.root
-	addwrite /dev/random
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
-	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
-
-	cat > ${ROOTENV} <<- EOF || die
-	MANPATH="${ROOTSYS}/share/man"
-	PATH="${ROOTSYS}/bin"
-	ROOTPATH="${ROOTSYS}/bin"
-	LDPATH="${ROOTSYS}/lib"
-	EOF
-
-	if use python; then
-		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
-	fi
-
-	doenvd ${ROOTENV}
-
-	if use emacs; then
-		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
-	fi
-
-	pushd "${D}/${ROOTSYS}" > /dev/null
-
-	rm -r emacs bin/*.{csh,sh,fish} || die
-
-	if ! use examples; then
-		rm -r tutorials || die
-	fi
-
-	# create versioned symlinks for binaries
-	cd bin;
-	for exe in *; do
-		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
-	done
-}
diff --git a/sci-physics/root/root-6.18.02.ebuild b/sci-physics/root/root-6.18.02.ebuild
new file mode 100644
index 000000000000..b39d88496bea
--- /dev/null
+++ b/sci-physics/root/root-6.18.02.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
+	prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="https://root.cern"
+SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+
+IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
+	+examples fits fftw fortran +gdml graphviz +gsl http jemalloc
+	libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres
+	prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite
+	+ssl +tbb test +threads +tiff +tmva +unuran vc +vmc +xml xrootd"
+
+SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
+	cuda? ( tmva !c++17 )
+	!X? ( !asimage !opengl !qt5 !tiff )
+	davix? ( ssl xml )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( root7 )
+	root7? ( || ( c++14 c++17 ) )
+	tmva? ( gsl )
+"
+
+CDEPEND="
+	app-arch/lz4
+	app-arch/xz-utils
+	fortran? ( dev-lang/cfortran )
+	dev-libs/libpcre:3
+	dev-libs/xxhash
+	media-fonts/dejavu
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-libs/ncurses:=
+	sys-libs/zlib
+	X? (
+		x11-libs/libX11:0
+		x11-libs/libXext:0
+		x11-libs/libXft:0
+		x11-libs/libXpm:0
+		opengl? (
+			media-libs/ftgl:0=
+			media-libs/glew:0=
+			virtual/opengl
+			virtual/glu
+			x11-libs/gl2ps:0=
+		)
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwebengine:5[widgets]
+		)
+	)
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
+	davix? ( net-libs/davix )
+	emacs? ( virtual/emacs )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:0= )
+	graphviz? ( media-gfx/graphviz )
+	gsl? ( sci-libs/gsl:= )
+	http? ( dev-libs/fcgi:0= )
+	jemalloc? ( dev-libs/jemalloc )
+	libcxx? ( sys-libs/libcxx )
+	unuran? ( sci-mathematics/unuran:0= )
+	minuit? ( !sci-libs/minuit )
+	mysql? ( dev-db/mysql-connector-c )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+	oracle? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql:= )
+	pythia6? ( sci-physics/pythia:6 )
+	pythia8? ( sci-physics/pythia:8 )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+	shadow? ( virtual/shadow )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0= )
+	tbb? ( >=dev-cpp/tbb-2018 )
+	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	vc? ( dev-libs/vc:= )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
+)
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+
+	elog "There are extra options on packages not available in Gentoo."
+	elog "You can use the environment variable EXTRA_ECONF to enable"
+	elog "these packages. For example, for Vdt you would set:"
+	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
+
+	# CSS should use local images
+	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+
+	if use nosplash; then
+		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
+	fi
+}
+
+# Note: ROOT uses bundled clang because it is patched and API-incompatible
+#       with vanilla clang. The patches enable the C++ interpreter to work.
+#       Since ROOT installs many files into /etc (>100MB in total) that don't
+#       really belong there, we install it into another directory to avoid
+#       making /etc too big.
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-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"
+		-DDEFAULT_SYSROOT="${EPREFIX}"
+		-DCLING_BUILD_PLUGINS=OFF
+		-Dexplicitlink=ON
+		-Dexceptions=ON
+		-Dfail-on-missing=ON
+		-Dgnuinstall=OFF
+		-Dshared=ON
+		-Dsoversion=ON
+		-Dbuiltin_llvm=ON
+		-Dbuiltin_clang=ON
+		-Dbuiltin_afterimage=OFF
+		-Dbuiltin_cfitsio=OFF
+		-Dbuiltin_davix=OFF
+		-Dbuiltin_fftw3=OFF
+		-Dbuiltin_freetype=OFF
+		-Dbuiltin_ftgl=OFF
+		-Dbuiltin_gl2ps=OFF
+		-Dbuiltin_glew=OFF
+		-Dbuiltin_gsl=OFF
+		-Dbuiltin_lz4=OFF
+		-Dbuiltin_lzma=OFF
+		-Dbuiltin_openssl=OFF
+		-Dbuiltin_pcre=OFF
+		-Dbuiltin_tbb=OFF
+		-Dbuiltin_unuran=OFF
+		-Dbuiltin_vc=OFF
+		-Dbuiltin_vdt=OFF
+		-Dbuiltin_veccore=OFF
+		-Dbuiltin_xrootd=OFF
+		-Dbuiltin_xxhash=OFF
+		-Dbuiltin_zlib=OFF
+		-Dx11=$(usex X)
+		-Dxft=$(usex X)
+		-Dalien=OFF
+		-Darrow=OFF
+		-Dasimage=$(usex asimage)
+		-Dastiff=$(usex tiff)
+		-Dlibcxx=$(usex libcxx)
+		-Dccache=OFF # use ccache via portage
+		-Dcefweb=OFF
+		-Dchirp=OFF
+		-Dclad=OFF
+		-Dcling=ON # cling=OFF is broken
+		-Dcocoa=$(usex aqua)
+		-Dcuda=$(usex cuda)
+		-Dcxxmodules=OFF # requires clang, unstable
+		-Ddavix=$(usex davix)
+		-Ddcache=OFF
+		-Dfftw3=$(usex fftw)
+		-Dfitsio=$(usex fits)
+		-Dfortran=$(usex fortran)
+		-Dftgl=$(usex opengl)
+		-Dgdml=$(usex gdml)
+		-Dgenvector=ON # genvector=OFF ignored
+		-Dgeocad=OFF
+		-Dgfal=OFF
+		-Dgl2ps=$(usex opengl)
+		-Dgminimal=OFF
+		-Dgsl_shared=$(usex gsl)
+		-Dgviz=$(usex graphviz)
+		-Dhttp=$(usex http)
+		-Dimt=$(usex tbb)
+		-Djemalloc=$(usex jemalloc)
+		-Dmathmore=$(usex gsl)
+		-Dmemstat=$(usex memstat)
+		-Dminimal=OFF
+		-Dminuit2=$(usex minuit)
+		-Dminuit=$(usex minuit)
+		-Dmonalisa=OFF
+		-Dmysql=$(usex mysql)
+		-Dodbc=$(usex odbc)
+		-Dopengl=$(usex opengl)
+		-Doracle=$(usex oracle)
+		-Dpch=ON # pch=OFF is broken
+		-Dpgsql=$(usex postgres)
+		-Dpythia6=$(usex pythia6)
+		-Dpythia8=$(usex pythia8)
+		-Dpython=$(usex python)
+		-Dqt5web=$(usex qt5)
+		-Droofit=$(usex roofit)
+		-Droot7=$(usex root7)
+		-Drootbench=OFF
+		-Droottest=OFF
+		-Drpath=OFF
+		-Druntime_cxxmodules=OFF # does not work yet
+		-Dr=$(usex R)
+		-Dshadowpw=$(usex shadow)
+		-Dsqlite=$(usex sqlite)
+		-Dssl=$(usex ssl)
+		-Dtcmalloc=OFF
+		-Dtesting=$(usex test)
+		-Dthread=$(usex threads)
+		-Dtmva=$(usex tmva)
+		-Dtmva-cpu=$(usex tmva)
+		-Dtmva-gpu=$(usex cuda)
+		-Dunuran=$(usex unuran)
+		-Dvc=$(usex vc)
+		-Dvmc=$(usex vmc)
+		-Dvdt=OFF
+		-Dveccore=OFF
+		-Dxml=$(usex xml)
+		-Dxrootd=$(usex xrootd)
+		${EXTRA_ECONF}
+	)
+
+	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# needed for hsimple.root
+	addwrite /dev/random
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
+
+	cat > ${ROOTENV} <<- EOF || die
+	MANPATH="${ROOTSYS}/share/man"
+	PATH="${ROOTSYS}/bin"
+	ROOTPATH="${ROOTSYS}/bin"
+	LDPATH="${ROOTSYS}/lib"
+	EOF
+
+	if use python; then
+		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
+	fi
+
+	doenvd ${ROOTENV}
+
+	if use emacs; then
+		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+	fi
+
+	pushd "${D}/${ROOTSYS}" > /dev/null
+
+	rm -r emacs bin/*.{csh,sh,fish} || die
+
+	if ! use examples; then
+		rm -r tutorials || die
+	fi
+
+	# create versioned symlinks for binaries
+	cd bin;
+	for exe in *; do
+		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
+	done
+}
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index e841fafab73c..c1e5b490ea25 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -9,7 +9,7 @@ FORTRAN_NEEDED="fortran"
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
-	llvm prefix python-single-r1 toolchain-funcs
+	prefix python-single-r1 toolchain-funcs
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
@@ -57,7 +57,6 @@ CDEPEND="
 	media-fonts/dejavu
 	media-libs/freetype:2
 	media-libs/libpng:0=
-	sys-devel/llvm:5=
 	sys-libs/ncurses:=
 	sys-libs/zlib
 	X? (
@@ -118,8 +117,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	LLVM_MAX_SLOT=5 llvm_pkg_setup
-
 	use fortran && fortran-2_pkg_setup
 	use python && python-single-r1_pkg_setup
 
@@ -149,7 +146,6 @@ src_configure() {
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
-		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
 		-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"
@@ -161,7 +157,7 @@ src_configure() {
 		-Dgnuinstall=OFF
 		-Dshared=ON
 		-Dsoversion=ON
-		-Dbuiltin_llvm=OFF
+		-Dbuiltin_llvm=ON
 		-Dbuiltin_clang=ON
 		-Dbuiltin_afterimage=OFF
 		-Dbuiltin_cfitsio=OFF
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index b93962839776..269dd49a07c5 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest
index 4f8138e3d616..808ec46071e9 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,5 +1,7 @@
 DIST tensorboard-1.13.1.zip 3187614 BLAKE2B e1b8cb43f7941b843e4fa8c84746f4b341e7c7e246422182eec9e1d3e2a5c367fb818c8e3ddd20cb6b5f64515a986dc5e814728340f0592d346dc55ec6065648 SHA512 d1581b7f694909e94a09d4c3fb2d34ddc31a18a6a09323ef48221e88560a9ec3bbb050ff12a2cd78607a2545053cabc448eab7264036a54dddc4720becfc44b3
 DIST tensorboard-1.14.0.zip 3149160 BLAKE2B 85a3544c2274757cdfb99e3d82751082415d9283a68808de50c4b14662542bd278db3320560cb39aee6bb62d1434dedfa720cfc83b7d464d99256cfe46081f78 SHA512 b19856b1c252b22e472efb9b91ea5c4509d0c3a9d5f99071dea04325e2346b37967b0be151227d150cf013aee5ae6f6273cd311085f4c6b1ca8021d14c2cf562
+DIST tensorboard-1.15.0.zip 3765194 BLAKE2B 54a9987b65d4e2b127789f0e66eb5bdef8c024d19a82867632b44eefc4718bc6eb6c68fa61fdb2306af2c3adbacc3c75ec15f7aa331038b15cec27af2d846f85 SHA512 7b47d60929b4be91b4d56e36fc5a19b79511b8f3a1081fe308d3a107f978f2c5d23ad2d209104de983bc44f4506cdb0cb6e09b37e552dc042600ea16e14827dc
 EBUILD tensorboard-1.13.1.ebuild 1709 BLAKE2B 77ed22515d805d87ced976128fb1437a050317e9522e0fcffdadca46aa224a27f6eb7bb65132332405bca07b8ace3b77b3eb43f0245c4ce5e8c95a5884de156f SHA512 48c270dca6bedd6b37aff0519270d96f5b991645ec2a95ac963cc7ff13a1c62d393c81a79ddf503d4655ef5f236936b32dfcc64e54d826f202d96bb75883ecdd
 EBUILD tensorboard-1.14.0.ebuild 1755 BLAKE2B babc76e17559a0af994038d1fd1fece08955617b17059b2f6f69b6ae010f64993deaf267c69830bf2a22dce15f4c53f6caf39bb3da198ab700ac45862ec00377 SHA512 ab3673346dfb5b1e94f8322c99c840bc7b08f07778fb15e19b4dc7cd850d9561091751c9cbb5b7b5b37be97d570dd95ec6f2904984c09eca627016edb12fbba6
+EBUILD tensorboard-1.15.0.ebuild 1755 BLAKE2B babc76e17559a0af994038d1fd1fece08955617b17059b2f6f69b6ae010f64993deaf267c69830bf2a22dce15f4c53f6caf39bb3da198ab700ac45862ec00377 SHA512 ab3673346dfb5b1e94f8322c99c840bc7b08f07778fb15e19b4dc7cd850d9561091751c9cbb5b7b5b37be97d570dd95ec6f2904984c09eca627016edb12fbba6
 MISC metadata.xml 494 BLAKE2B 367959e934fdf8e447da9632a05ea0ada6116a7c39cf42096a3b24f0dcf0c0bfbd3263e6f3913611c27e76f629b77d1e5022fa124d7e79f03a224bd3627bb538 SHA512 b59bedcac4e07ddbb62e90df57670116ba51c3d8c6294679ba5d8f17d7adbf3644f3d203c1d1ef4fa06d7e50640148ee259a081afb807477784350b98c52da11
diff --git a/sci-visualization/tensorboard/tensorboard-1.15.0.ebuild b/sci-visualization/tensorboard/tensorboard-1.15.0.ebuild
new file mode 100644
index 000000000000..7c8540d2dd19
--- /dev/null
+++ b/sci-visualization/tensorboard/tensorboard-1.15.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit python-r1 python-utils-r1
+
+DESCRIPTION="TensorFlow's Visualization Toolkit"
+HOMEPAGE="https://www.tensorflow.org/"
+SRC_URI="https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/grpcio[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]"
+BDEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	eapply_user
+
+	rm -rf "${S}/${PN}/_vendor/bleach" || die
+	rm -rf "${S}/${PN}/_vendor/html5lib" || die
+	sed -i -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d' "${S}/${P}.dist-info/RECORD" || die "failed to unvendor"
+
+	find "${S}/${PN}" -name '*.py' -exec sed -i \
+		-e 's/^from tensorboard\._vendor import html5lib/import html5lib/' \
+		-e 's/^from tensorboard\._vendor import bleach/import bleach/' \
+		-e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \
+		-e 's/^from tensorboard\._vendor\.bleach/from bleach/' \
+		{} + || die "failed to unvendor"
+}
+
+src_install() {
+	do_install() {
+		python_domodule "${PN}"
+		python_domodule "${P}.dist-info"
+	}
+	python_foreach_impl do_install
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0021593c3fce..79a15ab7b6e4 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 411c89adf57a..8b172fe71626 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -6,4 +6,4 @@ DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3
 EBUILD attr-2.4.47-r2.ebuild 1723 BLAKE2B 4ba215c8b35326cb4a607fe63e23e14262ef345c1f28bc9ac3ed2b9db80450adc365be791ff7391bd607c7a3d9ea0e0d77a931aeceaf3b4c61a86277e5488789 SHA512 34c2badaa57b539b0009747354bc2ba23a8498e86e12b802fd6dfc6ac7bd5f424b544ae1783ce6361b2635880d7d11d1b7b09ee76ad65ad32675dba5137b588b
 EBUILD attr-2.4.48-r2.ebuild 2109 BLAKE2B d871796b5945f20511d9916debec767436e249c68d41605a7203c4fb954992aec8f320f0607e5657308da881ab9b4d54351301ec51fab443469b8cebbab23e01 SHA512 28363d164d4ea15ed83c3b53e45060fbb415667fed8957be3e67f31def9d075353c8c943bd59fbb08f0949432c0561f0cac26b9707f61e22d53cdd192c43e175
 EBUILD attr-2.4.48-r3.ebuild 2194 BLAKE2B 3e71d2333ce22d1c8e5d93daf29579fe77e677eba611301a68d4f6464330f55be574cb282f3b9517a71bb58a3be15d936c3260dae9d921fbbf92267271bff546 SHA512 4588c952bb83cba21e706e92402d9afd4cf2614f0bd2fad70496b3c650fdab0c4ebfe73613e059b6d2503d7daab97c9ddabefeb0214dded923cbadfaeb104775
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/metadata.xml b/sys-apps/attr/metadata.xml
index 56c124413057..b8a192ea806b 100644
--- a/sys-apps/attr/metadata.xml
+++ b/sys-apps/attr/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:attr_project:attr</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 10cd8f05e08e..d6ec8d220356 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,8 +1,8 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
 DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
-DIST debianutils_4.8.6.2.tar.xz 156704 BLAKE2B 9ab9625042e8167daa988fb161db0dad56327ce8acb29b774a771e988c2e49ed17fe7ef3ce594b9fab3ffdc0518864b83c9dead91603b92d6c297fe79529b8c4 SHA512 1110d0f42870848a8a29b7b52d304ed39ae7d08156da09268dada7464ae45abc1f35320a12f218f8ba9bb2f1d323737136c143ef17141feef1275056842789a2
 DIST debianutils_4.8.6.3.tar.xz 156672 BLAKE2B bb87e04ca80a04c8841f04c877acedb0b953d815193069bb601d17907101bb6faf11bea99251a13a7c3b9ea6fa5d27daba264ea6924e542d9b574c87b3ffbebe SHA512 c38d1d351de69f270924f05755501d90cb7245c8a3154f91ea8e38978052ffe2ec016d4400c55e2f7d31358cfe134a40c5843a33836900d7e69cce9ee8ace98e
+DIST debianutils_4.9.tar.xz 157104 BLAKE2B 885f37b17eba7d20b2d76a0fb1afc6ccc2d9d4926754b9ce15928f3675eba4a38fec2e9b718d61684122f3c0dc17eba0aa06677e41ac641870ffc87442353951 SHA512 4e8726cf5744dca144535883c473a04884714afd50e501a140197fee9a9a78bd9596fcc1763e71b2baf6367bc38a8111016ab5ed35f4d4e98ccc78be697ca963
 EBUILD debianutils-4.8.3.ebuild 935 BLAKE2B 19d3779d81f7e10dd3a034ff3e1f4a4c1b15210c923796afa0535a062d7006418e4ef69d5a46577a916605979c15124607bfc68569b7e1bfe137612c3b20098b SHA512 24cbab98f62055e1298a3dfa1f6de6e9f766e593713f496fae07b2351bac6f70aed1643c1c0bcf07747d034d35538c4ca324bd41efef2bc97dcafc6f795dd4ba
-EBUILD debianutils-4.8.6.2.ebuild 932 BLAKE2B c6e10818583aa4d62e14a21f7b0092cb0354b15a71cde9bd323bf13c3df87e9234c176ec33e4592edbb261cad08d4e1b08051a16cacd2d761ca12168f32c558d SHA512 19ae964bd4539dfecc182174312c9a10b47596386adf9632dd67aa3e16fab1a5704443496f75b2de91c99b6cae07a3054527b0246f8bfe8f4bb0c998fa3aaadb
 EBUILD debianutils-4.8.6.3.ebuild 932 BLAKE2B c6e10818583aa4d62e14a21f7b0092cb0354b15a71cde9bd323bf13c3df87e9234c176ec33e4592edbb261cad08d4e1b08051a16cacd2d761ca12168f32c558d SHA512 19ae964bd4539dfecc182174312c9a10b47596386adf9632dd67aa3e16fab1a5704443496f75b2de91c99b6cae07a3054527b0246f8bfe8f4bb0c998fa3aaadb
+EBUILD debianutils-4.9.ebuild 932 BLAKE2B c6e10818583aa4d62e14a21f7b0092cb0354b15a71cde9bd323bf13c3df87e9234c176ec33e4592edbb261cad08d4e1b08051a16cacd2d761ca12168f32c558d SHA512 19ae964bd4539dfecc182174312c9a10b47596386adf9632dd67aa3e16fab1a5704443496f75b2de91c99b6cae07a3054527b0246f8bfe8f4bb0c998fa3aaadb
 MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
diff --git a/sys-apps/debianutils/debianutils-4.8.6.2.ebuild b/sys-apps/debianutils/debianutils-4.9.ebuild
index 2b96aa353477..2b96aa353477 100644
--- a/sys-apps/debianutils/debianutils-4.8.6.2.ebuild
+++ b/sys-apps/debianutils/debianutils-4.9.ebuild
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 813576cba177..6a6fcaed590a 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -17,4 +17,4 @@ EBUILD dtc-1.4.4.ebuild 1121 BLAKE2B 0e6226dce63ed1b6bc6dd96deb179f8451564f99e6a
 EBUILD dtc-1.4.6.ebuild 1217 BLAKE2B e82baa485e5139389f870dd2ecb83c6883af617585c2aa38bf6f1f26fd62c9f1c3c45888f1d305b53a3ba69a5e6c1511284289132499ea5a7b698286d156bcf2 SHA512 06acd8e5b7e8d26acfcc174d158f19a17fcf7f8fe5e5e597b309064773c9424d4032fdcca78eab02ccb3e8894d489ddd0ec8db88081f3645026b5488e7dc43ba
 EBUILD dtc-1.5.0.ebuild 1235 BLAKE2B 3215b7aafb7834810c43bd0b00ab3ea325969bad2ae84a3898a11c7eb5509d8a8410afddc1005b67a705cc04077ba9f322363af89c73b021fd615c140a9b81a1 SHA512 cb46e8b8b461fd32eeec1335188e79958a5e2fd844b1c3163bd51b1f9b932207eeacf805b8edce4b5045488c823d99e9f6aeda635cb5f0fd91644ddfe4ec4a86
 EBUILD dtc-9999.ebuild 1181 BLAKE2B 4ea4eb40173c5e481fe2d7e935df40e53cce6b79440bd0a12416e6e775e5d367401bc7e040230f43228d8e06a6c20dead191eb30da98454a751877304c011be7 SHA512 de6b2dbd04270c132fce691dec8a1dd7b25c75717c89075091a85d98c3c15f9b154568f4b7beb0d35cd60bd8e775c45a606c7aaf31570d899d64efc85bdfe83e
-MISC metadata.xml 335 BLAKE2B 123cf55da545acd9b0b568ca010eba5f7818f43bf020f412a479397f08cfb571f7cd83f4b8c63c97d3ab3216278b62e6eff03a8c349f3b6758b1a41d559787b4 SHA512 757b9539f0dd59ff4c25127df262c6f030c3e4ddf4a4044a77bb7e2ee126001adff606a683b3af24f11d23604919366fa42cb496941ed232a5169ed2eac7c631
+MISC metadata.xml 416 BLAKE2B 550a9af835cd395d8cc77230f5ee6e7dcd0ff70c3290af7771bb04e5c5c6a9b5508c634555a4444e6bdac9ad007ff2bed10a05dfee57db432eb1fcf15ef57022 SHA512 7d9e26636a6fb8c5bd06cc06c837b42643313be040b2a36ff09056d81a0e75608a4593f37bb7fb2471d5e4eec5db3bd12cb8f3ddce49a8036122c2c1d8fe5187
diff --git a/sys-apps/dtc/metadata.xml b/sys-apps/dtc/metadata.xml
index bc8ad1abc489..9d02ff2575d4 100644
--- a/sys-apps/dtc/metadata.xml
+++ b/sys-apps/dtc/metadata.xml
@@ -8,4 +8,7 @@
 	<email>ppc@gentoo.org</email>
 	<name>Gentoo Linux PowerPC Development</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:dtc_project:dtc</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 80ef9a726146..f78f09bb3579 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -2,10 +2,7 @@ AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff
 AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
 AUX etckeeper-1.18.6-gentoo.patch 2588 BLAKE2B 38f0b3cf6ecc2b47b59d6eee3d081f47e79cd0ebd4b3d0099a893257275fa8f7803da6b3aea7a90232632aa4106a2a8b9477bb9a78e200635958de7c8b3db93b SHA512 eb2d8f7eca7d5731518aec24c931aebe8a70f22a049d88f002d7649809762d82619b4c0bbc47a6207f2e018fc35bc497c30308adbfa7b62b4191f105cf5aeb40
 DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
-DIST etckeeper-1.18.7.tar.gz 77568 BLAKE2B 168b5b683c25a60c6626a678aed2f650106d4db554acbc239a2cd3c937f4b399ccca4f28fded30175c5787d8bd0907a25d62e6566e7902a2e914cd01513a8c2e SHA512 44b8f66b95663da1370943128bb5673e57bd7b9df7e727c93baea5dfc79852ebba9d0834827fed19722668849d3ed18b045db5cb42135e198576a2b839523d1a
 DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c
-EBUILD etckeeper-1.18.6-r1.ebuild 1775 BLAKE2B 6b957febafaa09290c02a9946f9745ce28fbbd4652df0297ba10e3f10b6fc838ea819e672a72eb0870dce44293c184a294e5d0c6d4624b3ced129a5a9a7156b6 SHA512 e4fa61e5c49e2149adbc511466d995c03afc350df8ba5d767c493733e8a2ab4c24161a549e3628b33d2d808b1937678c6968e541362fac3ea3e23a4c9d0fc5b8
 EBUILD etckeeper-1.18.6.ebuild 1718 BLAKE2B 79005365182bb210feefd82d5b5230097433922fed15cc5efdb3fb81109d2f3493aaf0283e4eaf0a0cce4fc3cd059cdd411a7f649fd699cd2dba7b72fb598954 SHA512 91f3da5f0d1022e47038d45820b6e3daba1739fc9dd650a576023b8da487270b2f4babbaac30be91e99cbddd8b68595e2c8998fdaded81bf520154b6d0c91795
-EBUILD etckeeper-1.18.7.ebuild 1866 BLAKE2B f04bba588be503ba8d6acd96aeee63a39c60fe9463477cee3f1d45fc6a70fb43c067996d22172521f1ec25118ec1fdbf8b53d06443c45b4e450fdfab000d63f7 SHA512 e2e44061b211a5278e0bcabcc42a88ba5c46f09fa02d40d10b84369430e4d27977237c900b26f615e297bc70f7c58061d7dd03d05a3b6fadfa2ff6d90d5ec045
 EBUILD etckeeper-1.18.8.ebuild 1863 BLAKE2B 5d24b9337feaaba19b3b96d1999e7c6c8e763227d77db048a45add4ef750965386adb7667023eaf7427b250f7f80cb1551126abdf7be0a1a6ce47cfaa9f21828 SHA512 ca5bb103396b54d5d38124e267c22dbc0da2444b7ab85b6168be9289ce3ad08703c8bf15da3ab332c921c50a8d9262d4544973066eea8ab19999b74e72daa51b
 MISC metadata.xml 778 BLAKE2B d3291ffd8dacecb55cbb2798c9bf98b8eb361bd0c82e2c440868757604edb98145ed04c3446ca92e9b18564a1a53f7b0fbbb94cf51adcf19ebcb9162086690f1 SHA512 49f78f732de99b82fad3f3ec6915d15f2050d9f6f1382a74221aa5608efc76b8e5e908d0f51a276afb8b28bec9d8291454695b3cd70314ad8836f444a03b2735
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
deleted file mode 100644
index 60ffce7651d5..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 prefix python-r1
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-SLOT="0"
-IUSE="bazaar cron"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
-	dev-vcs/mercurial
-	dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	app-portage/portage-utils
-	cron? ( virtual/cron )
-	bazaar? ( ${PYTHON_DEPS} )
-	!bazaar? ( || ( ${VCS_DEPEND} ) )"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	:
-}
-
-src_install(){
-	emake DESTDIR="${ED}" install
-
-	bzr_install() {
-		"${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" ||
-			die "bzr support installation failed!"
-	}
-	use bazaar && python_foreach_impl bzr_install
-
-	if use prefix; then
-		doenvd "${FILESDIR}"/99${PN}
-		eprefixify "${ED%/}"/etc/env.d/99${PN}
-	fi
-
-	newbashcomp bash_completion ${PN}
-	dodoc doc/README.mdwn
-	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
-
-	if use cron ; then
-		exeinto /etc/cron.daily
-		newexe debian/cron.daily etckeeper
-	fi
-}
-
-pkg_postinst(){
-	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
-	elog "	dev-vcs/bzr"
-	elog "This ebuild just ensures at least one is installed!"
-	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${PF}/examples"
-	elog
-	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/etckeeper/etckeeper-1.18.7.ebuild b/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
deleted file mode 100644
index 32667889cf27..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 prefix python-r1
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-SLOT="0"
-IUSE="bazaar cron test"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
-	dev-vcs/mercurial
-	dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	app-portage/portage-utils
-	cron? ( virtual/cron )
-	bazaar? ( ${PYTHON_DEPS} )
-	!bazaar? ( || ( ${VCS_DEPEND} ) )"
-DEPEND="${DEPEND}
-	test? ( dev-util/bats )"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.18.6-gentoo.patch )
-
-src_prepare() {
-	default
-	hprefixify *.d/* etckeeper
-}
-
-src_compile() {
-	:
-}
-
-src_install(){
-	emake DESTDIR="${ED}" install
-
-	bzr_install() {
-		"${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" ||
-			die "bzr support installation failed!"
-	}
-	use bazaar && python_foreach_impl bzr_install
-
-	doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
-
-	newbashcomp bash_completion ${PN}
-	dodoc doc/README.mdwn
-	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
-
-	if use cron ; then
-		exeinto /etc/cron.daily
-		newexe debian/cron.daily etckeeper
-	fi
-}
-
-pkg_postinst(){
-	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
-	elog "	dev-vcs/bzr"
-	elog "This ebuild just ensures at least one is installed!"
-	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${PF}/examples"
-	elog
-	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 4cdd5beeb719..c6900cbdcb0f 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -4,4 +4,4 @@ DIST ethtool-5.2.tar.xz 237700 BLAKE2B df7cfd9deaa8000352138e9747fe3811fddab2f58
 EBUILD ethtool-4.19.ebuild 448 BLAKE2B 4c01a965b0f8316cc6b6d81072fe252e630e059ecf231682c3093b79419e3db61da9949f47a6999e3e2ec823c626ba2874f60cc33ee1386c6cf8c3000d5fba9c SHA512 e510b9ddcd60ddcae090a406c008ac75ee613c6ebfa142ef511d9910997fafd6e705fe5b25d4842c3e3dcd724f43a5465bd62be2cfc20fdb62e30d5e9314a8b4
 EBUILD ethtool-5.1.ebuild 458 BLAKE2B b3992a08d298c7d944f1803a3bdd326c070dfbcd64585d18e0214b0490060fe9a3827c237c922c9496579a1529644d8b9ce0170e474acdd4cca791a3ae4363e7 SHA512 fe34a2982e1103e13b1d72d3d9ac454d343ecd7c759b265aec0fc3c4b400eaf1fc7fa4fa428eec7a6a4fd7195fb3951971e63d7ad79beed3a0f90af448099fe7
 EBUILD ethtool-5.2.ebuild 458 BLAKE2B b3992a08d298c7d944f1803a3bdd326c070dfbcd64585d18e0214b0490060fe9a3827c237c922c9496579a1529644d8b9ce0170e474acdd4cca791a3ae4363e7 SHA512 fe34a2982e1103e13b1d72d3d9ac454d343ecd7c759b265aec0fc3c4b400eaf1fc7fa4fa428eec7a6a4fd7195fb3951971e63d7ad79beed3a0f90af448099fe7
-MISC metadata.xml 814 BLAKE2B cb6f1a2aa029191f22615d83df4f166c7c53c70ac6486deadab63ea5a463b08ae9aa8392f0a2732b83efc2a476c2416cd94b2e47ed9b09097217da5746d110d2 SHA512 7ba75f7aa20f8cc48b91b7576449e416abfc412fe26670142d4ec1513b6a3939858b298ccdbf72c208c2d70b5c00eea88dc3c4201e2187b188ed4a9d33cf0272
+MISC metadata.xml 894 BLAKE2B f0d189f1c840c3f91e13aef4e6dff25c6ef17ab1b0f7f81f6c3ca4cf3d2fe650567689439050767f872cfdd10fbfce404a580dec5aec38676385851c5c613d6f SHA512 36ede687351bab379829a3872343eb73bb50a438465c0c951fbd172efcb8cc20e349b5b0ec8859f96effa7194b7c043424e4de56af1951a225fb393aefecd715
diff --git a/sys-apps/ethtool/metadata.xml b/sys-apps/ethtool/metadata.xml
index 0061d51971d3..760ac849b6bc 100644
--- a/sys-apps/ethtool/metadata.xml
+++ b/sys-apps/ethtool/metadata.xml
@@ -16,4 +16,7 @@
 		* Control receive queue selection for multiqueue devices
 		* Upgrade firmware in flash memory
 </longdescription>
+<upstream>
+	<remote-id type="cpe">cpe:/a:kernel:ethtool</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index eb6bc980a8b3..537980f6b758 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,5 +1,3 @@
-DIST fwts_15.12.00.orig.tar.gz 3391289 BLAKE2B b91a00c1fc6ab04b34a4ade0d86fbc879a649b0f74d7a1285c746402aaedba55027c493ca8b29494d8f59b6583a470cba761e184bae4984c634e8a0f890b1098 SHA512 44fab3e665279562b865261e5998e820ba960688e13bac717c5bbdb59faa1e97fd1d85f7ba95b5c7a4623e48a657f13e1ad8c1355f37173534739f26e155f8be
 DIST fwts_17.02.00.orig.tar.gz 3489625 BLAKE2B 04133b8fe251923b5cf4e146bd52d3d102c3080629a85c0205fd6aeb19b315f10657da28dc7de37ae4601599dc7033354268b88bb0768b56550fe1606bd000bf SHA512 1dcbd7f120b5c09127f1242d41d7cf5ec15e6b049fb0b0590fec221849c0195a18ee4b07b66c1de29cbb241ef39f6e11c26dcd2bc7c0a4c23bf2efaec5372b70
-EBUILD fwts-15.12.00.ebuild 1119 BLAKE2B f4c0e47632b8419aba6aa620d3a7575839ba0bcb0eb54b455134630265bf42c328f8173d0dd51c3318cf3cb905b069b91d202ef9b3d249b6cc78ebc97442ff04 SHA512 f1d554486a566ae9342d2b4c68728f04d0d3aa4e6452ea362a7badaf3802b2dcd6d3a4c0f0c5e10b46bd292f1e96979193115d7673393fd63218a849f5fee203
 EBUILD fwts-17.02.00.ebuild 1128 BLAKE2B 9fd64caf9b310f9db9c9588e6bc652fcef6cb039cd05e10b0baf990a6d457d439967259f43ea660d53785a95eaa7119e52b490bb6c8336ca1bff513b47c9c001 SHA512 595c4a4d3434dc472ef019b71c33204cbb505ab1498ecc2812ef34aeefadaad0760acc0745d797769b86c31dc57e8804fa067e179f514a6cd711a902d91f3ee9
 MISC metadata.xml 241 BLAKE2B f00f58ea265e1a7321a74a2e8a86824f7a1930a6e99162af446a1c1f831139711d626045b21215856a29e6ba4575bc38c7ab965ffb547757dbf4305235245039 SHA512 9a4d0499ef0c9cb67816755a3313bbba0b42f01b35d5d7da31dfe3e14a94fead3b8c202b95ffd4a9c5edbda7b046045b19095924b57a08cd97aacbda5bbd4550
diff --git a/sys-apps/fwts/fwts-15.12.00.ebuild b/sys-apps/fwts/fwts-15.12.00.ebuild
deleted file mode 100644
index 17321530bb08..000000000000
--- a/sys-apps/fwts/fwts-15.12.00.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-DESCRIPTION="Firmware Test Suite"
-HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-libs/json-c-0.10-r1
-	dev-libs/glib:2
-	dev-libs/libpcre
-	sys-apps/pciutils
-	sys-power/iasl
-	sys-power/pmtools
-	sys-apps/dmidecode"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S=${WORKDIR}
-
-src_prepare(){
-	sed -i -e 's/-Wall -Werror/-Wall/' configure.ac {,src/,src/lib/src/}Makefile.am || die
-	sed -i -e 's:/usr/bin/lspci:'$(type -p lspci)':' src/lib/include/fwts_binpaths.h || die
-
-	# Fix json-c includes
-	sed -e 's/^#include <json\//#include <json-c\//g' -i \
-		configure.ac || die
-	sed -e 's/^#include <json.h>/#include <json-c\/json.h>/' \
-		-i src/lib/include/fwts_json.h \
-		src/utilities/kernelscan.c || die
-	sed -e 's/-ljson/-ljson-c/'\
-		-i src/Makefile.am\
-		src/lib/src/Makefile.am\
-		src/utilities/Makefile.am || die
-
-	eautoreconf
-}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index a82d2b3177e4..27565ec910ba 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -2,7 +2,7 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2a
 DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e692b45f1afe91871621dbed008298154d94813711b8ab89a9ad2e9fffa5ba1e738a613e5e50681b0abea4bfcc92677 SHA512 071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff
 DIST help2man-1.47.11.tar.xz 202312 BLAKE2B 6baba7fb28f2b28aba8a05eb5df0a8596918767cf43d730052e0bae9293a4a27f207136c22cad246ca7220fb639fabce3bb135edf4e84f866f1ea9b0af26f41d SHA512 786a6bd4336c591cfeb0b4f2dc1429f6545e36514e7b238453c91368b8f531c46db2be025f02dc52e6dd8b971d6edbb4ff1a8e1b519f9253a3957ad7157790be
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
-EBUILD help2man-1.47.10.ebuild 1048 BLAKE2B 5f081dd97a1766ac00b01e2b1387b1073b4e2db8d2c4bc8cc22a9e3dc1ace972df34c1565ec92b35120beca22be2a429cb20efdb0e1746bfeee9ee47bc67d187 SHA512 a6f1b0ecf2a132bbe734b13d6ed1baf02efc1dd7e727e36c5cd74b8e179aa746958f854e4821d57943a0d80d39da5e6a725468eb7eaad0341ca913bbfda76a03
+EBUILD help2man-1.47.10.ebuild 1045 BLAKE2B 90b70011d00c687128d269ce5444b895354ee40baf9bfb44febaef503c66b6c4491076fb6167e3b33e73d55c6d34898e4bab45c24e44294880957ac1aa885ce2 SHA512 02d51c1b77a3cb4dfa8b01b2e540d557b2ce5c5303c042e73399300586e652665bdc7a960d9431ead6093ab9ebc3b68fbcf890bccf51dcc6070011701f4080be
 EBUILD help2man-1.47.11.ebuild 1100 BLAKE2B 70424da45e9d06d459ecfbe426c59b7d6bf8b3ce6f0bed3713ba1c7cff909610e9386684f1025b285bc34a203f54d81cb81bd1fadbc0c2a4be3cf114143d20a8 SHA512 aef361c7aa593641e5cdc420d8de89d00148f2b5d723ae6f7d562b101c1d9f46b4b23ffbe1dfbd16d5ab0f8b59ddea46df21a587c1456e4275fec8005e6ca6ac
 EBUILD help2man-1.47.6.ebuild 1045 BLAKE2B 90b70011d00c687128d269ce5444b895354ee40baf9bfb44febaef503c66b6c4491076fb6167e3b33e73d55c6d34898e4bab45c24e44294880957ac1aa885ce2 SHA512 02d51c1b77a3cb4dfa8b01b2e540d557b2ce5c5303c042e73399300586e652665bdc7a960d9431ead6093ab9ebc3b68fbcf890bccf51dcc6070011701f4080be
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.10.ebuild b/sys-apps/help2man/help2man-1.47.10.ebuild
index 7621fc2ef6fd..38896f6a0d4d 100644
--- a/sys-apps/help2man/help2man-1.47.10.ebuild
+++ b/sys-apps/help2man/help2man-1.47.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 6aa3e37e76cf..63183d17bb03 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,5 +1,5 @@
 DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e
 DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
-EBUILD i2c-tools-4.0.ebuild 1458 BLAKE2B 607926942381f1e86c38fa3c09cf4ca19a53c1a127790f290dd813a1d44b280c9ede663f03ab6d41daab25734fba8944724853924ced743c3327be068e3343b1 SHA512 54c1e5a50cc0cc04c260d2df23de514e1e2066df0d38ca0644098c4e9476745964721622a54c9c198617205bac333f2d9f2048fe81209798af67fc7e14032a70
-EBUILD i2c-tools-4.1-r1.ebuild 1984 BLAKE2B ecc259b77eb25618d51c9c8dd55a5e77590a1e349fd614a751e6f5d2359c577ba36388923742ac7c43f89208c58524f85bdf75952e198a957df30194f11a487a SHA512 b82f6116e7f14de8887cebf8befafdaf2ad776776b3b6695361c0dc02bc3ffebc54d7cf139c1017e5be3c7ab741da26919c0ee8d85616673dd725a2784a636ee
+EBUILD i2c-tools-4.0.ebuild 1458 BLAKE2B ca1012e7a8c01d614a1cd1d9d4842085e78611c4325dbfe46baedd8f80594e458d4628b97e26082df8eae3d8dda64e02ec3a463c070328212cf7655d2cf9003d SHA512 c8614ef33fca72d3f69eb687a15d62dcd9a23440ea976a73766a499abd7db9e316db11e508356a12a40eff40021aeca88a773ff70512cabcd87fa29823d538f9
+EBUILD i2c-tools-4.1-r1.ebuild 1984 BLAKE2B 996ddb5df273a1e1836bad0c4df5176b203ee11f6aa40d135542708d21bf13ac78e0e5b356e24c6451e37d397a6b9b3fabd102366bfdf8b8b454c0acff4b6e55 SHA512 cc57b871e0f9bed5aa2cc13187d043a982b240c0d59c319e1b499899c5e48d063331d11eb4e371ef01e36c4ba4bc16d7c4b39c0bab812770ef05a2285a5ae9ca
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
index a8b6cc72dece..209116293998 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="!<sys-apps/lm_sensors-3
+RDEPEND="!<sys-apps/lm-sensors-3
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
 
diff --git a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
index a90902efeea2..a2f0af908f46 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="perl python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="!<sys-apps/lm_sensors-3
+RDEPEND="!<sys-apps/lm-sensors-3
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
 RDEPEND+="
diff --git a/sys-apps/intel-performance-counter-monitor/Manifest b/sys-apps/intel-performance-counter-monitor/Manifest
index 2539a6653b59..ebb9a122d1c4 100644
--- a/sys-apps/intel-performance-counter-monitor/Manifest
+++ b/sys-apps/intel-performance-counter-monitor/Manifest
@@ -1,5 +1,3 @@
 DIST IntelPerformanceCounterMonitor-PCM-V2.10.zip 950922 BLAKE2B 3b3b0cf3e12e1f57241e25b13848253157624ac49c1aaec74a0ec8fd2cf92dffa56e5c25299189bd886cb069897dd5a7117a71b5189487be89ee704a377bbc03 SHA512 a9a219495d9e99f8a8ffdae729c56e565c63856b81d71d7d188db2543d8d656535bb88f5701351a41aee948aeeeae304951cdf99dac7e6628bd43ba79bda757a
-DIST IntelPerformanceCounterMonitorV2.8.zip 931374 BLAKE2B f5a2ab3a3e8982adc47031ab3dbe9fd425cfb60de95687833bb019752a2a4bbfc4acd52a025cd61e37b14e3535489a9d4eb3b2cb6e1aa6fdbf58ff1100d42ce2 SHA512 7dbba8c051663a315dcf79224502d76cb4217a483a4b322f0be938e06b988e290a83b345cb8c60645aceb8283555067c2db529179782432ff77fddd538ef8b8f
 EBUILD intel-performance-counter-monitor-2.10.ebuild 1272 BLAKE2B 521cb60f84ed33c45db378a37269f8758673df9291eafc5ce09eb39a44ed938052f6070aaeb480f9f2fea79b582aeaf99377fc0dbfd31dcb67309b41acedeca7 SHA512 32228ee77fa382bdcd77bf5bfeaa68f098f056c4559d3ca76cfddbef86362c3a7a7ffbcaecca1b6077fa95e7f4d08b6363b96136be7aa1f9373873047e337782
-EBUILD intel-performance-counter-monitor-2.8.ebuild 1284 BLAKE2B 10db6775d9c07ca590a3126ca3769eeb0136341fccaed022d2aa39ea1dd538cdc942ed5770e6f46df9091d45e6dc6770bbdfe5196b7015a4f3c589eb196f6849 SHA512 5e08f4e52217543c767cbc7220824d681a546213242b315dc9eea7e7a953ce1721f2f27ef75f39c87bbbc0922a105c8c9a2b3cd0d480864654a78c260f01ddfb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.8.ebuild b/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.8.ebuild
deleted file mode 100644
index ac520619c160..000000000000
--- a/sys-apps/intel-performance-counter-monitor/intel-performance-counter-monitor-2.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator fcaps
-
-MY_PN="IntelPerformanceCounterMonitor"
-MY_PV="V2.8"
-MY_P="${MY_PN}${MY_PV}.zip"
-
-DESCRIPTION="Intel Performance Counter Monitor - A better way to measure CPU utilization"
-HOMEPAGE="https://software.intel.com/en-us/articles/intel-performance-counter-monitor-a-better-way-to-measure-cpu-utilization"
-SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=sys-devel/gcc-4:*"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-CONFIG_CHECK="~X86_MSR ~PERF_EVENTS"
-ERROR_X86_MSR="Intel Performance Counter Monitor, requires X86_MSR to be set in kernel config."
-
-S="${WORKDIR}/IntelPerformanceCounterMonitor${MY_PV}"
-
-src_prepare() {
-	sed -i 's/^#CXXFLAGS += -DPCM_USE_PERF/CXXFLAGS += -DPCM_USE_PERF/'  Makefile || die
-}
-
-src_install() {
-	exeinto /usr/bin
-		newexe pcm.x pcm
-		newexe pcm-memory.x pcm-memory
-		newexe pcm-msr.x pcm-msr
-		newexe pcm-numa.x pcm-numa
-		newexe pcm-pcie.x pcm-pcie
-		newexe pcm-power.x pcm-power
-		newexe pcm-sensor.x pcm-sensor
-		newexe pcm-tsx.x pcm-tsx
-}
-
-pkg_postinst() {
-	fcaps CAP_SYS_RAWIO usr/bin/pcm
-	fcaps CAP_SYS_RAWIO usr/bin/pcm-{memory,msr,numa,pcie,power,tsx}
-}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 6915e4966333..fe59e37485de 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -11,4 +11,4 @@ EBUILD iproute2-4.19.0-r1.ebuild 4375 BLAKE2B 478751ceebaef4c53e975120662b7e5e35
 EBUILD iproute2-5.1.0.ebuild 4425 BLAKE2B cd695ac496f8b0bb3e017b5b8d2f074902366fa3185db992070984a83300d72851cce584ad8446530d0f303358afe104ad41d640b1188a753aa25349ce267ecb SHA512 21fcf629dd959d8fea205fcb4fd0fcb1ffa1bfe249ddfc68247350a7c9ee5ec7cf9d6d1b36c0282ce0a5791c0f55ee594b465dfa944e05f7725bc00f5f480f7c
 EBUILD iproute2-5.2.0-r1.ebuild 4425 BLAKE2B cd695ac496f8b0bb3e017b5b8d2f074902366fa3185db992070984a83300d72851cce584ad8446530d0f303358afe104ad41d640b1188a753aa25349ce267ecb SHA512 21fcf629dd959d8fea205fcb4fd0fcb1ffa1bfe249ddfc68247350a7c9ee5ec7cf9d6d1b36c0282ce0a5791c0f55ee594b465dfa944e05f7725bc00f5f480f7c
 EBUILD iproute2-9999.ebuild 4380 BLAKE2B 37d298a23f7a6906fcfb6738f37b01af7adf62e51d78200dea1dc21c4fa5ba6d90774b53824c78e3ac8f465df5a4f7aa78cbc1fa501bd87c42da54eafe0bc285 SHA512 642d47e5287d3c5253ae2908ddb47041e398a7460896458f22ca5ad5371511696a05d8dd7f96b0d04bb99336c2cdf72b04ee7a3520ef133678a3fc8fe0b788f3
-MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97
+MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index ad652efcf7e4..66ef219fafa3 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/metadata.xml
@@ -11,4 +11,7 @@
 	<flag name="iptables">include support for iptables filtering</flag>
 	<flag name="minimal">only install ip and tc programs, without eBPF support</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:iproute2_project:iproute2</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 3be371767dcf..c04104c3a6e6 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -16,6 +16,6 @@ DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd
 DIST keyutils-1.6.tar.bz2 93973 BLAKE2B 250275852d13fb5f77786350e64175c9c0909d1a7e44750e44b09f79217acb9c40536bd61e15d1abdfe36b9e161832f4c59f11b73915d457356a273ad4999990 SHA512 ee50da165099ea26904066d24b27c5165cb1eb78df6768cba3a534aa318a5c8d926ec6e5322a38c8cedaa768cd79bdcb26ef918aa8447df2e5dfbbe7b8f200ff
 EBUILD keyutils-1.5.11-r1.ebuild 3820 BLAKE2B d929dd8276d16e2f2cd38f6e815bf5fa63c43e20699ab69523d291ff88e2bac54386d7db45626564b50205f3e3943185a1066f9af1fc781bcef437f739cae244 SHA512 390277040f96c6ccd9b7d8a329e66c09fda691762e8c479e4f6c18cba6a02c718e139c9ea074ec678f4c7bc0e8b3f5d66e4a5eb758c93e02ecbb468e8cc3f6d4
 EBUILD keyutils-1.5.9-r4.ebuild 2986 BLAKE2B 75f613871ba022cc24deebd12dea2cb0dee06db56477c96693c59b65fa4f63c33c212af624ac73bc4ad1c34aadc12783867821300cde0b2d49426e31401ac42f SHA512 bf13e04b7e089a1cedbd3a9f12a941066043352ad66128d6ba7a02149ff0e54b2030e81c93556f805fd2d5b286df121e20ecff7d06bd02d1a5852321b83558aa
-EBUILD keyutils-1.6.1.ebuild 3864 BLAKE2B 27e707f83a05bbb72cd6f27622ef72060edb69505026ed322e8c15d7ae58c134dc7470d16556c7f6218fd4974e191615291974fb0de7eab0b58d4f6adaed62a7 SHA512 4ff1350d32b0b4449aac6f49b2f582da39ea8866504f0cafb6c9611b33f2d47b02966cb21e0c8b96a924cce99e550a90f71d495505822ea63ebe6426306fd907
+EBUILD keyutils-1.6.1.ebuild 3859 BLAKE2B 004924233fcbb1fada034fbfe7a475189c32002677dd3f39f8169a27ee43573e35eab0ca8368af570ad387fa708e7dbe3f031e1254d23642e2a81f80fa9840aa SHA512 03f8a97f9a9b6ab10019cd6c4223f59f1d0c0dc3e72b8f848617a2e56b7c41cd9e35f933e5f041dbd8d90a9e62f9cb1d0c99e79b5c491bbee49202966110c585
 EBUILD keyutils-1.6.ebuild 3805 BLAKE2B 9bfc8ac3ae965220f36b021b4dc2373e911387097aaa7f828334fa661964577a23bb6cf97818f7225f38de279d16b7d1fad8e96131482288e885e094e14d5402 SHA512 c35a43569ff5bfced26b1be0813d4f6420c12268af2be95294b5dbf53a0ca87887668f4aa8dc733d81ddc40f012cd179806c84697e82581f3f594ac4fd6b4018
 MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 9bb0b02d6775..452097f30717 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 
 RDEPEND=""
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
new file mode 100644
index 000000000000..4c8e1205bc19
--- /dev/null
+++ b/sys-apps/lm-sensors/Manifest
@@ -0,0 +1,15 @@
+AUX fancontrol.confd 669 BLAKE2B cc297a5122d54f6104d840548480c6648fb31388a9c78a5e3a96ec91841c67d527a38e452ddaba5801c975fb23d9fab79aea46abbba0781ef2a8d8e9c6f1fed0 SHA512 06ec0b44e753bfa6a5ca461345e5857ac4d824cb3d9dd4955bbe884ff91d0184050476fe6da0ea8b0882243a51466af2d82540474581bd471f13c5977a0ec41a
+AUX fancontrol.initd 603 BLAKE2B d5409d4141996adb8e5e9520075d42f79fcdcc017850c0d3d21cbf5736ea1d7da07921b035cbbb5a2c4a8490ddad3a108073fe154f170507249f3fc8f5e5b920 SHA512 3dad0939d679bfb2732bdbd8ff851298ed86e5fd83719eb5181f8cc3e7d84f7986a79a3438a8c3b6a6e3c8be1a3a9839769292d77e352c0167d4b16dd1f0d086
+AUX fancontrol.service-r1 146 BLAKE2B 666a45c2e55dcf31470167ba9bb78e6205b3fcb47f66ae7b185d6651dba33f8a7699f800ecddaed070a8827d24893cc1971203b691f37515ea74125e889e8965 SHA512 eb1e22045a4adbcba398b77061d33b145614edf960c31aeb3c9a987553d6a0d8de332d4887e52ca2c6d6147d6e1a2b5e8bae41dca5f1c9d4fc2dc522c18459f8
+AUX lm-sensors-3.4.0-sensors-detect-gentoo.patch 12441 BLAKE2B f35efdf0f27b8aa64d5d0f8f088921225b9f991eb999d40f452afba4161ea7a38521346356f00c3136e6fb0d27d6508dd46fef385fb9e317157eb33bce8bdb8d SHA512 740c2fefa3c914fbb977e86b5b57cdbbcd06fc2d348ee42b5c678f164f15fb7a171979e5da5a1779c932ba39a535e37d0f7b7506c43966463115e0042dc9dc81
+AUX lm-sensors-3.5.0-sensors-detect-gentoo.patch 12593 BLAKE2B 21383c2d0a7dc2063f81ca7af15ee02dc94a3344f23da80433ab19fc7a5528cc516408ecadc46d0fd1f55799a305c0e509211476314ca0cdf05e3b8942059050 SHA512 0f1556cef3d1c19f4dd822afdf609390f82dbfda7e66070ca5b89b145c29669e05141f150b3b0d58c277c79c57f98659284953788db6334c27e17e3f39e23cdd
+AUX lm_sensors.confd 102 BLAKE2B 5d0771a2cac4869caee2d6ae3ac2cc2f60e64720ad587d4a89fa6dca7506325554b06d92cce42fc51b9af9c8715834d6d481f342cd6be57061c5234dfabd26d3 SHA512 a31220f4bf337de7b17158e00c64e662527abe11c5cc9f8401216f757dcde1c220527ad73f375c0de051030119daeba4cef6c5155f077447a9391e273cd65f50
+AUX lm_sensors.initd 334 BLAKE2B 377cea5d1f0c2baf94a2a17dd870ae3ba545bb96453432808360d1ff0ffd92dfcb306364ffa579afdb6b02dda930c7288e5c1b32274893e8541777a62abe8c37 SHA512 5a3f3eb6ae2a97f0a3841a2544579733f6df4a89c3667e1920203a6b0d18f54eb0aa12b1fd0c0bbdc4f6a1535df8444ebeb9d6212cc8be8dc1cf25e204d009a0
+AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378eeef36654933f0ec2042683e1b13bc48349eebc4d2dde26d20ac7e7681c01ceeb0b3b4e27576d2b SHA512 83c71b9aaae273daff62da31ae45ffa682460e4d4a8fbca54dfa83b1db58d4d042bba08eb62c62f4d8f6647d222ef5a11181a3fb7bedffbb4138ef02f6143535
+AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
+AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
+DIST lm-sensors-3.5.0.tar.gz 267133 BLAKE2B f8fe8efe19cd17f2c828404bee7b2b285118279f06aaa2ebf831823d6767865a2b19da7bede1f3b43b2664ae3cec41b9e840be24fa673472fe577d38f602da4e SHA512 bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
+DIST lm-sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B 6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2 SHA512 15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
+EBUILD lm-sensors-3.5.0.ebuild 6478 BLAKE2B 86a3662a799b7fc98c6f4e743bd2922067fe38105a000e0c081dc207711b1c23c72712645d7beb16f31087cd8e952a06cbefb85b1870440d1646dcf29e5dde79 SHA512 080128a13e5e32b88365eb091708d61b0cb1dc523740a3a22828ec34876977817b4f50363ef0f361d27b853a80004a8aa03566406a12eaf27c1c840de49ee735
+EBUILD lm-sensors-3.5.0_p20190505.ebuild 6445 BLAKE2B 3e11c346ac68bfbec68d63ae766a5737cd59721008b4e04bb80ed6d73b32b3db64a98e2fd1ede5c5b13d487131d74b984559599299614b6c3d10856b73b1e41b SHA512 1edbf8904e2d43ae0ecd72e1b3b93f19387c42bd7d8ed7e2de737f1406dee1243bce43cf4c37ed5e6c0d5992f5f05522a34429e82a608c9f3ee3fa203ffd3c94
+MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm_sensors/files/fancontrol.confd b/sys-apps/lm-sensors/files/fancontrol.confd
index a7169583173e..a7169583173e 100644
--- a/sys-apps/lm_sensors/files/fancontrol.confd
+++ b/sys-apps/lm-sensors/files/fancontrol.confd
diff --git a/sys-apps/lm_sensors/files/fancontrol.initd b/sys-apps/lm-sensors/files/fancontrol.initd
index 0734668a4c0a..0734668a4c0a 100644
--- a/sys-apps/lm_sensors/files/fancontrol.initd
+++ b/sys-apps/lm-sensors/files/fancontrol.initd
diff --git a/sys-apps/lm_sensors/files/fancontrol.service-r1 b/sys-apps/lm-sensors/files/fancontrol.service-r1
index 7d4342c30171..7d4342c30171 100644
--- a/sys-apps/lm_sensors/files/fancontrol.service-r1
+++ b/sys-apps/lm-sensors/files/fancontrol.service-r1
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.4.0-sensors-detect-gentoo.patch b/sys-apps/lm-sensors/files/lm-sensors-3.4.0-sensors-detect-gentoo.patch
index dd77d66c0855..dd77d66c0855 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-3.4.0-sensors-detect-gentoo.patch
+++ b/sys-apps/lm-sensors/files/lm-sensors-3.4.0-sensors-detect-gentoo.patch
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.5.0-sensors-detect-gentoo.patch b/sys-apps/lm-sensors/files/lm-sensors-3.5.0-sensors-detect-gentoo.patch
index 3fcd19c05c4f..3fcd19c05c4f 100644
--- a/sys-apps/lm_sensors/files/lm_sensors-3.5.0-sensors-detect-gentoo.patch
+++ b/sys-apps/lm-sensors/files/lm-sensors-3.5.0-sensors-detect-gentoo.patch
diff --git a/sys-apps/lm_sensors/files/lm_sensors.confd b/sys-apps/lm-sensors/files/lm_sensors.confd
index bae2ea0bbbec..bae2ea0bbbec 100644
--- a/sys-apps/lm_sensors/files/lm_sensors.confd
+++ b/sys-apps/lm-sensors/files/lm_sensors.confd
diff --git a/sys-apps/lm_sensors/files/lm_sensors.initd b/sys-apps/lm-sensors/files/lm_sensors.initd
index 4efc6c964040..4efc6c964040 100644
--- a/sys-apps/lm_sensors/files/lm_sensors.initd
+++ b/sys-apps/lm-sensors/files/lm_sensors.initd
diff --git a/sys-apps/lm_sensors/files/sensord.confd b/sys-apps/lm-sensors/files/sensord.confd
index a6f2f265c11f..a6f2f265c11f 100644
--- a/sys-apps/lm_sensors/files/sensord.confd
+++ b/sys-apps/lm-sensors/files/sensord.confd
diff --git a/sys-apps/lm_sensors/files/sensord.initd b/sys-apps/lm-sensors/files/sensord.initd
index fa958dbf4389..fa958dbf4389 100644
--- a/sys-apps/lm_sensors/files/sensord.initd
+++ b/sys-apps/lm-sensors/files/sensord.initd
diff --git a/sys-apps/lm_sensors/files/sensord.service-r1 b/sys-apps/lm-sensors/files/sensord.service-r1
index b7a1e1bc3bd0..b7a1e1bc3bd0 100644
--- a/sys-apps/lm_sensors/files/sensord.service-r1
+++ b/sys-apps/lm-sensors/files/sensord.service-r1
diff --git a/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
new file mode 100644
index 000000000000..5a11eb1e7cf8
--- /dev/null
+++ b/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info systemd toolchain-funcs multilib-minimal eapi7-ver
+
+DESCRIPTION="Hardware Monitoring user-space utilities"
+HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors"
+
+MY_PN="${PN/_/-}"
+
+if [[ "${PV}" =~ .*_p[[:digit:]]{8}.* ]] ; then
+	COMMIT="807f9b1529892c0ac89bca0c7ae781c59f9c8393"
+	SRC_URI="https://github.com/lm-sensors/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${COMMIT}"
+else
+	SRC_URI="https://github.com/lm-sensors/lm-sensors/archive/V$(ver_rs 1- -).tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN/_/-}-$(ver_rs 1- -)"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1"
+
+# SUBSLOT based on SONAME of libsensors.so
+SLOT="0/5.0.0"
+
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="contrib sensord static-libs"
+
+COMMON_DEPS="
+	sensord? (
+		net-analyzer/rrdtool
+		virtual/logger
+	)"
+
+RDEPEND="${COMMON_DEPS}
+	dev-lang/perl
+	!<sys-apps/openrc-0.21.7"
+
+DEPEND="${COMMON_DEPS}
+	sys-devel/bison
+	sys-devel/flex"
+
+CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
+WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
+WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
+WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.0-sensors-detect-gentoo.patch )
+
+DOCS=( CHANGES CONTRIBUTORS INSTALL README )
+DOCS+=( doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} )
+
+src_prepare() {
+	default
+
+	if [[ -n "${COMMIT}" ]]; then
+		local _version="${PV%_*}+git_${COMMIT}"
+
+		sed -i \
+			-e "s:LM_VERSION.*:LM_VERSION \"${_version}\":" \
+			version.h || \
+			die "Failed to update version.h"
+
+		sed -i \
+			-e "s/^\$revision = '.*/\$revision = '${_version}';/" \
+			-e "/^\$revision =~ s.*/d" \
+			prog/detect/sensors-detect || \
+			die "Failed to set revision in prog/detect/sensors-detect"
+
+		sed -i \
+			-e "s/^echo \"# pwmconfig revision.*/echo \"# pwmconfig revision ${_version}\"/" \
+			-e "/^REVISION=.*/d" \
+			-e "/^REVDATE=.*/d" \
+			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+			prog/pwm/pwmconfig || \
+			die "Failed to adjust prog/pwm/pwmconfig"
+	else
+		sed -i \
+			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+			prog/pwm/pwmconfig || \
+			die "Failed to adjust PIDFILE in prog/pwm/pwmconfig"
+	fi
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || \
+		die "Failed to sed in LDFLAGS"
+
+	sed -i \
+		-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+		prog/pwm/fancontrol || \
+		die "Failed to adjust PIDFILE of prog/pwm/fancontrol"
+
+	# Don't use EnvironmentFile in systemd unit
+	sed -i \
+		-e '/^EnvironmentFile=/d' \
+		-e '/^Exec.*modprobe.*/d' \
+		prog/init/lm_sensors.service || \
+		die "Failed to remove EnvironmentFile from systemd unit file"
+
+	if ! use static-libs; then
+		sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || \
+			die "Failed to disable static building"
+	fi
+
+	# Don't show outdated user instructions
+	sed -i -e '/^	@echo "\*\*\* /d' Makefile || \
+		die "Failed to remove outdated user instructions"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	default
+
+	if multilib_is_native_abi && use sensord; then
+		# sensord requires net-analyzer/rrdtool which doesn't have real multilib
+		# support. To prevent errors like
+		#
+		#   skipping incompatible /usr/lib/librrd.so when searching for -lrrd
+		#   cannot find -lrrd
+		#
+		# we only build sensord when we are building for profile's native ABI
+		# (it doesn't affect libsensors.so).
+		sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || \
+			die "Failed to enable building of sensord"
+	fi
+}
+
+multilib_src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)"
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D%/}" \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		ETCDIR="/etc" \
+		LIBDIR="/usr/$(get_libdir)" \
+		install
+}
+
+multilib_src_install_all() {
+	newinitd "${FILESDIR}"/lm_sensors.initd lm_sensors
+	newconfd "${FILESDIR}"/lm_sensors.confd lm_sensors
+	systemd_dounit prog/init/lm_sensors.service
+
+	newinitd "${FILESDIR}"/fancontrol.initd fancontrol
+	newconfd "${FILESDIR}"/fancontrol.confd fancontrol
+	systemd_newunit "${FILESDIR}"/fancontrol.service-r1 fancontrol.service
+
+	if use sensord; then
+		newconfd "${FILESDIR}"/sensord.confd sensord
+		newinitd "${FILESDIR}"/sensord.initd sensord
+		systemd_newunit "${FILESDIR}"/sensord.service-r1 sensord.service
+	fi
+
+	einstalldocs
+
+	docinto developers
+	dodoc doc/developers/applications
+
+	if use contrib; then
+		insinto /usr/share/lm_sensors
+		doins -r "${S}"/configs
+	fi
+}
+
+pkg_postinst() {
+	local _new_loader='3.4.0_p20160725'
+	local _v
+	for _v in ${REPLACING_VERSIONS}; do
+		if ! ver_test "${_v}" -gt "${_new_loader}"; then
+			# This is an upgrade which require migration
+
+			elog ""
+			elog "Since version 3.4.0_p20160725 ${PN} no longer loads modules on its own"
+			elog "instead it is using \"modules-load\" services provided by OpenRC or systemd."
+			elog ""
+			elog "To migrate your configuration you have 2 options:"
+			elog ""
+			elog "  a) Re-create a new configuration using \"/usr/sbin/sensors-detect\""
+			elog ""
+			elog "  b) Copy existing \"modules_<n>\", \"HWMON_MODULES\" or \"BUS_MODULES\""
+			elog "     variables from \"/etc/conf.d/lm_modules\" to"
+			elog "     \"/etc/modules-load.d/lm_sensors.conf\" and adjust format."
+			elog ""
+			elog "     For details see https://wiki.gentoo.org/wiki/Systemd#Automatic_module_loading"
+			elog ""
+			elog "     Important: Don't forget to migrate your module's argument"
+			elog "                (modules_<name>_args variable) if your are not already"
+			elog "                using \"/etc/modprobe.d\" (which is recommended)."
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# New installation
+
+		elog ""
+		elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
+		elog "\"/etc/modules-load.d/lm_sensors.conf\"."
+		elog ""
+		elog "You might want to add lm_sensors to your default runlevel to make"
+		elog "sure the sensors get initialized on the next startup."
+		elog ""
+		elog "Be warned, the probing of hardware in your system performed by"
+		elog "sensors-detect could freeze your system. Also make sure you read"
+		elog "the documentation before running ${PN} on IBM ThinkPads."
+	fi
+}
diff --git a/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild b/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
new file mode 100644
index 000000000000..e2d8209c6ad9
--- /dev/null
+++ b/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info systemd toolchain-funcs multilib-minimal
+
+DESCRIPTION="Hardware Monitoring user-space utilities"
+HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors"
+
+if [[ "${PV}" =~ .*_p[[:digit:]]{8}.* ]] ; then
+	COMMIT="2c8cca3d6cd60121b401734c1a24cfec7daed4fc"
+	SRC_URI="https://github.com/lm-sensors/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+else
+	SRC_URI="https://github.com/lm-sensors/lm-sensors/archive/V$(ver_rs 1- -).tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-$(ver_rs 1- -)"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1"
+
+# SUBSLOT based on SONAME of libsensors.so
+SLOT="0/5.0.0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="contrib sensord static-libs"
+
+COMMON_DEPS="
+	sensord? (
+		net-analyzer/rrdtool
+		virtual/logger
+	)"
+
+RDEPEND="${COMMON_DEPS}
+	dev-lang/perl
+	!<sys-apps/openrc-0.36"
+
+DEPEND="${COMMON_DEPS}
+	sys-devel/bison
+	sys-devel/flex"
+
+CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
+WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
+WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
+WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
+
+PATCHES=( "${FILESDIR}"/${PN}-3.5.0-sensors-detect-gentoo.patch )
+
+DOCS=( CHANGES CONTRIBUTORS INSTALL README )
+DOCS+=( doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} )
+
+src_prepare() {
+	default
+
+	if [[ -n "${COMMIT}" ]]; then
+		local _version="${PV%_*}+git_${COMMIT}"
+
+		sed -i \
+			-e "s:LM_VERSION.*:LM_VERSION \"${_version}\":" \
+			version.h || \
+			die "Failed to update version.h"
+
+		sed -i \
+			-e "s/^\$revision = '.*/\$revision = '${_version}';/" \
+			-e "/^\$revision =~ s.*/d" \
+			prog/detect/sensors-detect || \
+			die "Failed to set revision in prog/detect/sensors-detect"
+
+		sed -i \
+			-e "s/^echo \"# pwmconfig revision.*/echo \"# pwmconfig revision ${_version}\"/" \
+			-e "/^REVISION=.*/d" \
+			-e "/^REVDATE=.*/d" \
+			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+			prog/pwm/pwmconfig || \
+			die "Failed to adjust prog/pwm/pwmconfig"
+	else
+		sed -i \
+			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+			prog/pwm/pwmconfig || \
+			die "Failed to adjust PIDFILE in prog/pwm/pwmconfig"
+	fi
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || \
+		die "Failed to sed in LDFLAGS"
+
+	sed -i \
+		-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+		prog/pwm/fancontrol || \
+		die "Failed to adjust PIDFILE of prog/pwm/fancontrol"
+
+	# Don't use EnvironmentFile in systemd unit
+	sed -i \
+		-e '/^EnvironmentFile=/d' \
+		-e '/^Exec.*modprobe.*/d' \
+		prog/init/lm_sensors.service || \
+		die "Failed to remove EnvironmentFile from systemd unit file"
+
+	if ! use static-libs; then
+		sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || \
+			die "Failed to disable static building"
+	fi
+
+	# Don't show outdated user instructions
+	sed -i -e '/^	@echo "\*\*\* /d' Makefile || \
+		die "Failed to remove outdated user instructions"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	default
+
+	if multilib_is_native_abi && use sensord; then
+		# sensord requires net-analyzer/rrdtool which doesn't have real multilib
+		# support. To prevent errors like
+		#
+		#   skipping incompatible /usr/lib/librrd.so when searching for -lrrd
+		#   cannot find -lrrd
+		#
+		# we only build sensord when we are building for profile's native ABI
+		# (it doesn't affect libsensors.so).
+		sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || \
+			die "Failed to enable building of sensord"
+	fi
+}
+
+multilib_src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)"
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D%/}" \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		ETCDIR="/etc" \
+		LIBDIR="/usr/$(get_libdir)" \
+		install
+}
+
+multilib_src_install_all() {
+	newinitd "${FILESDIR}"/lm_sensors.initd lm_sensors
+	newconfd "${FILESDIR}"/lm_sensors.confd lm_sensors
+	systemd_dounit prog/init/lm_sensors.service
+
+	newinitd "${FILESDIR}"/fancontrol.initd fancontrol
+	newconfd "${FILESDIR}"/fancontrol.confd fancontrol
+	systemd_newunit "${FILESDIR}"/fancontrol.service-r1 fancontrol.service
+
+	if use sensord; then
+		newconfd "${FILESDIR}"/sensord.confd sensord
+		newinitd "${FILESDIR}"/sensord.initd sensord
+		systemd_newunit "${FILESDIR}"/sensord.service-r1 sensord.service
+	fi
+
+	einstalldocs
+
+	docinto developers
+	dodoc doc/developers/applications
+
+	if use contrib; then
+		insinto /usr/share/lm_sensors
+		doins -r "${S}"/configs
+	fi
+}
+
+pkg_postinst() {
+	local _new_loader='3.4.0_p20160725'
+	local _v
+	for _v in ${REPLACING_VERSIONS}; do
+		if ! ver_test "${_v}" -gt "${_new_loader}"; then
+			# This is an upgrade which require migration
+
+			elog ""
+			elog "Since version 3.4.0_p20160725 ${PN} no longer loads modules on its own"
+			elog "instead it is using \"modules-load\" services provided by OpenRC or systemd."
+			elog ""
+			elog "To migrate your configuration you have 2 options:"
+			elog ""
+			elog "  a) Re-create a new configuration using \"/usr/sbin/sensors-detect\""
+			elog ""
+			elog "  b) Copy existing \"modules_<n>\", \"HWMON_MODULES\" or \"BUS_MODULES\""
+			elog "     variables from \"/etc/conf.d/lm_modules\" to"
+			elog "     \"/etc/modules-load.d/lm_sensors.conf\" and adjust format."
+			elog ""
+			elog "     For details see https://wiki.gentoo.org/wiki/Systemd#Automatic_module_loading"
+			elog ""
+			elog "     Important: Don't forget to migrate your module's argument"
+			elog "                (modules_<name>_args variable) if your are not already"
+			elog "                using \"/etc/modprobe.d\" (which is recommended)."
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# New installation
+
+		elog ""
+		elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
+		elog "\"/etc/modules-load.d/lm_sensors.conf\"."
+		elog ""
+		elog "You might want to add lm_sensors to your default runlevel to make"
+		elog "sure the sensors get initialized on the next startup."
+		elog ""
+		elog "Be warned, the probing of hardware in your system performed by"
+		elog "sensors-detect could freeze your system. Also make sure you read"
+		elog "the documentation before running ${PN} on IBM ThinkPads."
+	fi
+}
diff --git a/sys-apps/lm_sensors/metadata.xml b/sys-apps/lm-sensors/metadata.xml
index 897d37da3562..897d37da3562 100644
--- a/sys-apps/lm_sensors/metadata.xml
+++ b/sys-apps/lm-sensors/metadata.xml
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
deleted file mode 100644
index e5e4ff134f97..000000000000
--- a/sys-apps/lm_sensors/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX fancontrol.confd 669 BLAKE2B cc297a5122d54f6104d840548480c6648fb31388a9c78a5e3a96ec91841c67d527a38e452ddaba5801c975fb23d9fab79aea46abbba0781ef2a8d8e9c6f1fed0 SHA512 06ec0b44e753bfa6a5ca461345e5857ac4d824cb3d9dd4955bbe884ff91d0184050476fe6da0ea8b0882243a51466af2d82540474581bd471f13c5977a0ec41a
-AUX fancontrol.initd 603 BLAKE2B d5409d4141996adb8e5e9520075d42f79fcdcc017850c0d3d21cbf5736ea1d7da07921b035cbbb5a2c4a8490ddad3a108073fe154f170507249f3fc8f5e5b920 SHA512 3dad0939d679bfb2732bdbd8ff851298ed86e5fd83719eb5181f8cc3e7d84f7986a79a3438a8c3b6a6e3c8be1a3a9839769292d77e352c0167d4b16dd1f0d086
-AUX fancontrol.service-r1 146 BLAKE2B 666a45c2e55dcf31470167ba9bb78e6205b3fcb47f66ae7b185d6651dba33f8a7699f800ecddaed070a8827d24893cc1971203b691f37515ea74125e889e8965 SHA512 eb1e22045a4adbcba398b77061d33b145614edf960c31aeb3c9a987553d6a0d8de332d4887e52ca2c6d6147d6e1a2b5e8bae41dca5f1c9d4fc2dc522c18459f8
-AUX lm_sensors-3.4.0-sensors-detect-gentoo.patch 12441 BLAKE2B f35efdf0f27b8aa64d5d0f8f088921225b9f991eb999d40f452afba4161ea7a38521346356f00c3136e6fb0d27d6508dd46fef385fb9e317157eb33bce8bdb8d SHA512 740c2fefa3c914fbb977e86b5b57cdbbcd06fc2d348ee42b5c678f164f15fb7a171979e5da5a1779c932ba39a535e37d0f7b7506c43966463115e0042dc9dc81
-AUX lm_sensors-3.5.0-sensors-detect-gentoo.patch 12593 BLAKE2B 21383c2d0a7dc2063f81ca7af15ee02dc94a3344f23da80433ab19fc7a5528cc516408ecadc46d0fd1f55799a305c0e509211476314ca0cdf05e3b8942059050 SHA512 0f1556cef3d1c19f4dd822afdf609390f82dbfda7e66070ca5b89b145c29669e05141f150b3b0d58c277c79c57f98659284953788db6334c27e17e3f39e23cdd
-AUX lm_sensors.confd 102 BLAKE2B 5d0771a2cac4869caee2d6ae3ac2cc2f60e64720ad587d4a89fa6dca7506325554b06d92cce42fc51b9af9c8715834d6d481f342cd6be57061c5234dfabd26d3 SHA512 a31220f4bf337de7b17158e00c64e662527abe11c5cc9f8401216f757dcde1c220527ad73f375c0de051030119daeba4cef6c5155f077447a9391e273cd65f50
-AUX lm_sensors.initd 334 BLAKE2B 377cea5d1f0c2baf94a2a17dd870ae3ba545bb96453432808360d1ff0ffd92dfcb306364ffa579afdb6b02dda930c7288e5c1b32274893e8541777a62abe8c37 SHA512 5a3f3eb6ae2a97f0a3841a2544579733f6df4a89c3667e1920203a6b0d18f54eb0aa12b1fd0c0bbdc4f6a1535df8444ebeb9d6212cc8be8dc1cf25e204d009a0
-AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378eeef36654933f0ec2042683e1b13bc48349eebc4d2dde26d20ac7e7681c01ceeb0b3b4e27576d2b SHA512 83c71b9aaae273daff62da31ae45ffa682460e4d4a8fbca54dfa83b1db58d4d042bba08eb62c62f4d8f6647d222ef5a11181a3fb7bedffbb4138ef02f6143535
-AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
-AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
-DIST lm_sensors-3.5.0.tar.gz 267133 BLAKE2B f8fe8efe19cd17f2c828404bee7b2b285118279f06aaa2ebf831823d6767865a2b19da7bede1f3b43b2664ae3cec41b9e840be24fa673472fe577d38f602da4e SHA512 bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
-DIST lm_sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B 6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2 SHA512 15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
-EBUILD lm_sensors-3.5.0.ebuild 6448 BLAKE2B ae7e54bae38d9374a65df2f2aeaf4dad562e91357a351789e985674101253cd6f150b4366c4491cf5dececf1ee561ddd2057ff6a915b9a22b3feb345addd7050 SHA512 a7fb2556fa53fb57ee9e34b60fe9375ad67b326b5f1fd23ff31a2f6c0b98f0c51a184bf7817fbf3d5b28b4cc67c1bf2caf5421a1052efb64df0d9c286d2ec07c
-EBUILD lm_sensors-3.5.0_p20190505.ebuild 6444 BLAKE2B 99e792e84bd2120bcc6e0f632b55c8a2dbc76dd9939e0af95237178aba79f268f3a65c32c793286040785f4f0b8f893a5b981afc61c5ccc29f9b09a06b4b238d SHA512 1ccbc2cfd2a6f2e524579e5438f03d70100863e244ef25c92e956232e7c2d1abc21de6d4e47a2056305c3f8b732d080de4ef790cee0480b99d021ae6c376cd1c
-MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild b/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild
deleted file mode 100644
index f5c4e1a4e7f1..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info systemd toolchain-funcs multilib-minimal eapi7-ver
-
-DESCRIPTION="Hardware Monitoring user-space utilities"
-HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors"
-
-MY_PN="${PN/_/-}"
-
-if [[ "${PV}" =~ .*_p[[:digit:]]{8}.* ]] ; then
-	COMMIT="807f9b1529892c0ac89bca0c7ae781c59f9c8393"
-	SRC_URI="https://github.com/lm-sensors/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${COMMIT}"
-else
-	SRC_URI="https://github.com/lm-sensors/lm-sensors/archive/V$(ver_rs 1- -).tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN/_/-}-$(ver_rs 1- -)"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1"
-
-# SUBSLOT based on SONAME of libsensors.so
-SLOT="0/5.0.0"
-
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="contrib sensord static-libs"
-
-COMMON_DEPS="
-	sensord? (
-		net-analyzer/rrdtool
-		virtual/logger
-	)"
-
-RDEPEND="${COMMON_DEPS}
-	dev-lang/perl
-	!<sys-apps/openrc-0.21.7"
-
-DEPEND="${COMMON_DEPS}
-	sys-devel/bison
-	sys-devel/flex"
-
-CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
-WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
-WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4.0-sensors-detect-gentoo.patch )
-
-DOCS=( CHANGES CONTRIBUTORS INSTALL README )
-DOCS+=( doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} )
-
-src_prepare() {
-	default
-
-	if [[ -n "${COMMIT}" ]]; then
-		local _version="${PV%_*}+git_${COMMIT}"
-
-		sed -i \
-			-e "s:LM_VERSION.*:LM_VERSION \"${_version}\":" \
-			version.h || \
-			die "Failed to update version.h"
-
-		sed -i \
-			-e "s/^\$revision = '.*/\$revision = '${_version}';/" \
-			-e "/^\$revision =~ s.*/d" \
-			prog/detect/sensors-detect || \
-			die "Failed to set revision in prog/detect/sensors-detect"
-
-		sed -i \
-			-e "s/^echo \"# pwmconfig revision.*/echo \"# pwmconfig revision ${_version}\"/" \
-			-e "/^REVISION=.*/d" \
-			-e "/^REVDATE=.*/d" \
-			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
-			prog/pwm/pwmconfig || \
-			die "Failed to adjust prog/pwm/pwmconfig"
-	else
-		sed -i \
-			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
-			prog/pwm/pwmconfig || \
-			die "Failed to adjust PIDFILE in prog/pwm/pwmconfig"
-	fi
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || \
-		die "Failed to sed in LDFLAGS"
-
-	sed -i \
-		-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
-		prog/pwm/fancontrol || \
-		die "Failed to adjust PIDFILE of prog/pwm/fancontrol"
-
-	# Don't use EnvironmentFile in systemd unit
-	sed -i \
-		-e '/^EnvironmentFile=/d' \
-		-e '/^Exec.*modprobe.*/d' \
-		prog/init/lm_sensors.service || \
-		die "Failed to remove EnvironmentFile from systemd unit file"
-
-	if ! use static-libs; then
-		sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || \
-			die "Failed to disable static building"
-	fi
-
-	# Don't show outdated user instructions
-	sed -i -e '/^	@echo "\*\*\* /d' Makefile || \
-		die "Failed to remove outdated user instructions"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	default
-
-	if multilib_is_native_abi && use sensord; then
-		# sensord requires net-analyzer/rrdtool which doesn't have real multilib
-		# support. To prevent errors like
-		#
-		#   skipping incompatible /usr/lib/librrd.so when searching for -lrrd
-		#   cannot find -lrrd
-		#
-		# we only build sensord when we are building for profile's native ABI
-		# (it doesn't affect libsensors.so).
-		sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || \
-			die "Failed to enable building of sensord"
-	fi
-}
-
-multilib_src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)"
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D%/}" \
-		PREFIX="/usr" \
-		MANDIR="/usr/share/man" \
-		ETCDIR="/etc" \
-		LIBDIR="/usr/$(get_libdir)" \
-		install
-}
-
-multilib_src_install_all() {
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit prog/init/lm_sensors.service
-
-	newinitd "${FILESDIR}"/fancontrol.initd fancontrol
-	newconfd "${FILESDIR}"/fancontrol.confd fancontrol
-	systemd_newunit "${FILESDIR}"/fancontrol.service-r1 fancontrol.service
-
-	if use sensord; then
-		newconfd "${FILESDIR}"/sensord.confd sensord
-		newinitd "${FILESDIR}"/sensord.initd sensord
-		systemd_newunit "${FILESDIR}"/sensord.service-r1 sensord.service
-	fi
-
-	einstalldocs
-
-	docinto developers
-	dodoc doc/developers/applications
-
-	if use contrib; then
-		insinto /usr/share/${PN}
-		doins -r "${S}"/configs
-	fi
-}
-
-pkg_postinst() {
-	local _new_loader='3.4.0_p20160725'
-	local _v
-	for _v in ${REPLACING_VERSIONS}; do
-		if ! ver_test "${_v}" -gt "${_new_loader}"; then
-			# This is an upgrade which require migration
-
-			elog ""
-			elog "Since version 3.4.0_p20160725 ${PN} no longer loads modules on its own"
-			elog "instead it is using \"modules-load\" services provided by OpenRC or systemd."
-			elog ""
-			elog "To migrate your configuration you have 2 options:"
-			elog ""
-			elog "  a) Re-create a new configuration using \"/usr/sbin/sensors-detect\""
-			elog ""
-			elog "  b) Copy existing \"modules_<n>\", \"HWMON_MODULES\" or \"BUS_MODULES\""
-			elog "     variables from \"/etc/conf.d/lm_modules\" to"
-			elog "     \"/etc/modules-load.d/lm_sensors.conf\" and adjust format."
-			elog ""
-			elog "     For details see https://wiki.gentoo.org/wiki/Systemd#Automatic_module_loading"
-			elog ""
-			elog "     Important: Don't forget to migrate your module's argument"
-			elog "                (modules_<name>_args variable) if your are not already"
-			elog "                using \"/etc/modprobe.d\" (which is recommended)."
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# New installation
-
-		elog ""
-		elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
-		elog "\"/etc/modules-load.d/lm_sensors.conf\"."
-		elog ""
-		elog "You might want to add ${PN} to your default runlevel to make"
-		elog "sure the sensors get initialized on the next startup."
-		elog ""
-		elog "Be warned, the probing of hardware in your system performed by"
-		elog "sensors-detect could freeze your system. Also make sure you read"
-		elog "the documentation before running ${PN} on IBM ThinkPads."
-	fi
-}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild b/sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild
deleted file mode 100644
index c63ff098149b..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info systemd toolchain-funcs multilib-minimal
-
-DESCRIPTION="Hardware Monitoring user-space utilities"
-HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors"
-
-MY_PN="${PN/_/-}"
-
-if [[ "${PV}" =~ .*_p[[:digit:]]{8}.* ]] ; then
-	COMMIT="2c8cca3d6cd60121b401734c1a24cfec7daed4fc"
-	SRC_URI="https://github.com/lm-sensors/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${COMMIT}"
-else
-	SRC_URI="https://github.com/lm-sensors/lm-sensors/archive/V$(ver_rs 1- -).tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN/_/-}-$(ver_rs 1- -)"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1"
-
-# SUBSLOT based on SONAME of libsensors.so
-SLOT="0/5.0.0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="contrib sensord static-libs"
-
-COMMON_DEPS="
-	sensord? (
-		net-analyzer/rrdtool
-		virtual/logger
-	)"
-
-RDEPEND="${COMMON_DEPS}
-	dev-lang/perl
-	!<sys-apps/openrc-0.36"
-
-DEPEND="${COMMON_DEPS}
-	sys-devel/bison
-	sys-devel/flex"
-
-CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
-WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
-WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-
-PATCHES=( "${FILESDIR}"/${PN}-3.5.0-sensors-detect-gentoo.patch )
-
-DOCS=( CHANGES CONTRIBUTORS INSTALL README )
-DOCS+=( doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} )
-
-src_prepare() {
-	default
-
-	if [[ -n "${COMMIT}" ]]; then
-		local _version="${PV%_*}+git_${COMMIT}"
-
-		sed -i \
-			-e "s:LM_VERSION.*:LM_VERSION \"${_version}\":" \
-			version.h || \
-			die "Failed to update version.h"
-
-		sed -i \
-			-e "s/^\$revision = '.*/\$revision = '${_version}';/" \
-			-e "/^\$revision =~ s.*/d" \
-			prog/detect/sensors-detect || \
-			die "Failed to set revision in prog/detect/sensors-detect"
-
-		sed -i \
-			-e "s/^echo \"# pwmconfig revision.*/echo \"# pwmconfig revision ${_version}\"/" \
-			-e "/^REVISION=.*/d" \
-			-e "/^REVDATE=.*/d" \
-			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
-			prog/pwm/pwmconfig || \
-			die "Failed to adjust prog/pwm/pwmconfig"
-	else
-		sed -i \
-			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
-			prog/pwm/pwmconfig || \
-			die "Failed to adjust PIDFILE in prog/pwm/pwmconfig"
-	fi
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || \
-		die "Failed to sed in LDFLAGS"
-
-	sed -i \
-		-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
-		prog/pwm/fancontrol || \
-		die "Failed to adjust PIDFILE of prog/pwm/fancontrol"
-
-	# Don't use EnvironmentFile in systemd unit
-	sed -i \
-		-e '/^EnvironmentFile=/d' \
-		-e '/^Exec.*modprobe.*/d' \
-		prog/init/lm_sensors.service || \
-		die "Failed to remove EnvironmentFile from systemd unit file"
-
-	if ! use static-libs; then
-		sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || \
-			die "Failed to disable static building"
-	fi
-
-	# Don't show outdated user instructions
-	sed -i -e '/^	@echo "\*\*\* /d' Makefile || \
-		die "Failed to remove outdated user instructions"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	default
-
-	if multilib_is_native_abi && use sensord; then
-		# sensord requires net-analyzer/rrdtool which doesn't have real multilib
-		# support. To prevent errors like
-		#
-		#   skipping incompatible /usr/lib/librrd.so when searching for -lrrd
-		#   cannot find -lrrd
-		#
-		# we only build sensord when we are building for profile's native ABI
-		# (it doesn't affect libsensors.so).
-		sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || \
-			die "Failed to enable building of sensord"
-	fi
-}
-
-multilib_src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)"
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D%/}" \
-		PREFIX="/usr" \
-		MANDIR="/usr/share/man" \
-		ETCDIR="/etc" \
-		LIBDIR="/usr/$(get_libdir)" \
-		install
-}
-
-multilib_src_install_all() {
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit prog/init/lm_sensors.service
-
-	newinitd "${FILESDIR}"/fancontrol.initd fancontrol
-	newconfd "${FILESDIR}"/fancontrol.confd fancontrol
-	systemd_newunit "${FILESDIR}"/fancontrol.service-r1 fancontrol.service
-
-	if use sensord; then
-		newconfd "${FILESDIR}"/sensord.confd sensord
-		newinitd "${FILESDIR}"/sensord.initd sensord
-		systemd_newunit "${FILESDIR}"/sensord.service-r1 sensord.service
-	fi
-
-	einstalldocs
-
-	docinto developers
-	dodoc doc/developers/applications
-
-	if use contrib; then
-		insinto /usr/share/${PN}
-		doins -r "${S}"/configs
-	fi
-}
-
-pkg_postinst() {
-	local _new_loader='3.4.0_p20160725'
-	local _v
-	for _v in ${REPLACING_VERSIONS}; do
-		if ! ver_test "${_v}" -gt "${_new_loader}"; then
-			# This is an upgrade which require migration
-
-			elog ""
-			elog "Since version 3.4.0_p20160725 ${PN} no longer loads modules on its own"
-			elog "instead it is using \"modules-load\" services provided by OpenRC or systemd."
-			elog ""
-			elog "To migrate your configuration you have 2 options:"
-			elog ""
-			elog "  a) Re-create a new configuration using \"/usr/sbin/sensors-detect\""
-			elog ""
-			elog "  b) Copy existing \"modules_<n>\", \"HWMON_MODULES\" or \"BUS_MODULES\""
-			elog "     variables from \"/etc/conf.d/lm_modules\" to"
-			elog "     \"/etc/modules-load.d/lm_sensors.conf\" and adjust format."
-			elog ""
-			elog "     For details see https://wiki.gentoo.org/wiki/Systemd#Automatic_module_loading"
-			elog ""
-			elog "     Important: Don't forget to migrate your module's argument"
-			elog "                (modules_<name>_args variable) if your are not already"
-			elog "                using \"/etc/modprobe.d\" (which is recommended)."
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# New installation
-
-		elog ""
-		elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
-		elog "\"/etc/modules-load.d/lm_sensors.conf\"."
-		elog ""
-		elog "You might want to add ${PN} to your default runlevel to make"
-		elog "sure the sensors get initialized on the next startup."
-		elog ""
-		elog "Be warned, the probing of hardware in your system performed by"
-		elog "sensors-detect could freeze your system. Also make sure you read"
-		elog "the documentation before running ${PN} on IBM ThinkPads."
-	fi
-}
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 99aec0026643..dcf389efcd2e 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,6 +1,8 @@
 DIST nvme-cli-1.5.tar.gz 282891 BLAKE2B 31eb9f4acda978977b7de222e1d973aac4ea18a34eaa0ffea73f2603cc2b8936aecd23248c764d05af161943db06533faf881711f2f22ad539b7e7607d5f8652 SHA512 0fc3dafeba8f67c8f3a3f25aac3b454d9e3ebfb1c20d67f96009a4490f269f0fe3642de781cd161896300f91a1cc37bd8a4e61c77f35422ab134c747702ffaca
 DIST nvme-cli-1.6.tar.gz 368461 BLAKE2B e40f4d76314860c966c3cb3de31e8d4a1bceab847b8950f0c99d47e00b8e8de077e91f6da9216ec10e939d37d34ab255b5cc3c641f3bbaf3ac8974f697051329 SHA512 05bcc539febd047f092a236ef2b2e9ad4e1df5d38bdc70416f80217425767f414e72294fda46868323cb7c77662d6000eaf16ebdaf74bdfad1baaed11b025d39
+DIST nvme-cli-1.9.tar.gz 440675 BLAKE2B 19d9f4982e6bf4d37bbced02aadd0f58e496901c1463c96596b289e23c4e5849bfed9a4129447588c9c8104d5b49fd0bf97ee6495907bf022487407f02d7c4ae SHA512 3565b33bc39bde4480bbde5d46d75ea6907c0921884e8f39029b746f8383d3630942e405c61bcc3654bac5646bc86479b4b790e1b823ec83650649621bab6dac
 EBUILD nvme-cli-1.5.ebuild 566 BLAKE2B e723786af2108253b54742b752ea755b84964e2155e68a3500c90a8900a2cf80de952c3a212c3e0809009518b274158aace3afa9c7f2bf16d2e2b31321581c2f SHA512 3fb2c2818a77fe647dc8216004bc817ebcdefff99e18abffc62883d98d0448972975651eae704b945324bd809aaa6215d9803145955a971a15ae19357ca647ee
 EBUILD nvme-cli-1.6-r1.ebuild 637 BLAKE2B a8b970784c99af27bcd317bd4b246d97593eb6e9db69a35d7e5e5c12d1baeefa9fcbfc94c3055150d45bbd408714d8f756d82f92496512870ccc45e51b7582f2 SHA512 3fe25b46e5fb9135b15847def70cc9c41860e0f0ad9682f434229b2eaef5672a5416a6743fe2e351f3ed9244b33536e1555da4eb7f1b653ee0fc974c3df2b859
 EBUILD nvme-cli-1.6.ebuild 563 BLAKE2B 4494d38c8091d084bffc00ee18e1752cfc78f37f8b78684c738849aaadc93e9edc4cf8c1a3b13879dcc5bd86c9ed5053a72c6e7da367606605eadd7ea5c734fc SHA512 25a4590cc15ef4aff600cd0c18ec52e9bc7f043723ad569d7b1957b808e0d995abc5838f28b5af27350c38098c198274797b9eb6a059412ce86142b0ea18b75b
+EBUILD nvme-cli-1.9.ebuild 691 BLAKE2B a64c7181f53d1cf67620a5aa3126e6ae26136b15dad076face14095cb6d230cdeb853fe5fcf09121a9274c9301b31c69261bc1840e82e816483721cb7919ea85 SHA512 e13ee822fd979187fa0588d3f64df9083059831c75d31ae41861732ea8e9b611de5a92776a170f2b79eae31062ef3ea636c38ce057c38179deb68b147cdfce24
 MISC metadata.xml 369 BLAKE2B 67a0c73fe0e2de97927a7c827bf4d216c7460c2ec4383c07e028c0b2d10e71a45559482bab635a6b9374fbec557ab83327baf041eb47bbc06c5e624bb29f6925 SHA512 d9439fc99f1bc5051b670e7d287185af8e7db4ba9045fd9a9aeb4c0f04a33716650d3a01f0ad8640e8b62db048a0f536fbd6145d5a7d79bb7aa524d63112db61
diff --git a/sys-apps/nvme-cli/nvme-cli-1.9.ebuild b/sys-apps/nvme-cli/nvme-cli-1.9.ebuild
new file mode 100644
index 000000000000..dab045a072bd
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-1.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+uuid"
+
+RDEPEND="uuid? ( sys-apps/util-linux:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
+		-e 's|^install-hostparams:$|\0 install-etc|' \
+		-i Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
+	MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
+}
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 9f0068208aa5..3d44f2201b30 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -2,5 +2,5 @@ AUX pmount-0.9.19-testsuite-missing-dir.patch 1354 BLAKE2B cebe20a80f929f1104fc8
 AUX pmount-0.9.99_alpha-locale-regex.patch 749 BLAKE2B d1e777c57ba8b261f6fdf461200a980149b417022dd0fb78cd1f366be2001850956fede8677859a952c9b961668488f8bb2ef0302816f72e41f71b0191d3b336 SHA512 9009544a6d424dc6449d8f1ba53521802741b904129e1f4cd729a1051735fda3d6fcfe85d5aa49f6fbc5df62abbcb21fd7ab578cee667efaf3e4c00dc1b8131c
 AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
-EBUILD pmount-0.9.99_alpha-r5.ebuild 2044 BLAKE2B 51b599d98fd811ea7ae1417a220db540846a079174821d501a4906faf801cab783238a64d63d2f367a3fa1ed0c18594920c580c7fc4a0be2810555cf9f0c10d8 SHA512 7c09d021aeee9fe058d4f7cf2542b7fb4ab84cfe18e6af7bb9e69311f8c285e6f852928800d4197e00fc46dfd0315f8da62f19db88752d6cd58cb3f05ab4aea0
+EBUILD pmount-0.9.99_alpha-r5.ebuild 2025 BLAKE2B ef52d2965725324a5b98db6c6b8a2c061396f35b53f30dc5224d5d56fe8325811357c1de2be0518b5944a4dc3971e791c6fdc60f4d3ddc82876ad94dd2bff6f4 SHA512 65d58a6044be597ac0fe9fe893b411d8f8d82f0ead2eebb710c07e5ce582c673b321283ff01e330f679233fbb2e693576e1a64c79e34d2867873f034bfb089d7
 MISC metadata.xml 321 BLAKE2B 014d83434739678d62884604e7e4e56cc52123ddd326250068ed4fd2f5db2b439a75e29c5dc3699599db3c640df414f9407cc772e302796a34eec58e21ebf1a2 SHA512 be1e96e34fcb9d2c433c6d67280840adb13b8771860e6314fff1b716814b120c4d31574333052e54fb788f76c8990d0bd1bdb4c725fde28b174bbd5a918bdc6e
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
index f035b7abd422..52df8b15b9ff 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils user bash-completion-r1
+inherit eutils bash-completion-r1
 
 DESCRIPTION="Policy based mounter that gives the ability to mount removable devices as a user"
 HOMEPAGE="https://launchpad.net/pmount"
@@ -13,7 +13,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="crypt"
 
-RDEPEND=">=sys-apps/util-linux-2.17.2
+RDEPEND="
+	acct-group/plugdev
+	>=sys-apps/util-linux-2.17.2
 	crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -21,10 +23,6 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P/_/-}
 
-pkg_setup() {
-	enewgroup plugdev
-}
-
 src_prepare() {
 	# Restore default value from pmount <= 0.9.23 wrt #393633
 	sed -i -e '/^not_physically_logged_allow/s:=.*:= yes:' etc/pmount.conf || die
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7532b66b5149..d3cafe223ba8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,9 +3,11 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 DIST portage-2.3.66.tar.bz2 1023966 BLAKE2B dc378b714101b287fa33defeb778e586da83275cdc2d0bc7a98e9f2ea568568313d6a2767f693f3111fc41f0c6f07451315021186a1719bd52520da327c103d6 SHA512 f8642237e0127d9838c6e91430a19b8886295f8ce6b18cf915d6eb63204c7a8c65783f1554eec90b7ce7d0b613ef4206643eec8751b0594de1dcb4ede4491779
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
 DIST portage-2.3.75.tar.bz2 1032575 BLAKE2B c4f3e9a7e7056af19da6a56599fb79a26331d6ab88981f966b77e2d17ee5dac1a585f54b1185f64855c9c2af544684b759143f657a529878a4e6eb9df4757340 SHA512 06dabc9bff2992b197575ceab5b4f117aca01a10d2556bb006bb28bd4c1d99edfbff753e83aba706782da1e365b923e081ce2037053fed31e18baa5fab6da4a2
+DIST portage-2.3.76.tar.bz2 1033462 BLAKE2B 1be0641337cd7d2a55f8aaba6f84bbfa7182503050e669fb28cd00e4de13cce31ec6e33cc2794e372d1a67b7d2f27e6bb85969f720f2ed449c619598b708b903 SHA512 e7774cf89e3865cb1ca5465fc961b452cc8529ccf09e86b7ebd16cca049f1efb527dca9aba892392d5909283cf12930117b1d33fa58e1e429f4408cf50181921
 DIST repoman-bug-685482-fbebef9677d6.patch 3350 BLAKE2B f715267e2731c1ec7c780aa9c6cffe1f848b3ad050273646579677a0522483df6fef844ffd87fb22f7dad53f1ec60221acd0d81a813569baf768ba62a6c1921c SHA512 0e44625aeec7c239d7db8fdcf6a13313f4a8c1275e0e474cc2f05e5476d86214881cec2917d816c8b63f69d508c0bfa69e6a8e05b614b405463c998a4fb7ce12
 EBUILD portage-2.3.66-r1.ebuild 8243 BLAKE2B 2fb6301048727460fb3defc8ccde74b05807a0492ee7429924301e94f36d5b8d75336c721e82e41737f3ce257e24506a4894633639a96e28233d6244d17f1fd6 SHA512 58174afb4c008e0aa18616ea0d06297577f01344398fe7fbcb2ee0d80570258eba9010134dbd4ef3218d0f31652c1de09ad3c6b7fa43282116ee97a2f7d7c6b8
 EBUILD portage-2.3.69.ebuild 8100 BLAKE2B 7f50fad1739d128b7437044bacb43338ee9638aeb79fad691824f0d4749a3432f7d62a1ba3ffbcd00f13eaa33e0089268d3c4d78628752861598a483ab3876b5 SHA512 8bc0ddfc45c8f2d63911be82d5cd38efd7a06697a08688624f86a7963c264d4f1cb9b1e7e8d0a45a321041556ecaad0ed4cfa2fefa13f24a867226c810016061
 EBUILD portage-2.3.75-r1.ebuild 8385 BLAKE2B fa5c198d971d729af8931afb0dad6cf9dd8c2b8a180ef931fb3c99c05555cfbacf3307e4c068023b6bd719d7934b0410340872edc5f67b18c63a9e728815c705 SHA512 1e70cdf522ba87b0202b724734c6afeb2d910c617eef3d260fdb5d6ca5bf16e84a8482602db3d6fcaf3dd7bdb6e7ecf5b5fe17f82361b2d227181e6d82654153
+EBUILD portage-2.3.76.ebuild 8117 BLAKE2B a4d7360426ea26118e2f845d65a23de19c1e766f098094389a2ba7132d7d3b7c2eae03928fbfb837e578bd523ac74708d2d4c8591a930b9dc3e6f52c55c7a3b8 SHA512 ccc722d645070edce7a371b295888959241350161afd4be2c844115c8966afcc3274d1ae3034ba946020ce08ccbcf606469e78e34181c2a37a21c287ea5c2111
 EBUILD portage-9999.ebuild 7909 BLAKE2B 1116fee5fe17096e2a5b33cce164c6dd8e1f7a8cb04716e0218d001df4a09e957541b8267f0bf92e2b7f80a868aa0aeb081a4f83d8fa9529e619e682b8f4b480 SHA512 8b0b42bf555c092fc43aedc3c38f9eb78f7ea77b315dda867aacaddae4f7eba05434accfad2aa91e4d1a31d9ebeb9453483d3a5d6e5cdb785bb4c30ef6aaaa79
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.76.ebuild b/sys-apps/portage/portage-2.3.76.ebuild
new file mode 100644
index 000000000000..b45fedf35292
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.76.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_5 python3_6 python3_7
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	python_export PYTHON_SITEDIR
+	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+}
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index 8dac6d63c502..55e8a2140a6e 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,3 +1,3 @@
 DIST qdirstat-1.4.tar.gz 2534241 BLAKE2B 70b84376a949ab3d74879bc78dac9d41c592ee9a4c60d27ad9d85ab09378f85a65209c78f7030f76e86e8e418803eef5ed1dadb07a1058ec38c13d753f6e3e61 SHA512 5711a78297f4224e4471ac14d8e42ee9ac746cc31315ff894dafa1db578eff4ff2a5c62edc525a49c523154a0de402f878200d96601c7924bf0273f0eac9ab74
 EBUILD qdirstat-1.4.ebuild 750 BLAKE2B 59d9375f0252d35560bbbd3d9759b88afa67352ee7cb81695fa0bcd6c36f901a916ab5da7262f7b6c6ef9c1b1115eb3e28a2c564798ff630fe4579580949b532 SHA512 017e639e30a60f021541c547863bc2cdad0b70cb2b62981de9a2cc1a64c32a406f2b71691f0a59898d521ef128acb10d7a2e633a5bde16941711b01cf8aee75f
-MISC metadata.xml 817 BLAKE2B 8b85dcd0fa17063f62cdccae24736113e0f7d4a28f98ea5aaa0f5e7b174a0ea07ef360964c1e3126f21d606f2d325ee739d82f1cae18a59629b6fc22f029bed0 SHA512 df21f35f46599c1beca42e699889aa6d1aa1b6fb6bb03e7ebff87667fbf4a3b92bf8362858aa0f6aafe4d57b25c9d679a3cb59f6a1590bd98dbcb95d61c3efa9
+MISC metadata.xml 733 BLAKE2B aeee605c2acccc13fe411e1858852c1e4b789ba78776a8c2939d554ecfc11db75312258852b56c6d04370e70a34e29ac00a4b91328ddd179e5103ba508ecf489 SHA512 2ec50f52984c0c8ffa7300cbae7a13a36fb614f4daa424525154efcf0f023792a8497744490a55207bf5cd2b64acf08d44ea851920f7482e416eb0f7b067c548
diff --git a/sys-apps/qdirstat/metadata.xml b/sys-apps/qdirstat/metadata.xml
index 8439819f2f80..b811e95a6aec 100644
--- a/sys-apps/qdirstat/metadata.xml
+++ b/sys-apps/qdirstat/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dracwyrm@gentoo.org</email>
-		<name>Jonathan Scruggs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Qt-based directory statistics: KDirStat without any KDE -- from
 		the author of the original KDirStat.
diff --git a/sys-apps/smc-sum-driver/Manifest b/sys-apps/smc-sum-driver/Manifest
index a3743b577261..fa58f8edb0a4 100644
--- a/sys-apps/smc-sum-driver/Manifest
+++ b/sys-apps/smc-sum-driver/Manifest
@@ -1,4 +1,4 @@
 AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
 DIST sum_driver_V1.6.0_20151201.tar.gz 1423921 BLAKE2B 76e2439148749b708a51e0d9c95545b53762f03793e6b2ea6e63e9f79aaad77432f728e94713e0cfd4085e8b090b6e0ff8e779e2627764e71794453cb7e02b49 SHA512 809fdf164e29aabde74306d966de7e07488d8dacc01963b56486477f23bdf3a469d059bc5d302aedbfd4b8dc854a82357747add2626cc22d0ab3898c7bc0a625
-EBUILD smc-sum-driver-1.6.0.20151201-r2.ebuild 854 BLAKE2B 1272340d41d5f6f2a9b00e15448481fe864287a8c16073e443b738420cd86f8aec21f3769df04d3e6e3228a6823932180c530b2cd657c12843b39ba9a28dd3c4 SHA512 e8d2463374e985c464f82d64b41a0a6aab337e20ad33021c627b63f70701256964a00e44186814fa1dd13e1ee93fa13670c2bd633b0297649f0084933b111f9e
+EBUILD smc-sum-driver-1.6.0.20151201-r3.ebuild 943 BLAKE2B 1c24eee001edb3e38528d07adc76ac7afa8b8e8fbcffb5c10c16f1b6b2f0997ad0c3c6f96ca614e2bfa14dfc4514d95836b1c9e62f767560087bf3d512ff2399 SHA512 cc243884ae3ab64d0eb6abcfed56c8f2ee852b13d24facdd5907139a961473a7a79f5a3f0ccf594c5ee691836259f8f03bff1b4f84effc00152115ed6e0a6ddf
 MISC metadata.xml 602 BLAKE2B 6bb453de4cd9a7cd7f52648c2994ac056bb756a8851659bd4075341e5d97a6cd81d056ef54cd4315ae25d6821ac684bafaee12d7928d7a998724e87af57cf05f SHA512 27d229c5f3ea94fb7098f4659edf321b048ecdba0624a41cfc53cec5b3d3c975914fc599494ebb03ae5dc8ea29993a23e90a9b7be76505cb7dcdf8ab1e3d9b5e
diff --git a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r2.ebuild b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r2.ebuild
deleted file mode 100644
index 825bec7d32ea..000000000000
--- a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="${PN//-/_}"
-MY_PV="$(ver_cut 1-3)"
-MY_P="${MY_PN/smc_/}_V${MY_PV}"
-
-DESCRIPTION="Supermicro Update Manager (SUM) kernel module"
-HOMEPAGE="https://www.supermicro.com"
-SRC_URI="${MY_P}_${MY_DATE}.tar.gz"
-
-KEYWORDS="-* ~amd64 ~x86"
-LICENSE="supermicro"
-SLOT="0"
-
-RESTRICT="bindist fetch mirror"
-
-S="${WORKDIR}"/${MY_P}/Linux
-
-BUILD_TARGETS="default"
-MODULE_NAMES="sum_bios(misc:${S})"
-
-pkg_nofetch() {
-	elog "Please contact the Supermicro support at support@supermicro.com,"
-	elog "in order to obtain a copy of ${A}"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_prepare() {
-	# Install new Makefile to respect users CFLAGS and LDFLAGS
-	cp "${FILESDIR}"/makefile Makefile
-
-	default
-}
diff --git a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r3.ebuild b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r3.ebuild
new file mode 100644
index 000000000000..c8dba118df71
--- /dev/null
+++ b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="${PN//-/_}"
+MY_PV="$(ver_cut 1-3)"
+MY_P="${MY_PN/smc_/}_V${MY_PV}"
+
+DESCRIPTION="Supermicro Update Manager (SUM) kernel module"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="${MY_P}_${MY_DATE}.tar.gz"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="supermicro"
+SLOT="0"
+
+RESTRICT="bindist fetch mirror"
+
+S="${WORKDIR}"/${MY_P}/Linux
+
+BUILD_TARGETS="default"
+MODULE_NAMES="sum_bios(misc:${S})"
+
+pkg_nofetch() {
+	elog "Please contact the Supermicro support at support@supermicro.com,"
+	elog "in order to obtain a copy of ${A}"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_prepare() {
+	default
+
+	# Install new Makefile to respect users CFLAGS and LDFLAGS
+	cp "${FILESDIR}"/makefile Makefile || die
+}
+
+src_compile() {
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+
+	linux-mod_src_compile
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 209000f8fd9b..e332aa540d33 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -11,9 +11,9 @@ AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
-DIST systemd-243-rc2.tar.gz 8239802 BLAKE2B 9ab6a12f6dff855265be381616601fb2caf79be810bba7f5c24fa6e91ae34d8d1ead0ae1b45c374e8c9752b883daba01863e5622ef1d34718e8390c0ad837cf0 SHA512 7e9b996c1eeb299fb971f2fd4a39fa62c7cc9178bacaaae6c168008dec438f392b949deb72d08f27060b3cde54b46b70f6a18b1bc70725a56ca2a28a1f96b6a1
+DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 EBUILD systemd-242-r6.ebuild 14156 BLAKE2B e3f993817df49534a0fa0960f7232ee6168330511bbba2deef09d58e0e3d1e6efa727bc5909151683b77604e51d872daf4d05346e5ef6e1daa3270e9b331d3ee SHA512 9a4e424d9cf0dffe5928d9238c6173d7376db0a7f4b9e547f49d939759c47d74e51ed00584ec0410c33474bae33f47b4f2053b204fe2c5236d2c3a0c10e0855a
-EBUILD systemd-242-r7.ebuild 14198 BLAKE2B 283552b4169b16da6b8fb30f1ae4d2a92198b06e415c78bd67f5e10b3b216042333c8e9256598784112fb77d888db864a0cfa5fd7ea4dcc5a66576f2eeebcdb1 SHA512 ad58cf819702049f283972cb422777ab087460a46e3b1cf4baa4db4b4ffd044e7d222198dc24cf86f0b5b51eacb35790c8ee9dd9c3d19725275bed29961ea8d0
-EBUILD systemd-243_rc2-r1.ebuild 13774 BLAKE2B f2e4e2d00e151684203b1029d60532204afaf0edd7583418ce639097ecc89a83848c81ac61b8809772d86974f3d078a713aca60869696f4dd22c3e4a962681ff SHA512 7da1b91da0f77f1da31f68f0b56f902dc3cbc128fe514c705c0576677f7911baebed8eeab3ee75bce791fac3b6d3ab9f7fed0bfbe013383f7fbf42b3205f0394
-EBUILD systemd-9999.ebuild 13737 BLAKE2B 1bfaba9766c5182b54dd9cceb42b21a8a3c0fbd215270b015c051b582e1b54dfec9a4c2efc3b0a839b210ccc3f193cfe88535447437d7dbcf181b0256080a521 SHA512 7aff86c80448ac59fdb2c7bee4774836a794f47fde879793e1cf67ad37cd046335831eb3beb3d81aa5d5f7b2f9115995e8d5658f32b97298a9d87c2d82e0750d
-MISC metadata.xml 2126 BLAKE2B 8478ef3f19109c9654e894b20148d06a38ae0ffc45d47425fd4275825ba2d28c1de8ebf2e0a67d30a1ce88df9cbf1a04ea3a57a2e37127378f6e3ee5f3efccfd SHA512 642f406a6aee2644920aefdfcd14fb956eab1de98054a9b68e0b4e5683b7ca9b7e3f6dbbfec0d5a21b2eb96fee3511deae0cb4cf69f799b20a04528151f51da8
+EBUILD systemd-242-r7.ebuild 14196 BLAKE2B 494abac3d6a55da39000cd4f5b56e749b52a1b33900d6da8306fba4048cbb4bb0faa9fc0549df3918b9e0775223616a3ba55021e89a79198bde22edea17e661a SHA512 607fff528417fbb69c0d6f6e47d46ce92b346365dc9f5a105b1de6d77ec61120de1ad26dfd905021208e5e621379e1e7b5169d83cc23d8664d51030a04e84c01
+EBUILD systemd-243.ebuild 14254 BLAKE2B 5abd2f9420fc33c4651f944cab9fed1f5bc109b3faf62e3e451ac4c072b572220f6d2ae49ee1ba553abac157b28ab296019eb3fc9ce63a723e2362741cd67573 SHA512 655c0da0e1d733324f023f17e4a509aea977f37f3e0765d9b4f36a38717530ca635d715d71452be3030d5064b3bd9e1fe686d33fe87a3dad42185166926344ed
+EBUILD systemd-9999.ebuild 14254 BLAKE2B 5abd2f9420fc33c4651f944cab9fed1f5bc109b3faf62e3e451ac4c072b572220f6d2ae49ee1ba553abac157b28ab296019eb3fc9ce63a723e2362741cd67573 SHA512 655c0da0e1d733324f023f17e4a509aea977f37f3e0765d9b4f36a38717530ca635d715d71452be3030d5064b3bd9e1fe686d33fe87a3dad42185166926344ed
+MISC metadata.xml 2144 BLAKE2B f98da35b929799e76331e0f4957f175db15fd8766542058520aeeb1cc762f46c4e3c4d40b1dd21da50a3416807359c383e323e17de175a1439d7faa4bb4be0af SHA512 6e5847187232637a1de5f0d8fad2d6ad0515d537206ea3a7bd2ccd9f17e67789f5c80ebf295554aa135325f2e4260217de6e9a6a7f21dd70945a94ebfc3bf0de
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 76658cc29c52..540f7dbef65c 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -11,7 +11,7 @@
 	<use>
 		<flag name="apparmor">Enable AppArmor support</flag>
 		<flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag>
-		<flag name="cgroup-hybrid">Default to hybrid cgroup hierarchy instead of unified.</flag>
+		<flag name="cgroup-hybrid">Default to hybrid (legacy) cgroup hierarchy instead of unified (modern).</flag>
 		<flag name="curl">Enable support for uploading journals</flag>
 		<flag name="cryptsetup">Enable cryptsetup tools (includes unit generator for crypttab)</flag>
 		<flag name="dns-over-tls">Enable DNS-over-TLS support</flag>
diff --git a/sys-apps/systemd/systemd-242-r7.ebuild b/sys-apps/systemd/systemd-242-r7.ebuild
index 481f75192aa2..8708f9a869ec 100644
--- a/sys-apps/systemd/systemd-242-r7.ebuild
+++ b/sys-apps/systemd/systemd-242-r7.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
diff --git a/sys-apps/systemd/systemd-243.ebuild b/sys-apps/systemd/systemd-243.ebuild
new file mode 100644
index 000000000000..267a18fcc1cf
--- /dev/null
+++ b/sys-apps/systemd/systemd-243.ebuild
@@ -0,0 +1,492 @@
+# Copyright 2011-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	acct-group/adm
+	acct-group/wheel
+	acct-group/kmem
+	acct-group/tty
+	acct-group/utmp
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	acct-group/systemd-journal
+	acct-user/systemd-journal-remote
+	acct-user/systemd-coredump
+	acct-user/systemd-network
+	acct-user/systemd-resolve
+	acct-user/systemd-timesync
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-devel/m4
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-generator-path-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Defi=$(meson_multilib)
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		-Didn=$(meson_multilib_native_use idn)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-243_rc2-r1.ebuild b/sys-apps/systemd/systemd-243_rc2-r1.ebuild
deleted file mode 100644
index 56cfe509a088..000000000000
--- a/sys-apps/systemd/systemd-243_rc2-r1.ebuild
+++ /dev/null
@@ -1,480 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
-		>=net-libs/gnutls-3.1.4:0=
-	)
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
-	pcre? ( dev-libs/libpcre2 )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	acct-group/adm
-	acct-group/wheel
-	acct-group/kmem
-	acct-group/tty
-	acct-group/utmp
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	acct-group/systemd-journal
-	acct-user/systemd-journal-remote
-	acct-user/systemd-coredump
-	acct-user/systemd-network
-	acct-user/systemd-resolve
-	acct-user/systemd-timesync
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-apps/hwids-20150417[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	sys-devel/m4
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}"/CVE-2019-15718.patch
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-generator-path-r1.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		-Didn=$(meson_multilib_native_use idn)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/{hwdb.d,rules.d}
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	local udevdir=/lib/udev
-	use split-usr || udevdir=/usr/lib/udev
-
-	rm -r "${ED}${udevdir}/hwdb.d" || die
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-save_enabled_units() {
-	ENABLED_UNITS=()
-	type systemctl &>/dev/null || return
-	for x; do
-		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-			ENABLED_UNITS+=( "${x}" )
-		fi
-	done
-}
-
-pkg_preinst() {
-	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${ENABLED_UNITS[@]} ]]; then
-		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index f00c416fa382..267a18fcc1cf 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -354,10 +354,7 @@ multilib_src_install_all() {
 	# Symlink /etc/sysctl.conf for easy migration.
 	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
 
-	local udevdir=/lib/udev
-	use split-usr || udevdir=/usr/lib/udev
-
-	rm -r "${ED}${udevdir}/hwdb.d" || die
+	rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
 
 	if use split-usr; then
 		# Avoid breaking boot/reboot
@@ -422,6 +419,22 @@ save_enabled_units() {
 
 pkg_preinst() {
 	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
 }
 
 pkg_postinst() {
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 441c22b49014..5dc53b8179f6 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -8,12 +8,9 @@ AUX sysvinit-2.92_beta-shutdown-h.patch 2341 BLAKE2B 255f9831d59721fb3f59f6caeb9
 AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31e507ea8331ae1e9b8b012570cdc4099a15c864f2abc92f84c44ef9dbd35dfe43c68e491d347266abaa0156536edae4c35231f17ccb SHA512 2f26201e8634b380dafdf42678cd0241a93f0e473f5c8680d4206d97dfe3510c2ceeb4cd066d1af3ae97fe411f7a5452a9586f8f5c5e65653bf9241fea1edaf0
 AUX sysvinit-2.95_beta-shutdown-h.patch 2752 BLAKE2B a7174eaf34d5f9547d5d79c16bf2d8129e71c9564fc0b60e5adb3f2dda998dbdea7a3ee9fbfd3f7bc29ec977f8d47de4581d77abd6e1cdb6feeab9633946251e SHA512 682e6afd6443ffef2cbac9898eca42546b0614a82b2a0c370015cf5373229c00170a22adabf54d10a0f85da7b19de39334b05ef69874fa4003a9c74b7e416974
 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
-DIST sysvinit-2.94.tar.xz 120900 BLAKE2B e45a95246325e93ef49f11573924216937e238761cb9f5979ae2b272838fb3280b1d12c9553992271f7926dc7c7bc18e352a8019a70f54c592971fe043453804 SHA512 8d3b7b777f7c37cf5eaf73d4cdfad8ac54c6115577052bd7ddf3588da8fb7d16b812ffaade0ce300c2c6b7d2acd6e7778130544befc171eab174ee8766b3ec50
 DIST sysvinit-2.95.tar.xz 124576 BLAKE2B 1b0770e3bc7c5a32b8a634ab70d16854446816f9c22f57befb2602a8680d5d4a4adc51747b6199867ba73a3ac5118073a8bfa9ea4317de86b3b42867ae0cf6e7 SHA512 367990d166ec6dcc4de81e748f15035e2a4c2838da7336b064aeadac2db95ca77e8d11fb6aa7e7745874ef3e27118c9a68070062fffb16a886f32d6ab2529d28
-DIST sysvinit-2.96-beta.tar.xz 122212 BLAKE2B d819e0444b6d99129552b2ea6e1ab5b80d9b0967d68a53cd879995ca635ad54425a6a473fa2ea37ee43cd2f5bdfddffe1ad44f7115018ae3ec5925938ed1e72c SHA512 89116a473656033b974205f5eb296bc32fb558136511e087252248be8f444d0eebcb7c9473385913a00d15b9e5855068c1a8135d681114171728cd78ef278530
+DIST sysvinit-2.96.tar.xz 122164 BLAKE2B 10c28d3bb57fc744b66c3a7ac78912fb6a9d987e9f6f32f82953d23a9884020daa6fa8c7722e6d8145d9899f7f7dc623f69f885d3d8fbbcd313d0e69ffb66497 SHA512 1388398568ebfe53460796f8ab75a3ead6111612888ea36e8f1c0db4d41ef6f45fc217abb7804519ff1143a78d97c95b24e42c8c22c95a47b9436484bfb6f45d
 EBUILD sysvinit-2.93.ebuild 3575 BLAKE2B f327a05eaa2e82baa05b0473f31591da2e61cff22db7fb1e3f8a6302990cc70df166484dc138bb03f8494a32a21c5af4ee4adeaff9f37e1edfa0db702bcfd57b SHA512 159ca13a88b9868ec717fa8d786322d04cc7f67ea3e3ec32e0369060a295a43a33fe6a19d5f3be1b8d30f8dfb659d596b5c0d01f49fd1fa28cce1a150decb900
-EBUILD sysvinit-2.94.ebuild 3817 BLAKE2B dcf4a1ce3f2eb774783e0d3bab5a189e45f43bafefb05c8f6d60f3f09639c691576447c0b6922c974ed8f0f5ab7ecbacba1b427dcb569470163658c64dadaa06 SHA512 7b60c4537ad8f1d4bd70a3c922a8778501b89343ab103f5413322745077ae8c85c16344773746a8e7ae3ef1d185420c26fd30598e33b5641d57563d32f9c7179
 EBUILD sysvinit-2.95-r1.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e
-EBUILD sysvinit-2.95.ebuild 3812 BLAKE2B 945467b8f510628c055cfd83b9c5a36198b1aacdf5f05918a34b0478576c941eba6d690ba4523f10e729b5cdcd696643e01c8ceadf4374d49a371e1c5e090079 SHA512 5d0b8a20b6e2380e841cfa529ba867368db64725f776fafe3d4381ded00f3550906e6baa9a58b3eb065155d20f8c3376ab1ec0bac50f27dadc18b9ff9da71352
-EBUILD sysvinit-2.96_beta.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e
+EBUILD sysvinit-2.96.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.94.ebuild b/sys-apps/sysvinit/sysvinit-2.94.ebuild
deleted file mode 100644
index 51fe022e6ebd..000000000000
--- a/sys-apps/sysvinit/sysvinit-2.94.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="selinux ibm static kernel_FreeBSD"
-
-CDEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-DEPEND="${CDEPEND}
-	virtual/os-headers"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-shutdown )
-	!<sys-apps/openrc-0.13
-"
-
-S="${WORKDIR}/${P/_*}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615
-	"${FILESDIR}/${PN}-2.92_beta-shutdown-h.patch" #449354
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^CPPFLAGS =$/d' \
-		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
-		src/Makefile || die
-
-	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# logsave is already in e2fsprogs
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
-		-e '/^MAN8/s:\<logsave.8\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use kernel_FreeBSD ; then
-		sed -i \
-			-e 's/linux/cons25/g' \
-			-e 's/ttyS0/cuaa0/g' \
-			-e 's/ttyS1/cuaa1/g' \
-			inittab #121786
-	fi
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	append-lfs-flags
-	export DISTRO= #381311
-	export VERSION="${PV}"
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	# dead symlink
-	rm "${ED%/}"/usr/bin/lastb || die
-
-	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] ; then
-		if [[ -e /dev/initctl && ! -e /run/initctl ]]; then
-			ln -s /dev/initctl /run/initctl
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
-	# Required for new bootlogd service
-	if [[ ! -e "${EROOT%/}/var/log/boot" ]] ; then
-		touch "${EROOT%/}/var/log/boot"
-	fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-2.95.ebuild b/sys-apps/sysvinit/sysvinit-2.95.ebuild
deleted file mode 100644
index f02f81e06455..000000000000
--- a/sys-apps/sysvinit/sysvinit-2.95.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="selinux ibm static kernel_FreeBSD"
-
-CDEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-DEPEND="${CDEPEND}
-	virtual/os-headers"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-shutdown )
-	!<sys-apps/openrc-0.13
-"
-
-S="${WORKDIR}/${P/_*}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615
-	"${FILESDIR}/${PN}-2.95_beta-shutdown-h.patch" #449354
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CPPFLAGS =$/d' \
-		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
-		src/Makefile || die
-
-	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# logsave is already in e2fsprogs
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
-		-e '/^MAN8/s:\<logsave.8\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use kernel_FreeBSD ; then
-		sed -i \
-			-e 's/linux/cons25/g' \
-			-e 's/ttyS0/cuaa0/g' \
-			-e 's/ttyS1/cuaa1/g' \
-			inittab #121786
-	fi
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	append-lfs-flags
-	export DISTRO= #381311
-	export VERSION="${PV}"
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	# dead symlink
-	rm "${ED}"/usr/bin/lastb || die
-
-	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] ; then
-		if [[ -e /dev/initctl && ! -e /run/initctl ]]; then
-			ln -s /dev/initctl /run/initctl
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
-	# Required for new bootlogd service
-	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
-		touch "${EROOT}/var/log/boot"
-	fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-2.96_beta.ebuild b/sys-apps/sysvinit/sysvinit-2.96.ebuild
index 6dd6484ee442..6dd6484ee442 100644
--- a/sys-apps/sysvinit/sysvinit-2.96_beta.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.96.ebuild
diff --git a/sys-apps/uam/Manifest b/sys-apps/uam/Manifest
index e0ad8332aebc..b5448a7b8a88 100644
--- a/sys-apps/uam/Manifest
+++ b/sys-apps/uam/Manifest
@@ -1,4 +1,4 @@
 DIST uam-0.3.2.tar.bz2 60508 BLAKE2B 35accde4ae392f33af0d1c0f30069975e30691927dff33ac754d00f1de7b30d1b789e9797637f9701913796b5993add4b2405294fa47b1fbd6f8d6e1946b1ad8 SHA512 4a4ee9286b3762227fc5a03a10998cb3b4a2f110cd648bb2ed45f400e31218a17d3929c83450e9190255bda1f22f4001a7f33842999b79c27aa12fc11f286273
-EBUILD uam-0.3.2-r1.ebuild 1475 BLAKE2B 9639fac307ee43155a8847d49cd1cae4cd1feae0535df422fc2f24114e56cc66a919249edbf4dfcecd59b1d690ab7b5c6590bb912dcb5534cd35670012370409 SHA512 fc315fe69d91a5c5d1b1c186322fbd19d381cacc5c6ec95bb2041e7a9f9b3498efa7f0fa599776923c57bd92835867f2d5fe53e02ee37454dcccedd1af655da1
-EBUILD uam-9999.ebuild 1509 BLAKE2B 8fee1d4104540955b2cd074fd902ed56ee2777f315e88850d096461bfd76c16f93963dcc8b0d60629fd0226e8c2b95bbbc73446c7afa7c9f572e82552022642d SHA512 d410de4ba3041a770b13edb3365b896e6548611748168f4031b89d090718c3e600cfe94c294c6e3842ca00cd1a1a10cc35fb8498c028018474e710253bd7d7a6
+EBUILD uam-0.3.2-r1.ebuild 1280 BLAKE2B f8e7a223e9441a100beec69b3397431aa2cec1f82ae57816c956cbdb8b2b0c774da17c39905892e28674b849cfd916a2a878281943e0523d1fcf4f3cbeeefadc SHA512 e0e6a2a988173a88b4d95fb77ddb3b215ce785670085eda00d5e889a876c360c049e3dcd1b39386ac1a0d05600469d63335c1d705ab43c981388d1bc31842eea
+EBUILD uam-9999.ebuild 1314 BLAKE2B 68fea581b335c0cbbd63d8662e7133d101a7d15a626209b55bb06cecb32ca4929c5c9557d3faa176d1e7746bc0482d66f02f0aae49932cdfada801b168a5dd5d SHA512 2a376133d0cf8413247b5435812fe98a8ecc52d069ff16696eeacbdec6451245afbf5f1f71b2a0aae98e1a6bad6b4ea533aa24ec5217e70dadfee1dfbee6536d
 MISC metadata.xml 714 BLAKE2B fe8e8accd2c75c3aa51ce152676480d221a02e009db51874118ad939350c22c01bd171fe5d8628b626b0bf399df31b62f24303496768e214a0392979101ed128 SHA512 a344cc7080f63224d58604c26db1923afbe06b6bae3bd839f72e8f1cd8b6e41fc01e2eb46b135e8b8dfcb1217fc5ad507c0e86315c833a2d2b0541a6c3a53078
diff --git a/sys-apps/uam/uam-0.3.2-r1.ebuild b/sys-apps/uam/uam-0.3.2-r1.ebuild
index eddf29d0f8aa..e22ef2bb8000 100644
--- a/sys-apps/uam/uam-0.3.2-r1.ebuild
+++ b/sys-apps/uam/uam-0.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit udev user
+inherit udev
 
 DESCRIPTION="Simple udev-based automounter for removable USB media"
 HOMEPAGE="https://github.com/mgorny/uam/"
@@ -14,16 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="
+	acct-group/plugdev
+	virtual/udev"
+DEPEND="virtual/pkgconfig"
 
 pkg_postinst() {
-	# The plugdev group is created by pam, pmount and many other ebuilds
-	# in gx86. As we don't want to depend on any of them (even pmount is
-	# optional), we create it ourself too.
-	enewgroup plugdev
-
 	elog "To be able to access uam-mounted filesystems, you have to be"
 	elog "a member of the 'plugdev' group."
 	elog
diff --git a/sys-apps/uam/uam-9999.ebuild b/sys-apps/uam/uam-9999.ebuild
index 4aa949336985..3a247b31bd2c 100644
--- a/sys-apps/uam/uam-9999.ebuild
+++ b/sys-apps/uam/uam-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools git-r3 udev user
+inherit autotools git-r3 udev
 
 DESCRIPTION="Simple udev-based automounter for removable USB media"
 HOMEPAGE="https://github.com/mgorny/uam/"
@@ -15,9 +15,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="
+	acct-group/plugdev
+	virtual/udev"
+DEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
@@ -25,11 +26,6 @@ src_prepare() {
 }
 
 pkg_postinst() {
-	# The plugdev group is created by pam, pmount and many other ebuilds
-	# in gx86. As we don't want to depend on any of them (even pmount is
-	# optional), we create it ourself too.
-	enewgroup plugdev
-
 	elog "To be able to access uam-mounted filesystems, you have to be"
 	elog "a member of the 'plugdev' group."
 	elog
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index a35f52f0376b..0ad31c28b155 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -2,7 +2,5 @@ AUX udevil-0.4.3-flags.patch 1051 BLAKE2B d9c6ad984ac5ef75f20226f7d2e2a3ce73126a
 AUX udevil-0.4.4-include-sysmacros.patch 398 BLAKE2B 36369bc56a5d3b66dd455f8fc481481156a4fa2b005046e7718ca186a2c3a1b980456d0025ffe3e25db476c91b3011fa5a3a209f270847508e78aaf2081c1b2a SHA512 ce9070dcce7fb0117e50cda0f8b27f493a24f881a9e11fef2024ff3e3b70a1804bb7beef35c9935247baa1f74a499a0ad928a9ff7dbcc586b8c7ee26c5a57776
 AUX udevil-0.4.4-stat.patch 234 BLAKE2B 834ac0c306e4f13cea623304637729e285ff5d286b40e6b4a05f8a8acbf4ce8ff95d6552b6274e01de22ebfc3ee683376decb2de2afa70b56d66bc944a325590 SHA512 92a9889e3c70e3b9b0bdd4f6470ba0368a69d42eb852f10bcf00bb1f06ae126ea1579cfaaff15127e359c790f0672c655b34efddb7c27fe88addee70ec4d7583
 DIST udevil-0.4.4.tar.gz 477254 BLAKE2B 16a1980da8b3b98e36921c8e2fe6490c495066178dd928695a07eb8d5d7367cae49e314983f251a1ec684bd16a34286ea4ccc83329c9af0dd71af84c77ced20d SHA512 adce4916e06d1cc4965521abbcbc2901e53930691167f431cb18e28d3ef8bde740e95a6a5f40dfc58dfd7b4b661b4475d3dd2b6174a5d7a55ae7c65629b82327
-EBUILD udevil-0.4.4-r1.ebuild 1929 BLAKE2B 2aa9974037fc6a8e839a103c1a9f155236305de2521752b4570df6d251f1c1ae1f562e43ff4f056cf2a4f12436757a09e99fe11d9f31d8843ccc6922ac4c1af9 SHA512 d485071b991959dc45476bf9d0f54264c39386e8698e93beb3a0ac4eb8741937558e418a8c6353328bf9ab40d69fceee8f98afe48ab64eef777b3efcb5bceee3
-EBUILD udevil-0.4.4-r2.ebuild 1983 BLAKE2B f55a86aecb963c18879a78715dc1d91dea20474443ce1b221049cb6cc1a89771d7f1f1a336a5e2c82fec6b8cee3865a4f40ed1841ec6618d77cd97d711625971 SHA512 c744b083e8c0becbb09804c6e0c41704469f3a226588d4e36cd9aedbcca35bd51ee1ac2838a893879fa7b712e350154d680e8a291d5feccb5e637429506f4ff6
-EBUILD udevil-0.4.4-r3.ebuild 1981 BLAKE2B 41c282b74f6add017ea962267a8430115f0fc4776b9d39fde351351fa405bf054843a4c74384ee70e824c4ecc6fd18548ecd39e821ed90b51876566892fa43d0 SHA512 287d08a8535aa11394a26a4d6f995ad344cb1bbc2ed2c53781d6e2df5ede3a875d0ae301105e122bccedf1481cfd3872e3d99697d97571d2ac0c099545e0affe
+EBUILD udevil-0.4.4-r3.ebuild 1960 BLAKE2B a1aec5c2fd909c3b0361651bb39771bb88dcb939654af6a6e149b2407453e15693d19a15293a63400e9e7279c8dc056edf62f87c7494a8cd2554896de904c2ff SHA512 e1a6f76c8e7e1423288fb3c486bffbaf37b28ec3975e30c8d857f8f369cea6060c9f373358b9f4cf0b2c731efaf3a2254b8d71978715c3652d07c3cdbaa48489
 MISC metadata.xml 250 BLAKE2B 0a529fe4be14917719f846d11e5d49e7129b42ec81e665a0895c29fe63ea1300d30a5e470b9c0c06f18d214a862cd02669c7e3f92f174aa21339b84e29dd3f14 SHA512 6b612fb510b795abda0fb36e0440a98c315e1d09b397e2865f8eea7b740763f93673a19cb356e8366ace8f00f1c4e2e4246d74d6c4fa87e3427300d33f975537
diff --git a/sys-apps/udevil/udevil-0.4.4-r1.ebuild b/sys-apps/udevil/udevil-0.4.4-r1.ebuild
deleted file mode 100644
index 73596bdd436e..000000000000
--- a/sys-apps/udevil/udevil-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch user
-
-DESCRIPTION="mount and unmount removable devices without a password"
-HOMEPAGE="https://ignorantguru.github.com/udevil/"
-SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-shells/bash-4.0:*
-	dev-libs/glib:2
-	sys-apps/util-linux
-	virtual/acl
-	>=virtual/udev-143"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup(){
-	enewgroup plugdev
-}
-
-src_prepare() {
-	# This works for 0.4.4 too, no sense copying the patch
-	epatch "${FILESDIR}"/${PN}-0.4.3-flags.patch
-	epatch "${FILESDIR}"/${PN}-0.4.4-stat.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-setfacl-prog="$(type -P setfacl)" \
-		--enable-systemd
-}
-
-src_install() {
-	default
-	fowners root:plugdev /usr/bin/udevil
-	fperms 4754 /usr/bin/udevil
-}
-
-pkg_postinst() {
-	einfo
-	elog "Please add your user to the plugdev group"
-	elog "to be able to use ${PN} as a user"
-	elog
-	elog "Optional dependencies:"
-	elog "  gnome-extra/zenity (devmon popups)"
-	elog "  net-fs/davfs2      (mount WebDAV resources)"
-	elog "  net-fs/cifs-utils  (mounting samba shares)"
-	elog "  net-fs/curlftpfs   (mounting ftp shares)"
-	elog "  net-fs/nfs-utils   (mounting nfs shares)"
-	elog "  net-fs/sshfs       (mounting sftp shares)"
-	elog "  virtual/eject      (eject via devmon)"
-	if ! has_version 'sys-fs/udisks' ; then
-		elog
-		elog "When using ${PN} without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See https://ignorantguru.github.com/${PN}/#polling"
-		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
-	fi
-}
diff --git a/sys-apps/udevil/udevil-0.4.4-r2.ebuild b/sys-apps/udevil/udevil-0.4.4-r2.ebuild
deleted file mode 100644
index a75cf290506c..000000000000
--- a/sys-apps/udevil/udevil-0.4.4-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools user
-
-DESCRIPTION="mount and unmount removable devices without a password"
-HOMEPAGE="https://ignorantguru.github.com/udevil/"
-SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-shells/bash-4.0:*
-	dev-libs/glib:2
-	sys-apps/util-linux
-	virtual/acl
-	>=virtual/udev-143"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup(){
-	enewgroup plugdev
-}
-
-PATCHES=(
-	# This works for 0.4.4 too, no sense copying the patch
-	"${FILESDIR}"/${PN}-0.4.3-flags.patch
-	"${FILESDIR}"/${PN}-0.4.4-stat.patch
-	"${FILESDIR}"/${PN}-0.4.4-include-sysmacros.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-setfacl-prog="$(type -P setfacl)" \
-		--enable-systemd
-}
-
-src_install() {
-	default
-	fowners root:plugdev /usr/bin/udevil
-	fperms 4754 /usr/bin/udevil
-}
-
-pkg_postinst() {
-	einfo
-	elog "Please add your user to the plugdev group"
-	elog "to be able to use ${PN} as a user"
-	elog
-	elog "Optional dependencies:"
-	elog "  gnome-extra/zenity (devmon popups)"
-	elog "  net-fs/davfs2      (mount WebDAV resources)"
-	elog "  net-fs/cifs-utils  (mounting samba shares)"
-	elog "  net-fs/curlftpfs   (mounting ftp shares)"
-	elog "  net-fs/nfs-utils   (mounting nfs shares)"
-	elog "  net-fs/sshfs       (mounting sftp shares)"
-	elog "  virtual/eject      (eject via devmon)"
-	if ! has_version 'sys-fs/udisks' ; then
-		elog
-		elog "When using ${PN} without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See https://ignorantguru.github.com/${PN}/#polling"
-		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
-	fi
-}
diff --git a/sys-apps/udevil/udevil-0.4.4-r3.ebuild b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
index 0dede83db0ee..fdae0cfa0d3d 100644
--- a/sys-apps/udevil/udevil-0.4.4-r3.ebuild
+++ b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools user
+inherit autotools
 
 DESCRIPTION="mount and unmount removable devices without a password"
 HOMEPAGE="https://ignorantguru.github.com/udevil/"
@@ -14,7 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND=">=app-shells/bash-4.0:*
+RDEPEND="
+	acct-group/plugdev
+	>=app-shells/bash-4.0:*
 	dev-libs/glib:2
 	sys-apps/util-linux
 	virtual/acl
@@ -24,10 +26,6 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-pkg_setup(){
-	enewgroup plugdev
-}
-
 PATCHES=(
 	# This works for 0.4.4 too, no sense copying the patch
 	"${FILESDIR}"/${PN}-0.4.3-flags.patch
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 811da035a4da..daaf0b26df59 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/google-authenticator/Manifest b/sys-auth/google-authenticator/Manifest
index df4356c8ad5e..d3d9f85b3c2a 100644
--- a/sys-auth/google-authenticator/Manifest
+++ b/sys-auth/google-authenticator/Manifest
@@ -1,6 +1,4 @@
-DIST google-authenticator-1.04.tar.gz 54019 BLAKE2B 06afb1be1ceabb68bb7ba94921af415fe1dfd68b3b1ed75b58b3c5a58901ec482ae11063f487db0a7032868e833644022335ad9844f54734c2ad78c514f255a8 SHA512 e4b8ad74301312e17edd0a7f25257086fd805c8d5215b06b71d96e9a64a71b2c87d0c5a532d9eca21d6d67e30c02c2c2c77dbd338a2f49af25c32dcd355ee98e
 DIST google-authenticator-1.05.tar.gz 57778 BLAKE2B c31d7929e2aacffc159ee5384f6f31498585819b848f4f8b026519cf2f2fc566b8533e007844c64d348f1cf423a7175b3221f879c5c1ead360c4f1b3acea57ed SHA512 d97b26c6181dbce0612628484db37b1bf61e984fb2fb3d4974d04038e564404aa17415368dba524f0d17d96ec8d57ae4129b27f0c672d849d16ef03941d87996
-EBUILD google-authenticator-1.04-r1.ebuild 1256 BLAKE2B 6719a49bc90468a752125b7a9c123d4691210602635925e12756b28fccdef35d0633dc7479230613b0c1e1300079d9e7b7a41e615fdbc6dcb7a30954c843fe6e SHA512 4d05c0f31011bf8899554bf6de92d2d621c3528d73072d8904387c2ab3662506a5d39b5ae812bdd5b30103e512707d382ff58044d0b72d0776eaa74f74cf9e88
 EBUILD google-authenticator-1.05.ebuild 1262 BLAKE2B 3b27489b8d18d5805611098bbfaf343db4c80a392617b3b902b9a63141fe731e3802378d4817fe8b7aedb522a5b3ada5617cc825d71f169063b77f7942255586 SHA512 c76193bd06000d3eb5b207eec16942eebc5bb096ce5be5fdd72dd5b78fef9e2b07beafd390d94a95933acd504ab49cb177625291ad3ffecaf3702eb3f7a5eb4f
 EBUILD google-authenticator-9999.ebuild 1256 BLAKE2B 6719a49bc90468a752125b7a9c123d4691210602635925e12756b28fccdef35d0633dc7479230613b0c1e1300079d9e7b7a41e615fdbc6dcb7a30954c843fe6e SHA512 4d05c0f31011bf8899554bf6de92d2d621c3528d73072d8904387c2ab3662506a5d39b5ae812bdd5b30103e512707d382ff58044d0b72d0776eaa74f74cf9e88
 MISC metadata.xml 262 BLAKE2B 9190d29ce12a5f82e0fc23c1cfb1bbd8642fe74392e1cbfcbac723b93255048ab06bcafc1b94ff52afe63be6dc1856f27b21022aab5357ae1f5b0204fd5df169 SHA512 fe36d12281e055298607afc0209c8bc1d3a3b9d61464b6f0d69b98b2d38b9c25bf6c979392be9427fd1ad4621b49b8e6c4b41a53ef28d4696150d1ee4525d8c3
diff --git a/sys-auth/google-authenticator/google-authenticator-1.04-r1.ebuild b/sys-auth/google-authenticator/google-authenticator-1.04-r1.ebuild
deleted file mode 100644
index 2d682decb665..000000000000
--- a/sys-auth/google-authenticator/google-authenticator-1.04-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools multilib
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/google/google-authenticator-libpam.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/google/google-authenticator-libpam/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	S="${WORKDIR}/google-authenticator-libpam-${PV}"
-fi
-
-DESCRIPTION="PAM Module for two step verification via mobile platform"
-HOMEPAGE="https://github.com/google/google-authenticator-libpam"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/pam"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# We might want to use getpam_mod_dir from pam eclass,
-	# but the build already appends "/security" for us.
-	econf --libdir="/$(get_libdir)"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "For further information see"
-		elog "https://wiki.gentoo.org/wiki/Google_Authenticator"
-		elog ""
-		elog "If you want support for QR-Codes, install media-gfx/qrencode."
-	fi
-}
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 11d2161af122..ef8c4cd49fac 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,4 +1,6 @@
 AUX libfprint-0.8.2-fix-implicit-declaration.patch 4831 BLAKE2B ec61d1ee189549f4456634b5b0157f32c61b2255330681b96bc50c73d9a5d51c1058f4f82b979ca4695d9d1065b0623e86be943f98c1582725bcddda0630156b SHA512 afd4e7c5ee65a91b17aa8bec4c6a0ba5b972e9f2586a0cfa7adc823d2a1f8d2378ed28928c5108870d2347f3edb2f343a24b2eaef6c015b7650834b4d76ceb73
 DIST libfprint-0.99.0.tar.gz 473925 BLAKE2B 799e3600393e4b25f7b0685ff0456ca391e5fcaef36e5b4475371cd07c848e40820dbbdc5a241fe11c6ee08b818380967129f85e177b5d8714b9dbc4d7b68ea1 SHA512 eca1d45baa23b7db1fcc5d7a9a396fe504aadc6ec2e68da32b5415fb0fff1227566d579271e0b34895ce7f3baa55314a0ccd20bb8c4adba253063b7b61284748
+DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271c1932ca5126b7bd6c82fafee24aff393c0fe223fef018a34a409647065d5f98a999c00f0e7a879e33bdfcd3cb SHA512 2d7f569368035cce0a579ef3412a1961c28aab254ae6174ce9ad11ce97b3dce824d0c6123adac12718cb074439e4d5b93bf978e5341824f179231d1faa219a26
 EBUILD libfprint-0.99.0.ebuild 1062 BLAKE2B ed6620cb8f8f1da04c4ea8cc68d5f08a491ad7199816bda0514451dd43fdbca9e6176b155ae178a6b994874da2fd2a836b9d343293ae1a9728266bdb825268a7 SHA512 422ca65e9ecbc14b8ac37ef608a19d806f0435778eeb8b61234a59add034c07d1c02d5b1b2aefe4c64979a533181550ab2ff425e6d73ab580ae74738b61271cc
+EBUILD libfprint-1.0.ebuild 1070 BLAKE2B e0e493c3286514549b4649c595d4bc90b133891973e5826c572381d19e1bdcc20c70253e585ccbe0cebf6f3a9ce8d54d3d0a81468d04dabbed0872bd1b025d04 SHA512 8d0a321813e7330e385d7fc2f7f7c361cd6c04a4347877c0a78b289d9ecdcd7a885cd33847a56d626369f8f23476448c68c7d392606254bbc777427e0c74d091
 MISC metadata.xml 347 BLAKE2B dd0d99ac1a5a8cc925618bc556216a23f14fab90dd2e1d66747e4af3fd64d410812aac366a0e11cc169af7345c8bbf304577da5a1faf75f557bb4ba18033fb0f SHA512 f3303670a2e7d4b30732d335b313edda6c97952f2f6290ff6b1d67a8a237e147ba7c7c4edcb58994679ff9cbf606fb82b79bec1ba840a22b46ee21cfd26aefc9
diff --git a/sys-auth/libfprint/libfprint-1.0.ebuild b/sys-auth/libfprint/libfprint-1.0.ebuild
new file mode 100644
index 000000000000..b3d49b6892ca
--- /dev/null
+++ b/sys-auth/libfprint/libfprint-1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson udev
+
+DESCRIPTION="library to add support for consumer fingerprint readers"
+HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint"
+SRC_URI="https://github.com/freedesktop/libfprint/archive/V_$(ver_rs 0-3 '_').tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="dev-libs/glib:2
+	 dev-libs/nss
+	 virtual/libusb:1=
+	 x11-libs/gtk+:3
+	 x11-libs/pixman
+	 x11-libs/libX11
+	 x11-libs/libXv"
+
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( ${FILESDIR}/${PN}-0.8.2-fix-implicit-declaration.patch )
+
+S="${WORKDIR}/${PN}-V_$(ver_rs 0-3 '_')"
+
+src_configure() {
+		local emesonargs=(
+			-Ddoc=false
+			-Dx11-examples=$(usex examples true false)
+			-Ddrivers=all
+			-Dudev_rules=true
+			-Dudev_rules_dir=$(get_udevdir)/rules.d
+			--libdir=/usr/$(get_libdir)
+		)
+		meson_src_configure
+}
diff --git a/sys-auth/pam-afs-session/Manifest b/sys-auth/pam-afs-session/Manifest
index a26f8512d4cc..66371168d35f 100644
--- a/sys-auth/pam-afs-session/Manifest
+++ b/sys-auth/pam-afs-session/Manifest
@@ -1,7 +1,3 @@
-DIST pam-afs-session-1.3.tar.gz 98643 BLAKE2B 0366a7b223e2d58f19a32286e7464b917976d5da2c377ebbf55f5e1de5c476bca68a93de87e1e627db47bc0ad3d8eda6e36c50b1bfae21262f5567d90981725c SHA512 a9019551a9ac35db4a5b7a430b01aac63561828ddef2c63fa751696aa57aa52d2769f8008b214222b9f2933be69134d7bb6750460bfa23c3b7df098886a575ea
-DIST pam-afs-session-1.5.tar.gz 101464 BLAKE2B 7713feb40997bfbd05499a761845eb17986802a949e64fde55bcffa60f8364da3c860dd03fa647ccaa4a2b628da5e3f52948987b54aece756319670ef563a6f0 SHA512 a0f449a1dd3365158fbaee1ac9719dcf0358c01234e0aad29b3738020a0fc0a3ec7328afbbd5d661db47e357c5a57f36200c03bfe7684c159b3099384313059e
 DIST pam-afs-session-1.6.tar.gz 115666 BLAKE2B f57e24fdccc803e5074b814a74309e3278678a6c45ce5a99b8c317eaafbc7ab9d25bae58b76774d51b08ed51db4d0f2c7743ca4ce08497ddb2207253f8071264 SHA512 ac7bc1af43de5d08e6893b7411a0004e20a871f572a86c0322b883a45eb566717b8db77c3ad4825daeb89ab04039c6412cde6342056d544cb2189093ea95381f
-EBUILD pam-afs-session-1.3.ebuild 624 BLAKE2B da58330bec02d0807871b702a4487847b40a2ed424a61548b0cd6bc80c61c42073bd584af6d20857f40b9755b99759c18aa3f572e41c4bc8cd4a9d86a6dfdb34 SHA512 ee2fdf93bc11f56e16570d17ddc60625eaff83a3348f9218ce3377fa8e08e25fa5095ca73ba8a7cd3969fc8bdd27384d9efe3f475c613556fca7fa99a9286f36
-EBUILD pam-afs-session-1.5.ebuild 624 BLAKE2B da58330bec02d0807871b702a4487847b40a2ed424a61548b0cd6bc80c61c42073bd584af6d20857f40b9755b99759c18aa3f572e41c4bc8cd4a9d86a6dfdb34 SHA512 ee2fdf93bc11f56e16570d17ddc60625eaff83a3348f9218ce3377fa8e08e25fa5095ca73ba8a7cd3969fc8bdd27384d9efe3f475c613556fca7fa99a9286f36
 EBUILD pam-afs-session-1.6.ebuild 624 BLAKE2B da58330bec02d0807871b702a4487847b40a2ed424a61548b0cd6bc80c61c42073bd584af6d20857f40b9755b99759c18aa3f572e41c4bc8cd4a9d86a6dfdb34 SHA512 ee2fdf93bc11f56e16570d17ddc60625eaff83a3348f9218ce3377fa8e08e25fa5095ca73ba8a7cd3969fc8bdd27384d9efe3f475c613556fca7fa99a9286f36
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-auth/pam-afs-session/pam-afs-session-1.3.ebuild b/sys-auth/pam-afs-session/pam-afs-session-1.3.ebuild
deleted file mode 100644
index 2d895f991d10..000000000000
--- a/sys-auth/pam-afs-session/pam-afs-session-1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam
-
-DESCRIPTION="OpenAFS PAM Module"
-HOMEPAGE="https://www.eyrie.org/~eagle/software/pam-afs-session/"
-SRC_URI="https://archives.eyrie.org/software/ARCHIVE/${PN}/${P}.tar.gz"
-
-LICENSE="HPND openafs-krb5-a"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/krb5 virtual/pam"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf --with-kerberos || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dopammod pam_afs_session.so
-	doman pam_afs_session.5
-	dodoc CHANGES NEWS README TODO
-}
diff --git a/sys-auth/pam-afs-session/pam-afs-session-1.5.ebuild b/sys-auth/pam-afs-session/pam-afs-session-1.5.ebuild
deleted file mode 100644
index 2d895f991d10..000000000000
--- a/sys-auth/pam-afs-session/pam-afs-session-1.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam
-
-DESCRIPTION="OpenAFS PAM Module"
-HOMEPAGE="https://www.eyrie.org/~eagle/software/pam-afs-session/"
-SRC_URI="https://archives.eyrie.org/software/ARCHIVE/${PN}/${P}.tar.gz"
-
-LICENSE="HPND openafs-krb5-a"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/krb5 virtual/pam"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf --with-kerberos || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dopammod pam_afs_session.so
-	doman pam_afs_session.5
-	dodoc CHANGES NEWS README TODO
-}
diff --git a/sys-auth/sakcl/Manifest b/sys-auth/sakcl/Manifest
index cf51dda9cb1a..40248c33362b 100644
--- a/sys-auth/sakcl/Manifest
+++ b/sys-auth/sakcl/Manifest
@@ -103,4 +103,4 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 EBUILD sakcl-0.1.0.ebuild 2249 BLAKE2B f46fb927d596525daeb6c7b0b12a8844a576cf900ef45ef3e5c77afedab04ea79b41cda79af0a81f2691fe49f96e09b9ede4c7d378a4f385e7f75f0683801e60 SHA512 50f4847b09e33ff7ebcc6aef35bd9cfef473f920257177d944e74fc7aa10d403e215f35cebed85d2541d3a963edee57409a7663927d06dd2e9196456981b020b
-MISC metadata.xml 324 BLAKE2B 5d7fd03823e79ac64adb2876944d9d866eaeb26476cd32679b1bb786db219c83dde67975ef6520a3bf826c700119798a51cb9a6db5484d44cc2bfe116d6b7263 SHA512 b2a5ed95983a9fd4b630e92ae1b3579d2b31edcbf08c5564c9fd7303908c4eff2b02bb5e338202c84b78692a6c628bf92aaef592ae9d2116e05217cada9804bb
+MISC metadata.xml 244 BLAKE2B 7177daf39270783a69096a90fb14820fa3af27a866de3dfea5fbcef92f605529920277148ddea77a384d9732c06103a474d85de4739b32015ebbbec0acd01710 SHA512 d168bf106a3677d8ba817c0170783804105641c8a60e846e121a08d36193ac3a735b0d707524b9d975a11cee6e4516733e9da7edac1af9c9acf3c82f57cc65ce
diff --git a/sys-auth/sakcl/metadata.xml b/sys-auth/sakcl/metadata.xml
index 52445b8dfdd0..478166bcbd9a 100644
--- a/sys-auth/sakcl/metadata.xml
+++ b/sys-auth/sakcl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="gitlab">cardoe/sakcl</remote-id>
 	</upstream>
diff --git a/sys-auth/ykclient/Manifest b/sys-auth/ykclient/Manifest
index 3020d6ebd0d6..08d82b83ddf1 100644
--- a/sys-auth/ykclient/Manifest
+++ b/sys-auth/ykclient/Manifest
@@ -1,5 +1,3 @@
-DIST ykclient-2.14.tar.gz 386915 BLAKE2B fc102be66224551ec25ddd6e4008146fd569692bc6fcc331b5a35c95fa24d4ff3100cbfff78f5700ace0f12859c758d5eb12d2d56384f7548b92ac1a7a1d1b4a SHA512 743249f52eed1b07a5e582b644b4819e1defcd18a4c2d812b7738cb161e3152e2a49fba54fbf0fe3dfcda9f8477536660b9d2b0bb5c2eb84b106d435c91efe8d
 DIST ykclient-2.15.tar.gz 388738 BLAKE2B 10f56d97c337de5ae8fe15fb526f89208e8e69563cd7b2f1494e5a972da0a218c1c89e608ed490b7f17efc619bfeacfb51d1615b6eff36d4bfa5351cf80e4061 SHA512 a6e00309330225c681702616aa9f5d7e042f33a22ebe7719c2d71276f1a660ed0dc180d7f50c24b1c65d7bba6e2f2285d03037d504e926ac75506c24e6826279
-EBUILD ykclient-2.14.ebuild 519 BLAKE2B 755100be4c7b0f0ef757519b08fdfe749e1da3c59aa8fdd39057c93c7db04db30f0d4bbb7a655170a4d371aabd9fd696c28ea69a7f860cc764a5742550a90456 SHA512 94226ed6f721788db1c7c7eaf28912c95666697d4b8350e47c005a64d4175a245d331776d20606c5d5416fc71b9dfe0c04640ad2ff16afadf54aec64cfc1c8ce
 EBUILD ykclient-2.15.ebuild 494 BLAKE2B a7104c7f71c473d0a3f0ac03b8011d44f478decad2fefcb11e56d378e1d42231fa56baad5ca8a134be8ee8f258730296c3e53fa2a1b4bf24472854f25fe76471 SHA512 5f5a3fe705a77caf1f42f3960eedd93baf8786ffb130b969cb77d5eb93712af0245d3d9b4c8864e62e0128142494be56904d429fe4f3f32362bdc2f6229ff4af
 MISC metadata.xml 321 BLAKE2B 189e81fb02e188f57bb417a5036fe6812e90debb69aa73140f9f1375450b1cc37c6f947c313e3bd93298b9bce2805075e0ff0d7ef610aec7a35aa4b2f9465c95 SHA512 a19889c9f91a995a6c1f4c753481271de980fb1d3b7653ea4160f1b4eb3443d2260e3ddd223b05b508b6dfa607f86a4d0412b666a6915fffcd2bd07e954a2870
diff --git a/sys-auth/ykclient/ykclient-2.14.ebuild b/sys-auth/ykclient/ykclient-2.14.ebuild
deleted file mode 100644
index fb692e4fa79d..000000000000
--- a/sys-auth/ykclient/ykclient-2.14.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Yubico C client library"
-SRC_URI="http://opensource.yubico.com/yubico-c-client/releases/${P}.tar.gz"
-HOMEPAGE="https://github.com/Yubico/yubico-c-client"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="BSD-2"
-IUSE="static-libs"
-
-RDEPEND=">=net-misc/curl-7.21.1"
-DEPEND="${RDEPEND}"
-
-# Tests require an active network connection, we don't want to run them
-RESTRICT="test"
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index c91aba3a2a11..d15231aac03e 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -1,8 +1,3 @@
-AUX yubico-piv-tool-1.5.0-openssl110.patch 5114 BLAKE2B f21851a171dc94a7862b47d094d25e1c39aa874c62c8753b5b6d6f01dbcecfe2db7b94322a9e8326fe66f6c800199e407a964a4cdf3a2dca7e5fb88fa83e4290 SHA512 d7561f1d9e0cc2f1ffae2ae46ad140ac63ee77daac0e0fc8c4e975678e3abe33c9ac2181ce7c1e237ebbd54511ecd65271f463fec55672e6e904c2edafd97b0e
-DIST yubico-piv-tool-1.4.4.tar.gz 109397 BLAKE2B ed1299508cd5f90c662a184527ae696e7cd463b0e8d327413c8acff47d41de7393570798b9582e845262afb1780e0c759246980051a62335d7033de913147bb9 SHA512 3edc341fdbeeacfbf541adc37d0bd2b1df9777ca04e13bc1825e99a151008213b816ff811e83e623f52eb1400a8146c36a5a874fc5e26a89c9398e79a0e234e1
-DIST yubico-piv-tool-1.5.0.tar.gz 179092 BLAKE2B d15eed89699989ff545f18cf54fd42349fc81862e7bb3e182fad59d0604cc9729dedcc4aaa40d3f28c1d40b78ddbb5ed073c107cb233d0fa66a17a2ef1e29d68 SHA512 10d7f7a2f163e5f61d6f7463f2124d06213506bff39f3fe0c5b361f90f8bc372de97ab1fa8d6bfcb77659f086d71f8ff536a064ee8f300a620b929ee76e8f8b9
 DIST yubico-piv-tool-1.6.2.tar.gz 182957 BLAKE2B 0ca9bdcda68f7ee100078604854caccc5141ab01e40f894ae36c3175afa3989c1d0074ef0994e1e369d67499a9778e22f0c5a3cf930d1ba162b0ee0ddbc05f91 SHA512 fc72b9d381f10b63c8958b6c90c1ee97e3ef6b5fb283a9513e6f2ace972710c2872903f38350d9e4a3576b16cb0890b067dd55f5c125f443d353df3f628a9f96
-EBUILD yubico-piv-tool-1.4.4.ebuild 647 BLAKE2B 527ff9328cdc01228974aaa7b4f846ec22aea8dc1b7b63078784a6100293db1b4c0992558fb26fd9b33f5b7f72404e06a675141b11fd785919d5a981362af184 SHA512 96360ad999f9f1af146b2ea6f2795791221f8b0803b4f6de2accd20d03e2bf5b1b8091cf00cdb05aea52995664bdafabe3a3bbf695f909de85d44ec9d8e3a0ac
-EBUILD yubico-piv-tool-1.5.0.ebuild 1012 BLAKE2B 9f43dc92c0d0cdac06620494838a5f555d9bf7236289f48ed12a71a4579206202e0df3c471a88a2ac4fe1f680072b80ba13efb582f50826278174e36f679a672 SHA512 16de41a9380636e55add90752abc9cace3364607cfc6f4dac90fa3d11e5b59c7d28e8bdf14d702ec4216f324695ce96bb6a9eb0829dd1d8d45b48385e45727d2
 EBUILD yubico-piv-tool-1.6.2.ebuild 960 BLAKE2B 73eafe198e477a1d1cc0e5e49546c9fc4ee90f50359259e6715e63756ac21c2cbcca5aca0553f4109e0115cc43ff1080a5368cef7b4ac412676dad88e55e8c35 SHA512 007572085768d401170351ee740ff5fcbdfb18648ab889ed4ac3d5cbcfeeecb0cfe77451e6ac4a8da931e127375f17390abe95b465b954d3576d69ae526eb027
 MISC metadata.xml 254 BLAKE2B 469b2f4552e9db14cd35556a77359913ea2470137cd26ae2ecc0dd253c155a1e3bd04d19d16a8588c7e72b85057da2f3d62c5ca093992f121d9a32835f1b5ed4 SHA512 b30ec6f0a6c90d7e5d21552c23b34d6326e29fed03c766edf9da7a2a0848edbf694c0fca4fbb81cf291e607cd5de342b9e2f59a3ea5cf27e5b50d6dc2384e8b1
diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch
deleted file mode 100644
index 86b8bf9bedc9..000000000000
--- a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From c8372f27d791aa445e879ded4efe4a267e3ff48e Mon Sep 17 00:00:00 2001
-From: quentin <quentin@minster.io>
-Date: Mon, 26 Feb 2018 02:43:41 +0100
-Subject: [PATCH] Improve compatibility with OpenSSL 1.1.0
-
-* add missing headers
-* stop using deprecated APIs
----
- tool/util.c            |  1 +
- tool/yubico-piv-tool.c | 24 +++++++++++++++++++++++-
- ykcs11/openssl_types.h |  1 +
- ykcs11/openssl_utils.c | 11 +++++++++++
- 4 files changed, 36 insertions(+), 1 deletion(-)
-
-diff --git a/tool/util.c b/tool/util.c
-index de6b071..5b299ca 100644
---- a/tool/util.c
-+++ b/tool/util.c
-@@ -38,6 +38,7 @@
- #endif
- 
- #include "openssl-compat.h"
-+#include <openssl/bn.h>
- #include <openssl/evp.h>
- #include <openssl/x509.h>
- #include <openssl/rsa.h>
-diff --git a/tool/yubico-piv-tool.c b/tool/yubico-piv-tool.c
-index c40b027..f8b72b1 100644
---- a/tool/yubico-piv-tool.c
-+++ b/tool/yubico-piv-tool.c
-@@ -43,10 +43,12 @@
- #endif
- 
- #include "openssl-compat.h"
-+#include <openssl/bn.h>
- #include <openssl/des.h>
- #include <openssl/pem.h>
- #include <openssl/pkcs12.h>
- #include <openssl/rand.h>
-+#include <openssl/rsa.h>
- 
- #include "cmdline.h"
- #include "util.h"
-@@ -868,11 +870,19 @@ static bool selfsign_certificate(ykpiv_state *state, enum enum_key_format key_fo
-     fprintf(stderr, "Failed to set certificate serial.\n");
-     goto selfsign_out;
-   }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   if(!X509_gmtime_adj(X509_get_notBefore(x509), 0)) {
-+#else
-+  if(!X509_gmtime_adj(X509_getm_notBefore(x509), 0)) {
-+#endif
-     fprintf(stderr, "Failed to set certificate notBefore.\n");
-     goto selfsign_out;
-   }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   if(!X509_gmtime_adj(X509_get_notAfter(x509), 60L * 60L * 24L * validDays)) {
-+#else
-+  if(!X509_gmtime_adj(X509_getm_notAfter(x509), 60L * 60L * 24L * validDays)) {
-+#endif
-     fprintf(stderr, "Failed to set certificate notAfter.\n");
-     goto selfsign_out;
-   }
-@@ -1241,7 +1251,7 @@ static void print_cert_info(ykpiv_state *state, enum enum_slot slot, const EVP_M
- 
-   if(*ptr++ == 0x70) {
-     unsigned int md_len = sizeof(data);
--    ASN1_TIME *not_before, *not_after;
-+    const ASN1_TIME *not_before, *not_after;
- 
-     ptr += get_length(ptr, &cert_len);
-     x509 = X509_new();
-@@ -1299,13 +1309,21 @@ static void print_cert_info(ykpiv_state *state, enum enum_slot slot, const EVP_M
-     dump_data(data, md_len, output, false, format_arg_hex);
- 
-     bio = BIO_new_fp(output, BIO_NOCLOSE | BIO_FP_TEXT);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     not_before = X509_get_notBefore(x509);
-+#else
-+    not_before = X509_get0_notBefore(x509);
-+#endif
-     if(not_before) {
-       fprintf(output, "\tNot Before:\t");
-       ASN1_TIME_print(bio, not_before);
-       fprintf(output, "\n");
-     }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     not_after = X509_get_notAfter(x509);
-+#else
-+    not_after = X509_get0_notAfter(x509);
-+#endif
-     if(not_after) {
-       fprintf(output, "\tNot After:\t");
-       ASN1_TIME_print(bio, not_after);
-@@ -1950,7 +1968,9 @@ int main(int argc, char *argv[]) {
- 
- 
-   /* openssl setup.. */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   OpenSSL_add_all_algorithms();
-+#endif
- 
- 
-   for(i = 0; i < args_info.action_given; i++) {
-@@ -2191,6 +2211,8 @@ int main(int argc, char *argv[]) {
-   }
- 
-   ykpiv_done(state);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   EVP_cleanup();
-+#endif
-   return ret;
- }
-diff --git a/ykcs11/openssl_types.h b/ykcs11/openssl_types.h
-index 307f746..08170fc 100644
---- a/ykcs11/openssl_types.h
-+++ b/ykcs11/openssl_types.h
-@@ -31,6 +31,7 @@
- #ifndef OPENSSL_TYPES_H
- #define OPENSSL_TYPES_H
- 
-+#include <openssl/bn.h>
- #include <openssl/x509.h>
- #include <openssl/evp.h>
- #include <openssl/rsa.h>
-diff --git a/ykcs11/openssl_utils.c b/ykcs11/openssl_utils.c
-index 5a7f85d..edfe0ea 100644
---- a/ykcs11/openssl_utils.c
-+++ b/ykcs11/openssl_utils.c
-@@ -35,6 +35,11 @@
- #include "debug.h"
- #include <string.h>
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+# define X509_set_notBefore X509_set1_notBefore
-+# define X509_set_notAfter X509_set1_notAfter
-+#endif
-+
- CK_RV do_store_cert(CK_BYTE_PTR data, CK_ULONG len, X509 **cert) {
- 
-   const unsigned char *p = data; // Mandatory temp variable required by OpenSSL
-@@ -580,7 +585,9 @@ CK_RV do_pkcs_pss(ykcs11_rsa_key_t *key, CK_BYTE_PTR in, CK_ULONG in_len,
-           int nid, CK_BYTE_PTR out, CK_ULONG_PTR out_len) {
-   unsigned char em[RSA_size(key)];
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   OpenSSL_add_all_digests();
-+#endif
- 
-   DBG("Apply PSS padding to %lu bytes and get %d", in_len, RSA_size(key));
- 
-@@ -590,14 +597,18 @@ CK_RV do_pkcs_pss(ykcs11_rsa_key_t *key, CK_BYTE_PTR in, CK_ULONG in_len,
- 
-   // In case of raw PSS (no hash) this function will fail because OpenSSL requires an MD
-   if (RSA_padding_add_PKCS1_PSS(key, em, out, EVP_get_digestbynid(nid), -2) == 0) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     EVP_cleanup();
-+#endif
-     return CKR_FUNCTION_FAILED;
-   }
- 
-   memcpy(out, em, sizeof(em));
-   *out_len = (CK_ULONG) sizeof(em);
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   EVP_cleanup();
-+#endif
- 
-   return CKR_OK;
- }
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.4.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.4.ebuild
deleted file mode 100644
index 689eca071a9b..000000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Command line tool for the YubiKey PIV application"
-SRC_URI="https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-${PV}.tar.gz"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0=[-bindist]
-	sys-apps/pcsc-lite"
-DEPEND="dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig
-	${RDEPEND}"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild
deleted file mode 100644
index 7a72c9087c3f..000000000000
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Command line tool for the YubiKey PIV application"
-SRC_URI="https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-${PV}.tar.gz"
-HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool"
-
-LICENSE="BSD-2"
-SLOT="0/1"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/openssl:0=[-bindist]
-	sys-apps/pcsc-lite
-"
-DEPEND="${RDEPEND}
-	dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-"
-
-S=${WORKDIR}/${PN}-${P}
-
-PATCHES=( "${FILESDIR}/${P}-openssl110.patch" )
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		sed -i -e "/PKG_CHECK_MODULES(\[CHECK/d" configure.ac || die
-		sed -i -e "s/@CHECK_CFLAGS@//" -e "s/@CHECK_LIBS@//" */*/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	rm "${D}"/usr/$(get_libdir)/*.la || die
-}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 99b1b4e6702b..61a318a245c7 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index f9831406a951..74d9499be0a1 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -9,4 +9,4 @@ EBUILD syslinux-4.07.ebuild 1763 BLAKE2B 3d191d3bc66a6f7f45172f3aa677088f95f04d8
 EBUILD syslinux-5.10.ebuild 2219 BLAKE2B f0ac630efca67b5600c267e3aa7f17c4c227437bc0e9afac60cefaf46aaa30d78c57582e716060bd9b3a6e57e2bf2a84f002804d94be484be11d019fc98a163c SHA512 2c04378b5d5d89e2d92ed1bb8d9cd8752ef8aa5abf77098110f6df39c79e420c66dc6ab1fbababd36c60d84fba3ad442d3bf04d053bd8333d18f16b464839939
 EBUILD syslinux-6.03.ebuild 3410 BLAKE2B fdfef0f6d7e65af38cce92bb82cc75a582e97a753b7fbe1dd3b42c2ff31408b8c43c8c4502145d2684cdd33526a7b33ae9c2475c8e011a5a25fd4e041af68109 SHA512 f6a265acbf4e53c4bb142db3a36cef199edfface74fcf2d9755ffa5289c7716c5604055ae822e19f5d6ac4d9d5d94edb6398a0beb2640c61375b8e41a4944cbe
 EBUILD syslinux-6.04_pre1.ebuild 3478 BLAKE2B 1ac8784af49e9c7d4aa1ddad6b839421b91b561e3137e3f999bd61e77187b129b6717397df8ed734245cd9de1c7df2cde38ad0d40cc046a970074af1ca1781d2 SHA512 5247a0696b81fa4d78df0e50753456086d88fdc15b5bcdd7ef33a54dc67a1a941abdd1dea1c9de35d487c39981642665963489ce5741da18a6eee2fb28ac992e
-MISC metadata.xml 330 BLAKE2B bfb2aae9b13d232ca01f0ed74b99385c056ecbf59dba80999ff840c7885450158b44d32bdb9ec51f078e1d3c3f839cf6f9bf6432b0998aa62538d39dfc0a3850 SHA512 89e1dde9592f2cc3ed391f6f3ad29b877751b95b0c1bbb4416cd0c38f136c4a293f4687ebb5758adab540d6f3ff63f20f43847e294644c9e68ee84f3223657ac
+MISC metadata.xml 411 BLAKE2B d3b00622fd68d6ae1b4ba7aa30c33c790b2fbdc688637d3c573cb4496f3952a62f8ae20384badda70b9cbd4ed036e0884becd212d63ec015decc511f1ee7970e SHA512 e8256115d61eeef51be14bea35df6765b356471d145ad8e43e75e6301a4557d526af5fd99b8957fb02ecd9c4a7a0bd0d3db4790abef935887bff8a102709c518
diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml
index dbe176cabd0d..72e7472ad1ec 100644
--- a/sys-boot/syslinux/metadata.xml
+++ b/sys-boot/syslinux/metadata.xml
@@ -8,4 +8,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 771fc9dbf2ed..b230514f6ac5 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -2,8 +2,8 @@ AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1e
 AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a
 AUX 239-stat-0.patch 3553 BLAKE2B 225dd5e8e001a10a33c7ecb5c1378589b3eeecbea4fc746f27cc72d8eb8787c6966b8787c5922f0d0cefa28ac966c7c4f65ed341335d4105bc109df14110604c SHA512 a982c6384fcad2a1ad709564e932231e837ef799b764bbfa73eff5c42635a4bdc0dcf36e72300482ed188b492da723d3cd7ae04dda9b2c16c70fd1871c556a46
 AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b238d028227e19cb7ba4933a115e2e82652b3179462ed0d2115058bff5d8d0212f439a919857f083c318d SHA512 6aee279728d0e609956c825ced6d2c00d8f4905327492c0348ad6ee8e862287b101ec4e2f1daa19533cf51f2ba1a15f0ea2dd6ccde44a4ff1b0fb151ffc7381e
-DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
-EBUILD systemd-boot-239.ebuild 2424 BLAKE2B ec26000bf32d10242e876af86e401d249c64c58519bd2855d793d2809395b72355f4656e5a1ab5a68c0c10dff9a9fe7bc0034449a357c5322db7ad05d1078d54 SHA512 c5d2be59f5ff81923f86330f4ddba7449663ddcba332fa39373e541a92c032f481a860defaf1ea7e7306b700f7fa16ee105bf7ac517afa4dbd3670c87ddb8730
+DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 EBUILD systemd-boot-241.ebuild 2352 BLAKE2B bcc51f97daccf09f929ff56947733721a70c87e5a8842a2c3d3e2fba23dc28a9cd46e16f4b39a5b56ae4707dbfcf61ea346d7d313024378fd8c97361d574da99 SHA512 26949284b57ba3ec387984293e6646f9a9eab168659c33c1c24e16e3ffd00603e4bea39f7d8c74fc1cc4da37cf75ce9f27ff1a036ae8612b130a94182ae0017d
+EBUILD systemd-boot-243.ebuild 2352 BLAKE2B bcc51f97daccf09f929ff56947733721a70c87e5a8842a2c3d3e2fba23dc28a9cd46e16f4b39a5b56ae4707dbfcf61ea346d7d313024378fd8c97361d574da99 SHA512 26949284b57ba3ec387984293e6646f9a9eab168659c33c1c24e16e3ffd00603e4bea39f7d8c74fc1cc4da37cf75ce9f27ff1a036ae8612b130a94182ae0017d
 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
diff --git a/sys-boot/systemd-boot/systemd-boot-239.ebuild b/sys-boot/systemd-boot/systemd-boot-239.ebuild
deleted file mode 100644
index 603415b39a0f..000000000000
--- a/sys-boot/systemd-boot/systemd-boot-239.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	>=dev-util/intltool-0.50
-	dev-util/gperf
-	>=sys-boot/gnu-efi-3.0.2
-	sys-libs/libcap
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-apps/systemd
-"
-
-S="${WORKDIR}/systemd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/237-libshared-static.patch"
-	"${FILESDIR}/239-debug-extra.patch"
-	"${FILESDIR}/239-stat-0.patch"
-	"${FILESDIR}/239-stat-1.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		-D blkid=true
-		-D efi=true
-		-D gnu-efi=true
-		-D efi-cc="$(tc-getCC)"
-		-D efi-ld="$(tc-getLD)"
-		-D split-usr=true
-		-D rootprefix="${EPREFIX:-/}"
-
-		-D acl=false
-		-D apparmor=false
-		-D audit=false
-		-D bzip2=false
-		-D elfutils=false
-		-D gcrypt=false
-		-D gnutls=false
-		-D kmod=false
-		-D libcryptsetup=false
-		-D libcurl=false
-		-D libidn=false
-		-D libidn2=false
-		-D libiptc=false
-		-D lz4=false
-		-D microhttpd=false
-		-D myhostname=false
-		-D pam=false
-		-D qrencode=false
-		-D seccomp=false
-		-D selinux=false
-		-D xkbcommon=false
-		-D xz=false
-	)
-	meson_src_configure
-}
-
-set_efi_arch() {
-	case "$(tc-arch)" in
-		amd64) efi_arch=x64 ;;
-		arm)   efi_arch=arm ;;
-		arm64) efi_arch=aa64 ;;
-		x86)   efi_arch=x86 ;;
-	esac
-}
-
-src_compile() {
-	local efi_arch
-	set_efi_arch
-	local targets=(
-		bootctl
-		man/bootctl.1
-		man/kernel-install.8
-		src/boot/efi/linux${efi_arch}.efi.stub
-		src/boot/efi/systemd-boot${efi_arch}.efi
-	)
-	eninja -C "${BUILD_DIR}" "${targets[@]}" || die
-}
-
-src_install() {
-	local efi_arch
-	set_efi_arch
-	dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
-	doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
-	exeinto usr/lib/kernel/install.d
-	doexe src/kernel-install/{50-depmod,90-loaderentry}.install
-	insinto usr/lib/systemd/boot/efi
-	doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.efi.stub,systemd-boot${efi_arch}.efi}
-	einstalldocs
-}
diff --git a/sys-boot/systemd-boot/systemd-boot-243.ebuild b/sys-boot/systemd-boot/systemd-boot-243.ebuild
new file mode 100644
index 000000000000..99dbbaa4668a
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-243.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	>=dev-util/intltool-0.50
+	dev-util/gperf
+	>=dev-util/patchelf-0.10
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-boot/gnu-efi-3.0.2
+	sys-libs/libcap
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/237-libshared-static.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dblkid=true
+		-Defi=true
+		-Dgnu-efi=true
+		-Defi-cc="$(tc-getCC)"
+		-Defi-ld="$(tc-getLD)"
+		-Dsplit-usr=true
+		-Drootprefix="${EPREFIX:-/}"
+
+		-Dacl=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbzip2=false
+		-Delfutils=false
+		-Dgcrypt=false
+		-Dgnutls=false
+		-Dkmod=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlz4=false
+		-Dmicrohttpd=false
+		-Dpam=false
+		-Dqrencode=false
+		-Dseccomp=false
+		-Dselinux=false
+		-Dxkbcommon=false
+		-Dxz=false
+	)
+	meson_src_configure
+}
+
+set_efi_arch() {
+	case "$(tc-arch)" in
+		amd64) efi_arch=x64 ;;
+		arm)   efi_arch=arm ;;
+		arm64) efi_arch=aa64 ;;
+		x86)   efi_arch=x86 ;;
+	esac
+}
+
+src_compile() {
+	local efi_arch
+	set_efi_arch
+	local targets=(
+		bootctl
+		man/bootctl.1
+		man/kernel-install.8
+		src/boot/efi/linux${efi_arch}.efi.stub
+		src/boot/efi/systemd-boot${efi_arch}.efi
+	)
+	cd "${BUILD_DIR}" || die
+	eninja "${targets[@]}"
+	patchelf --remove-rpath bootctl || die
+}
+
+src_install() {
+	local efi_arch
+	set_efi_arch
+	dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
+	doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
+	exeinto usr/lib/kernel/install.d
+	doexe src/kernel-install/{50-depmod,90-loaderentry}.install
+	insinto usr/lib/systemd/boot/efi
+	doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.efi.stub,systemd-boot${efi_arch}.efi}
+	einstalldocs
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 334ce269c53f..63869e544f6b 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index 61fa0ba44f09..c69eed73e01a 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -10,8 +10,6 @@ DIST charm-6.6.0.tar.gz 18779545 BLAKE2B 7fef3e34060e6e76d757b432646da25d0869600
 DIST charm-6.6.1.tar.gz 125697465 BLAKE2B 49cdab682ddb2c5409007f852b9d2d905921a5db04aaa7a4d679f9cf05f754864be5b2c885c070d8c7f35a78584055e38993397430617f6aebfe398d415df6c4 SHA512 139409fff76ac9811b2efe6605579a877738f873b112d4e4da25f079598f6c238cf76e677ed3cf3f92aa59f29710feea3e96e59e6010e186e4191dfa4c3ef92e
 DIST charm-6.7.1.tar.gz 18843211 BLAKE2B 090959b5dd8642fecf6dff7bf24212a42b39d7940c264a0b37af9c2ae8f1ac32f3c65d22a67cdc78b7cd821523dc01659293c84e9b26fa69669915d9c5b3f4db SHA512 08581ad58ea737bb118ad1d382feeae2cec2ec0fd8ea1a227e2cb8080c40ba0d043de6c867de0dfa470b2291638b1b6bf6d52c89b4e4b6c9f1fdd824ac601436
 DIST charm-6.8.2.tar.gz 24420478 BLAKE2B b5035d29f90ec766dc49b94e76d68a9ce3d16f43037203baaa035cfa863c6ca063a81c5dc275c1517feabc3517201d5e854a2b1b4b1c492ff0433f692db39a34 SHA512 903aa47706c260d35a04e6002874d197439087d6bdbd4fe65a397a02096a2e53eeb93b64c57e5983f0190ca2dcef3a9b28a3b424207c9d3eb6e820659f5e00c1
-EBUILD charm-6.5.1-r1.ebuild 5248 BLAKE2B ed7c807ce8425c6371648696bde5d7d34ce3f864f5374d580837d129cd9904f5a372793015e90b3a30ad974305d6b310eb712abe1307334e09752f1cc0d88e91 SHA512 bca23f56b551d6fb40328f8bdd25130c34f84e6b1e11236749703a0fdedbdfe40b566f13f8e3cbe07c7668582ddd0bbe880242955516c1dfdc5075571be0a573
-EBUILD charm-6.5.1-r2.ebuild 5311 BLAKE2B 194e6a685d68a3240d21352e212a9aa062ec6c26029d84c5f3384646a2203471ecadea0da6ee2cdfc5e859e0575682dad294c82770899602bd0767ad3ea14785 SHA512 8cbea2a9aeab22ffbee26659991c8caed1b8545985df91e82375995b044a18be2dc3a14183260342eb7665c81bfce83e7d04f59346b718ef9aafd1f07d7c13ae
 EBUILD charm-6.5.1-r3.ebuild 5330 BLAKE2B 26314be92b5e5451476bd1611faddb7c194c1d53f5793aec9ef0272996596ad7f94767eec677de9f7391d8fe38b049414dd93a9332763e1bc540aea5ab76aed9 SHA512 d31c2c5eca23229b208ec9e043b5e8b23e86341cbc24ab2b588d84a094c9f543ff63c4b8fc24a11eb4c4d55db7ad66917dc620b275ce5dd137276a6cbcb649cb
 EBUILD charm-6.6.0-r1.ebuild 5572 BLAKE2B 016d5d96033b1fd02a79b85af7ddaa236fc575740b5034d3d4c52de22e4388be4bf1bb101015a1c0257b0b71a4c185e4b4870e255243162dee8045b596ba978c SHA512 6947f911efc5d756537ff8c06754e0f9580f8f4b9e7ee33ea96be3144ad4537da21228ecfd1321f972d97979fcf556e4f3b2646b11de7717006b4491462fafa7
 EBUILD charm-6.6.0.ebuild 5572 BLAKE2B 016d5d96033b1fd02a79b85af7ddaa236fc575740b5034d3d4c52de22e4388be4bf1bb101015a1c0257b0b71a4c185e4b4870e255243162dee8045b596ba978c SHA512 6947f911efc5d756537ff8c06754e0f9580f8f4b9e7ee33ea96be3144ad4537da21228ecfd1321f972d97979fcf556e4f3b2646b11de7717006b4491462fafa7
diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild
deleted file mode 100644
index 4f82e15a3eba..000000000000
--- a/sys-cluster/charm/charm-6.5.1-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-single-r1
-
-DESCRIPTION="Message-passing parallel language and runtime system"
-HOMEPAGE="http://charm.cs.uiuc.edu/"
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
-
-LICENSE="charm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		>=app-text/poppler-0.12.3-r3[utils]
-		dev-tex/latex2html
-		virtual/tex-base
-		>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-libs/netpbm
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	doc? ( ${PYTHON_REQUIRED_USE} )
-	cmkopt? ( !charmdebug !charmtracing )
-	charmproduction? ( !charmdebug !charmtracing )"
-
-FORTRAN_STANDARD="90"
-
-get_opts() {
-	local CHARM_OPTS
-
-	# TCP instead of default UDP for socket comunication
-	# protocol
-	CHARM_OPTS+="$(usex tcp ' tcp' '')"
-
-	# enable direct SMP support using shared memory
-	CHARM_OPTS+="$(usex smp ' smp' '')"
-
-	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
-	CHARM_OPTS+="$(usex syncft ' syncft' '')"
-
-	# Build shared libraries by default.
-	CHARM_OPTS+=" --build-shared"
-
-	if use charmproduction; then
-		CHARM_OPTS+=" --with-production"
-	else
-		if use charmdebug; then
-			CHARM_OPTS+=" --enable-charmdebug"
-		fi
-
-		if use charmtracing; then
-			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
-		fi
-	fi
-
-	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
-	echo $CHARM_OPTS
-}
-
-src_prepare() {
-	sed \
-		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
-		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
-		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
-		-e '/CMK_F90_MODINC/s:-p:-I:g' \
-		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
-
-	sed \
-		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
-		-e "s:-o charmxi:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
-		-e "s:-o charmrun:${LDFLAGS} &:g" \
-		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
-		-e "s:-o charmd:${LDFLAGS} &:g" \
-		-i \
-		src/scripts/Makefile \
-		src/arch/net/charmrun/Makefile || die
-
-	# CMK optimization
-	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
-
-	# Fix QA notice. Filed report with upstream.
-	append-cflags -DALLOCA_H
-
-	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
-	epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
-}
-
-src_compile() {
-	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} ${CFLAGS}"
-
-	# Build charmm++ first.
-	einfo "running ./build charm++ ${mybuildoptions}"
-	./build charm++ ${mybuildoptions} || die "Failed to build charm++"
-
-	# make pdf/html docs
-	if use doc; then
-		python-single-r1_pkg_setup
-		python_fix_shebang "${S}/doc"
-		einfo "forcing ${EPYTHON}"
-		emake -j1 -C doc/charm++
-	fi
-}
-
-src_test() {
-	make -C tests/charm++ test TESTOPTS="++local" || die
-}
-
-src_install() {
-	# Make charmc play well with gentoo before we move it into /usr/bin. This
-	# patch cannot be applied during src_prepare() because the charmc wrapper
-	# is used during building.
-	epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch"
-
-	sed -e "s|gentoo-include|${P}|" \
-		-e "s|gentoo-libdir|$(get_libdir)|g" \
-		-e "s|VERSION|${P}/VERSION|" \
-		-i ./src/scripts/charmc || die "failed patching charmc script"
-
-	# In the following, some of the files are symlinks to ../tmp which we need
-	# to dereference first (see bug 432834).
-
-	local i
-
-	# Install binaries.
-	for i in bin/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dobin "${i}"
-	done
-
-	# Install headers.
-	insinto /usr/include/${P}
-	for i in include/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		doins "${i}"
-	done
-
-	# Install static libs. Charm has a lot of .o "libs" that it requires at
-	# runtime.
-	if use static-libs; then
-		for i in lib/*.{a,o}; do
-			if [[ -L ${i} ]]; then
-				i=$(readlink -e "${i}") || die
-			fi
-			dolib "${i}"
-		done
-	fi
-
-	# Install shared libs.
-	for i in lib_so/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dolib.so "${i}"
-	done
-
-	# Basic docs.
-	dodoc CHANGES README
-
-	# Install examples.
-	if use examples; then
-		find examples/ -name 'Makefile' | xargs sed \
-			-r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \
-			die "Failed to fix examples"
-		find examples/ -name 'Makefile' | xargs sed \
-			-r "s:./charmrun:./charmrun ++local:" -i || \
-			die "Failed to fix examples"
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/charm++/*
-	fi
-
-	# Install pdf/html docs
-	if use doc; then
-		cd "${S}/doc/charm++"
-		# Install pdfs.
-		insinto /usr/share/doc/${PF}/pdf
-		doins  *.pdf
-		# Install html.
-		docinto html
-		dohtml -r manual/*
-	fi
-}
-
-pkg_postinst() {
-	einfo "Please test your charm installation by copying the"
-	einfo "content of /usr/share/doc/${PF}/examples to a"
-	einfo "temporary location and run 'make test'."
-}
diff --git a/sys-cluster/charm/charm-6.5.1-r2.ebuild b/sys-cluster/charm/charm-6.5.1-r2.ebuild
deleted file mode 100644
index b66af8c38b24..000000000000
--- a/sys-cluster/charm/charm-6.5.1-r2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-single-r1
-
-DESCRIPTION="Message-passing parallel language and runtime system"
-HOMEPAGE="http://charm.cs.uiuc.edu/"
-SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz"
-
-LICENSE="charm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		>=app-text/poppler-0.12.3-r3[utils]
-		dev-tex/latex2html
-		virtual/tex-base
-		>=dev-python/beautifulsoup-4[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-libs/netpbm
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	doc? ( ${PYTHON_REQUIRED_USE} )
-	cmkopt? ( !charmdebug !charmtracing )
-	charmproduction? ( !charmdebug !charmtracing )"
-
-FORTRAN_STANDARD="90"
-
-get_opts() {
-	local CHARM_OPTS
-
-	# TCP instead of default UDP for socket comunication
-	# protocol
-	CHARM_OPTS+="$(usex tcp ' tcp' '')"
-
-	# enable direct SMP support using shared memory
-	CHARM_OPTS+="$(usex smp ' smp' '')"
-
-	CHARM_OPTS+="$(usex mlogft ' mlogft' '')"
-	CHARM_OPTS+="$(usex syncft ' syncft' '')"
-
-	# Build shared libraries by default.
-	CHARM_OPTS+=" --build-shared"
-
-	if use charmproduction; then
-		CHARM_OPTS+=" --with-production"
-	else
-		if use charmdebug; then
-			CHARM_OPTS+=" --enable-charmdebug"
-		fi
-
-		if use charmtracing; then
-			CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread"
-		fi
-	fi
-
-	CHARM_OPTS+="$(usex numa ' --with-numa' '')"
-	echo $CHARM_OPTS
-}
-
-src_prepare() {
-	sed \
-		-e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \
-		-e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \
-		-e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \
-		-e '/CMK_F90_MODINC/s:-p:-I:g' \
-		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
-		-i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die
-
-	sed \
-		-e "s:-o conv-cpm:${LDFLAGS} &:g" \
-		-e "s:-o charmxi:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-silent:${LDFLAGS} &:g" \
-		-e "s:-o charmrun-notify:${LDFLAGS} &:g" \
-		-e "s:-o charmrun:${LDFLAGS} &:g" \
-		-e "s:-o charmd_faceless:${LDFLAGS} &:g" \
-		-e "s:-o charmd:${LDFLAGS} &:g" \
-		-i \
-		src/scripts/Makefile \
-		src/arch/net/charmrun/Makefile || die
-
-	# CMK optimization
-	use cmkopt && append-cppflags -DCMK_OPTIMIZE=1
-
-	# Fix QA notice. Filed report with upstream.
-	append-cflags -DALLOCA_H
-
-	epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch"
-	epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-string-parsing.patch"
-	epatch "${FILESDIR}/charm-6.5.1-fix-navmenuGenerator.patch"
-	epatch "${FILESDIR}/charm-6.5.1-static-library-fix.patch"
-}
-
-src_compile() {
-	local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} -j1 ${CFLAGS}"
-
-	# Build charmm++ first.
-	einfo "running ./build charm++ ${mybuildoptions}"
-	./build charm++ ${mybuildoptions} || die "Failed to build charm++"
-
-	# make pdf/html docs
-	if use doc; then
-		python-single-r1_pkg_setup
-		python_fix_shebang "${S}/doc"
-		einfo "forcing ${EPYTHON}"
-		emake -j1 -C doc/charm++
-	fi
-}
-
-src_test() {
-	make -C tests/charm++ test TESTOPTS="++local" || die
-}
-
-src_install() {
-	# Make charmc play well with gentoo before we move it into /usr/bin. This
-	# patch cannot be applied during src_prepare() because the charmc wrapper
-	# is used during building.
-	epatch "${FILESDIR}/charm-6.5.1-charmc-gentoo.patch"
-
-	sed -e "s|gentoo-include|${P}|" \
-		-e "s|gentoo-libdir|$(get_libdir)|g" \
-		-e "s|VERSION|${P}/VERSION|" \
-		-i ./src/scripts/charmc || die "failed patching charmc script"
-
-	# In the following, some of the files are symlinks to ../tmp which we need
-	# to dereference first (see bug 432834).
-
-	local i
-
-	# Install binaries.
-	for i in bin/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dobin "${i}"
-	done
-
-	# Install headers.
-	insinto /usr/include/${P}
-	for i in include/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		doins "${i}"
-	done
-
-	# Install static libs. Charm has a lot of .o "libs" that it requires at
-	# runtime.
-	if use static-libs; then
-		for i in lib/*.{a,o}; do
-			if [[ -L ${i} ]]; then
-				i=$(readlink -e "${i}") || die
-			fi
-			dolib "${i}"
-		done
-	fi
-
-	# Install shared libs.
-	for i in lib_so/*; do
-		if [[ -L ${i} ]]; then
-			i=$(readlink -e "${i}") || die
-		fi
-		dolib.so "${i}"
-	done
-
-	# Basic docs.
-	dodoc CHANGES README
-
-	# Install examples.
-	if use examples; then
-		find examples/ -name 'Makefile' | xargs sed \
-			-r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \
-			die "Failed to fix examples"
-		find examples/ -name 'Makefile' | xargs sed \
-			-r "s:./charmrun:./charmrun ++local:" -i || \
-			die "Failed to fix examples"
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/charm++/*
-	fi
-
-	# Install pdf/html docs
-	if use doc; then
-		cd "${S}/doc/charm++"
-		# Install pdfs.
-		insinto /usr/share/doc/${PF}/pdf
-		doins  *.pdf
-		# Install html.
-		docinto html
-		dohtml -r manual/*
-	fi
-}
-
-pkg_postinst() {
-	einfo "Please test your charm installation by copying the"
-	einfo "content of /usr/share/doc/${PF}/examples to a"
-	einfo "temporary location and run 'make test'."
-}
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
new file mode 100644
index 000000000000..a2bc01f1093e
--- /dev/null
+++ b/sys-cluster/rdma-core/Manifest
@@ -0,0 +1,10 @@
+AUX ibacm.init 211 BLAKE2B 4f3b2ffb7cbc7f42b14dad5c02bce698feaf079ff75a2f7a7c9d7d0165a92656e8622fa47ecefe310e4283e5b14e70a386aabcf0fcd85403d5c9f16ddf4e9c4f SHA512 fc99aafb0952e4a8d6cf740df58c623fc400f89f60c7e78d3af7fb9067aaf36dc976d82db2c76120fb91ed3340591d24b2df099b44dccec0c136b599e9f12d7d
+AUX iwpmd.init 211 BLAKE2B ce37edeceae812b999cbcd15b9c9cae55125de0d94ac6983e953117a265c444ab4f9b7a09053c4303c260f1df59cc916ff7f1a89ca6f937a42c2cace6a2a88b4 SHA512 e08d8521d74aa4e266e11833750682974bede45e2b7c42ee3d4ba7cee5695f6e7f5c3c5963b57186f6f669a752faf4c5f4c51f92065425ff6ce859be9affdb07
+AUX optional_pandoc.patch 1611 BLAKE2B 5f6c4f8ebe1379cf733b4b1829f39bfc34ff2715cd3be172a609518560c97adbfeec15a648d3205a3016f24a0e99db4be6cb6602672046b96a01c998fd314b6f SHA512 b9c1be47aa530231d0becf6bd313d881262f5360985206371daf96377f657f4aa1b52227ae371e21154edcac48ccf6b1433f84b689cd373b02b844782654c2c2
+AUX srpd.init 546 BLAKE2B 40a03607fd4a85b821a71b98373b5c59f721bb2da78afbede8299ae6eedd402776c4ee3b4965c7df0b8b1816969a715351a1e659e4a26abc99808e93ef69f6c9 SHA512 14c1dac4581943855c362d7a37ef31a87be458123dd890bdcfb75c35b71b0a6e789a819c768ea352b3846af29ab5c3b1872cbe27a2e127b8fc8c93a835428190
+DIST rdma-core-24.0.tar.gz 1219485 BLAKE2B 400076305ca634a14d8f46df3477f9e3e753b95840237a217cfffe1a78e93ee90994e628f2a0693bde588ce15965df0014acb55bc92c36e3c45011cc69e9898a SHA512 0ef2b2b4250a1738adec964911a286f60e2310472c943dac1be45c70974a8bd1f32ee96013bff9e492132403af810aee1350d404a87ae7671731f7a5bd80c655
+DIST rdma-core-25.0.tar.gz 1494005 BLAKE2B 406926ae57ae4914a77c82025906270bbc45632ed1e0ecb44b1662d797066bf27275c8b4c4bee40795880bdb4ed06f8f9d3714cfffc64132c00395328ee0527f SHA512 b2c6eaf16f89fb913e35b0eb602f60e8bf45979673597c34006ed78c2e671cf1e50b1cc0752740dc474a58fc94eb0c3f66175183e6b903605ff1512469ceef38
+EBUILD rdma-core-24.0.ebuild 2394 BLAKE2B 41d23a8da59916065bba0a78ea358e2557f9f81ae1e3fe2ae430e1e98758d015ed72f8da5266dba850933bdcdc3b7ecc17889334480126604e486e50aaa7967c SHA512 2867f122ef0466090ec1fb8a199300f7c5b52fe68a2b57692c96583ea9d5d669d0df6cd0b2c5436d0085cc2a07a0412bce72fb66e2b6e2f4340c020f8a8abecc
+EBUILD rdma-core-25.0.ebuild 2443 BLAKE2B 8544079e018f49322806151b8e90738b565c02ebed4982954c558fe982d46f06b981258a9b1d7f824e3a500cd035f98d1bba50dabbf12866ade7097978adcd5a SHA512 2e7e2d490c870768ecbece72858bff12a732d72ba6da99ce5ff247712d199583fbdcae7699b544c62053f8d679aecb243bf4e4f02d364e3cd4d3f219c0832cd5
+EBUILD rdma-core-9999.ebuild 2390 BLAKE2B 77f3af5fe37f08c92427e3e9d546ff3d4577d8c754274ab77633d93a5a44edca95e883a7d089cfb482f0cfaa9f375a65ac79f7bf77d285be4951cf7b9fdab4ec SHA512 e4df896afa8585fa3e58f55e1f7da6470ab08e7a8d3e5b36f29fb77b3d01cadda2d51e126a845bff76a51101d9211bcd517258813d4205a778c1cbd802b699a9
+MISC metadata.xml 559 BLAKE2B 1526777511ab5118d4de73361959107221858659ebbc60f52eb09b45d0798d969f847e4f157501ed6e8c85c2cee1c93d0b26989b357141bba45af946e2e5b0a1 SHA512 5d69acf3d0a323c0d2ee66971fd058c6c0ebf59e4fac0d4777b15bfcc7db8f515b67e6059d204346404ce3b26cdd77c2bea21e1132f418498fe1523eb16dccbb
diff --git a/sys-cluster/rdma-core/files/ibacm.init b/sys-cluster/rdma-core/files/ibacm.init
new file mode 100644
index 000000000000..719accfa95c8
--- /dev/null
+++ b/sys-cluster/rdma-core/files/ibacm.init
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/ibacm"
+pidfile="/run/${SVCNAME}.pid"
+start_stop_daemon_args="-b -m"
diff --git a/sys-cluster/rdma-core/files/iwpmd.init b/sys-cluster/rdma-core/files/iwpmd.init
new file mode 100644
index 000000000000..b1ffa33fcc8a
--- /dev/null
+++ b/sys-cluster/rdma-core/files/iwpmd.init
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/iwpmd"
+pidfile="/run/${SVCNAME}.pid"
+start_stop_daemon_args="-b -m"
diff --git a/sys-cluster/rdma-core/files/optional_pandoc.patch b/sys-cluster/rdma-core/files/optional_pandoc.patch
new file mode 100644
index 000000000000..4ed0e3a63ef4
--- /dev/null
+++ b/sys-cluster/rdma-core/files/optional_pandoc.patch
@@ -0,0 +1,54 @@
+The master "CMakeLists.txt" listed "pandoc" as an optional dependency,
+but subsequent "make install" fails if "pandoc" is missing.
+This patch makes "pandoc" really optional.
+diff -ru rdma-core-25.0.orig/CMakeLists.txt rdma-core-25.0/CMakeLists.txt
+--- a/CMakeLists.txt	2019-07-26 02:17:21.000000000 +0800
++++ b/CMakeLists.txt	2019-07-31 00:08:41.485085990 +0800
+@@ -602,11 +602,17 @@
+ add_subdirectory(kernel-headers)
+ # Libraries
+ add_subdirectory(libibumad)
++if (PANDOC_FOUND)
+ add_subdirectory(libibumad/man)
++endif()
+ add_subdirectory(libibverbs)
++if (PANDOC_FOUND)
+ add_subdirectory(libibverbs/man)
++endif()
+ add_subdirectory(librdmacm)
++if (PANDOC_FOUND)
+ add_subdirectory(librdmacm/man)
++endif()
+ 
+ # Providers
+ if (HAVE_COHERENT_DMA)
+@@ -614,13 +620,19 @@
+ add_subdirectory(providers/cxgb3) # NO SPARSE
+ add_subdirectory(providers/cxgb4) # NO SPARSE
+ add_subdirectory(providers/efa)
++if (PANDOC_FOUND)
+ add_subdirectory(providers/efa/man)
++endif()
+ add_subdirectory(providers/hns)
+ add_subdirectory(providers/i40iw) # NO SPARSE
+ add_subdirectory(providers/mlx4)
++if (PANDOC_FOUND)
+ add_subdirectory(providers/mlx4/man)
++endif()
+ add_subdirectory(providers/mlx5)
++if (PANDOC_FOUND)
+ add_subdirectory(providers/mlx5/man)
++endif()
+ add_subdirectory(providers/mthca)
+ add_subdirectory(providers/nes) # NO SPARSE
+ add_subdirectory(providers/ocrdma)
+@@ -639,7 +651,9 @@
+ add_subdirectory(libibnetdisc/man)
+ add_subdirectory(infiniband-diags)
+ add_subdirectory(infiniband-diags/scripts)
++if (PANDOC_FOUND)
+ add_subdirectory(infiniband-diags/man)
++endif()
+ 
+ if (CYTHON_EXECUTABLE)
+   add_subdirectory(pyverbs)
diff --git a/sys-cluster/rdma-core/files/srpd.init b/sys-cluster/rdma-core/files/srpd.init
new file mode 100644
index 000000000000..07f5ec2d29a7
--- /dev/null
+++ b/sys-cluster/rdma-core/files/srpd.init
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/srp_daemon.sh"
+pidfile="/run/${SVCNAME}.pid"
+start_stop_daemon_args="-b -m"
+
+rdma_config="/etc/infiniband/openib.conf"
+[ -f ${rdma_config} ] && source ${rdma_config}
+
+[ ${SRP_DEFAULT_TL_RETRY_COUNT} ] && command_args="-l ${SRP_DEFAULT_TL_RETRY_COUNT}"
+
+start_pre() {
+	if ! [ -e /sys/module/ib_srp ]; then
+		eerror "SRP kernel module is not loaded, unable to start SRP daemon"
+		return 1
+	fi
+	return 0
+}
diff --git a/sys-cluster/rdma-core/metadata.xml b/sys-cluster/rdma-core/metadata.xml
new file mode 100644
index 000000000000..25b5861a7599
--- /dev/null
+++ b/sys-cluster/rdma-core/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>zlogene@gentoo.org</email>
+        <name>Mikle Kolyada</name>
+    </maintainer>
+    <use>
+        <flag name="neigh">Enable iwpmd support</flag>
+        <flag name="python">Enable pyverbs support</flag>
+        <flag name="valgrind">Enable valgrind notations</flag>
+    </use>
+    <upstream>
+        <remote-id type="github">linux-rdma/rdma-core</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/sys-cluster/rdma-core/rdma-core-24.0.ebuild b/sys-cluster/rdma-core/rdma-core-24.0.ebuild
new file mode 100644
index 000000000000..f50ad59a5b0b
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-24.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
+else
+	SRC_URI="https://github.com/linux-rdma/rdma-core/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	virtual/libudev:=
+	neigh? ( dev-libs/libnl:3 )
+	systemd? ( sys-apps/systemd:= )
+	valgrind? ( dev-util/valgrind )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-fabric/infiniband-diags
+	!sys-fabric/libibverbs
+	!sys-fabric/librdmacm
+	!sys-fabric/libibumad
+	!sys-fabric/ibacm
+	!sys-fabric/libibmad
+	!sys-fabric/srptools
+	!sys-fabric/infinipath-psm
+	!sys-fabric/libcxgb3
+	!sys-fabric/libcxgb4
+	!sys-fabric/libmthca
+	!sys-fabric/libmlx4
+	!sys-fabric/libmlx5
+	!sys-fabric/libocrdma
+	!sys-fabric/libnes"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_FULL_RUNDIR=/run
+		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
+		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes
+		$(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
+		-DENABLE_VALGRIND="$(usex valgrind)"
+		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
+		-DENABLE_STATIC="$(usex static-libs)"
+	)
+
+	if use python; then
+		mycmakeargs+=( -DNO_PYVERBS=OFF )
+	else
+		mycmakeargs+=( -DNO_PYVERBS=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules
+	rm -r "${D}"/etc/{udev,init.d} || die
+
+	newinitd "${FILESDIR}"/ibacm.init ibacm
+	newinitd "${FILESDIR}"/iwpmd.init iwpmd
+	newinitd "${FILESDIR}"/srpd.init srpd
+}
diff --git a/sys-cluster/rdma-core/rdma-core-25.0.ebuild b/sys-cluster/rdma-core/rdma-core-25.0.ebuild
new file mode 100644
index 000000000000..c2d102716c98
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-25.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
+else
+	SRC_URI="https://github.com/linux-rdma/rdma-core/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	virtual/libudev:=
+	neigh? ( dev-libs/libnl:3 )
+	systemd? ( sys-apps/systemd:= )
+	valgrind? ( dev-util/valgrind )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-fabric/infiniband-diags
+	!sys-fabric/libibverbs
+	!sys-fabric/librdmacm
+	!sys-fabric/libibumad
+	!sys-fabric/ibacm
+	!sys-fabric/libibmad
+	!sys-fabric/srptools
+	!sys-fabric/infinipath-psm
+	!sys-fabric/libcxgb3
+	!sys-fabric/libcxgb4
+	!sys-fabric/libmthca
+	!sys-fabric/libmlx4
+	!sys-fabric/libmlx5
+	!sys-fabric/libocrdma
+	!sys-fabric/libnes"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_FULL_RUNDIR=/run
+		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
+		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes
+		$(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
+		-DENABLE_VALGRIND="$(usex valgrind)"
+		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
+		-DENABLE_STATIC="$(usex static-libs)"
+	)
+
+	if use python; then
+		mycmakeargs+=( -DNO_PYVERBS=OFF )
+	else
+		mycmakeargs+=( -DNO_PYVERBS=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules
+	rm -r "${D}"/etc/{udev,init.d} || die
+
+	newinitd "${FILESDIR}"/ibacm.init ibacm
+	newinitd "${FILESDIR}"/iwpmd.init iwpmd
+	newinitd "${FILESDIR}"/srpd.init srpd
+}
diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild b/sys-cluster/rdma-core/rdma-core-9999.ebuild
new file mode 100644
index 000000000000..69def0d58b57
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
+else
+	SRC_URI="https://github.com/linux-rdma/rdma-core/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	virtual/libudev:=
+	neigh? ( dev-libs/libnl:3 )
+	systemd? ( sys-apps/systemd:= )
+	valgrind? ( dev-util/valgrind )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+
+RDEPEND="${COMMON_DEPEND}
+	!!sys-fabric/infiniband-diags
+	!sys-fabric/libibverbs
+	!sys-fabric/librdmacm
+	!sys-fabric/libibumad
+	!sys-fabric/ibacm
+	!sys-fabric/libibmad
+	!sys-fabric/srptools
+	!sys-fabric/infinipath-psm
+	!sys-fabric/libcxgb3
+	!sys-fabric/libcxgb4
+	!sys-fabric/libmthca
+	!sys-fabric/libmlx4
+	!sys-fabric/libmlx5
+	!sys-fabric/libocrdma
+	!sys-fabric/libnes"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_FULL_RUNDIR=/run
+		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
+		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes
+		$(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
+		-DENABLE_VALGRIND="$(usex valgrind)"
+		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
+		-DENABLE_STATIC="$(usex static-libs)"
+	)
+
+	if use python; then
+		mycmakeargs+=( -DNO_PYVERBS=OFF )
+	else
+		mycmakeargs+=( -DNO_PYVERBS=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules
+	rm -r "${D}"/etc/{udev,init.d} || die
+
+	newinitd "${FILESDIR}"/ibacm.init ibacm
+	newinitd "${FILESDIR}"/iwpmd.init iwpmd
+	newinitd "${FILESDIR}"/srpd.init srpd
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index cd20199f2d03..49bd8243313f 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/byfl/Manifest b/sys-devel/byfl/Manifest
index fb61c299d90d..4f120970a03e 100644
--- a/sys-devel/byfl/Manifest
+++ b/sys-devel/byfl/Manifest
@@ -1,6 +1,4 @@
-DIST byfl-1.6-llvm-5.0.1.tar.gz 556083 BLAKE2B fbbd158d0a60674db22a74b30e8410817d7cf6202f34e2ae5906cbed3188661de301cb9b9c6488840b6f0f4e3fcdc121a237decce5ffbb1db9827c6be40f1fe7 SHA512 b63db13d686a7b3c0bf69eae62b3a344c4e9e11c4a5c5da2188091e6037c0e9e5f7fb89c37f1256596c9aaefa8fbcd537ab41f48b27f7f2d1ce4a018a788e36d
 DIST byfl-1.6-llvm-6.0.0.tar.gz 556081 BLAKE2B 34e233d29aebc340a0dadfa2ca74b35fe8a8c90e8b7d79ebde0da877a2462144d3a82a5c63633786e177c52e04444cd623dd91db870b654f322ee1becbb1e336 SHA512 3b69eb98247cc4e3398788dfbf450624a918c4de731e1ec1b709a5e6aa0dd29988088827468f0bbf4397563b18aca51350cc947ddcbd2e513b51e1fce17ccc01
 EBUILD byfl-1.6-r1.ebuild 1088 BLAKE2B 63365abfa04e1244929003d5b1094e5f5e49796bdc78955291e3970cd83f74b0f725727ca7001e854ecb8e057ecb7ed0b82ec3b9e3f83cb5b4105cd9bcbd6229 SHA512 d3d82de1446362bfadb03196b8ac04abbcc96dac373ba9300e45c26b35ea47d223a506fcc7e9f90f77bf4295606515ca2c9174eb3b095a8f27104bb2fdd4c4b3
-EBUILD byfl-1.6.ebuild 1088 BLAKE2B 5b0463b0d1cfa97e1e3fe6a6d7857dc4fa74b90b575672723e21be49a19a2e8592ca0d84357398ee3f6695a0e18acea326a64c9c9b2833fe4434b757f6d67c71 SHA512 f04bd81961aaaffb14c5945f7f1a3c5cafc1b230b9fe9d7e62361f2caa997bb4cff2a4e16eff59184bbd1b17897efdbecab5f400e307dd0bbb564ecc789038a9
 EBUILD byfl-9999.ebuild 1088 BLAKE2B 5b0463b0d1cfa97e1e3fe6a6d7857dc4fa74b90b575672723e21be49a19a2e8592ca0d84357398ee3f6695a0e18acea326a64c9c9b2833fe4434b757f6d67c71 SHA512 f04bd81961aaaffb14c5945f7f1a3c5cafc1b230b9fe9d7e62361f2caa997bb4cff2a4e16eff59184bbd1b17897efdbecab5f400e307dd0bbb564ecc789038a9
 MISC metadata.xml 327 BLAKE2B c1b85e4d2ef64f4eb4c9ad62d47dca1bde431dc11fe2c02974a3d019b6b2d0d97d8505847e37dde82f89241a4c62d5d20aba217edcfb81c0a6ed9b9c2b7b2ae6 SHA512 ed1eea05cc9adab8173a1ce8af0cc2dc54675947bda8ffeef935504e9bbb3cf959f36989302ff2cad22c16ff1e499470373bb8c4817c5dc20522b7bfc59c6d47
diff --git a/sys-devel/byfl/byfl-1.6.ebuild b/sys-devel/byfl/byfl-1.6.ebuild
deleted file mode 100644
index 4d749435eab1..000000000000
--- a/sys-devel/byfl/byfl-1.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic llvm
-
-if [ "${PV}" = "9999" ]; then
-	LLVM_VERSION="6.0.0"
-	LLVM_SLOT=6
-	EGIT_REPO_URI="https://github.com/lanl/Byfl.git"
-	inherit autotools git-r3
-	KEYWORDS=""
-else
-	LLVM_VERSION="5.0.1"
-	LLVM_SLOT=5
-	MY_P="${P}-llvm-${LLVM_VERSION}"
-	SRC_URI="https://github.com/lanl/Byfl/releases/download/v${MY_P#${PN}-}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~amd64-linux"
-fi
-
-DESCRIPTION="Compiler-based Application Analysis"
-HOMEPAGE="https://github.com/lanl/Byfl"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="hdf5 static-libs sqlite"
-
-RDEPEND="
-	>=sys-devel/clang-${LLVM_VERSION}:${LLVM_SLOT}
-	>=sys-devel/llvm-${LLVM_VERSION}:${LLVM_SLOT}
-	sys-devel/binutils:*
-	dev-lang/perl:=
-	dev-perl/Switch
-	hdf5? ( sci-libs/hdf5[cxx] )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	[[ ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	use sqlite || export ac_cv_lib_sqlite3_sqlite3_errstr=no
-	econf H5CXX=$(usex hdf5 h5c++ no)
-}
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 927ff8b02297..c56fdfc64179 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -6,6 +6,6 @@ EBUILD clang-common-10.0.0.9999.ebuild 670 BLAKE2B 9fa4f350989a3053448c2b79cc658
 EBUILD clang-common-6.0.1.ebuild 777 BLAKE2B 3f19ef0457ce59dffd312ee898a72b4b5e6d21a2f9403d159c2f92c76dd16f212beec6a906fc8652487a7bd7f0b773b86620ceb03ceeaa1974e9fd8bd021a830 SHA512 e469a91c0619ae0aca5f0c25bb14cb22fb5b773c452dbb212a32a499ff5101878455b28b2948fe118713ee5d9d15b24d470fde9a57ce38bbe46f26c0ed2c33da
 EBUILD clang-common-7.1.0.ebuild 779 BLAKE2B 5622d7b4e1f8d6a91a34cd8490b5537a38d2976f120b93ebed15b33ed8d1cc204552df042f720327f0be1e9954b7ce42d1979fae1cf59a3332bb1359605368cb SHA512 882271012335b5d3404c643eb7c6aa3c199e8e1b53866631ab5854690957345bf252482aed272784ed42cefeea781ef92fea1bdefa36c541f9dd726dbd2dc09a
 EBUILD clang-common-8.0.0.ebuild 782 BLAKE2B b11541f70d3dc663a09442a84f95b992fd491109ea3b1da0214a2d9912f61794393cfaa2a5b52920c075436cfc3c2864132feeef411f115888c68a310e77c35f SHA512 ecc50e293902d9e294ae6fb227c25dde36945fe5808c464ca7c6a0fd022a07d0e03325ebf9f1e4683cdc84f9f6ef41cd1ff3b45cc66ce4b2036416957d72856f
-EBUILD clang-common-8.0.1.ebuild 815 BLAKE2B 82e73c6b57af9d15b192029663af32566f9ae23a90fd804ba149420357f4fe79092e4efc2798e539a21cb23be828841ca1ba4a3e2464ce9a4b6cae2b5fd949c2 SHA512 744e41d064d99836e490982b2c2494553b315b742f3c6b6fbcd8fb29ed3032de1036166d907b93d244be91c4a29520bdda988478ca4c8cbae6b17a78cd21083e
+EBUILD clang-common-8.0.1.ebuild 811 BLAKE2B 03c3664a11d13cb695a396b12d93d80372d0ff1ea281bf7540a910127e0e8f6085a9c650db6e1b195d81875932827f42c68d8d18efe8acd8fb7711373b6ee83b SHA512 7e61e31a6920b7cf7a430b0185f70224e1f55b902b3c5b9f468a8a86bf0305c35898ecbafb1411d97bd4695681ed7b6f3075afe453526a3dd7b03ec8a1e0ee2b
 EBUILD clang-common-9.0.0.9999.ebuild 695 BLAKE2B 96d0c4bc870b20db7b30bce6a8f5b74c414b41328afe3f8c1a21dccc02d06b8f894b93fbd7ca644af188e606429856dca4d6c28479d08bbbb7a251fcf3430850 SHA512 36f8228512ca9c07bc586ee4b8b0537eda0c5bda63f1df6d84d22c4cdff2c7afa57a9e59f67d9c89bdf81a134cc80d65961690fdf023de2897ab78910cf57e4a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-8.0.1.ebuild b/sys-devel/clang-common/clang-common-8.0.1.ebuild
index 91d38bbf2f5b..457848d62887 100644
--- a/sys-devel/clang-common/clang-common-8.0.1.ebuild
+++ b/sys-devel/clang-common/clang-common-8.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 169f5d7ac695..b3882b5760b4 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,8 +1,7 @@
 EBUILD clang-runtime-10.0.0.9999.ebuild 742 BLAKE2B 4f87d036a60605681f5aa32fe72b3903d0bef4a687135100b52293950925434d5fdfe6df399390233c0efeda89fdafd057ab3e79c8a88c2f40cb95b862ecb45e SHA512 3213913a9adf5db5e55470914450740b10bfe2464d70a74edf9d644211320a1facba949aad52c814d44c205fd3bc25d556dcfa03322b03442206eea4d2af1534
-EBUILD clang-runtime-5.0.2.ebuild 820 BLAKE2B 52c56a71db4514803c8ecc070e21a479bad960fdaa40e3fbd6de2229f6f71c0f5fbbfc2dfc5fee8bcb8570c5e71c73be921cd3fcaabe442551d10ccf9a4736e7 SHA512 bcde7bededdae2f422da56eb68ed862fcafb618b8ce6cd1932a5472e325f0c0231429c7914806915b2f4b579655d0f46d82e19f5f83420d204f53a81a9596e47
 EBUILD clang-runtime-6.0.1.ebuild 819 BLAKE2B ce5fe6e1f47830366c00f80149adfb9f0ac25742fe57dd1cb1f35c30186a919b89cdb679b342ff1db3ed676bc48c58f28c85b5c74e1adaaab18875293b8be1c1 SHA512 25d88ca2c1d51c0140fbb7572fc45786a61902ff27534ad8e2bd8d12155a69229cadeee3c4827533207a265aa290e829de2141f96bc7d2181c59731ce0fbacfc
 EBUILD clang-runtime-7.1.0.ebuild 821 BLAKE2B 072164459daddb9d7929387acf7c718e7a1f9bb6ebd09f2521903c4a018893d43b7925edf21ca8f7da0300a01771b006de814c62131ad5b52dacf44cbb83c4ce SHA512 5156a526676038effbce1d470c58df549205eeb7daf57562702186e8669d2225c8b47af816949ea2545a884392918c1a8094ce824039c6b27a82dd83ba506e95
 EBUILD clang-runtime-8.0.0.ebuild 824 BLAKE2B cb29c1792ab83a7ff72636ff43c4363be47aa1034cd37af4b1a458c2f907cd34ab95f56dd4f5c5f5d0ac2a810a18f5baa0f0fc69a974c34dc218c26fae78cfee SHA512 f6047b9351eccfcdf85daafa93717d27c42f87f671b029bafb4f9b111c56338f1b2b8436f2aaafe923c575e436adc1af742ac6295781df53d2e9d498544a705a
-EBUILD clang-runtime-8.0.1.ebuild 824 BLAKE2B cb29c1792ab83a7ff72636ff43c4363be47aa1034cd37af4b1a458c2f907cd34ab95f56dd4f5c5f5d0ac2a810a18f5baa0f0fc69a974c34dc218c26fae78cfee SHA512 f6047b9351eccfcdf85daafa93717d27c42f87f671b029bafb4f9b111c56338f1b2b8436f2aaafe923c575e436adc1af742ac6295781df53d2e9d498544a705a
+EBUILD clang-runtime-8.0.1.ebuild 820 BLAKE2B 05082b55c015d66664096aab0d82b6d0e45980b3c227441c1ec7b6048242cfe9223e5051ef1fa8b3e0c23758499329502b0e37f54d422894c1914dbdfcabad5a SHA512 b5b9f5df5a0a4b1bfd539582c9e171aca24e13df88accde574f2d28af405e281caf09272a98b8156bb15dbdcb8fe0422de8559a17634b6ce051c79bcb099dd43
 EBUILD clang-runtime-9.0.0.9999.ebuild 742 BLAKE2B 4f87d036a60605681f5aa32fe72b3903d0bef4a687135100b52293950925434d5fdfe6df399390233c0efeda89fdafd057ab3e79c8a88c2f40cb95b862ecb45e SHA512 3213913a9adf5db5e55470914450740b10bfe2464d70a74edf9d644211320a1facba949aad52c814d44c205fd3bc25d556dcfa03322b03442206eea4d2af1534
 MISC metadata.xml 708 BLAKE2B 56cc586deba4a72cc9ebf5d0ac6b9dbb3767b736a96f1c0e4f8d9a715076645be25e42f1c610f55ba69e500bc828d629e7f2253e7c9ed6fd4b01032722bec3c8 SHA512 764eefdff5358c66cad9e8fe18fc7b938c7656268208639cbb92a4b5ae76f7de0dee86a729cc1e6745ddbf7308180885ef99047502e0e040020e738e3d0d1425
diff --git a/sys-devel/clang-runtime/clang-runtime-5.0.2.ebuild b/sys-devel/clang-runtime/clang-runtime-5.0.2.ebuild
deleted file mode 100644
index 2aec5c92acb2..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-5.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="${PV%_*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+compiler-rt crt libcxx openmp +sanitize"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	crt? (
-		|| (
-			sys-libs/netbsd-csu[${MULTILIB_USEDEP}]
-			sys-freebsd/freebsd-lib[${MULTILIB_USEDEP}]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
-
-REQUIRED_USE="sanitize? ( compiler-rt )"
diff --git a/sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild b/sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild
index 97c0d55cf2a5..5dfc7693b07f 100644
--- a/sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt crt libcxx openmp +sanitize"
 
 RDEPEND="
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 78e593a6d502..6f78baf800e7 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,21 +1,15 @@
-AUX 5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch 6888 BLAKE2B e6d9907b05f99fb21008e7533f348348a3fe81249e6bcd0c473b82ba2dbb3651f7c27ba8c84053eb9c5832de1df4de7632971fc48d47aa9fff673f76e5688263 SHA512 6d1f35f39c15b11ce631477eefcca7ade90cb08e5992839273f97c339ef6bf0deecf9625fdacbad6e8cc61e4fd213e0e1c582c407ac051d99545962e310344fe
-AUX 5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch 2846 BLAKE2B a5d3081767621f774b4c873611506a6ab9518acbab48839e142dc920b2059ac32258ffa0d9c04a6d8450d355680e98a62b406ac876785f9241ee4111f472b86d SHA512 c714adfa4bb62f89be07216a0e2601ba9729791228a42020d5069e821c629077df4581f82236c3dfb5dbcfb54ff124e7b4f1241512a03ae8e3f7ac40b27acd7d
-AUX 5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch 1376 BLAKE2B baa36d2b05118859ffc5af12e9b5a8ed0dac3c262736ef2bab5f89049267dca5a94e134b078c06f09cafcc678fb8adefcf84f940806b594777a1f05a1e216a80 SHA512 f4e31053c03429528fc193a4550784b21d60fa0487700c1f416952c5d92b71988ca481b53c00f95f0c8c39f5f30e9ddd5cc6bee5334294fd3e4df24b8a450e69
 AUX 6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch 1256 BLAKE2B e71f32b08defa1ba59b574e9314e272107638676f1b1469a448efced144c680ffde4d76e34fa3fa5786859bf6e04050bd23150d7c0b98f8849f5d9355eacb646 SHA512 260096c1c7e6ba6f35537873cb6ba83f2271cb50446c50f6f1a5c88138c23508df16c99cac8664b5be0d56f2e0fe288f51a27424ff0b56c317d7a7e07562e0fc
 AUX 6.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be08ea3babcae6dc1353171fad7f297f787d476d28768c7c1bbe6efc7404ea638f1dc6b4b36e1c17e141faf82be623bbd96d5e09118 SHA512 5f8ecabaf43853964bffeb3953b205bea7e8928fd53637d01842723ac8344e19cc639f6f06c199f2be88b73e60b6eab1987bc5ee7dfeaea5e710eacab90f3533
 AUX 7.0.1/0001-clangd-Fix-detecting-atomics-in-stand-alone-builds.patch 1244 BLAKE2B 0a5f0b4af299ae49b13eac0e6ff06ce84264baf05bc09437b481830d4cfafab68ec2a3adf5814fcd8efbe91770e2dda0ce5fa5e10fcefc10d6fbe2c17ca067b6 SHA512 cec3d531b7d6121f7fc5da731d7d89d03a7d1a38e32abd5d7812790ffa62e6d3b9f18084983702203502905d447ad89bd4e2a7f3ca51ee7d696ebe623b035ac6
-DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
+AUX 9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch 1324 BLAKE2B 83a02461f65f2fc660e2ad0a07ec0d75c56da04e7ad849bdb80aeec9200b2cdbfd5f283710294bfa0f4abf26bfa24da2961ac9decd9d50d9d51fbb148fc5d573 SHA512 03669ad470bd85237673c217aea0deca6080d374e2b31531c17da6594959c323dde7e187fcc3ba6ae387b03a9252d89d75caafb8ef715b49b9ba9f2cdd5c242d
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.0.src.tar.xz 12868468 BLAKE2B 3cb96c95c4d9713feb7011e4f1ca24be3e7f6c9b458f6cd9e6905f99737312ca44cb701ed5871e47dd583145e5898d53a65c4cda6456af3d4ca31b670ed84409 SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
-DIST clang-tools-extra-5.0.2.src.tar.xz 646272 BLAKE2B 8a15a0c3ed9e8c31706d744017aa8be52616037790075c2314c3a613c9e1aa86b0b980c4e3bd9a775b234440f17436392196b41f1691ab25a33b432a25affb68 SHA512 241d85652e7c3ad5d77754ad9a694bddab3c14098067da4119223007c5a4a765d1cd7e7c7dba91666ccd5506f8703c82c9ee487f28249a00c2c4edbd0d1f2640
 DIST clang-tools-extra-6.0.1.src.tar.xz 757256 BLAKE2B 1d91d7459a34e7251007af91db1803ee6d04f1ef3e0fcf134a7e0d1d3456b094a80339ee60db3f0bdd12961f3a05caee7edfc5c6b9c48d49cd55a5dc3c102c3a SHA512 cf29d117b6dabcb7a8e5f6dab5016ce5a5c8f475679001a43fd5c935f2c368f37cdef50aae2080a1e4524f647f6d83458d4a5dec5b45d03fb374f463caf7c3f5
 DIST clang-tools-extra-7.1.0.src.tar.xz 901328 BLAKE2B 20865cf188cf08e4eae969d1083d9d69f57159c3dceb71e3e00a3f4dd96814b99e25fe633eb46801923d64cc9f884da24a417c21af71f0b3535bda0cce7d73da SHA512 8c22136324808b42601915e8163e06a90db078693f9e12369050bca6bab8cb971efaddcda82c5abf08e67ba7a5be1ac32e1bef0aff29a1b433e80eca8eba3e7b
 DIST clang-tools-extra-8.0.0.src.tar.xz 1996156 BLAKE2B 26c839669ce4cf531a56e8527c9d507ce458861c00aaf563fa5e58cfa2fa3897d820643746802198c8e77c9e46fc8f4b833fc3746b32d8adc0d4a09dbe3ace7c SHA512 434e4cb7b76f89b0a0af25f05f32f2f2e8edb9e9f14547be845df75f5032c1d9dbf475be408bb989c476ec667c10af54a15d40e42559b05e52d24c5fd416b517
 DIST clang-tools-extra-8.0.1.src.tar.xz 1994068 BLAKE2B 7d312c1a958d9c5b24515067cbb1db3a92b34cdf77c2345c08ef2f327d2ae4ca7f05252d72ede6569e25cda34225963a8d415cc64279e39d542449ba56eae9c9 SHA512 d39962c30ee9d8a1679d8007009b48dea2c8aaeb283bed781a9e22a1a57b8186c2cfe058da046658882ace1c84a30ddf9b4cb75bce988891189e8423b6c6a72c
-DIST llvm-5.0.2-manpages.tar.bz2 93977 BLAKE2B 8c5e8899e0df9d6037fb7d5c373de6492ccdc9fd2c26cc7dfbd8fb2b9e68418ca8fdf42cdc303c361e649cc6939bf5229cbad017bdccbd5d791e92752328252f SHA512 568615bce5a75d42e4b6d592557472d366d49a99f8e81be10ae679804f1fe674c7fd0bbdac09af44fc67ee5aa34c4ed2153c2767c536ac8e45dd15c811c92dcb
-DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df54505d5db2504bc61860a7260343722ec8cdd5e937d0843263a5bf5077b9cf386c337fa127039b996bab10d2ca5c2caeb59 SHA512 c468e97a2d5610aee9e72cb795e4e65375a079d733550f05380230fb44ba0ed67d407ad06e2340b66f13d19c06583b657e8d01fcdca2146ae43964cea309e0b3
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f38f0bd41147a2c63dc5b8a92f0ec37512e913e68efce51e1643e8f20cf0f3f088d31d19c541d2ff361ecb7d89b234b6c SHA512 78a526d889a8e62accf422655acbb4d17e3c22b0f0830003db0068b3c01c367ac32ce4f4be4cbb2966274440865557c25795205af2a59a054a6f6964294d289f
@@ -24,11 +18,10 @@ DIST llvm-8.0.0-manpages.tar.bz2 140542 BLAKE2B e6c58865ace0b8848ffe825e931a639d
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6db3dd9a1a380a92a07867e3cb835f94b265da5d75c4712b5409405a65795d2cb6b32da4098e38cbb95d7023b56bcbbc1 SHA512 23994a2374659fbbf8d9b5160f4d77e9be7c4c9fc14963e8186bbede78b0ee9257f6b6a9c484bc75d72443d65bb24e598841e64af500336283de0f454d6a2073
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
-EBUILD clang-10.0.0.9999.ebuild 9334 BLAKE2B dd945ca1a7827587a40f0cb329a9eefe5205e9ea89cdc58d74c3a3a9b6a7c159173f6042c8779224f98a2ee528027d3c83deca068aa6ac9127cc02fe58baaff5 SHA512 56cf98e5f53399da6eb12cacec63f8387fe0de9be0330162eb9eee2e27446ab91fd90457d81b466f21c0971c27ec29b859c997dd8cf3976bf934c3ce0525e0e6
-EBUILD clang-5.0.2.ebuild 10452 BLAKE2B 2f0af78f8cdaf88e643bccc474ff186db268307373cfe5130c09c2f07753c5eaa92220ab4f117ae1396ae5ff7cb13fb42765bcc44f7e0aa3decd1c7ce1c93dd2 SHA512 3dc65b62475430748da620f6dcd83943b5de88a28d666b321f107439a8cec88694285c6cf2cd90e0cca78b8f75d3c7af98ca70099500dfd1a59685aadb4fc630
+EBUILD clang-10.0.0.9999.ebuild 9234 BLAKE2B 1249c11cdc4b4ca21cc3e2e82c30dc081125a8800b908807209db4f886e08873b25053ff4cc47b8314ae17ac25e5b8f831ecb724bc90038071cd19b9964e41f3 SHA512 d4c9fe45b4c37f3c192f975231d5f79fa86a186d5182af79d72f8d0b0691276c75772093a350338980370a00ed936ee3928f8ba446865a6ba3dc70490f0c25a8
 EBUILD clang-6.0.1.ebuild 10272 BLAKE2B 7f179071a60dad773c4fedd95aae8c7529e84f891f6001808576bf6523baebe92eee713522c03accdcbeff76afc0c0a1329e159eef2cd307a2ff4ba6b598edc1 SHA512 508dc2b7c6758f63e931f83ec851ccf6e07433719e4e8dcb1f366c736bd22cb4fc19723dc2f05f7ff90f1828fc41a71d808d4f7f8332625134294516dc52ce79
 EBUILD clang-7.1.0.ebuild 10355 BLAKE2B 6f698e87585d2ca5ec9f204022f13dbc9a44a91f78ddfb38e7981af84a19d619b9185124d627b6c00951e323393c864c12f32d60b465f635f1e70ec1f36a441f SHA512 e298008b3eaaf5efb51a04a6322adcbb6e7d16d8b4dba7d5c1ccd0e13ac2c9798b362c9be19087aa1b52a8cdb3ff291c91ed88d1cc7e8195312ee6da17d3e304
 EBUILD clang-8.0.0.ebuild 10158 BLAKE2B 5864138aa69d8cb51fd0d378516aa83a50b30fa57945a95e159740f42949ccc4f9551c2a851170cbdacd2e93982a76fb34f883657c48d4839bbe865b906fbe01 SHA512 f4eca2292f261751a243bb9b50a2b8aaabb6e0f331ab50ebf88e6b1bc5b172c0e0a0b4efa0db87282d8cbfd0f13942e95f986d75ce9ee0d935a75194b7a1a313
-EBUILD clang-8.0.1.ebuild 10257 BLAKE2B 5fc7abba028f8604a99b4ed725d25edf504012c10b1dc62c3ef2bbeb6f56c96a1087344f5ccef0593ca8b96e9b7fb58bc3dda194fe09f9ea16ef83a53c974184 SHA512 dbe4c1ca84567d7fecd0ff52177a32657f4da4410183bd11cf7ab153de267041cd19f1994c49d617a5ba334b40731e1c3f99740cebeab304fec471efee89879a
-EBUILD clang-9.0.0.9999.ebuild 9276 BLAKE2B 2c0cfc102e3ad8f0da02c12ffa789880b05d0c0b6f264017896ae7b19d0116a55f708e29aedfeca990c651f0308a897bd4a317f9f590d6680ca9f0305d1a8434 SHA512 751382164fc4d5fd70919275f289792804aca26e025158eedfa0691361a7e11b6526c643b4b68735bf18aa9e8ba9df4744748d8fc1d83085cc9131573c1baa43
+EBUILD clang-8.0.1.ebuild 10253 BLAKE2B 58fc3b7c9492275425c8ef67c53c016a68826daeaa732783fafc0a9855557deeb706e8ed3e7b3bbea9ef275e0a0a6ce71f3ba5de7076f5ed65b02c606424a0cd SHA512 bf394db124492851d8f9d6ccb53f334fd517952b707d5741e1ca3cf5da1336f41abfeaad8a193b2d14e18e6cf704c8fba9f807855b6921d38dd1bf3edd7ea3eb
+EBUILD clang-9.0.0.9999.ebuild 9378 BLAKE2B 398f15cf6abc57c7b64560f338d87bb8fccae689b95cfcc864df1bfc88f24cd6c33425e60ea37e1bc67151f8bdfec21fdf9a66856259f271ba697fc7f1400dd5 SHA512 471cff8f8b198707b4eb4000b0715481b9852c178e89055e9ee6694cb2e289506049ba04a63296e30a4c2b3b879caf3da0f6b8393c4f6a9a3031bcbed3d60eb8
 MISC metadata.xml 1377 BLAKE2B 8b580be2bcaddb98c2d2b8defd1730c69a7478248f7d241dd00f533d36d750a3f45c1e55161a4fd2731b6211a22c658046cf8ad5a87028c32928dfe0cd4a862f SHA512 b08ea2bd3454abb09abfa92b62e6dae4f4e10db0266c1e4895bef0f6a2d2fadea0b36b9b861831389413e1cca0e3c412b4cf474fc8c4170902b40deeab06686a
diff --git a/sys-devel/clang/clang-10.0.0.9999.ebuild b/sys-devel/clang/clang-10.0.0.9999.ebuild
index 801d601ba134..423e55170bfd 100644
--- a/sys-devel/clang/clang-10.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-10.0.0.9999.ebuild
@@ -109,8 +109,6 @@ multilib_src_configure() {
 	local clang_version=$(ver_cut 1-3 "${llvm_version}")
 
 	local mycmakeargs=(
-		# ensure that the correct llvm-config is used
-		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
 		# relative to bindir
diff --git a/sys-devel/clang/clang-5.0.2.ebuild b/sys-devel/clang/clang-5.0.2.ebuild
deleted file mode 100644
index 68bde97b3892..000000000000
--- a/sys-devel/clang/clang-5.0.2.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eapi7-ver flag-o-matic llvm \
-	multilib-minimal pax-utils prefix python-single-r1 toolchain-funcs
-
-MY_P=cfe-${PV/_/}.src
-EXTRA_P=clang-tools-extra-${PV/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	https://releases.llvm.org/${PV/_//}/${EXTRA_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )
-	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
-	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND="
-	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
-	static-analyzer? (
-		dev-lang/perl:*
-		z3? ( <sci-mathematics/z3-4.6:0= )
-	)
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	${PYTHON_DEPS}"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	!<sys-devel/llvm-4.0.0_rc:0
-	!sys-devel/clang:0"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-# We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	# create extra parent dir for CLANG_RESOURCE_DIR
-	mkdir -p x/y || die
-	cd x/y || die
-
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-	einfo "Unpacking ${EXTRA_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${EXTRA_P}.tar.xz" || die
-
-	mv "${EXTRA_P}" "${S}"/tools/extra || die
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/utils/{lit,unittest} || die
-		mv "${LLVM_P}" "${WORKDIR}"/llvm || die
-	fi
-
-	if ! use doc; then
-		einfo "Unpacking llvm-${PV}-manpages.tar.bz2 ..."
-		tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die
-	fi
-}
-
-src_prepare() {
-	# fix finding compiler-rt libs
-	eapply "${FILESDIR}"/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
-	# fix setting LD_LIBRARY_PATH for tests on *BSD
-	eapply "${FILESDIR}"/5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
-	# add Prefix include paths for Darwin
-	eapply "${FILESDIR}"/6.0.1/darwin_prefix-include-paths.patch
-
-	cd tools/extra || die
-	# fix setting LD_LIBRARY_PATH for tests on *BSD (extra part)
-	eapply "${FILESDIR}"/5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
-	cd ../.. || die
-
-	cmake-utils_src_prepare
-	eprefixify lib/Frontend/InitHeaderSearch.cpp
-}
-
-multilib_src_configure() {
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-3 "${llvm_version}")
-
-	local mycmakeargs=(
-		# ensure that the correct llvm-config is used
-		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# override default stdlib and rtlib
-		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-		# z3 is not multilib-friendly
-		-DCLANG_ANALYZER_BUILD_Z3=$(multilib_native_usex z3)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			# normally copied from LLVM_INCLUDE_DOCS but the latter
-			# is lacking value in stand-alone builds
-			-DCLANG_INCLUDE_DOCS=$(usex doc)
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
-		)
-		use doc && mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=ON
-			-DLLVM_ENABLE_SPHINX=ON
-			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-		use z3 && mycmakeargs+=(
-			-DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -x "/usr/bin/clang-tblgen" ]] \
-			|| die "/usr/bin/clang-tblgen not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-		)
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-clang
-	# clang-tidy requires [static-analyzer] and tests are not split
-	# correctly, so they are all disabled when static-analyzer is off
-	if multilib_is_native_abi && use static-analyzer; then
-		cmake-utils_src_make check-clang-tools
-	fi
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED%/}"/usr/include/clangrt "${ED%/}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	# note: we use two version components here (vs 3 in runtime path)
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-2 "${llvm_version}")
-	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X.Y
-	# - clang -> clang-X.Y
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X.Y
-	# - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die
-		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
-		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
-			dosym "${abi_chost}-${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
-		done
-	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED%/}"/usr/include || die
-	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
-	mv "${ED%/}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED%/}"/usr/include/clangrt || die
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"usr/lib/llvm/${SLOT}/share/scan-view
-	fi
-
-	# install pre-generated manpages
-	if ! use doc; then
-		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-		doins "${WORKDIR}/x/y/llvm-${PV}-manpages/clang"/*.1
-	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
-	elog "To use these scripts, you will need Python 2.7. Some of them are vim"
-	elog "integration scripts (with instructions inside)."
-}
-
-pkg_postrm() {
-	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/clang/clang-8.0.1.ebuild b/sys-devel/clang/clang-8.0.1.ebuild
index b3eea9c9d31f..dd1094ed0e97 100644
--- a/sys-devel/clang/clang-8.0.1.ebuild
+++ b/sys-devel/clang/clang-8.0.1.ebuild
@@ -31,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/clang/clang-9.0.0.9999.ebuild b/sys-devel/clang/clang-9.0.0.9999.ebuild
index 92eaa1de0a74..4fac61d4c534 100644
--- a/sys-devel/clang/clang-9.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-9.0.0.9999.ebuild
@@ -63,6 +63,12 @@ S=${WORKDIR}/x/y/${P}
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+PATCHES=(
+	# fix linking in non-native build (without tools-extra)
+	# https://bugs.llvm.org/show_bug.cgi?id=43281
+	"${FILESDIR}"/9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch
+)
+
 # Multilib notes:
 # 1. ABI_* flags control ABIs libclang* is built for only.
 # 2. clang is always capable of compiling code for all ABIs for enabled
@@ -108,8 +114,6 @@ multilib_src_configure() {
 	local clang_version=$(ver_cut 1-3 "${llvm_version}")
 
 	local mycmakeargs=(
-		# ensure that the correct llvm-config is used
-		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
 		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
 		# relative to bindir
diff --git a/sys-devel/clang/files/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch b/sys-devel/clang/files/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
deleted file mode 100644
index 7d53cbdef3f3..000000000000
--- a/sys-devel/clang/files/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 19e3dc0ce4949cc7f869b4552c6a7f28cd59c3b7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 17 Nov 2016 14:19:18 +0100
-Subject: [PATCH] [Driver] Use arch type to find compiler-rt libraries (on
- Linux)
-
-Use llvm::Triple::getArchTypeName() when looking for compiler-rt
-libraries, rather than the exact arch string from the triple. This is
-more correct as it matches the values used when building compiler-rt
-(builtin-config-ix.cmake) which are the subset of the values allowed
-in triples.
-
-For example, this fixes an issue when the compiler set for
-i686-pc-linux-gnu triple would not find an i386 compiler-rt library,
-while this is the exact arch that is detected by compiler-rt. The same
-applies to any other i?86 variant allowed by LLVM.
-
-This also makes the special case for MSVC unnecessary, since now i386
-will be used reliably for all 32-bit x86 variants.
----
- lib/Driver/ToolChain.cpp                            |  5 +----
- .../usr/i686-unknown-linux/lib/.keep                |  0
- .../usr/lib/gcc/i686-unknown-linux/4.6.0/crtbegin.o |  0
- test/Driver/linux-ld.c                              | 21 +++++++++++++++++++++
- test/Driver/nostdlib.c                              |  2 +-
- test/Driver/print-libgcc-file-name-clangrt.c        | 10 ++++++++--
- test/Driver/windows-cross.c                         |  2 +-
- 7 files changed, 32 insertions(+), 8 deletions(-)
- create mode 100644 test/Driver/Inputs/basic_linux_tree/usr/i686-unknown-linux/lib/.keep
- create mode 100644 test/Driver/Inputs/basic_linux_tree/usr/lib/gcc/i686-unknown-linux/4.6.0/crtbegin.o
-
-diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp
-index 6adc0386ee..7e4222f087 100644
---- a/lib/Driver/ToolChain.cpp
-+++ b/lib/Driver/ToolChain.cpp
-@@ -283,15 +283,12 @@ static StringRef getArchNameForCompilerRTLib(const ToolChain &TC,
-   const llvm::Triple &Triple = TC.getTriple();
-   bool IsWindows = Triple.isOSWindows();
- 
--  if (Triple.isWindowsMSVCEnvironment() && TC.getArch() == llvm::Triple::x86)
--    return "i386";
--
-   if (TC.getArch() == llvm::Triple::arm || TC.getArch() == llvm::Triple::armeb)
-     return (arm::getARMFloatABI(TC, Args) == arm::FloatABI::Hard && !IsWindows)
-                ? "armhf"
-                : "arm";
- 
--  return TC.getArchName();
-+  return llvm::Triple::getArchTypeName(TC.getArch());
- }
- 
- std::string ToolChain::getCompilerRT(const ArgList &Args, StringRef Component,
-diff --git a/test/Driver/Inputs/basic_linux_tree/usr/i686-unknown-linux/lib/.keep b/test/Driver/Inputs/basic_linux_tree/usr/i686-unknown-linux/lib/.keep
-new file mode 100644
-index 0000000000..e69de29bb2
-diff --git a/test/Driver/Inputs/basic_linux_tree/usr/lib/gcc/i686-unknown-linux/4.6.0/crtbegin.o b/test/Driver/Inputs/basic_linux_tree/usr/lib/gcc/i686-unknown-linux/4.6.0/crtbegin.o
-new file mode 100644
-index 0000000000..e69de29bb2
-diff --git a/test/Driver/linux-ld.c b/test/Driver/linux-ld.c
-index e5aa870866..92b199b9d4 100644
---- a/test/Driver/linux-ld.c
-+++ b/test/Driver/linux-ld.c
-@@ -71,6 +71,27 @@
- // CHECK-LD-RT: libclang_rt.builtins-x86_64.a"
- //
- // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-+// RUN:     --target=i686-unknown-linux \
-+// RUN:     --gcc-toolchain="" \
-+// RUN:     --sysroot=%S/Inputs/basic_linux_tree \
-+// RUN:     --rtlib=compiler-rt \
-+// RUN:   | FileCheck --check-prefix=CHECK-LD-RT-I686 %s
-+// CHECK-LD-RT-I686-NOT: warning:
-+// CHECK-LD-RT-I686: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
-+// CHECK-LD-RT-I686: "--eh-frame-hdr"
-+// CHECK-LD-RT-I686: "-m" "elf_i386"
-+// CHECK-LD-RT-I686: "-dynamic-linker"
-+// CHECK-LD-RT-I686: "{{.*}}/usr/lib/gcc/i686-unknown-linux/4.6.0{{/|\\\\}}crtbegin.o"
-+// CHECK-LD-RT-I686: "-L[[SYSROOT]]/usr/lib/gcc/i686-unknown-linux/4.6.0"
-+// CHECK-LD-RT-I686: "-L[[SYSROOT]]/usr/lib/gcc/i686-unknown-linux/4.6.0/../../../../i686-unknown-linux/lib"
-+// CHECK-LD-RT-I686: "-L[[SYSROOT]]/usr/lib/gcc/i686-unknown-linux/4.6.0/../../.."
-+// CHECK-LD-RT-I686: "-L[[SYSROOT]]/lib"
-+// CHECK-LD-RT-I686: "-L[[SYSROOT]]/usr/lib"
-+// CHECK-LD-RT-I686: libclang_rt.builtins-i386.a"
-+// CHECK-LD-RT-I686: "-lc"
-+// CHECK-LD-RT-I686: libclang_rt.builtins-i386.a"
-+//
-+// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
- // RUN:     --target=arm-linux-androideabi \
- // RUN:     --gcc-toolchain="" \
- // RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
-diff --git a/test/Driver/nostdlib.c b/test/Driver/nostdlib.c
-index a9ef665c57..c9793d968c 100644
---- a/test/Driver/nostdlib.c
-+++ b/test/Driver/nostdlib.c
-@@ -27,5 +27,5 @@
- //
- // CHECK-LINUX-NOSTDLIB: warning: argument unused during compilation: '--rtlib=compiler-rt'
- // CHECK-LINUX-NOSTDLIB: "{{(.*[^.0-9A-Z_a-z])?}}ld{{(.exe)?}}"
--// CHECK-LINUX-NOSTDLIB-NOT: "{{.*}}/Inputs/resource_dir{{/|\\\\}}lib{{/|\\\\}}linux{{/|\\\\}}libclang_rt.builtins-i686.a"
-+// CHECK-LINUX-NOSTDLIB-NOT: "{{.*}}/Inputs/resource_dir{{/|\\\\}}lib{{/|\\\\}}linux{{/|\\\\}}libclang_rt.builtins-i386.a"
- // CHECK-MSVC-NOSTDLIB: warning: argument unused during compilation: '--rtlib=compiler-rt'
-diff --git a/test/Driver/print-libgcc-file-name-clangrt.c b/test/Driver/print-libgcc-file-name-clangrt.c
-index 9f8120c31d..28c758881d 100644
---- a/test/Driver/print-libgcc-file-name-clangrt.c
-+++ b/test/Driver/print-libgcc-file-name-clangrt.c
-@@ -6,6 +6,12 @@
- // CHECK-CLANGRT-X8664: libclang_rt.builtins-x86_64.a
- 
- // RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \
-+// RUN:     --target=i386-pc-linux \
-+// RUN:   | FileCheck --check-prefix=CHECK-CLANGRT-I386 %s
-+// CHECK-CLANGRT-I386: libclang_rt.builtins-i386.a
-+
-+// Check whether alternate arch values map to the correct library.
-+//
-+// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \
- // RUN:     --target=i686-pc-linux \
--// RUN:   | FileCheck --check-prefix=CHECK-CLANGRT-I686 %s
--// CHECK-CLANGRT-I686: libclang_rt.builtins-i686.a
-+// RUN:   | FileCheck --check-prefix=CHECK-CLANGRT-I386 %s
-diff --git a/test/Driver/windows-cross.c b/test/Driver/windows-cross.c
-index 5a2fe52b09..78b4981c9d 100644
---- a/test/Driver/windows-cross.c
-+++ b/test/Driver/windows-cross.c
-@@ -59,7 +59,7 @@
- // RUN:    | FileCheck %s --check-prefix CHECK-SANITIZE-ADDRESS-EXE-X86
- 
- // CHECK-SANITIZE-ADDRESS-EXE-X86: "-fsanitize=address"
--// CHECK-SANITIZE-ADDRESS-EXE-X86: "{{.*}}clang_rt.asan_dynamic-i686.lib" "{{.*}}clang_rt.asan_dynamic_runtime_thunk-i686.lib" "--undefined" "___asan_seh_interceptor"
-+// CHECK-SANITIZE-ADDRESS-EXE-X86: "{{.*}}clang_rt.asan_dynamic-i386.lib" "{{.*}}clang_rt.asan_dynamic_runtime_thunk-i386.lib" "--undefined" "___asan_seh_interceptor"
- 
- // RUN: %clang -### -target armv7-windows-itanium --sysroot %S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/bin -fuse-ld=lld-link2 -shared -o shared.dll -fsanitize=tsan -x c++ %s 2>&1 \
- // RUN:    | FileCheck %s --check-prefix CHECK-SANITIZE-TSAN
--- 
-2.11.0
-
diff --git a/sys-devel/clang/files/5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch b/sys-devel/clang/files/5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
deleted file mode 100644
index 1751a4f479f0..000000000000
--- a/sys-devel/clang/files/5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 4650c277d616e5d297baf28682eb792e2e0144b1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 1 Apr 2018 23:20:56 +0200
-Subject: [PATCH] [test] Fix clang-test for FreeBSD and NetBSD
-
-Lit tries to inject the shared library paths, but no action is taken
-when platform.system() is not recognized, results in an environment
-variable with an empty name, which is illegal.
-
-The patch fixes this mechanism for FreeBSD and NetBSD, and gives an
-warning on other platforms, so that the latecomers don't have to spend
-time on debugging lit.
-
-Thanks Zhihao Yuan for the patch!
-
-Differential Revision: https://reviews.llvm.org/D39162
-
-git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@316411 91177308-0d34-0410-b5e6-96231b3b80d8
-
-(rebased for release_50 branch)
----
- test/Unit/lit.cfg | 41 ++++++++++++++++++++---------------------
- 1 file changed, 20 insertions(+), 21 deletions(-)
-
-diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
-index 90eb2ac604..2cabf4bba1 100644
---- a/test/Unit/lit.cfg
-+++ b/test/Unit/lit.cfg
-@@ -87,24 +87,23 @@ if config.test_exec_root is None:
-     lit_config.load_config(config, site_cfg)
-     raise SystemExit
- 
--shlibpath_var = ''
--if platform.system() == 'Linux':
--    shlibpath_var = 'LD_LIBRARY_PATH'
--elif platform.system() == 'Darwin':
--    shlibpath_var = 'DYLD_LIBRARY_PATH'
--elif platform.system() == 'Windows':
--    shlibpath_var = 'PATH'
--
--# in stand-alone builds, shlibdir is clang's build tree
--# while llvm_libs_dir is installed LLVM (and possibly older clang)
--llvm_shlib_dir = getattr(config, 'shlibdir', None)
--if not llvm_shlib_dir:
--    lit_config.fatal('No shlibdir set!')
--# Point the dynamic loader at dynamic libraries in 'lib'.
--llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
--if not llvm_libs_dir:
--    lit_config.fatal('No LLVM libs dir set!')
--shlibpath = os.path.pathsep.join((llvm_shlib_dir, llvm_libs_dir,
--                                 config.environment.get(shlibpath_var,'')))
--
--config.environment[shlibpath_var] = shlibpath
-+def find_shlibpath_var():
-+    if platform.system() in ['Linux', 'FreeBSD', 'NetBSD']:
-+        yield 'LD_LIBRARY_PATH'
-+    elif platform.system() == 'Darwin':
-+        yield 'DYLD_LIBRARY_PATH'
-+    elif platform.system() == 'Windows':
-+        yield 'PATH'
-+
-+for shlibpath_var in find_shlibpath_var():
-+    # in stand-alone builds, shlibdir is clang's build tree
-+    # while llvm_libs_dir is installed LLVM (and possibly older clang)
-+    shlibpath = os.path.pathsep.join(
-+        (config.shlibdir,
-+         config.llvm_libs_dir,
-+         config.environment.get(shlibpath_var, '')))
-+    config.environment[shlibpath_var] = shlibpath
-+    break
-+else:
-+    lit_config.warning("unable to inject shared library path on '{}'"
-+                       .format(platform.system()))
--- 
-2.17.0.rc2
-
diff --git a/sys-devel/clang/files/5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch b/sys-devel/clang/files/5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
deleted file mode 100644
index cbdb0b807aaf..000000000000
--- a/sys-devel/clang/files/5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5c5bb3948697f2ca184a03dedd5666eb2de547ba Mon Sep 17 00:00:00 2001
-From: Dimitry Andric <dimitry@andric.com>
-Date: Sat, 20 Jan 2018 14:34:33 +0000
-Subject: [PATCH] Assume the shared library path variable is LD_LIBRARY_PATH on
- systems except Darwin and Windows.  This prevents inserting an environment
- variable with an empty name (which is illegal and leads to a Python
- exception) on any of the BSDs.
-
-git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@323040 91177308-0d34-0410-b5e6-96231b3b80d8
----
- test/Unit/lit.cfg | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
-index fc63afdb..b40e1cae 100644
---- a/test/Unit/lit.cfg
-+++ b/test/Unit/lit.cfg
-@@ -19,13 +19,12 @@ config.test_exec_root = config.test_source_root
- # ;-separated list of subdirectories).
- config.test_format = lit.formats.GoogleTest('.', 'Tests')
- 
--shlibpath_var = ''
--if platform.system() == 'Linux':
--    shlibpath_var = 'LD_LIBRARY_PATH'
--elif platform.system() == 'Darwin':
-+if platform.system() == 'Darwin':
-     shlibpath_var = 'DYLD_LIBRARY_PATH'
- elif platform.system() == 'Windows':
-     shlibpath_var = 'PATH'
-+else:
-+    shlibpath_var = 'LD_LIBRARY_PATH'
- 
- # Point the dynamic loader at dynamic libraries in 'lib'.
- shlibpath = os.path.pathsep.join((config.shlibdir, config.llvm_libs_dir,
--- 
-2.17.0.rc2
-
diff --git a/sys-devel/clang/files/9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch b/sys-devel/clang/files/9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch
new file mode 100644
index 000000000000..67ae5a8e4dcf
--- /dev/null
+++ b/sys-devel/clang/files/9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch
@@ -0,0 +1,39 @@
+From bfb5b0cb86cf90d9fa794f873644aa642b652c43 Mon Sep 17 00:00:00 2001
+From: Michal Gorny <mgorny@gentoo.org>
+Date: Thu, 12 Sep 2019 13:06:12 +0000
+Subject: [PATCH] [clang] [unittest] Import LLVMTestingSupport if necessary
+
+Add LLVMTestingSupport directory from LLVM_MAIN_SRC_DIR when building
+clang stand-alone and LLVMTestingSupport library is not present.  This
+is needed to fix stand-alone builds without clang-tools-extra.
+
+Differential Revision: https://reviews.llvm.org/D67452
+
+llvm-svn: 371733
+---
+ clang/unittests/CMakeLists.txt | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
+index 9a41000cf43..4c222e24599 100644
+--- a/unittests/CMakeLists.txt
++++ b/unittests/CMakeLists.txt
+@@ -1,6 +1,15 @@
+ add_custom_target(ClangUnitTests)
+ set_target_properties(ClangUnitTests PROPERTIES FOLDER "Clang tests")
+ 
++if(CLANG_BUILT_STANDALONE)
++  # LLVMTestingSupport library is needed for some of the unittests.
++  if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
++      AND NOT TARGET LLVMTestingSupport)
++    add_subdirectory(${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
++      lib/Testing/Support)
++  endif()
++endif()
++
+ # add_clang_unittest(test_dirname file1.cpp file2.cpp)
+ #
+ # Will compile the list of files together and link against the clang
+-- 
+2.23.0
+
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 764b23e41619..b0d8e0302a19 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -3,10 +3,12 @@ DIST crossdev-20181202.tar.xz 27184 BLAKE2B d1770f5148d666b22a20576b638e71bf6325
 DIST crossdev-20190311.tar.xz 27176 BLAKE2B 444828314b4e5363e9603a1fea8034e0b2b604a164d8efd6c31bf15591080daebd936eb2881c83e165f945742d11f54b04bf5f59b4ff39c048e55fef9989d268 SHA512 1f572df09204e297efd6e97001aad929226f26e9ddc706568680d75b1746a624e86c1578c5d3ee1e52ece0bbafdd17ae59565f3098864f018768c2901821f4ff
 DIST crossdev-20190712.tar.xz 27240 BLAKE2B a2d09a21df1eeeb16ad03c7415a58e3d3424221b08d1a672167945df8ebe9b6c1898ee3f684d8653ed088cc1ef0155de0156b14e2a77bb47389c6f3e277039d7 SHA512 987c29b7e36f94e1bd14c4072514a04d6655a41a922cc179e6cd12bc78a71dd60202d202c40a107365297fe11c6e2bdcbd2a3cea21b5b7260c0b8608d9d3ade5
 DIST crossdev-20190901.tar.xz 27180 BLAKE2B 879616453e883c54c9646e9111aba0fca86bda36c3f1fb327a4036a140c58b6b09498fb8e2b6d8e19dcd5efe15245d70585c6b4b463ec9f58ed5c2b84395fa49 SHA512 42d31626f798136df1d9000d0de325d53d51746a8f187001279090b112fe05862930110d2ef877d14dfc9a6d111649f3e335e1bb8e023696a69129592b6a8976
+DIST crossdev-20190908.tar.xz 27216 BLAKE2B f756735108c257b5070031f60f39cd93ce4d146e1f7d0e33df40384033c92d545f11b3aaf7b6313fa3fc402af6d0daa8ec0dd1e0aadb42a9a2f23b05768fbcda SHA512 70fb3a5995c284745fa4aae5844c368e7b8f5190a9ec15384b1db455ff6202bf88e33e16ededb6d127f82bab0aa1d0fd859652c8d4907e9cf7f4e7c95bdfa540
 EBUILD crossdev-20181020.ebuild 853 BLAKE2B d9a5fe47015d1d73a4b54b91cbf745780ad2fcafd857a11e4bf7b4ba2cc3c54c75918a491f5146c25626bbb271c2ff121fd6b524a2b54a52e4a4d5e1ba1cf262 SHA512 d19b06a4d29e3a43829db890b5b24180a3a6979f446dd9ce4e131ebdbd4f1dd547133d2aae718c146d085813323ad2223a5f9ef8b07091757927a06bca86ac78
 EBUILD crossdev-20181202.ebuild 853 BLAKE2B d9a5fe47015d1d73a4b54b91cbf745780ad2fcafd857a11e4bf7b4ba2cc3c54c75918a491f5146c25626bbb271c2ff121fd6b524a2b54a52e4a4d5e1ba1cf262 SHA512 d19b06a4d29e3a43829db890b5b24180a3a6979f446dd9ce4e131ebdbd4f1dd547133d2aae718c146d085813323ad2223a5f9ef8b07091757927a06bca86ac78
 EBUILD crossdev-20190311.ebuild 873 BLAKE2B 6ba21dec4b1fcf5a36f23ce56c07cef4eb5f00ae08cba636354c966e83f19569c9d3772f112e4a033863cab938ebd6a476fd731f18284eaa4d64f7e8acbfd961 SHA512 4ca24706a276064a3c4a89667ac4d8c6033796db077e06d7bd28f18e218a6c0c018a890789216cace24bb228c3344975eb287a79df49a5c40b851d77a7bf3e78
 EBUILD crossdev-20190712.ebuild 860 BLAKE2B dbd958904546375349ac0ea43abc0614cbddc0ef834d9134ebf4a70fcaa59c62f13cd5ba1d5687fac9e6f4ea33cfa5fa99dcfad1e1345cbbe7e34ec56f9c4857 SHA512 9cd21e0ad7c5744226e75931e9c3c0fc3598ad8e3c015042418fa65007ea21061b91a698622cc806a53c7d8ac26fef28302ab5c560356896cf3ffca900209948
 EBUILD crossdev-20190901.ebuild 873 BLAKE2B 6ba21dec4b1fcf5a36f23ce56c07cef4eb5f00ae08cba636354c966e83f19569c9d3772f112e4a033863cab938ebd6a476fd731f18284eaa4d64f7e8acbfd961 SHA512 4ca24706a276064a3c4a89667ac4d8c6033796db077e06d7bd28f18e218a6c0c018a890789216cace24bb228c3344975eb287a79df49a5c40b851d77a7bf3e78
+EBUILD crossdev-20190908.ebuild 873 BLAKE2B 6ba21dec4b1fcf5a36f23ce56c07cef4eb5f00ae08cba636354c966e83f19569c9d3772f112e4a033863cab938ebd6a476fd731f18284eaa4d64f7e8acbfd961 SHA512 4ca24706a276064a3c4a89667ac4d8c6033796db077e06d7bd28f18e218a6c0c018a890789216cace24bb228c3344975eb287a79df49a5c40b851d77a7bf3e78
 EBUILD crossdev-99999999.ebuild 879 BLAKE2B 9ac2da81d2ce3e295b1ddf9b4c5febb91718a37badefcadc32c984523169a455001e14d591d4873bcb3e691fe4b8b532c45e379935de71d573aef47b438275a7 SHA512 f3420056b96dc3bbd175638eeb4cd16779d8676db61a25635d60533f9f1d08ec434e4e70e8c00001eb8a961bd79aa3b50d20729c2cddf14c4225fe18d801bab0
 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20190908.ebuild b/sys-devel/crossdev/crossdev-20190908.ebuild
new file mode 100644
index 000000000000..36e054f04b26
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20190908.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.1
+	>=app-portage/portage-utils-0.55
+	app-shells/bash
+	sys-apps/gentoo-functions
+	!sys-devel/crossdev-wrappers"
+DEPEND="app-arch/xz-utils"
+
+src_install() {
+	default
+
+	if [[ "${PV}" == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 8a91a17b1c17..d7d9357d5c8c 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -11,5 +11,5 @@ AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be
 DIST distcc-3.3.2.tar.gz 1008938 BLAKE2B e784002dffefd395b068d237a86203563fefc81e17a08c4d2e372eaaf62c5ac799011fc8633c8bfb717f0ebc8c8cb8b999c941e0f5f87c4077d031a9e5c4b138 SHA512 fdf11ed94ba50977b45e302179c5c4ba067cc3db37579cb8ed6d5b9487f8e3c89114f65af69333c38d374cf7634d7aef8d5a2d5c7fd8e9b1f4930c0897d6da10
 DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592aaaafd521cf73c92a72bf30b8a69caa SHA512 d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135
 EBUILD distcc-3.3.2-r5.ebuild 5698 BLAKE2B 5b8292c329aae5fd986e9866ce34a5aef87667ebdee12279e3c4382067c9c7d3b0c1b84ceabbf585d9f3f889314c20cd637042f659ad382f56a41f3213711a59 SHA512 37e46b0085ced2f6fcdb80548f176aee90ba80e0c81226f88404c3ab70c15a7e1c3f9d5565d9bf503807baa60f53ad19e316979ad0cab162d5da7fb9e9295ae7
-EBUILD distcc-3.3.3.ebuild 5601 BLAKE2B f9a847fd03e9863fb1efbb58e7d8bafc4a628017eeb73bba76d684075aeb1a7aa32d30fdaf80b42e30311c0c5f22d36dbf926c102679114fa7b88ad3364c0201 SHA512 115cb109027d4ce1b95078433f9fcd934a29fa1d3071406cf4c7457c192ec57fc58d1b9308aaae027576eaec84566543d77b6a945f937986812c0b89e593ad3d
+EBUILD distcc-3.3.3.ebuild 5593 BLAKE2B 3fdad30c9f1a31e2e9af419eb3dfdcbb2f307fd6a9bf546c7e140ee1c905fee4d3ec541a19ad5fe22ba212093af8223220ca23568f0988ad7d3ee383c6e0c7d6 SHA512 ef72a44dff748ad557b28a10bd511ef40ea0c3cc7613220f06b4cf0d9107d9081b277e4c18338654ee39d275999c398c4cfd06830de029ec14f68d41dc6d3e43
 MISC metadata.xml 606 BLAKE2B e6d738b3d7fed20430d4ae45738c9e4b2447a61a1a57735bf0fa8e1e177e1e0d027a71ebff71de9cbcc5d1d5800a31946002b1e36d73a8c31b2c097360a1dc64 SHA512 e196028491d2e4bcbb7390e220313a1ce4f5a41706a792775d31c66b3caf92bbb23680d26d3f41d285b2ba2f8b4dceb4e09760ac7ed0724eafdbc4b2ca8ecc6f
diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild b/sys-devel/distcc/distcc-3.3.3.ebuild
index 7d4e47111f25..e2f081d29b07 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf"
 
 RESTRICT="test"
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 74bb7eb963ed..2a9a73023222 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,4 +1,6 @@
 DIST gcc-config-2.0.tar.xz 15344 BLAKE2B 323b1e791b831ee610a375fc03532ab89e31b1f74586742c1d37dcea9c7853cf4ebfef875fc2bfa273cfc1555a33b9f04a1e58c850133cddee765dd769bdb189 SHA512 67c8cfc7e031d4a88191c04495c97f46e90e2d3fce4cd1afc29f142fad9414218768d3c6de4bd8bb7d9baa39a20b17bb28a503b0d05d6db2003b767546317a30
+DIST gcc-config-2.1.tar.xz 15520 BLAKE2B 0e37762877116d90265a31cf6d9bc99da9b358afc26c0f7cb6fdbbb44dce23ebf59a1d5c2e481d456c03fbcc383efb7a56559af0bbd1f2bd78f407a853c88369 SHA512 0b19cb758a1e8c5e2e1f7901799fa1eb598d9d5c8d89ceace2e294ec569bfa90978bef72f52b9c2a3455f2ffd21be0899fb3e23b5fbdf62b70e978c153961272
 EBUILD gcc-config-2.0.ebuild 1208 BLAKE2B e30bce3cb658560c82662433eac8c6c0cc162eb68f47bd9ac3d75915c3a14f743b22b443a7022efc5261c28fc7cb0ef5890df90c0fea1bc5882e028b18ca9fa6 SHA512 ed202ecaa285fe76327382ad71dc54eb1093888302826e1d968b279bfc7c9dcbed121409adcc58b504e6e55b58603b651a336b6abdaa8a449b9d73204ab2fa2b
-EBUILD gcc-config-9999.ebuild 1220 BLAKE2B c742e71d7eec27b9b010ee84fdb08b70aa5e226d11f3317699bed8de606baff34b9a48ba30b39660b9decdfb27b8b6ea4c7eac67666c581814850d6e88ca564d SHA512 22c107f48ded4903572ccb8d5381114c17c4cd7210147b344bdf3556137e1b12f4d0a5ff2c148a41b435c3e2b6119fe7ad77084a36598f42b4eccc08c8ac6c5f
+EBUILD gcc-config-2.1.ebuild 1221 BLAKE2B 1fb823effc6eafcf213e0fb339c8ac220c68163f5edb8683d4a7db3e9d900fb0ed91b1b68de6435e9cf463a2674bda265a6467c981d3b4b9d92deb75678a05b4 SHA512 a764662594c1fd62eb1643f959e75466375dda1bb0c3b0f446565306f8c14abd7a2f56708fcfcdb13a39452178207589d4bb4972d54591b34d6b0502500dcaad
+EBUILD gcc-config-9999.ebuild 1217 BLAKE2B 57f7e9aee9f4314f819d9ba81c7007231373b25154721ab9912ccd94a927a22909a08fcd0d358b89fa1f381dbf3c4e57922a758007df452688cf367614a86ee4 SHA512 e57bf24e35e5075d325f17812f78d4c70a060013aad75955c266fd8cf56ed4c39eec4574a3b680d44911a2ac4673e921b2744d151ce4415c1cc192247d004f6b
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/gcc-config/gcc-config-2.1.ebuild b/sys-devel/gcc-config/gcc-config-2.1.ebuild
new file mode 100644
index 000000000000..fc7dbbda8a1d
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+DESCRIPTION="Utility to manage compilers"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/gentoo-functions-0.10"
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		PV="${PV}" \
+		SUBLIBDIR="$(get_libdir)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PV="${PV}" \
+		SUBLIBDIR="$(get_libdir)" \
+		install
+}
+
+pkg_postinst() {
+	# Scrub eselect-compiler remains
+	rm -f "${ROOT}"/etc/env.d/05compiler &
+
+	# We not longer use the /usr/include/g++-v3 hacks, as
+	# it is not needed ...
+	rm -f "${ROOT}"/usr/include/g++{,-v3} &
+
+	# Do we have a valid multi ver setup ?
+	local x
+	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
+		gcc-config ${x}
+	done
+
+	wait
+}
diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index de2993cbb378..22370b52cc52 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 5e12777b92de..0840103bee14 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,10 +1,10 @@
-AUX 99999999/0002-Add-x32-support-to-config.guess.patch 1315 BLAKE2B a0d88c06dcd6aacc93bc54b67cc7b6197ab3e58186a47cc6825a36eb898e4c0bfa50b38c3d8ca233583981ec2e7b9ab7a66d48507bd487d725ddd88182eb5a30 SHA512 e35aa9b56acc50bad8f560fb4def75c79bf8090e6595d5a66ec10f2a12ac1037dac9c0e5c1c4b66946dac26b97f845011952d1472625753294c295e82f67cb6a
-AUX 99999999/0002-add-ps2-targets-to-config.sub.patch 1690 BLAKE2B 53d43da59ed0bcd390408333efcd07de1f1aabb9b4dfde8335949897535885cbbde3e623990737b833c47f6e948a64decfb6060395eaa935e8e5e0ac681605f4 SHA512 cb53feeaa937a72b3d64a45120890fdbb5c8eb93124da6528fcbbf03fff0d4f08d252fed1331d40de5cd34f09dc9e05d175e24fe097f274b141b73366f8cb0ad
-DIST gnuconfig-20161104.tar.bz2 49977 BLAKE2B 4d7d838c153abf2624bf53ceaefa43cee3f7321a36fc4bc64bfe8a22f93430faa43c28cb5c56a30d4818f7dc84fdcca7b866adc0cb557d8a67e7ca3e3a2f1daf SHA512 976b29363aaeaddf4d0520e1458b7fd3f91adf4e4f54c732acba984b9fd59a67c72488a439cc848deae32de8e6884b372ff5e5bb2972ea1e8eb9ddb222816f56
+AUX 99999999/0001-add-ps2-targets-to-config.sub.patch 1736 BLAKE2B 291ba73c850f1a53cbb0f64da20447d6c9adb9652d994d50eb2052b385253b8d4083277f5b5aa70f9fba75aadc517755d7ef0c880d62cbb87032bae84d9760f7 SHA512 851d52019749cc8fe2c34a53326cd68acae2269274e283a96a4a90b0e630552c8f13b8199f74a8b26c62afabee7631eeed5f56381a84ec99980d59f443270b28
+AUX 99999999/0002-Add-x32-support-to-config.guess.patch 1318 BLAKE2B 1844a1c52406e4142d2b966f485de914a63dd1553e1dfb6f07dfc5860884df13228ef33ca782870a90f5f04de67f21f35028855f6da1bcfaf279fff417b603e9 SHA512 9561f39564bcba61495665e984e0e4539459ec1a342461364849f74cb86adfe6e71867913f0aa98540a4c9a54d0932f133b5541ea41e59f9b32d0278d22db17f
 DIST gnuconfig-20170101.tar.bz2 50152 BLAKE2B be36ec32461444e489c591aa5dff8540f6191cc21c69590bb48632e79b4ce41b1ca30b17d034c068cf79762a520447c0edc1b3a300b4225b25f8ed19fbf249e5 SHA512 a4d72b50f0c6ebae702b4d51aaeb459ac2b325f9f79ff6c464c1b92ecd7eb961b47b4fa0eb03894e80646846cff39a3e3b2d8ada6279e288e94846a12578b440
 DIST gnuconfig-20180101.tar.bz2 51438 BLAKE2B c09ceb107bc446b04feb6fda500a1d869c8e0841bb72b7116c7bdadaa737cc25db2715ab3ce20429a9a7d4e0a5c0b054b63b21fc49da2f65e277169c34b5e2ed SHA512 3af359088e8e93c81ec49bfae90839266596c2566a663839b0e91c4d4319d2bfb91738af9d5fa19b9d53703979fbddd81294bcc032b46c33b94f1961ff9f2178
-EBUILD gnuconfig-20161104.ebuild 1540 BLAKE2B 4b82791d056a3a03ea6977d0849dfdd14db635fa51179b4dbf5b8cebdcad1424d9c3b17fb8122e98bada6b6ead518b23a3d6a7eeda9b412c263202ecd17a7e0f SHA512 b2bf31e1c4dbf327c8153e9a76ae15e842aced572f454896707d41b085b730f9ed72570ecb107b061f444d336ff7f8e7bd7cfab039bda1423042e3b1cbe733e4
+DIST gnuconfig-20190804.tar.bz2 58538 BLAKE2B ec2ef7990e94eebca655db3f7e84a0294ca59f4753e33f69bdbd4d214240e33472abbfdd99735ec71d38a3d542501603a54e979e2aad4776c5faf6646d016956 SHA512 c24e0a49046d2a7fa3a77a22f06be8b97adb05541a95225c65c1cea47f7977230db1954666795019d28c02a4676acb93cc8b5c53f1b838e28fb50746630af82f
 EBUILD gnuconfig-20170101.ebuild 1552 BLAKE2B af79dc52309ea125f1e424d60ed04141fd94e36da24a9cd8f7d99582f67a588ed12b9c8f80f116c6b225af86fd0f39b41bec75802c144f72c26c1ba5115c63f8 SHA512 59d0cc38277e881eeb75dca77fa497a247edafee7488dd6cf08aec0e1839fbe3d651f38e79a905e59ab37e1a3650fb360f58d23fa01b6765a46265cd4015eedb
-EBUILD gnuconfig-20180101.ebuild 1580 BLAKE2B 9a042eda40df4b580a3ef2883eac15208a4f1f2bfd17527185853404a33cbea81acd6e99435a3bb2d9ad35251d3c7ba78b88d1b21070a9b2b0db0ce7837833c3 SHA512 7c877857bca6620a4932d4939050388dbd0beca60ec7a0729b635f8f3b915478036909c0f8534d027b9818fe66caa3c7a66146f3cda938ba614c9930668e5a58
-EBUILD gnuconfig-99999999.ebuild 1576 BLAKE2B 00e0809f7cb0f30a60ec4fa3a1fc734a4a667223cc9e1001df7e1ed9e4f9b1bfc7e86cbc10cddb71ad33a9e4b647f27e2f307d766b3827722e93b09a163c96db SHA512 aae8750105eedbf5bb86cb5a958c21e1dc4c65e16bb4f2dfd8aefe1c0320adbab73ff4f3af4b6d3244cdb1c812b72c71a6d23dc4b31651dd4bbb9e94b92da75a
+EBUILD gnuconfig-20180101.ebuild 1567 BLAKE2B c085296eb227b05e021048e2f3a5ce1b36cbeb783e5ac829d90a18acf71f74f60e7c1dd8a4ccdf5cf7a823e6ff43707555ae19d7a67057e1d13723da12bd94c3 SHA512 e3d10d89dfdfd42554197057cda6724a8725c93cb235812d578281c2af16f8ee30826db9c30380b4d40eea65a05ad88fb0df7e66ba8749b068829c22792699b8
+EBUILD gnuconfig-20190804.ebuild 1593 BLAKE2B 3da2f6df66246162f251389fde500c0d447f090b8499127d88f968fe9ce8b893c3d2de27eb073f8208df63e43ea5681702f15b10258a8c1c0f5f0d8e882c5b4e SHA512 c9b3595a3a16605410424b006f989396910cadb24a8ddd29db9e9f3704aada6899aa516246c8d25a0e06cb24fd5bd2ad57d8c6ced081c96f3d48e7c24719aee1
+EBUILD gnuconfig-99999999.ebuild 1593 BLAKE2B 3da2f6df66246162f251389fde500c0d447f090b8499127d88f968fe9ce8b893c3d2de27eb073f8208df63e43ea5681702f15b10258a8c1c0f5f0d8e882c5b4e SHA512 c9b3595a3a16605410424b006f989396910cadb24a8ddd29db9e9f3704aada6899aa516246c8d25a0e06cb24fd5bd2ad57d8c6ced081c96f3d48e7c24719aee1
 MISC metadata.xml 392 BLAKE2B f4a920a49c8060921ea7bc83a097d3a847970b7d655da81c68e13c7902850fd0cd8b442c9193b1936c8687b7a3fc79485fb2eb0523e6eb37e5b0f43f30cbbe29 SHA512 8b0ec5d0b1184ea7514dfd2ff09a1ceddad49150cf412816a5e966eec9857e25886b6c03bb14b38638f79dcca2a40326b8506e23d0d3d7e97b48d2234c5653e5
diff --git a/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch b/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch
new file mode 100644
index 000000000000..83c259b2b1ef
--- /dev/null
+++ b/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch
@@ -0,0 +1,64 @@
+From d5899b457d3215db991761e57aa4e091e4b24f28 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 9 Oct 2008 15:51:35 -0400
+Subject: [PATCH] add ps2 targets to config.sub
+
+We no longer carry the "ps2" target as that conflicts with the long
+standing shortcut for the i386-ibm-aix target.
+---
+ config.sub | 25 +++++++++++++++++++++++--
+ 1 file changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/config.sub b/config.sub
+index a318a4686850..837d23369163 100755
+--- a/config.sub
++++ b/config.sub
+@@ -810,6 +810,27 @@ case $basic_machine in
+ 		vendor=atari
+ 		os=mint
+ 		;;
++	mipsEE* | ee)
++		cpu=mips64r5900el
++		vendor=scei
++		case $os in
++		    linux*)
++			;;
++		    *)
++			os=elf
++			;;
++		esac
++		;;
++	iop)
++		cpu=mipsel
++		vendor=scei
++		os=irx
++		;;
++	dvp)
++		cpu=dvp
++		vendor=scei
++		os=elf
++		;;
+ 	news-3600 | risc-news)
+ 		cpu=mips
+ 		vendor=sony
+@@ -1172,7 +1193,7 @@ case $cpu-$vendor in
+ 			| bfin | bpf | bs2000 \
+ 			| c[123]* | c30 | [cjt]90 | c4x \
+ 			| c8051 | clipper | craynv | csky | cydra \
+-			| d10v | d30v | dlx | dsp16xx \
++			| d10v | d30v | dlx | dsp16xx | dvp \
+ 			| e2k | elxsi | epiphany \
+ 			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+ 			| h8300 | h8500 \
+@@ -1359,7 +1380,7 @@ case $os in
+ 	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+ 	     | interix* | uwin* | mks* | rhapsody* | darwin* \
+ 	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
+-	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
++	     | storm-chaos* | tops10* | tenex* | tops20* | its* | irx* \
+ 	     | os2* | vos* | palmos* | uclinux* | nucleus* \
+ 	     | morphos* | superux* | rtmk* | windiss* \
+ 	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+-- 
+2.19.1
+
diff --git a/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch b/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch
index 2c69f57878eb..5a696d1c4b4e 100644
--- a/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch
+++ b/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch
@@ -1,4 +1,4 @@
-From 8474d78c459f4ec8f8930094faeaacb2b77bf68f Mon Sep 17 00:00:00 2001
+From 42ebd93d96cd060141e37d9d6601ca1e7d21040d Mon Sep 17 00:00:00 2001
 From: "H.J. Lu" <hongjiu.lu@intel.com>
 Date: Fri, 20 Dec 2013 14:36:01 -0500
 Subject: [PATCH] Add x32 support to config.guess
@@ -16,15 +16,15 @@ URL: http://gcc.gnu.org/ml/gcc-patches/2012-08/msg01083.html
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/config.guess b/config.guess
-index fddac42..17a4f70 100755
+index 97ad0733304d..92f16126465f 100755
 --- a/config.guess
 +++ b/config.guess
-@@ -1038,7 +1038,18 @@ EOF
- 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+@@ -1090,7 +1090,18 @@ EOF
+ 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
  	exit ;;
      x86_64:Linux:*:*)
--	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-+	eval $set_cc_for_build
+-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
++	set_cc_for_build
 +	X86_64_ABI=
 +	# If there is a compiler, see if it is configured for 32-bit objects.
 +	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
@@ -35,10 +35,10 @@ index fddac42..17a4f70 100755
 +		X86_64_ABI=x32
 +	    fi
 +	fi
-+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}${X86_64_ABI}
++	echo "$UNAME_MACHINE"-pc-linux-"$LIBC$X86_64_ABI"
  	exit ;;
      xtensa*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 -- 
-2.4.4
+2.19.1
 
diff --git a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch b/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
deleted file mode 100644
index 88e43cd8ac2b..000000000000
--- a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 582f9caf95b3ccf36e6248be3b5b414546b0a03e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 9 Oct 2008 15:51:35 -0400
-Subject: [PATCH] add ps2 targets to config.sub
-
----
- config.sub | 22 ++++++++++++++++++++--
- 1 file changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/config.sub b/config.sub
-index 88307c1..7ee2b4c 100755
---- a/config.sub
-+++ b/config.sub
-@@ -258,7 +258,7 @@ case $basic_machine in
- 	| be32 | be64 \
- 	| bfin \
- 	| c4x | c8051 | clipper \
--	| d10v | d30v | dlx | dsp16xx \
-+	| d10v | d30v | dlx | dsp16xx | dvp \
- 	| e2k | epiphany \
- 	| fido | fr30 | frv | ft32 \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-@@ -823,6 +823,24 @@ case $basic_machine in
- 		basic_machine=m68k-atari
- 		os=-mint
- 		;;
-+	mipsEE* | ee | ps2)
-+		basic_machine=mips64r5900el-scei
-+		case $os in
-+		    -linux*)
-+			;;
-+		    *)
-+			os=-elf
-+			;;
-+		esac
-+		;;
-+	iop)
-+		basic_machine=mipsel-scei
-+		os=-irx
-+		;;
-+	dvp)
-+		basic_machine=dvp-scei
-+		os=-elf
-+		;;
- 	mips3*-*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- 		;;
-@@ -1389,7 +1407,7 @@ case $os in
- 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
--	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--- 
-2.3.1
-
diff --git a/sys-devel/gnuconfig/gnuconfig-20161104.ebuild b/sys-devel/gnuconfig/gnuconfig-20161104.ebuild
deleted file mode 100644
index bd734c724372..000000000000
--- a/sys-devel/gnuconfig/gnuconfig-20161104.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
-		http://git.savannah.gnu.org/r/config.git"
-
-	inherit git-r3
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S="${WORKDIR}"
-fi
-
-DESCRIPTION="Updated config.sub and config.guess file from GNU"
-HOMEPAGE="https://savannah.gnu.org/projects/config"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-maint_pkg_create() {
-	cd "${S}"
-
-	local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog)
-	[[ ${#ver} != 8 ]] && die "invalid version '${ver}'"
-
-	cp "${FILESDIR}"/${PV}/*.patch . || die
-
-	local tar="${T}/gnuconfig-${ver}.tar.bz2"
-	tar -jcf ${tar} ./* || die "creating tar failed"
-	einfo "Packaged tar now available:"
-	einfo "$(du -b ${tar})"
-}
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]] ; then
-		git-r3_src_unpack
-		maint_pkg_create
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	epatch "${S}"/*.patch
-	use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
-}
-
-src_compile() { :;}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins config.{sub,guess} || die
-	fperms +x /usr/share/${PN}/config.{sub,guess}
-	dodoc ChangeLog
-}
diff --git a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
index 387ba6cac9aa..97da37cf54f6 100644
--- a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-devel/gnuconfig/gnuconfig-20190804.ebuild b/sys-devel/gnuconfig/gnuconfig-20190804.ebuild
new file mode 100644
index 000000000000..c7e0faa0146d
--- /dev/null
+++ b/sys-devel/gnuconfig/gnuconfig-20190804.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
+		http://git.savannah.gnu.org/r/config.git"
+
+	inherit git-r3
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	S="${WORKDIR}"
+fi
+
+DESCRIPTION="Updated config.sub and config.guess file from GNU"
+HOMEPAGE="https://savannah.gnu.org/projects/config"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+maint_pkg_create() {
+	cd "${S}"
+
+	local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog)
+	[[ ${#ver} != 8 ]] && die "invalid version '${ver}'"
+
+	cp "${FILESDIR}"/${PV}/*.patch . || die
+
+	local tar="${T}/gnuconfig-${ver}.tar.bz2"
+	tar -jcf "${tar}" ./* || die "creating tar failed"
+	einfo "Packaged tar now available:"
+	einfo "$(du -b "${tar}")"
+}
+
+src_unpack() {
+	if [[ ${PV} == "99999999" ]] ; then
+		git-r3_src_unpack
+		maint_pkg_create
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	default
+	eapply "${S}"/*.patch
+	use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
+}
+
+src_compile() { :;}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins config.{sub,guess} || die
+	fperms +x /usr/share/${PN}/config.{sub,guess}
+	dodoc ChangeLog
+}
diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index c4ccaeecd38c..c7e0faa0146d 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit eutils
 if [[ ${PV} == "99999999" ]] ; then
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	S="${WORKDIR}"
 fi
 
@@ -31,9 +31,9 @@ maint_pkg_create() {
 	cp "${FILESDIR}"/${PV}/*.patch . || die
 
 	local tar="${T}/gnuconfig-${ver}.tar.bz2"
-	tar -jcf ${tar} ./* || die "creating tar failed"
+	tar -jcf "${tar}" ./* || die "creating tar failed"
 	einfo "Packaged tar now available:"
-	einfo "$(du -b ${tar})"
+	einfo "$(du -b "${tar}")"
 }
 
 src_unpack() {
@@ -46,7 +46,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${S}"/*.patch
+	default
+	eapply "${S}"/*.patch
 	use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
 }
 
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 21626315a8ca..bf295bd9df21 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -17,4 +17,4 @@ EBUILD libtool-2.4.6-r3.ebuild 2586 BLAKE2B e9eafe307085043c84eced99cf201f3fbd9f
 EBUILD libtool-2.4.6-r4.ebuild 3546 BLAKE2B e23322cae3db6ae0e6f6a5536926659a2ea5a2bcdd6225b3011adae43f681b8a2fe29d26aa89b53a0652d376a938ebde50c16ba1346075e96d283bc1241a02bc SHA512 70d086fca9e9f5b26e6c170659d1f5710dda488330851050cbcd00dec2b2bcbe3f0f5713bfa1c64712e84d765381719a27757d46c2b9a58e9f6a1a2cd4f13522
 EBUILD libtool-2.4.6-r5.ebuild 3686 BLAKE2B 1beefe475a725d684e6b9aa6bccb98d4497a8447fbda67839b977a243b7a595681ec1b167488797e1806aed973c485486a477f33f73c5b4310b8d2e7a855ab18 SHA512 f53280c523e6f21fa7930edf44e8c91f98f578fa9418f909dec4ca414505c268f0018e9cace75d7f3c1b8a1d48f7ff49638451f8f67a0c4b12fb728f8bb86de5
 EBUILD libtool-9999.ebuild 3338 BLAKE2B e5122e24f3a92bcad40e1007a39656aaad5b7ca9ae15c171a4e00953771f91d98063fd05ca33115a25352e8d1e9073218efe74861fd9d48a285f94e2883e042e SHA512 7308be87b811707bdbce23ead476a7bf23857a836d79293b9b036e52d78bf8647f2acc41683658f2215d85a437ba7a0bafc79a3c043d40b0f151357502819c6a
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/sys-devel/libtool/metadata.xml b/sys-devel/libtool/metadata.xml
index 56c124413057..c9dbcd910423 100644
--- a/sys-devel/libtool/metadata.xml
+++ b/sys-devel/libtool/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:libtool</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 57b58e8075ac..39291fc0e154 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -10,6 +10,6 @@ EBUILD lld-10.0.0.9999.ebuild 1720 BLAKE2B 122128ff55d2540e358a1c477cc3955705d52
 EBUILD lld-6.0.1.ebuild 1731 BLAKE2B 94a45353bb5db9ff18974afbbf2f77f00814302af1f146298da97cc53941811b91367aee89c82365e1a712ad7d86b2e8ad0b6b59653e56296c7e45e8ab65a266 SHA512 3985af3b2b300c6ddfade3c848a51f8dd1254f15bc3c51cf4d6a5bf8d655de756c8e5315c5594f65f07530b8d21526367f4397fd9b39f895a5f1e525a3aef409
 EBUILD lld-7.1.0.ebuild 1737 BLAKE2B 85f64c0cef8e74db4caace97d2c49eb78bcca24cf5eae82c9ee7faaa1bfc81b14f02e4be948681ecf23a7a86e1cb080666420e9da9bc3ce0856454b3afe68da8 SHA512 ab6d48d872e1dfa608a2e9ca88a907f6bd5f6951dafe5e938d9448279ee7930bac21f9d9c5a8cd6d6523cb4302b0f6822f27fca153c76ae0ec58520e106c78ad
 EBUILD lld-8.0.0.ebuild 1740 BLAKE2B 4983c4001002413e79947b461edfa0685bd90f2d9f4a597d80e8df2dac45189a0a5989384ab7ef0124a1e86aa1c4af2fce7f3ad77a18be6578b811058a1ed2f5 SHA512 2b79af989f4d73dc7bdd55ede94d28b94fa9e6a206fb5295308d6dd09355c34d71b616d28983e9fb80d46142c00fd8f02b64af4bd22514f5aa22e822037b1457
-EBUILD lld-8.0.1.ebuild 1806 BLAKE2B fab8015fa8b017d59286c7477ace8ed2abea9403e6db6943565209e698084c3224a904f00184451911ae9793d47ae68f6166b744f4719e563f047d614014f73e SHA512 abfc12282a086661592290c0b2d0498d52185f707dafa26123111567a56a70d02affdb335659ab6fca281adda5ac2be08d1913988d7bba84b285c6b6fa083d0d
+EBUILD lld-8.0.1.ebuild 1807 BLAKE2B 291147a7b0fd9f2b7c55e666c252080255c29352e00b8d588516ff22b918320dd0bfe776bcebca7d05aea44c9b35bced0e1742ce2c4af90086e3b8b08cd52793 SHA512 98f3e0c0d6a32aa24b5bd084bf680ce3a74c77347a218e235e973704badd481ada0359bd2fb04798dfc81ec24831260391edd687d58e0cefd496d004dfce5e6b
 EBUILD lld-9.0.0.9999.ebuild 1745 BLAKE2B 5cd0b0e0087f19a2db40ae1c1d65dade6a90b595d9d132245e328ae4f501d1121925f28779062d9ae0a9ad83b5da67659e801956685fd81472e9c978c100c0e8 SHA512 72f1a52b43efb65f246bac0b9b596d82c61923e979fb8571d527482d01be21c46289d06bd87595e53a29b703626cecaf39f9999f8c6112971b8616fee208abe6
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-8.0.1.ebuild b/sys-devel/lld/lld-8.0.1.ebuild
index 2db7d93b3fbe..231c14d28d99 100644
--- a/sys-devel/lld/lld-8.0.1.ebuild
+++ b/sys-devel/lld/lld-8.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index b682df2da608..95eb2a1ad42b 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,13 +1,11 @@
-DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 EBUILD llvm-common-10.0.0.9999.ebuild 733 BLAKE2B 1f9de93b6caf96b7a5bea067dd55dec75c61fe7f44904adfa262b33626c8a336896d44bb46cce14b1aaeece0a741eadf731e0be52688c2debb80f83bb12ba0d0 SHA512 a39e5d1047c1bb2c94e01062eab53920c5f07303d68f79b205cd8e2d33c173f717b7b2bed7edd051e7c77f934fa837250e51f1775816ee91d45244ac6f84bbf6
-EBUILD llvm-common-5.0.2.ebuild 839 BLAKE2B d7e6aaba7df7b7da6da5f7cc9cc165b8921758d8969f498f289c5797facfb383c7299617655d8228641e53d02a782a48b22b9c08ea9c3e8e6bc33a842fa24567 SHA512 6647d800604efe1eae94a55a632075d491c11c128bbb7a0903a6b3a93a49f071d74049b98fc4f765d5c7dae9e52de772f127d158e397e9160ef80b3b7dd09595
 EBUILD llvm-common-6.0.1.ebuild 838 BLAKE2B 7c30c7e7e52916af34728e11cc6e00e6add5363974affd53e7940bcbacfb3b7a73bd17d86b29b10684535ced07c0237909473c4500e2439d5824b4cbcf924d7e SHA512 d642ce674d3a0a742e5afaeb97a5e67e5a616ddd18642777dc640c44fc65c9f5d34c5e1398483c062152e87c9ab076b5518ad3ab5d39df9d1ce1331eb2784464
 EBUILD llvm-common-7.1.0.ebuild 835 BLAKE2B c2efeb392ea3f30d6c8a3fc24769dad0331d555c0dfdb161226284d4c7354148958162d929d062a3bbeee13e80b0bd0ebf07eed61be7ebad74d48a8be76747bc SHA512 0b663a260a31231706d089c921f7b4f53a617578dfbb6309384fed73ccd23ec06ba82094ce0c1c93e8e603317ac149b0a94a6a8bdfaf654abc9b7e586a6e1ad4
 EBUILD llvm-common-8.0.0.ebuild 839 BLAKE2B 9c75a82312a25919df8050ef435cad0452a4303cd4a3401d33c72d866ba463d1d87578f613a1d9896abca79a7bcb84b539fb18b7c1e00ef86345303e7230e298 SHA512 879c499c2420da38117c62bae7e8c68a810bfe74b6afd7c5d2541223f8476c6f2cb24534fb2d6f7d8d956e336a8e6e6db371ba97bfcf1938dbe0330a30b49c52
-EBUILD llvm-common-8.0.1.ebuild 872 BLAKE2B 2b7d0ced512db326635a8d99876436b9bd2942687b8f4eddafea1565c254d0cc6b33ba1d2d19ad70a50d7c07cf715ba3d62f167e18f6a79b5f4ce5cfc9592c68 SHA512 97cdb1e4905b2e01cea26c37d4ab30ff8058d0b9686621031452374d9cf79249cfe1f42666975222b1ecc6e98c5eff321f862dcdd8bd2838ca116cd8265fed99
+EBUILD llvm-common-8.0.1.ebuild 868 BLAKE2B 8d4e1656560053fdd4d686d9b9a5c1fb00f0bed03f0590470c2892bd756fb11ebb42e992008bead577238cbffb6a1a8624164eaed772192df720bdeabacc2079 SHA512 ef9b12578d8542150a574273e3daa463c4618f12f5fe692f36eea54d28d1198910c4a43f7c55dc5dcbf24a9446e0f0a7188cbc9fa38030da96a26906513eea4b
 EBUILD llvm-common-9.0.0.9999.ebuild 758 BLAKE2B 2f6317c0d24a961be87d31390448570908901a773aa2e7a93e3e01ad2bf1f473bdba044261405f0f34c369d60521519e1031be215eaba07f98a107b2ad4c2f2c SHA512 5b233105e8750ae316c48a65069912f582315a2dcb5dda5e72c047152a0955a0a008c1c2238d18c7f0a67d610a58906838704af79a9d17359f075e6f14e8f696
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-5.0.2.ebuild b/sys-devel/llvm-common/llvm-common-5.0.2.ebuild
deleted file mode 100644
index df3faf4c903c..000000000000
--- a/sys-devel/llvm-common/llvm-common-5.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=llvm-${PV/_/}.src
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="!sys-devel/llvm:0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/vim" || die
-}
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r utils/vim/*/
-	# some users may find it useful
-	newdoc utils/vim/README README.vim
-	dodoc utils/vim/vimrc
-}
diff --git a/sys-devel/llvm-common/llvm-common-8.0.1.ebuild b/sys-devel/llvm-common/llvm-common-8.0.1.ebuild
index a9bd1e16b47c..8ed42acf03ee 100644
--- a/sys-devel/llvm-common/llvm-common-8.0.1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-8.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 2765fa0ebc21..e002666def40 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,4 +1,3 @@
-AUX 5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch 1299 BLAKE2B 486ead622d4885f9e218a6fb44496ace574950e9946455050ffdde7bfac56c0893a5dc62fa6ffe6e8e18cdd706073454f8e1f2bc75a8ad98cf5246449ffe4df2 SHA512 3e17e72508242172c59547eaa2a8238bd145cfb888d4323818a943f075645b9bc5a272656e39f37d9f7997a16491b6a3a3b5c51101465369d8570a0d078cd335
 AUX 6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch 1575 BLAKE2B 3a650b244c2b97fa6e76327348a7bb00ace08b18441a59af238ccf0cdea4409e2d0b46c0a381737d7d0879dbc5eb0f71007fee0c9f0f5b92369453223d25397d SHA512 f09bf2b2bbac1f875f32f8761697717fbbfda2939fcccb8b03ecb8e4e65377c875355a3523d54f81c53d11bfaf3557f80000918bea003cfdba0662469283563a
 AUX 6.0.1/0002-llvm-mc-Produce-R_X86_64_PLT32-for-call-jmp-foo.patch 13865 BLAKE2B 03f677e386115c3c7333db39664f75b2b4c22e18c2e487e515dc2a55acaa1bf569d2945ae620420b4b4323fb2e4fb7d3c3313dcc7e648942afa25d055d36efc7 SHA512 2820793ef29f08b55b7d94ef700085dce02c6a029c5877a77c5296e9a05dfc9946d10ee66d2d3d8a150cd511e3346d2acf259b873aeed25c1b0aaefebe95790d
 AUX 6.0.1/0003-X86-Stop-X86DomainReassignment-from-creating-copies-.patch 4263 BLAKE2B f0b073f90968b008ce758a43f00a4268dad1037f949704f3d86741319b6972d1ad69bed0944152f21b837486404948c1f290babc90a4da5ac0c300f0d2a868ee SHA512 efcb4b4bf0320304df680e6b69d8db1e732539e6cde0d9f11566e00533ecf8383d1520edca0a69c96e1722b33dcc8bc33da23470faf59774724cedc9f522d9b1
@@ -6,9 +5,6 @@ AUX 7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 2626 B
 AUX 8.0.0/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch 1452 BLAKE2B d8b9b34b077bf33fd0fc6fb50937f5e9a8b90730fee3b6c08b5e0659fd37092ad073580ded506fbeba4fa3503f0ea6104d7adefa41f7eeef9a17a3189ba1212b SHA512 fa2aa9bde1b153f42037bb864b1a4dce0288f567c6a116a4005e45ca322808041562c2d2cecca5e3d84e44bf73bed600a05dfda85107c164415912ef60141dab
 AUX 9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 1188 BLAKE2B 72311a8da991b9f3b98523baefe6f5b31aa7f9101c388f35484dd5f384a08e838ea42a17447ca17a0dfe6b7d3c20abbdf0e8afee72e8ad5d46ec38b8d55307c8 SHA512 0ada997db2a0eb875105fb212dc3fc3077b9c4f7804d78c33c4b1f512bf1267295f325153ae14c00404c86e576ae1c78a6aeb0a57d1d4525aabd1169c21806ef
 AUX 9999/musl-fixes.patch 1258 BLAKE2B fe275412bc908884239ea71de9a9ddf1d2f64debaa1a9ada18170195a7775c41571600ed3666343bf967aff5f9117900f73155f60de5077bc4584cfc2f782f53 SHA512 314dcbe846a66312c9f1634f4ff3f4670b3db1d3210bb550f1d3877a423333ba042da2e90c8736918a36be4d4faf58dab8d3236d4f26df5af7f7f019b0e0ec8f
-DIST llvm-5.0.1-patchset.tar.bz2 4204 BLAKE2B e7282e84578631d88549bdf34e5a44e0294e47ef1fee29c0cb954d7afd160d4b6a0f39bb3bd53791ea53503a60eaa0ada0a512a63d696ff096dc6f21f4aecdc7 SHA512 395ea2b13008e222c034e2bdd8c2bb033b9c01e61fb89c840f009f6cddb499b317df8b061d29f40968d8f0df5540a2f4a9de31eef1de886796c8c334f37254eb
-DIST llvm-5.0.2-manpages.tar.bz2 93977 BLAKE2B 8c5e8899e0df9d6037fb7d5c373de6492ccdc9fd2c26cc7dfbd8fb2b9e68418ca8fdf42cdc303c361e649cc6939bf5229cbad017bdccbd5d791e92752328252f SHA512 568615bce5a75d42e4b6d592557472d366d49a99f8e81be10ae679804f1fe674c7fd0bbdac09af44fc67ee5aa34c4ed2153c2767c536ac8e45dd15c811c92dcb
-DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df54505d5db2504bc61860a7260343722ec8cdd5e937d0843263a5bf5077b9cf386c337fa127039b996bab10d2ca5c2caeb59 SHA512 c468e97a2d5610aee9e72cb795e4e65375a079d733550f05380230fb44ba0ed67d407ad06e2340b66f13d19c06583b657e8d01fcdca2146ae43964cea309e0b3
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f38f0bd41147a2c63dc5b8a92f0ec37512e913e68efce51e1643e8f20cf0f3f088d31d19c541d2ff361ecb7d89b234b6c SHA512 78a526d889a8e62accf422655acbb4d17e3c22b0f0830003db0068b3c01c367ac32ce4f4be4cbb2966274440865557c25795205af2a59a054a6f6964294d289f
@@ -18,11 +14,10 @@ DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f0050
 DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6db3dd9a1a380a92a07867e3cb835f94b265da5d75c4712b5409405a65795d2cb6b32da4098e38cbb95d7023b56bcbbc1 SHA512 23994a2374659fbbf8d9b5160f4d77e9be7c4c9fc14963e8186bbede78b0ee9257f6b6a9c484bc75d72443d65bb24e598841e64af500336283de0f454d6a2073
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 EBUILD llvm-10.0.0.9999.ebuild 8573 BLAKE2B 92e759d050250e02abe1a46139ce077997bf3c61f5199e8ac9c6e10a95247abe0fd7359633570745358af060fb7d0152685fb960d0c85a760250fc05b7401d53 SHA512 da9dbbabfeb41553834a1e01e232cc84e433bb6a3d07dbe967f6fed3b0ae6fcba807093b4cdb58551ffcd53cfb73beb2b73a268ca869795f13037014186b0d84
-EBUILD llvm-5.0.2.ebuild 7853 BLAKE2B 53cac32fac8ff690d937722db86eb2eb85ea56390d56065bf52e8a7aba099018b5d369a7efaf756627327e1c15bd32194553ae71f6c541808f2e06e63e5790eb SHA512 1ffa0b2d0d5d4eaa2363a9f477b3a1382547b53b5e767c9e31e3acdd0ca8e3eb8631917c8de6d8838086a3fb17690e4de776e4330151bd043ea298ba99d44834
 EBUILD llvm-6.0.1-r2.ebuild 8223 BLAKE2B c19ea8293cb393516560805dca29834a5ad57a9b9892c4f2d18d13b7031960624e411d32c64715cff1b0ea42c667d362d06c21f453258c8d7924abba61c566f6 SHA512 46f510c491a6ac5791f5d368d9d3ac0694d12a8c061158050ae3202d275cb1002f6b28fe38a0ef3d0d3f96e2d86b4f1bbe0412beb5bd9494376c9cb425bb0b7e
 EBUILD llvm-6.0.1.ebuild 7878 BLAKE2B 2dccaac410eb5ca447df7ba22891b05ba4767037239a321ac8314cce46ca18306885b5b90b3ba52092972dfad9f11cbac4285c8cddf9645a7c3bb0d1b77509d6 SHA512 77117eecea99a8ee65b5fd4c7f0003186b777624af4d0eb4fab1b1f2c5c02708a30e5f9952371452b0da933247b75e18cf2154a8cd40ea2fbd65a0d7dea4c987
 EBUILD llvm-7.1.0.ebuild 7833 BLAKE2B 7e96495d3e0d4dfa095a1ed9bb1dc065c7ba6606550f205cde21c54b6513322d0d5de7430a84d52fac960bc86ace5b61a6818de72fea7dbd16f9478d487dd1f0 SHA512 384d5eb9b43a1b519c73d3992a97e9364ab86f00025cbbaecdd96439e77865d6b5f2327ca0fd6e524b4df9fd50f7709024093f0455c5048a1701495936ca5080
 EBUILD llvm-8.0.0.ebuild 8796 BLAKE2B a7761e6533e36d575ec859125fa4e1ea8d56a0b6b69d826100dac66f5fc7540ece7690f82a51b973bb34fdcb8585466fd040d20b7db3a843761b40a6e8dc0c49 SHA512 ed6ad22908ae370b98896e3e1a8e99fe78c22348fb1dbebbc7b49ee51b68cb0d80d8c87f83d285a48dc89a0486137178560cb1c495bb4e5f09d3e89241f5843e
-EBUILD llvm-8.0.1.ebuild 8647 BLAKE2B a880e509c45e1ad814e19043020ae5746fe87e5496739c81bc9f75fdb44bd509dac22801ae2dbb94dbe43795300f52452f7183412770e6dc051f94af1fa56e0c SHA512 b61ab41d945d1f1243087d674d0cf932e6a876f2797b5072ffc09f61b595b6d8d3756aaa597e37bf1cd9d638907d7b1190de7dd0e66371ea4b971dea9d18c457
+EBUILD llvm-8.0.1.ebuild 8643 BLAKE2B 577e9898d8da77d6d4ac83c2f6f39650a7f407b10baf85c0bfde0b7a0d7a201f9dbaf72df88d679cf2cf0d7dcfd874b0bca4c674b7e3d8ae9942fb3673750e19 SHA512 d2046d249585649652398842579b9de1c361e5717a09d79583f27cb332c6ea6c0cd0cb7e3f84edc2c1c5b20126f509bb8ac8c283552efca9cb9c1c1a728e0de9
 EBUILD llvm-9.0.0.9999.ebuild 8273 BLAKE2B b7c046852551a9e54a62c868d3dc12a1370bc169c72f1471aca489b38916be95d0b5c2ba56e12efdee0140e21db6576d0bd890b91608824820a01f25b57c837b SHA512 66f2f5833d65028ba0d4934ba40acaa1ba3efda8d77d91a9e60f7c2b4be38a198f1cd5dd68bbf7f6a8cdb99ea0d78c2f78a5ebd7788c2bce3077656f6ca6ec42
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/files/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch b/sys-devel/llvm/files/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch
deleted file mode 100644
index 6eaacec77a84..000000000000
--- a/sys-devel/llvm/files/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b25d5675b67bd08e25dd093aaaf8c8f4bb1f822e Mon Sep 17 00:00:00 2001
-From: Tilmann Scheller <tschelle@redhat.com>
-Date: Thu, 1 Feb 2018 11:40:01 -0600
-Subject: [PATCH] Fix return type in ORC readMem() client interface.
-
-GCC 8.0.1 detects the type mismatch and causes the compilation to fail. Clang
-and earlier versions of GCC don't detect the issue.
-
-Fixes rhbz#1540620.
----
- include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
-index da02250ba16..bed472e2e0e 100644
---- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
-+++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
-@@ -713,8 +713,8 @@ private:
- 
-   uint32_t getTrampolineSize() const { return RemoteTrampolineSize; }
- 
--  Expected<std::vector<char>> readMem(char *Dst, JITTargetAddress Src,
--                                      uint64_t Size) {
-+  Expected<std::vector<uint8_t>> readMem(char *Dst, JITTargetAddress Src,
-+                                         uint64_t Size) {
-     // Check for an 'out-of-band' error, e.g. from an MM destructor.
-     if (ExistingError)
-       return std::move(ExistingError);
--- 
-2.18.0
-
diff --git a/sys-devel/llvm/llvm-5.0.2.ebuild b/sys-devel/llvm/llvm-5.0.2.ebuild
deleted file mode 100644
index 840938cac7c3..000000000000
--- a/sys-devel/llvm/llvm-5.0.2.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \
-	pax-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.1-patchset.tar.bz2
-	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )"
-
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. ARM backend: LLVM Software Grant by ARM.
-# 3. MD5 code: public-domain.
-# 4. Tests (not installed):
-#  a. gtest: BSD.
-#  b. YAML tests: MIT.
-
-LICENSE="UoI-NCSA rc BSD public-domain
-	llvm_targets_ARM? ( LLVM-Grant )"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc gold libedit +libffi ncurses test
-	kernel_Darwin kernel_linux ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	gold? (
-		|| (
-			>=sys-devel/binutils-2.31.1-r4:*[plugins]
-			<sys-devel/binutils-2.31.1-r4:*[cxx]
-		)
-	)
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	kernel_Darwin? (
-		<sys-libs/libcxx-$(ver_cut 1-3).9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( dev-python/sphinx )
-	gold? ( sys-libs/binutils-libs )
-	libffi? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${PYTHON_DEPS}"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="${RDEPEND}
-	!sys-devel/llvm:0"
-PDEPEND="sys-devel/llvm-common
-	gold? ( >=sys-devel/llvmgold-${SLOT} )"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S=${WORKDIR}/${P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# Fix llvm-config for shared linking and sane flags
-	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
-
-	# Apply the backported patches
-	eapply "${WORKDIR}/llvm-5.0.1-patchset"
-	# Copy the new binary file (we don't support git binary patches)
-	cp {"${WORKDIR}/llvm-5.0.1-patchset",.}/test/tools/llvm-symbolizer/Inputs/print_context.o || die
-
-	# Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD).
-	eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch
-
-	# gcc-8 build failure
-	eapply "${FILESDIR}"/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# User patches + QA
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DWITH_POLLY=OFF # TODO
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		-DHAVE_LIBXAR=0
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-#	Note: go bindings have no CMake rules at the moment
-#	but let's kill the check in case they are introduced
-#	if ! multilib_is_native_abi || ! use go; then
-		mycmakeargs+=(
-			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-		)
-#	fi
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use doc && mycmakeargs+=(
-			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-		use gold && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
-		[[ -x "${tblgen}" ]] \
-			|| die "${tblgen} not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DLLVM_TABLEGEN="${tblgen}"
-		)
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${SLOT}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED%/}"/usr/include || die
-	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
-
-	if use kernel_linux || use kernel_Darwin; then
-		# install fuzzer libraries for clang (cmake rules were added in 6)
-		# https://bugs.gentoo.org/636840
-		into "/usr/lib/llvm/${SLOT}"
-		dolib.a "$(get_libdir)"/libLLVMFuzzer*.a
-	fi
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${SLOT} ))
-	cat <<-_EOF_ > "${T}/10llvm-${revord}" || die
-		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-_EOF_
-	doenvd "${T}/10llvm-${revord}"
-
-	# install pre-generated manpages
-	if ! use doc; then
-		# (doman does not support custom paths)
-		insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
-		doins "${WORKDIR}/${P}-manpages/llvm"/*.1
-	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
-	elog "To use these scripts, you will need Python 2.7 along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/llvm/llvm-8.0.1.ebuild b/sys-devel/llvm/llvm-8.0.1.ebuild
index af0c9dae9448..0746ccc13810 100644
--- a/sys-devel/llvm/llvm-8.0.1.ebuild
+++ b/sys-devel/llvm/llvm-8.0.1.ebuild
@@ -33,7 +33,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index c8aa2df64fc6..8f346c5c7acd 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -1,7 +1,6 @@
 EBUILD llvmgold-10.ebuild 526 BLAKE2B b9b614311523171eef1f65780fc2fbf60761434530f35dd417037183113c8c6c4c42051b15e9e1d6deb54a6f5db48b034594fa31644d54f003a5a2d6e4d67235 SHA512 c952653f9bbfa610bbf44fa4f9c47853586083e694b63f8850ddd4fb604166dab2e0930d22588a715605357b856bf5d12c47235e35959da144c92e92bfe50f73
-EBUILD llvmgold-5.ebuild 562 BLAKE2B 31652a1e9d08a66e2b9cac7557c3e887da039b2a1c6004f60ca76423a97a779b251ef1d5803d47ec968851bf384271abbdb8700df61e036762c029c86729a090 SHA512 70e23a895088483df9fdeb1edd5ebb81deb2b0c053bbf0b0c8e61c6793c3d98ece2b2eea0f60c8e5d9099aaa0de668a6e34bdda8864260781fe31e0eaff3037b
 EBUILD llvmgold-6.ebuild 561 BLAKE2B 791f54efe7fa1c99d9a14d75a5ef023114b8cbb4183261b0b042e5dd5eb28a14657082fb0ac3faefa0f4b44bfa2a5d885dea11450e313ba156925eb074c33239 SHA512 245def4febc63a8f161aaa00caefaab5d9d82d6857c730024f1e1366e8a3c6d4cb48e5d1c5c648b9e8ad127607b7e009f29a3e39e39c574ea23356ffe93b0f9e
 EBUILD llvmgold-7.ebuild 558 BLAKE2B 29cf97eda879cd6819e35471dceca3fd5778f21a0d7d81706087ddd93c689978be667cd05b14c33c65222822b56a417e463e654cbd5f4cb7e1db03d1d3038cad SHA512 95a7672fa35f6b2a47ef25765a700c658086f8f83adb33e611308e8e3799ab51c7d0776419ba2065a3cd46a0f43297d61a6ab2b2de81e97ae09b388f266c35eb
-EBUILD llvmgold-8.ebuild 562 BLAKE2B 1dfebb67a5bda9bbae0af2f4fa1f9805b818a830a5908d0c94801e5f184390715e5927f9d3c6a926d73cc36811097acd9dfc840bb3084c264d9254c64dd35a59 SHA512 99b407cdcd2466e0cd6c54ba80cb0945cb001374d1b815987a4a7cafceacf3e57fb66039b9a0eacf3f0e4814770cdbc41550c312ff9394233ae1c4749b1861f9
+EBUILD llvmgold-8.ebuild 559 BLAKE2B 565696025936d9792d735a3ba5c5c2f62e7453243de6ea59e0593b81832269d0a7dbd0c36fec7d4e441016eccf54513c85979e05847b841bd11657d8438e24cb SHA512 62196a64451f9949ab4caada216089f896387276d918018a4dc93572b7c190bef61e0ac67cf8d96a9725d6e8ad632821eed66e887bf8cb5f95281e8ed74cbcc2
 EBUILD llvmgold-9.ebuild 526 BLAKE2B b3715471c71dd9d1ec294d3423560ba7623d43eccd8fcd007924c12ec9bcf9e7fb7db63c04db0ffa894889f0d1ec51cceb394c5a1ee245c361ad5d3d248f5c5b SHA512 5e5a876ddaa436a2ba0e478ed504c4d391195461748db0c8fe8b1a2125a2186417f282c214d2badd0f0fb255d6eea28a4f48ccb206ccb2427d83a74e7a52ea5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvmgold/llvmgold-5.ebuild b/sys-devel/llvmgold/llvmgold-5.ebuild
deleted file mode 100644
index a3af49b27d74..000000000000
--- a/sys-devel/llvmgold/llvmgold-5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="LLVMgold plugin symlink for autoloading"
-HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="sys-devel/llvm:${PV}[gold]
-	!sys-devel/llvm:0"
-
-S=${WORKDIR}
-
-src_install() {
-	dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
-	dosym "../../../../lib/llvm/${PV}/$(get_libdir)/LLVMgold.so" \
-		"/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
-}
diff --git a/sys-devel/llvmgold/llvmgold-8.ebuild b/sys-devel/llvmgold/llvmgold-8.ebuild
index 26f191ef4df0..c7df10caa83a 100644
--- a/sys-devel/llvmgold/llvmgold-8.ebuild
+++ b/sys-devel/llvmgold/llvmgold-8.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sys-devel/llvm:${PV}[gold]
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 921d0609564d..efe7b3e08e6c 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index bc5a6c5362db..f0a617f72d10 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,4 +1,4 @@
-DIST intel-microcode-collection-20190819.tar.xz 5309072 BLAKE2B b3c6167f0d380795ef1d22f8d0d39e7db54fa37357e4d650ca5948f049c3e9e51872a9c40c70d2a9103a2e53c5ac28510a4300aea025de38d9ef1b7a96dd3ffa SHA512 e9942ef3bced654433e356db58ca1647dc54caaab4511236ffdbec513871ead02838d50f81f298381f6376d2ff5dc33704f50cb0cc4e021bfca4c7681763233f
+DIST intel-microcode-collection-20190908.tar.xz 5265124 BLAKE2B c3d9b611e9ea052e28921ea8cfa4c9b0dad980cd527564cdc077e9af2935f83ee24eb3c784d6dfe8e627a372c8474a218f7447f4d174e1677e04e59880a938ac SHA512 0d55067c3933f35526f655c20d732545bce83089c5cb45092bf7a50f6f8acff7b97266fa0c8a94ab88c67c77f836e88910851de4db98939a3775fb02fe7fa231
 DIST microcode-20190618.tar.gz 2446418 BLAKE2B f5e4846c7d6d4251c8a53e7a238ce0be9530827d16a015b91beec9d2ba2186d6632d370342b4b7a898f32d294b3c8c12522d07ea40c13ebc75d40b8b83eb1da3 SHA512 f7717f476465705e14ea26b516cf7b1d04e29842da0924d7da5582346ad5dd5dfd8755041bdca8f3afa7fe64f138e91354498d87006fe4487701242858c24c17
-EBUILD intel-microcode-20190618_p20190819.ebuild 8571 BLAKE2B 47d02586b98c8b78b798b07577e3b2ec609af2cb4e14e3c428acedd4dd673d3a2ccd37a06a2da338c00d2104f7d3f34d60cd3d1d2562d0a36a2a76810309f47f SHA512 933c15406dc5277896ccda6075b0afc02f5a86b70716d7e6ddafd81faeef2daa6970353cafa89a98cd31741fd0dbfefc5c6f388a22d85bd3e82656af8f1561f2
+EBUILD intel-microcode-20190618_p20190908.ebuild 8571 BLAKE2B 47d02586b98c8b78b798b07577e3b2ec609af2cb4e14e3c428acedd4dd673d3a2ccd37a06a2da338c00d2104f7d3f34d60cd3d1d2562d0a36a2a76810309f47f SHA512 933c15406dc5277896ccda6075b0afc02f5a86b70716d7e6ddafd81faeef2daa6970353cafa89a98cd31741fd0dbfefc5c6f388a22d85bd3e82656af8f1561f2
 MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/intel-microcode-20190618_p20190819.ebuild b/sys-firmware/intel-microcode/intel-microcode-20190618_p20190908.ebuild
index c38383872511..c38383872511 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20190618_p20190819.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20190618_p20190908.ebuild
diff --git a/sys-firmware/ivtv-firmware/Manifest b/sys-firmware/ivtv-firmware/Manifest
index 788b0e2cb205..d10816c2a416 100644
--- a/sys-firmware/ivtv-firmware/Manifest
+++ b/sys-firmware/ivtv-firmware/Manifest
@@ -1,3 +1,3 @@
 DIST ivtv-firmware-20080701.tar.gz 125526 BLAKE2B e0f21c3d06723257609aa12d81120fde30cd920c4aa4b4eb407c569c8280a81fe64d15375f6d3f3c38826105a1eb1a8e35c076f0848f54a386d7850d931b6656 SHA512 1ad00fb55721f5161e0b64d04ea004cd0e24f31b3c47cadb181c0a8f24a0064356b56479cd54d834d4575f6cb5d826bca5fd061634b1e10f0e4b5737c1fb192b
 EBUILD ivtv-firmware-20080701-r1.ebuild 468 BLAKE2B 4a1a69c96bf3088f664c9d8cb78c4cccaa3bf0a90fbe162bf5218f49f2237967c278ad32e3f02c5edaeedbff14bf31eb20972d2596ef974c11475bcb963e9646 SHA512 4303f41a966b219c1df046a30603000ac89499176af1c9ad43eef263831f56edb7dc3c6fbee2121dfd7b667736c81e4f21ad7145b8d628ba232379bc4022c11f
-MISC metadata.xml 217 BLAKE2B e7b3b2e0fcf6946ba3ffb502b3811a8570f8c1aec82c5317e90156b2458af3578e883f8bdd7de72d5f8a5d4293438401b7ac38c55b5bebd2db5f08dcb1748259 SHA512 01e5c8d9f0ade4e0891b4c8f791a08c52ef01010997da3045d3b35bcd7e495ed983b50664c90ba3c8d47c34ebcac45f634ea17c91a57da7674ae93cc23781a1b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-firmware/ivtv-firmware/metadata.xml b/sys-firmware/ivtv-firmware/metadata.xml
index bd3d94ffd0d7..7a38bb900964 100644
--- a/sys-firmware/ivtv-firmware/metadata.xml
+++ b/sys-firmware/ivtv-firmware/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index c6a103431e31..494a32798f1e 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -17,4 +17,4 @@ EBUILD seabios-1.10.2.ebuild 3409 BLAKE2B b39299fbca9c8641333882be197c181fc780e4
 EBUILD seabios-1.11.0-r1.ebuild 3485 BLAKE2B 06b5cd36ca5abf255c5f76785ac457c0017bca5755ace55a4065a4ba0237471f1728233ea7fe12f68f86abf136a18fe5ea12e070169f93aff1857923ba944fbb SHA512 1415659b8dded4f3bb0b7bf311641d7fef5920ee8f3aac7bfd4dbacb48e427259fa234535fb1a2049f6b419bb4ad47b4c684e4dfe2902ca1717d5abb5e8e943e
 EBUILD seabios-1.11.0.ebuild 3325 BLAKE2B f90f4e73373ca40ecc98e0f11e16f9b2f9e527cc83c1f5a7e12052626ea3d6a5b2596475a122c2effe899f120d629c56026c829dbabd5a16af8da6bbf8748424 SHA512 aa8a8292ae43057165c7cbf40949d15b4472e279196315459c3a795f5552902da9cf77375dfd5e7f4c74a7af3d5b12106e3f5bb9393ed79457863199081d445f
 EBUILD seabios-1.12.0.ebuild 3480 BLAKE2B ee6aac19a6f0f15ccb785cf09d9f98f358cd7cd7694219a14528f31fc677190b332a4e809a5018236608710151dbb1f56d1e6ef4679e217b58d677d6c954bf35 SHA512 ebd724faafc3df91122defba546c29df96af39355a39517d5b5233850a4a291e3e0ece5d9254f912e2465470cba74562d8352822d041a04d29a8410007a9b031
-MISC metadata.xml 659 BLAKE2B ec90c7e7dec453a99ac7d431f3d431cfbbbdfe4ba5fef5d57b7923ed5a8b1f3511c1a8e260c51080f754aa1f27b4d63e6cfba97fadfa00765fcf14277431c583 SHA512 62dbf23559c5c19e9157fcaab10356fd51f52e98a1c39ac138445b058a45a350c758ecb2e6b36eb2e05a384bf6c5c7413deea3b5db7a3a2468248b677136b246
+MISC metadata.xml 551 BLAKE2B 1bc4f5bcc0dd85ff4e14ededc83e631c942995a8f0ba9534d72b6d5b671ad471eeb0c43a02ce4cf7c0b79d7f0d5583d419c46aaa8c297f1544353b8f42cdefa4 SHA512 5a580198036d96152d46c79b19317e35e5ba15f998ccaeade825189ee640a6ca50552a46f56f783ebba288df3953d461695039539c47baa27e3c9da1f8b1ccc0
diff --git a/sys-firmware/seabios/metadata.xml b/sys-firmware/seabios/metadata.xml
index 0d64e0a0db2e..4235b1b9f4aa 100644
--- a/sys-firmware/seabios/metadata.xml
+++ b/sys-firmware/seabios/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
diff --git a/sys-firmware/sgabios/Manifest b/sys-firmware/sgabios/Manifest
index 2106502a2b60..8754b8024eb9 100644
--- a/sys-firmware/sgabios/Manifest
+++ b/sys-firmware/sgabios/Manifest
@@ -3,4 +3,4 @@ AUX sgabios-0.1_pre8-makefile.patch 395 BLAKE2B 0d6a9eff239e3881bb6dc674e62b98eb
 DIST sgabios-0.1_pre8-bins.tar.xz 2704 BLAKE2B 8efcf613a4857467cc3cfbc3f6402bca091892f0b2137ff65caf2b444610c86c1db0e61505bfe48ed8d6ccc9e8928190c2a38693aeddd523e27d22a29e777044 SHA512 46fc02200b3fa2e45c954a2b6e4cd40f10d6969fd05ef4d441402c7390b4e83390250972ef0ea891635400cad22a4d8fd2b66b56afa91d03e1e0b99132e09c0d
 DIST sgabios-0.1_pre8.tar.xz 27200 BLAKE2B 8ea535f2fcc8f7105a278202648e06722e7463e66ff3ccf824cd3a672a7908e7223f27678ebd4ca73eb19abaff75e082ea7b9bc222332436f31a8840443d7b44 SHA512 68e2a894eb5b99cda2b0e96ade891e24397ac962a777a97dbb526f4570e5734d36a88fde1ef64ed7a887cd8bfc500c91c48849d2c26aca6ce7e36dd80aaf361e
 EBUILD sgabios-0.1_pre8-r1.ebuild 1240 BLAKE2B d4a4874d172db80d063a4fca37a953fd768318b08df41cb79911c03d33fa48616cf7d7564b7d40e247c4d2d984e8ce9425dcd837531f083e84e21f1de1e9776c SHA512 3d5975238c0d281d6044cf58d100fa452cead9af9627a3a3ac30f488f55687fe239335bc114e56a6b58c4ce99d935574d03c4d1987760c13eda71329f459d0ad
-MISC metadata.xml 554 BLAKE2B 675f2ab919854639c14a08d25bd1efd6814cd262563701d285f25f4a345716c97ef603a2b9c2335a45c40950cc9ab98cf14fe5be8061a033b1ee045ef6a323b3 SHA512 147e5f7bb7cf615a83bf78684ffb4ddf794d74364004a028f2be53ff9b8bdba62b0b24dbeeff6bacfbf81925a7084c884d663d5da5c20a7364b125ebfd9485a4
+MISC metadata.xml 446 BLAKE2B 4ae7416e96ab45a156d697bbb5bd35307040114250950a9b695ab19ec9ce75ee9f2e89845ffce820b693518df6ba525b722461f82b306b5798d71e806106baf9 SHA512 3dff66a2d4412a527c648ceb070d7f23765e6b0b74271cf1ecef27c8c05c9282c880ea8f5e3192ea612b07eaed6a0596b00ecf4bbdee22b77d1ce176592b9f0d
diff --git a/sys-firmware/sgabios/metadata.xml b/sys-firmware/sgabios/metadata.xml
index 99ab4157ae0d..dd7b4327c259 100644
--- a/sys-firmware/sgabios/metadata.xml
+++ b/sys-firmware/sgabios/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
diff --git a/sys-firmware/vgabios/Manifest b/sys-firmware/vgabios/Manifest
index a3ad865bd446..c3c346915cc3 100644
--- a/sys-firmware/vgabios/Manifest
+++ b/sys-firmware/vgabios/Manifest
@@ -2,4 +2,4 @@ DIST vgabios-0.7a-fixes-1.tar.bz2 2602 BLAKE2B 68fbd29e6c660dc69ea110e00ff75fc9d
 DIST vgabios-0.7a.tgz 1506655 BLAKE2B fb9b99ab385423b4ef103a56de140591556d2f49fffebfdd508a462551b1a9def9d8dc50c947a88ef6d47c43ff62dbe3d97fef969d985c49b9e78671eaefd34e SHA512 35d789b1b39f8f05b757b6c3379a1b2c33dc27b244720471530325f3e215b5f4fa97cfbfc131f813013f4640fe85be912e7b4cb924fa87ed35e68b6966424874
 EBUILD vgabios-0.7a-r1.ebuild 1746 BLAKE2B 483e821ec557c40a5d28e38b4a6eec13b57d14171524a5f8c44f48ca37ac8ed30df7470a2f9d9396d31e7054a15d32a6f2e5081d84f4669b49fedde2b9349b84 SHA512 d238b9766304222b5f99b79d87443e59409fbdb6ac3cc39faa711a17a8f72c78c601965f4cf3cb2f2bee47760662343a8dba5f3f49c3ad25738d1b0cd2ed6cf5
 EBUILD vgabios-0.7a.ebuild 1716 BLAKE2B 839c1706b973275439ca2bd257020bd93f53ed71d493e5b60bd429918bbb48f1dc6d889c6d6351c840e6483f3750fece19b209df6a0403c80a99cc0c0ee6e50f SHA512 1822165f80f0d45437825044e9675edfe515a35004e3b3fddc069b60208bbd1f4fc97120bd1c8a3f7d226f2ee6c4459e4017321c48d402f9a44c272b346ceff5
-MISC metadata.xml 605 BLAKE2B 176d2f1f0874e3afeb5300f6df01c25d19cf26a714230e0c9bc98a44b695d55411e16cbe56573dc9a3fe3aa07f7968bff0f116b16a9c980779c32095c97b1932 SHA512 a6214ebae56804c8e138eeb4d4e3ebff3656a7a0236ba89c6a44e773d744f83861e9d52af5799e19c935969b888248d77f10d018bc653144682d058b229c2cd3
+MISC metadata.xml 497 BLAKE2B 486ae4d9758667855e7920cc589aa1a284c0be89387f78c2c226701fa2f32bc20a6769b909d63f9c04483aa900d0d0858fec2db4e49fe6e710cf9dd6df458263 SHA512 c7f5fb5b3c08c0cd3d7460d4ada18ce829dadd3c286782cc064ce18af5b427e20c5be8925b8ed179ceb2ee2405aa0a85593b268c1d98dfae5d55f06587d6de47
diff --git a/sys-firmware/vgabios/metadata.xml b/sys-firmware/vgabios/metadata.xml
index dec7a1d5bc34..99d582c600e4 100644
--- a/sys-firmware/vgabios/metadata.xml
+++ b/sys-firmware/vgabios/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 19deac51c854..bd82dde28f32 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index f13076c43c58..aebf3f9b8067 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -15,5 +15,5 @@ EBUILD cryptsetup-2.0.5-r1.ebuild 4151 BLAKE2B eb67cb9e3424b5444bf298fafeb3cbf05
 EBUILD cryptsetup-2.0.6.ebuild 4167 BLAKE2B 0aaa413b365a5b3986e3908709e54af38af8191c2086168076d380321c8577cc686826b7f57fb1671bdf45adf141630f65e815842f0cf4703636a8caf7cee46b SHA512 c707d533fcfc71e5adcd3eacd9556ae0d87c65b9e283008daafe5aaa29056ed175bf5354c08638454677b75e99f0f77d51a0ea76a0006bb8812d721a46e8cef7
 EBUILD cryptsetup-2.1.0.ebuild 4411 BLAKE2B 4098102c4571866c9030bb68c489d078b590fe0e7b5cac6e134a90ecff3e083277d82cb9bad9778eaec098268d3ce5b8d89dcbf34f4108334536cc5e7529c789 SHA512 4fc4743afac269525e2bd108bf7bf033719df987acf5d1431be98d75f4af1fee9a3abb07397ec9cba2bb527cbf7f225e235142ed4bb6968eb3a2a721c9f25579
 EBUILD cryptsetup-2.2.0.ebuild 4230 BLAKE2B b79655191d45d68eeece99538db185206cfe825042e98e055d83149d04c538b813ae350733b1bc7ab77fcbdeb6092f47cf10b67124b6f8199d94c39202c1704a SHA512 d1c10829bf880cb841b622819d16148e606f7654758f2e0943143d85292d074c1a52e756151e0a0526aeee5908f782d55d36f44b7c89855e9f38c916272dac2d
-EBUILD cryptsetup-2.2.1.ebuild 4230 BLAKE2B b79655191d45d68eeece99538db185206cfe825042e98e055d83149d04c538b813ae350733b1bc7ab77fcbdeb6092f47cf10b67124b6f8199d94c39202c1704a SHA512 d1c10829bf880cb841b622819d16148e606f7654758f2e0943143d85292d074c1a52e756151e0a0526aeee5908f782d55d36f44b7c89855e9f38c916272dac2d
+EBUILD cryptsetup-2.2.1.ebuild 4223 BLAKE2B 42c5b1fc4881519591033b5005c4b43b238057d5d7edaa0c315d92ec64fb1190a180f9b75dd35908827fd2589b0f288e24305e8c400bb70f41708548f9ba8b99 SHA512 b8e502d1b69ace88bdf61a2cb6a560158b08edd031b9e611c0922461700fa542eaac98408ed426cb04e04d1e649f4c048361260c5b2dd9e2c1ba9c3df7df5897
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.1.ebuild
index 8cb062389bc5..64b6bb8cae77 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index f6fab9763823..9f240f8adb07 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,3 +1,3 @@
 DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
 EBUILD dosfstools-4.1.ebuild 998 BLAKE2B d3916e58c7b0db551e58bcbb44e210b80ca331bbf71ef6fdf2109712a35c9c41beed04543b1510054796089e4839f4691bb3629c1d56ef4ed61617774d3df6ef SHA512 f0efd8f779406dfae4dfdf45c75b61b87287cf3ef401ea4b6de5de56cbf628a43e75e87968c2a837092bd3bcc98b27abd17df7f6a4252331282fc5f53f04e16d
-MISC metadata.xml 424 BLAKE2B 01d65645ef9a1e617bf40a2d401a5fd3f1444c68f41a3c64e746e445b100ebd7c8af05b48c250f4bd9c679842906dd2e9b679edc298b1001f7dfe5b183f5f77a SHA512 d82795b70fc583b8154a2c3b14b6565cff36924b91fb3888cd2b6c36d8036614be6d67a0ea0fc96f2fa4bfa5516675b8aa74571e578ad8d42c06cb9f503c565d
+MISC metadata.xml 496 BLAKE2B 32b7ed76d0385441b8a40fff8ca15d6848fce7cf1ae511a6905d3c12b8a7593bbc11494f7ca720c465f61175d8d84cd9e6d41f084a140fce88513c6b95965615 SHA512 40b886dc36d892d733a6a6528eed5dec3977eecb71a22b5cee2ea6c0417401951b966509c3816ed5a2761eae4b8c5def7ef5e99d9aedab2e09000a3f3de6b354
diff --git a/sys-fs/dosfstools/metadata.xml b/sys-fs/dosfstools/metadata.xml
index ffedbfb729c1..85825b41c0dd 100644
--- a/sys-fs/dosfstools/metadata.xml
+++ b/sys-fs/dosfstools/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <upstream>
+	<remote-id type="cpe">cpe:/a:dosfstools_project:dosfstools</remote-id>
 	<remote-id type="github">dosfstools/dosfstools</remote-id>
 </upstream>
 <use>
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index fd09a3118cb5..bc58db64a5e6 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -13,4 +13,4 @@ DIST e2fsprogs-1.45.3.tar.xz 5561452 BLAKE2B ee41f35c3294ccb8dad4274e44d9c07dc94
 EBUILD e2fsprogs-1.44.5.ebuild 3928 BLAKE2B a71cb0b55c3c27cd64cdff8f30c4df93487682665919bae9a36cf7edd9b05204d95dbd88614110e27b8ab607041ad6a089ad86e6dd684db8e571c41da097322f SHA512 017fe80104dedd930c47be814858693ed110b1bf969213ec161e260ff000ea23b8c925e5b94a1bd34db883cd5132e7f785aa0e7b9c7ff328c1451369dc452c1b
 EBUILD e2fsprogs-1.45.2.ebuild 4094 BLAKE2B 926c3cb6a6bed8b0d42541d6272b19eb270d00e08507148a9bd56f1f188730916c3b289bbca86d4aeedf1ee21ff6404b1141b7ce20b3f9edf43e030439646827 SHA512 d8358629d11e074c2bff189d54e540c46fa9875ff9b13e41ada9d567f0df02ea8f75b3d8aca287c4281973725e3cd852adbe916ebfe429b7976e6cd1edf335f8
 EBUILD e2fsprogs-1.45.3.ebuild 4107 BLAKE2B 1dca4c3e02522b493e10a29612bcf11786c05295cc7dfe62a6076d47905d20d51ad798aa07c6e31894be51a234a83bf57ae4fb0d2dbc7f601cdadcd462f61e3b SHA512 9f412d36677410a52e5e3bbc3170c534a06bb7badf5ad576ae5ea61597cc4b02b364e11f4467e2bc46ac322e5af26417230884c309e39f45976766ba8b90fc05
-MISC metadata.xml 578 BLAKE2B 08094a62570e432f1ed7370d2eb402523f17e7cea8ca1370302b602de949e812e6d277a280be23d0a0f515b6b39ee18d974b1ef0d008d2267fcc4e7bb41ff3d9 SHA512 094625d323bca75af0884ee4d2c1503437a50aa1a323c52e054b49edf890afc0b20f936b2833c82e944b58615996b76e7fc2a502aa87b3c66a385e7698d2d6cf
+MISC metadata.xml 569 BLAKE2B 0a09eb03e2d5f07a24f33d71a16d0e4cb7e12e5a03356b44127e964c712addfb5bb9d5bc3b26dc66c608544639b6a92ebe0dcc18c03b8820f50b6fabcc9c231b SHA512 fa3e24f0db835a5fb475d42874d3197bd30f0c1f606b66b1b3f285e61dd32624ae56014b37ee0de0a9ebfaf51dd2f06cc2f73f91a011c5314809f5d495d65e67
diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml
index 4ffc67ac95a7..fd229917a073 100644
--- a/sys-fs/e2fsprogs/metadata.xml
+++ b/sys-fs/e2fsprogs/metadata.xml
@@ -10,7 +10,7 @@
 	<flag name='fuse'>Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems</flag>
 </use>
 <upstream>
-	<remote-id type="cpe">cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id>
+	<remote-id type="cpe">cpe:/a:e2fsprogs_project:e2fsprogs</remote-id>
 	<remote-id type="sourceforge">e2fsprogs</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index 07cabfaf0367..48ce62194fc7 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -2,4 +2,4 @@ DIST exfat-utils-1.2.8.tar.gz 181121 BLAKE2B 679b7662d14d9caa26b6d0aff1007130f6d
 DIST exfat-utils-1.3.0.tar.gz 188943 BLAKE2B 07af437fc21ae2f7d99db778069135c7391554f964a05eb6df715bcb5135003ecdc1257c541a61e0c140bfcffbc0802dd4118413f8d11a175be3f8adf5f5b83f SHA512 e1c5b708f22e878d7521e3299866bba127145757e3620696ff11b18c8c7d4830522974e8ee4771234b70aa9718295d3433779cf34ca990e28ccc06cbf9325f7e
 EBUILD exfat-utils-1.2.8.ebuild 638 BLAKE2B 5de4958b72b4d8522ab9eed8e45f56fc74511ae09c3de7b75ab605b83a055cfbe40a3bda8b67676758e69dcd43335f10f81953f18166ebe89b6369fcb701e210 SHA512 322012c9bf1ad9281cb7d3319703bc9a3a3db6f79548a1edfb49e8ffd4cc0b176e71eefdde6e83a386e51ffd6ba337baa00fb053d6cf8bbc2fa53b97bdcb7975
 EBUILD exfat-utils-1.3.0.ebuild 620 BLAKE2B 1648c06ba38db8712c4b5a79396c03e02120467af9661cc1353e80e35636f8c3ccbf986014576f8cbad45409738bd5f1850bd800667e0131305979e6ea5ab5a3 SHA512 b6020897bb9596a2aa450ee22f4eea190809e6514031908aba0f40cd1d58cb1de32fce79c957d70127dc77d17b514b221dddce88ea50b76acf0f7a620e365316
-MISC metadata.xml 451 BLAKE2B 89f419f995928b9d29c5aed14e20792fde2bc90cae84ad31b2df25eedfca4bbe23fef0845989616b5e6f0a44bc50941879bd5928e4f0dfbdb8a2ed4db97b95a0 SHA512 e9b06c7885b8f6d5d114042e9fa8946583b2a481ef74d4269e0d462ff995fb7da3d4ef171d401c48f517c93ca8b954f7f72f1fc0a9ac294b232e7d8a5da228c9
+MISC metadata.xml 513 BLAKE2B f7192dfbeb1f77cdb3d85592d6706c50fd5b84c93ad8516611b641784fbc794256c1f102e5269df5cb37316681a7df0a8860a687b47104c017c82af654ea3fe4 SHA512 622380a436001db3795c658dc36ad2fcd35e380f6987943fa0281f0190b2000cbefefa4e28e9cb4552285c77481e1230eadef800797520718d68bcc372d868bb
diff --git a/sys-fs/exfat-utils/metadata.xml b/sys-fs/exfat-utils/metadata.xml
index 2b2d336f4adb..e71e375cd5f9 100644
--- a/sys-fs/exfat-utils/metadata.xml
+++ b/sys-fs/exfat-utils/metadata.xml
@@ -9,6 +9,7 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <upstream>
+	<remote-id type="cpe">cpe:/a:exfat_prokect:exfat</remote-id>
 	<remote-id type="google-code">exfat</remote-id>
 	<remote-id type="github">relan/exfat</remote-id>
 </upstream>
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index c47b3d0a8eba..f871f2690545 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -51,11 +51,11 @@ DIST LVM2.2.02.184.tgz 2383698 BLAKE2B b6e308d76d541b9461dfcc6e82db256a175ccdabf
 DIST LVM2.2.02.185.tgz 2386328 BLAKE2B d2e31de3eedd7518ea2d239cb9b36b38e351d7fc070097a1fc4e7934e3636195da3247fba57d684bb0b31b7f3dbdfe29161bd121b2962b2c35c8c9d7914b4506 SHA512 f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf
 DIST LVM2.2.02.186.tgz 2389759 BLAKE2B e094c0135d455386ea5789208899d4dbdd5e78bebf52e49ab5587f881fbc2b94c6accecacf1b4ed182b0c87046402c00a47a1b724795a94fe3ec998b580a77ae SHA512 06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03
 DIST LVM2.2.03.05.tgz 2427412 BLAKE2B a66f199b6b9b593746ff7738657d80c3dc6201b417736e8136e8c894532611d9a4b44c3c791cb7dac539e6e2683b348ba17917a2a9ba539ec15cac5c25713816 SHA512 3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a
-EBUILD lvm2-2.02.116.ebuild 8450 BLAKE2B 1e028c3b1c14ac9e0e8bad95c4882bd05d5227f462f594f9af5b4fb58c1cb89412006e497211645dbadbf3fcca35f95c88d5b30bd7415ea4ecf53be26e8465cc SHA512 6aebbe79f13bc0ce8422c9d0ed73f30efe9f04cbbdc190b5d52dc63be981be1cd350c9dd586a6dc2704e4c5abb7ca16eee878350eddbcee46ebdd21f148ef07b
-EBUILD lvm2-2.02.145-r2.ebuild 8637 BLAKE2B e21d693c8428d8704be6f5065939081f0c1992f016a55ca2d2074caf9a4066ee45cb02b57c84d6377d0e993110da67164716f1974ed474a095c54c3dd30f0c90 SHA512 cd63c1e595901e17f9cd0fb7d780ea8538e3fbc48111fbd6e3d3ba9c7aff23d7deeeb8e556aa7c206884f49891a534911f0186750a15d4bbdc81424f1316025a
-EBUILD lvm2-2.02.183.ebuild 8886 BLAKE2B f70bfabc88eeacfd2ea52a22ade436296276f53db341ed1be96e72e5309f4494c6ecd14b5a057f33c67efc36c5029c146a90aa3db6580c03290598043597fc26 SHA512 87c6dcce5a9731e3d0f4c8ddee25db5324dd25ac66a70f632a9653d1874a10eef84ec4ab6089651b00a8663cb3af9bf7c10df352353e32d04d7a74fc80438922
-EBUILD lvm2-2.02.184-r4.ebuild 9424 BLAKE2B bf506a9a4cd7bd4a307ffb274943c502aadddfe35bed56841116d6cf8e2dd33d051e769f36dae1a678dc292f68d49b337634c2cc16ceddd284495da319075505 SHA512 a69837d3c29391fcc907a641340e96d46d49085a10c43c31fb2236ee113f1be9331ad8d75cf3152de87ce765f93bcabea7cef1183d7bf6176654ff410b048e92
-EBUILD lvm2-2.02.185-r1.ebuild 9615 BLAKE2B 0cab9042fa65ac0d5a18af8a704b21e726a859d51b691a0abd3fba85f39157b19a194d419543271d75186f2298de2c9482307b86b09aff477611df1373885f17 SHA512 9c236f62da5a4d71f29385b255ea4ceaf25a1cec624eb5fe89ba0c149375d4e6e36b39451c123c45c5982c98f532718a35523c1ef7233b820343ca28aa450ba5
-EBUILD lvm2-2.02.186.ebuild 9615 BLAKE2B 0cab9042fa65ac0d5a18af8a704b21e726a859d51b691a0abd3fba85f39157b19a194d419543271d75186f2298de2c9482307b86b09aff477611df1373885f17 SHA512 9c236f62da5a4d71f29385b255ea4ceaf25a1cec624eb5fe89ba0c149375d4e6e36b39451c123c45c5982c98f532718a35523c1ef7233b820343ca28aa450ba5
-EBUILD lvm2-2.03.05-r1.ebuild 8994 BLAKE2B 071fcdc622045a2365b8da2728e84c99ed072e9811742ef47a506d851265cea876aae9720c40c15610b6dd6633ad03a4ab1d709ea62d50d4bf08d39b2a6565ed SHA512 9cfb92c77b5efaf0e4472e028d94373cad788cf911e1a3a2ec53e9ccf8ed7420c06e40624666e50f1bfe3a19f683cf247a730d2ec11ee4b5dbd39ca29282f249
-MISC metadata.xml 1146 BLAKE2B 7a4bbf38d2e752523c2909c240a2c90ada04aee8efe96c62c5989887f4997e00a4ed7312dd9803d8ddcae02e8bbc3ba8f0fa9e5da0f484bc9768e0ed99ab8be3 SHA512 24240ba35d93d9f9171f2b164d949846a5ea2126eceed4b4454dd0b4efb9b1132f9f6717d2c7364f20820b792bbaf26dc274f7c10767993b35a565a76e042f4f
+EBUILD lvm2-2.02.116.ebuild 8359 BLAKE2B 664a994314d72a762c1e048373200ba6a07949f222cfa402aafe2f11dc4cb7430a2f2b8bd40a8e4f0c40a78a5c0814fd7a2c06297f1f6b12ab3225dab443eee0 SHA512 647ec89384494e27b93a13943d127659ac0d3528b5cdccc62f421d765884b887650c9da0a888f22322dfae5e558be7e16ffe7e3705881e06e4ccd47d953bbecf
+EBUILD lvm2-2.02.145-r2.ebuild 8544 BLAKE2B 7f234281ad898cba25b6dfb797f5a66ddb35695e67211a5dbcc43b4d2028a863957065e123b558dcbceb1415c1a27f32783aa9471e84c4492c74c9aacb026ba7 SHA512 e5ff07acdd559ce743003da72ccc35a370b6002cc07a26b021bd3f5da44ec32290ff79b04b6edf7e11cc0b7b30b8e9df437fe25456bbc2bf7d9c988fbfe12233
+EBUILD lvm2-2.02.183.ebuild 8795 BLAKE2B a3593fba8a0aa2f7567804fd66b06288ef56cc44b66c347589d30fd393d900d3db9fc09a2f9841141b18c79a2dc700182a8727443ae944770caaed926d6ae223 SHA512 f4d66395ac3ccf044b50f693d414e25bdb5430c0a268ac4087a8349b17a95bac16dc72e11493d7708dada2abc770080af955ef2e3d7b24d0961b8a38610f62d5
+EBUILD lvm2-2.02.184-r4.ebuild 9333 BLAKE2B 9594a9e268f8b27d04007218b930b67e8d6b2c929d25e6850b66a7a13b202f4cc74a8049504ba4adf6e6a0911834fe3b7fa12bcf686b3d9426d314fcb7153316 SHA512 44833fc31b7b6dbd582d6342ddd8a5ec9326ce15e49b2f8746e9ea9203c0ca3df487c2137b4713a9a97eac4838ea1301568db5ceb0b1057b60df1f718cb87e0c
+EBUILD lvm2-2.02.185-r1.ebuild 9523 BLAKE2B f3f2c8cbb0bb54b265e62c302481e8d66fd21dca562762af920f48797d21189d8cc7018e531aeeb29fea4a59f19def2b5531d099747e3728b2f66aa3dc4e890e SHA512 560345964724d79c18db900ae1ee6aaea3bc23994722d9a505bc2658e394593e5b329271c8878770c833bc2017a0bbd2d6770295e98bca055b526ed315f9f886
+EBUILD lvm2-2.02.186.ebuild 9523 BLAKE2B f3f2c8cbb0bb54b265e62c302481e8d66fd21dca562762af920f48797d21189d8cc7018e531aeeb29fea4a59f19def2b5531d099747e3728b2f66aa3dc4e890e SHA512 560345964724d79c18db900ae1ee6aaea3bc23994722d9a505bc2658e394593e5b329271c8878770c833bc2017a0bbd2d6770295e98bca055b526ed315f9f886
+EBUILD lvm2-2.03.05-r1.ebuild 8902 BLAKE2B 6b6e07d8e50de31b4d92d0bf7f9810f0fc9e5cba19f61b206b4bbe95445241cbb0a237e2356cf4b447fccd984ca06467874ea1982a2a5c4e7517126a021dff6e SHA512 2dc836e69c621a1c0e60dfc1df53eb76aceb6f15d9e8ee3ccc355592221330e7c761a5e56f376a6419b3cc2ca689718c8b3e642bc3b089a80030b5c72d4586f6
+MISC metadata.xml 973 BLAKE2B d44e826563738ba8b14ba0a31756f66551bae97866c66da94bcfb6f763ab45d8217e92e4a7c2ad07bba41285470c7dbca617af598a8ef765f9d30e409c3ae12d SHA512 d85b652879e6fae8e2fc9fe796c3f7e70fa5edefff6c33f858fac73c165c658493efc1fde61cccefccac80e0b9b2f50f6b8de0dbe9e432055fd218552911f403
diff --git a/sys-fs/lvm2/lvm2-2.02.116.ebuild b/sys-fs/lvm2/lvm2-2.02.116.ebuild
index c08ea9082043..f7e83264dbc1 100644
--- a/sys-fs/lvm2/lvm2-2.02.116.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.116.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript
+inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
 HOMEPAGE="https://sourceware.org/lvm2/"
@@ -212,9 +212,7 @@ src_install() {
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
 		dolib.a libdaemon/client/libdaemonclient.a #462908
-		#gen_usr_ldscript libdevmapper.so
 		dolib.a daemons/dmeventd/libdevmapper-event.a
-		#gen_usr_ldscript libdevmapper-event.so
 	else
 		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
 	fi
diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
index 9123620e40b1..d014bed6e223 100644
--- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript
+inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
 HOMEPAGE="https://sourceware.org/lvm2/"
@@ -222,9 +222,7 @@ src_install() {
 		dolib.a libdm/ioctl/libdevmapper.a
 		if use !device-mapper-only ; then
 			dolib.a libdaemon/client/libdaemonclient.a #462908
-			#gen_usr_ldscript libdevmapper.so
 			dolib.a daemons/dmeventd/libdevmapper-event.a
-			#gen_usr_ldscript libdevmapper-event.so
 		fi
 	else
 		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
diff --git a/sys-fs/lvm2/lvm2-2.02.183.ebuild b/sys-fs/lvm2/lvm2-2.02.183.ebuild
index 595dd187372a..1438959ea365 100644
--- a/sys-fs/lvm2/lvm2-2.02.183.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.183.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
 HOMEPAGE="https://sourceware.org/lvm2/"
@@ -228,9 +228,7 @@ src_install() {
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
 		dolib.a libdaemon/client/libdaemonclient.a #462908
-		#gen_usr_ldscript libdevmapper.so
 		dolib.a daemons/dmeventd/libdevmapper-event.a
-		#gen_usr_ldscript libdevmapper-event.so
 	else
 		rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
 	fi
diff --git a/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild b/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild
index eab949397c29..0c4acb77beb2 100644
--- a/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
 HOMEPAGE="https://sourceware.org/lvm2/"
@@ -240,9 +240,7 @@ src_install() {
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
 		dolib.a libdaemon/client/libdaemonclient.a #462908
-		#gen_usr_ldscript libdevmapper.so
 		dolib.a daemons/dmeventd/libdevmapper-event.a
-		#gen_usr_ldscript libdevmapper-event.so
 	else
 		rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
 	fi
diff --git a/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild
index c18e5334dcd1..de7273ad6448 100644
--- a/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
 HOMEPAGE="https://sourceware.org/lvm2/"
@@ -242,13 +242,11 @@ src_install() {
 
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
-		#gen_usr_ldscript libdevmapper.so
 		if use !device-mapper-only; then
 			# depends on lvmetad
 			dolib.a libdaemon/client/libdaemonclient.a #462908
 			# depends on dmeventd
 			dolib.a daemons/dmeventd/libdevmapper-event.a
-			#gen_usr_ldscript libdevmapper-event.so
 		fi
 	else
 		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
diff --git a/sys-fs/lvm2/lvm2-2.02.186.ebuild b/sys-fs/lvm2/lvm2-2.02.186.ebuild
index c18e5334dcd1..de7273ad6448 100644
--- a/sys-fs/lvm2/lvm2-2.02.186.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.186.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
 HOMEPAGE="https://sourceware.org/lvm2/"
@@ -242,13 +242,11 @@ src_install() {
 
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
-		#gen_usr_ldscript libdevmapper.so
 		if use !device-mapper-only; then
 			# depends on lvmetad
 			dolib.a libdaemon/client/libdaemonclient.a #462908
 			# depends on dmeventd
 			dolib.a daemons/dmeventd/libdevmapper-event.a
-			#gen_usr_ldscript libdevmapper-event.so
 		fi
 	else
 		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
diff --git a/sys-fs/lvm2/lvm2-2.03.05-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.05-r1.ebuild
index e1103033f62a..aa341d835815 100644
--- a/sys-fs/lvm2/lvm2-2.03.05-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.05-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
 HOMEPAGE="https://sourceware.org/lvm2/"
@@ -230,13 +230,11 @@ src_install() {
 
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
-		#gen_usr_ldscript libdevmapper.so
 		if use !device-mapper-only; then
 			# depends on lvmetad
 			dolib.a libdaemon/client/libdaemonclient.a #462908
 			# depends on dmeventd
 			dolib.a daemons/dmeventd/libdevmapper-event.a
-			#gen_usr_ldscript libdevmapper-event.so
 		fi
 	else
 		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index c1a65d74e23d..40ead9259ea7 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -10,11 +10,6 @@
 		<name>Alasdair Kergon</name>
 		<description>Upstream Maintainer (please CC on bugs)</description>
 	</maintainer>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-		<description>Backup to Robin. Please CC on bugs.</description>
-	</maintainer>
 	<use>
 		<flag name="lvm1">Allow users to build lvm2 with lvm1 support</flag>
 		<flag name="lvm2create_initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag>
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 4214cbdc9abf..28ceb747fb18 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -4,4 +4,4 @@ DIST mtd-utils-2.0.2.tar.gz 355964 BLAKE2B 9a795ddac1287c7c44f52215faa4b6295cf5a
 EBUILD mtd-utils-1.5.2.ebuild 1564 BLAKE2B de9628c6cff455da5ed55f2f5822cd561ac9a487e6b9510d3b7ece0ae26edece2d02045cbadae63c4e6e48421c0babb4b77bb2ebf076f3fb86c7170bc671c301 SHA512 934327b7a547dff08509bbf956a00eb22188d0a0bf1275bcf2c2b07b7a2a5faaefe64ce6665de31c8dfd74c835a10e7d9de9b9404630109e4dbaad51e8780410
 EBUILD mtd-utils-2.0.2.ebuild 1327 BLAKE2B 02cd485785eb0c8f112a9868701cf64674057592c89bfa2958cea23885afca964c8d743b303a213fb00231a73364bdbed528ea0e8db03d3acbbc81718ddf573a SHA512 1e0b35ec4fb7cecd48eed123ba20b8121014e0f5bf7836a0247e09c5f5b8624e235ebe1ab6dd9b02cc015a701a83e92b24504e5e558af7b32181289d7fa46fb6
 EBUILD mtd-utils-99999999.ebuild 1510 BLAKE2B 6b49689495715cb470e1c386dd0ab7006610aaed89935a2d9c75eae5b7c08a8566a89060bc9ab1d8da73ce18a5e8826b6bf7f2e724531d93103a298ad894f241 SHA512 8fd85aaed72cf2a59f783a366a01ba93f3929c15eb098500be0025a6a2e388db397c385a9d97293cba1b14913ae6a2d93f90be082d129312e9fc49601f95a5f8
-MISC metadata.xml 323 BLAKE2B d1d9d3f24dc9d2fe5790f0999f787a331b5b0f261b2bf73946841c8a7f40a3b7c1a8e7bd7e516eaae87f82210f4d558c11f3ff1a3f302b71bb98e993a59c421c SHA512 191d5a9dbe4c6a0a72815092a0668070ff39bc121b30a3e55abd894ca62fd3641a205662a23a6a87aeeedd8ab000e4d2d40bbba278acbc0f7d74c97d0571d0c1
+MISC metadata.xml 416 BLAKE2B 88cdc71a56448e05d3d8bba7b5bb031b043d7b798ad40a04d7ab416b5148fc9c27501366991d26a51f44186953fa6eb3a1214cc8d0872f6e3cd39861c532a672 SHA512 e75a4504c7558e19937f8f608a852905853f8efc2aef32ca3c383517fce86673aa3647a6ed5305d105f16be2c6a0f9667bb8326a9453050810b29b8f72fdc7ac
diff --git a/sys-fs/mtd-utils/metadata.xml b/sys-fs/mtd-utils/metadata.xml
index 7d84a262b640..9075500ddb8b 100644
--- a/sys-fs/mtd-utils/metadata.xml
+++ b/sys-fs/mtd-utils/metadata.xml
@@ -8,4 +8,7 @@
 	<email>embedded@gentoo.org</email>
 	<name>Embedded Gentoo</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:mtd-utils_project:mtd-utils</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index e62579a4659a..c6535ed0095e 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -7,4 +7,4 @@ DIST mtools-4.0.23.tar.bz2 418592 BLAKE2B 442f552087a5d53ef0ead6161cdad7997dc45a
 EBUILD mtools-4.0.18-r2.ebuild 1442 BLAKE2B 7aaa093e1f1bbc4df2201b1c66044141914cbf49479cbac748026604ead012f986dc5228340448d60aa169023f6f5b7a2d5d826e19bf5e2618059ab8bacdc4af SHA512 32a807769bebeffad14f2a366e5536cb9b055f24cfa3a15508267eb88e4015f33713e8fa338078834942fcfc0d44ac22e15bb3265f45ab96420466ed4c1b77d5
 EBUILD mtools-4.0.22.ebuild 1178 BLAKE2B 3fa2b089538673259b7e6600a841f94b96a116213aa76d31be62951537ce662c8b1d78720c55a6f0c40f8ae4e83261abe2a35cb25d3f76a5160cb23bb7054bef SHA512 ac4561a82fb5d0c6658d9173585dd173f631bd374793ea2c53038b40a7f789e4bc48ae097187303010a5e6cdbd49ab59fa1f1848f342a75d5148a5324a103762
 EBUILD mtools-4.0.23.ebuild 1178 BLAKE2B 3fa2b089538673259b7e6600a841f94b96a116213aa76d31be62951537ce662c8b1d78720c55a6f0c40f8ae4e83261abe2a35cb25d3f76a5160cb23bb7054bef SHA512 ac4561a82fb5d0c6658d9173585dd173f631bd374793ea2c53038b40a7f789e4bc48ae097187303010a5e6cdbd49ab59fa1f1848f342a75d5148a5324a103762
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/metadata.xml b/sys-fs/mtools/metadata.xml
index 56c124413057..dd09ab641ca1 100644
--- a/sys-fs/mtools/metadata.xml
+++ b/sys-fs/mtools/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:mtools:*</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 9a4f31858ed8..1f40f8de61c0 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -9,4 +9,4 @@ EBUILD xfsprogs-4.19.0.ebuild 2434 BLAKE2B cc6ca0e0425994414497bb9ac27541408958d
 EBUILD xfsprogs-5.1.0.ebuild 2466 BLAKE2B 568609a5a361342a9eba9c591910ef0304f0a362dcddd3c4629671bcc28600b9155e17a59111bdd28e90d4be51f26d9e0ca4c313b0daea82fe4eafd4af77813e SHA512 5a4c27c82ea4e20c0e8a1428cbbff72e58c84e72281dbe2e5a91fb52ab3e6824fe778e375c0c8318df1ebf83975c5bef637b4749e21fc5f5309d8b82743867a0
 EBUILD xfsprogs-5.2.0.ebuild 2847 BLAKE2B 21b2d3dd8fb503e435a97af0bec0b2a6d4c51dc3be92bf1bc12c41e568e154b44d41e5c559c5893da7962ad05d9a08f25ee3f9f51983ece8631c8601d942a7f6 SHA512 c76c5830628b64bbed2af76f3529e6354bcc9c89667836c107c7f8f25bbac48de6ef5b36b55b71273441a0a17289f51ee12017c23ed0c2bf16448e5f16160466
 EBUILD xfsprogs-5.2.1.ebuild 2782 BLAKE2B 13add8a58236a489688016d3d58800be7542c8ae31d334c72999fc7bc280063112ce5c642da5b01cd922d9c54706899e72c8af7b9becd8c910c4314cb30f39f3 SHA512 9c51e3b40019277aeb1751bc5686157601cdb9b477e086584d5d68866b1f2062690ad2e85f4140d4f5a9f13468609df041007c5e077e848da300083c62d051d7
-MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
+MISC metadata.xml 338 BLAKE2B cdf07fec58a2401c154a3fdb7d5326065143eeac8dbe78078012d643dc3872bc2df79cc734c033c2030d356f2366dad8ad1da553bc268fd0318ab3ba971c4b5e SHA512 1a085c94d623db2cc55d987afb66265ab51e94c8868bc7c169cc669b58f8a8c5a1d81f503aa838d5c2a84f2a0bf923f73314048b49eb1e139d91eca6f71e119e
diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
index 4eb20a048df2..a582335304e6 100644
--- a/sys-fs/xfsprogs/metadata.xml
+++ b/sys-fs/xfsprogs/metadata.xml
@@ -5,4 +5,7 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:sgi:xfsprogs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 00b95990b723..53af4d135fd2 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,5 +2,5 @@ DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d
 DIST zfs-0.8.1.tar.gz 8668360 BLAKE2B f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b SHA512 1fb3957f65dbe94edaffcedb5b2694390dc14e472c11f7e63184a9ea6a774e79a43d47a2d789b7ced233fc67c76583bf7d5c1bda0692bb07929673e2a57f4667
 EBUILD zfs-kmod-0.7.13.ebuild 4119 BLAKE2B f8d921251bc94644a7331762054935518bb9fb68425b404572876466bff118b9ae20cf297f34d9267c933d7ea28840c84fe8e4a867e9a9f191b627f29207798b SHA512 8e4eb43e5b4edd7dcb8b0ecb13a809340ee20247017e7cb141b8489dc4c9988b84b40e866028e8d3b73aea69981a923e4fc4b237389115fb8e72d8b6ed450340
 EBUILD zfs-kmod-0.8.1.ebuild 4390 BLAKE2B aa8f7a575bbb367b4cfa9e41e7aabe96a25a3192fe3af70fc49dc1c9722cd48b91cdabd0a9089ee347c75fe9c921e3c7f5d08aa30e5a2cb2c9c0d611d0533f33 SHA512 bb422bf5fa963e67bace35c56dd42232f98029b792d5b0428d26bd56c8b972ac5e5c7cf632e8cfe8e21ccf89f9e78ce7bdce133770795ce7c7852ccec5e2dbc5
-EBUILD zfs-kmod-9999.ebuild 4397 BLAKE2B 5ef83f8a5175df9e06b2033138d0f83bb840c0a7b5c507571c8e9895858f2ad782e7d3026e436733d1b4d32dd0e466972cbaa18648cd779738ab1ab1ac6ea358 SHA512 637dc8027537b8879fdf4ba6d247ba7c6a043cee5aefc7cea27ee52c7cdfd21e45eb405c56f77278acb9eff44a5a4dbd6990e4a8e6cec688e616d374e773d16c
+EBUILD zfs-kmod-9999.ebuild 4428 BLAKE2B 55ac5f6d3bc7530ed723033d8829696be87c8ca2b3a9a022a11f82725fb147b0ae3c249b48399dc9fdfdcd8f72c6b26dc450d783404be8c72eef745b664754a7 SHA512 71f8bade7df5f2f7f8a434c8cbfbb9ddebf490a42ae289ba7539808de653ae58ec9af4afea2d7006853cac6d46ba072abd47b80512249f04316c0d08f2b7aabc
 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 a8669aea640b..743338031070 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -63,7 +63,9 @@ pkg_setup() {
 			DEVTMPFS
 	"
 
-	use arm64 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT"
+	if use arm64; then
+		kernel_is -ge 5 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT"
+	fi
 
 	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
 
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 538b4a130bf2..7b948aa156d7 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -6,5 +6,5 @@ DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d
 DIST zfs-0.8.1.tar.gz 8668360 BLAKE2B f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b SHA512 1fb3957f65dbe94edaffcedb5b2694390dc14e472c11f7e63184a9ea6a774e79a43d47a2d789b7ced233fc67c76583bf7d5c1bda0692bb07929673e2a57f4667
 EBUILD zfs-0.7.13.ebuild 6286 BLAKE2B 8ff2c44069a13fe26b02a7a490ffcf1cb9833f5d5ba9ca1b151e1ed6bcc706bc46083a86663c073660d7a80792989335f8a1f4d71d162fcc8a16a635336ef175 SHA512 35127bc47361845a18bba3b60b27ae900a16ad2b94c1c479a62b30079b6688236b2feccb9d902ce93e3d8ff0a95504bc00d52fba6120b763d69057227e50a8a6
 EBUILD zfs-0.8.1.ebuild 6818 BLAKE2B b787b718b658937297f35acda6b41c0eaa5b9a41398eb19b0617e2faba0fa41c54d19e96d1ceaab3367e46235f54286d95212cc4de9bb1306f25d5f2ec1b260a SHA512 8719b4b46066a3a2c2bf5f9518082814aba9ecba5e1d977c412432213c1baad89922b13eaf13e3e422fbb4001dc92602444f182847e2e08375d38c812496fe10
-EBUILD zfs-9999.ebuild 5587 BLAKE2B 4645ed8a61534158c7420c707876c009a81b176f9e21df817844c8019f2768dbf67f254532260c6a21694e304598beb7260941670ac8aefffbf9834e928e82d6 SHA512 6c232d76438b42149c517f50421ad6e12c63c01a09446b012ed77e10d56d4349e89d95c9c2a45e0b68835ce2ea70ed8459d8d2c2cd1d5e049eb854ed138aaf3a
+EBUILD zfs-9999.ebuild 5568 BLAKE2B ef7d928b722c7463c15b801f00547e626a706f7d48cdee04e68fc011e8684181c34dce9c7fa633514e1973a3f38537c3d5f23e6319f4d54b5291e30e29a77a6a SHA512 ab819d02e7b537c8c18e32bd2b657ca4c6e566b9cd5b1a17f242a925258a2b88d6c828274c83d5e252bbd7e979f27776243508cb2408bdb6035b3c4fec157faa
 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 4c9ec8687286..220b7d7b8ebd 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -23,7 +23,7 @@ LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
 IUSE="custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs"
 
-COMMON_DEPEND="
+DEPEND="
 	${PYTHON_DEPS}
 	net-libs/libtirpc[static-libs?]
 	sys-apps/util-linux[static-libs?]
@@ -37,14 +37,14 @@ COMMON_DEPEND="
 	)
 "
 
-BDEPEND="${COMMON_DEPEND}
+BDEPEND="virtual/awk
 	virtual/pkgconfig
 	python? (
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
 "
 
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!=sys-apps/grep-2.13*
 	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
 	!sys-fs/zfs-fuse
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 5a09a4de66f6..956ebd307a4c 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index f8d3d61dc992..0f4308a6eeb5 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -5,7 +5,6 @@ AUX genkernel-4.bash 2479 BLAKE2B e5504698ab49bb62623fcdfdd4a54b19ee6d88f96a682f
 AUX genkernel.bash 2438 BLAKE2B 31f1eaa826ab12bba07a2dc45b3394e14ceba9bc98b3f0ce609ca48a9306f2aec507787d457abdee18f4a83ea868de787cc6f9bd085298c396ecab6da14df9c3 SHA512 2bfe23606f919577bb2d174ffe18cd00fbb4ce642fb8860b319e059745d46ff8459b99374159f78af9f3aebb0a352a74ccd74c3be581980f5e298293b96e983d
 AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc010900692f67171512366e6599f08c5f2093490713aa7715e903b7e06528e3f2c6d8468f506938ed5 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665
 DIST LVM2.2.02.173.tgz 2363504 BLAKE2B a516bc9b68b7b7529f4436d8849ca741eb3ca1b5ac2eb2fb2915507935bdd28b5e234e74c1bce827e5761f57b5936510d08107e0dc1c320190f952c706f128d3 SHA512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e
-DIST LVM2.2.02.185.tgz 2386328 BLAKE2B d2e31de3eedd7518ea2d239cb9b36b38e351d7fc070097a1fc4e7934e3636195da3247fba57d684bb0b31b7f3dbdfe29161bd121b2962b2c35c8c9d7914b4506 SHA512 f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf
 DIST LVM2.2.02.186.tgz 2389759 BLAKE2B e094c0135d455386ea5789208899d4dbdd5e78bebf52e49ab5587f881fbc2b94c6accecacf1b4ed182b0c87046402c00a47a1b724795a94fe3ec998b580a77ae SHA512 06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03
 DIST LVM2.2.02.88.tgz 1029151 BLAKE2B e3ce91b6c43155a66b79cf25da3973abb19decde3acc37d28daf80d14b1bd574f7d31fbcee4b397f0a146b2e221599079e521d0ac21932ff58b7c9d4fdf93501 SHA512 5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b
 DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
@@ -14,7 +13,6 @@ DIST busybox-1.20.2.tar.bz2 2186738 BLAKE2B 3efa01ee81a9f3af0ccbcf28b1a24e817a28
 DIST busybox-1.26.0.tar.bz2 2143958 BLAKE2B 3a4a227a4308d9d5e00c00fc5e90ee9a1d6345574bdb571cd8b4adab63dcdad3ff7edf30154bb8f8f31a3a658c85641af0f7875d4d533d56bb7c79f28980ebe6 SHA512 9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
 DIST busybox-1.31.0.tar.bz2 2427873 BLAKE2B 7fff2ac2c39232f9dbd8ea4af55539e9eb7ab2ddabf2f53534f57cabe00a6096643415275dcfa2730f970994282776f9ce661e99e681989449473182ffe820e1 SHA512 cd58f0b2b6e3bb1b771fcf3d15f420518fb9b10086a45cfb1d7f136ac035be89eec28f9350e42b3fc38454d8bef9190eae0376497487c73785e8fde44c793730
-DIST cryptsetup-2.2.0.tar.xz 10763072 BLAKE2B 0ffc228bde15e3427f38402b7411207d1402dcd648903d9c1565689462103c07ab23c4d5c1439674693cf7ed6d14cf62c8a2d19e266da60658c91a37549ba74e SHA512 903ef5811999ce3836bc348334192a432a971f94aa9c850491c8ba856a2c87385f75abc9296b0913ee6785149b8a7bd40457ad07e01f4ac7a1e62e97c7b18e6e
 DIST cryptsetup-2.2.1.tar.xz 10803072 BLAKE2B 00ee2eff11e3054a40a4d9036c1786422288ff4c61ff497cb7039721dde80ca337cab067faa4f70721de3aded465f612e9328a6b533ff7c9b67d1069fe435bed SHA512 e4b45b24ad63cc4c22cb816f04cf4af71431e15134a8208af1a24e64ded54c07aba6c43521c063f03429304e0610b6cce849332564d69a46934fb7bae8e99718
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
 DIST dropbear-2019.78.tar.bz2 2708659 BLAKE2B 212b173cfea8655b43a8d93422dd4d3e0d669a67681cb17d6494b6083e6e4c58d21d52850c0cdf414617ee3dcaa071e376d0b5b156b6856cee2e4fe111550f7d SHA512 f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f
@@ -34,7 +32,7 @@ DIST genkernel-3.5.2.4.tar.xz 318152 BLAKE2B 101bd8011b73699a3d8410fcb93adca2417
 DIST genkernel-3.5.2.5.tar.xz 318652 BLAKE2B 9b0e1b07f61b54edc1d263cc679b36d7e9062fd1e7cf11fc9442cf60b217274bc73425150ca963b6a91cd504d7817a852fa5bf4ad7634ff8d1ec3b43748ded41 SHA512 096aa77f4a52afefcef81ff6c7eb281e539af304854572389e38bbdd735ca723c7a5f2f7163fa9f387e3a2a78a2ba117260f1c8396ed4e51e12a91ad0fb0ff90
 DIST genkernel-3.5.3.2.tar.xz 320644 BLAKE2B 14eaf05aab02287c3dbb98f1a596e73bcbea39ceb2c8e44c5bdbb77b656958cee666f4353a2401bad531c2a7a98ee11b2531b251c19edc86db517cf3cc2869ec SHA512 1bee8ebdb8c2c30e90e0a1c573ad09b0eb79da54f0829859305eb50ffab95e69aa219ce82d4969140dea3d8788d66d3490fc03d38e190b533666e9278c7f96a6
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
-DIST genkernel-4.0.0_beta16.tar.xz 407172 BLAKE2B 917fe2f399e0806473a09f8240af28916b5a039a52c0d9246ecfc0de614ead3bcc917ca5e71313085d64460b9a1974c118ecf974a3a1aa8244ce14e00c1bc832 SHA512 c04483a715eecb3cee38dadf3db275b371c9a85c9808385282a57d47dbbe59c758f85b1a2fc850300941f1e3a6d5e63584b5babc8c07998d263da92eada3d246
+DIST genkernel-4.0.0_beta17.tar.xz 406812 BLAKE2B 3c7238727f496ba5745d5880d81d4e1f6f96f1add7177e7f1d772e055264890ee3579753bb5d26284573fccc66f45baea8cfe222f9beb563c329471a01cd3002 SHA512 e71bfc56c88763e2f06295783a71cce42dd142968cbae406c12c784d1f6e5c8693684de5efc734779c95bace1374cbe9e8eefd218cbcf446d9ad78b0bccf5bea
 DIST gnupg-1.4.11.tar.bz2 3407075 BLAKE2B 85d35d2e4da65d54add1010ea0486b943b328785e28c4efcaa2b65daafd53410a355d1df79ae45c5f7767d2eb7ff1f0b9637f417e65b084d2c760a281abd317a SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae
 DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
@@ -56,10 +54,8 @@ DIST unionfs-fuse-0.24.tar.bz2 30381 BLAKE2B c3886d7b0cbd4ac62712d7d94bf95444812
 DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
 DIST userspace-rcu-0.10.2.tar.bz2 503833 BLAKE2B 17e2102e096903f301d1a08d606cf98e28a413ef26a3dc8fa6f400ba74aa14aabdef5e28d4fed5fb01cee33b0bd5de9fb0682523aaa50c6053fd3471711a02e7 SHA512 47413b4a593d19185ee3d455e5744042c060cb50008dac25e9135c5cd2250ef5129a419258b18c665c8c794ad3b09234fdd70a106c72d8fc64631172b13d0e22
 DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
-DIST xfsprogs-5.1.0.tar.xz 1223736 BLAKE2B bfadb13cf3a4f9231eb13f4e7d3c803c2143abb776c0fee758ea7257097ef3fb79253c16133942041c20ff6078a1704fa18d08866c6a2e1a61b63f4de11d00c7 SHA512 ca5959edb299be8574b2ca51e907a418fab796ae92f588075a2aab0c2a3cf8dae49e2b68679c65c361201223e8f8ac29b1e5618eb1e519496c3aca9218620881
 DIST xfsprogs-5.2.1.tar.xz 1227012 BLAKE2B af6c25d88d0a50fc82ecb2d9d00545ffdf906d6e85361360130b5a2b0d362e566c097f15be04a61023bd5c7815b77d0bab6258d8f188c5afe68098c51ae26ee0 SHA512 a2ecd8e2ae8a4e7357b4133beaeffeae4d6c9d0ece9855d9780a84c2d4072e3d4e0b8ffa3baa995862ec38dcbc5dd74205f7f4456676826082c4811867508a43
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
-DIST zstd-1.4.1.tar.gz 1908835 BLAKE2B 564ae54a96804954c25987eb0a744b7197c17555286187f615ce8c1b0a52a0522dc8a9e0c1e4e8b7ddd2ffbf302646b7c119d2b5be4d0867e58d2ee4ff70efa4 SHA512 5bfac959dbbcfaa16fc0b5d3d5028c606e0c56d385581644a7376d6c61f2efc081efa65e7cc3d3e7b4c107646e0b67b3a75f9b3ff392624025d3a0816c45a9f2
 DIST zstd-1.4.2.tar.gz 1909790 BLAKE2B 7b420caf91bd2e9739a26e5ea61c0c5b7d9d6d8e6630612fd66fec24203bc38ae7ab527587318c09997e1e577210b748576d8cb40a0d8dd366fafc306b28c0fa SHA512 5473502093332401c83b02e4ac66b2e05f32f710121d371daf164d8b002be9c06c51578bf9fed0ffb70bb67a0c64457b0e7a02f0d1ba5d36b1f3b6dde93ff907
 EBUILD genkernel-3.4.52.3.ebuild 4504 BLAKE2B c5fa5fb46a9dd8adeb0d6b75ed2ad25ff129702e943c60f0e123371fd4f0e1b43ce2f3ff36136c0ad3cb5cc6194cfbffaf8dd0410983951eb6e9602e84afda76 SHA512 73e7f516abc5b7e5c1617b8e1956bbc2c15bb5e01280ad5ce54a29883f9c8af9024bb0369701c76de56e3139a47913fb4d0d6ccfd9aaa25061613c621a9b353a
 EBUILD genkernel-3.4.52.4-r1.ebuild 4566 BLAKE2B 4726d898e376dbf9dfa625e86f0a35fbbca0d3e46d11912309207855730b58c9a2dd3e8619902dafd1879af2bc980086cfcc9c10ef57991c93ef6e808ae285c5 SHA512 865271386a9530383695ecd28ce49d02fb3205504d4833e6a621dd3215b4cc65388987d1a9d35badf8298fc14e63a1d8b3e4c02cea00a4131dc95b9942fa70c7
@@ -74,6 +70,6 @@ EBUILD genkernel-3.5.2.4.ebuild 4919 BLAKE2B 64b2dcbefae58d8fc4ec5901f00e2858c02
 EBUILD genkernel-3.5.2.5.ebuild 4919 BLAKE2B 64b2dcbefae58d8fc4ec5901f00e2858c02641ef77315b46d092f18df4b8f2c32544a3baf53f36a789eec7d11652155831f3c89efba83156fd4cdff3f11a2ac6 SHA512 f4c5f8362b80c1475e4ae7a870afc2681e00e1eba8dbf3b452c23fd85cd2c9c3f9c9291522782ce6bf34234fb663a81871582afb7d2a6efd752db1f108b287ba
 EBUILD genkernel-3.5.3.2.ebuild 4920 BLAKE2B eab47ca81c1ccab3ff07ec9bc6ac4622a258f68d2d4278fbaa27d2d8e5a636f50ce916773a93f2f1b222476aa1f54cd5544735abd54acbac43bb37f5dccb6397 SHA512 3becb2fc4e9a0c400c19e56eb22e8d9cdb6349c1101ce6435a7273dd4b7e28acbc2d472ca633a70f11dbb8dc9136825fd26b1e9867b741b7be835aec78d909c6
 EBUILD genkernel-3.5.3.3.ebuild 4909 BLAKE2B 0ec28cd64a6f719fc41dc6034e3ff8ccf2b69ac35273222a9649e73d08544c2e87e6d3dc6496346902f04d9fecf2a08673af6baa583225f1452a77235a6f18a3 SHA512 6e76e7c21aad6870c9da0f293b4e29dafffcf66e3dcd030f9b2d21c9053aa6f51068d27e9a8771f2fe22363ffdb6dc420b60d2b1cd6bbd927bc9e89f51d3277a
-EBUILD genkernel-4.0.0_beta16.ebuild 9708 BLAKE2B aa901db13ef4d1ce11fdbd3eac108439acac14cb42a230751077ab8e0140c964a65db91af1438b2346f2bb5a8d42d2fc2bfd3a86d8d78d5a7ac5a5db988764e6 SHA512 e7144b3760379f25d6da50b0ccf18bd01ddc9bdda6d68016a2f5aae1ebce118862d674a597af83dc539c6b9455a920ac35f80061df8b994aeac289c3846124db
+EBUILD genkernel-4.0.0_beta17.ebuild 9708 BLAKE2B 8687d23d3a1ebe1a642c9cbcbfb556117e494b8b53f2139a5e48421e3984a1d32d76e49ba5ed01a28d128f8f1a9a64d1a889de355ecfaa72282c9e43272be7bb SHA512 9e27d47c3e2c594cd89c7f6590f133536fa650c265c11ec079a8d309259c3ab1d00db52b2921e16ddc735af9bb72bd5267d78dd5b78cd84ea2b0dfbf46e6dc19
 EBUILD genkernel-9999.ebuild 9708 BLAKE2B 8687d23d3a1ebe1a642c9cbcbfb556117e494b8b53f2139a5e48421e3984a1d32d76e49ba5ed01a28d128f8f1a9a64d1a889de355ecfaa72282c9e43272be7bb SHA512 9e27d47c3e2c594cd89c7f6590f133536fa650c265c11ec079a8d309259c3ab1d00db52b2921e16ddc735af9bb72bd5267d78dd5b78cd84ea2b0dfbf46e6dc19
 MISC metadata.xml 637 BLAKE2B 8498132ea1773f537d7f463fb420e9b7c80f24e6a8e3eefbb88bc942707d37d3c7a0e8a80cbbace2c8068411d06f8a1923efbc23e80e6fa87fa06766af1a6627 SHA512 10753c6db20c7e5d2c805d309aa69945f66d27287bbb240626baa2179263b5cf0e703c589f1951aecc2ed1e7e8259097434cc4e7f36d9dff8e1c6d8f50b684db
diff --git a/sys-kernel/genkernel/genkernel-4.0.0_beta16.ebuild b/sys-kernel/genkernel/genkernel-4.0.0_beta16.ebuild
deleted file mode 100644
index 493149efc031..000000000000
--- a/sys-kernel/genkernel/genkernel-4.0.0_beta16.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# genkernel-9999        -> latest Git branch "master"
-# genkernel-VERSION     -> normal genkernel release
-
-EAPI="7"
-
-inherit bash-completion-r1 mount-boot
-
-# Whenever you bump a GKPKG, check if you have to move
-# or add new patches!
-VERSION_BOOST="1.70.0"
-VERSION_BTRFS_PROGS="5.2.1"
-VERSION_BUSYBOX="1.31.0"
-VERSION_CRYPTSETUP="2.2.0"
-VERSION_DMRAID="1.0.0.rc16-3"
-VERSION_DROPBEAR="2019.78"
-VERSION_EUDEV="3.2.8"
-VERSION_EXPAT="2.2.7"
-VERSION_E2FSPROGS="1.45.3"
-VERSION_FUSE="2.9.9"
-VERSION_GPG="1.4.23"
-VERSION_ISCSI="2.0.875"
-VERSION_JSON_C="0.13.1"
-VERSION_LIBAIO="0.3.112"
-VERSION_LIBGCRYPT="1.8.5"
-VERSION_LIBGPGERROR="1.36"
-VERSION_LVM="2.02.185"
-VERSION_LZO="2.10"
-VERSION_MDADM="4.1"
-VERSION_MULTIPATH_TOOLS="0.8.0"
-VERSION_POPT="1.16"
-VERSION_STRACE="5.2"
-VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
-VERSION_UNIONFS_FUSE="2.0"
-VERSION_USERSPACE_RCU="0.10.2"
-VERSION_UTIL_LINUX="2.34"
-VERSION_XFSPROGS="5.1.0"
-VERSION_ZLIB="1.2.11"
-VERSION_ZSTD="1.4.1"
-
-RH_HOME="ftp://sourceware.org/pub"
-DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
-BB_HOME="https://busybox.net/downloads"
-
-COMMON_URI="
-	mirror://sourceforge/boost/boost_${VERSION_BOOST//./_}.tar.bz2
-	mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
-	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
-	mirror://kernel/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
-	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
-	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
-	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
-	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
-	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
-	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
-	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
-	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
-	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
-	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
-	mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-	https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${VERSION_MULTIPATH_TOOLS};sf=tgz -> multipath-tools-${VERSION_MULTIPATH_TOOLS}.tar.gz
-	http://ftp.rpm.org/mirror/popt/popt-${VERSION_POPT}.tar.gz
-	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
-	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
-	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-	https://lttng.org/files/urcu/userspace-rcu-${VERSION_USERSPACE_RCU}.tar.bz2
-	mirror://kernel/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
-	mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
-	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
-	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
-"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-	SRC_URI="${COMMON_URI}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		${COMMON_URI}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT=""
-IUSE="ibm +firmware"
-
-# Note:
-# We need sys-devel/* deps like autoconf or automake at _runtime_
-# because genkernel will usually build things like LVM2, cryptsetup,
-# mdadm... during initramfs generation which will require these
-# things.
-DEPEND=""
-RDEPEND="${DEPEND}
-	app-arch/cpio
-	>=app-misc/pax-utils-1.2.2
-	app-portage/elt-patches
-	sys-apps/sandbox
-	sys-devel/autoconf
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool
-	virtual/pkgconfig
-	firmware? ( sys-kernel/linux-firmware )
-	!<sys-apps/openrc-0.9.9"
-
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND} app-text/asciidoc"
-fi
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		local gk_src_file
-		for gk_src_file in ${A} ; do
-			if [[ ${gk_src_file} == genkernel-* ]] ; then
-				unpack "${gk_src_file}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999* ]] ; then
-		einfo "Updating version tag"
-		GK_V="$(git describe --tags | sed 's:^v::')-git"
-		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
-		einfo "Producing ChangeLog from Git history..."
-		pushd "${S}/.git" >/dev/null || die
-		git log > "${S}"/ChangeLog || die
-		popd >/dev/null || die
-	fi
-
-	# Update software.sh
-	sed -i \
-		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
-		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
-		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
-		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
-		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
-		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
-		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
-		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
-		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
-		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
-		-e "s:VERSION_GPG:${VERSION_GPG}:"\
-		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
-		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
-		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
-		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
-		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
-		-e "s:VERSION_LVM:${VERSION_LVM}:"\
-		-e "s:VERSION_LZO:${VERSION_LZO}:"\
-		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
-		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
-		-e "s:VERSION_POPT:${VERSION_POPT}:"\
-		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
-		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
-		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
-		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
-		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
-		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
-		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
-		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
-		"${S}"/defaults/software.sh \
-		|| die "Could not adjust versions"
-}
-
-src_compile() {
-	if [[ ${PV} == 9999* ]] ; then
-		emake
-	fi
-}
-
-src_install() {
-	insinto /etc
-	doins "${S}"/genkernel.conf
-
-	doman genkernel.8
-	dodoc AUTHORS ChangeLog README TODO
-	dobin genkernel
-	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
-
-	if use ibm ; then
-		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
-	else
-		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
-	fi
-
-	insinto /usr/share/genkernel
-	doins -r "${S}"/*
-
-	fperms +x /usr/share/genkernel/gen_worker.sh
-
-	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
-	insinto /etc
-	doins "${FILESDIR}"/initramfs.mounts
-
-	pushd "${DISTDIR}" &>/dev/null || die
-	insinto /usr/share/genkernel/distfiles
-	doins ${A/${P}.tar.xz/}
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	# Wiki is out of date
-	#echo
-	#elog 'Documentation is available in the genkernel manual page'
-	#elog 'as well as the following URL:'
-	#echo
-	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	#echo
-
-	local replacing_version
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "${replacing_version}" -lt 4 ; then
-			# This is an upgrade which requires user review
-
-			ewarn ""
-			ewarn "Genkernel v4.x is a new major release which touches"
-			ewarn "nearly everything. Be careful, read updated manpage"
-			ewarn "and pay special attention to program output regarding"
-			ewarn "changed kernel command-line parameters!"
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	mount-boot_mount_boot_partition
-	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
-		ewarn ''
-		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
-		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
-		ewarn '*default* boot entry in your boot manager could still point to last kernel'
-		ewarn 'built with genkernel before that name change, resulting in booting old'
-		ewarn 'kernel when not paying attention on boot.'
-	fi
-	mount-boot_pkg_postinst
-
-	# Show special warning for users depending on remote unlock capabilities
-	local gk_config="${EROOT%/}/etc/genkernel.conf"
-	if [[ -f "${gk_config}" ]] ; then
-		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
-			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
-				ewarn ""
-				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
-				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
-				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
-				ewarn "in genkernel v4+ initramfs!"
-			fi
-		fi
-
-		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
-			elog ""
-			elog "Please remove 'emerge @module-rebuild' from genkernel config"
-			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
-			elog "instead."
-		fi
-	fi
-}
diff --git a/sys-kernel/genkernel/genkernel-4.0.0_beta17.ebuild b/sys-kernel/genkernel/genkernel-4.0.0_beta17.ebuild
new file mode 100644
index 000000000000..c2673d58f516
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.0.0_beta17.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="7"
+
+inherit bash-completion-r1 mount-boot
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BOOST="1.70.0"
+VERSION_BTRFS_PROGS="5.2.1"
+VERSION_BUSYBOX="1.31.0"
+VERSION_CRYPTSETUP="2.2.1"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2019.78"
+VERSION_EUDEV="3.2.8"
+VERSION_EXPAT="2.2.7"
+VERSION_E2FSPROGS="1.45.3"
+VERSION_FUSE="2.9.9"
+VERSION_GPG="1.4.23"
+VERSION_ISCSI="2.0.875"
+VERSION_JSON_C="0.13.1"
+VERSION_LIBAIO="0.3.112"
+VERSION_LIBGCRYPT="1.8.5"
+VERSION_LIBGPGERROR="1.36"
+VERSION_LVM="2.02.186"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.1"
+VERSION_MULTIPATH_TOOLS="0.8.0"
+VERSION_POPT="1.16"
+VERSION_STRACE="5.2"
+VERSION_THIN_PROVISIONING_TOOLS="0.8.5"
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_USERSPACE_RCU="0.10.2"
+VERSION_UTIL_LINUX="2.34"
+VERSION_XFSPROGS="5.2.1"
+VERSION_ZLIB="1.2.11"
+VERSION_ZSTD="1.4.2"
+
+RH_HOME="ftp://sourceware.org/pub"
+DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="https://busybox.net/downloads"
+
+COMMON_URI="
+	mirror://sourceforge/boost/boost_${VERSION_BOOST//./_}.tar.bz2
+	mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://kernel/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${VERSION_MULTIPATH_TOOLS};sf=tgz -> multipath-tools-${VERSION_MULTIPATH_TOOLS}.tar.gz
+	http://ftp.rpm.org/mirror/popt/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://lttng.org/files/urcu/userspace-rcu-${VERSION_USERSPACE_RCU}.tar.bz2
+	mirror://kernel/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+	SRC_URI="${COMMON_URI}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="ibm +firmware"
+
+# Note:
+# We need sys-devel/* deps like autoconf or automake at _runtime_
+# because genkernel will usually build things like LVM2, cryptsetup,
+# mdadm... during initramfs generation which will require these
+# things.
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-arch/cpio
+	>=app-misc/pax-utils-1.2.2
+	app-portage/elt-patches
+	sys-apps/sandbox
+	sys-devel/autoconf
+	sys-devel/autoconf-archive
+	sys-devel/automake
+	sys-devel/libtool
+	virtual/pkgconfig
+	firmware? ( sys-kernel/linux-firmware )
+	!<sys-apps/openrc-0.9.9"
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		local gk_src_file
+		for gk_src_file in ${A} ; do
+			if [[ ${gk_src_file} == genkernel-* ]] ; then
+				unpack "${gk_src_file}"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BOOST:${VERSION_BOOST}:"\
+		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
+		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
+		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
+		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
+		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
+		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
+		-e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\
+		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
+		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
+		-e "s:VERSION_GPG:${VERSION_GPG}:"\
+		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
+		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
+		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
+		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
+		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
+		-e "s:VERSION_LVM:${VERSION_LVM}:"\
+		-e "s:VERSION_LZO:${VERSION_LZO}:"\
+		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
+		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
+		-e "s:VERSION_POPT:${VERSION_POPT}:"\
+		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
+		-e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\
+		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
+		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
+		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
+		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
+		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
+		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]] ; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	fperms +x /usr/share/genkernel/gen_worker.sh
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	pushd "${DISTDIR}" &>/dev/null || die
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	mount-boot_mount_boot_partition
+	if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then
+		ewarn ''
+		ewarn 'Default kernel filename was changed from "kernel-genkernel-<ARCH>-<KV>"'
+		ewarn 'to "vmlinuz-<KV>". Please be aware that due to lexical ordering the'
+		ewarn '*default* boot entry in your boot manager could still point to last kernel'
+		ewarn 'built with genkernel before that name change, resulting in booting old'
+		ewarn 'kernel when not paying attention on boot.'
+	fi
+	mount-boot_pkg_postinst
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT%/}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+
+		if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then
+			elog ""
+			elog "Please remove 'emerge @module-rebuild' from genkernel config"
+			elog "file (${gk_config}) and make use of new MODULEREBUILD option"
+			elog "instead."
+		fi
+	fi
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 9bbde348ce6f..53a814998a7d 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -25,6 +25,9 @@ DIST genpatches-4.14-150.extras.tar.xz 17484 BLAKE2B 58d632aa901a07a4c8172a12bb5
 DIST genpatches-4.14-151.base.tar.xz 3198952 BLAKE2B 6a7515c446c5ffe45243f6e6485005099ed6680f5fca89f4ecd7030fe71b2d4256fc5294ad67b2428afa1d630d87e8f4cfcb894cc4e0a0bee2536ea0bf76e991 SHA512 afb81b9ae38acbda886e473cf4a463e12cf8f06454779423933ec5b56d06ce9038bcf87663aa50ada70477ddcf6dec11bcc86c7a43d0d99db6f8df2d7219b3bb
 DIST genpatches-4.14-151.experimental.tar.xz 5936 BLAKE2B 88b6f1eafb51dd828ed5c7eb784f2791bc8b5a47831df1af9d5df944c47270619a351d55d4785ed2642065fdaab28b9495db789b48ba0324a7ddcb7c51bf6272 SHA512 6d7e8c5b9dc604959eb01ed645294fa90b9fdd1d55a8e5eda6ecebafd959369022f5309467a46ef7c9deb74023cbd7f6742de489bb55a0cd408470825ced0584
 DIST genpatches-4.14-151.extras.tar.xz 17492 BLAKE2B 12e774754f53d925af8510c4e6220911228c0d4180f8ce6c1142d1dd26ac539ce6d2052a113bc6705b704f1bed1535d55350fda0ef7ec73c289fbeb1a5833947 SHA512 4a20ebf320f2651c88b12f1a0e901849a42a331858c7ed903070acfec2008b6c0f675aad260bcd809574c0d277f6630c20f89e935336e61bf91876e1dacc2dd2
+DIST genpatches-4.14-152.base.tar.xz 3208180 BLAKE2B 3b3ddd2982128ef792a52ffd3494886e8915478c3326c1a849ba1d82a2806bb75af293932e8e36ec1949ac5cd4e0d2b29f5ece8f535e4d652a4b11f4101927c0 SHA512 697660cef9ae0b1b6ecfffa66dbfa1649990554d41e98657d881440475a47486df7bca9d2207770cf240caa843f3c3f7fd8f63e109203ec5e7d7cf93d54d41dd
+DIST genpatches-4.14-152.experimental.tar.xz 5928 BLAKE2B 6c8bdc67a25a7f18ea1a656e213e247a6db50ebf0649c7f27cd8e98847e912ac79f05d537a7b1ff3e614e68db29bd255b58a168862874685913894820d83ae9e SHA512 303c59fcfbe01fede4c5f06fe307490db567c8c40b79a2196fd57c637de7def8602b0acb1cb962329258661acf56f9150989fe4d72a194b8223d002fe16580cb
+DIST genpatches-4.14-152.extras.tar.xz 17492 BLAKE2B 1273ecf6f8b53a51350278c90970c8f19f3a4ab33318001f6c4d553c1fdacd0b12bb6e7331b01f4b4e619a8ff8f8ea6a21843061c29608271f79ab3a5550502e SHA512 3a797ef715a1b805b16c9904b4fc639eeff35ce3078c6879e3d2f2872aef0d13a0715a85a4bc03c0ef334eb85ca5c3edf5024bd63811eac3da37a796afb6a1b9
 DIST genpatches-4.19-57.base.tar.xz 1555700 BLAKE2B e1d6d04de6b22dadf737a927883580aff444d18e2b16010ea5b0cc64a7c14f66615f6bbe117edc3b4a09df93e70b2b4bfb2183509bc539922da82de3c59fe508 SHA512 598f7f85cdd5f63e9cdadc2e33ac556e71a0711bfbc518b7f1b0f77f76c65a68c4844a160fe7092f7c2ac3b123c0aeaa147064007fae03ff97b3e1b16ee4a01d
 DIST genpatches-4.19-57.experimental.tar.xz 5808 BLAKE2B 44f72723d72260c39200227610fc4c952bac4e2d767020ad69f8f58bc68e154a30772e612c799aef4f0ca52906cb02a326275dd3d3286c6f0bf846fd3303e2b2 SHA512 94a00f9b6c72486f869245176e311a6fffd6d6b4a0a3b533b19b25d4571f8c149d0ed34a90357cd43135596f9901b25af7bc8cec9f8bb78748a12082a48f79bb
 DIST genpatches-4.19-57.extras.tar.xz 17476 BLAKE2B 6ba89592e66f964600d509d1ed4e01c5e59dbb00df75cc7fbde3d3aa6505e50722c4d4b565df03a595dd4fc55d89ce133421fb7e29816c751559929198d3842d SHA512 5e67c9f60306c915a1645b522039c4f4436073babaaae8029beb53104f407f242d8f6bf539b4c54e2ce9494fb271e5bfa33da1e3992ae6e1ecb2627aaf216cb3
@@ -52,6 +55,9 @@ DIST genpatches-4.19-69.extras.tar.xz 17484 BLAKE2B d5da9682c06aabf5b0c17d01cc0e
 DIST genpatches-4.19-70.base.tar.xz 1855352 BLAKE2B 30ab6b260259ec45c7df9a0d68e4da67f4721bc43a574b40eb32c1f188f18cd948aad6810b8793bdd52f16bfe14fddf5cd815dbf118d09ef246adf059d89e769 SHA512 b3aea0ecf50373eb8609815a173c9a707def2e7a670d9d4a90e1c4152c7619afde609a499ac1a74a62a4c4e32c2d09229deadc179133ec6299af39738f33bbf6
 DIST genpatches-4.19-70.experimental.tar.xz 6432 BLAKE2B df2e99c7d08d3ba33bcc4c491abd8d38286ff22ee464e084bc9dcce15daa6267764b1cf0adb11ec79ff0c5d26af4b292e127e0464a8a464441c26e6a364c54ec SHA512 f6294e2cbe20c616b1e8426ceb05dd80cda6fba13fc5c03717c5677865a8a0bb797d6dc07fd44829f8a8d6f23107ad189161bfb9403c39dcb3ea33eaf4e671db
 DIST genpatches-4.19-70.extras.tar.xz 17480 BLAKE2B 0d7eb535254a4d66696a9fc27622cdfc64e7f3a470b68e907d75fa4ef7335413b324714b03292d559e9dc1b6e4469ebce78147e88fe20a03d3c1c37c6a35fd39 SHA512 483d15bd83fdd7cdcab89c7014cfb85925503c9970e993811c32e395299266e8d2628a39fad4f303cc8926aa67cb2ef63047403bec9dfdc643ef8ba8c5ed5ca0
+DIST genpatches-4.19-71.base.tar.xz 1867536 BLAKE2B 73417de430132a47d5c875da35f97c0c899efcf818a725403d38501af32639389366bb60b5da2b54397c7f8c678c2d123267ec6a6cc9f6a9c2ce3ec084b4180d SHA512 d1abe72536ec9aee59a1f9a1e092b659e072fe34c494d571895f70888207f83c9d5b402a00bb41b33704b1cf1372d8dbd8bf4d8cf670cc26ef36166edd68b29d
+DIST genpatches-4.19-71.experimental.tar.xz 6432 BLAKE2B b0401d67d6d0e7dcfb1e7858b1146aeded18864017988a6b3411e6bb5f0188807c7667a0ddde7cf86c97189a5057e9bd2238a8e6fad32297ae5dd1bb5540716e SHA512 c0daaac96a5f1db3a3ea9e082879973e8ff623e7b64b2df6b4e8c793c8fb7cc1ec121b70d6444c3558b0eb9b46bc206c6e9ea3288f4cb4f3ea2d15dbf6fcfc40
+DIST genpatches-4.19-71.extras.tar.xz 17488 BLAKE2B 3805d5edb67ebb3719633c4bd64158b0d62ee4daa5dadf2ac7b801b831bbc50fc812867f473f8a40e01abc765ebc60c3b995e28140c0718a5c0acb0df05de70a SHA512 f4de6a541524655ff8e5426aeceebdf06c44adcd0926d764ae6deb1edc725aaa5aeadb3f4ab322b77ca83ab3550e31ec42eb8a29fab5f815235368ddacf707fb
 DIST genpatches-4.4-185.base.tar.xz 2920876 BLAKE2B 7dffd426998699bd64aeea62f0c1bae1c41d39c894182ff667e257d5dbce84a175185f68044f324aca6b0d921933c4270fe5f304e491405182aee0371a5026dc SHA512 7e6d92800e79049851cf9230b323e50fd370f293372f850e6fc7fde850bfd166161dadc98575f6abdb4a06c733b31b68476645a0a6cbcf2321c4a28dde99bd63
 DIST genpatches-4.4-185.experimental.tar.xz 83300 BLAKE2B 2942b87434124f9de90e69c34f5dd67ecfc84fd4b2362e0a9f180d4af77f70ab3a0f35d513eacc7b1080f611b2082feb36637b8bc38870e09f225fee42625a34 SHA512 4e5890679d5a89864d2dfd00c963259a08476b80f57728bfd4060c9057eec6173e5582fccc43cd3213e643f7fef88cb4a59a22ec7bac41652df2121aba6646d8
 DIST genpatches-4.4-185.extras.tar.xz 16464 BLAKE2B 54b3a1a6ee38b7cffc363bbbbb576acf97f3d229b745241758bcb568d18c1b7b5a7640fdd6d30cb951efef72bd7a1bf9a39c834199aaeef2b52ad459a2f6c64e SHA512 e254d39a766212d9b7bcd90945f623ecdfa97ab861d6be728e4afd4d4407fbefca66f1fb129f6af16844ad4fe82539118188f4248f8c1f3ab2b8a89d8fa8a3e3
@@ -73,6 +79,9 @@ DIST genpatches-4.4-191.extras.tar.xz 16464 BLAKE2B 07ecac9a3d9a4f5308ec298b76e1
 DIST genpatches-4.4-192.base.tar.xz 3038556 BLAKE2B 0cdc9e0d9a8d47483fc9858f63375d72017b3b2abb236cc4fc87cd755c371ce9cb6ec12892c16dbd8499eb542fbc7ba919199839d38c2d982c234feef9f42671 SHA512 f0e77e6b0c0b24acbf346a8a7205542d6fa26f5e8573a36e8dd300c7835a7368d9b2eef0837895bdd33319a3d417e7c18d831d8edb4bc989f74e1c61d2703b26
 DIST genpatches-4.4-192.experimental.tar.xz 83312 BLAKE2B c1c7eac0e4df7c1e19386928e47a3d01ac7f45bce8aef07b11d2fa6dc2f18d302d289917d4a22ea60ac90fa7061f8ab7beba78c037c9efb3e9e466fc3671ef9e SHA512 b62073e3b2d8f72988c10d674bd045734bb723cc0bece0f0d2a75121f0a44e0b3bf4b3958e5acb63fec170af6394a252033c7fe5eedd1d239269a1d3082e4066
 DIST genpatches-4.4-192.extras.tar.xz 16464 BLAKE2B c9d565ed84c70cc619ac51b514f25ac441b3f1a43a0c1f69b380a4a7a0833e28767074b55910e02b90675c4ed3d3c9c94d85e28bad044b14b144edc51103d0dd SHA512 9ea0d8167105557cb0a087202a8e2fa71ba2604641b6b2e1af5102ad9ac243c43a288edcb05a3b50675867ec445c464052405bfe8fb4a5e5c2e111b4b6e216bb
+DIST genpatches-4.4-193.base.tar.xz 3042136 BLAKE2B 1cafd1e7ef0823742bd0b44f4b2759f19ca342ec0e54cb85a9e2745ad933e965afed6ec2550b15e4d79a9a7408b7e6f253859e14a5be53cf4d34de6d5a3c9f73 SHA512 12dcbfe67ac2e4f63929074b2477eb64258d177f226e9fd5f19af4941b3378e786a3f75ea7bc6762c5f80550400ead14893398951cc32ff5c5dc86dc9d9af87b
+DIST genpatches-4.4-193.experimental.tar.xz 83312 BLAKE2B 54b6234c14a50765a81a44b8137409285161150c96c6d91fb55b17bc0ff059ee9f474393dfe0ab20e5750aa1bc5745ce6e79d87eb26eaaad314ff7928aa66bc5 SHA512 17888812a1dcce4df01de066701d0d68cb53f457672c44c3287f1ae0d74134656827555466590d7cdacaa5e83077f5fab4bae5e980b01cd34b8b4ece9fe04148
+DIST genpatches-4.4-193.extras.tar.xz 16468 BLAKE2B 38d2b6eaa2ed14170b2ad7ee4d04a2aba9a1e1c6bc554590b3d132b716c50e8d41531d86f560a2d64faa94ff94f05132762c69333cfa5b4a672db6a26caaea9f SHA512 7332596d49ddaf23934cb22557d69cd304baceeb7895459a713edc050e1d9a7790fbf7fbd826c5cda4f6642c2d6cb0bd9f1864910699a8d74267a095417ef44f
 DIST genpatches-4.9-189.base.tar.xz 3186152 BLAKE2B 888bed66a88257d6383cffaea48c3f46b4ab563773d68c16e28b1e1f786f59439251b1f7d638fa74abacabc56a9955102639b69e129a4af5ee5c91e9bc58da8a SHA512 726d1d54a0e2a98e94043185e1051be2b76f94874c191bda742b98519110dd0bbf0821325b21f6af1f0ea1be5aac21409f82a560fc84a309736268d3e5c96977
 DIST genpatches-4.9-189.experimental.tar.xz 106380 BLAKE2B 6d426845614e1fbb33773643711ff9fab2e73a02358d55438926a7bd05f4b7ce8046c115a0c5dc295ce6db18a6eda5b3ff71d0b413408073dfeb427797f070b0 SHA512 6b70e2fa5bf3a313261fcaf4a3037b713015dfb5ba7ad969e6e08a47f41f19df10ed3fd9f791daaf4fe15d0808ed2059c807dcbf1b12d0919fb254c8dab987be
 DIST genpatches-4.9-189.extras.tar.xz 17360 BLAKE2B c84fb1fecabed0d6c8c9e2e387e6cfab58d015e260927e6e9403a6c4088c2774c1e4f7e8b78d319e7147be1056dc273f2ed59905e1d3fed0064a1addc5113402 SHA512 7357730f4176ae49c5e221d1fdaae6529d0a48cd9046dd1954a0e18fc6c583ea3126a7aa7d15936caf19d45edae5baf6a87ffb4b68ebf5b58c6ffd94bd69a810
@@ -94,6 +103,9 @@ DIST genpatches-4.9-195.extras.tar.xz 17356 BLAKE2B 5dd79dea04e8a2f7dbc056afe0d2
 DIST genpatches-4.9-196.base.tar.xz 3348728 BLAKE2B 8e6cfc37473ea6433e7431d4c093e5e75089cb226f694f44bfd1f786cd414a631f19b760ae9d78b37bf4a6f87ef703a04c5820e2fac5bc1665a5abb12f3ef378 SHA512 edcbcde21f8a243bdbb5de1da06bb5858ad8cf13b0ce2ee0d42423f3dab2dfa5f91fae0337548a509068314b370047b96ab650e75df8704309b001cab70b0156
 DIST genpatches-4.9-196.experimental.tar.xz 106420 BLAKE2B 590854c20e8e46899fe308b36e57876415ac2150f5edcfa0a89c7be53070fb1f4f298401384ba415bbfe0c05893210f4147dc69012e19192c9fc57ba3a05c373 SHA512 0ffa36411f4c41811b9c38ade271751f22c4c88ffb5c9c8195587e960b9c21050c562605226b849c8c8b99e03371a6e1711338cc0cf5c170afc7c1dd7c862595
 DIST genpatches-4.9-196.extras.tar.xz 17356 BLAKE2B 981abb4646f29aa76b38cc9edf21152a853ac7c7d445a7af59975fc15c244b1b55d6eee69698100f5f82173176208511b39136d7dc4c1a72460b7ef03c3257d4 SHA512 c971ffa1178ffcbbf1d71a20727ff49cd3111072de0a2a5e9c4c094965ed72be210238b1a8b1c5ac8fade5f25e24030a4543c6ac4a50612c43f8ee08be320d6b
+DIST genpatches-4.9-197.base.tar.xz 3352864 BLAKE2B 19382856363c0509cd9415c8c1563322f6e9586beb5ec9824d6a124f3e3c221e4f59218a25b7579acc6a4893bdc4c0b3bb969789c8aaf37de8ebcda445438c23 SHA512 d88ed242a59ec8519b59464e01fde0a4b7e4100db140d0612bcb1e3f536bd3bdb9cc40565cfecc35c3542694b8aac860535ce83dad88e711e49d4ecc6a4249a4
+DIST genpatches-4.9-197.experimental.tar.xz 106364 BLAKE2B 799b3a3b2e7807a5c39a64cba88db9b521e17593968009757a0394698d16a1bea961b3b7c4cea8a656cceadfaf0c52bc2b28248be9be7b0ee0b5410f8518bf07 SHA512 32cb2d57e834b2f00a7a304471a53c96ea7d6431ca86d237f51074da23d537cb9202aa2e86df4d0b7497c64ed908082748ec42112caa4191814401cc27a5575d
+DIST genpatches-4.9-197.extras.tar.xz 17356 BLAKE2B 6114152c1dcbd2cc3c6660d77a86d8b50b18ee548e4696c0829ac1e2f239a65ee2efd2b71f23f86f6ebdb0447bfcd7aa099253fde00879eab35746852058d292 SHA512 78cd6191081a163bf911ef726b0310146ab25eafa71e871ab932ca3dbb202dc3725649d93ccd98e1f1b0faec1ce04b2075452edcfc47c4a994df4d88c54e1d3b
 DIST genpatches-5.2-10.base.tar.xz 368492 BLAKE2B bce92540f9a84d4955b12a9a05b97614da1bd0d84cb705cbd258b33bcaecfa97394dcab04391e1b8b6e85437d9dcbe8fa7ed40c8f348e6eda4874a3c4be223b7 SHA512 eeed6e5a72a73cdaf0e557454c5f6cf5c1c5083ed8f9180b105e31f2cd9efc56e8381920d68e9e92bbea597945d10d37cbe9c799d3a13f759445caad64f0ba18
 DIST genpatches-5.2-10.experimental.tar.xz 5392 BLAKE2B 8cbde09ae8b161b5ca3901625df9708709d682ab323d55fcad2be482512dab102836b1e015bc03810052383203260c5eb0e4b7daced375ac8017a242e04174f5 SHA512 02d31ee46686ff8acf97b60814bc4f2c972223477197b9da86e40e3000d0b435668ae7f4810adde4349896b77e8e3343b0532a61dca97af13f4430e35d877f4d
 DIST genpatches-5.2-10.extras.tar.xz 1720 BLAKE2B 59b259581f7f75f04077f09a6a089b00663be2a0d39731d485d5fd5e28d9a2bdaf89d74f9d555c899615b5911d3b0e270aa0ae03150da66f73063acdf2e69973 SHA512 e8dd3eb262108059d15cd590869dfbe9d0c70728bb2b6b658872f8b705c15c6d7f6fbdeab6c0bdb2e34a9d2312df3570a5724937282cc12c42f435095b6b1b96
@@ -106,6 +118,9 @@ DIST genpatches-5.2-12.extras.tar.xz 1720 BLAKE2B 63af9caef4e48fdf228337f76fa5ec
 DIST genpatches-5.2-13.base.tar.xz 491768 BLAKE2B 4fab32935e7ec534662f33ddd8cf01a55e92ed19f11b50ab3d7e7e421e579828401a4535c0cf706778c01a87e53bb874e840935177b73723ec2efad6d0ce3210 SHA512 260d4e09527975573c31aeb7d0338f0909d5c052100ab755aa3094c4a8c2e2a1eb0cbcba6c42cb183d7601883ced95c4431064aa6670169adca6e81358eb9e84
 DIST genpatches-5.2-13.experimental.tar.xz 6144 BLAKE2B 207dbeb745a047832e34908497cf919dbcad48e9a546ae60e07119617a9425f54f5380b3f090dc49a4686d9a5407908c8db3fa4b9cdc2d1dd1db7b839997d89b SHA512 27e7bebd2f6159ec7424076f4bae0e9cebc8d630caf680ccd0dff31e4f45b5542dc9e8f44649d6289eff59ff68192614d8d12ea6ac3e002f5c8a420b60641917
 DIST genpatches-5.2-13.extras.tar.xz 1724 BLAKE2B ca8e21259048f32db03073094e8caa6477fa238bf97f6dfa4c151cd0347267d813313205778f242395a2fd608f9a41154ec81b474f5a95d86f625f27d1d30256 SHA512 db9ffacfed65ef2b439a82cec274541435b47cdfc2639c4dfeae9cd96028c4a9bc806266301e5389a41eee247c1d7505e07414cce4009076549c5a2e2cad872e
+DIST genpatches-5.2-14.base.tar.xz 517244 BLAKE2B b2601a8ad8d035142881cdd1dcb5c07ffe96d861fcce8b11ff4520468919767c3df2b3b943f99bea160e9d43370f76aec7be8f3ea0cc7942f11b288e671836bf SHA512 c5e4751fe7f8f239ec1087a8986ae12377d041f82bbfd2299df88835288ca063a618155a84516942f99c9d3148b4abb363f7fab8cc8e4eb6c01ab5a8a0d6f794
+DIST genpatches-5.2-14.experimental.tar.xz 6148 BLAKE2B 05017cfdda21711a13a12c2cf31afb8780a005c8fcef63b9a8a665b09bd10d649c72c1c2e85e193b747033eb739d3734400c8c32bfcd3bbc1b85bbc7aff81fad SHA512 86f298e3ff0782e651e24853d73fa5cc686c8f978645233127cf3c35f603f0c46d34d75f0b8fb145a094d74192c36b3032c38ba36a74f358e971593a5d7320d6
+DIST genpatches-5.2-14.extras.tar.xz 1724 BLAKE2B bdf4f9b0c6ec641ee1dc5daa3552022bac3ad22d6def9604013b3d8ee0475f9bc3c823a5c5135c0031410281f13d6657f1dd9239bdd3b7433d6960334eb55d5e SHA512 282e43f0873af088574ffbdd3538e4ea9e82902b73d4ff565b32c5814b0c2a441e7095213db12df5512e5a42785b03d5bca0b02391c0a3bd738f8d9481f69cb7
 DIST genpatches-5.2-6.base.tar.xz 265524 BLAKE2B dce32f49af02d34432c43063e197b8fdc9d2436ff9ef947f6a5c807a719d63777a2c394b7582cd74e4a9cac12d7e993c2753fa42a698f6a11cd13be39f0eef04 SHA512 2dae1e73eb28020886af2921bc8f34519a92b1e6d7cdee9517e38078cdcb84afda08eeda7154e4513c35d83def74170c89c0ed76b116d6b3eb3d8749ea7a461a
 DIST genpatches-5.2-6.experimental.tar.xz 5388 BLAKE2B 6f95c1d6213b8975ba7bf63a90299426c96d85b6ba3b5d87804fc5561aad0f91c2623a825c73fffab2426a70ebedb53f292c4fc6645ba05af0d4673074023985 SHA512 c728b030fc9b204d7d4e4d2c7ff19661095b62a16e0d2e3d8ccbc281e23b514ff32d21313e92ddf8e681ee5526982227711d606b7f730831e50dfce807217738
 DIST genpatches-5.2-6.extras.tar.xz 1724 BLAKE2B 1512792ee07dd6e623d19650024254fe5bd93726b2198fe99f8fa3d8b27c4dc465114ed75d0c0f4bbe082a70fe8bf0af47735d065f6ba4d24d4884a023866368 SHA512 a6995ab3b3b49603601580628af0d15b80272a7f817368e99d37884b1d175bafd3f59e20b6cafd83baa7d6823618fb82b31c6119d6710d4819e88760223e7987
@@ -127,37 +142,42 @@ EBUILD gentoo-sources-4.14.132.ebuild 731 BLAKE2B 8fe04d070ddf17bdb1e090f742aced
 EBUILD gentoo-sources-4.14.135.ebuild 740 BLAKE2B 233c807856dab2b507bc4a955306329373b1416833fd47fc9078e54cb2a6b2f61f62c700f6f337ccfd93e236d85a25bfa87a89aea3305be2b928d3d4ed2825fa SHA512 dce6f0be7399475401b8593ae5e8a44022a74006e65413678ca9e6ed330a561899912046f9060f12ccd3e0c2f7c3fe9bcf94ad02760f51e8e2112094fed09d51
 EBUILD gentoo-sources-4.14.136.ebuild 740 BLAKE2B 6e40d8da72c6419bbaaf15885493f937a35dda9c5dba67585255b9f6df07c04505f4d629b869c385dff796f6261ef2cf144c01397d4adab0920a9a62cfee59d4 SHA512 e35c5fc786a779573e85593cce8bd6e16ca12952a6f22f8c3cdbe43c972aa806948baaf74aa0666e50c618306390e5b1adca98815e2056de9345d900c3a75faa
 EBUILD gentoo-sources-4.14.137.ebuild 740 BLAKE2B 8f1b104c14dd1b47fecb1bedeafc81b82fd3e5dc253cfa789dc460f432fcf2c01ce098f481be36a1607ef36c44f52631cf2f2752e77c70fdef16a182cee38f49 SHA512 d352bf64b35467f4dbf903c473fb112dfaca09f6360e87f74fd34708f479c695bb648948e643a382800a80313b453055e60865ddb27ff94bb3ad8b63c454967c
-EBUILD gentoo-sources-4.14.138.ebuild 732 BLAKE2B c24095de934528b760631dafb9ee83849bcb54b26a81b74c2c87735f14e9f50e0984e72010f5749a1740344c71bdad17c4ad60d79bdaf5fa03a9b74129c5efcc SHA512 519fd87f1aa524752fd2b19ac06b3c928ddf538d68685e61c65211f8bc28ad339c06fdeaec609d812ec212a27334999a5a7a3dfbad7d6ea24acd3a02eee939c1
+EBUILD gentoo-sources-4.14.138.ebuild 731 BLAKE2B 719954c7d853c7a6abe45097cc76a8c0e163fd46ede5ffd252b8222b0e26fc9fda25946811347a86c828916f55574d1544789f714ed80357557228f5b2e0644c SHA512 7f4424e9109b4b72d6a86294541e296dae8df1ae467ad1a44ead4ff9967bfacd1a240bb7bbc41d4ffbc3c29becb9a4bd20435c4623100f7a830f43d83a9fe13f
 EBUILD gentoo-sources-4.14.139.ebuild 740 BLAKE2B 0352eb7caf6e99e001c7c28252995fea61c2d98be3ecae8e4951227fc8b3f78eba1597a3aa77c2d7c76401b4148b948ed773c245d415ced58883b609d470729c SHA512 824b08aef9fab60debd26c71ea766eec9623a994d0fdaf19d3e27dcd99c83bb759e15d4fa87bdf271fe6fb147dfa9de73920e3bdd60ae4b38a33e156cdbfd09c
 EBUILD gentoo-sources-4.14.140.ebuild 740 BLAKE2B 4e548d6e2afd65a0efe1d4d81495c1ad642c5989ea0bad4372f98a8fd826c1c34acc7549b86be5ab36b4f9861ccfff673dd26cec6f015fe4551cd218178fc9a4 SHA512 38643a00c5bd48e4ed2b53a88ca3db4a79a996ec74b60f562b9fd17b25a61d784a66e8fabc4448074492eb445447342563b57766dea4c82fe27c52d4e43c3607
 EBUILD gentoo-sources-4.14.141.ebuild 740 BLAKE2B cff84dc9338e8557e7d6ab0c2b7f36dbd6d454acf6883889966fd1affd8c845803e7c043ad4867e605a8393a83f97ab7e9c94395ea57246f926904163ba82d94 SHA512 9691808072525b2cd8718e7c85ea9f8303955e7a726a874022e1c7b75f0cf1338abb998e6ee5a82b5d1947e333caffb62f1c00291007b318de65a2677cb38ebf
 EBUILD gentoo-sources-4.14.142.ebuild 740 BLAKE2B 4aefbe0be132bd0d265c3b9b932108e8131b6a6e163bebb7c3d03bdda6eff4a65adb163f60b55efbdc668257b95bc82163119df338f7d63e4c41ceebf7a28355 SHA512 7b2be00c1ce6e87ee6dde7fc5019657c756369453b62f1ac1521c3165467db10536ddde3f12e96ee68562b770dc3a559cd62a4c9805db0ffcde7f73b4e5bf1ac
+EBUILD gentoo-sources-4.14.143.ebuild 735 BLAKE2B 17bcccced5d429878c2ecd06cb63838765b8429866ab7021425828371c95b93ea1e3d6ba68cf14b50e56bb29d9163b91595ccfd7fa5d80e22c4b830349f1339d SHA512 5683690b1dd4d1915061855c74692a36d61ff0621b35c9d6e89a89d4258f8dedb0235c6657d111385a1164e139425d8af6f7cb2cafebf521de64f899f8ce02c7
 EBUILD gentoo-sources-4.19.57.ebuild 730 BLAKE2B 8582f73a21682c2ef7507ec3f7e8c4456b5f168a7de9c097ca3e090779c65e86f89d449fc9d824a5d75ffea0a48203beaeeb3705b1bf671da8332abac2d1e00c SHA512 a803e9a5ef868b4a1bc57c12ea7bd7b3b1e1755b9611c9255e56cb26db11d7ce59e992a90b87ce30c666a7bf25dd53061db30971ca5cd089635cfaee3e4761d2
 EBUILD gentoo-sources-4.19.63.ebuild 739 BLAKE2B 07e730493c11c160a3bba22a4da108420bde1f9364db4af3090007307e46a399b91f202b39dbeb62ff45b99ba709d8d6378997d0021478ef26df5d8178bb50bc SHA512 48ec6c18386277aca59f2ee8e440c6a727e0c19e84519d6c6c1c88a5b1fd752b9cc0637373809406cf1d440608075b82e19bc448a8d1ef5fe498a80acc37a52b
 EBUILD gentoo-sources-4.19.64.ebuild 739 BLAKE2B 0df210bbc91e67ad3a8aae219d844b8a9153a3a205a5681b6d89ba1852543f74fc2cf0402b2d1cdb07405bfc399aabfa426203ac4ba73e1546f9946e823e2822 SHA512 1a9264c6c3c5e4ed8018ff2c696d9a9fc837e249e953359ad2783e8677d44a80024c8de826d58836995acb2c3e873973938713d818b55fdedeac29eed8db6841
 EBUILD gentoo-sources-4.19.65.ebuild 739 BLAKE2B 93b8a7ed96e5ed7e19c68df9963c4f090633ed557f36d9724c6cfa71f4861958e0670eb2341884fb740123633607e32a1e1da07a881bdf25e8392424e831e859 SHA512 a4156f4a9c4f6899ac5a876d75057380234d77a0f8ef1d66a49b1773d5b1dfceed47776bcdd8fb9221e7389afcb502ebe52c3df874aef3d3f92de5cfa5c814bc
-EBUILD gentoo-sources-4.19.66.ebuild 731 BLAKE2B 2bbcb81a37608aa822a882612858032761a43b874a53a296a45581771d0ad9fbf07e86e568150e2469c89624c2330b3dc4ae64881387ba63dc92b9ed41daa8ec SHA512 40cd380408ca34946284abe3fa40b649733b8eba5b35e3ebcdeba64f6c4e6859c47c76d23da4a0670fce81d90ed2bce69eb8d776caf637f6036294e72059beb5
+EBUILD gentoo-sources-4.19.66.ebuild 730 BLAKE2B aecb5cc4fced2374456fce4f30ef429dfb7a6d9f7e6a1a25b86fe3b21f370566e003e9beb22ec5d6624405341f65ca7f53f7114f1b83501a9a64127473101a35 SHA512 dc3dcb661c4b2d056188c2e7cd1900371bcdd9ba5a50301f375cf6c5e084b54c7db11ae003d90faba15bd44116f81bddc57ec221a6fa13dd02594cf3b59399c8
 EBUILD gentoo-sources-4.19.67.ebuild 739 BLAKE2B b98b08882b10e87d0e2534fb1dec2ecd07c469e2210ec250fec162a8b4f0797a910fee3e3ee560ad7168806c5e99caa8fd5deef196e786f89fcd9543bee32574 SHA512 c10272a65629f537610a19c5f9c3d73dfa346edf0b36da2c71d8b1a9813ccee03a0049acc50aadebd068ec1d1d86e1be68f52df5e68168521d02019da62f972d
 EBUILD gentoo-sources-4.19.68.ebuild 739 BLAKE2B 18ff93f19e991703dcddbf15311abfb45e371ce26893c492c350669a3c6fc81133f9eacd6dcd6729d3a659da4feb69455c4cdeae1bf89fc30ccf6e109a7d00b7 SHA512 46f7ba43067d6af54892b19e2e641a0a9dab126a8a81657c123e9220e4db06d6c023316671e49a9babf6b7f6b23daa7e7c86d1b794dd1c14e4c876a77e138da6
 EBUILD gentoo-sources-4.19.69.ebuild 739 BLAKE2B bb67f3e3f029c4ebc3b445510ffb19562c3c0ba9dfd5400ee5001900568e46ba5bfcf9042f1d3d8d2b6b7da5cd4a3f98febe27b6603036500dd5e9de75a986eb SHA512 53dbb0b848d5483b737cd13e26182b6856e165dc9ecdf8c39b36297efcbaf8b7b892c93ce6eeb62ff99e478fe0ae57390fb86e1065dd7c05011f93bb82add5df
 EBUILD gentoo-sources-4.19.71.ebuild 739 BLAKE2B 6f8de7326dc5829ebf7f6d25fdfe8ad27765c25a7475570f382e30081dae9b4a8e42e93b15ebc8fb910af75ca15dc207525f31a1643d12f1210564c65ea9a828 SHA512 270d2e6e69b8a4cfd48306b98e7549c43184a033a4eb65b2a71890cc5c1cba21218a3fcf82f6304e1a55b8f387d6178f6ab5ec25c840c83c6ee73cc92bad4d74
+EBUILD gentoo-sources-4.19.72.ebuild 734 BLAKE2B cddfa4e9ee3d7e10a4defd6749902d53c4ec28dfa2dc36e4a9f66f581637ce4c4d8757b73843fdda2d6f84e9bd32c89db2474754f9d16ba708a3b991375b4885 SHA512 9fbf67009091ae2cee46a817dd20c0676d954aa065a9af6805b419a32ce553128175a73574fa0f33829e0a0834646bc966241f96263b04caa71b756abea558bd
 EBUILD gentoo-sources-4.4.184.ebuild 731 BLAKE2B bbd17e5eccbb68f6bf54eccc0c793052782776b06ab3dc665e2af619f231ab140f9599ea7c609b4d2cd0e16da560bd7c188cbd63ed25c604c2ed8fd59ad02e47 SHA512 fa0d0597d96ea09cd2ed07b72823f38ae6c640446355be89a1cd65f72e305a449a965a73eae4c3fd5574e17cf7aa9bff63dd414f10d678fe5f34d51b640195d4
 EBUILD gentoo-sources-4.4.186.ebuild 740 BLAKE2B 4c33f07d0dee69a18cae881da489b6f5c7de477e10909f7c3758ab7a1dbfaa7f97c1af4efbf1b8719d7457fd47ad9e7d22635aa0189727c9d6a5adb04e5e87c6 SHA512 bafae94b0546f7a7fbae18acb762dd488f739bd407f2dab2a8e77b46f96e4a9f49d4c6b099b2f9283ca22e69b17404fa40ac9d21bb6287588f7ca8b73ea9e573
 EBUILD gentoo-sources-4.4.187.ebuild 740 BLAKE2B 4d8447d324124a32b79f415e4d566b570d99218d896d5a6e1c61e736231ce71ba06fa8dd5fec29714cdff335026c536326b78fef1608d26d2dcee86a6341db3e SHA512 c35610d118b4d98fc392987ec6a6dfc2c57db60275d9a3a6d43f948a00b05da2689f49da50d80384fc074f1827579a421088e832955e1a80c4c97efc858ea7bb
 EBUILD gentoo-sources-4.4.188.ebuild 740 BLAKE2B f01fab86fcce2c064ae7216166b219c6d0fe89c1b5aeefcc4e8b93e7e6f4c20e35054ee1d4c81693c5c59a567fef999abe3b6b4fef4e93431163be5d1a35da01 SHA512 f0817251261743e842fb1bb6d72f8c0c4af1085f3c825e4031fc8c9a518e22e6cdb06c43bfd766c01124948724bb2fac3a79b47ec887efab548670e0594d5488
-EBUILD gentoo-sources-4.4.189.ebuild 732 BLAKE2B 468b09a4e24af6b8a92035288995c139ff511cfa09f8af4087aa3570bce95afce3f714fbebd08f1b54f84791997923dc62fa4a376510e592aaa2bf0b3ba2b10e SHA512 10e1a0bbce8d523968d8641e2a69b592a5ca8bc7f5c37636d8ac665c74a6501e0d09daf319f7b6b6ba0fbb188eea09e76fe6e85e21b55475fec75b0224975304
+EBUILD gentoo-sources-4.4.189.ebuild 731 BLAKE2B 1b77008d1a2950e369c9c7f2592f49ca05e12323b0cbc4524cc66a83096bd36a2526e64d2ac51440433f2a00d39da69b48a8856a60c1b31a787bcd1b770fb34d SHA512 4a32a695672e8224dfc40c8290d8bbd3011cab2c4efd0e0e657895b667c0710800a6ce5608b319518fe6f2ff7df8ee3aa4d5c3772fc0ac5e9a42c0b19678199f
 EBUILD gentoo-sources-4.4.190.ebuild 740 BLAKE2B dce8fe1733d4f6d484b22336838fa3873c6ada1facfb9dc28c92aa2fde44de62819c5e1b559f90f1fb2b8ffbc180735a0557d1c3c516c43e326746ae8ab4b244 SHA512 6308a3c6745b031ef0404d24bf1c7a517126b5ecb67c430cbd4e686634da1a5f83455bd1dd53db99fd278f239e1fa1d3d66ae750733facf87a5fa88fb6e7eb4a
 EBUILD gentoo-sources-4.4.191.ebuild 740 BLAKE2B aef3320640f73c0d4c43405edaf9347acfd9f5198f1156ce4fb51bc362d61639690f330c817655a5829aacd10dfcb5a8794c96b82a3e20148884072ce849318b SHA512 d38362aa0dd4f4b08c32252d6cc24f20625ccf8aad08e910baa142970f4c7ceee5012c503b325256fc824fd8dbbbdd848532e625b8e79c9a3e38c551775902df
+EBUILD gentoo-sources-4.4.192.ebuild 735 BLAKE2B 7ba4e64823de3062a91ff55cb0f4967c85e183556b19e6824914857d79ccaa8cdcc91339357bb43cd9319532b0faa2ccec94de6f39dd6e515595f1e66ea7cca1 SHA512 e193626d4b7c2869610ecded6ef87d05e5680d746aa913eb6aaad238fc225ae74b3696dc66189639e4b0cb29ef4e495bb7d7dd5afae054912e4fb276684ac68c
 EBUILD gentoo-sources-4.9.184.ebuild 731 BLAKE2B 9762b8f14a4f1612ea730267322b7f7814b9b5ccd526af4327f2d3b9adeb2653abef0d563b154e7da50bae795af0d9056cebca9cf1da28797400551bd07fb410 SHA512 bde0972c737ba5162bdbbde1799014668e7463ff7566c4ecf8564b32b850bcf2e5f7eb2ec69063a6b1fcb579a50035668a9bc5783b809ca04385f1bb80dce15a
 EBUILD gentoo-sources-4.9.186.ebuild 740 BLAKE2B dce8fe1733d4f6d484b22336838fa3873c6ada1facfb9dc28c92aa2fde44de62819c5e1b559f90f1fb2b8ffbc180735a0557d1c3c516c43e326746ae8ab4b244 SHA512 6308a3c6745b031ef0404d24bf1c7a517126b5ecb67c430cbd4e686634da1a5f83455bd1dd53db99fd278f239e1fa1d3d66ae750733facf87a5fa88fb6e7eb4a
 EBUILD gentoo-sources-4.9.187.ebuild 740 BLAKE2B aef3320640f73c0d4c43405edaf9347acfd9f5198f1156ce4fb51bc362d61639690f330c817655a5829aacd10dfcb5a8794c96b82a3e20148884072ce849318b SHA512 d38362aa0dd4f4b08c32252d6cc24f20625ccf8aad08e910baa142970f4c7ceee5012c503b325256fc824fd8dbbbdd848532e625b8e79c9a3e38c551775902df
 EBUILD gentoo-sources-4.9.188.ebuild 740 BLAKE2B 1924caa40b98f05e5105ac2e9afe5ad9fe4a60b7c0a2297f30f619245fd42093b94920ce5f4f28118a6af106a64ec7ecfa1a39f8c19aa342afcfa132245fb84b SHA512 55e491c26058e9cb447c94e0840cfca2736836b07f133dc9fd40ad31bdc61a257c5d7e37125be21da7e89f58e26fde4956d4459203edeffa61d49ed8f081ee75
-EBUILD gentoo-sources-4.9.189.ebuild 732 BLAKE2B f65e80eb940397695a9c5bac0052dd344d1d354bfd7f8a3ea7ede9467295e420b7563069ba4dd6a37dd86fe8e429e254d66be143c32326773049499937855462 SHA512 e31f06b6be0f67cde6167cb1d37967dd15d05c9e1835594109b69ecfdff7a474af1f41d44e42d0da2e1ff4235e65d16ba0756108bcd054994c1a1d079642f431
+EBUILD gentoo-sources-4.9.189.ebuild 731 BLAKE2B 09d5b89710d6e7f27597e306eb80c51bca6657f77cf37c2fba14994bbde4d60be94fe9a609c46ee9e649f96f78cbc6727db29febe6ab0155a7b8cadde811c43d SHA512 3b30ccec4d8c4d35f3a0c9856032d2dc030d361a62b38294dc17174de836da276c9bbc8eb18e43b51d3e49f13a7c69362bc04fcbc06fa19570e12897b36ee4cb
 EBUILD gentoo-sources-4.9.190.ebuild 740 BLAKE2B 2325cfe04572f00ad4dda808578faf261567125cdd58d8df751b0885dc5bc700fe04004d1e904058ffeed0531752f78a238d7f9a74c794e08c9263af2450dfb9 SHA512 e18b354cf9e066aa1d986dcf537ca48ee1588af7df810a72ca3ce886629488f34f7a7acd89a2739a442c52f9995bcec3bc4c8dbd172a2171e8a34866e7637ae6
 EBUILD gentoo-sources-4.9.191.ebuild 740 BLAKE2B 198557e92ba41f4be9df17bdd658e2ea6491a2dcf7c3c50d64c9c61113776dcb881b252e6dce72383a10c84566b85c673a7b475f013839a07d6bccc052f514e3 SHA512 dba974ebc3cc7afed2b95b11a0acac95f9cb4372bbb979ffe2fdf305b9cc07201b99f4bf265809d9da947260b975fb3500311db50cc8a195cdca90a103a07589
+EBUILD gentoo-sources-4.9.192.ebuild 735 BLAKE2B ce5b0b2de541d82d116555b1c8d7d075d060ad6aa3a002da8868c647e7ec995649385ec5917eb0f6fef2e0bd7df5b633dbbac6f55cf4b2c70e67ee6c465654f9 SHA512 d62bc5650f4cfd138e17ed7479c15b08dda1aec11f7d8b5af514fafc38e415826c1bf887b8f740546fb639662ebdebd0648f6238668af5597b8062b24f89c938
 EBUILD gentoo-sources-5.2.10.ebuild 739 BLAKE2B 5ad7bed7245733db3c6cb9fe2b19ea72443c6b709fc5f59a57089e28b4a5747fa30d93727095d756de20946f473436b322204630f8f40c3402f62840f5aa4f58 SHA512 e484e29f173ec1031cde544d16d061456c1941dc25eb01bf33ab0ffe403dfacf16a8416df156ff2063dd107cf75503459a9c309c9cb677d5cbbddd481a7ab8de
 EBUILD gentoo-sources-5.2.11.ebuild 739 BLAKE2B 77af4185938936243a61c9707c4da428304cb18fa1eaeff9f23b09a9b881656cc123320b18abfcc6c25be29361bac91401c3ea5eb37bd4b5c7763bdf02ed7f8a SHA512 0c609a383805332da69b09056bd50641671c44b498d3e8eae775124f8d089246287d11d6754b1862499a42955ddc6fb3aff88e5ac724fc91bb608e84d2f2760a
 EBUILD gentoo-sources-5.2.13.ebuild 739 BLAKE2B af383526ef73bec89200918ee9e958037822139adba9131e09cdbe34f36b351a25881f05e7c2b73c1fb76dda2bf3bae3d360a81f0f23127eee20c739d0c7c1ef SHA512 5d0e774383cf5446516d3b8b78bc97aa29098562a61710ddbf3db20c6d88c038a9941ab0414477c406a4a1ceb88d4cba5207428cb0abde43c76c0847f535359c
+EBUILD gentoo-sources-5.2.14.ebuild 739 BLAKE2B 4dfd1d50f34ef3e2691d9706c49032688dc434606db61132952d1419c8ca0e014321c3e21551a7ffc5e6e7da9feb486c954c0b1d75c057a8a650289e5c3edfff SHA512 e4c2fd3039633e6b45374c41d0dd075dbeaaf977ee3e3fd5c8bd9393c851caef9b7725a2f8aaf9b9edc0a8a29eeaa40112e27a650109e89c70f61442580c6977
 EBUILD gentoo-sources-5.2.5.ebuild 738 BLAKE2B 3a563b3d46eabac3a4b6fa8cc0cc2e94afef9fa9193a2cf3bc14ae03f12e3ccd36562c73b75248851bdccad2b64ea0e023217b75facb721b0e2b546a1d4f8cc2 SHA512 c6c70da5283e6513f294c99cfa97ae6d69d93596564b82b81ea2bc188030e5c26e729de3b25b7a0cc7e76c7eac69d65a2d6e09f91cf236b1b7e636dd00681655
 EBUILD gentoo-sources-5.2.6.ebuild 738 BLAKE2B c61efe89320428b1f993491fc821976b28930fb076dd20e2959cb26960b43025d5862762c3c9eabbecee8766eeb479a701d962086f5d51c30b03dc40b83a75ea SHA512 de0986e0b957f6ef2f8fe88e784bd05025424b29f696f1916559214599b4d206ded1450278edc97d78bfde09fc500ed599a325f02e20f63d494e3ceb22787d1d
 EBUILD gentoo-sources-5.2.7.ebuild 738 BLAKE2B 22e7f8227add007af0e9108383ef18d15e809711c89e336b1552ed5e17506215499d29a03df774bddc29652b7a73444d41aef87a9de4e2dd7051170f2318b7d9 SHA512 947e1d97d0c3acb066b46252b0e70ef45cf167e0c32f4f610e5d9d895058de75caac0fe43a0bb4f056cf0fc018461b1a03f69fdaba9a1b2c60e88316226eb96c
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.138.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.138.ebuild
index a6a7abbab4c7..44edcf61574b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.138.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.138.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.143.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.143.ebuild
new file mode 100644
index 000000000000..04b65c284e19
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.143.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="152"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.66.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.66.ebuild
index 286d860276df..852bfe4b6268 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.66.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.66.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.72.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.72.ebuild
new file mode 100644
index 000000000000..a1fdcd6a796d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.72.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="71"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.189.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.189.ebuild
index 54a07f4a448e..5740095eb1cb 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.189.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.189.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.192.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.192.ebuild
new file mode 100644
index 000000000000..ef9b521b3d5d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.192.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="193"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.189.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.189.ebuild
index 2163aa25df33..1055355c10fa 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.189.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.189.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.192.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.192.ebuild
new file mode 100644
index 000000000000..d14315138851
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.192.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="197"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.2.14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.2.14.ebuild
new file mode 100644
index 000000000000..03e9eecd323f
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.2.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="14"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 876b539d5571..eada0cd77073 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -6,6 +6,7 @@ DIST patch-5.3-rc4.patch 94800817 BLAKE2B 3998bbc5c0147cb759920052e60b391e53cf73
 DIST patch-5.3-rc5.patch 94949483 BLAKE2B 656d9c20de02f6203ba1d5b011f6cbfdca8a953905880287e1d645da1cb5851fd7422c7f9ed00c6487b03b578fa1ef08f9745771b8436ce06710a54e7e2375e9 SHA512 2736a8228ecda89948ac4df91eb3b930f76da442ae14ff72155048d9db048d7a4a0b3b25a5f83f06cd8d1b87abdd82cce5f3e6d5c575db6d9df72a029c7c3b3b
 DIST patch-5.3-rc6.patch 95212932 BLAKE2B 22bda01b2cb8eff5b57e757c2b53c9be3db5f82458794988449ff45b6ba44f2e9d867f8e214c80ebaa54101caa0ca5a4a96bf1936d84ba8c0e4ebe51b103780f SHA512 47f212970ab571609bc5f51cbd0207be7baa0c5fa9ba47eb348613fbbdaa3f8031f57624e6b05d5873594c82f811eaec4608de44e8ee5ce5df53112f3b192df0
 DIST patch-5.3-rc7.patch 95534361 BLAKE2B 427dd100e4ff4557316c92bae3d59ecd43ea9c37bbbda92fd3c36d106587f5494b9339e2dfd436479d0c43fa13d98aeb17ee62b01fd0c3fdddc3195e24af41ca SHA512 6004b20248c340f7c35d254787e156f5ac6ec072a4a4fea96f6feed76c8f9b5f0cb3f1037c2940288898d8778ec503ed847f8df7e2801db884186e8f624b1835
+DIST patch-5.3-rc8.patch 95585085 BLAKE2B 3b754461e9de91e5ca44172dbfda6e85ef3bd3eff695af46acb9bb6594eca227f1a0dce8a5519d4d2a15fbba237d3548cdacfeb0d4c591869b97377a2beced0f SHA512 470cd87fa770aac56675e2a2f088ee67d38b9efa7a6f2bc1d751774ae5951790ce93aa94c709d68f9e25f2eef8aa2e9f5d0c5666055f196a09e177b746388dbb
 EBUILD git-sources-5.3_rc1.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
 EBUILD git-sources-5.3_rc2.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
 EBUILD git-sources-5.3_rc3.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
@@ -13,4 +14,5 @@ EBUILD git-sources-5.3_rc4.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386e
 EBUILD git-sources-5.3_rc5.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
 EBUILD git-sources-5.3_rc6.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
 EBUILD git-sources-5.3_rc7.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
+EBUILD git-sources-5.3_rc8.ebuild 1175 BLAKE2B 7a09327f6828833a7d7427ed1a786386eac539116fa0ab6db5bec3c09ede64560c22358828972d185fde307fec584b0e13b169b424b9398851f9f9e520622591 SHA512 9f9c58ad3248da75dc0f157ee221294051fc7f55122e8a279c28259b123afc72680ead52d819bb39e70a518c6e51a73868837667c65e76123945891e1e0d104a
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-5.3_rc8.ebuild b/sys-kernel/git-sources/git-sources-5.3_rc8.ebuild
new file mode 100644
index 000000000000..71a45a3201b9
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.3_rc8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.2"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 6b562ddd3019..16891696a675 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,6 +1,8 @@
 DIST linux-firmware-20190603.tar.gz 186855626 BLAKE2B 66e3bf709ae9a3df1ac9b7b9bd4e1fa556b07696896e7db086c7b60887a8e8854638d86ecead091d32b3d9a83adc1ab88e8b2fde730f8f97a3225492c2229512 SHA512 9027ae7f649b7e1ff15177c1edb23def93d8fe90a63a90e72e7ab98414d557c9f4545ced30363c68eb1715cd74d19c0dd9e395e82320427b4aab2432a173e62b
 DIST linux-firmware-20190815.tar.gz 195268794 BLAKE2B bc67b4501e1d0c4375000bbcbae754b072a3769703eb214f85468d910f29becbe79f6989d3bf223ffa259326c964cbf153326b64d7756882165d29b576e13703 SHA512 99bcc1372ed51be1692cbc3c7b7c34940ee2f9b89f611afa5266b2b0825ed602cde27ff383edb776c1239eaf37002cd19be7cbb7cdf81e0721c3167d38018e9a
+DIST linux-firmware-20190904.tar.gz 196829538 BLAKE2B b45b03b26908fab0602ad7e6ff8b5a2028b56a2d4d200de6fda332e9f589e6fa898cfc5eb7a28b585b1eadefb3bc7a06e5e5685928f2a087ddba39b792ff9ca2 SHA512 5469754181b3ddbe7233958d517d845c1220890758769995f90605e2f70cd34ed29d1904e8b0388293515191795deef8be1f457f9cb196c9cf01a65707534aff
 EBUILD linux-firmware-20190603.ebuild 8027 BLAKE2B 55e8f8436056b1db693383dc41c93b10601e000a9865b06823ce0c34743f23573f6fbf2743bc7edb9a53ad2e7f206d9e979c441e09163eb26d21d0d535258b8d SHA512 4c0149cd856aaa704f8c241e4e60cf3bbaf245555f7166bca0b65d04a321da8d891c693f11e434328994b1b893c661f8e952babe083ac92b2b8d71928a37d5b8
 EBUILD linux-firmware-20190815.ebuild 9648 BLAKE2B 70bee7f6ccc9be4dab18bd71aa480da91bfe3fec0614d272b64cf03a6c413a04f6f01c4995e399c8bc97267631326f05a6930d7395e9bf7c62795e09fa8c12d3 SHA512 2ede9aabf11122cdc0912f8ec07a267329177f19f04fe5b7246f7c9c329c0c900b854a70ac742dc841fc4a6c1100c9a645947d338d73abaeb2e50f8cefe99bb3
+EBUILD linux-firmware-20190904.ebuild 9648 BLAKE2B bd55d616f9e6770df5d18eeb148412bb57c8cf9d6484410b6349bd329c26ea932802161b6c24eaf1e9353cbf9ffa2770cd6dce51188276b254d5e768a6bad5ec SHA512 45b22d4c28ad8a7b33ea2ada5ef305eb7f27e982e975d6ebcaba55730242d088f65466029cfcb37fe618fafd9509f5e62c6db02e15b5f3e4c211da18f3f3eae2
 EBUILD linux-firmware-99999999.ebuild 9621 BLAKE2B 1a3ff9ddab3ceee929a91747a1195528405e37eee8a1f9f02a385ab66c5b153c69004dc3d46ca20c0cbeea59006838c50e15b68a63431f9cdafdf721ceba031f SHA512 44e9cef586b7d908ae2c9057827edc25929677fa4d865674524f022dd6b7ea4caad4a9996993deed6629480c89d50e4773596ce2c3e5639a67075ea8adb157d9
 MISC metadata.xml 867 BLAKE2B db510434e654367fb0ae439b1a3ca3fc170f558022f07634a534ea982f2445ff656fa618b9dac5ebb6ac2f64d9ee93dcc59525c1f3d429eda4ebce05a678298c SHA512 5429e7424fac663e3448e80dad98365239b855f09522fe7ea3cd2c731bec37fee29209cc8ead46e73ea03cd85a3e9c8fafe18ddf4a35e5bb55513d63ad5ae7ff
diff --git a/sys-kernel/linux-firmware/linux-firmware-20190904.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190904.ebuild
new file mode 100644
index 000000000000..6cdb10d1681e
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20190904.ebuild
@@ -0,0 +1,354 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit mount-boot savedconfig
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+else
+	GIT_COMMIT="6ddb9d9704e2171d91439c9c42c5965bf3863de8"
+	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
+	redistributable? (
+		linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
+	unknown-license? ( all-rights-reserved )"
+SLOT="0"
+IUSE="initramfs +redistributable savedconfig unknown-license"
+RESTRICT="binchecks strip
+	unknown-license? ( bindist )"
+
+REQUIRED_USE="initramfs? ( redistributable )"
+
+BDEPEND="initramfs? ( app-arch/cpio )"
+
+#add anything else that collides to this
+RDEPEND="!savedconfig? (
+		redistributable? (
+			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+			!media-tv/cx18-firmware
+			!<sys-firmware/ivtv-firmware-20080701-r1
+			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
+			!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
+			!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
+			!net-dialup/ueagle-atm
+			!net-dialup/ueagle4-atm
+			!net-wireless/ar9271-firmware
+			!net-wireless/i2400m-fw
+			!net-wireless/libertas-firmware
+			!sys-firmware/rt61-firmware
+			!net-wireless/rt73-firmware
+			!net-wireless/rt2860-firmware
+			!net-wireless/rt2870-firmware
+			!sys-block/qla-fc-firmware
+			!sys-firmware/amd-ucode
+			!sys-firmware/iwl1000-ucode
+			!sys-firmware/iwl2000-ucode
+			!sys-firmware/iwl2030-ucode
+			!sys-firmware/iwl3945-ucode
+			!sys-firmware/iwl4965-ucode
+			!sys-firmware/iwl5000-ucode
+			!sys-firmware/iwl5150-ucode
+			!sys-firmware/iwl6000-ucode
+			!sys-firmware/iwl6005-ucode
+			!sys-firmware/iwl6030-ucode
+			!sys-firmware/iwl6050-ucode
+			!sys-firmware/iwl3160-ucode
+			!sys-firmware/iwl7260-ucode
+			!sys-firmware/iwl7265-ucode
+			!sys-firmware/iwl3160-7260-bt-ucode
+			!sys-firmware/radeon-ucode
+		)
+		unknown-license? (
+			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+			!sys-firmware/alsa-firmware[alsa_cards_sb16]
+			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		)
+	)"
+
+pkg_pretend() {
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		mv ${PN}-*/ ${P} || die
+	fi
+}
+
+src_prepare() {
+	# source and documentation files, not to be installed
+	local source_files=(
+		README
+		WHENCE
+		"LICEN[CS]E*"
+		"GPL*"
+		configure
+		Makefile
+		check_whence.py
+		atusb/ChangeLog
+		av7110/Boot.S
+		av7110/Makefile
+		carl9170fw/
+		cis/Makefile
+		cis/src/
+		dsp56k/bootstrap.asm
+		dsp56k/concat-bootstrap.pl
+		dsp56k/Makefile
+		"isci/*.[ch]"
+		isci/Makefile
+		isci/README
+		"keyspan_pda/*.S"
+		keyspan_pda/Makefile
+		usbdux/
+	)
+
+	# whitelist of images with a free software license
+	local free_software=(
+		# keyspan_pda (GPL-2+)
+		keyspan_pda/keyspan_pda.fw
+		keyspan_pda/xircom_pgs.fw
+		# dsp56k (GPL-2+)
+		dsp56k/bootstrap.bin
+		# ath9k_htc (BSD GPL-2+ MIT)
+		ath9k_htc/htc_7010-1.4.0.fw
+		ath9k_htc/htc_9271-1.4.0.fw
+		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
+		cis/LA-PCM.cis
+		cis/PCMLM28.cis
+		cis/DP83903.cis
+		cis/NE2K.cis
+		cis/tamarack.cis
+		cis/PE-200.cis
+		cis/PE520.cis
+		cis/3CXEM556.cis
+		cis/3CCFEM556.cis
+		cis/MT5634ZLX.cis
+		cis/RS-COM-2P.cis
+		cis/COMpad2.cis
+		cis/COMpad4.cis
+		# serial_cs (GPL-3)
+		cis/SW_555_SER.cis
+		cis/SW_7xx_SER.cis
+		cis/SW_8xx_SER.cis
+		# dvb-ttpci (GPL-2+)
+		av7110/bootcode.bin
+		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
+		usbdux_firmware.bin
+		usbduxfast_firmware.bin
+		usbduxsigma_firmware.bin
+		# brcmfmac (GPL-2+)
+		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
+		brcm/brcmfmac43340-sdio.meegopad-t08.txt
+		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
+		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
+		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
+		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
+		brcm/brcmfmac43430-sdio.AP6212.txt
+		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+		brcm/brcmfmac43430-sdio.MUR1DX.txt
+		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
+		# isci (GPL-2)
+		isci/isci_firmware.bin
+		# carl9170 (GPL-2+)
+		carl9170-1.fw
+		# atusb (GPL-2+)
+		atusb/atusb-0.2.dfu
+		atusb/atusb-0.3.dfu
+		atusb/rzusb-0.3.bin
+		# mlxsw_spectrum (dual BSD/GPL-2)
+		mellanox/mlxsw_spectrum-13.1420.122.mfa2
+		mellanox/mlxsw_spectrum-13.1530.152.mfa2
+		mellanox/mlxsw_spectrum-13.1620.192.mfa2
+		mellanox/mlxsw_spectrum-13.1702.6.mfa2
+		mellanox/mlxsw_spectrum-13.1703.4.mfa2
+		mellanox/mlxsw_spectrum-13.1910.622.mfa2
+		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
+	)
+
+	# blacklist of images with unknown license
+	local unknown_license=(
+		atmsar11.fw
+		korg/k1212.dsp
+		ess/maestro3_assp_kernel.fw
+		ess/maestro3_assp_minisrc.fw
+		yamaha/ds1_ctrl.fw
+		yamaha/ds1_dsp.fw
+		yamaha/ds1e_ctrl.fw
+		tr_smctr.bin
+		ttusb-budget/dspbootcode.bin
+		emi62/bitstream.fw
+		emi62/loader.fw
+		emi62/midi.fw
+		emi62/spdif.fw
+		ti_3410.fw
+		ti_5052.fw
+		mts_mt9234mu.fw
+		mts_mt9234zba.fw
+		whiteheat.fw
+		whiteheat_loader.fw
+		intelliport2.bin
+		cpia2/stv0672_vp4.bin
+		vicam/firmware.fw
+		edgeport/boot.fw
+		edgeport/boot2.fw
+		edgeport/down.fw
+		edgeport/down2.fw
+		edgeport/down3.bin
+		sb16/mulaw_main.csp
+		sb16/alaw_main.csp
+		sb16/ima_adpcm_init.csp
+		sb16/ima_adpcm_playback.csp
+		sb16/ima_adpcm_capture.csp
+		sun/cassini.bin
+		acenic/tg1.bin
+		acenic/tg2.bin
+		adaptec/starfire_rx.bin
+		adaptec/starfire_tx.bin
+		yam/1200.bin
+		yam/9600.bin
+		3com/3C359.bin
+		ositech/Xilinx7OD.bin
+		qlogic/isp1000.bin
+		myricom/lanai.bin
+		yamaha/yss225_registers.bin
+		lgs8g75.fw
+	)
+
+	default
+
+	# remove sources and documentation (wildcards are expanded)
+	rm -r ${source_files[@]} || die
+	rm -rf .git
+
+	if use !unknown-license; then
+		# remove files in unknown_license
+		rm "${unknown_license[@]}" || die
+	fi
+
+	if use !redistributable; then
+		# remove files _not_ in the free_software or unknown_license lists
+		# everything else is confirmed (or assumed) to be redistributable
+		# based on upstream acceptance policy
+		local IFS=$'\n'
+		find ! -type d -printf "%P\n" \
+			| grep -Fvx -e "${free_software[*]}" -e "${unknown_license[*]}" \
+			| xargs -d '\n' rm || die
+		IFS=$' \t\n'
+	fi
+
+	if use initramfs; then
+		if [[ -d "${S}/amd-ucode" ]]; then
+			local UCODETMP="${T}/ucode_tmp"
+			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
+			mkdir -p "${UCODEDIR}" || die
+			echo 1 > "${UCODETMP}/early_cpio"
+
+			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
+			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
+
+			if [[ ! -s "${amd_ucode_file}" ]]; then
+				die "Sanity check failed: '${amd_ucode_file}' is empty!"
+			fi
+
+			pushd "${UCODETMP}" &>/dev/null || die
+			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
+			popd &>/dev/null || die
+			if [[ ! -s "${S}/amd-uc.img" ]]; then
+				die "Failed to create '${S}/amd-uc.img'!"
+			fi
+		else
+			# If this will ever happen something has changed which
+			# must be reviewed
+			die "'${S}/amd-ucode' not found!"
+		fi
+	fi
+
+	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
+	find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
+
+	if use savedconfig; then
+		restore_config ${PN}.conf
+
+		ebegin "Removing all files not listed in config"
+		find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
+			| grep -Fvx -f <(grep -v '^#' ${PN}.conf \
+				|| die "grep failed, empty config file?") \
+			| xargs -d '\n' --no-run-if-empty rm
+		eend $? || die
+	fi
+
+	# remove empty directories, bug #396073
+	find -type d -empty -delete || die
+}
+
+src_install() {
+	save_config ${PN}.conf
+	rm ${PN}.conf || die
+
+	if use initramfs ; then
+		mkdir "${ED}/boot" || die
+		mv "${S}"/amd-uc.img "${ED}/boot" || die
+	fi
+
+	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
+		eerror "No files to install. Check your USE flag settings"
+		eerror "and the list of files in your saved configuration."
+		die "Refusing to install an empty package"
+	fi
+
+	insinto /lib/firmware/
+	doins -r *
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+
+	# Make sure /boot is available if needed.
+	use initramfs && mount-boot_pkg_preinst
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${ver} -lt 20190514; then
+			elog
+			elog 'Starting with version 20190514, installation of many firmware'
+			elog 'files is controlled by USE flags. Please review your USE flag'
+			elog 'and package.license settings if you are missing some files.'
+			break
+		fi
+	done
+
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postinst
+}
+
+pkg_prerm() {
+	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postrm
+}
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 4801a8218ae3..f86554267429 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -13,14 +13,14 @@ DIST mipsgit-4.17.0-20180705.diff.xz 1008 BLAKE2B 07d316dd9dd0c16033763d066e4d70
 DIST mipsgit-4.18.0-20181112.diff.xz 996 BLAKE2B 4f233173c587bf717229b469a0f25c172a72987bfbd0fc38723ec6483293ae966867274ef1799039fa7c0e2425678df525361e608c6f659edd3c6701406a8603 SHA512 b5abf06bc6d9bb80bd51670885b9639fdd2a489dadbc45b99f221025a2f4bf2e0ec70691c5ee840b1d73d655fad152244b8aa4988eec519389caebff8c93d0d9
 DIST mipsgit-4.4.0-20160123.diff.xz 1908 BLAKE2B a8be92376d1360246359e8d3674fa30727363297d0f3c1f1fa41ad031235fcd59cfca3fa8645d2fd8ab34fcb79b49f622a28eaddd80da76cf23afc05970d7bae SHA512 0086c470064dd4e5c2fefd8161b70200475659fe925e68d374ff139b506147c39163f366be689bbb92a9aaf72e8c58cdaaaff5def6718c5e87ff7e047551a1f8
 DIST mipsgit-4.9.0-20161216.diff.xz 1120 BLAKE2B 1207d943aa39d157cf1ed87918082fe53c26e5342f8249cce1c21b47d38d9a33ec3fb024cb6358cb659e8630e58840d67570be731fb05e9124d86387793e045b SHA512 d1d8d95661d349826e2978d2259df9e30dbd6779a6506fe769dd8e60699e8461920b290a2064a432b8c3bd95888854f4dbcc2ba40929c58f0dd165fcb7894e15
-DIST patch-4.14.135.xz 2774180 BLAKE2B 3afa8750e0d93b06d56c521accdd3cd3173e652650829511ab885aad2ab0f7edb99b1f7cf74c332c6d2cae9018fbd8e7be167f5ff33d303ec5060081a6919298 SHA512 a49e93d5849a603899886fe9a2bf953fe0b84713fd1cbea17de9a595d351b2254f18509775a5b7dad4a591c10b67ba1165da4acd82cd9fcf11ced1f0a579fe7a
+DIST patch-4.14.143.xz 2854228 BLAKE2B 5b5383d9b7fe94bec33d66b4f733fb44657a807eeb63abc79ec19d127c2216543ce75abaedcd9a6ae151288a6be13b6d250d4d40ee329d00bfa4344ece93424a SHA512 ccbeab5d2f7f985067e8d88cf5a42fbc44a2f379914a9f92bcd6a0823d8f501d6de278806128f218d94ba68f296c7c9b7b5c824c8808fbdcabc8697b69178edb
 DIST patch-4.17.19.xz 463572 BLAKE2B 6097f24f8663ade71204d83e4b89bc15f3d0b0f906cb4a0e6a9aa32705fdbd7e8855337acca37697ef93bb3f2c696ce60bab2d4e02f1e20a0113ca02c7df61a7 SHA512 57fab939df862c3807d1ddd6461b19f85b3c0aba83203f327cf174f9d6e33c79e996362cabbb44014e03fe1eb77cf0232944927ae95aa1e51ef43b153d6343ab
 DIST patch-4.18.20.xz 652212 BLAKE2B 7351cd9ee275fe7687e0260262763faa54fdbec9ec2c6cbc2d8169b900227ab82851ed43f3d1052a6e59b547380a19488dec4e8e64ba2985c0a460dad96124ec SHA512 c44403f5fb71a0dcbc8c39037cfc982d73edc2f411ec9cef0eb0220d422ef369b57e849e9047bea1ca734fa4706483e72c0e91a4be0c31e4df45223b388091d4
-DIST patch-4.4.186.xz 2623620 BLAKE2B 0b1569f17c1dc2eac7b83d5a65381f219f594d62a38df3e6b3c011aa81627e38c0080231630f9a288dbf17e6ab0012a74554c16646fb61676e4420a966e4efd8 SHA512 e548d0986a679750446fbbbf86269bc01447a4cccd350890978d56d35b43eaf02c2aad22852fb99e9a04ac7474d873a9d1a931638e52c222a492360562b5bfc1
-DIST patch-4.9.186.xz 2852924 BLAKE2B 4bb1fe840352a3e2ddbd0f6fff4b4c8bbf7b97dbed194b7ca80f6f73687188ac61c2e5a06d1bf3f8b702fb3ad8309a19a05b2c4969d00abeb9e5bc19ff8eda2c SHA512 140d50ab6aa00f17bf4c7818c241fdd46665a82a5f1d50caed61b25d16a13606a3a7419e42a67ed2a8326fdd3f68fafe95330daf8b883e83903df56a5d1c088b
-EBUILD mips-sources-4.14.135.ebuild 13150 BLAKE2B a37b1f923b099f31d59fe7926e40495642266d9c82359e716767d5c8747b8cdc733e3061cb499f5735c1ea1dff08690a456bf847af4d01350c564177cb981ef1 SHA512 7a30811d0a454dd07508442a0f60852e6d9b60c00218c1807d23ee7fc1eeef5d564c5501eec97124f5c53ea5c8addcd13f90d17d3f0eaaa29054fb5410c6710e
+DIST patch-4.4.192.xz 2704412 BLAKE2B 022847be3a4ccdfe48b7e7e30a739646b20147c2b679bed4e83abfb282c028586d7bb07640ea5948f45e23c8d22595c51c43829844d13a166024c5036b09c086 SHA512 ae2b74783ec9dbb7e8d4f7b467ede4e09256dc7dff0a90b966e3739a2b0535964f9527cde162411cc101295a32e53317ef182f752fd2fd4a0bafc2f046ad0266
+DIST patch-4.9.192.xz 2960500 BLAKE2B dc5055b6ed7f8b8111c5341d353ca1cc07558c5f0595d39cc4f395b1c0166d23587c896b439139c641cd31fd486709e38a52ce777345b9f14f30aa011c8db958 SHA512 aeddc83f898c1eb1a3aab3ebee766c7b6b3d5e12833ac7ef30e6547988cabdd8acffc9d6c835ed850db07e452f7a5f45123c678c9e5030c8c7cae734e0bb0b9e
+EBUILD mips-sources-4.14.143.ebuild 13150 BLAKE2B a37b1f923b099f31d59fe7926e40495642266d9c82359e716767d5c8747b8cdc733e3061cb499f5735c1ea1dff08690a456bf847af4d01350c564177cb981ef1 SHA512 7a30811d0a454dd07508442a0f60852e6d9b60c00218c1807d23ee7fc1eeef5d564c5501eec97124f5c53ea5c8addcd13f90d17d3f0eaaa29054fb5410c6710e
 EBUILD mips-sources-4.17.19.ebuild 13153 BLAKE2B 7731959134d8ed3c69ce521be818b74208fbfe8e2df636351bcf167a05e9cdd882aad7fddb59d1f56c79334be721cdd01b353123832d192e726cfdfcd1ce78d7 SHA512 d200632ff5c6b7cec9b72d93ac7ed7f3225f4ec5886543eb62f6416ee4d2678429b0e013f6f7f87c0093ef6e088060523523d7e13db4d99088fb64f67b2cf973
 EBUILD mips-sources-4.18.20.ebuild 13150 BLAKE2B 525002df7b5e36e99157154b8e9070a382f0d7d49d15a658d6e23b8e6417aa690f6dcfec94d76c515a531b2b330b0447105a7b3fecf7dd9cafeace69448e63a7 SHA512 f812dcc5a8869066ffb7bf70c1d15cf232b5cea1ec21aff9f5ce0cefd6c59cc2b4eb0ae455f52b5d3c21250619f5df898f79ba493a166ac6d3a1815dc4e5b066
-EBUILD mips-sources-4.4.186.ebuild 13244 BLAKE2B 6e74f1196f83588ec27ccee72eb1afe1a8056e4e4adecdf3fdf2d0d8b91a09c33cfd1097b524e493b722ff69774f2e7b48ec81f6fd3857a07b945c01cb38cf36 SHA512 aa7cf8489450bfbdb4d76ec60888ca63e96d12e6cadc8d8243f430ff14e6568eb5eb28dd5372f8a5581b1fbd8925d4e5065b8249782a2f6a2373cecbf25827ef
-EBUILD mips-sources-4.9.186.ebuild 13146 BLAKE2B 22d64471acb97b5c18c1074de6423215f9cca88b2515ef3d13f0cc2673ce079d39f0c358945f61ae27152ea401f71659d5e17f12f8010ed5752381d2052ee7cf SHA512 9e13951b8213b983c5d4d8bb0f85fa79ee994948af18f11ae4aaecffe81ff6307825ba06c187fec724cd5464b23c9ae5989dd75617109a26a63cae959586d341
+EBUILD mips-sources-4.4.192.ebuild 13244 BLAKE2B 6e74f1196f83588ec27ccee72eb1afe1a8056e4e4adecdf3fdf2d0d8b91a09c33cfd1097b524e493b722ff69774f2e7b48ec81f6fd3857a07b945c01cb38cf36 SHA512 aa7cf8489450bfbdb4d76ec60888ca63e96d12e6cadc8d8243f430ff14e6568eb5eb28dd5372f8a5581b1fbd8925d4e5065b8249782a2f6a2373cecbf25827ef
+EBUILD mips-sources-4.9.192.ebuild 13146 BLAKE2B 22d64471acb97b5c18c1074de6423215f9cca88b2515ef3d13f0cc2673ce079d39f0c358945f61ae27152ea401f71659d5e17f12f8010ed5752381d2052ee7cf SHA512 9e13951b8213b983c5d4d8bb0f85fa79ee994948af18f11ae4aaecffe81ff6307825ba06c187fec724cd5464b23c9ae5989dd75617109a26a63cae959586d341
 MISC metadata.xml 791 BLAKE2B 8f6a800e1ce23fc8d8fa9a2e93f29c7161c30770ed2ed7345e1175d06a44298c645020317f6e21eac3d798edf4b2a72eaca8ae32207ad62c2e151e9d87c8cd07 SHA512 8a8f75a760d1ca13dc53038271236e16801136db499d52f97cedf0120077d06870750f51440f5cf765bbc8bc1cbc8745b354f467c582e219c58be3e700ee29cf
diff --git a/sys-kernel/mips-sources/mips-sources-4.14.135.ebuild b/sys-kernel/mips-sources/mips-sources-4.14.143.ebuild
index b35a060561ac..b35a060561ac 100644
--- a/sys-kernel/mips-sources/mips-sources-4.14.135.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.14.143.ebuild
diff --git a/sys-kernel/mips-sources/mips-sources-4.4.186.ebuild b/sys-kernel/mips-sources/mips-sources-4.4.192.ebuild
index a06155ed17a5..a06155ed17a5 100644
--- a/sys-kernel/mips-sources/mips-sources-4.4.186.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.4.192.ebuild
diff --git a/sys-kernel/mips-sources/mips-sources-4.9.186.ebuild b/sys-kernel/mips-sources/mips-sources-4.9.192.ebuild
index 6ed3f51e8622..6ed3f51e8622 100644
--- a/sys-kernel/mips-sources/mips-sources-4.9.186.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.9.192.ebuild
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 7ee3498b7742..cfc2da0b9c62 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -12,6 +12,7 @@ DIST pf-sources-5.2_p4.patch 1370761 BLAKE2B 54a489784bdfa42879931eb5f05d4ee91bc
 DIST pf-sources-5.2_p5.patch 1632051 BLAKE2B 71fe6365e1e8fee65480bc3b6081f410516dcd6cecdffe0ad03b95c63b8aa2f59dc7357190aa49d9c10637ef7ae5516588c27140afe594eaa1282f565ea4bf70 SHA512 27eff105625ce917e009d5e29ba991682731bb6b7e77ae16948456b820a78271ca666634ee30ef6ebf7d8d1dd13aa9999dfc68acead55eaecca4081746cbba5f
 DIST pf-sources-5.2_p6.patch 1777289 BLAKE2B 11a913546dcd8a4ad39b4b924aa085bdf0b711cfe8f8697efe3983a09afe4ce377e6ab61730be115617645e0c32be3970b2c4c60de3beb1e2580c560da9561d4 SHA512 5af6631d86c59e076ba9d48bd866b8aaa1903b9d29b4e478ca328cc6352bc0b4f8b0d41f54f750f2ba03bc6a0cf6a9925a795965e051f4ef77fafba2da18bf8d
 DIST pf-sources-5.2_p7.patch 2142830 BLAKE2B 000e4f464b8d81e0ec767b6cfde56f001f51ed39c90d4dcb3c962460bf0fc184334cd631e9c05e26a0e49814665aad88df066f87f04cc3dee3f42a806d405d7d SHA512 2532cf8d6278321a6b757fca4e5405164ff3fe9349059f5f0983bcf302de2ea0a46a4c70c5cc2af185083050cb086a85be5fffb6104fb2df8f396af822dc841b
+DIST pf-sources-5.2_p8.patch 2328455 BLAKE2B 425b0a04800db70b060c8b18ae4f8e99a7af12cf8053604361b34b0c6c759cefcad6d1ba4d241729fbbb12ef5fa4c034d904c14219bd3c7a18dc9e616f148f43 SHA512 4f021b1051391a9a582e86ab898f1fbdf867b8573d6861f25932e5bef2baae4234be5caac93cfc87656bc5c4fc2bf179906b7ce12e0c267245e5efeaa63605bd
 EBUILD pf-sources-5.1_p7.ebuild 1943 BLAKE2B b21d2989f5532ddc528ec7996b1f447fe78e8106fd540816e5e77fac684f044e20dd119ee4e57aec04948662485e4565c23202ea06ee632a1f43ccb336e76f20 SHA512 9e31de214070b8a7e9d4b0358859efe7361bf881c045520cfe1b841efafba5e64c7ddc5d6a3641dfde92b2f37d31ae85f53fa4a3832b77139bda458632c756f8
 EBUILD pf-sources-5.2_p1.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
 EBUILD pf-sources-5.2_p2.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
@@ -20,4 +21,5 @@ EBUILD pf-sources-5.2_p4.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a
 EBUILD pf-sources-5.2_p5.ebuild 2030 BLAKE2B 607fd965a08b6be56cca4e3b7f6e511588117c2aa9e522601a212fce05cef7522f9e3943f8b3f17bda291550908f587c7ef9cfaac619437ea483ee2fc29e6a1d SHA512 fccc06bb103b959768227faeece80b29c81eacb958fb4b1a3d18bf7a3ea825fe8ae9bdd670c72bc4b98747e763946bb3b6f4840098ef02c22c0227ec9e972692
 EBUILD pf-sources-5.2_p6.ebuild 2030 BLAKE2B 607fd965a08b6be56cca4e3b7f6e511588117c2aa9e522601a212fce05cef7522f9e3943f8b3f17bda291550908f587c7ef9cfaac619437ea483ee2fc29e6a1d SHA512 fccc06bb103b959768227faeece80b29c81eacb958fb4b1a3d18bf7a3ea825fe8ae9bdd670c72bc4b98747e763946bb3b6f4840098ef02c22c0227ec9e972692
 EBUILD pf-sources-5.2_p7.ebuild 1999 BLAKE2B 0fd6841de5f35f0a923837f58992e56b37f448b0c8949f5f4d26550ac65f55c240866fb9139ce19cbc9ab1913255ac6d8acaef18f1a16ba7bba9e9b395b9ef8b SHA512 4fb684a031faef367ba4ae5fb95bd6310820dd324087804de4ffd33fde0f0e89774a1e6e2a7f3b833b79bc8079c96c1c3c3929867a0bfcc1e1e44c7497f39108
+EBUILD pf-sources-5.2_p8.ebuild 1999 BLAKE2B 0fd6841de5f35f0a923837f58992e56b37f448b0c8949f5f4d26550ac65f55c240866fb9139ce19cbc9ab1913255ac6d8acaef18f1a16ba7bba9e9b395b9ef8b SHA512 4fb684a031faef367ba4ae5fb95bd6310820dd324087804de4ffd33fde0f0e89774a1e6e2a7f3b833b79bc8079c96c1c3c3929867a0bfcc1e1e44c7497f39108
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.2_p8.ebuild b/sys-kernel/pf-sources/pf-sources-5.2_p8.ebuild
new file mode 100644
index 000000000000..82d79915f607
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.2_p8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+ETYPE="sources"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+
+IUSE=""
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# No reason to bump this number unless something new gets included in genpatches,
+# in that case we can manually remove the linux kernel patches from genpatches.
+K_GENPATCHES_VER="1"
+
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security crew
+K_SECURITY_UNSUPPORTED="1"
+
+K_USEPV="yes"
+
+# We want the very basic patches from gentoo-sources, experimental patch
+# is already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+UNIPATCH_STRICTORDER="yes"
+
+inherit eutils kernel-2
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+
+PF_URI="https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch"
+SRC_URI="
+	${KERNEL_URI}
+	${PF_URI}
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz
+"
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+PATCHES=(
+	"${DISTDIR}/${P}.patch"
+)
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+see: ${HOMEPAGE}."
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	optfeature "Userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index f437be4a6714..c95d26168d18 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -3,20 +3,17 @@ DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
 DIST linux-5.2.tar.xz 107029708 BLAKE2B f0cf6e3a15a4bd019edbfa33cb4556d0672e807f7d139eff3ab053d0ad7649198b229475955a1f51eb90d0e9f8268cafb782f6312793fdf38472f3c6d7c2d7ee SHA512 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c
 DIST patch-3.16.73.xz 2488000 BLAKE2B d60b6db3e5de716031667bf367c278e06a7d3ae6cb045d9558e5b3550a4bc11c478d0daca8b08c901b09ce5d27f49fb27610cd4c0e6694f885c263c9b7ea99bc SHA512 64b07867a0c22f1d122b0cd0e52b2039f7ddea3bc22390ce1b43da7b09c35eb235b6e44d4715746573861fba2df73b52227da885b761b097bcc5cc5c91506054
-DIST patch-4.14.142.xz 2846856 BLAKE2B 8b6d6def9a76a77003b9a38662386c3fd17a335ea21cfe3a18099ce33144009f6b237e5537a01d7f0725e355cd962a7dd994259e562b515cba7cd161c5112d9d SHA512 5b2119eec2f984b9a13b6c2a2ded7e04373ffe32007cae66a619cd72d47b0008e528a21a6d6c0fae825d5867344889ecee1c5f2423a1d8787b38180beb756ff0
-DIST patch-4.19.71.xz 1733204 BLAKE2B 76d07ebae44ca5c4c275df79adb913eb40080eaaf7eef603c6f6be01e7c8c739cd7811f5a865253ba14bffff69b2abe239bd6ba63bd14961901a246197cdb799 SHA512 a600bfb9f45b589ccdba0a99428f55e6c8f235df0b170f0a1d4d30c2decd5e92f423763a3b377837b46504505214e1fd0b47ff2f246b00a677779bbf299eb68e
-DIST patch-4.4.191.xz 2701564 BLAKE2B a7f04f9c0b87010ac8371c1bbbd64cb1c985b43f9e985ae8554c1fa99786b33af1d367026138966d1a5e4dc406600997416776762033dc334036e94e942c04a2 SHA512 e451b0f772d168ff9b09a13392c94d373e9f80c506843afd85983d6fbf8ce44c685b18ead108e47f9022daadba15ae3c5e13b98edf31b7a783d92b048742b32b
-DIST patch-4.9.191.xz 2957556 BLAKE2B a7cf90fa59c338e745bccdecfc9c0066e026587d8b03f3c71cdeffea5a11d5b50d3c02807af58c399ee8aaca06e4806bea2a4680ab9524300968d05248364cc0 SHA512 0b3bedfaa9dd65043b91a56c8ab83790ae9625354a5fa7ac7fcb05eea171a1046778e93b44d05e9e8aa9fac60633777b68ecbd2f9d7894a879af4b08c563d82f
-DIST patch-5.1.21.xz 651764 BLAKE2B cf928fa0453a3460af3a2889596e49383f975d22c9e891be0096c5d37cde2bdf6391301855504f8c2522d3c8a8433f865f80c6937992be67e9bbe296afae8901 SHA512 124bded280ada37ab8af76c11aeb688fcc37f335e2318c5a28ab6bec351e516614540cea0bfa93dfec66c1a74500e39a031deaaf67047b1eca5cbc2cde5f7165
-DIST patch-5.2.13.xz 475676 BLAKE2B 2e0dab5fd6ae481fc4a0476a3ed8af9cc33f7b20d4f9ecb5d510a396125bdad097f686be3f9286f04c9cec084765cd504225c71c9221ddf58d83d7d7b3b34371 SHA512 22e5bc8817eec0649a8d40ad246edff4b4ffda3cde7ff06052714fdf32c59c139fa5e0be0028c6b56ffb85290de43c65b99aed18e559dcfe0a73a209eb70540a
+DIST patch-4.14.143.xz 2854228 BLAKE2B 5b5383d9b7fe94bec33d66b4f733fb44657a807eeb63abc79ec19d127c2216543ce75abaedcd9a6ae151288a6be13b6d250d4d40ee329d00bfa4344ece93424a SHA512 ccbeab5d2f7f985067e8d88cf5a42fbc44a2f379914a9f92bcd6a0823d8f501d6de278806128f218d94ba68f296c7c9b7b5c824c8808fbdcabc8697b69178edb
+DIST patch-4.19.72.xz 1743320 BLAKE2B 95c7f44125d57448daa2fc8793ea23a294a242f509656d1f90c34e5ef3ec344b16d68a88f188954a2478302912a75a79c329be6140191dd08e935e8c089a5411 SHA512 f877d915822fd63f87e9c01e579222ddbde9a4b1598aec2924417990e1d3581f4dfb67e4991ee19487ad1ecbaf98f2329d36edc459ef9a108d8551d101d7f8b7
+DIST patch-4.4.192.xz 2704412 BLAKE2B 022847be3a4ccdfe48b7e7e30a739646b20147c2b679bed4e83abfb282c028586d7bb07640ea5948f45e23c8d22595c51c43829844d13a166024c5036b09c086 SHA512 ae2b74783ec9dbb7e8d4f7b467ede4e09256dc7dff0a90b966e3739a2b0535964f9527cde162411cc101295a32e53317ef182f752fd2fd4a0bafc2f046ad0266
+DIST patch-4.9.192.xz 2960500 BLAKE2B dc5055b6ed7f8b8111c5341d353ca1cc07558c5f0595d39cc4f395b1c0166d23587c896b439139c641cd31fd486709e38a52ce777345b9f14f30aa011c8db958 SHA512 aeddc83f898c1eb1a3aab3ebee766c7b6b3d5e12833ac7ef30e6547988cabdd8acffc9d6c835ed850db07e452f7a5f45123c678c9e5030c8c7cae734e0bb0b9e
+DIST patch-5.2.14.xz 499880 BLAKE2B fb4da87950064d0b91105fe32523f4c25cad5c1e95683a2659233396aa006738a78f5e695fb17289d0cb142f1448cb6eb5ac9dda1c40d8c4b06c8e113f5cb573 SHA512 3a142cf650fa6d201aa6aee97f3e30a0abf6e3a43d68c5cd12afd4c02f4c2b0d798ba84daca707e1079be819e7602404cad5a1671f0e518349c46bc4bb111ab4
 EBUILD vanilla-sources-3.16.73.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.14.142.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.19.71.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.4.191.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-4.9.191.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-5.1.21.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
-EBUILD vanilla-sources-5.2.13.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.14.143.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.19.72.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.4.192.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-4.9.192.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
+EBUILD vanilla-sources-5.2.14.ebuild 423 BLAKE2B d077048db942e6fb09190f65207b4cf348a86c8f62607c34afc82d139c931ff936333472a207e113641d1864bd01993d584374fc0ac4e43af12bb1502da37fdf SHA512 7d2c30380ed82fccad284744dfbed056e80bf050692ec8de8d2eb9ed44d99c2ebb736eaacce12d27d7e986cfc7a0322c4d26252bd300edd22cd3a95790937675
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.142.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.143.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.142.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.143.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.71.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.72.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.71.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.72.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.191.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.192.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.191.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.192.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.191.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.192.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.9.191.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.9.192.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.2.13.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.2.13.ebuild
deleted file mode 100644
index 6f2f5701c4ee..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.2.13.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.1.21.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.2.14.ebuild
index 6f2f5701c4ee..6f2f5701c4ee 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.1.21.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.2.14.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index f64c3ab72aa0..9290e57351b3 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 08e43cad90b0..e5f3e354be54 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,22 +1,18 @@
-AUX 5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch 2336 BLAKE2B 501238f8bb3881b427ff4673933c4544596fcbd3e129876d17b8506498c0513aeec69acd2a38f1d009a7df9f8aecf3e10d88301281722f156a32f76fea131c53 SHA512 7b2b71bb5cb11d6f0d96d0f5f33f2f7da7b4c637e191248c83e27e536d277bb1dee92affa0ca2092c870648525ed7d7b97a29af71aef3631764f724b61118720
 AUX 7.1.0/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch 2583 BLAKE2B be7e9a2cbab8b3bd110346f6c8bda30d104397601950c995b77388fcb91e53ca82f5d3574931c58244403eee698f01209ca9e704fd4c6b9b3ef08e68d41dbea7 SHA512 656a7bbdcf0f678814d0ad0ff56ce43b7fc48c7a549373a4ef77e74490437283c5834e86b1b4e8bcb85578953687d79474ef2bf494c7eed4cf7fa1f17003f385
 AUX 7.1.0/0002-test-Support-using-libtirpc-on-Linux.patch 4161 BLAKE2B 3db2dcebf70ca3e7c399dfb22d8ae50d51863f7a8a15a10b0232f73d4fc2ee0b51ff67e8842b0e4d29dd41e60a326c90670f62a431ca593617f566e03bc7f90a SHA512 2f03f4d0232b600861de0c527d6bef26b0e3273865a7d7344e083a6a7de4033de6d30df3a6b22f4d23be74dfa8864ccaebd42c1f0d4474abc83a66f8997e19fb
-DIST compiler-rt-5.0.2.src.tar.xz 1543256 BLAKE2B 09fa84b8f3e9b8627a14387bc6eaa3d6b4588b9c8f1ac5a0114135fd830e3d45922408b237866789eb81bf38defde1186e0f7430a69f825bee12776b7cd9f74e SHA512 605a6d064877a860d6c9097e0220896dfceafed0a2392ad495c97aa347b97899d89f7e21932e29d3274f396615837414a3e730a915fe4f53eaa858ce3642a666
 DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
 DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
 DIST compiler-rt-8.0.0.src.tar.xz 1903020 BLAKE2B dc42c4772132fee5e225bb94805cd6917214c1d830b8ba4f1c774e6e1726ec7846432d1d6881085676b6d094ec04060ec2a95749eb7d93be79268ee7de1bd828 SHA512 fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913
 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
 DIST compiler-rt-sanitizers-6.0.1-patchset.tar.xz 8820 BLAKE2B d53ca357e060d058c7f20c51e74684f4c032fdf3ccec4c9f227dc7a5757206f331b9eda25a72c5c66faf4c44b2cc63eb439bd21bdd55d37a93918ab428fd7cd4 SHA512 782a34c56134bd061da30c1f598ddb9e90cb34a4e4ef058fa9634f6da372fd8693ff5e6cf98b59700942273240f83052b89ee2736b22f4e19bc8b519fbec8cad
-DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 EBUILD compiler-rt-sanitizers-10.0.0.9999.ebuild 5080 BLAKE2B 867d9b094c28fc7a8955f716e7afd5b9a1fb765b5cf1c24c031058dd758fd66f3d19bb3f5d992ba7cda403730ced01ab72f52a83e20eab652312d366b19a5af7 SHA512 a22c61868254c35249d4c1685677cbc566a9e8b9b64f5b28d912daf742ea35625858e15870de1ad17d876486c45b32dd68889a42443e41c2dc92b6ed3be094ed
-EBUILD compiler-rt-sanitizers-5.0.2.ebuild 5259 BLAKE2B d9fd342c98e1c7a9d124cd3149a4325625c8ab604cc9d3cbb01513b6ae2add2adbf246c616219f2fc0691d90aa26f5371e7cda8a18aec95243bd1d6ba7b25379 SHA512 8f82649dded359a5c6132b0b9cf211faefb3840850d71f43332cb8f1c250c830848aee7c5e7b1be2278f103420683b4e51bf493c563dead5a27781756a0c8015
 EBUILD compiler-rt-sanitizers-6.0.1.ebuild 5453 BLAKE2B b643f95efc78b4aaa3ab4f05072397003d6e46793a763f91eb79f60c183d89e7265a53f6f96401dc87546bba5b8d21dd38dd0b8bceecdb652702685288465916 SHA512 c9b1dee74f1cbe7d6822589372389c2e3e6f3398211e26d83072dab290541797fa08c52c4c6ac581a59dac52fe5893a27812e5e46e175b9146f2c8348f170458
 EBUILD compiler-rt-sanitizers-7.1.0.ebuild 5401 BLAKE2B 7e4069b74c630e33f5f7045764f8ad5f510fd4c03014e6274d8ba4430406d1e507ce9fc9198c64f923a3df15545f143cdeb696c9b2e74b5250c557d5a8be295b SHA512 1853c25f8b8fcd21f7f37044dfd96d6bed076324d067cbb6d14711e6e65ffe7aa7b76a3b6665acf04051ea688a08eca0bd66da47476c1cc3e969cc6ce346f0f5
 EBUILD compiler-rt-sanitizers-8.0.0.ebuild 5137 BLAKE2B f155a3b8d1ea7c1ec3bd598784a0600c7c0050a7e25a17895d919a5d7d0b05b28548e42fce9ee66a7fbb9b328b5cc7f1a998cb110f1e20a1d0b55c564f33d91e SHA512 4ebfa01e7d110bee738b63c7b9129cfaff13aaa90e38f8e08bec256b7fa098eb79f8b92dacd21c0af3b717005207b0eb4c8c4ebec92da805b53c0052759f03e2
-EBUILD compiler-rt-sanitizers-8.0.1.ebuild 5203 BLAKE2B d663a6cb26677be372e91ec3664c5b2a615dc7234170af6d7946bf73c6cab81c5ca691fdafb0108c8d8112f01daae75878ea5d9fc391ae906d401343d4d800d5 SHA512 f1d68014cc59092eefab419c505711fa5207286b44fe1d99e4dbae4b6dcb68d3393ac6f0ce63bae9251ef9ec5dfc10f1d03fc0e9b6fc19ca22c20e820390cddd
+EBUILD compiler-rt-sanitizers-8.0.1.ebuild 5199 BLAKE2B 6025df5f2f6443175dcaf2e5f84467c5e8606449127d3535e86efbdd1c25f3df5b841c1fc9715c07adaff4b97ca31f8663ab377acb622b1843cd8fa017230019 SHA512 592c2dfe5d924b8818a2a849fe4b32912e9bd80852a5d89a394a0b1a6c45b4d842f613ab1ab3dcb36486f3949bf7c99392a65536f90d65981089d9b01129e40f
 EBUILD compiler-rt-sanitizers-9.0.0.9999.ebuild 5105 BLAKE2B aa430a9b40ae689c8fee3d1615d0c34351fdf54b6f49551fb376bb6c7f8dae90321c065ec012c30acc08340e19c97a0657d7340e6423a7333635c1e8f060f71b SHA512 89417db1facedea5758704d344811f9fbdc9cbd0e5d98c0d3782ce4e0bc14c187ce7ee89e1f691a435616fd09a051e577be6175d37aaf0366cda55e28d942d4a
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild
deleted file mode 100644
index 2862cd5c8719..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils flag-o-matic llvm python-any-r1
-
-MY_P=compiler-rt-${PV/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="${PV%_*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+clang test elibc_glibc"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-4 needed for --cmakedir
-DEPEND="
-	>=sys-devel/llvm-4
-	clang? ( sys-devel/clang )
-	test? (
-		!<sys-apps/sandbox-2.13
-		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
-		sys-libs/compiler-rt:${SLOT} )
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/utils/{lit,unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# sys/ustat.h removed in glibc 2.28
-	# https://bugs.gentoo.org/675654
-	eapply "${FILESDIR}"/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch
-
-	if use test; then
-		# remove tests that are broken by new glibc
-		# (disabled in 6.0.0+, r313069)
-		if use elibc_glibc && has_version '>=sys-libs/glibc-2.24'; then
-			rm test/tsan/Linux/user_malloc.cc || die
-		fi
-		# https://bugs.llvm.org/show_bug.cgi?id=36065
-		if use elibc_glibc && has_version '>=sys-libs/glibc-2.25'; then
-			rm test/lsan/TestCases/Linux/use_tls_dynamic.cc || die
-			rm test/msan/dtls_test.c || die
-			rm test/sanitizer_common/TestCases/Posix/sanitizer_set_death_callback_test.cc || die
-		fi
-	fi
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# built-ins installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=ON
-		-DCOMPILER_RT_BUILD_XRAY=ON
-	)
-	if use test; then
-		if has_version '>=sys-devel/llvm-6'; then
-			mycmakeargs+=(
-				-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			)
-		else
-			mycmakeargs+=(
-				-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# disable use of SDK for the system itself
-			-DDARWIN_macosx_CACHED_SYSROOT=/
-		)
-	fi
-
-	cmake-utils_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake-utils_src_make check-all
-}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild
index e293bbe65f60..076fc4939f58 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
 REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
diff --git a/sys-libs/compiler-rt-sanitizers/files/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch b/sys-libs/compiler-rt-sanitizers/files/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch
deleted file mode 100644
index 5a9aa2327b8d..000000000000
--- a/sys-libs/compiler-rt-sanitizers/files/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 2e8240309f5ce36eae8f1f9dfcd8c060c040ca5c Mon Sep 17 00:00:00 2001
-From: Craig Topper <craig.topper@intel.com>
-Date: Thu, 24 May 2018 17:59:47 +0000
-Subject: [PATCH] sanitizer: Use pre-computed size of struct ustat for Linux
-
-<sys/ustat.h> has been removed from glibc 2.28 by:
-
-commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
-Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-Date: Sun Mar 18 11:28:59 2018 +0800
-
-Deprecate ustat syscall interface
-This patch uses pre-computed size of struct ustat for Linux to fix
-
-https://bugs.llvm.org/show_bug.cgi?id=37418
-
-Patch by H.J. Lu.
-
-Differential Revision: https://reviews.llvm.org/D47281
-
-git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@333213 91177308-0d34-0410-b5e6-96231b3b80d8
----
- .../sanitizer_platform_limits_posix.cc            | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 83f4fd22f..804abd9e4 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -159,7 +159,6 @@ typedef struct user_fpregs elf_fpregset_t;
- # include <sys/procfs.h>
- #endif
- #include <sys/user.h>
--#include <sys/ustat.h>
- #include <linux/cyclades.h>
- #include <linux/if_eql.h>
- #include <linux/if_plip.h>
-@@ -252,7 +251,19 @@ namespace __sanitizer {
- #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
- 
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
--  unsigned struct_ustat_sz = sizeof(struct ustat);
-+  // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
-+  // has been removed from glibc 2.28.
-+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-+  || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
-+  || defined(__x86_64__)
-+#define SIZEOF_STRUCT_USTAT 32
-+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
-+  || defined(__powerpc__) || defined(__s390__)
-+#define SIZEOF_STRUCT_USTAT 20
-+#else
-+#error Unknown size of struct ustat
-+#endif
-+  unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
-   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
-   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
- #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
--- 
-2.20.1
-
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 8a6260f90723..741aff16a203 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,13 +1,11 @@
-DIST compiler-rt-5.0.2.src.tar.xz 1543256 BLAKE2B 09fa84b8f3e9b8627a14387bc6eaa3d6b4588b9c8f1ac5a0114135fd830e3d45922408b237866789eb81bf38defde1186e0f7430a69f825bee12776b7cd9f74e SHA512 605a6d064877a860d6c9097e0220896dfceafed0a2392ad495c97aa347b97899d89f7e21932e29d3274f396615837414a3e730a915fe4f53eaa858ce3642a666
 DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
 DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
 DIST compiler-rt-8.0.0.src.tar.xz 1903020 BLAKE2B dc42c4772132fee5e225bb94805cd6917214c1d830b8ba4f1c774e6e1726ec7846432d1d6881085676b6d094ec04060ec2a95749eb7d93be79268ee7de1bd828 SHA512 fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913
 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
 EBUILD compiler-rt-10.0.0.9999.ebuild 2910 BLAKE2B 94a8d936ea0d366cf57f648772e7dc4adeec0c3b50edb3c62043cbfe1ce5c3ddeec28d03afbc036cc1a702767f7d35b2fa7fe8413a5d14bca4c2f553d3be72ac SHA512 1076cea1303646469d9125c8f4fca47e40901f4923792c352e488fb186811fd957fdba4e5c70058e2bc22445e6c8d5953a8ace00e77a61b8969175fa689a0e5e
-EBUILD compiler-rt-5.0.2.ebuild 2840 BLAKE2B 4c6e6ca121bad66f69f272a1ddc8a5153196c8f2608da08b5326e264842fe60ae8a4cb1aa98e2907b141068e5af997fe81ae13708dfd148f8676bebf18b894d2 SHA512 3fcea6a7045c1dc666ad6cd9c575b1ba931719bf31457f7493bb7b9c7950bca8e1c5eb8ce4342c1098250d0c126e85ba86b56724b17a3f6bb43c2846fb765a1f
 EBUILD compiler-rt-6.0.1.ebuild 2911 BLAKE2B 9ee423b460c62366af5525ab3b32cd2980aff78331a65b5658a50e0f808c9cb694d2e5d85bd753d291e1b5f96ab9e6cbc6a6d9f0cddcd9f7f8521ed5280f8291 SHA512 ecce0303d9db8ec0c74b3d0b248547402c32b7bceef52a5bb999f076c8fa82e209d5d113e6c14a1511e99dbf04bfd4d79077da1c010d9069a1bd284a168b26e0
 EBUILD compiler-rt-7.1.0.ebuild 2913 BLAKE2B 86f05a0f2604f7df55ecec3906f380f6838f9deb66f76f952c9dfb89d8b3738aafd7468c1cfc2c6e19e1301fc4dacdb74a4f8436cdf7daf98bebb82ee1284590 SHA512 ddb15119c6dc09816ecf15ca61c548d786c16c8380284323e27a37229dd81808fae98b2451b5bfe98b2f1ce3b0bb620acf792ba1a66e5aa67acb40a33dd64744
 EBUILD compiler-rt-8.0.0.ebuild 2916 BLAKE2B cb63ba2b0e7a3f913fe58f2e53fb5deaa827c0fa7b10a89891a7da7fcf658fb6d9ab0fd50e501d35a788c9f53b3c267c85a03dbbb9722f4a3294aec4a1c0e4b8 SHA512 d11deefc294f5d99e4b92384a154dfebcb9ab5a7549aaefefbe791bf5cc319c1ea547eb076bb416702d8812d967e4721f7d51f18ec9d741a0347cd79b8172ad1
-EBUILD compiler-rt-8.0.1.ebuild 2955 BLAKE2B 702fd03689bf6442de07f5edccccc583cc151158998a0f2b9c627de68d16761dbe4463468f4e74a5ad10772878660a3a62d464a48c83e595f9e43e7bbf26cd02 SHA512 df56a69b5bc0ac31d53bbe9b44f4a7ec59d79d8b573ba0396593fc7e9ac9d8fed5ec599d41bde33adb6584f46c672e9d790bf0f933f7b67f796620d9ff06e7c1
+EBUILD compiler-rt-8.0.1.ebuild 2951 BLAKE2B 9cfc02a33655e435d962e84d81b51690ad473bf50910beea9137a8116fad2d82608c46af093a761a83560c71be7bab83bfd291e7067f124e24175ce36c3a858d SHA512 d38dd53b62515c2a3d19fc9bd6927e71e04adfbdc247b666f9b79ab8a1873d39fbaf4447950f3f265918c6135faee085a2a7151604f9e8f9d8ba08addff6ff43
 EBUILD compiler-rt-9.0.0.9999.ebuild 2935 BLAKE2B cb244d9f5532655ad9da87e22d09d6167dc525698d331e3d0c590170af23b2ccc9027e9d355925bc3492706ddc8b42499d76615e8f96a3f9bed5e6b582fcc226 SHA512 b08ab2c25a1d2b748be508d1b7b98dd571729984b605f26fe32eaff6419f1416dbf3659c93cada597abe323ffc8fc22a06ba97f49f6118758d761d1882194f37
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-5.0.2.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.2.ebuild
deleted file mode 100644
index 8d53cbd955ee..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-5.0.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils flag-o-matic llvm python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="${PV%_*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="+clang test"
-
-CLANG_SLOT=${SLOT%%.*}
-# llvm-4 needed for --cmakedir
-DEPEND="
-	>=sys-devel/llvm-4
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	local nolib_flags=( -nodefaultlibs -lc )
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		# ensure we can use clang before installing compiler-rt
-		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-		strip-unsupported-flags
-	elif ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-	)
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# disable use of SDK for the system itself
-			-DDARWIN_macosx_CACHED_SYSROOT=/
-		)
-	fi
-
-	if use test; then
-		if has_version '>=sys-devel/llvm-6'; then
-			mycmakeargs+=(
-				-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			)
-		else
-			mycmakeargs+=(
-				-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
-			)
-		fi
-
-		mycmakeargs+=(
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake-utils_src_make check-builtins
-}
diff --git a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
index 2df510757e47..809f1f7861c0 100644
--- a/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 505de122a2d4..bd983814d130 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -5,4 +5,4 @@ DIST e2fsprogs-1.45.3.tar.xz 5561452 BLAKE2B ee41f35c3294ccb8dad4274e44d9c07dc94
 EBUILD e2fsprogs-libs-1.44.5.ebuild 2420 BLAKE2B 185bc676e63b1a9d4bbeeab3f93026d90c9f147b55b40161efb57596071e0bb9f6ef2b78a234de7d7006d9a2ac9de83d563a87f4469f8525401eb346bf1dc73e SHA512 1ac2a5bbd640ead26afbb89c5d30ea8e9c07af7754591a1bc5167e016ee0a3b16a3534cdf01a89608204bbec6e1cf556720c050d658cd1d011c5bc6eceeb44c6
 EBUILD e2fsprogs-libs-1.45.2.ebuild 2420 BLAKE2B 81ee3f5d9d59a5add241ca79bfa2a0f9a112c16c4bb0b9970a1ee196540d2d98106c6a0d43bdad610d640407b56b312d0f58a4a6062bd311dedc96b0ecd96fe2 SHA512 be072a3070da4d0017347a9b62e09a2020410b48e29c8c9e680effa4dcd31d5cecc61604402f63dfa55256ace35b9c179fb7b6773ba0eaf8249f0144c0015939
 EBUILD e2fsprogs-libs-1.45.3.ebuild 2433 BLAKE2B 25dcfee95771ef368e6b97fa8376b44dfd17e0761366b89b9a0614e5f9b9297521728b8712f6ed29ce63620092b3320c77d0dc6bebcf0a3d274ae6d17b7c245a SHA512 b5b7b987d17aa61e331cf2b7168dfcb5b7ee995fa89064cebd8ca6b636057cad389d357a78b2bef67851e9a85022e33d5a20b6a7e4eeb20355679b08439ec517
-MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71
+MISC metadata.xml 399 BLAKE2B 7f75ab727887efba1f1991c5944cd262c95b53dbc48a391afdd67cb5c1f99d9c06753b06c7d28c5472075835ff5da4718eb0c3ca5b9e68a4d83173f223162c31 SHA512 45e90f3d9b83bffd42173290d47dce2247a2eff4d6293b7bcbcf422115e11b8c958a7a13f60b7742a96350bd5a2b37d8e76a807776f943c88833b77782d4f180
diff --git a/sys-libs/e2fsprogs-libs/metadata.xml b/sys-libs/e2fsprogs-libs/metadata.xml
index fb37f7ff1115..3455ebb9dca9 100644
--- a/sys-libs/e2fsprogs-libs/metadata.xml
+++ b/sys-libs/e2fsprogs-libs/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <upstream>
+	<remote-id type="cpe">cpe:/a:e2fsprogs_project:e2fsprogs</remote-id>
 	<remote-id type="sourceforge">e2fsprogs</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 0fbdcd9f3264..8ea9a3f62fde 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -28,4 +28,4 @@ EBUILD ldb-1.5.5.ebuild 2671 BLAKE2B fa05fba1b86166a83019bbf6d09595ab6210803d63e
 EBUILD ldb-1.6.3.ebuild 2671 BLAKE2B fa05fba1b86166a83019bbf6d09595ab6210803d63e91718beab283106a0c21c6f9fee6bc399a8bb4ac9c4947c540e3cdfb8ce02a7dfa51e6acfb79c9def65f7 SHA512 9b39921c760d1c73a4fd3aa96fe94765728844b438b0ee9d6c42e87330667eb017f346b57e7679bcdd8daa2c91e0584502922792d45e5e81a547539fd14c0643
 EBUILD ldb-2.0.5.ebuild 2669 BLAKE2B 20600ca8a56727fd4984e107dfb28569dc850c79c0b719ffa95201d8932916c51e44bc5a0fc2084537c1c4ced2ec290c6f9a16a22f2cf8433fa6f82f862ed717 SHA512 7e75e5505fd1193e3b604b5ea52945342c9264a38b8d2b0d27031a6cf4e291c826ca1945e72cbd8bd600eeba8fa49deebc45a413818f0976e219b166506c9645
 EBUILD ldb-2.0.7.ebuild 2669 BLAKE2B c8ed063507dadd7d69098b2f830e46558ab2e527006c0bd6f96fd2ccc9906cc5f8f9a11bc05943ae21de08d37e16e8262729d25119923c98eb09c6b41b0a0bf7 SHA512 3976d24cdcdd1d6159c80d71ec4bddb25fcf20f2ef2ba5d67a17f4748ff147e1a2d09820417947be6cdf514b83b9129fcf2339a7b83aa28c0f8f0d64c3bb1f92
-MISC metadata.xml 445 BLAKE2B 959f0dc450ab8518bcbdbaf2802a3660c180e0eb95028e7b13fb0c0c0b47c8e68a81a1c970ca023ac441a1c43027b4b567c3643519b7c33ac6c0d1e11dcd0ff3 SHA512 b701ef9375735fb561c2e7c46ad13d30b62739fbf780e4343882898ecf13961e4f8381997109290e70a79993692aec2adc602bbc4bb9c881780349bebc75e4e1
+MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/metadata.xml b/sys-libs/ldb/metadata.xml
index db4a710716a7..597078477105 100644
--- a/sys-libs/ldb/metadata.xml
+++ b/sys-libs/ldb/metadata.xml
@@ -5,6 +5,9 @@
 		<email>samba@gentoo.org</email>
 		<name>Samba</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:samba:samba</remote-id>
+	</upstream>
 	<use>
 		<flag name="doc">Builds documentation</flag>
 		<flag name="ldap">Enable LDAP support</flag>
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index a85d52113389..2fd31859b309 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,8 +1,8 @@
 DIST libblockdev-2.20-1.tar.gz 338039 BLAKE2B 77923e52b10e7853ae9433bf811d3a08f1c18da81d4f148b220d7e4101535f245612f0c82c96c6c3bc3e4c0631ada153c59c4587a86efdc5669a0b9f69e764be SHA512 4cb6b18d5de63461f35e0b6f6896599aa41da2c995839c2e88661dacdf07522842b612820fb1d83edbde72092cc62295d5411e8607f52c611db7f02aa16c9ab3
-DIST libblockdev-2.21-1.tar.gz 342121 BLAKE2B a0a1958303d38760a49eb2aca11ee84dfc16ebecac37d0b8322f88e078931737695e4a600efef42511bad4e027799ca38d0e3b42527a0b9189035f7a02a10f35 SHA512 9991e5b776b4fe62b7f703753630e8ec4769c043047452d63de08d93f823b778179e4568b8b78c3963daf6219422afc9eb82bcc5b07b7f0a422162037b569e41
 DIST libblockdev-2.22.tar.gz 854888 BLAKE2B beb1ff0ac122eb12b2066d97c81a8c62a33369aa22a6ae5d141076d52fbd82d17504a97f1a0091773d9a65b25b976edecebe3a76ba91ee8e6032fd034298fa4a SHA512 69bbd5afbd8abb0e22ef72d80375e32db653f21cf3063cf69fff71ad069ee0e6119adf6918a63e7ba9ec4ca02ffe3337be3edeeafdd3e73e4e53d85e90bf2f45
+DIST libblockdev-2.23.tar.gz 856829 BLAKE2B 131bf429e530fc9dd44fade4f5bc937ec220365b1ee2ae46818a6fa3ec7591775fdc3ed531350cc2546f4151e41551dfd3e331b0a6d5777769a7b54c5c15ed42 SHA512 ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3
 EBUILD libblockdev-2.20-r2.ebuild 1993 BLAKE2B 379104c3a7fa7e3d01cb7906ee0928db4cd6c3d03a062c25c25a1c869f18bbd8ba77be3c2ae084a9018b2b42a2a96151bd697453c5d1c6aecebeb56a36b796f2 SHA512 fba4a4dfd56f6708bc08c9f6276353a48e07284ccfe762a15e54ee7984beb74e52561062cd5b7686578d5bfd8bdeefadda35643a33c58aaf155f1a677bb61084
-EBUILD libblockdev-2.21.ebuild 2029 BLAKE2B 52b4450eee896acef06c19b4ce5565739139ded79438b9a3ebbbe4c9e4d6cc37d02410b0d1c39533ff81427479efbdddb97855550a13e5aa8a5437163be3ad8b SHA512 d2b6dd2c454a83be8b2733ee215a24b4d21f200ef4c65aeb7bca293d47b92eb0ca4a69b520b623c1165b18287fefd5d9afdc37bebf75e0b994d91903285df4d8
 EBUILD libblockdev-2.22.ebuild 2498 BLAKE2B 249e31af2e2e8f0d19dc37d3dfd069a32e8bc6ec2d4cc8edae1d232a64c5c844fb5cf97b4e1d648f5b45405e2e0292b2c84ca7dd7fb9542deb0391f3d4a4a982 SHA512 0b54fd3f202027e4c7d95b381ab4503a32cb294a8e3419896621e0c3770b6ed32f7ac87d2aff9c751e3888b9c1ba7885c9275482525ac729345f7eab76f580c2
-EBUILD libblockdev-9999.ebuild 2393 BLAKE2B 168e982cd69a773f96a51b5273c7529a885431b06f3c632d27e1e4858ac8c07ef14860aeff54b7c3d5ed071d3ed1b921c87cdc477383aaa066c0c8397ad14d43 SHA512 0f4cbb4d0fbb2cf2dfd300685fd3ef75ef9fe21981f4cd53a5f9b2b659520c7cb8784bc904cd5fd68d10f7f9fee13506441cd085e11b14c4e6151fc9716b1e4d
+EBUILD libblockdev-2.23.ebuild 2561 BLAKE2B c49bd0fc3cc62435318de85413da603bb7a8e0318c74a83b2efb6aff7ba28ac76b28f5aba616eeb11f0810b91497e3b251fafb5dadecf37001b11ba3e038e1b9 SHA512 a57665c92cb455ad4fd5dac72318fab90e39a12b70a5062b8ff0ba1919a6654e075635357ea8da0899d65458a84216d10ea9914c1bef803fd25ea9aef34697f2
+EBUILD libblockdev-9999.ebuild 2561 BLAKE2B c49bd0fc3cc62435318de85413da603bb7a8e0318c74a83b2efb6aff7ba28ac76b28f5aba616eeb11f0810b91497e3b251fafb5dadecf37001b11ba3e038e1b9 SHA512 a57665c92cb455ad4fd5dac72318fab90e39a12b70a5062b8ff0ba1919a6654e075635357ea8da0899d65458a84216d10ea9914c1bef803fd25ea9aef34697f2
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.21.ebuild b/sys-libs/libblockdev/libblockdev-2.21.ebuild
deleted file mode 100644
index 896f932d1c63..000000000000
--- a/sys-libs/libblockdev/libblockdev-2.21.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit autotools python-single-r1 xdg-utils
-
-MY_PV="${PV}-1"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A library for manipulating block devices"
-HOMEPAGE="https://github.com/storaged-project/libblockdev"
-SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bcache +cryptsetup device-mapper dmraid doc escrow lvm kbd test +tools vdo"
-
-RDEPEND="
-	>=dev-libs/glib-2.42.2
-	dev-libs/libbytesize
-	>=sys-apps/kmod-19
-	>=sys-apps/util-linux-2.27
-	>=sys-block/parted-3.1
-	cryptsetup? (
-		escrow? (
-			>=dev-libs/nss-3.18.0
-			dev-libs/volume_key
-		)
-		>=sys-fs/cryptsetup-1.6.7:=
-	)
-	device-mapper? ( sys-fs/lvm2 )
-	dmraid? (
-		sys-fs/dmraid
-		sys-fs/lvm2
-	)
-	lvm? (
-		sys-fs/lvm2
-		virtual/udev
-	)
-	vdo? ( dev-libs/libyaml )
-	${PYTHON_DEPS}
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	>=dev-libs/gobject-introspection-1.3.0
-	sys-devel/autoconf-archive
-	doc? ( dev-util/gtk-doc )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		escrow? ( cryptsetup )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset #623992
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-btrfs
-		--with-fs
-		--with-part
-		--without-mpath
-		--without-nvdimm
-		$(use_enable test tests)
-		$(use_with bcache)
-		$(use_with cryptsetup crypto)
-		$(use_with device-mapper dm)
-		$(use_with dmraid)
-		$(use_with doc gtk-doc)
-		$(use_with escrow)
-		$(use_with kbd)
-		$(use_with lvm lvm)
-		$(use_with lvm lvm-dbus)
-		$(use_with tools)
-		$(use_with vdo)
-	)
-	if python_is_python3 ; then
-		myeconfargs+=(
-			--without-python2
-			--with-python3
-		)
-	else
-		myeconfargs+=(
-			--with-python2
-			--without-python3
-		)
-	fi
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/sys-libs/libblockdev/libblockdev-2.23.ebuild b/sys-libs/libblockdev/libblockdev-2.23.ebuild
new file mode 100644
index 000000000000..6108db98a24f
--- /dev/null
+++ b/sys-libs/libblockdev/libblockdev-2.23.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit python-single-r1 xdg-utils
+
+DESCRIPTION="A library for manipulating block devices"
+HOMEPAGE="https://github.com/storaged-project/libblockdev"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
+	BDEPEND="
+		sys-devel/autoconf-archive
+		gtk-doc? ( dev-util/gtk-doc )
+	"
+else
+	MY_PV="${PV}-1"
+	#MY_P="${PN}-${MY_PV}"
+	#SRC_URI="https://github.com/storaged-project/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	#S="${WORKDIR}/${MY_P}"
+fi
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo"
+
+RDEPEND="
+	>=dev-libs/glib-2.42.2
+	dev-libs/libbytesize
+	>=sys-apps/kmod-19
+	>=sys-apps/util-linux-2.27
+	>=sys-block/parted-3.1
+	cryptsetup? (
+		escrow? (
+			>=dev-libs/nss-3.18.0
+			dev-libs/volume_key
+		)
+		>=sys-fs/cryptsetup-1.6.7:=
+	)
+	device-mapper? ( sys-fs/lvm2 )
+	dmraid? (
+		sys-fs/dmraid
+		sys-fs/lvm2
+	)
+	lvm? (
+		sys-fs/lvm2
+		virtual/udev
+	)
+	vdo? ( dev-libs/libyaml )
+	${PYTHON_DEPS}
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND+="
+	dev-util/gtk-doc-am
+	introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		escrow? ( cryptsetup )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_environment_reset #623992
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-btrfs
+		--with-fs
+		--with-part
+		--without-mpath
+		--without-nvdimm
+		$(use_enable introspection)
+		$(use_enable test tests)
+		$(use_with bcache)
+		$(use_with cryptsetup crypto)
+		$(use_with device-mapper dm)
+		$(use_with dmraid)
+		$(use_with escrow)
+		$(use_with gtk-doc)
+		$(use_with kbd)
+		$(use_with lvm lvm)
+		$(use_with lvm lvm-dbus)
+		$(use_with tools)
+		$(use_with vdo)
+	)
+	if python_is_python3 ; then
+		myeconfargs+=(
+			--without-python2
+			--with-python3
+		)
+	else
+		myeconfargs+=(
+			--with-python2
+			--without-python3
+		)
+	fi
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
+	# doesn't work at all.
+	if ! use lvm; then
+		rm -f "${ED}"/usr/bin/lvm-cache-stats || die
+	fi
+}
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index fb0c5edf2187..6108db98a24f 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -113,4 +113,9 @@ src_configure() {
 src_install() {
 	default
 	find "${ED}" -type f -name "*.la" -delete || die
+	# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
+	# doesn't work at all.
+	if ! use lvm; then
+		rm -f "${ED}"/usr/bin/lvm-cache-stats || die
+	fi
 }
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index d30f9328becb..dfd22127a1ae 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -2,4 +2,4 @@ DIST libcap-ng-0.7.8.tar.gz 447946 BLAKE2B a26af2dcdd1af26cf03ca668dc95eed7bc1d0
 DIST libcap-ng-0.7.9.tar.gz 449038 BLAKE2B 3f84e5078d5d443cb61358c49405e4f16ff82a56e1c96d5127b522613b1b5c56a566a01b14b40055eca85f13b37f3d795248a506c54ac4612ab184a94addc365 SHA512 095edabaf76a943aab0645b843b14e20b1733ba1d47a8e34d82f6586ca9a1512ba2677d232b13dd3900b913837401bb58bf74481970e967ba19041959dc43259
 EBUILD libcap-ng-0.7.8.ebuild 2292 BLAKE2B 8ee760e4d10a5ae652d30cb824852d60228c4ce7cd8e9339cd223527bb73b5348f2178597c9daf6e30620090e76ea13f539c44b78434acb5db8db909f0773ce4 SHA512 fd1f7e43556763f0512464c2a03e33815df1d4517f2558ab84cf4aeaeefc0ed6f92fb771f121656b9e62ab461d74355311bb1e6a49b166862fa87f6a8edc3b3a
 EBUILD libcap-ng-0.7.9.ebuild 2209 BLAKE2B d99748aa43de737a364f480007cf8a6957e5143f1866a5e724b4a9bff867c6e55e39d94cfce40a7744f4633b5c4d5046f6869d75d175564ef1335b2b2aea8072 SHA512 73845fe25ca5416a9b2cb04b59667c5bb2781f8ad982c6093c723be67371e486423151772c35f0f396532e6f2266578ba61c46f66cea6ec831ca2cc75045b4fc
-MISC metadata.xml 580 BLAKE2B 488341de9440c9cb0679acda14073496a0a1294380aa421496e4c622fa22a1c143b8bbce742214459fccf1825b9c1ef0004c9fec0fc3076b92a88bf557a63361 SHA512 51d670d97a94c8c668a4580bf6106a5b027b4d8d0c2f27ca88a508e60ece5a5390b619f0368c8111f2b843748a9ad31f1804c2a60df91ae1717a2c8b2a7aedc3
+MISC metadata.xml 673 BLAKE2B f4890411426cd85bc65373e34f5e1c2b5b294ee6774b8af47cb8effcb4d5730772fee52bcf0fdd477f56b412b1918214467cc0afc3f13b56098d45a98009ce4d SHA512 8f15beccf0bed144b7cceb7699e9e90e05bca2b0fa2bc198dc6cdc5af95f57c9fb07c9049d5b7229b2ec71b945cee3b20210874ebb030566caee850d50980d95
diff --git a/sys-libs/libcap-ng/metadata.xml b/sys-libs/libcap-ng/metadata.xml
index 9aa642f3201d..e9dd16674835 100644
--- a/sys-libs/libcap-ng/metadata.xml
+++ b/sys-libs/libcap-ng/metadata.xml
@@ -11,4 +11,7 @@
 	utilities that can analyse all currently running applications and print
 	out any capabilities and whether or not it has an open ended bounding set.
 </longdescription>
+<upstream>
+	<remote-id type="cpe">cpe:/a:libcap-ng_project:libcap-ng</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index fe9e460c9c2f..a5b26b2af959 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -6,4 +6,4 @@ DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219b
 DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6
 EBUILD libcap-2.26-r2.ebuild 2031 BLAKE2B 11a03a442a8859efef3eb93c16858d74292a30384db6a219250eb68f745a647de6431adbb9225c2f1672bec5448978dc35a9edd6581fc502648f9fdd0a992c60 SHA512 1935cba9a14be5431255bd36be8942be541812a1d1610646bee1d659a931f79285179ceb3f44001b5f3061461374b5c2b013693880a60e65d2adaa6df9cef40e
 EBUILD libcap-2.27.ebuild 2044 BLAKE2B 405ef4470f9c2dc7da9034bcbc3abb7863a3ff8c1cf62636a7c5fd7ecca3ee1c2e6871b1b7d7d542c18902400510d60da914255ad2e4930bcb8002e30fbc0f08 SHA512 344bc5bd41b3c499d36cace315c0b93fdf9f05a48effebb7fdb29489de884071904aec29d8531c74c789a348567c743f4dbfbe92a240fe6673dc97de144a2757
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/metadata.xml b/sys-libs/libcap/metadata.xml
index 56c124413057..d10107478bd7 100644
--- a/sys-libs/libcap/metadata.xml
+++ b/sys-libs/libcap/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:libcap:libcap</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 48daa63e4de3..10ee5b7484a6 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -7,6 +7,6 @@ EBUILD libcxx-10.0.0.9999.ebuild 7093 BLAKE2B 9091fed3e48a68383200334296a1a2cb78
 EBUILD libcxx-6.0.1.ebuild 6746 BLAKE2B 616128b9d49049ac6de90b84f89a48c7033f5927edc5e15674df5e3a2225630f59a99c8047c71d9128304d726241ceaa1cefabf8d44e4b2d6a491611f63bee88 SHA512 3df9e7e79b62893441212fe7baa51190ac69f0bf64332718ae53596a043dc3583b8125bbcf7339cca7cf9937aa870ea0d8b12670700962c1cb22892f706e3129
 EBUILD libcxx-7.1.0.ebuild 6747 BLAKE2B 437a08ee7854b3d398c55e20ff790deca0d7c69e1050fc2ed0d0dc00f467c9c3ca3fcd9e4752898adc68c28c485091a016f6d22af202bedf2b2008e62f1b9a28 SHA512 e22930bc78ff7063b75982164effc559c2adcf25b2b126f31c15e51095cba0d14de839cf1265c6c154a7c89bc8d92de62f962946359731f7ecd5ac6f8cb6aa7b
 EBUILD libcxx-8.0.0.ebuild 6750 BLAKE2B 6e03588334d2af0c0ce2e02ff2e7a8f9f9817a494fc6445a4fecfb1381884eb4a92921d7b06d5c12f36795acac5f2ee90a3794665419e9bc6ed2bde99a4f7259 SHA512 4bc27a7e3974d83a661887ca32f414b1697f0470ba8d9505f1ea795537d252cd336feb8a8db71f456821b2d9f38613458af888f530663df78a371f7e1391d897
-EBUILD libcxx-8.0.1.ebuild 6789 BLAKE2B de37835ae850bbebef3cb114f51db6af7e04fa76c3209b7a96e8c1ffc1928566e9ee5f11a150d26f16fe2d66440b872dde850771e1b1ed88f0f5095677baf037 SHA512 cc20b84c1d1061dc43713ca71e80c45c9ce3ea8a9212009c98524c467be60e85c96509896c835ed92a6b146e14061c5d018620f5ee6ca0e195d65c5e62ac85da
+EBUILD libcxx-8.0.1.ebuild 6786 BLAKE2B 566b15bceff07d99a155fd7ccbd72d066af5be723f2f7a6a5a57fb3d1ed876eec09185b1c33b462a2443187d0c200df3a72696c700f2cdef77dc8de22425472a SHA512 7309e7d97d58b427fe0b193eb5d1419fa33533e5294733c6a91e9d31d1573870b2ab24a4766075b105bcd669fb3d9c182fb756a08e32350d28a00d019705c24b
 EBUILD libcxx-9.0.0.9999.ebuild 7118 BLAKE2B e4af9cd8fdc3728d46feab331acc98010bd7a8b5fca99df215898ba7e38a5001de66c6b215f163d31ea089b0096944c7da976f8c118d561712e810e427a09058 SHA512 ab849d2c0a4ee0a6b7e536db0c96886fc850cb208bb8d60717c9f6c02a1e1b98748256161d25c951d1665b6570244e3db33af672c796a88506ceb9761df0c310
 MISC metadata.xml 854 BLAKE2B f731ffbb07722face32cfe5ef0576c572fc45d93e8d78ec4adb46c43b95999dc4eb48f20311517fe08a397f2e5dec56c530bb6787a058358cfd1af8d79ffad90 SHA512 8ef3feab266e09442a42baced2d72667fa8b1290624c2c84bab7b173ead72669568847f6e995388fc1d7bc722381f60805d87b2a0cc2d04ae0c49e36bec3802a
diff --git a/sys-libs/libcxx/libcxx-8.0.1.ebuild b/sys-libs/libcxx/libcxx-8.0.1.ebuild
index cf4bd1b3b354..d3a06927affa 100644
--- a/sys-libs/libcxx/libcxx-8.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-8.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-fbsd"
 IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
 REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
 	?? ( libcxxabi libcxxrt )"
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index ecaa99c2f8f5..36d8a3451f4a 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -10,6 +10,6 @@ EBUILD libcxxabi-10.0.0.9999.ebuild 3334 BLAKE2B e186dbaf646c165595a73956bb4362a
 EBUILD libcxxabi-6.0.1.ebuild 3172 BLAKE2B 0078aa6ca753285439a17dea5af0c66a991a1844b7bd487c0f51b95d9c8007a4d077515d3282cea8a044692a3d14f869f2b651bed3a7ba5e6acd20629bfd2e5b SHA512 b1168935e250e2a83356061456bef94635a1bb797abeb725f201298de3f6c90e285714799de4d79f30bd33f2a9ad9cfbdad2f4339100023485aee4554c36c133
 EBUILD libcxxabi-7.1.0.ebuild 3173 BLAKE2B 48dda73d243e18c4591910d0f8900b0fc75eacf229f1eb11b9c402897f46a03e89bae5330daffe80a994d526fc612db237d104d9a3c69cef2c910bfb705069cc SHA512 a028cb4cd4381fea4cd487fa44a33bdbd604badfbe8c7e8452c4b19255ef672d11a415ddc4cf087ce19235cea0eac4e479bfb3d3e5d764aa431677d31683a37d
 EBUILD libcxxabi-8.0.0.ebuild 3176 BLAKE2B 709c55c2aedd2490ef6a982f41fa0b3977c1109ef480aba56cbfd248c40027349daa0dd477adefd5c37b8dbac8485cb8ab3c470e440b4be050ff52c0815bd59c SHA512 76237682c5e3d09cd259a03184fc35def96a90ac2bf42efe869be7d2f2ebdde05dca1e9f2efb5a08a41e7b461d4bbcb5dacd2d1ff8d3128ae65a1dfb2683f92f
-EBUILD libcxxabi-8.0.1.ebuild 3242 BLAKE2B ed19bb64b100dc6a1878a3ace19ee8a44c29402d08c41b37bd7639efb83190ba2dea56b39a50d9bf3be7d8eeb4c80b8ba71404d35593b731c157a50f06259a4c SHA512 2795ce4983faea958c8ce7c439b0d093fb267ed9884697a1a416bf2b918a31b593ab7e5a295bb3fbec8a6259168c40054c352cc2be327e9c900ae44426816f9e
+EBUILD libcxxabi-8.0.1.ebuild 3239 BLAKE2B 820a0a14a4f415eccd457afcbb5daa7fd1c1cb2b6c636529cc1acacb7a67b19fc2d60b82d88e012293bc3d1aaab369c2f38c4864e1c6f4de85e9ff902cc262ea SHA512 cba12e7d0425218fad50c519de54cd9712f2d85b1bac57ab484761c982b7bd6e9f2d1c0a6f8b8b0cc811c2c6ad567011cfed0bf8f8183c16d3360ccee42b5473
 EBUILD libcxxabi-9.0.0.9999.ebuild 3359 BLAKE2B 647cb17fc54a8a7e909c290420957ba46304346bee82bce9b89b7ac54dc3396ce948747d52fd3d0985aaafc16cce9421b4959def28a7ab3a855db0e20692bc1a SHA512 387434299ae97fe288665d447b27ab56ce40e85a53f91157d51a5d3070bd9e87e3d24cc29a3aad6b9093715e0fdbbca1b35a3f0c79bb1d657be9e63a4bf0a223
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild
index 9a5bef364e69..330727ef79ce 100644
--- a/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-fbsd"
 IUSE="+libunwind +static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
index 3eee4b091a43..463bf0b3e528 100644
--- a/sys-libs/libcxxrt/Manifest
+++ b/sys-libs/libcxxrt/Manifest
@@ -2,6 +2,6 @@ AUX Makefile 513 BLAKE2B 582a1ee9c7cf3f50a3508470e68c987f7566a6b85fd525b9c5649d5
 AUX Makefile.test 172 BLAKE2B 75bf612ce08664303e4e28d7003e111a28e5ac931940f61768ffe4244e5fd883bc4a8ec5ef3e41537734899353127801004659ab8a6890b0c4fea46b8bba4591 SHA512 fc93c26e4df1c5eca2f99ad3058e2d129fa85a876c9d3d6fcc9e456f397455ebd136b88b3c0ed8d27003dc7a00a985094b6c711fb34316d9fef39e1ab2aadaba
 AUX prepare_snapshot.sh 428 BLAKE2B 5fab8d5ccc8aafbb4c5e9f729dad99b87d45c9973be777d4a77d5fddba280731186ec5075fe79526130ed26396e621e955ee28f1cbc0293b1e19e109b54f363e SHA512 2fc1391df1178a1f6e2e29243731a0630e43718e7e525f95f8dcea3c9909905e86cba1cd9063c396be0a076965b6c3c1cfaac899ba6e30c9cf4f90e237fb5b25
 DIST libcxxrt-0.0_p20180311.tar.xz 60920 BLAKE2B c75bf5bb88e0f5c448a377a7ae58b33444e644c5e4ce7d6e0f5242c4ee61335be6a8b878bcc06f47bb44f9c48895845b174ca398c95aabb90182ebefd3d31815 SHA512 625aa0fab7d54c584faf4cf1e7f8f694776337fc0c6f441683f035743d00e3d18be3339a8ccfc8b61eb07819e4ccf7b1e5f3e7948fd584eefc5d61b200b32d50
-EBUILD libcxxrt-0.0_p20180311.ebuild 2303 BLAKE2B 5dbda1e0b6d57410f14b84b93d34680e00de90433596602d144a1c945cd22bc54213cd6bc90c0cf241642c1b6b2cfdf527b8635befbb4a6c012b1f3d5fa56406 SHA512 58c0b410158c3b2ffc66b1ace283a3bb528cdb6ebf700d84428263da6ebbda675c42ed325f6a2be3a2b72c756e1dd0048142303bd6226b6930d0ec87b8a1b1df
+EBUILD libcxxrt-0.0_p20180311.ebuild 2301 BLAKE2B 7fbe868bd62ce114c9945b6237b09a7a64090e0f6604b0f2e5866cd89ede75544aa860645869503db6760b1a059eaa0664d55bac50fcd1948af947591030672a SHA512 af17a37e2af2b2e6eced1cccf72a8ccc84e95a26d008d466f7ecf3bf5519648323fad9bbf44fac03c98fb810196e7b12ccccb05c90381badebf268897226ce2e
 EBUILD libcxxrt-9999.ebuild 2282 BLAKE2B 90380383d29d75b333eba9a510236f76a89673deb2a6b3b4d946eb15d3ec12df54e95121bf2e2cb6938bdeb961f0789f203585b494ef757f4f1d888bccf1f695 SHA512 b76d1a9bcd2e4d065e358f6fd856baeb762af5e7bec05caeaf0bbfe9037573a59d6158783df5950017330b578d3cff101caff18d65db1644543563a8ff360060
 MISC metadata.xml 772 BLAKE2B 918a0b6a0d5d7c07b86a8157e08d66f1df42d38e74099c3c38a5dcb2757d55637426df7e0b61d893afde5cd15eb9d4ab78920ccde846a781c5e7ee285161f0c1 SHA512 2740f5561f530ec9053c2e3cc1c32af9b11b61d6b9b1e1babc39d135132bd7fbc0670bcdef274408126c9444e93c9e6f964f7c51316cac06b4a64e177263be7a
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
index 1c96b79f320e..f5a189ddbb2e 100644
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
@@ -21,9 +21,9 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 ~arm arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
-	KEYWORDS="amd64 ~arm arm64 x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 IUSE="+libunwind +static-libs test"
 
diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index 3e42c146d085..b5bb23971b29 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -1,8 +1,8 @@
 AUX libhugetlbfs-2.20-noexec-stack.patch 3513 BLAKE2B b33aa3f5891e1c55c00c61e7d7232504466dc78c6b4d232f64ec5047c45c6044058bdebea02ddb1f67deb20f298e970d96d2fe8a76a017984d46863c179c0924 SHA512 b8146512167da9530f107d3db4695d8e1174568c2f10bab41c3c3f8dff27b1357cef409e95cea75fbce177366a84904d80a7f1cfb7653dc6e8e10c0abfd8ef0b
 AUX libhugetlbfs-2.6-fixup-testsuite.patch 1231 BLAKE2B e49ac448b4ac17a6ce9c32543e3ad7391bc8525e147d7a5100ef7ae15e4b0cf48b58ff1fe62d9a0fa61f142b7b8366228974c6628999edaa61d96114371bc09d SHA512 af9ee541ac4a30260e17baab1616cee13fdcc679ae3fdceed29ca6282c12a6b60d24b04bb61e3aa5f42092e017eb3bae59a56fd2b03954e40803f9f6f2cc4f80
 AUX libhugetlbfs-2.9-build.patch 1163 BLAKE2B 782c802c12ba86c637fa693dda3d8fb618068f156ccaae5a60623d077997d4dcc7a27e3b2fa4e3b7ec0a34ae8db2e9571bad077de103ca6b65de533b6fc896c9 SHA512 d6443875d2dd2e44abfd470ec793b70d0cf5a69931e2c2889a7b204d1c27bc2abc3b0c7149a495845e080cb797b759844c330ad5c467aed7dae0669b7f5b7ff2
-DIST libhugetlbfs-2.20.tar.gz 186750 BLAKE2B 758482a41254d6d14795efdfb2959248af2ff00bc6cafbae9b2002b7eaa50921a72ef928910bc0d2061a414e9c73346848eead108af077c96429870c734495aa SHA512 817fca3f8e3b127b9b877e0a03d0a94bf0c3ec481d3becf995986ce6ae0532629c5460100eb9f2ef3452ed59a3b9d3ac8362df8f87b387803c36d35ab7af0902
 DIST libhugetlbfs-2.21.tar.gz 173052 BLAKE2B a65fdeee3ed9ad8cb69f772847646befbf5deef0b82d6cb7338e5ff448d5c2461ceb1e381b9515e79f4243482589bb0203874cc52e5c8c6d98667df4eacffa8b SHA512 87fd95a826bedc2c53b1aa440f5db7ff3ece482d520545b597d4d1231cf84276103c312899b812166872444331bc7b6f1692f0d3b7cbff691efdcf9c2e99b1d0
-EBUILD libhugetlbfs-2.20.ebuild 4461 BLAKE2B 4ba750e430f3c3de3282fe628a3229d58af3f2af9ed2f795e5584e967d34b6a3ef5158cd0f29c2f78d5400ed1ddaff391847b3b180687e21957880f03731868e SHA512 c8db19646892d790c08abd9e577c96bbfcb52de3e45087782a4019f0f5fffe0311079b5d8e61e96a75e5af56d3e9b0961e6a3d0b43f3d29ecf57c85fc12ce108
+DIST libhugetlbfs-2.22.tar.gz 175099 BLAKE2B e67a6a678065b10492d510b733b7c6e2926f4f01dd741d49f6e76cedde002fa81d7dad6a6fd8922443c6aacd527c9b3df35f84b8da7332c04e3fcf8c52e23084 SHA512 7f38f9fa576841f36c7cd5192a9ee3f79b275b7b64d7e2a838a43636489cf88627bdba3a045d6b3302a4a509cf64627972b569b4c2c3c4fe05d5aa4ae1d66fd8
 EBUILD libhugetlbfs-2.21.ebuild 4068 BLAKE2B 903b0db5f72e4926e8185d15bc4ad970fc77926381bdb6ad0205aa9bcbb7fe6a8936f38a4b783d2a418ad0523ca045cca45db7ed1650e892edd58db1f04de233 SHA512 9df56b646c5df82903a03562e7de61b019d3182a9b8d9b24506ad3bd0edf2ba68b4cd00ba5c47410c8f60876d0fe79b360b50d6c40f6a08d9db6c688cfbfc36d
-MISC metadata.xml 484 BLAKE2B 8f4e5877068e5af69e5a53695d10c44fbc899eb53f3128c41a4cef162ce3c0213002c169c6d7e89fff6a39126b3e387f565480e1ef2323b354a2c6181ecb8167 SHA512 0dee09cbd2ca1a730dbe2a3c62ef1099959ab307c96f3106c483854310430dd59b45a7135a2db56a28684b0a4245898341527b1f67bb335456c8cdc14ae611fd
+EBUILD libhugetlbfs-2.22.ebuild 4153 BLAKE2B 3079451b1dd71059eb955d6ff8a3c08986176fdaeadfce9358b56deedd011a23a301cf80eff014960103a08802a77ef8327f0394e38c9c94a89550a45bb876a1 SHA512 a77ab0a980a286945b1082cbcfa02a7c984d16be555bcfc50b9b2f2bc4a4c1cae45bb93e304ad9b3970e59624d52624be9806c20d576ab41d791d916ae7a2e56
+MISC metadata.xml 396 BLAKE2B 261776d0894dc66459b99826ce4721148b0916cacca7fa4cadf70eef720c19a0d8fbd9e3a5e63323ba98778843e715e3e493645de701f2276259ebfaa6ae9e87 SHA512 95adcf5f0a47473f679d37ba1a6559b45681f288f7c4c70a8b9dd18c67eab3b4c222df996c3eb83d1317aa9a8a2710dc788ebc23e1255713ed81db33f57df3b8
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.20.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.20.ebuild
deleted file mode 100644
index c3c800361c4d..000000000000
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.20.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib toolchain-funcs perl-functions python-any-r1
-
-DESCRIPTION="easy hugepage access"
-HOMEPAGE="https://github.com/libhugetlbfs/libhugetlbfs"
-SRC_URI="https://github.com/libhugetlbfs/libhugetlbfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
-IUSE="perl static-libs test"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="perl? ( dev-lang/perl:= )"
-
-src_prepare() {
-	perl_set_version
-
-	epatch "${FILESDIR}"/${PN}-2.9-build.patch #332517
-	epatch "${FILESDIR}"/${PN}-2.20-noexec-stack.patch
-	epatch "${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
-	sed -i \
-		-e '/^PREFIX/s:/local::' \
-		-e '1iBUILDTYPE = NATIVEONLY' \
-		-e '1iV = 1' \
-		-e '/gzip.*MANDIR/d' \
-		-e "/^LIB\(32\)/s:=.*:= $(get_libdir):" \
-		-e '/^CC\(32\|64\)/s:=.*:= $(CC):' \
-		-e "/^PMDIR = .*\/perl5\/TLBC/s::PMDIR = ${VENDOR_LIB}\/TLBC:" \
-		Makefile || die "sed failed"
-	if [ "$(get_libdir)" == "lib64" ]; then
-		sed -i \
-			-e "/^LIB\(32\)/s:=.*:= lib32:" \
-				Makefile
-	fi
-
-	# Tarballs from github don't have the version set.
-	# https://github.com/libhugetlbfs/libhugetlbfs/issues/7
-	[[ -f version ]] || echo "${PV}" > version
-}
-
-src_compile() {
-	tc-export AR
-	emake CC="$(tc-getCC)" libs tools
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-	rm "${ED}"/usr/bin/oprofile* || die
-	if ! use perl ; then
-		rm -r \
-			"${ED}"/usr/bin/cpupcstat \
-			"${ED}"/usr/share/man/man8/cpupcstat.8 \
-			"${ED}/${VENDOR_LIB}" \
-			|| die
-	fi
-}
-
-src_test_alloc_one() {
-	hugeadm="$1"
-	sign="$2"
-	pagesize="$3"
-	pagecount="$4"
-	${hugeadm} \
-		--pool-pages-max ${pagesize}:${sign}${pagecount} \
-	&& \
-	${hugeadm} \
-		--pool-pages-min ${pagesize}:${sign}${pagecount}
-	return $?
-}
-
-# die is NOT allowed in this src_test block after the marked point, so that we
-# can clean up memory allocation. You'll leak at LEAST 64MiB per run otherwise.
-src_test() {
-	[[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
-	einfo "Building testsuite"
-	emake -j1 tests || die "Failed to build tests"
-
-	hugeadm='obj/hugeadm'
-	allocated=''
-	rc=0
-	# the testcases need 64MiB per pagesize.
-	MIN_HUGEPAGE_RAM=$((64*1024*1024))
-
-	einfo "Planning allocation"
-	PAGESIZES="$(${hugeadm} --page-sizes-all)"
-
-	# Need to do this before we can create the mountpoints.
-	for pagesize in ${PAGESIZES} ; do
-		# The kernel depends on the location :-(
-		mkdir -p /var/lib/hugetlbfs/pagesize-${pagesize}
-		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
-	done
-	addwrite /proc/sys/vm/
-	addwrite /proc/sys/kernel/shmall
-	addwrite /proc/sys/kernel/shmmax
-	addwrite /proc/sys/kernel/shmmni
-
-	einfo "Checking HugeTLB mountpoints"
-	${hugeadm} --create-mounts || die "Failed to set up hugetlb mountpoints."
-
-	# -----------------------------------------------------
-	# --------- die is unsafe after this point. -----------
-	# -----------------------------------------------------
-
-	einfo "Starting allocation"
-	for pagesize in ${PAGESIZES} ; do
-		pagecount=$((${MIN_HUGEPAGE_RAM}/${pagesize}))
-		einfo "  ${pagecount} @ ${pagesize}"
-		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
-		src_test_alloc_one "$hugeadm" "+" "${pagesize}" "${pagecount}"
-		rc=$?
-		if [[ $rc -eq 0 ]]; then
-			allocated="${allocated} ${pagesize}:${pagecount}"
-		else
-			eerror "Failed to add ${pagecount} pages of size ${pagesize}"
-		fi
-	done
-
-	einfo "Allocation status"
-	${hugeadm} --pool-list
-
-	if [[ -n "${allocated}" ]]; then
-		# All our allocations worked, so time to run.
-		einfo "Starting tests"
-		cd "${S}"/tests
-		TESTOPTS="-t func"
-		case $ARCH in
-			amd64|ppc64)
-				TESTOPTS="${TESTOPTS} -b 64"
-				;;
-			x86)
-				TESTOPTS="${TESTOPTS} -b 32"
-				;;
-		esac
-		# This needs a bit of work to give a nice exit code still.
-		./run_tests.py ${TESTOPTS}
-		rc=$?
-	else
-		eerror "Failed to make HugeTLB allocations."
-		rc=1
-	fi
-
-	einfo "Cleaning up memory"
-	cd "${S}"
-	# Cleanup memory allocation
-	for alloc in ${allocated} ; do
-		pagesize="${alloc/:*}"
-		pagecount="${alloc/*:}"
-		einfo "  ${pagecount} @ ${pagesize}"
-		src_test_alloc_one "$hugeadm" "-" "${pagesize}" "${pagecount}"
-	done
-
-	# ---------------------------------------------------------
-	# --------- die is safe again after this point. -----------
-	# ---------------------------------------------------------
-
-	return $rc
-}
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
new file mode 100644
index 000000000000..34b969c3fe3d
--- /dev/null
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit multilib toolchain-funcs python-any-r1
+
+DESCRIPTION="easy hugepage access"
+HOMEPAGE="https://github.com/libhugetlbfs/libhugetlbfs"
+SRC_URI="https://github.com/libhugetlbfs/libhugetlbfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
+IUSE="static-libs test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^PREFIX/s:/local::' \
+		-e '1iBUILDTYPE = NATIVEONLY' \
+		-e '1iV = 1' \
+		-e '/gzip.*MANDIR/d' \
+		-e "/^LIB\(32\)/s:=.*:= $(get_libdir):" \
+		-e '/^CC\(32\|64\)/s:=.*:= $(CC):' \
+		-e 's@^\(ARCH\) ?=@\1 =@' \
+		Makefile || die "sed failed"
+	if [ "$(get_libdir)" == "lib64" ]; then
+		sed -i \
+			-e "/^LIB\(32\)/s:=.*:= lib32:" \
+				Makefile
+	fi
+
+	# Tarballs from github don't have the version set.
+	# https://github.com/libhugetlbfs/libhugetlbfs/issues/7
+	[[ -f version ]] || echo "${PV}" > version
+}
+
+src_compile() {
+	tc-export AR
+	emake CC="$(tc-getCC)" libs tools
+}
+
+src_install() {
+	default
+	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+}
+
+src_test_alloc_one() {
+	hugeadm="$1"
+	sign="$2"
+	pagesize="$3"
+	pagecount="$4"
+	${hugeadm} \
+		--pool-pages-max ${pagesize}:${sign}${pagecount} \
+	&& \
+	${hugeadm} \
+		--pool-pages-min ${pagesize}:${sign}${pagecount}
+	return $?
+}
+
+# die is NOT allowed in this src_test block after the marked point, so that we
+# can clean up memory allocation. You'll leak at LEAST 64MiB per run otherwise.
+src_test() {
+	[[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
+	einfo "Building testsuite"
+	emake -j1 tests || die "Failed to build tests"
+
+	local hugeadm='obj/hugeadm'
+	local allocated=''
+	local rc=0
+	# the testcases need 64MiB per pagesize.
+	local MIN_HUGEPAGE_RAM=$((64*1024*1024))
+
+	einfo "Planning allocation"
+	local PAGESIZES="$(${hugeadm} --page-sizes-all)"
+
+	# Need to do this before we can create the mountpoints.
+	local pagesize pagecount
+	for pagesize in ${PAGESIZES} ; do
+		# The kernel depends on the location :-(
+		mkdir -p /var/lib/hugetlbfs/pagesize-${pagesize}
+		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
+	done
+	addwrite /proc/sys/vm/
+	addwrite /proc/sys/kernel/shmall
+	addwrite /proc/sys/kernel/shmmax
+	addwrite /proc/sys/kernel/shmmni
+
+	einfo "Checking HugeTLB mountpoints"
+	${hugeadm} --create-mounts || die "Failed to set up hugetlb mountpoints."
+
+	# -----------------------------------------------------
+	# --------- die is unsafe after this point. -----------
+	# -----------------------------------------------------
+
+	einfo "Starting allocation"
+	for pagesize in ${PAGESIZES} ; do
+		pagecount=$((${MIN_HUGEPAGE_RAM}/${pagesize}))
+		einfo "  ${pagecount} @ ${pagesize}"
+		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
+		src_test_alloc_one "${hugeadm}" "+" "${pagesize}" "${pagecount}"
+		rc=$?
+		if [[ ${rc} -eq 0 ]]; then
+			allocated="${allocated} ${pagesize}:${pagecount}"
+		else
+			eerror "Failed to add ${pagecount} pages of size ${pagesize}"
+		fi
+	done
+
+	einfo "Allocation status"
+	${hugeadm} --pool-list
+
+	if [[ -n "${allocated}" ]]; then
+		# All our allocations worked, so time to run.
+		einfo "Starting tests"
+		cd "${S}"/tests || die
+		local TESTOPTS="-t func"
+		case ${ARCH} in
+			amd64|ppc64)
+				TESTOPTS="${TESTOPTS} -b 64"
+				;;
+			x86)
+				TESTOPTS="${TESTOPTS} -b 32"
+				;;
+		esac
+		# This needs a bit of work to give a nice exit code still.
+		./run_tests.py ${TESTOPTS}
+		rc=$?
+	else
+		eerror "Failed to make HugeTLB allocations."
+		rc=1
+	fi
+
+	einfo "Cleaning up memory"
+	cd "${S}" || die
+	# Cleanup memory allocation
+	for alloc in ${allocated} ; do
+		pagesize="${alloc/:*}"
+		pagecount="${alloc/*:}"
+		einfo "  ${pagecount} @ ${pagesize}"
+		src_test_alloc_one "$hugeadm" "-" "${pagesize}" "${pagecount}"
+	done
+
+	# ---------------------------------------------------------
+	# --------- die is safe again after this point. -----------
+	# ---------------------------------------------------------
+
+	return ${rc}
+}
diff --git a/sys-libs/libhugetlbfs/metadata.xml b/sys-libs/libhugetlbfs/metadata.xml
index 534f22e29cc0..bf4a9ce74b49 100644
--- a/sys-libs/libhugetlbfs/metadata.xml
+++ b/sys-libs/libhugetlbfs/metadata.xml
@@ -5,9 +5,6 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
-<use>
-	<flag name="perl">Install the cpupcstat tool and some perl modules</flag>
-</use>
 <upstream>
 	<remote-id type="github">libhugetlbfs/libhugetlbfs</remote-id>
 	<remote-id type="sourceforge">libhugetlbfs</remote-id>
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index cbcc79b8e213..7d87ca6dc567 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -6,6 +6,6 @@ EBUILD libomp-10.0.0.9999.ebuild 3146 BLAKE2B 73737d981fa62ec452a2b2810ac3740d0c
 EBUILD libomp-6.0.1-r1.ebuild 3261 BLAKE2B dc43e11cbd716285018a3857b33378715338350269cbfee3292c44ebb0d10584ea1f505962c34fc9c5a58771d6abb52f444467e79834e9a04d594c914af46a2f SHA512 eb901f8810fa552cad6d6510f54f30824a1d7f7931ccc1cf6bb02a2ed22a9e9af3d924bfbc09921510d2972ac4ca36fb1df4d6b7d52342a346fb8b5cfa0ac436
 EBUILD libomp-7.1.0.ebuild 3263 BLAKE2B c1ac92a7713abe0f53eb0cd60703bba001e99bd9d371af06b5ac595be438b6dbb9a2bd638026aab9c231c3cce032be487e25ba8d778afbc8220857341c910abc SHA512 554b946498e2699bbdcd99f313b03b23b78494adc1dd06ea4540b68304a58c8f25b2c619313ea5fc76be089f63fd7bd7e8e9bd2d95297342cc8b95a69aaa794f
 EBUILD libomp-8.0.0.ebuild 3266 BLAKE2B 8cd6a5dfac53b82e0a92d647ae9b453a664f5b5fa8156c8185ccecf394f313ae826e29634b14126a53ce36498c485b658b36141ddd5895635437b59beabea001 SHA512 6fb36d649ce586f638f0846e26d7346ae9faeae571b1e61b2509b810a04e899b63293653d6b3af51924cbd2c1477f359b8e004f57cedf20385698eb8657caef5
-EBUILD libomp-8.0.1.ebuild 3297 BLAKE2B 558f0d747ad1cfb8e5f2e3436a20e8151eb53c72df550fac88675c6ff664127f009f55ab10b8b1d646e0a19454795df603d2c47b7c7c05b7b34de5a6c929785c SHA512 b4ef0557edd709b18fcfea3ee08fb19e48089e985daab2488936e1f8f63ea42b8de993c8a23b5c51a9c54385f0b87a56ccefd47b43eaa9c53d2ca5d6f0df034c
+EBUILD libomp-8.0.1.ebuild 3293 BLAKE2B 0f22aad737f0a17b3a8e197ec168da237485ddf8422dbcdf42f2ac3a88fddbf56db52da811b0786b4561a94810e48aef1b08fc8921e06b0652d0c47ca843ba06 SHA512 e2ff57d498166c4c872e57b0a30e17e4301cea4dc1f8be27478c1e93374378bc782374842ac3160472bfc513c4ca3f5d98ef30490dec54b50966315427b3a56c
 EBUILD libomp-9.0.0.9999.ebuild 3171 BLAKE2B b4891226a8c35031dba8ab4fe7ab5fbb77b41527652b8095bc2350affaf760e026408912a9dcbdb02891fdd9824c51c1e8055710a7ec814aaa858229df871561 SHA512 02c305620b8f83888627fbf3dc8e0040e9343c76e943c7bccbb061941ec0ba94827e659eb97a865fa0c444b9bc0fc17b041182aad63ff4f27d6050366931b3ec
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-8.0.1.ebuild b/sys-libs/libomp/libomp-8.0.1.ebuild
index 9272c4a89352..e7d3e917287a 100644
--- a/sys-libs/libomp/libomp-8.0.1.ebuild
+++ b/sys-libs/libomp/libomp-8.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 arm ~arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index a668cdec05f0..e7ad3c880f24 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -5,4 +5,4 @@ EBUILD libselinux-2.8-r1.ebuild 4185 BLAKE2B 215867146c515772f63c579ac9d3cb5e65b
 EBUILD libselinux-2.9-r1.ebuild 4257 BLAKE2B fdebf286772e557341bc0be3a893cfd3fc9ef4681f4a586f977fdf4dbcaafc0923ea3085a106cfccbf793ba11bd2ce06e88ff133477e93908268cfb02da342d5 SHA512 37e8ad4cb92d059841232e7bcfe6170b7ae3a11d1daba18df540604912e6211d899bfce577908540eba0e6b80bbf000a3121f91eca089b0b8f7070f5aaad3f7c
 EBUILD libselinux-2.9.ebuild 4166 BLAKE2B 820eebc2087a9731775a43fe7d8b34b692369e11419867a66e68ecd78a61608c8716d43ef390d8e4d39360dfb97e0e317e3ed24c7ab6a7bd2db4f5928c5ed59d SHA512 d575fa59d838a18e827d489c9a9212128e5f9c07eaa90ecaecc3a24565b467220893074149818f907b87611ca02595ac175bb98f8d30bc12616f56b08f7fb11e
 EBUILD libselinux-9999.ebuild 4170 BLAKE2B e23a62ba8d06085e9bc2b5ea42e84637a503b243332c78d0429d407a49a482dc966b669ff061dc9f58895efe54ec423f175312d9081c5ccbe2760cf0e529f434 SHA512 c100b626adec06317ecefe13954a846f4d8d7c537e48bd39c7945231d0f5041a9db63d543e341b2ef7fbe751049856c64a2f8a398d1ed6ea099b73a4935ed711
-MISC metadata.xml 676 BLAKE2B 530269a4d717ef305f4b15fe02c54e26f6acb9d73d6c7ac6ecd1f947712912f98120820a362e7cdc8e17019e88bc9c30162d54002bdea6facb2c41931e9c54f2 SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7
+MISC metadata.xml 745 BLAKE2B 6658dad55bd195725b345865e152b62528e04201b9743dd3688058eeb6f3ca87add86035c2a14bea0b238273328464f5e2fa36ce6b96ac35fb1cc679e3cb4a7c SHA512 ee405602d0345a118c4b8eac9126417f082f4a37a7d5816a991e21191d4ce71ec883abe7e91f10f5330cdc61e6f7a174968c12f873b08a4bda5186cc4986b363
diff --git a/sys-libs/libselinux/metadata.xml b/sys-libs/libselinux/metadata.xml
index 537e0aa97df3..92059a54b96d 100644
--- a/sys-libs/libselinux/metadata.xml
+++ b/sys-libs/libselinux/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name="pcre2">Use <pkg>dev-libs/libpcre2</pkg> for fcontext regexes</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:selinuxproject:libselinux</remote-id>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index d68e37f81eb9..9aaa84ab9c61 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -3,4 +3,4 @@ DIST libsepol-2.9.tar.gz 474861 BLAKE2B 2d0941a003bbe6f15f047e3e55ce4561c36fb494
 EBUILD libsepol-2.8.ebuild 1121 BLAKE2B 5896f2ea478008922f39d26ecf6fe7570952f2a74b327f25c9ddcb682b9609f47ee9b6fee2f65272393d249724489685ec5431c5b2e13f2deec7f8ee1057aeb8 SHA512 909747386f07ada18df34d5b89168efbe83999bacd969b17f20dcf4f23e2d525a6bd5006dc94d9e52e57ba94302364c6f2c114a92091167729993437d894e45d
 EBUILD libsepol-2.9.ebuild 1101 BLAKE2B 15d24d96643fe4cd0448a5fa917f0784bf34310ad5f326f428896e58eb7e4b4de02f6acab25c9f4f833b237a06b4ac7044e9c10d15548b8bc56dd00308515ad1 SHA512 caf47ce74e8463c2ece4bf8c39271f28c92a9700a6eaed4e39d35356a0169f09f83af257e7afa1b56099b22e6b79e373427e644a017eb9addf515ae0da2e18a6
 EBUILD libsepol-9999.ebuild 1103 BLAKE2B 98191cc3a9bc03475f9832eb55f8152dcc7f1b85900babbf776f468e452e7eaaca9f6292f875a46c637769c51cb30d0c466bdcc94d7f28151ff342d3e8809d70 SHA512 49d14f6550df03cb0eea70c495f6ca1680ca2bc6ee9c4231bc51b88d56ce02ee143491283be4530606d090938bfddea033f4ef483cae8a1e88c470e460bd0aff
-MISC metadata.xml 428 BLAKE2B 5e3dba085b9d5cf181fd548681975f00f888a6bb02b688eaa088a3668acdfb5def36af8c0e1085ca8785b7c503c3b797474724097fb24ebb1acc9c1a4c4e9a0f SHA512 14093ec1e86ac7b7521ab02ace725347013e11628e22cf3ed5362cfe7f30a180374ab00747b58ae251afbb3fabbeb4e328bda798e512bfac9bad643206835192
+MISC metadata.xml 495 BLAKE2B 2cf1b786b99f7cdcbf7e393957ee741ff23b69c4f2d326f306e3576ab7e17eb17148c1f34d32797fa669a05506eee0d86ba7c9b41c24c62f72aaa2b7d97ecdb5 SHA512 bf55f1da0e997ebc521b5c74f9f721e38971630e9201a6c8aa458e44291c8480eef082b526c746b20ee7335a231fa69ac9d0f1953ee8cd5a63a1c2346708de1c
diff --git a/sys-libs/libsepol/metadata.xml b/sys-libs/libsepol/metadata.xml
index ef117d5eac5e..1ff444ab65c6 100644
--- a/sys-libs/libsepol/metadata.xml
+++ b/sys-libs/libsepol/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<longdescription>SELinux library for manipulating binary security policies</longdescription>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:selinuxproject:libsepol</remote-id>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-libs/libstatgrab/Manifest b/sys-libs/libstatgrab/Manifest
index c0a5da94c8c5..2982fbf22968 100644
--- a/sys-libs/libstatgrab/Manifest
+++ b/sys-libs/libstatgrab/Manifest
@@ -1,6 +1,4 @@
 AUX libstatgrab-0.91-tinfo.patch 1833 BLAKE2B 77d33279b50f9210260f3897912735573a6fca5be942b6381413544ae139c7f79d74f8e3fffd231423cf3f7a5d7468579f0fa567156fc83a3e6421ce9fb81c92 SHA512 71908cdac0684e4b6fae04f30156ca390d9bd525467f0954e94b5725e9ef5fe368cfd78ece333d8ffca5e02fc33b66e993655960a3cd1b9667a479be73943b6b
-DIST libstatgrab-0.17.tar.gz 463224 BLAKE2B fff9f0833a0320de469c81d1dd10a62f0a81413a243c38d449ea8129a4635f55056d431f2b585b5f77082829438c8945d961c4a6ca1db13e0b4c9689bfd47905 SHA512 feb8d8aa345d57a9036700d580a7d1e21aed9bb2063b46b2c57a59fce00eb20a22590e5e391c8a9a1f43055c14a6ce3fcf648b98f1fec3b4efd270455a2933e3
 DIST libstatgrab-0.91.tar.gz 776046 BLAKE2B 29906d4df8b8e8f1ae8fedf5ccac12b282b5cba66715a2d1b51059426e7cb073862e49cbee535c0f9ea7a34171cbc3d143a38a92149ffe5f22ed9ec426fec0be SHA512 f360f2e1b185bf9603b1d9c50649b0050e9502128ff81a9f4de88457e2f5203deafe7fd7ac13ebc4cc56e6ecd1bdf8aacae64987bdf36af0c9929e30626915f6
-EBUILD libstatgrab-0.17.ebuild 778 BLAKE2B 9224ab5e5289e48c6a6db42f38a00e4fff96dcbc96e2ae962c89b20f40882650ad297bc6047ed0355596725e1d9e792d8f105c905878ad026ef0ebdc740da126 SHA512 9237601a8660cd0f9490edcb0cbb7e57421db3321c190a9bf66a6113461da060d6237b92f8fb56b8d2d2a8e467f4472042fb46db4bfc2e46af65f12f0fcfe5f5
 EBUILD libstatgrab-0.91.ebuild 1028 BLAKE2B ca1d27101a697b2fe9ccafdcb3537df1a9a31a2a8ce42b64827b3d6cca0a64fcb1b1c86b798879de66ca1eecd7b491c482961e7090216399e190e99122b6946f SHA512 20baae8873265e26d344c5dbac272ca1c7e5408546f2e70b21f7017e5219ad0a36a52e37a911d897f1eb9141477922193f4decbbe66392b26b9ee8cf1ba8aeed
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/libstatgrab/libstatgrab-0.17.ebuild b/sys-libs/libstatgrab/libstatgrab-0.17.ebuild
deleted file mode 100644
index b4bbb0eaa85f..000000000000
--- a/sys-libs/libstatgrab/libstatgrab-0.17.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="A tool to provide access to statistics about the system on which it's run"
-HOMEPAGE="https://www.i-scream.org/libstatgrab/"
-SRC_URI="https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 LGPL-2.1 )"
-SLOT=0
-KEYWORDS="amd64 ~arm ~ia64 ppc x86"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog PLATFORMS NEWS AUTHORS README )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-setgid-binaries
-		--disable-setuid-binaries
-		--disable-deprecated
-		--with-ncurses
-		$(use_enable static-libs static)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index e0660959ceaf..d0e94dd5c488 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -14,6 +14,6 @@ EBUILD llvm-libunwind-10.0.0.9999.ebuild 3918 BLAKE2B b337caa75a19e0ecfaeb21a070
 EBUILD llvm-libunwind-6.0.1.ebuild 3738 BLAKE2B 5c58eb49bac3d30643ea2d82f5e59add83fff5154ab335180778b3c7c9e7cf87b2423ee76401dd25a2fc89f5a492440236ad47328dcf05af87d4961c2c2f1761 SHA512 712fc6d98152c397f7436ffbccf62646ee53e14a5b9fc2c491b3c0d8dcfa40e81b16a4d9b7d5b1d81769282ead75d93994606fe6cf3ee08d80eaa5707f182d8e
 EBUILD llvm-libunwind-7.1.0.ebuild 3739 BLAKE2B 160c33fd885e26e19ad02304ee792cb26868e92bcce527246e726e5415c63c071cc72858d35bf4d03111d0e85756b744e00f4f0ec89523232e088d3342f61adb SHA512 260d39e26ae10d62261c2cd348ec487cdc8950997c04b73b3773482fb8f54cc5518dfff58943727892fb7ba57752e1bfe785b2b621c4f00f3bdcdd909ab266c8
 EBUILD llvm-libunwind-8.0.0.ebuild 3742 BLAKE2B 2284e1919e3a6dfacafc424dd0c7cf43f1eb5810ca061096801867397b40989989c4ededb3aa60261046313df3064cece909a2f9343d2225e9e7e273c7a693e9 SHA512 69d4b2bcc157f2851a1b88ac0db3a18391b1e1bc8867f7725804133fd8b91cd128299c182c7d718c98cfb062d456d14181f9fd2885cb2c32e32bb3b96843728d
-EBUILD llvm-libunwind-8.0.1.ebuild 3841 BLAKE2B d4d2346264a5bfc924ad9cef8bf55f5021074597a81278f175c40410fe3edefb5738e56eebeb82053aa325a7d0b2af545f057517af71420e8bceca2988b8921a SHA512 fe53dd13dd8db83812ff9b4ac91c8b486edde12b59449ca2259b3ca52997d31cac137bf57f05641d2e771f5566f83f6d809a88711e475320a7894f629c2abfdc
+EBUILD llvm-libunwind-8.0.1.ebuild 3838 BLAKE2B 66cfbbe8c4681581c377ee8afc3f878fcf5793ff670b9b2c4ada61edaf69672f0ee7174bca4b7fd8fa8ecba6b9137515bc56286684967dc8f162ae4f3c175a48 SHA512 9d12f629041eca1c9312a137f7f7425d3afe5775c2396fa8e1d9c82d9e44fabbe32e0406f15479f70d02df9209669738dd1f66ee6a3ee2857c3399092af7d68a
 EBUILD llvm-libunwind-9.0.0.9999.ebuild 3943 BLAKE2B 0f310507cd16f7f1a9d64feb41dacc26cbf89d91e2ff8f246e152315e871fab99ae528e4500188bfe0cde00b4d9a6eaa2332e39ee32b7c30409ae809d5044745 SHA512 4f6fb06a1b6c72b36293d243bccc15d8c457a5b2b5cf0c0b6fbdbb1dbdac2cfb6b56c71931e2347e0c41182c3766832bd73e56892534c5cfad2f1d13a59de4e6
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
index 48723607244a..9d6ddc3b2cbd 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-fbsd"
 IUSE="debug +static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/lwp/Manifest b/sys-libs/lwp/Manifest
index 24f3dc20b435..13bd9f58b956 100644
--- a/sys-libs/lwp/Manifest
+++ b/sys-libs/lwp/Manifest
@@ -1,9 +1,4 @@
-AUX lwp-2.0-amd64.patch 866 BLAKE2B 231e806f36c17ec0501e0ec646f16093408ecd25bf612a29a0cd34550c966f53b891d1f2522cb810a2fec9661cef2be9747537a17e06f6e8f6e257dc7694eb50 SHA512 f66c3d7111673ddf503a8ebd82fe22db9bf92dcc4bb7d9ce8fbfd3c65fb699a4f240c04700fcdb08c582a4f2be8da7ed870ba07cbc3d81110b2fc29f69028dd0
 AUX lwp-2.8-ia64.patch 523 BLAKE2B d5fd6257a690112cf1a4da4e83035244ca97ca9d306ba7ebdcbe701192ce3b49e93a237d823780abab1ab4bef8c41370d6aecf0d5a9828345121ce14b555dc91 SHA512 5289f26b363a480cf5d22c0c4217384e9d3338b573beaf1b2be5287a039732b1c53d6da024d0a83c4377561e86edf1676d01308971ad331ccaa006fc822443f2
-DIST lwp-2.2.tar.gz 376136 BLAKE2B 2f80ccab5cdc7e910a0ae41416a24a8fd2a6da86799f1393b23fb570d61e6973aa4ebc70fec8d3343465bbc5eea1280fa70d14ca2678d2b2d490333b5cef2f2a SHA512 a5fa52c0483e04fdbface5f0e9cc85bab5db59c4d730a3cb3c538ccaa3a88aaa916b37478e4c5450e77bcc45638987610ba619995a75541d728f138f103c5d7e
-DIST lwp-2.6.tar.gz 372225 BLAKE2B 86b00eee6f2acafd9214c879255936ba40c27a5773d47a1e58375775a80c96b739cc17acf6aacf3b161e53445d947af341a555edbd2cb8783741075bfacaea43 SHA512 ad8374ddf55ef9fddf9ce0b8d7c2ae0dc206e5108a01f278a37486070ab70e5bd7312f057863254b4fc430cfbed2c36f589807813e6a99067933142d5225395b
 DIST lwp-2.8.tar.xz 270008 BLAKE2B 67107f880d5052d42166fe429cda14b4d733bcc3e5905cf48b23898e0da590854ca935ea0350c77be75c3f27d2624134c17159e5f2981ac8806bd78906d7de41 SHA512 c56f3b350e888b5bcb2bffb41086f8926e975aafae236be7f1d2153bb178a37564b77d7598db1aa915714ce8e2ed1904663ce2113f5d0853173cf5e189958bf0
-EBUILD lwp-2.2.ebuild 743 BLAKE2B 9769b2d8bef4dbac08721740c7a06c0546f2db5d54e6c8277bfa4505b331910cf04a72af56b01af88fd5ce21268865ab4cdb048e95e2e1502efef3add1199e93 SHA512 a0f6b1911cf58893fcf81753e43f41c25d8e9151ad15189cb3e99fd432fbd2d6761002887a2df52e3479a70e1f292486ee61835d9802bdb686ece8228a052c16
-EBUILD lwp-2.6-r1.ebuild 524 BLAKE2B 542f127237e8ed1b0ef5a2a94820e54efefde2ee98387d588e29a104f4a7f7c7dae122a6221b05292ce81c0648de70bde114fa1a62cb1240abdc9e1185031de4 SHA512 59b622850763aa9e36733f3a72ad037cb94168fa9fe0ffd7e7a3d870601f252a72deecfa457d2a7ae79c5b75d0d011449b940597a8df856b4dae714ff699d3e9
 EBUILD lwp-2.8.ebuild 522 BLAKE2B fb5f3ed46c3f5b025604f6e64d43fbad5d173c9319cfbe2792bdbf452a2525f71a4501ccccf3d89edd84ba7fb6f148faecfa00f6f3a2c95c48f69c17801ea38e SHA512 7f57ee9faeef1bfc493c1c6c7ab6b7aa5a6131d7861b0fa5aae82231103bc727a6d60e43206eacd22b029750460a4b8b71526ab32a567807ff1b24b85979ee58
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/lwp/files/lwp-2.0-amd64.patch b/sys-libs/lwp/files/lwp-2.0-amd64.patch
deleted file mode 100644
index 64a1576f0894..000000000000
--- a/sys-libs/lwp/files/lwp-2.0-amd64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ruN lwp-2.0/src/lwp.c lwp-2.0-fixed/src/lwp.c
---- lwp-2.0/src/lwp.c	2005-03-25 17:50:56.000000000 +0100
-+++ lwp-2.0-fixed/src/lwp.c	2005-05-05 14:32:56.580753096 +0200
-@@ -463,6 +463,16 @@
- #ifndef MMAP_LWP_STACKS
-     stackptr = (char *) malloc(stacksize);
- #else
-+    pagesize = getpagesize();
-+
-+#if defined(__x86_64__)
-+    /* [gb] Ensure minimal stack size. Heuristically determined
-+       through tdb test that 2048 is too small when printf() et al. come
-+       into action.  */
-+    if (stacksize < pagesize)
-+	stacksize = pagesize;
-+#endif
-+
- #ifdef MAP_ANON
-     stackptr = mmap(lwp_stackbase, stacksize, PROT_READ | PROT_WRITE,
- 		    MAP_PRIVATE | MAP_ANON, -1, 0);
-@@ -483,7 +493,6 @@
- 	perror("stack: ");
- 	assert(0);
-     }
--    pagesize = getpagesize();
-     lwp_stackbase += ((stacksize/pagesize) + 2) * pagesize;
- #endif
-     if (!stackptr)
diff --git a/sys-libs/lwp/lwp-2.2.ebuild b/sys-libs/lwp/lwp-2.2.ebuild
deleted file mode 100644
index 85cd229c0241..000000000000
--- a/sys-libs/lwp/lwp-2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Light weight process library (used by Coda).  This is NOT libwww-perl"
-HOMEPAGE="http://www.coda.cs.cmu.edu/"
-SRC_URI="http://www.coda.cs.cmu.edu/pub/lwp/src/${P}.tar.gz"
-
-SLOT="1"
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="sys-apps/grep
-	sys-apps/sed
-	sys-devel/libtool
-	sys-devel/gcc"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Was introduced for bug #34542, not sure if still needed
-	use amd64 && epatch "${FILESDIR}"/lwp-2.0-amd64.patch
-}
-
-src_install() {
-	einstall || die "einstall failed."
-	dodoc AUTHORS NEWS PORTING README
-}
diff --git a/sys-libs/lwp/lwp-2.6-r1.ebuild b/sys-libs/lwp/lwp-2.6-r1.ebuild
deleted file mode 100644
index f4206728130a..000000000000
--- a/sys-libs/lwp/lwp-2.6-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Light-weight process library (used by Coda)"
-HOMEPAGE="http://www.coda.cs.cmu.edu/"
-SRC_URI="http://www.coda.cs.cmu.edu/pub/lwp/src/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-src_prepare() {
-	eapply_user
-	# Was introduced for bug #34542, not sure if still needed
-	use amd64 && eapply "${FILESDIR}"/lwp-2.0-amd64.patch
-}
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 5c90223df3fe..efc0ce06e987 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -6,6 +6,6 @@ DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b
 DIST musl-1.1.22.tar.gz 987296 BLAKE2B 0326751e1d1bd5b909938159e709daa1ca0b2e51a3f3dc1fc80caa3e7fc0e9fe0fa64d6dfe7d870057fa8e97100a3a89bfe4449fd4c04fe3af17d0f105dfb9cd SHA512 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87
 DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09
 EBUILD musl-1.1.22.ebuild 3240 BLAKE2B 756ce888342f6b9f7501873af701bad4e4b429fcd11a9713e168da63da641d0fbef39a25d002a88f6d988a6a1b0e79e24cf042acd56a1903b95905cd811ecda6 SHA512 c7b779730e7c5b56618d0a53cd70e02e4f3e9f443c91bb59237fbf72dea1f6d7fa2e480312114b98db012ab4e716d0ef1481019788389edfc21b56c1245e28ac
-EBUILD musl-1.1.23.ebuild 3243 BLAKE2B 8b71faa27471cdd6e645b15fa3d9e08f0076d729262c27e7b132c329344d4a30513a18f1fa6997e5169fb95eeed25e5ce6b6657bdb42aebe2ff098c0bde5eae4 SHA512 3b261897998feda25bd51d0983b664071dbb3f4607dc849be761b4a319aa9e325d1c0a5f4d61f8580d3d248cba58172fa96e5d727b2d9728c7e03269de9cc70c
+EBUILD musl-1.1.23.ebuild 3242 BLAKE2B 2d7c121e43f3f3dcc39daa3a27049ffadce81db16b055c5807c7a7ea7e62cae844145d2f4a737b92ce5c5601a3b494726a842105b983a050a2dfa09763885a76 SHA512 a0b7e420307c6350a7ffc1f026bf41de5c8692c7791b7c7941902ebb6f4427a2b0ce039acb983ffd8b0c8ae7df76ea2d224ead0b8f931fea41f566a3204d6750
 EBUILD musl-9999.ebuild 3245 BLAKE2B 96b025385b2f8cdbc66a91bbe4bcabdb6daab5fc6dff29f4f78b10f0d02daa2c4f4ff9546f55b67fba4552c3fdfd3ee6deaa21dd2b4f52b95a114070cee587aa SHA512 8a789f0d2988be8567647258a45989b708c9d50f0fdae020160931af140c6566f68551ff4ec423beaf9a9043490888c2a99b80cfd826a98d46553609b7994de8
 MISC metadata.xml 453 BLAKE2B d7b2840a6b0bb2ede2124f22bde34a9f77ac258792a9fbf9d9e3f552a85d6ee539a98c8704729efb75dec627db62b33759fc0cfdfd01614abbc4960a163c5019 SHA512 5d8bebce119ed34a6a6b8cb07b3ce056db5efc91db80709fc8031c955b16e29965f3741f75e9afbe9f428bbac1e39e7c30278cd63f04479e3a1493b006195e0a
diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 19c1029a0454..36f4183156b3 100644
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.ebuild
@@ -17,7 +17,7 @@ else
 	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
 	https://dev.gentoo.org/~blueness/musl-misc/getent.c
 	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
-	KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~ppc x86"
+	KEYWORDS="-* amd64 ~arm arm64 ~mips ~ppc x86"
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index b60a067747e9..3f67676c2050 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -16,4 +16,4 @@ DIST ncurses-6.1.tar.gz 3365395 BLAKE2B 1248a5088bc982d0880cb9550b1192457f6f6249
 EBUILD ncurses-5.9-r101.ebuild 5287 BLAKE2B 7429e04203c35510eec381f3ac1fe28292b191c1b0d3f37d467e97b90c3d53d03a564745a1cafbb6a6032a895af7cc4e172afd9d91ac9315463786f545117e47 SHA512 98daead57237d72df9450e95d75f25949cb0056973e29801f06bb6352e66b3e9d94212c555a72e6fbef66fa778a74acc2c2a5a9027bfda719593acb062356df6
 EBUILD ncurses-6.1_p20181020.ebuild 9288 BLAKE2B 5e37b4794b93a896942a7cd2510e1696128bf4b3d9f84be6016a1aaacc6a9a1c9fef134c4ec2812541720863dab20fa303582eb3ad3a41dd55b4da7cb261c9d4 SHA512 07fccd57e13ef6732a69c0bc1865b8f6d446097f919fde7d830469867cc15f791e4692f2b051a9b37cc39fd1d9f2d5234855404242ecd284b5f5a8f75573a612
 EBUILD ncurses-6.1_p20190609.ebuild 9497 BLAKE2B 7e273a1ebb12f343e92e822cc72d944aeeb10deb356de599d2e3141454ec443445ac21812e185e2e67bbd659baf037ef0f2c17063eff5643d661416039a6e066 SHA512 63e9874446bf271fa3341f707c76a5eb06f4c7388e788a24666e2605ea1f7a0f42dd58a4f6ca735c107fb43558d279dde58009dd049277f9e2c377ead2df9254
-MISC metadata.xml 619 BLAKE2B a5b29f22ce491bf7a308673944651ea9d916a6d487a45a2a7ee4a7e8d33f7b3bd398e3edeb830f0b443cb4524c0b73af4d6e1511e8128289a76666acd931d611 SHA512 3f28fd8aee675226f641d72d7437edf4c5840cdac3dca64b6a4c61902d4f4127d86f65acfefb270cba2fcfb0ba9d6ff9d3ca24930825b89c82f0eedc8160f9ef
+MISC metadata.xml 696 BLAKE2B 00deabf0f9a310870a8080425ee4df0e581c6871565f5f3c42c823f51bb4fabac4a8980e371f2bd142a982b6369527bee184ecb941e5d5f31697a871cd0a8237 SHA512 ff73226dc25e761ad9106768fc7ad0d2c40b6fefd3beced9ba5dfcc31a499220408fb2f2a6fd8aa53bb360398154a3653bf0e0ddb16c4ef4e5e89fe60752b7b5
diff --git a/sys-libs/ncurses/metadata.xml b/sys-libs/ncurses/metadata.xml
index 888a6adf6636..1030e9cebbae 100644
--- a/sys-libs/ncurses/metadata.xml
+++ b/sys-libs/ncurses/metadata.xml
@@ -14,4 +14,7 @@
 	</flag>
 	<flag name="trace">Enable test trace() support in ncurses calls</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:ncurses</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 5ccf5159a40d..b4988e81971b 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -50,4 +50,4 @@ EBUILD readline-6.3_p8-r3.ebuild 4390 BLAKE2B 2121e1c1d5b045fa0ae14db133a80e4b52
 EBUILD readline-7.0_p5.ebuild 4843 BLAKE2B 77f5eca75e11a2a2c3de59020a3030593670e402c2c58efe786507a3cbbda015f9714f187434d53eeb13b9d47a3fb8ae9f2a032c67272326e076fe56c44333cb SHA512 b116fd9a52913d615845f23ab5d37bca0b478b03779ed7aa229dc929565e47bcd757625f636088788721debd43171e133ea5f40e685918f6df519dd670e7db78
 EBUILD readline-8.0.ebuild 4812 BLAKE2B 34c5b37ae51086570439f333067a8276f2160c9ab7d2b6e1a4639164ce9d199b253689dd69beba935231b251729b8af36ee938c12bba03d1440ae463b8f8f128 SHA512 c1afbacd9c1297570a6c8a116faad750a3236e25b7ec30bf2861492e0c3578d2002e9995c11aa9cce86c88cb5567c89c6f9b6343fc4d57f98a5edf5bb8e83c3b
 EBUILD readline-8.0_p1.ebuild 4840 BLAKE2B d0dddfb82d703dd45801ff9079861a0213cb11063fa7608a195eb30b97b4d7e635eef028ff8f17daf37716b701ce514284bb7422ee5720c2bbcd7203a42dec1d SHA512 a8079e8578f0cc5c7fc616a76d69135fb3e95965328cd38097398458f760f812612951381b143106612f316068871a941d5d0c1b3ec396fbc457f4fd902e79b4
-MISC metadata.xml 394 BLAKE2B e4fee9daaa3d2c66a9425c988c855768ddb74af714f9e259fad1e3a470ab10af041ec8ca82d106fd967317e555a492b35723d60fa913ffac200212af14ca5ae1 SHA512 e27930a59d80535721eda0d3c481b1d13a66915c6d9552d960c9ac788f3dcdb0ef3fc411803a36cc98441ebbb8a4e0c1086bc2bda01511549fbf2921a7017784
+MISC metadata.xml 472 BLAKE2B 8d3717ac6980105677b10449a1aabca9f9347066f73802241b904101172690bb789b8071f3670dd91ad2af0223c7bc5fb4ed594dc8af3aff20b17bdd681f7630 SHA512 f19a6f0d6aed18903778adc5ad45fdae39c4388e4f09e7cb8a110b798e8cc7ab1739ff813a227ad08ef1166309e1ead57c200b7fe42499a06db97af9f4bce173
diff --git a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml
index 49d63436c4b4..6bce63269f8b 100644
--- a/sys-libs/readline/metadata.xml
+++ b/sys-libs/readline/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 	<flag name="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:readline</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 0b0a9c706de8..0f6c38c5efc4 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/anacron/Manifest b/sys-process/anacron/Manifest
index 9ff54b0c7b19..a731a5383fda 100644
--- a/sys-process/anacron/Manifest
+++ b/sys-process/anacron/Manifest
@@ -4,6 +4,5 @@ AUX anacron.rc6 252 BLAKE2B 5237dbe878e9d5393f05b2671b6ee81461cd478cde37a2bf3527
 AUX anacrontab 468 BLAKE2B 4f77a6759934e0e2693f3abeb9fe208de059d019906dc6c09160ac8b12e0c311d5f3414092c1cb6e62c947d950bf5fdf7990a6c351f4218f366ab2aaa4280c08 SHA512 f04850d22b459fe95bf5ccf594143f6fb02a1d29fc9cf36d2965a8b846920bc36b0d2d5665c5d6ac9828b904a4f30da49f62f6bedd51c75f548b981e056f097e
 DIST anacron-2.3.tar.gz 24140 BLAKE2B 70fa2c716172a538b6810b65a4b80d8d8b70e8de7569856236f6386e30a3a77acc6b7aa11dfc3ce06aa432bc74009aa6dd44fd8d3b70f8585b979d0c5c596b98 SHA512 27bbbfad5bc35ddc68e4345c3a3acefd0a6f794aaba890f7c75ec42b2e4c4200fbb1667e75b2e344afb7722bdc9ba3dc5a7db66d3369808bc9f483ea3509849c
 EBUILD anacron-2.3-r2.ebuild 1422 BLAKE2B 11d51a26fdfe62619f66584c6084e44ace99c029bb1fdd0228d55ff444bb82ed4a9733137d58fb511c4edaceb76e26eadc9057f60a42c73f666710a2a5ea53e5 SHA512 dc28aa765c65198333a740574140db23f778b28212e3b499485720f19315689bb75f8a3e75d64436bf1295741ae34b7e27daa970166196b8e2cc24b1a802c583
-EBUILD anacron-2.3-r3.ebuild 1444 BLAKE2B faea7ea4ef3206b2d500f5424bc245ff49c0efd8594fbdfb9c99f31874559a121745eb817e066291dfed3a20ef92a34a20b1897c20451be798426ea37b7b6246 SHA512 2ce3e597493c8ced6cacbe6e15a36903eb857a1b27cedc80c1cbb109436dfbe39bcf49b0bafdebd812d0d352c03f831fa5334d676f1ca7e6e033ab9eacacec20
 EBUILD anacron-2.3-r4.ebuild 1443 BLAKE2B a7c39be2c6c9b85b59566d3dfcc151097c0524bbd69692ad7c63d48b36658a6c76cd95e124c5f0de3a18a1f0c5a8df9434b9da82f3f3b1b504cfabad89f61157 SHA512 82f32961b4d066682474eb3f6f26589000d746b9251ae2a826c0901d49869aed7c17096cf56d5ee6520bda49ac5ec1a6f2a2d9a8806f874454f5c4835eb5a1cb
 MISC metadata.xml 244 BLAKE2B a650691e7c7b4c902aa2797645acba4fff4434a8b098b140e0eb711d81078e24df71625176cf489397639b117be475d38ede9697e60dd809ace97aafb2387c66 SHA512 991ccea1a22791aabec3cdf5cc996892d6c595263fd92b07a4b2b52a1ff32d96198aae09947b95b08e62542958225218890b08367ade7a07dc04ac332c5e4cfd
diff --git a/sys-process/anacron/anacron-2.3-r3.ebuild b/sys-process/anacron/anacron-2.3-r3.ebuild
deleted file mode 100644
index 30f89d829732..000000000000
--- a/sys-process/anacron/anacron-2.3-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a periodic command scheduler"
-HOMEPAGE="http://anacron.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-DEPEND="sys-process/cronbase"
-RDEPEND="${RDEPEND}
-	virtual/mta"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-compile-fix-from-debian.patch
-	epatch "${FILESDIR}"/${P}-headers.patch
-	sed -i \
-		-e '/^CFLAGS/{s:=:+=:;s:-O2::}' \
-		Makefile || die
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	#this does not work if the directory exists already
-	diropts -m0750 -o root -g cron
-	keepdir /var/spool/anacron
-
-	doman anacrontab.5 anacron.8
-
-	newinitd "${FILESDIR}"/anacron.rc6 anacron
-
-	dodoc ChangeLog README TODO
-
-	dosbin anacron
-
-	insinto /etc
-	doins "${FILESDIR}"/anacrontab
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Schedule the command \"anacron -s\" as a daily cron-job (preferably"
-		elog "at some early morning hour).  This will make sure that jobs are run"
-		elog "when the systems is left running for a night."
-		echo
-		elog "Update /etc/anacrontab to include what you want anacron to run."
-
-		echo
-		elog "You may wish to read the Gentoo Linux Cron Guide, which can be"
-		elog "found online at:"
-		elog "    https://wiki.gentoo.org/wiki/Cron"
-	fi
-}
diff --git a/sys-process/evisum/Manifest b/sys-process/evisum/Manifest
index a41278be3606..c234837fe3b0 100644
--- a/sys-process/evisum/Manifest
+++ b/sys-process/evisum/Manifest
@@ -1,6 +1,8 @@
 AUX evisum-0.2.2-respect-cflags-ldflags.patch 458 BLAKE2B 9c40cb1b47b6fa52f870e281e18f7858aac131ea542d4afdeb7e9a52cb6cbc7658b5ff425d359e9471c101bfdd81cd0f94b90bfefacb4d1dc1da5aafea5bdd97 SHA512 e2399269e346f50c3c265cefdf3996e89fb9fd5d9da060e8cd27c70284279cae3ae6fcb183573cd286a7e4a028dfab7efe41fabeaa5eb74e2a5c227383f2e025
 DIST evisum-0.2.3.tar.xz 85000 BLAKE2B 3f3a43ff569d05550d092930f1cf61eb4deef2a449bd1b407b0f460c15887b76fc430ecbbe8357e6a06d6c34cdce68321d38922635ec4b9caccad084d9c619d6 SHA512 0043432f2b434c2bbdbe03b96d29a3f9515d063bdf5ae61ef5273aad1ec6dbc532860af4a22bebf275f171585e793e3851eec9c98a7eaa4645e32d3a79eafdc1
 DIST evisum-0.2.4.tar.xz 84604 BLAKE2B 36219949fdc63ee08be2577591ebb8c746abdf583ae7d9683be0809bd452f0ec8026e65221f8094b18340d54440f303b6ac21d4ff99cf7919a20046ef3ffa1b2 SHA512 31360e8965e9078e8d66ddbffd7f71fec75e327ac1a1a00b9e6337cfc5e80028beaa141f6feb64221098c4a202a410497ad96280e2510d91e84e44038662d540
+DIST evisum-0.2.6.tar.xz 85532 BLAKE2B d673ab15e589ffcb79e1425f948ec1be760d199f0837ca54fc9eec8524c597d5c7f914126fbd581610a97a3a9078cea695691b371fe0272e3dffbfd337d29ae9 SHA512 175a28f96a9a001acfc241b04adf93244f4bbe5bdebe2d8dd86660e6c1749c31fa676f77b016c264565cafe29ebbbcc5b6db6062fc53f657700e2b0d0a866d10
 EBUILD evisum-0.2.3.ebuild 647 BLAKE2B 5be77ea47801cf4dc982300559d2bc3d21cdfdbc807c3ae87b17a15a517e9cb11934a9ccdf4e232d449e694d5b880458156a05c3a27b98a4bab10fdd0a7ce653 SHA512 828700dc6177e8c8904635848b8a19d3ccfaac2dd251789e28174d67229a595e50b1b66ef0083c83b5e8807422276f2d75a097821f6be5b618ada15f8d10e666
 EBUILD evisum-0.2.4.ebuild 647 BLAKE2B 5be77ea47801cf4dc982300559d2bc3d21cdfdbc807c3ae87b17a15a517e9cb11934a9ccdf4e232d449e694d5b880458156a05c3a27b98a4bab10fdd0a7ce653 SHA512 828700dc6177e8c8904635848b8a19d3ccfaac2dd251789e28174d67229a595e50b1b66ef0083c83b5e8807422276f2d75a097821f6be5b618ada15f8d10e666
+EBUILD evisum-0.2.6.ebuild 647 BLAKE2B 5be77ea47801cf4dc982300559d2bc3d21cdfdbc807c3ae87b17a15a517e9cb11934a9ccdf4e232d449e694d5b880458156a05c3a27b98a4bab10fdd0a7ce653 SHA512 828700dc6177e8c8904635848b8a19d3ccfaac2dd251789e28174d67229a595e50b1b66ef0083c83b5e8807422276f2d75a097821f6be5b618ada15f8d10e666
 MISC metadata.xml 815 BLAKE2B d969cde79150c0cd2977017520a7ac95713b1c43aad52645f4d354f5a3ef3320638f5da097f0b7999689135036f1f8594b5331d2ca3420af93a2c3bfc726569e SHA512 c1b2c28863e8572ddfb79f8159e9ffc0defb4dc9c7b02c3ad7b1a4804ddcad06034471d9774f4e09bda1c84a8ce72393172f194c30cb5e5fda0a1177db842c3e
diff --git a/sys-process/evisum/evisum-0.2.6.ebuild b/sys-process/evisum/evisum-0.2.6.ebuild
new file mode 100644
index 000000000000..9ea74684dde2
--- /dev/null
+++ b/sys-process/evisum/evisum-0.2.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="System and process monitor written with EFL"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/efl"
+RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.2.2-respect-cflags-ldflags.patch" )
+
+src_install() {
+	emake PREFIX="${D}"/usr install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index 3ee280bcb3b3..0dff8e66c8c0 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -4,4 +4,4 @@ DIST lsof-4.93.2.tar.gz 1319222 BLAKE2B 3b1756e7b72a0b0a2a11bce82a9b386f6dc5727d
 DIST lsof_4.91.tar.bz2 791734 BLAKE2B cd6211caedea34fdbb89266fd78a70902117eda6d4d7fa69115426f4a6f5cb5296fa09bbd946648d8d93483881e4ea4e2190f090be155c1081850e8366cfd05a SHA512 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92
 EBUILD lsof-4.91.ebuild 3603 BLAKE2B 2e6e36eabd3dc6aa592dc3bee6560bd0c616a08016142491d5a91cd60b538ff51b2481aa2c244cd43dc83128c8010877b8e0ce0b16098446ca49110025682523 SHA512 e33d67630f3786d8de94fc39a0452f8eaf06b294c6169c1f6eeda63ec975ba7156cddc7b54d55a1a84e8dd8a9be18d6ad0801821d08ac0167782d70f3012e7a1
 EBUILD lsof-4.93.2-r1.ebuild 3428 BLAKE2B c3dcc51ad7ca3c4f09f5e19d9f4c95ed55cf2913e99d7d1e67d093449bb9a8c55ca18963e8b2dcd0bd7e0dd3a2300feecb007179052599f278c14772ce0e993d SHA512 9e33c262db6493fae3218c0ed8396d45de86ed4649b3296a449dc8a5e91af9ff4d459b9d8e61f1ad54fcd764b0dca0f2f58f9e0e6cc985785faa3cfdff3492a3
-MISC metadata.xml 327 BLAKE2B 4dec6763546c6f65ccd6a2483e6cc99203313a267ee5f18ca0e646f9af8774c8760e4f56711735f2c64880af8bc78e26b22e47774b36fb48ccd2d841647d274e SHA512 c8c0efc3b339063936d805d533cf3528e1a4e1a84829c0e0f993fd3268751f4d7d4713f45cc6fec2956101b611e6e344e0c0336eb8d1b769a47481d72088fb98
+MISC metadata.xml 410 BLAKE2B fd0f172a687fe180b6fc367195925576c468612bbb516fe582ed6fb8be19c5de238f9ce3e762f2bedba9802167c55995f5d8319ffeb681cdb4a91e01a9292ab2 SHA512 47b91158e1621c03685f821f3126fbd3c4a6336fedb79c85f7fc245fe0a724b2df46e18abd15f926f5739b70e93072817ccde5862c9712314bf7cd9a4e43a812
diff --git a/sys-process/lsof/metadata.xml b/sys-process/lsof/metadata.xml
index 4f913c0bcab0..159182173aec 100644
--- a/sys-process/lsof/metadata.xml
+++ b/sys-process/lsof/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 	<flag name="rpc">support looking up RPC service info</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:lsof_project:lsof</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-process/numad/Manifest b/sys-process/numad/Manifest
index 29730a419ee8..05a06614cc9e 100644
--- a/sys-process/numad/Manifest
+++ b/sys-process/numad/Manifest
@@ -9,4 +9,4 @@ EBUILD numad-0.5-r2.ebuild 890 BLAKE2B 0db9cb7690a9ba505ed8f17cf34fe0ee660e13566
 EBUILD numad-0.5-r3.ebuild 1127 BLAKE2B 845f5ccc5ffa599a22786aac1d14eefa41ca913436adbe21b61e14e07a78ad5b2b24221fde84a4f033d8643bac05cd7c9e3ca2bb23cb640311e6ee4e95c566ce SHA512 e3d08fae0d825dbab40f82fad728a4e6e95c2849cdab1ee69cb43619bfa2ecb45818aba2e7b6564e249c03ea90b8817881390e694136829a2321534d866cf654
 EBUILD numad-0.5.ebuild 749 BLAKE2B 6809148d97102d48ba30aa3d56eeae53b7c1bfe5b3c7db445496cab3b160d53e2fb57f6cf5dd7fc53a057114405dd7b625e26608a8412e256ddcea69bd6af8cd SHA512 a0e13444332366c33ab78354a0c7d04943322d11299f5c69898c45e61a2debfb4de9f04a95e81f2efeb906eec65a41bdf2b1772a53f9bdce54c524775826a12e
 EBUILD numad-9999.ebuild 980 BLAKE2B 467dffd645719dfbf60d4040628f7fa32701a1b70e251e2be9108392f9386b7373bb573bb85663c5dab6ff40362826d1567fd4c216d6f9256c668473976cd5ec SHA512 c460b61e43aaf24ae57fd147aa96c7539c319511cd48d29d5293947560341be8f2c15a5c9d00d25a24fada95152080606536d5ebf18f67568122546586a4d18e
-MISC metadata.xml 328 BLAKE2B 822cf0f0fc28b6d632cfb157d4f75e9e1e9744a142b2e22de3f80fd0c385e47ae9978a547c8287c4eea709e92101e52ecfc2d53a63bd0db8541f310d6aab1112 SHA512 1512c4008e723063cd4fbf1b82319fa2d55aad398017c17f6908bf9c6079087487490b68c5f5f63908dac835be5ef1ae299eb46168151a105ee1e093352bdb36
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/numad/metadata.xml b/sys-process/numad/metadata.xml
index f5e477fa1c04..56c124413057 100644
--- a/sys-process/numad/metadata.xml
+++ b/sys-process/numad/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>cardoe@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index e826c487f183..4e88253e9000 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,9 +1,5 @@
-DIST parallel-20190422.tar.bz2 2011139 BLAKE2B 09da0f286ae0b7ed09225d0281eee1e73dfcec40723a35c6107f737d4d8cb50cda8df0391ac65f9a9a23d4e2af106991e3584007dd1828369c8e9decdf3b3433 SHA512 0b08b2883d8eb33ccebfdd3707a53f16db9d70ac3ca0637d369e6159408c494d34c494c868c7b537083f17a1145040f3f2e6290380d302a18d337d752ae219ef
-DIST parallel-20190622.tar.bz2 2037056 BLAKE2B 4fee4635e5643a07001f159a7748b1bba97b73813f893194ccd94fee1443130bd99bfbf430e6f0d8b78963e4e628d34a8b25b3dd0adb479ab1f4fa1f2d8edf92 SHA512 c785537d127492d52c1eb40b5e3111f0ace3197dfacf0af4676d0722dac22dbf3e70f37c90508e8cadb3fa9a709ac647615dd221f27c231ab4ea7a2d2c3d23b4
 DIST parallel-20190722.tar.bz2 2055028 BLAKE2B 4c0d21eb44298ee970e9bb1838a869c874b1057081010a990c1122f615df3eb83a99c2e8bd6b5ea6612fdebe7db213ee631ab143772c6b64dae7bad59ea08d4f SHA512 37d76081863c05200082cd4d6b97c03628c2a77e6565df69c099923ef5025d3509bb4802791cc4a6e79056471664f7eae146c48c293f71c6f7719ff91dda1217
 DIST parallel-20190822.tar.bz2 2066472 BLAKE2B 02dc53d9074ba3e41f1c9aaaab216b0a56eb03d1821c0e75383cdf9a5b08c0091fbf971a27651c39c435ad9211a024b9461f8cfd9e9c0bb466bdd8945b7fba17 SHA512 60adc8b0283fe5111864be08e02383d6dd49304268dd48dd2fb48c8417b3545bdb1cd6ef7820b1688f3ac22316bebd2573639af0f57c196c94cda5321daf623e
-EBUILD parallel-20190422.ebuild 875 BLAKE2B 343f4c995cada466af2808fcf4446bd4335423998d212313ab2797433617f61c307fca7ff65bd00ec124c6814b76c7010ef12e01f198337fb2702394fac0816b SHA512 2e5275b74295ca8cd480314dfa5e5c941eb61f52a47e852c3d0c2e397b56aa20ec2dc5f7808302a8b97a0e2920749efb9e5b058c54bf4d7811174c1c6ece02a8
-EBUILD parallel-20190622.ebuild 877 BLAKE2B 2c7d88b69284f33cb6143cbc446029473d55edb7dd34b7a76731c3611d272deb0a8824160b288444d9bd618a6346070b7b8ae11d507f67461ee6417752162d1b SHA512 f02bf01d25ced665d53e21fc5b6c42f935c356aae8dce6d85fd713000c35c865dc9c7cdff51a4ae2b346789f20f2202281929775f27d4a8bb1d0407ba3cfa3a1
-EBUILD parallel-20190722.ebuild 877 BLAKE2B 2c7d88b69284f33cb6143cbc446029473d55edb7dd34b7a76731c3611d272deb0a8824160b288444d9bd618a6346070b7b8ae11d507f67461ee6417752162d1b SHA512 f02bf01d25ced665d53e21fc5b6c42f935c356aae8dce6d85fd713000c35c865dc9c7cdff51a4ae2b346789f20f2202281929775f27d4a8bb1d0407ba3cfa3a1
+EBUILD parallel-20190722.ebuild 875 BLAKE2B 1105bb6f44507eb1e8fab2fd23b0dbfbbc3bae2593e50f9734bcb46612f9d91ee11a0bc5316893db4d2df528a4f2e2cca81423980d1a598c16ce8d74ed6c86e7 SHA512 b536e1af212b6ccf77a0e933a3811e7e1867ee0dc6701b60a732be19ff5d919b79350e9f504fb560404a8c00f86f5d926369ffe54c8638fc473ea8bcd6137784
 EBUILD parallel-20190822.ebuild 877 BLAKE2B 2c7d88b69284f33cb6143cbc446029473d55edb7dd34b7a76731c3611d272deb0a8824160b288444d9bd618a6346070b7b8ae11d507f67461ee6417752162d1b SHA512 f02bf01d25ced665d53e21fc5b6c42f935c356aae8dce6d85fd713000c35c865dc9c7cdff51a4ae2b346789f20f2202281929775f27d4a8bb1d0407ba3cfa3a1
 MISC metadata.xml 1003 BLAKE2B a5a05ad6fb91321ade93dc8534764af73614a4495ae0ae023825b155be4a2d8f095df51971bb174c3e5fa335d7753121b09b22d8fef5ec4ffce3460b95fa2ed1 SHA512 a9da23fd3dc9476e2934a06ed8c0638fb3ee2530ea0ed9305a88ef0fa517a2996494d4e97492a709a601937d794748b0cba794d0b919667decdace77123c700f
diff --git a/sys-process/parallel/parallel-20190422.ebuild b/sys-process/parallel/parallel-20190422.ebuild
deleted file mode 100644
index e033960bdf87..000000000000
--- a/sys-process/parallel/parallel-20190422.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-lang/perl:=
-	dev-perl/Devel-Size
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO"
-DEPEND="${RDEPEND}"
-
-DOCS="NEWS README"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# See src/Makefile.am for this one:
-	rm -f "${ED}"/usr/bin/sem || die
-	dosym ${PN} /usr/bin/sem
-}
-
-pkg_postinst() {
-	elog "To distribute jobs to remote machines you'll need these dependencies"
-	elog " net-misc/openssh"
-	elog " net-misc/rsync"
-}
diff --git a/sys-process/parallel/parallel-20190622.ebuild b/sys-process/parallel/parallel-20190622.ebuild
deleted file mode 100644
index 30fa03438813..000000000000
--- a/sys-process/parallel/parallel-20190622.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-lang/perl:=
-	dev-perl/Devel-Size
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO"
-DEPEND="${RDEPEND}"
-
-DOCS="NEWS README"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# See src/Makefile.am for this one:
-	rm -f "${ED}"/usr/bin/sem || die
-	dosym ${PN} /usr/bin/sem
-}
-
-pkg_postinst() {
-	elog "To distribute jobs to remote machines you'll need these dependencies"
-	elog " net-misc/openssh"
-	elog " net-misc/rsync"
-}
diff --git a/sys-process/parallel/parallel-20190722.ebuild b/sys-process/parallel/parallel-20190722.ebuild
index 30fa03438813..c2cccfe01b9e 100644
--- a/sys-process/parallel/parallel-20190722.ebuild
+++ b/sys-process/parallel/parallel-20190722.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-lang/perl:=
diff --git a/sys-process/rtirq/Manifest b/sys-process/rtirq/Manifest
index 22e08c6b48b8..6717ffa3c8cd 100644
--- a/sys-process/rtirq/Manifest
+++ b/sys-process/rtirq/Manifest
@@ -1,6 +1,4 @@
 AUX rtirq 435 BLAKE2B db105cd1c0765a92ede509ec010b8c2c96cd6180dcdfefff3c4f9dac6ed18a2da32f04dc4d023b6b7d21708d9a0897f20ddb4a87cb0c7eef2257bfcf0be2205a SHA512 9b7ef8e58098032f68210b64ae604558fed58a66b8d86ec9198dcf2f4b020582d8c4983d95f60e048bc97c0ef19b4b31cdc615635b4f57902362843a11a5fc6f
-DIST rtirq-20150216.tar.gz 12249 BLAKE2B b138c3b274e7d0875fc18d21ff77291975f86d841cfd06d704b428bcf7e106fb06b4738a4d8dd88ca2e58fa719b8232ef8a61df0bd088c9a368497e27095bd39 SHA512 4cb4e3a8e314cec238c2a21c975bec258f229b660e0994893b73aa0b16f6041179ff4e220532fde237d70e15fd5420e22ee5dbf84168148060e760d76617b59c
 DIST rtirq-20180209.tar.gz 12290 BLAKE2B 432bf6c931b753d4d9a5d7c50a35b0fb9b2161d09c9f762b97a5aae88152de1f3d14a2a4ccc46d8607d7379e4a7a659d603cc09ee20017923b176359eb4b9133 SHA512 9de924e627b91d6df162b6c8c0c3421fbab11f08162abe98b0fac8742ea924a7e0a18aab23d828e19fe81dfdb70f2f6814c7195acbcbc93af9a339dc549190b2
-EBUILD rtirq-20150216.ebuild 1128 BLAKE2B 8de8512f1d1ef106ae9b97e82a6895941237ca00e86de683665a4fee0b99bafa2c9c60bf5aef239635ac14f047df66fbb57f014679eaece84393b33c418845df SHA512 825723f800562b58574c048bc5e38de971d8e52f257801191ca8e87bdae4e2548be4a4935c3270e8bfed5e6263654a0ff580867eedc392eed37236670424ca44
 EBUILD rtirq-20180209.ebuild 902 BLAKE2B 0081b1bc8013e04ef1994fe26296988726a1c080d9f97c8f09218cbb19a14e85db92ac03d666129b0266656a4bea05f22147c1c65622e38aad678e9e7cf9ff75 SHA512 e56be7a09553cdc6b734c04a652f3ebe28196818ed21b3e12b9b1797f392b6f3e8da1cc55024cc9c999e273bb2bc663ed0f16715c34596b443d000e27cec7847
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/sys-process/rtirq/rtirq-20150216.ebuild b/sys-process/rtirq/rtirq-20150216.ebuild
deleted file mode 100644
index 5bd86fb047b1..000000000000
--- a/sys-process/rtirq/rtirq-20150216.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Modify realtime scheduling policy and priority of IRQ handlers"
-HOMEPAGE="https://www.rncbc.org/archive/#rtirq"
-
-SRC_URI="https://www.rncbc.org/archive/old/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=sys-apps/util-linux-2.13"
-
-src_prepare() {
-	# Correct config file path.
-	sed -i -e "s:^\(RTIRQ_CONFIG\=\)\(.*\):\1/etc/conf.d/rtirq:" ${PN}.sh || die
-	sed -i -e "s:/etc/sysconfig/rtirq:/etc/conf.d/rtirq:" ${PN}.conf || die
-
-	default
-}
-
-src_install(){
-	dosbin ${PN}.sh
-	doinitd "${FILESDIR}"/${PN}
-	newconfd ${PN}.conf ${PN}
-}
-
-pkg_postinst(){
-	if [[ "$(rc-config list default | grep rtirq)" = "" ]] ; then
-		elog "You probably want to add rtirq to the default runlevel, i.e."
-		elog "  rc-update add rtirq default"
-	fi
-	if [[ "$(uname -r | grep rt)" = "" ]] ; then
-		elog "To use rtirq you need a realtime kernel."
-		elog "Realtime kernel sources are supplied in sys-kernel/rt-sources."
-	fi
-	elog "To display the rtirq status issue:"
-	elog "  /etc/init.d/rtirq status"
-}
diff --git a/sys-process/usbtop/Manifest b/sys-process/usbtop/Manifest
index be0fc427723d..324305871160 100644
--- a/sys-process/usbtop/Manifest
+++ b/sys-process/usbtop/Manifest
@@ -1,3 +1,5 @@
 DIST usbtop-0.2.tar.gz 10828 BLAKE2B d595fda23adee6778060c25176d1951250bb45cc25ea8040661222736c63aa356605ec8ca52b71e7142cf0f8e7807a77a54fffbc54165178f44af63dfb5ba712 SHA512 43a4512abcff6107ac7a56d65ee19c2b17f4aeb9d38e42e630d724c6744c7d23c85d2c66325c0e6b50404431312754646f1290202fa51f3dee1f94a9d211ba25
+DIST usbtop-1.0.tar.gz 626770 BLAKE2B 4f14e1e8d926ce7f6ffd1a276871d7d9072979d844a55e477c402bcac343a3cc14faebbfd3886b386a48b01399bcb748fb843453a0eee48b8e09578841eab356 SHA512 bc2003c1085fae238d99347bbf3caa1da7e44aa8f5b07abbde3f96b4124b301bbbc896f7b5e341665db1cdba44a59752884e3b9fe3a6104ef804aa94c510a5c0
 EBUILD usbtop-0.2.ebuild 669 BLAKE2B a00a54ac96300e21d924644324afd8b28d726c1fa5aac84e5216d8eca974cad29125fdc9e8a18c6193107c748e5ff275ad486169806063be5d82cf5f056830a0 SHA512 cf05e52e7e7279f7175b92539f86b74148ec0ed9756d82e33b2ef96858a9dab82204e2abc956978c00371a1ed19a13fb591cb65acf0e22117459fd709c53ddf4
+EBUILD usbtop-1.0.ebuild 656 BLAKE2B 37c194b60c182cf6fbb17d9a109b2ef0c00badd2efdf0f71beed903095ff58e223c35c9a148fa9ba83b02877a0a8ce4869add0c49db71483d464572141f443ad SHA512 b7420381fde0583a64b4f7e9aa6b009148af45dc62dde0372f54a9d72bfc72c2259aa91ca20091d7097f962deae0dbfb991f5724b6b0e4c4bfd5cc59ef7ff3f6
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/sys-process/usbtop/usbtop-1.0.ebuild b/sys-process/usbtop/usbtop-1.0.ebuild
new file mode 100644
index 000000000000..7b8e3d1fcb94
--- /dev/null
+++ b/sys-process/usbtop/usbtop-1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info
+
+DESCRIPTION="utility that shows an estimated instantaneous bandwidth on USB buses and devices"
+HOMEPAGE="https://github.com/aguinet/usbtop"
+SRC_URI="https://github.com/aguinet/usbtop/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libpcap:=[usb]
+	dev-libs/boost:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if linux_config_exists; then
+		CONFIG_CHECK="~USB_MON"
+		check_extra_config
+	fi
+}
diff --git a/sys-process/vixie-cron/Manifest b/sys-process/vixie-cron/Manifest
index 1b5a17ddbde0..cc7d55677c4f 100644
--- a/sys-process/vixie-cron/Manifest
+++ b/sys-process/vixie-cron/Manifest
@@ -8,13 +8,11 @@ AUX vixie-cron-4.1-cron.deny 148 BLAKE2B 3da92c65667ccacd74e32443e1cd5623d8040a7
 AUX vixie-cron-4.1-crontabrace.patch 658 BLAKE2B 4958e13b14519b484b677a7fd7593f2b17adbbb7cac46d18e0cd68714841e50614d472cdb880ce7f45e456ba30b9119671c44c217edfa81679d5a231bab8be30 SHA512 7aac74563a26bc86bb99488ab0a556a389b5a3d36bed7c80c355a3504d9175d1ac8d437ebdba60831de42a1cc7188b464956f8e94876f8eaf465c9f7005b8242
 AUX vixie-cron-4.1-hardlink.patch 369 BLAKE2B a1e3f1106ca15411b59ebb0a162181675189ae9c459169b01893ffc33cd6ca2b256eaee043c48d841cb8ee8789414ebaf7d153f5a600190d6c8b096c2d06fbd9 SHA512 32a804929f1a005edbe58c17e5a4e57141e1b379724e1d760729ba2e5f578b9e509e5e04893e648f463dc250804a9b6303b3dfb7d91c485e57ac02e1c866600a
 AUX vixie-cron-4.1-pam.patch 1714 BLAKE2B 04d3b0f76b794e357b8d93f2a95a45f64f9f6baddd92901626f8cad96d9a6033802727d5d54bc3983acf3073b0e860228567f1a6894021c260222de22d99c880 SHA512 596e3888c9ba484b5e4f2b0db14aac0449760d9e4ca91105cac19555c4e45ae96c9e5e302335c5559697881286eae98d7149742e4f01102cc5042edf795d46fc
-AUX vixie-cron-4.1-selinux-1.diff 4658 BLAKE2B de680ec7292d1ddb8380c2c315ce1e6a33e78388b73a354d7ddecab8b8b969c0a17da19b862069246014afd47761d055fe6d69939f02f658769bd5a2212d8d01 SHA512 aa226982ace71b951d46af7777c173c8c4a1dcb4fc5967fa7396cbe617a7c341add25cfbf6210aa99ab8f1af9773d55fc57985f396a827b75acca12dd542dc54
 AUX vixie-cron-4.1-selinux-2.patch 6566 BLAKE2B 21aec85c6ca39e6479252f34d7f8e557fbbc191d8336d056c37a41f487f8c417dea827e3f608f9c605960431583db0453db024f4bbe329a89b81661c5eba641f SHA512 b272b8a9dda7b80f6213ce7b0b38dc3beb16bf38ae202410c9062ae0c14653174dc309fe6dffa469058acf58fae903e0eb670b721213bbdcba3bf21eccfbdfd3
 AUX vixie-cron-4.1-setuid_check.patch 767 BLAKE2B b14d22d7a457fd984a65b32bacd30f6f4a01b6670f486d3529a28afd2f880791e0995043066035870e0221b9ae66af68f7134081ec25d18f4757249bd7119784 SHA512 4c49ac5465a142a49799ce1ab816aacd458b44287a3200d9dc35afe1b717d095b2db93eee70913c3c6ee4171afe1293d6838af3f0e6156a96e1e6431ded2af70
 AUX vixie-cron.rc7 239 BLAKE2B 64248f4d67ba35ae9c4cbcc9f800782a4da9c0b8780b326cf97d8800cd606cb449ab1725b68d98879d1e33db7552b090ca458fe2ba10f86d360130e65563945f SHA512 d491ae5db8e6ad00bf59380a3358577dfe45a0d137fa5100c22252b8d6d84149d379aae860a30b39c4bdbfc0274ed6cf8fe8d2dfedbea29f4260d5aaab975766
 AUX vixie-cron.service 178 BLAKE2B 2ef614075505ef9a48b89ae46d21c5c3544db711b430eabc04870b436437d9b194963b6da572c3bf2c758c4fc7aa37ee90500a1e72fc135ecb8a59f7582ebbba SHA512 09af14c9010c55c204db8755872df531d0e28b473d56f0b5f99c037e2183e2f9e2be9cc66895f4da2036b74efa7bc472e932331fac13722a505ae2be400a068d
 DIST vixie-cron-4.1-gentoo-r4.patch.bz2 4204 BLAKE2B 1e276ade20e61ae17e45c10145532e3f32dfa74e32b6cbecde22863de82afb280e97d3b380626451524cfc7fc0663934657509b228a51b3b5ad42e26e5cceb3d SHA512 eec8f89a97927a3557bd1350ed7e9baa0ec133e2c49f8f0fbf51adf62c377451dc48867ca6affcc7576833a5b6b749613c9b99641b1b658853f91d8071c3411b
 DIST vixie-cron-4.1.tar.bz2 54246 BLAKE2B 920bf5d95b24cd41677f4a748da02231ed75713ff280acafdf476ad0a71e73068bbad9070fc57d3b0cb39a9539da24182aa2dbc9eb9dfe241adaf9a46f9c5db2 SHA512 1db9a246243dbd4934438ce70bf022215ccffed4b899a77b076d5a7679a7b98a23ef67344e329fc7a836df90685581e10b1c95709db40601c33d2052ce561e04
-EBUILD vixie-cron-4.1-r14.ebuild 3489 BLAKE2B bce170b850ca7446bbb7bb58ed0de15fcac1c4d34c9c5395078978bd5ee58495c753cfa69244065e952c3dc9e4320cfb0f2f8049b30340fa8a22da08fc7877d8 SHA512 2b71cca48dc0bf4075de8db96ccafbd585ecca4987854a50a50816ab188ab9c1fed140707962e564b5a6bdf470e395272befca724c833639f6c8eddbdfd12cf5
 EBUILD vixie-cron-4.1-r15.ebuild 3487 BLAKE2B a6c3d77988b303c818458e3d8745b5019493e45235fe1b530968c219be95bc473e496ceaf0413e4db85bf832c14b3481d8291a819c472be0634b172d8c1dbc2c SHA512 84fd99d5dea56b6beb2edb5704b39c64257f94569c1276b0ea1392acdd2d51c17da2f2a5211300d17d3c3e97af84f248522b83a23ba98f1bea509ab30a5fefd4
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-process/vixie-cron/files/vixie-cron-4.1-selinux-1.diff b/sys-process/vixie-cron/files/vixie-cron-4.1-selinux-1.diff
deleted file mode 100644
index ec2493e8c3ca..000000000000
--- a/sys-process/vixie-cron/files/vixie-cron-4.1-selinux-1.diff
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -purN vixie-cron-4.1.orig/Makefile vixie-cron-4.1/Makefile
---- vixie-cron-4.1.orig/Makefile	2004-08-27 14:09:33.000000000 -0400
-+++ vixie-cron-4.1/Makefile	2008-08-25 15:17:20.062720415 -0400
-@@ -68,7 +68,8 @@ LINTFLAGS	=	-hbxa $(INCLUDE) $(DEBUGGING
- #<<want to use a nonstandard CC?>>
- CC		=	gcc -Wall -Wno-unused -Wno-comment
- #<<manifest defines>>
--DEFS		=
-+DEFS		= -s -DWITH_SELINUX
-+LIBS		+= 	-lselinux
- #(SGI IRIX systems need this)
- #DEFS		=	-D_BSD_SIGNALS -Dconst=
- #<<the name of the BSD-like install program>>
-diff -purN vixie-cron-4.1.orig/database.c vixie-cron-4.1/database.c
---- vixie-cron-4.1.orig/database.c	2004-08-27 14:09:34.000000000 -0400
-+++ vixie-cron-4.1/database.c	2008-08-27 08:19:37.948930858 -0400
-@@ -28,6 +28,16 @@ static char rcsid[] = "# $Id$
- 
- #include "cron.h"
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#include <selinux/flask.h>
-+#include <selinux/av_permissions.h>
-+#include <selinux/get_context_list.h>
-+#define SYSUSERNAME "system_u"
-+#else
-+#define SYSUSERNAME "*system*"
-+#endif
-+
- #define TMAX(a,b) ((a)>(b)?(a):(b))
- 
- static	void		process_crontab(const char *, const char *,
-@@ -183,7 +193,7 @@ process_crontab(const char *uname, const
- 	if (fname == NULL) {
- 		/* must be set to something for logging purposes.
- 		 */
--		fname = "*system*";
-+		fname = SYSUSERNAME;
- 	} else if ((pw = getpwnam(uname)) == NULL) {
- 		/* file doesn't have a user in passwd file.
- 		 */
-@@ -245,6 +255,56 @@ process_crontab(const char *uname, const
- 		free_user(u);
- 		log_it(fname, getpid(), "RELOAD", tabname);
- 	}
-+#ifdef WITH_SELINUX
-+	if (is_selinux_enabled())	{
-+	  security_context_t file_context=NULL;
-+	  security_context_t user_context=NULL;
-+	  struct av_decision avd;
-+	  int retval=0;
-+	  char *seuser=NULL;
-+	  char *level=NULL;
-+
-+	  if (fgetfilecon(crontab_fd, &file_context) < OK) {
-+	    log_it(fname, getpid(), "getfilecon FAILED", tabname);
-+	    goto next_crontab;
-+	  }
-+
-+	  /*
-+	   * Since crontab files are not directly executed,
-+	   * crond must ensure that the crontab file has
-+	   * a context that is appropriate for the context of
-+	   * the user cron job.  It performs an entrypoint
-+	   * permission check for this purpose.
-+	   */
-+	  if (getseuserbyname(fname, &seuser, &level) < 0) {
-+	    log_it(fname, getpid(), "NO SEUSER", tabname);
-+	    goto next_crontab;
-+	  }
-+
-+	  if (get_default_context_with_level(seuser, level, NULL, &user_context) < 0) {
-+	    log_it(fname, getpid(), "NO CONTEXT", tabname);
-+	    freecon(file_context);
-+	    free(seuser);
-+	    free(level);
-+	    goto next_crontab;
-+	  }
-+
-+	  retval = security_compute_av(user_context,
-+				       file_context,
-+				       SECCLASS_FILE,
-+				       FILE__ENTRYPOINT,
-+				       &avd);
-+	  freecon(user_context);
-+	  freecon(file_context);
-+	  free(seuser);
-+	  free(level);
-+
-+	  if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) {
-+	    log_it(fname, getpid(), "ENTRYPOINT FAILED", tabname);
-+	    goto next_crontab;
-+	  }
-+	}
-+#endif
- 	u = load_user(crontab_fd, pw, fname);
- 	if (u != NULL) {
- 		u->mtime = statbuf->st_mtime;
-diff -purN vixie-cron-4.1.orig/do_command.c vixie-cron-4.1/do_command.c
---- vixie-cron-4.1.orig/do_command.c	2004-08-27 14:09:34.000000000 -0400
-+++ vixie-cron-4.1/do_command.c	2008-08-25 15:43:43.289174371 -0400
-@@ -25,6 +25,11 @@ static char rcsid[] = "# $Id$
- 
- #include "cron.h"
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#include <selinux/get_context_list.h>
-+#endif
-+
- static void		child_process(entry *, user *);
- static int		safe_p(const char *, const char *);
- 
-@@ -265,6 +270,29 @@ child_process(entry *e, user *u) {
- 				_exit(OK_EXIT);
- 			}
- # endif /*DEBUGGING*/
-+#ifdef WITH_SELINUX
-+			if (is_selinux_enabled()) {
-+			  char *seuser=NULL;
-+			  char *level=NULL;
-+			  security_context_t scontext;
-+
-+			  if (getseuserbyname(u->name, &seuser, &level) < 0) {
-+			    fprintf(stderr, "getseuserbyname: Could not determine seuser for user %s\n", u->name);
-+			    _exit(ERROR_EXIT);
-+			  }
-+			  if (get_default_context_with_level(seuser, level, NULL, &scontext) < 0) {
-+			    fprintf(stderr, "get_default_context_with_level: could not get security context for user %s, seuser %s\n", u->name, seuser); 
-+			    _exit(ERROR_EXIT);
-+			  }
-+			  if (setexeccon(scontext) < 0) {
-+			    fprintf(stderr, "setexeccon: Could not set exec context to %s for user %s\n", scontext, u->name);
-+			    _exit(ERROR_EXIT);
-+			  }
-+			  free(seuser);
-+			  free(level);
-+			  freecon(scontext);
-+			}
-+#endif
- 			execle(shell, shell, "-c", e->cmd, (char *)0, e->envp);
- 			fprintf(stderr, "execl: couldn't exec `%s'\n", shell);
- 			perror("execl");
diff --git a/sys-process/vixie-cron/vixie-cron-4.1-r14.ebuild b/sys-process/vixie-cron/vixie-cron-4.1-r14.ebuild
deleted file mode 100644
index 09604bb30746..000000000000
--- a/sys-process/vixie-cron/vixie-cron-4.1-r14.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit cron toolchain-funcs pam eutils flag-o-matic user systemd
-
-# no useful homepage, bug #65898
-HOMEPAGE="ftp://ftp.isc.org/isc/cron/"
-DESCRIPTION="Paul Vixie's cron daemon, a fully featured crond implementation"
-
-SELINUX_PATCH="${P}-selinux-1.diff"
-GENTOO_PATCH_REV="r4"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-${GENTOO_PATCH_REV}.patch.bz2"
-
-LICENSE="ISC BSD-2 BSD"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="selinux pam debug"
-
-DEPEND="selinux? ( sys-libs/libselinux )
-	pam? ( virtual/pam )"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	 pam? ( virtual/pam )"
-
-#vixie-cron supports /etc/crontab
-CRON_SYSTEM_CRONTAB="yes"
-
-pkg_setup() {
-	enewgroup crontab
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${WORKDIR}"/${P}-gentoo-${GENTOO_PATCH_REV}.patch
-	epatch "${FILESDIR}"/crontab.5.diff
-	epatch "${FILESDIR}"/${P}-commandline.patch
-	epatch "${FILESDIR}"/${P}-basename.diff
-	epatch "${FILESDIR}"/${P}-setuid_check.patch
-	epatch "${FILESDIR}"/${P}-hardlink.patch
-	epatch "${FILESDIR}"/${P}-crontabrace.patch
-	use pam && epatch "${FILESDIR}"/${P}-pam.patch
-	use selinux && epatch "${FILESDIR}"/${SELINUX_PATCH}
-}
-
-src_compile() {
-	use debug && append-flags -DDEBUGGING
-
-	sed -i -e "s:gcc \(-Wall.*\):$(tc-getCC) \1 ${CFLAGS}:" \
-		-e "s:^\(LDFLAGS[ \t]\+=\).*:\1 ${LDFLAGS}:" Makefile \
-		|| die "sed Makefile failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	docrondir -m 1730 -o root -g crontab
-	docron
-	docrontab -m 2755 -o root -g crontab
-
-	# /etc stuff
-	insinto /etc
-	newins  "${FILESDIR}"/crontab-3.0.1-r4 crontab
-	newins "${FILESDIR}"/${P}-cron.deny cron.deny
-
-	keepdir /etc/cron.d
-	newpamd "${FILESDIR}"/pamd.compatible cron
-	newinitd "${FILESDIR}"/vixie-cron.rc7 vixie-cron
-
-	# doc stuff
-	doman crontab.1 crontab.5 cron.8
-	dodoc "${FILESDIR}"/crontab
-	dodoc CHANGES CONVERSION FEATURES MAIL README THANKS
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-4.1-r10"
-	fix_spool_dir_perms=$?
-}
-
-pkg_postinst() {
-	if [[ -f ${ROOT}/etc/init.d/vcron ]]
-	then
-		ewarn "Please run:"
-		ewarn "rc-update del vcron"
-		ewarn "rc-update add vixie-cron default"
-	fi
-
-	# bug 71326
-	if [[ -u ${ROOT}/etc/pam.d/cron ]] ; then
-		echo
-		ewarn "Warning: previous ebuilds didn't reset permissions prior"
-		ewarn "to installing crontab, resulting in /etc/pam.d/cron being"
-		ewarn "installed with the SUID and executable bits set."
-		ewarn
-		ewarn "Run the following as root to set the proper permissions:"
-		ewarn "   chmod 0644 /etc/pam.d/cron"
-		echo
-	fi
-
-	# bug 164466
-	if [[ $fix_spool_dir_perms = 0 ]] ; then
-		echo
-		ewarn "Previous ebuilds didn't correctly set permissions on"
-		ewarn "the crontabs spool directory. Proper permissions are"
-		ewarn "now being set on ${ROOT}var/spool/cron/crontabs/"
-		ewarn "Look at this directory if you have a specific configuration"
-		ewarn "that needs special ownerships or permissions."
-		echo
-		chmod 1730 "${ROOT}/var/spool/cron/crontabs" || die "chmod failed"
-		chgrp -R crontab "${ROOT}/var/spool/cron/crontabs" || die "chgrp failed"
-		cd "${ROOT}/var/spool/cron/crontabs/"
-		for cronfile in * ; do
-			[[ ! -f $cronfile ]] || chown "$cronfile:crontab" "$cronfile" \
-		    || ewarn "chown failed on $cronfile, you probably have an orphan file."
-		done
-	fi
-
-	cron_pkg_postinst
-}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 44f46ce2788e..e28f9671abf9 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/imap-c-client/Manifest b/virtual/imap-c-client/Manifest
index f3af9d1476a0..62378a9bdb75 100644
--- a/virtual/imap-c-client/Manifest
+++ b/virtual/imap-c-client/Manifest
@@ -1,4 +1,3 @@
-EBUILD imap-c-client-0.ebuild 303 BLAKE2B a0bc34f47aef428e59b59b1c8fa656673babe63268f0474f2289532e5de2aeb20ddd73686fd86085712685ea4af4357b6dcb9608bc5f9115ba0ea27894e5349c SHA512 a03582fbc7237acb3a5234d21223cce70711b3f933b88ad4e9a946e7b644c8b3e831b2f660bd41439d4a70e0309acd58058ddd4f5ebee3b2cace02207bd05c9d
 EBUILD imap-c-client-1.ebuild 339 BLAKE2B dbfacd261c215932c398bceb1b0896394bbcccf1ec9c253d3def8161a5eb9ec9b73b2a428c27592e8c7b020d7f9037be3134585097606a08926c7062b1210cd0 SHA512 9cfc2d99a9e4113c5126d599b37fa76f36bd44da905822103e24c58d7853b7dc1460772a8a99d3c2d97d053e87d41ff7743f353339a443f9b9d2439927503918
 EBUILD imap-c-client-2.ebuild 373 BLAKE2B 9cca9bff2ed07840198ac15af2a2f39911c96cb3b7d83983838357c4ed5133546b7518513b4999a93ef8b40eb2b85bc9d515d4895ae30b59eb2427a0db8da810 SHA512 9705e31abe0a5c0edd5f86a46f4cde2e48d0947a09a2cc5d3f5a6701433216363446c786b93fe809df9d355b26871673d2483119b447d7f9562769d9703d9e1b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/imap-c-client/imap-c-client-0.ebuild b/virtual/imap-c-client/imap-c-client-0.ebuild
deleted file mode 100644
index af4f1bdea717..000000000000
--- a/virtual/imap-c-client/imap-c-client-0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for IMAP c-client"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-RDEPEND="|| (	net-libs/c-client
-				net-mail/uw-imap )"
diff --git a/virtual/linuxtv-dvb-headers/Manifest b/virtual/linuxtv-dvb-headers/Manifest
index 8520ddcb0881..0435d4d5acc5 100644
--- a/virtual/linuxtv-dvb-headers/Manifest
+++ b/virtual/linuxtv-dvb-headers/Manifest
@@ -1,3 +1,2 @@
-EBUILD linuxtv-dvb-headers-5.3.ebuild 268 BLAKE2B 9a54b1931f2b997189783920683a4fdd682c3bf52acb53b4cdbcad026edd0521a8d50a76623e5a21216b6bbb682dd08ee49927f0e58048b726b74a314ae1b31f SHA512 e6b68e3a1f5f9c9196864255ecad27d00c9e609b253280c95fe17779dc5b33b0cfa2e8e018ad2acb4dbe05c34b49627b5af7973b328341331784660313272b7f
 EBUILD linuxtv-dvb-headers-5.8.ebuild 281 BLAKE2B c0489d79611f8b9be02704f89b82142fdfbe9a52f952074e150090760bda78d24492a33127f986a0d35d878120f6cdfc7e015d93226d718f9c1ef93237ac9f32 SHA512 438eab4a3a0b7c0ae8bb844ef75d8f3f18cbe75bc3be06b6502b47531685418347e5675a6a0272bb2413084bed2302e6e695e3dbbe2a3ca69e5a184b59368ec0
 MISC metadata.xml 413 BLAKE2B 93ac6fa43d28696fe738b8cce3b01d8c167bc53154ba1fc087e4b3ea31bbdf492a102629604108e2c235ef4b953b06b33993efb3c9782991f46746c1f022f92b SHA512 89c322d223ae5cefcc8969288ab13d8fd540c9aab7dea6ea3a3759af6f8665ee83bac82d9e0f0482e8e5d978d4669d13db6245441d69af1d2f8f46ff0590d10f
diff --git a/virtual/linuxtv-dvb-headers/linuxtv-dvb-headers-5.3.ebuild b/virtual/linuxtv-dvb-headers/linuxtv-dvb-headers-5.3.ebuild
deleted file mode 100644
index 1331f69342ca..000000000000
--- a/virtual/linuxtv-dvb-headers/linuxtv-dvb-headers-5.3.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual Package installing the Header files for DVB"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-
-RDEPEND=">=sys-kernel/linux-headers-3.0"
diff --git a/virtual/mailx/Manifest b/virtual/mailx/Manifest
index 7f62a9f7be1d..d6a1dd0ebca8 100644
--- a/virtual/mailx/Manifest
+++ b/virtual/mailx/Manifest
@@ -1,4 +1,3 @@
-EBUILD mailx-0.ebuild 380 BLAKE2B b28deda9faa7e74708ea8e3a2706008a7d03506b3704711253cc4e04d8f734f2231091310e9e6788c1b7a11f5ba98c375d4082dc8a1928ffae62196064afd02a SHA512 3aeff5af373627892c3c170d37b89142fe266b7974a83edd958c9e7d1e7e1a4df3d913716832144dd448e0662427234be2bf62f0cb0c17885c7e64ed286738cc
 EBUILD mailx-1.ebuild 412 BLAKE2B 65a97bb74d4cda0fe5e3831d6f3aff810cb6b9fb6366ba9e0bfa9138e9d81eaf7357c15ec1a501fd830d0c557924ddc884fd5b929181ba307e334ac9bfa7c81a SHA512 afef40de1d6ca773f682aa82dac129c969d73c44cf27f6cd0208a4973c7cb88856f6f9cbde25ad612a232933020d9a87dc9faf0a35301b6a7d50e21bad4072a9
 EBUILD mailx-2.ebuild 447 BLAKE2B 253f7c7d90b3e2f491d2418806f7ed5fa69870f9d821eeaf7c72abeec93e6e5fe183a43e3ab5a524a0e4fd0034c7daf3eb21c0b4ce97e0dc791e515b061b5631 SHA512 855972a72c7bdc72a9020cd18f02aa54aebef3b22642dd43f6cbda7a75208517b7f323127d4a599089a6fd65aa61b25f7c3ad768248765286a903a555d63fa75
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/mailx/mailx-0.ebuild b/virtual/mailx/mailx-0.ebuild
deleted file mode 100644
index 1fa455372718..000000000000
--- a/virtual/mailx/mailx-0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for mail implementations"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="|| (	mail-client/mailx
-				mail-client/nail
-				net-mail/mailutils )"
diff --git a/virtual/perl-Attribute-Handlers/Manifest b/virtual/perl-Attribute-Handlers/Manifest
index 8cb4d4f6ebea..e72318a2e792 100644
--- a/virtual/perl-Attribute-Handlers/Manifest
+++ b/virtual/perl-Attribute-Handlers/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Attribute-Handlers-0.990.0-r2.ebuild 525 BLAKE2B 65ebe50b9d2a69ccecc77081ae7ea12c42eaef793238879c8bd3fdcca40b91950cd262d26a8aa7b4256e0e9db7b03075b3520c42d28c7bc0fd0af387ed25b29f SHA512 6be1c458f79d5275b83e3bf5be3e1115325f02148ad8a7f7eac0b238c9ccf8bf4d8d4403c5bb96ffa927846e9f7018f1ef34e04db1338acea3aa45af4fa43fc5
-EBUILD perl-Attribute-Handlers-1.10.0-r1.ebuild 521 BLAKE2B 05541bc523c030a794cd17f089705c3b143c189ffdf5b2f065a3e6b95c6061cf80db32bd2b1634336532290a4f1fd12661dd873f5c04a34552f4f970348b0f35 SHA512 99d274dea94f280791477b25ac403432e0d48f6431c8c69b5ec6cc266edf1ee3839b60120a6cca332290b0779fbd40cfb6d3818fd0c9da6a26edb9e7f50d531f
+EBUILD perl-Attribute-Handlers-1.10.0-r1.ebuild 520 BLAKE2B 4ab96dde6ac4b5113458ce09b0842fead01bf94f486eda879c771a3d8447a805188db392b04556e987d28e85ed1fea92575b3645b953deb84db008c38be6f289 SHA512 614f0e5a8c3ee9120ce8c7645678a37215d2dc559bf65e7906bfb7b5c22387c7d95b16430a77e498e0e2822d33766c0dac69242bc6792ff76e1e1c343fc7423b
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r1.ebuild b/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r1.ebuild
index 245cd069f290..99a5db44160e 100644
--- a/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r1.ebuild
+++ b/virtual/perl-Attribute-Handlers/perl-Attribute-Handlers-1.10.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-B-Debug/Manifest b/virtual/perl-B-Debug/Manifest
index 6389c02814c9..d6a6bdb0eed0 100644
--- a/virtual/perl-B-Debug/Manifest
+++ b/virtual/perl-B-Debug/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-B-Debug-1.230.0-r3.ebuild 572 BLAKE2B bcf8f703d08e7ce2b8a96aa3963bec3379ee41ad8732eacf97375cfefde14341ca6a44745aab5d5b9e85577f99eb1e8c28cee5ec599706f35cfae7463f230db3 SHA512 0baf8432cc5a369806af68b8d7e0529b6536b35330e6cdd3483850cb0cf1fc911f3d04162ecf85fae2b30f3fdcc56b60d3e1fe56c6d482f3b1d7721fd54dc58c
 EBUILD perl-B-Debug-1.240.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-B-Debug-1.260.0.ebuild 568 BLAKE2B b04fc78f0a01e0ba552bcaa4870fc3521669648627b65b7ca5ea12d0134a866bdef9dc756615c6e78a555e3ee20096043d4fe6b2ebe60228bd7a216f91e7aae3 SHA512 ba477c2e274e4dc68019d5b31b0b48101ffacfaad38e7a8377cf98620ba33517ddebc1ba18260e3ef28474233a1d51b59779a19ce3342099405357d033f1dd15
+EBUILD perl-B-Debug-1.260.0.ebuild 567 BLAKE2B b621685e414e02016f420fd661537e037d35d9f41aece96172177e3d8edc6be69e6571e9b6ada642ded193e1746ce308a30a813229b617f19c3010337666393d SHA512 ae6eaa2f0c4a88e00d19bcdea9275da6037f41db7b624a3c2b0fb44c928c518ea356ff5c66692ec92d431b831fd185c6b8a16f737084c2c335a256448c342fee
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-B-Debug/perl-B-Debug-1.260.0.ebuild b/virtual/perl-B-Debug/perl-B-Debug-1.260.0.ebuild
index 1eb46f3f09d1..7bddede2847b 100644
--- a/virtual/perl-B-Debug/perl-B-Debug-1.260.0.ebuild
+++ b/virtual/perl-B-Debug/perl-B-Debug-1.260.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-CPAN/Manifest b/virtual/perl-CPAN/Manifest
index 81fa6d1dbe0f..529501e9c0a6 100644
--- a/virtual/perl-CPAN/Manifest
+++ b/virtual/perl-CPAN/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-CPAN-2.110.100_rc-r6.ebuild 424 BLAKE2B 1d66536c40fa054f18d9202e7b575031fa566cfbdfad7c4a061a7517ff8bfcc6f25b6176e9e74649148ff328cbea19abba60af9a111d09a85b239acc79f23dfd SHA512 274709f9205a021a821275e57e234037667a801c1dbd2b65871cd4c5a38aab5da3fba7483e3506f12a33470ec25910cacf848dd4d60bb8df0a9a7cf4132bae5f
 EBUILD perl-CPAN-2.180.0.ebuild 409 BLAKE2B b336c66677a0357a4fd581b6d73e46d1ac277d0a280ab9c74551b3f75778bdb65fe596c17ddcf367a0effa290be8d4b0f77bf074b0c6a95f599b8e6eec0b72d3 SHA512 91b5966b38ad661959a8102126a9d5d217f5e1e186aae6d66f6d9a5a221994cb796cd7b84be9ee11a34540df45aaae80c29cb19b5ac9bb9e865dce603c09d9ce
-EBUILD perl-CPAN-2.200.0.ebuild 411 BLAKE2B 5e45b95e42ffe9ac4f4a0a5d309f52ef09c941e88641ac4e386e6d9f9d87437c734da9969ea1a3cdc762d909a3e81c143620984a4a7364daa474601c2690d73b SHA512 22da2e8dd2e0b8d3167166fe9ec617e17802064b398629512fb3dca5709b9fb4301155987b3b277139d6e7ea29977b4d96b87f5e3720a1977a3b9d4c108bec6f
+EBUILD perl-CPAN-2.200.0.ebuild 410 BLAKE2B 32da2afeac81627fc66aa5d5717d8416ea6a40dd75c3840fb719ea717cbfa9e9e205997dab28974cde635eff3493ba955156de45cc810e432da4bef86aac7f33 SHA512 8c3e4e5790cb8ae06f075f5a6850c36d891d31f5ab7ac2b3fca14cf49de0aec12a2be15de9eca279696b53b6e089ec3c556187ff9439e90eaed184a30593f592
 EBUILD perl-CPAN-2.220.0.ebuild 422 BLAKE2B ca32124be449c74f9453f61eedf285dd08ebeb28bfbe32d772ded70e2aa5c8480236af13b76d838396fe4c95fd93afb508482eb55a17c1033695cf8399985a48 SHA512 5f965f1c785a7f98ffc83f7bf7cab0539cc7cfdff3e6deb67e731f6df1567615e27512af56fddca0a4085bbf9409290e654b834ede79040bab03736cd82f0eb4
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-CPAN/perl-CPAN-2.200.0.ebuild b/virtual/perl-CPAN/perl-CPAN-2.200.0.ebuild
index 54390ef53365..3cac2f114d7e 100644
--- a/virtual/perl-CPAN/perl-CPAN-2.200.0.ebuild
+++ b/virtual/perl-CPAN/perl-CPAN-2.200.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Carp/Manifest b/virtual/perl-Carp/Manifest
index 29f9f1ebc89d..e3580641a1b6 100644
--- a/virtual/perl-Carp/Manifest
+++ b/virtual/perl-Carp/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Carp-1.400.0-r1.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
 EBUILD perl-Carp-1.420.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Carp-1.500.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-Carp-1.500.0-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 MISC metadata.xml 356 BLAKE2B 9e80c3a70b4d2ef550bd705d02d24477dbade20545ad50d21ce19d16afc9d7b167b693eceee72373eee0d77c07e972238f3b4d8357b1c5b9942e7a116ced8141 SHA512 cf5fbb85cd1f54aed3f0df484085dbd6dce8afa8377b9964741f3c224c9979354964da769fcc1c6c5b9017c2f6551062751ed5aac370be300f3854c49ada0d50
diff --git a/virtual/perl-Carp/perl-Carp-1.500.0-r1.ebuild b/virtual/perl-Carp/perl-Carp-1.500.0-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-Carp/perl-Carp-1.500.0-r1.ebuild
+++ b/virtual/perl-Carp/perl-Carp-1.500.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Compress-Raw-Zlib/Manifest b/virtual/perl-Compress-Raw-Zlib/Manifest
index 04df5f6d6e7d..695b312eefa1 100644
--- a/virtual/perl-Compress-Raw-Zlib/Manifest
+++ b/virtual/perl-Compress-Raw-Zlib/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Compress-Raw-Zlib-2.69.0-r1.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
 EBUILD perl-Compress-Raw-Zlib-2.74.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Compress-Raw-Zlib-2.76.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-Compress-Raw-Zlib-2.76.0.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-Compress-Raw-Zlib-2.84.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.76.0.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.76.0.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.76.0.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.76.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Data-Dumper/Manifest b/virtual/perl-Data-Dumper/Manifest
index 566cc6e1f90a..66992dbb13f4 100644
--- a/virtual/perl-Data-Dumper/Manifest
+++ b/virtual/perl-Data-Dumper/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Data-Dumper-2.160.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-Data-Dumper-2.167.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Data-Dumper-2.170.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-Data-Dumper-2.170.0.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-Data-Dumper-2.174.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.170.0.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.170.0.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.170.0.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.170.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Devel-PPPort/Manifest b/virtual/perl-Devel-PPPort/Manifest
index 73055a54038b..38b4903d5d8c 100644
--- a/virtual/perl-Devel-PPPort/Manifest
+++ b/virtual/perl-Devel-PPPort/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Devel-PPPort-3.320.0-r1.ebuild 541 BLAKE2B d891d2cedff1d7678b8e7aa6f5c8f2331ea0387db71487095112cc30c3e255ffc8272ab770ada6ebc5eff7890c3b167da5e032f94f27f0193a01392d4956bc40 SHA512 147a2bd7e47beac1123c6630e59390b58d317077957ddbcf8edc9d3fb4ab36686cfee4aabb4382ea67d5cfd6a0e38792692b4318bfbd14f950db15afcbb042f5
 EBUILD perl-Devel-PPPort-3.350.0.ebuild 554 BLAKE2B 7f315087948631d9798d12699789bea93f563ae0b13c70d836e1da4c6adb3f45773601b936e9c563a7a4d627141ace026906dec76ab9dfc5caf5bc93e893ec94 SHA512 91bfbce379aec3562b730da4147e51cd001178301fd373309e3fb2b85006ca87e2309e38c8ec8815171e22a193d3597cce935d32b97a6dbc9368038615e823f7
-EBUILD perl-Devel-PPPort-3.400.0.ebuild 556 BLAKE2B 512a3e62da4cb7b18e152e01419a90b4d7fdcb1dd734b99b26e2c75f7abcaf23cddfab9febe23a740e5bcdce93977d93628eea33e35d5134403a76e40dd8cac4 SHA512 c6ae2e9f9f8928ef166a6168514afd36d760aed0a50e33d51dd0633ae9a24333227c846f6177d06f7d5c1434f085f4928793f2c9de813196add74415795b2516
+EBUILD perl-Devel-PPPort-3.400.0.ebuild 555 BLAKE2B 66cb63e62e5ebfb6919eec6081c18a92f666edecb592044e9db6a5567e7023eb5d197fac470e600d9af3e91da3b80553eec6f26ee22e7b207140a05632351e8f SHA512 5fe16e03d7106fe88aec57624e96d9d12e35278415acd2c310a0e7f2fc292ab94f760fe3a98c5fe8cc3708e8dca77788aa559f125131177a105c93f7f94be964
 EBUILD perl-Devel-PPPort-3.520.0.ebuild 567 BLAKE2B cb81dfd22a31023ac91f8bf5ebf71e9c83c8922a9ee2584ea136c407d1336faad8062dfdb0e539b406e0dcbfd0da8c29467c9f25618ef5c415ffbb7b2a0fbf5a SHA512 0f27731b4729f350b3c71c67996ed797770a6edef4881872419bca74bb117c3e09ea82f443d2b66e8e744cf74e8649a6dafcb3b32e4070dfe1b44256228eb637
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.400.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.400.0.ebuild
index 39dba4fca720..7db55e8b5320 100644
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.400.0.ebuild
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.400.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Digest-SHA/Manifest b/virtual/perl-Digest-SHA/Manifest
index c89abd106ce3..5a59dcc378d7 100644
--- a/virtual/perl-Digest-SHA/Manifest
+++ b/virtual/perl-Digest-SHA/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Digest-SHA-5.950.100_rc-r6.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-Digest-SHA-5.960.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Digest-SHA-6.10.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-Digest-SHA-6.10.0.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-Digest-SHA-6.20.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Digest-SHA/perl-Digest-SHA-6.10.0.ebuild b/virtual/perl-Digest-SHA/perl-Digest-SHA-6.10.0.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-Digest-SHA/perl-Digest-SHA-6.10.0.ebuild
+++ b/virtual/perl-Digest-SHA/perl-Digest-SHA-6.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Encode/Manifest b/virtual/perl-Encode/Manifest
index b988693b1c97..3399c047a6cf 100644
--- a/virtual/perl-Encode/Manifest
+++ b/virtual/perl-Encode/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Encode-2.800.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-Encode-2.880.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Encode-2.970.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-Encode-2.970.0.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-Encode-3.10.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Encode/perl-Encode-2.970.0.ebuild b/virtual/perl-Encode/perl-Encode-2.970.0.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-Encode/perl-Encode-2.970.0.ebuild
+++ b/virtual/perl-Encode/perl-Encode-2.970.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Exporter/Manifest b/virtual/perl-Exporter/Manifest
index 2c5c10846349..2a39b9941f1d 100644
--- a/virtual/perl-Exporter/Manifest
+++ b/virtual/perl-Exporter/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Exporter-5.720.0-r3.ebuild 590 BLAKE2B 435f74078015551bbbf3719854aff354c9323735541263e18b0b7dd7dba914506b2846e150e90d0548f40e8d35dc124c4bef1440f8038cb61ff17687f53c5247 SHA512 55948821d22a941f0a737d321ab1e86d42a8092248e6a42e9b63ea0c2555db06962f7b1ebbb93870a409adef8ae24d6f6c408c2b1a6a697c7af8d635356f435f
-EBUILD perl-Exporter-5.730.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-Exporter-5.730.0-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Exporter/perl-Exporter-5.730.0-r1.ebuild b/virtual/perl-Exporter/perl-Exporter-5.730.0-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-Exporter/perl-Exporter-5.730.0-r1.ebuild
+++ b/virtual/perl-Exporter/perl-Exporter-5.730.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-CBuilder/Manifest b/virtual/perl-ExtUtils-CBuilder/Manifest
index f417c208d5ff..5ade154b85cb 100644
--- a/virtual/perl-ExtUtils-CBuilder/Manifest
+++ b/virtual/perl-ExtUtils-CBuilder/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-ExtUtils-CBuilder-0.280.225-r2.ebuild 590 BLAKE2B 671eba3ac58748277b47d30da3614a195a16e527c7ffbb5f1339f71e6d0baaa3cdc1b29d63ab60d98261d1ae60852937db66cda2ab4b994e858721307c9a25b2 SHA512 e569c5c72af058154cef7d2f61ff30ebb2da157b6c108187afca4f69f0eb020826f71302a9b927635c3125e675d61da352e9bed3f4c268a22477ce7a29548625
-EBUILD perl-ExtUtils-CBuilder-0.280.230.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-ExtUtils-CBuilder-0.280.230.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-ExtUtils-CBuilder-0.280.231.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.230.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.230.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.230.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.280.230.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Constant/Manifest b/virtual/perl-ExtUtils-Constant/Manifest
index c6c4e8b9dbda..99a900fda420 100644
--- a/virtual/perl-ExtUtils-Constant/Manifest
+++ b/virtual/perl-ExtUtils-Constant/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-ExtUtils-Constant-0.230.0-r11.ebuild 575 BLAKE2B 64846db83b40ec2e2203a9993524d4f4d098dbe7001e0f006d010064f83827281cc404da16e733846f4f0702898e9db7907bc3f580576788bf7d7ed24fdddb3d SHA512 cdc0145a9a77f41174c22850b447c4b04c51cc4dde5744d3fa50b07f39878b24eaf225c31dd318e554c6ca1709fdfe662e401068cd8ca449b53cbedfc18e9b1a
-EBUILD perl-ExtUtils-Constant-0.250.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-ExtUtils-Constant-0.250.0-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r1.ebuild b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-Constant/perl-ExtUtils-Constant-0.250.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-Install/Manifest b/virtual/perl-ExtUtils-Install/Manifest
index 4e0d509b2c24..0649a6065069 100644
--- a/virtual/perl-ExtUtils-Install/Manifest
+++ b/virtual/perl-ExtUtils-Install/Manifest
@@ -1,3 +1,3 @@
-EBUILD perl-ExtUtils-Install-2.140.0-r1.ebuild 601 BLAKE2B 3608bd88f3ea6fc858ec11047fd6ac18e739e322e6d1698a0dfb2f211348d666a1e935674f747a8f6e2b74b06f9880355a7fa0292de39645b0a357bbb5b5d3df SHA512 e392af29c14574cc34c813ccba3041723ec894ee70b5bab5f9ef32bc9448b5581b3aa656487b6d06ba3dda239ccd85eec188f60070db1f87bbdcb56ebfea8cd2
+EBUILD perl-ExtUtils-Install-2.140.0-r1.ebuild 600 BLAKE2B 9f5c85148c0dc1a82ebfa97553f13b4d983263d5bab04a1309f0f5d5e06fc449d2b62d326f7f261665e3f772985ab28900e5669030cab83989a86b11a51b8703 SHA512 ae1adeaa3ecc24271d3e5f5b38bf36e9a6aa8fca4b96c057cfb901ecc5bf411fa701885df3eb3ed91d087bb875bb75cf8cfe36bf20765d5dcb818a58473ef090
 EBUILD perl-ExtUtils-Install-2.40.0-r3.ebuild 595 BLAKE2B 814182f09720d7be7f447330607a263f83533c78003c83a9da08609c415985c9ef9aeea46724a4168d5e420fea0db1bef13b1f418a084d8a26c64b57b63b6e90 SHA512 696c77f538f41e6159d1d381f77a89a318f5d3bf10c5744d5e78b25c03cfee54d9f64b6f5abd9afb18f437a04e58eeae2995ad46a34f5237ff17acbbfb2fb869
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r1.ebuild b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r1.ebuild
index 6fd60f3bd8bb..1f2ee900c0ef 100644
--- a/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-Install/perl-ExtUtils-Install-2.140.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ExtUtils-Install"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-MakeMaker/Manifest b/virtual/perl-ExtUtils-MakeMaker/Manifest
index af1ef874175f..019d2b12d263 100644
--- a/virtual/perl-ExtUtils-MakeMaker/Manifest
+++ b/virtual/perl-ExtUtils-MakeMaker/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-ExtUtils-MakeMaker-7.100.200_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-ExtUtils-MakeMaker-7.240.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-ExtUtils-MakeMaker-7.340.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-ExtUtils-MakeMaker-7.340.0-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r1.ebuild b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r1.ebuild
+++ b/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.340.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-ExtUtils-ParseXS/Manifest b/virtual/perl-ExtUtils-ParseXS/Manifest
index e543dd69fe42..c0dd76f4abcf 100644
--- a/virtual/perl-ExtUtils-ParseXS/Manifest
+++ b/virtual/perl-ExtUtils-ParseXS/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-ExtUtils-ParseXS-3.310.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-ExtUtils-ParseXS-3.340.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-ExtUtils-ParseXS-3.390.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-ExtUtils-ParseXS-3.390.0.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-ExtUtils-ParseXS-3.400.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.390.0.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.390.0.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.390.0.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-3.390.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Path/Manifest b/virtual/perl-File-Path/Manifest
index b4de4a5c7d9b..2dcef30d2bd5 100644
--- a/virtual/perl-File-Path/Manifest
+++ b/virtual/perl-File-Path/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-File-Path-2.130.0.ebuild 541 BLAKE2B e4701947e0923c6664635cc28e65a08421d314355a5e70e5119aacbebf39f458e42ac51e50fdbd623ecdea99f86c4f752f8e5efe9bfc23aefaa3e99ab2038ead SHA512 bdca0a240035e58a586a33a16ec9965add6d1134630f198bbc99832cff3e575f063358ab47074c58dfe25241c734ddc5583315f280a19399723ac5416136c676
-EBUILD perl-File-Path-2.150.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-File-Path-2.150.0.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-File-Path-2.160.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-File-Path/perl-File-Path-2.150.0.ebuild b/virtual/perl-File-Path/perl-File-Path-2.150.0.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-File-Path/perl-File-Path-2.150.0.ebuild
+++ b/virtual/perl-File-Path/perl-File-Path-2.150.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-File-Spec/Manifest b/virtual/perl-File-Spec/Manifest
index 5983d1b214b9..87f0da7ab53e 100644
--- a/virtual/perl-File-Spec/Manifest
+++ b/virtual/perl-File-Spec/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-File-Spec-3.630.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-File-Spec-3.670.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-File-Spec-3.740.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-File-Spec-3.740.0.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-File-Spec-3.780.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.740.0.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.740.0.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.740.0.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.740.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Filter-Simple/Manifest b/virtual/perl-Filter-Simple/Manifest
index 5c1b3c414204..1991e7ae0657 100644
--- a/virtual/perl-Filter-Simple/Manifest
+++ b/virtual/perl-Filter-Simple/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Filter-Simple-0.920.0-r3.ebuild 584 BLAKE2B 5d9cf4534906d104cf12e95d6785f1acab0dd708a17a6dda3cd81601e1fcfd0fe839a5dd2e101c9bfeb693256d21008762f506431fc0f886723354ef3c85d7f7 SHA512 3d6d1a70d423afec98a057b545b77ec1e9aedb3c67fecb273a5db1a6fcfc19bbb87d54b4227b24c87af9cd1b774394ac0bf402eed47ba7741c4ba9e623558c98
 EBUILD perl-Filter-Simple-0.930.0.ebuild 578 BLAKE2B 68c52600ba1daec42e4e180ee3d71e4b4cbea82f4656ed1673485dd6afaf122da07d37c3b56a34fde1f35fec004af4ccac6ee3089671e88c9cd37e019b74e59a SHA512 b882f65af638882197a70f4bd04820b2f02722e195eaf6508c8072f2175407784cd3e2e83ebf3f412abee1536bef7f2bcb0e59dbf0a8d3a27c3749aa7071025d
-EBUILD perl-Filter-Simple-0.950.0-r1.ebuild 601 BLAKE2B fd04ae1f2750425f580507d37acafa4ca2ce53cc2c084fd78e5d61cc9f301d2d7132467379930835cb0a49e7d3e8892083cc85e0a72788d8a1823a2c04cc87e6 SHA512 077cbe54b4142a0225d244887d5ccfd005bd246364f8c5ba53d8b64e9c966d85c285e5719e58b3e6742962e01028b6695ee1c570fcfb49dab7f6a0ad8ef5e241
+EBUILD perl-Filter-Simple-0.950.0-r1.ebuild 600 BLAKE2B 6b0ecaa436ddbe5af463c48cabb689c989ded7baf827c1e1b4d04e8d121aa0ea351eafb7319d7ddb11ebb65f21afee519280eca6d3dd27bc2939670257da7189 SHA512 d46b627fb9a6a72259ae834c0d3acb1f738b45abba1a4aad59d746c89f8f8181e96b477445ead667de8c66a0c658a096bb91eafd78e4046b9449be3dbf51801a
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r1.ebuild b/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r1.ebuild
index ff3c3d904e28..cd88b0ba3ea5 100644
--- a/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r1.ebuild
+++ b/virtual/perl-Filter-Simple/perl-Filter-Simple-0.950.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for perl-core/Filter-Simple"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Getopt-Long/Manifest b/virtual/perl-Getopt-Long/Manifest
index c78de7523e7e..f783f2c46a4a 100644
--- a/virtual/perl-Getopt-Long/Manifest
+++ b/virtual/perl-Getopt-Long/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Getopt-Long-2.480.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-Getopt-Long-2.490.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Getopt-Long-2.500.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-Getopt-Long-2.500.0-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r1.ebuild b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r1.ebuild
+++ b/virtual/perl-Getopt-Long/perl-Getopt-Long-2.500.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-I18N-LangTags/Manifest b/virtual/perl-I18N-LangTags/Manifest
index 98101539f479..b04f59c3b203 100644
--- a/virtual/perl-I18N-LangTags/Manifest
+++ b/virtual/perl-I18N-LangTags/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-I18N-LangTags-0.400.0-r5.ebuild 423 BLAKE2B 1401c116d10ad895ac6b4e677cd81453f37c68eddd43ae89518e3675176595698bc4f223c7246de3658d3f3f5114a4e341be64a9244aac198195811ce6fcfaef SHA512 b84fda2cdf2339ce486723663c5b11d706339471128947869cc6750e4500a70afea21d7b2fd279f705cf6902e4208e47d71225cb3f000e6a272142ec36f1c48b
 EBUILD perl-I18N-LangTags-0.420.0.ebuild 423 BLAKE2B 12ca8593c996903a6b36f80e65c497f8bf84e616de7ea461832924726da8a12a8f444b8cc947f5c5b89fe23a28e721820a1d52318d4e6cc5d45f541aec24edd1 SHA512 49d83eda48d5cc0c9b2f4868f4e92767b23a462a6f38ba30aa22f27726650494af1e9c743141c324246813ebda2b5ab1bff4061295f4b2c79aecd455fb38dc75
-EBUILD perl-I18N-LangTags-0.430.0-r1.ebuild 446 BLAKE2B c06306752ff5ba229e6410573f66b97e8f7e270ae5a705d91e69f70a81005becc11d02c9ae526e92effa0ec0543eb845787aa92fe06db6ae8c023f475ab0df0c SHA512 23d0a5c6e617da6ef7fa52c7577f73a9388dc726f17fb0df1f8f6d14546cd7e831699da1a8d452a0dea91f97db1479ff820cbd55ba01f6b97621670e657785e4
+EBUILD perl-I18N-LangTags-0.430.0-r1.ebuild 445 BLAKE2B 085aad71446b6d169404edf5a3078e8c5a292f74e6fbf62148b1acc1599bfd12fb4fdc000ef8186da6cacf370916682611aa8a81640dbf1a8f0bc459f24aabbc SHA512 958cf2355bc661c8e4886c0f6dfc49c65ccd43a3e9122b1e65ab3304dd9b293c849593d64d99ea9de0dfa8406189af6b9f3e9d26d41e18ff312e9e7b6a3ace00
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r1.ebuild b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r1.ebuild
index a315f3b6023a..2ed0e1d047f7 100644
--- a/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r1.ebuild
+++ b/virtual/perl-I18N-LangTags/perl-I18N-LangTags-0.430.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for I18N-LangTags"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/I18N-LangTags-${PV} )
diff --git a/virtual/perl-IO-Socket-IP/Manifest b/virtual/perl-IO-Socket-IP/Manifest
index 956f88277baa..153bd0982aef 100644
--- a/virtual/perl-IO-Socket-IP/Manifest
+++ b/virtual/perl-IO-Socket-IP/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-IO-Socket-IP-0.370.0-r3.ebuild 569 BLAKE2B b9574e4eb204bdcf94ff1d474014b8459dbc4cc436916a8e7ce16a8d90bdf47dd9214261512a48ed5750ea4acad8258a535091cd74324d886d17a0b119f92dbf SHA512 06344243ee8b58f52a1939dce565176c1d70d7e73af80788641b73c46faaad86522a38fdb00402999bf2c28e08f31d89183bb4fabc380e6949bfc40342ecf56b
 EBUILD perl-IO-Socket-IP-0.380.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-IO-Socket-IP-0.390.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-IO-Socket-IP-0.390.0-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r1.ebuild b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r1.ebuild
+++ b/virtual/perl-IO-Socket-IP/perl-IO-Socket-IP-0.390.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IO/Manifest b/virtual/perl-IO/Manifest
index 5875397bb2d7..4bcb2b57ee19 100644
--- a/virtual/perl-IO/Manifest
+++ b/virtual/perl-IO/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-IO-1.360.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-IO-1.380.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-IO-1.390.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-IO-1.390.0.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-IO-1.400.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-IO/perl-IO-1.390.0.ebuild b/virtual/perl-IO/perl-IO-1.390.0.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-IO/perl-IO-1.390.0.ebuild
+++ b/virtual/perl-IO/perl-IO-1.390.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-IPC-Cmd/Manifest b/virtual/perl-IPC-Cmd/Manifest
index 5eb3793d883d..595f37dcc2b5 100644
--- a/virtual/perl-IPC-Cmd/Manifest
+++ b/virtual/perl-IPC-Cmd/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-IPC-Cmd-0.920.100_rc-r6.ebuild 597 BLAKE2B bc52f214e7f43712fc3b18b205ee2fd7eb9bf5a167f4d9acb1b0eff5e4171097066c414c06bf139e1f397207a176138e41d5a15ed946b7872ba2c06dc0d42f8c SHA512 f773447ae231b2724604fef7102cca16d26d822e7bdc81beee289521f4e36b04f8d17f2944372effada8b00b01ce87cc7f1aa36cd04e363edaf97a4e0ea17750
 EBUILD perl-IPC-Cmd-0.960.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-IPC-Cmd-1.0.0.ebuild 568 BLAKE2B b04fc78f0a01e0ba552bcaa4870fc3521669648627b65b7ca5ea12d0134a866bdef9dc756615c6e78a555e3ee20096043d4fe6b2ebe60228bd7a216f91e7aae3 SHA512 ba477c2e274e4dc68019d5b31b0b48101ffacfaad38e7a8377cf98620ba33517ddebc1ba18260e3ef28474233a1d51b59779a19ce3342099405357d033f1dd15
+EBUILD perl-IPC-Cmd-1.0.0.ebuild 567 BLAKE2B b621685e414e02016f420fd661537e037d35d9f41aece96172177e3d8edc6be69e6571e9b6ada642ded193e1746ce308a30a813229b617f19c3010337666393d SHA512 ae6eaa2f0c4a88e00d19bcdea9275da6037f41db7b624a3c2b0fb44c928c518ea356ff5c66692ec92d431b831fd185c6b8a16f737084c2c335a256448c342fee
 EBUILD perl-IPC-Cmd-1.20.0.ebuild 579 BLAKE2B ee43c037c00f5894577191f68424efcd33d2f01ef9e615cc749b5db5aeabe98f92a0d7effc3714431acb2e5c138a0d4258433d8b279e875fb6e09c2454bbf375 SHA512 c2307f5398ca1600770c2af98310e0c94c9ee937fe6d401cf4118be78997685669ef7860a65137b7b92cea3c176971c179373d695d278e21851a712703d46e40
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.0.0.ebuild b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.0.0.ebuild
index 1eb46f3f09d1..7bddede2847b 100644
--- a/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.0.0.ebuild
+++ b/virtual/perl-IPC-Cmd/perl-IPC-Cmd-1.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-JSON-PP/Manifest b/virtual/perl-JSON-PP/Manifest
index f1d7f5b7f2a0..e3d73d7728c8 100644
--- a/virtual/perl-JSON-PP/Manifest
+++ b/virtual/perl-JSON-PP/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-JSON-PP-2.273.0.100_rc-r6.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-JSON-PP-2.274.0.200_rc.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-JSON-PP-2.970.10.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-JSON-PP-2.970.10.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-JSON-PP-4.20.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-JSON-PP/perl-JSON-PP-2.970.10.ebuild b/virtual/perl-JSON-PP/perl-JSON-PP-2.970.10.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-JSON-PP/perl-JSON-PP-2.970.10.ebuild
+++ b/virtual/perl-JSON-PP/perl-JSON-PP-2.970.10.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Locale-Maketext/Manifest b/virtual/perl-Locale-Maketext/Manifest
index 74b4ee9310b7..d34e22a12af0 100644
--- a/virtual/perl-Locale-Maketext/Manifest
+++ b/virtual/perl-Locale-Maketext/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Locale-Maketext-1.260.100_rc-r6.ebuild 466 BLAKE2B 4e3fde67517a897f53862b167da04c16fc8bf42a2850adf4c5554273e2e5e2a02df31e23d24e09948809e7b8d72db7afdcc3f2b6bfb404825847ddadbffad42f SHA512 8757c411af1a794eaa36b161d0efb2629780424917d4efb493e3c6f7b13ad33e473c7993e6fc5ee368f714218973a7d58514e234d6ad6d4edbcde4b440835c2b
 EBUILD perl-Locale-Maketext-1.280.0.ebuild 439 BLAKE2B 070c99705667d41d6501c23bcebf5628663973d08fd402c491130585b78cb50e4f51ca0bc2fa00b2b560aee81a6e94d0056475d469d5007497bca057ff12babf SHA512 31fc714a4ead0165a1560e04e824da31e729595142d4410f408ebf7c1515dc678cc82c03f6595b579a1c7b429b8b65fc426d0f755893c7be3ee613f3d3b69edc
-EBUILD perl-Locale-Maketext-1.290.0-r1.ebuild 577 BLAKE2B 532162392b34ed7ae7518cc899dd5acdf0cf2f7eb2f11e65e22310f24692a88f69f0fe8babe49a3c9367f98c226cac4e17808268170e9f5e3ff55b96fd779587 SHA512 fd6ae2ad1082493317bf55a8f575a8383ef4634a99e68a9d1bde5e090de8ef58356de4a390ada232213235d5f3b4d998d1b09348eb0d85598e72ca35d3ce045b
+EBUILD perl-Locale-Maketext-1.290.0-r1.ebuild 576 BLAKE2B b8464e06d85b396e202283e961cf863e217863b285e149a29a9a8e3ed771e29f040d4ed281c6e24018f985c427991d76979bcc48211a634a070cf0e49adb6c03 SHA512 c2c666a7225442625b64d8fa6f87d58a9c67b70ec394a09a1045facc00f75f38f821f77a1625735602d7b8e8b5a0f1f4daae60ba3cd4b58414150a683cfb359c
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r1.ebuild b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r1.ebuild
index 676027bfb38f..8ede60a8572a 100644
--- a/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r1.ebuild
+++ b/virtual/perl-Locale-Maketext/perl-Locale-Maketext-1.290.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt-FastCalc/Manifest b/virtual/perl-Math-BigInt-FastCalc/Manifest
index f4bbd261b677..e500cecd5ff7 100644
--- a/virtual/perl-Math-BigInt-FastCalc/Manifest
+++ b/virtual/perl-Math-BigInt-FastCalc/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Math-BigInt-FastCalc-0.400.0-r1.ebuild 557 BLAKE2B ffdff1172ea418175c75c3d1607f5c4ff98fe3d58fb46fa52c0dee9928a118acba65439db500512fc8f9a142c15894cd76d5346c6a514324247a8b47e89cb430 SHA512 cca51455ffa40ab6cbf6c19cd175de1b1c93028469cc923a6a3d186fa186d81fc03897ee6fc60adacbfcd38b2c48108e68fe704d86f6248392655e8367301f3b
 EBUILD perl-Math-BigInt-FastCalc-0.500.500.ebuild 554 BLAKE2B 7f315087948631d9798d12699789bea93f563ae0b13c70d836e1da4c6adb3f45773601b936e9c563a7a4d627141ace026906dec76ab9dfc5caf5bc93e893ec94 SHA512 91bfbce379aec3562b730da4147e51cd001178301fd373309e3fb2b85006ca87e2309e38c8ec8815171e22a193d3597cce935d32b97a6dbc9368038615e823f7
-EBUILD perl-Math-BigInt-FastCalc-0.500.600.ebuild 556 BLAKE2B 512a3e62da4cb7b18e152e01419a90b4d7fdcb1dd734b99b26e2c75f7abcaf23cddfab9febe23a740e5bcdce93977d93628eea33e35d5134403a76e40dd8cac4 SHA512 c6ae2e9f9f8928ef166a6168514afd36d760aed0a50e33d51dd0633ae9a24333227c846f6177d06f7d5c1434f085f4928793f2c9de813196add74415795b2516
+EBUILD perl-Math-BigInt-FastCalc-0.500.600.ebuild 555 BLAKE2B 66cb63e62e5ebfb6919eec6081c18a92f666edecb592044e9db6a5567e7023eb5d197fac470e600d9af3e91da3b80553eec6f26ee22e7b207140a05632351e8f SHA512 5fe16e03d7106fe88aec57624e96d9d12e35278415acd2c310a0e7f2fc292ab94f760fe3a98c5fe8cc3708e8dca77788aa559f125131177a105c93f7f94be964
 EBUILD perl-Math-BigInt-FastCalc-0.500.800.ebuild 567 BLAKE2B cb81dfd22a31023ac91f8bf5ebf71e9c83c8922a9ee2584ea136c407d1336faad8062dfdb0e539b406e0dcbfd0da8c29467c9f25618ef5c415ffbb7b2a0fbf5a SHA512 0f27731b4729f350b3c71c67996ed797770a6edef4881872419bca74bb117c3e09ea82f443d2b66e8e744cf74e8649a6dafcb3b32e4070dfe1b44256228eb637
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.600.ebuild b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.600.ebuild
index 39dba4fca720..7db55e8b5320 100644
--- a/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.600.ebuild
+++ b/virtual/perl-Math-BigInt-FastCalc/perl-Math-BigInt-FastCalc-0.500.600.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigInt/Manifest b/virtual/perl-Math-BigInt/Manifest
index d1941ff7b3a6..76c551eae6bb 100644
--- a/virtual/perl-Math-BigInt/Manifest
+++ b/virtual/perl-Math-BigInt/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Math-BigInt-1.999.715-r2.ebuild 556 BLAKE2B 78577542a749c4ac5dec3899557cf2fad4ce302a74e8fb6847c63c74e66cf37b40dc20ccc4e18f6fea57604a92d91b3607aaa6a93fde2c5a2b300d2e9a2e95a5 SHA512 86a298812e255a8295c20dd901ab6ea12742e41128fe2296b20c77691503ddade665e89a987d70e4e88a2b6d29d117b2cc6c4253be49385f7520288d92d5f967
 EBUILD perl-Math-BigInt-1.999.806-r1.ebuild 554 BLAKE2B 7f315087948631d9798d12699789bea93f563ae0b13c70d836e1da4c6adb3f45773601b936e9c563a7a4d627141ace026906dec76ab9dfc5caf5bc93e893ec94 SHA512 91bfbce379aec3562b730da4147e51cd001178301fd373309e3fb2b85006ca87e2309e38c8ec8815171e22a193d3597cce935d32b97a6dbc9368038615e823f7
-EBUILD perl-Math-BigInt-1.999.811.ebuild 556 BLAKE2B 512a3e62da4cb7b18e152e01419a90b4d7fdcb1dd734b99b26e2c75f7abcaf23cddfab9febe23a740e5bcdce93977d93628eea33e35d5134403a76e40dd8cac4 SHA512 c6ae2e9f9f8928ef166a6168514afd36d760aed0a50e33d51dd0633ae9a24333227c846f6177d06f7d5c1434f085f4928793f2c9de813196add74415795b2516
+EBUILD perl-Math-BigInt-1.999.811.ebuild 555 BLAKE2B 66cb63e62e5ebfb6919eec6081c18a92f666edecb592044e9db6a5567e7023eb5d197fac470e600d9af3e91da3b80553eec6f26ee22e7b207140a05632351e8f SHA512 5fe16e03d7106fe88aec57624e96d9d12e35278415acd2c310a0e7f2fc292ab94f760fe3a98c5fe8cc3708e8dca77788aa559f125131177a105c93f7f94be964
 EBUILD perl-Math-BigInt-1.999.816.ebuild 567 BLAKE2B cb81dfd22a31023ac91f8bf5ebf71e9c83c8922a9ee2584ea136c407d1336faad8062dfdb0e539b406e0dcbfd0da8c29467c9f25618ef5c415ffbb7b2a0fbf5a SHA512 0f27731b4729f350b3c71c67996ed797770a6edef4881872419bca74bb117c3e09ea82f443d2b66e8e744cf74e8649a6dafcb3b32e4070dfe1b44256228eb637
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.811.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.811.ebuild
index 39dba4fca720..7db55e8b5320 100644
--- a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.811.ebuild
+++ b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.811.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Math-BigRat/Manifest b/virtual/perl-Math-BigRat/Manifest
index c0b6d37c5c95..b2cfcd7762ee 100644
--- a/virtual/perl-Math-BigRat/Manifest
+++ b/virtual/perl-Math-BigRat/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Math-BigRat-0.260.802-r1.ebuild 557 BLAKE2B ffdff1172ea418175c75c3d1607f5c4ff98fe3d58fb46fa52c0dee9928a118acba65439db500512fc8f9a142c15894cd76d5346c6a514324247a8b47e89cb430 SHA512 cca51455ffa40ab6cbf6c19cd175de1b1c93028469cc923a6a3d186fa186d81fc03897ee6fc60adacbfcd38b2c48108e68fe704d86f6248392655e8367301f3b
 EBUILD perl-Math-BigRat-0.261.100.ebuild 554 BLAKE2B 7f315087948631d9798d12699789bea93f563ae0b13c70d836e1da4c6adb3f45773601b936e9c563a7a4d627141ace026906dec76ab9dfc5caf5bc93e893ec94 SHA512 91bfbce379aec3562b730da4147e51cd001178301fd373309e3fb2b85006ca87e2309e38c8ec8815171e22a193d3597cce935d32b97a6dbc9368038615e823f7
-EBUILD perl-Math-BigRat-0.261.300.ebuild 556 BLAKE2B 512a3e62da4cb7b18e152e01419a90b4d7fdcb1dd734b99b26e2c75f7abcaf23cddfab9febe23a740e5bcdce93977d93628eea33e35d5134403a76e40dd8cac4 SHA512 c6ae2e9f9f8928ef166a6168514afd36d760aed0a50e33d51dd0633ae9a24333227c846f6177d06f7d5c1434f085f4928793f2c9de813196add74415795b2516
+EBUILD perl-Math-BigRat-0.261.300.ebuild 555 BLAKE2B 66cb63e62e5ebfb6919eec6081c18a92f666edecb592044e9db6a5567e7023eb5d197fac470e600d9af3e91da3b80553eec6f26ee22e7b207140a05632351e8f SHA512 5fe16e03d7106fe88aec57624e96d9d12e35278415acd2c310a0e7f2fc292ab94f760fe3a98c5fe8cc3708e8dca77788aa559f125131177a105c93f7f94be964
 EBUILD perl-Math-BigRat-0.261.400.ebuild 567 BLAKE2B cb81dfd22a31023ac91f8bf5ebf71e9c83c8922a9ee2584ea136c407d1336faad8062dfdb0e539b406e0dcbfd0da8c29467c9f25618ef5c415ffbb7b2a0fbf5a SHA512 0f27731b4729f350b3c71c67996ed797770a6edef4881872419bca74bb117c3e09ea82f443d2b66e8e744cf74e8649a6dafcb3b32e4070dfe1b44256228eb637
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.300.ebuild b/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.300.ebuild
index 39dba4fca720..7db55e8b5320 100644
--- a/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.300.ebuild
+++ b/virtual/perl-Math-BigRat/perl-Math-BigRat-0.261.300.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Module-CoreList/Manifest b/virtual/perl-Module-CoreList/Manifest
index fde96721a5e7..446b02b65ef8 100644
--- a/virtual/perl-Module-CoreList/Manifest
+++ b/virtual/perl-Module-CoreList/Manifest
@@ -2,6 +2,6 @@ EBUILD perl-Module-CoreList-5.201.709.220-r2.ebuild 692 BLAKE2B 406ab8135213f8d0
 EBUILD perl-Module-CoreList-5.201.709.230.ebuild 674 BLAKE2B 9605e981723de11fcc7ed9f77e603d5c14da8a80e106899f209270b39b275db421e2e1c33034607e32b6779bc7fee302fca04b6e6929c9b5214cedb086f6b4d0 SHA512 a744ae47ac08f93774a70aed8ce034ee767fa0a9d286723f81a5cf3fce9de6a81c77400c992c9941677dd5f25eb06474713adc803628bf5ee9dedd587be0ee09
 EBUILD perl-Module-CoreList-5.201.804.140.ebuild 711 BLAKE2B 79776cfef9a832e9eb42e0d881cb48698c26d5a1b7a793565832bb13e27d026cc7f0795b56eb3463a4092f4a725e8a93e823062a7b4dddb1d4e8293777d5b8d7 SHA512 ef3da162fdf5fc1ec07972a517bcfa5c96318df86b1e78a6eede81ea5675a2fba95be79567b2de97953f0aeed5df9f4ad1a426dca96f899cfe9e1de4507c74b2
 EBUILD perl-Module-CoreList-5.201.806.260.ebuild 674 BLAKE2B 9605e981723de11fcc7ed9f77e603d5c14da8a80e106899f209270b39b275db421e2e1c33034607e32b6779bc7fee302fca04b6e6929c9b5214cedb086f6b4d0 SHA512 a744ae47ac08f93774a70aed8ce034ee767fa0a9d286723f81a5cf3fce9de6a81c77400c992c9941677dd5f25eb06474713adc803628bf5ee9dedd587be0ee09
-EBUILD perl-Module-CoreList-5.201.904.190.ebuild 690 BLAKE2B cfe9d70ae9d3c2bce8399b055c80143b50f8b7346d7a6f66ab260297e5788940e63ec467d057b8894c3bac342a2ba6d69f95ec522b225f4fcdc683796645ea54 SHA512 ca0681352d095bc149d3fd7e0fef96353d83bfcc3865a8fb34d591cdef5d18c95282a8a7512aa461fe4ce270f51fb30816700cfeb478a50e69047da457f8d35f
+EBUILD perl-Module-CoreList-5.201.904.190.ebuild 689 BLAKE2B e1e0a8261d2b0a8521227ce7aa87f16799b498f5f9ff78218a047edc3a85890d743fc65a79ca48f8b9d501e99b4f5a95cdb47d0f9c553aa2592458ec5aa96461 SHA512 b76a944d222f641a0a7a7e3fd6ae7b34edfc697df36a24c3e516dc7990b440b2346766bf80918f49b6262b40dc5149885c72f12a7b1e3402ecf7dd83729e537d
 EBUILD perl-Module-CoreList-5.201.905.220.ebuild 701 BLAKE2B 07819170ff96170128f3ef8350c2d6e7543e69af3d021537eb411c8711274229a290adbd015fb40c1dbc327dcb8f961b1aba60dd76459d84829c80249207446d SHA512 c205a916407130621379ee1a8b1d89f5301244d2fa297acbb3669280cbafe95695d0a1e90f986c80fc232959723549a72d956e1597b7827a9d384849c94aa518
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.904.190.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.904.190.ebuild
index c17487e974b5..9cad289165a7 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.904.190.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.201.904.190.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
diff --git a/virtual/perl-Net-Ping/Manifest b/virtual/perl-Net-Ping/Manifest
index c2dbf0a7da8f..f033eb186bae 100644
--- a/virtual/perl-Net-Ping/Manifest
+++ b/virtual/perl-Net-Ping/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Net-Ping-2.430.100_rc-r6.ebuild 447 BLAKE2B e676e226851c6fb785479265ed996bb69fc19b2c22ac9ec1fda7984eedfcf1120c4c2a83003eeb8f415b3281392115e3a0dcbaa4dc7fb055c4df7bfafaae8e24 SHA512 77bb6a17998005531790cc90a637274b27eaeaab40276f5b1d00e0719dacf1c4383dd18ba4731a423501b208082d55998787c0c0cb6e957dbcac39b86b502615
 EBUILD perl-Net-Ping-2.550.0.ebuild 432 BLAKE2B 4be32dafedf0c6a342412f0416562c8e20e57083baeead518be2dc290ba452be9d331fe7f224b7736fe3cd1bc9fcfca4899f170dcb042ec7794f650980358307 SHA512 54044ce10e9ef9d1a039a3bc043c49ed61ef88b5546848b1f49fce32d4a33cf831145268f5e4a2923064559c347aef07b8b940cb9725d9c658c0f6ac6ff68bc2
-EBUILD perl-Net-Ping-2.620.0.ebuild 434 BLAKE2B aa96695d43863e087a39dcfcc025e36652f51b93a5f9b832e59a579555397f0a7743720197fae3f5861daafcde73b9cd7bac3d6de14299465f5dd0ef80ddf4cb SHA512 e5f7384f11247b0ce4579a150a61f8ec4922a3667900eaf5feb86ea47fe37e8b3b39b96a780a5636ae0d41f3810f430335736b5567c3cfb1e4e4d9f61d8d1561
+EBUILD perl-Net-Ping-2.620.0.ebuild 433 BLAKE2B 571032487f199dcb8041dc582ae51a1e5cfb0307189741ccd71e0e992d595be3cb11db9a6e1d43806f875fe5dfbc6cd0d53c2af101c928fb20803e8d3657853b SHA512 3a406286a9d91d058c82ce275db96380a2c4636f15ba13c5d4bda2f310126bc06ea5f16bac4c31d30a233a783758c1f15ac294d15887835d6e200c062bcf9be7
 EBUILD perl-Net-Ping-2.710.0.ebuild 445 BLAKE2B c881f52d606bd4ce8b53070cce6a4315f321c28338f90c48e0322108e2be328310a3d7af97700cfe31fc65ef54a8a063aca497640ddcb0be63aa527d72b3aa0d SHA512 6f85e61cd29ba37a0a21ce7f8656edf1519581e290d0399ca1e12fc999e3f518932360ebd3f222993f64895baf0f14335e1eb4433a26fb6b6452b98dc06fa152
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Net-Ping/perl-Net-Ping-2.620.0.ebuild b/virtual/perl-Net-Ping/perl-Net-Ping-2.620.0.ebuild
index f395dc8bddb0..053270ec5607 100644
--- a/virtual/perl-Net-Ping/perl-Net-Ping-2.620.0.ebuild
+++ b/virtual/perl-Net-Ping/perl-Net-Ping-2.620.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Scalar-List-Utils/Manifest b/virtual/perl-Scalar-List-Utils/Manifest
index 457d997b9a66..8b6139480463 100644
--- a/virtual/perl-Scalar-List-Utils/Manifest
+++ b/virtual/perl-Scalar-List-Utils/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Scalar-List-Utils-1.420.200_rc-r1.ebuild 626 BLAKE2B 88eb25c5eb992457bbf0e428106e835e463b0412c6845816d6f997e130ed8cb06577390c6bd51d20c46dea7b035cdf729556b16c415b2fad5ff485398d80ae11 SHA512 5a44ca37942a57f31d21702e1266028dcabcc3b846e3497b71a0738251ef9a3eff0c82e78da9108861e812c2ebd74bb303df0daa70bfa3b7673149df4a3e8e29
 EBUILD perl-Scalar-List-Utils-1.460.0-r1.ebuild 544 BLAKE2B 34e3203a9281686b31e30955eaa40f9ab3ade29d7d0c4b9c6690759b4a170bf370831cbf6ed6402bf3158e13f477173c61f69cd3475f49e25ce939f345b2ce26 SHA512 28a51ae66558d9e79d7d56b421699e86b65a39db67e1c64971b7ed45c9fdf0cd33c7d9d2ec81d11751c04f06cf2c75490237c5f2b7ffdd0e795f7f05beaedbec
 EBUILD perl-Scalar-List-Utils-1.460.200_rc.ebuild 623 BLAKE2B 2254d6c8f99874c447ae368f169c9b66b866af0b1485daa9536eb48fee3464acec12154dd5250a38c19ed47dd3857127a6344bdea602ab87dc6811f921fd7e53 SHA512 69d7915de61e3dab41f7854588d0fa0d02c8fae58e0da1dd8498c1e97123f7ff720f0fea1a53309ee4677fa978cb852fd7d13efedb1b74bd77820e9fed81de3e
-EBUILD perl-Scalar-List-Utils-1.500.0-r1.ebuild 653 BLAKE2B 1248f54b1617eee3b4929f67b67eb6939f20a5668c6c95d99e6546e852109ce6d737c169ae2cbe7ae819b8a5647bb35e489d80c65d1b78bd609a257568d501f2 SHA512 b00f73776b46a51c4a7605406beb8ed345a248177bf18d46726921e6c7d1ab347fe54bcfc04becac757c87ade52c157a5a7165b59820deeb39b33a3db0169a5b
+EBUILD perl-Scalar-List-Utils-1.500.0-r1.ebuild 652 BLAKE2B 4d8a4c1920ed712a55fd88055f3085923ba41ccfc473e327ac09da243d8abdd21acd314fa1d5dcc20975977c09194b227ba6ee9c22bad3da093fca68a7425181 SHA512 fb5339fd46cf47a3f9e20056eef52936881d08ff8a757dbf3ccb46cc2205230baf4bf7c74b87debe6527b5a31887caf49e2da83d4d353fb43513b1e5cf88c142
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r1.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r1.ebuild
index f3b02838b512..7715f64477c0 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r1.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.500.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for Scalar::Util and List::Util, also distributed as Scalar::List::Utils"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Socket/Manifest b/virtual/perl-Socket/Manifest
index a731c3af46c5..9b397867d1e6 100644
--- a/virtual/perl-Socket/Manifest
+++ b/virtual/perl-Socket/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Socket-2.20.30_rc-r2.ebuild 590 BLAKE2B 435f74078015551bbbf3719854aff354c9323735541263e18b0b7dd7dba914506b2846e150e90d0548f40e8d35dc124c4bef1440f8038cb61ff17687f53c5247 SHA512 55948821d22a941f0a737d321ab1e86d42a8092248e6a42e9b63ea0c2555db06962f7b1ebbb93870a409adef8ae24d6f6c408c2b1a6a697c7af8d635356f435f
-EBUILD perl-Socket-2.27.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-Socket-2.27.0-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-Socket/perl-Socket-2.27.0-r1.ebuild b/virtual/perl-Socket/perl-Socket-2.27.0-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-Socket/perl-Socket-2.27.0-r1.ebuild
+++ b/virtual/perl-Socket/perl-Socket-2.27.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Storable/Manifest b/virtual/perl-Storable/Manifest
index 26a62d5f0895..2a1166e38e13 100644
--- a/virtual/perl-Storable/Manifest
+++ b/virtual/perl-Storable/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Storable-2.560.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-Storable-2.620.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
 EBUILD perl-Storable-3.150.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
-EBUILD perl-Storable-3.80.100_rc.ebuild 577 BLAKE2B 9b5ecb8edc5059dafd4db22509b251002ebb6ed8c5cea7078db6ce5fdbe4db7f97d15b9bdc2755b6a2ca1e6c3ad6504864078e107ea12594268d83d7bba25337 SHA512 198746e18abf54f3d77b348bcdfba57887183556f74215c6863370520c188258f6177196168715cccc6fd9719e313b101b4a6669a6ec1a2bbe0d86a4fb2f0608
+EBUILD perl-Storable-3.80.100_rc.ebuild 576 BLAKE2B f81997798d84f80a7495b8403b455cc92165d16b9124c9cbf50ba4ffa0b0d985f7b7ca63468777d6f27c3d0df3c0dfdcac39d61aabdd4ac8629d24f70f70f116 SHA512 83a342843b834de4f1101cebb19cded5d53e9efcb8588351642691032bc2991cb287bbdc150a4af88c69c57dfd7cebc4d5b15dea5497465e3a18eeb0f37d00f7
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Storable/perl-Storable-3.80.100_rc.ebuild b/virtual/perl-Storable/perl-Storable-3.80.100_rc.ebuild
index 89a6d92673ec..28f620ffb24f 100644
--- a/virtual/perl-Storable/perl-Storable-3.80.100_rc.ebuild
+++ b/virtual/perl-Storable/perl-Storable-3.80.100_rc.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28.2* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Harness/Manifest b/virtual/perl-Test-Harness/Manifest
index 04ca9f7a4562..7b54501c3bfe 100644
--- a/virtual/perl-Test-Harness/Manifest
+++ b/virtual/perl-Test-Harness/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Test-Harness-3.360.100_rc-r3.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-Test-Harness-3.380.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Test-Harness-3.420.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-Test-Harness-3.420.0-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r1.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r1.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.420.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test-Simple/Manifest b/virtual/perl-Test-Simple/Manifest
index 25b7c0b8823e..90fcb51671ba 100644
--- a/virtual/perl-Test-Simple/Manifest
+++ b/virtual/perl-Test-Simple/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-Test-Simple-1.1.14_p522-r2.ebuild 554 BLAKE2B 9efbcb5607d6cd97e9e93b5e3970e38dc687c27a856814beccdd7f1e25c9dbc1c15b7493c052b2fa9deee5b50129ca7865a79a2a38e8827aa68fccd8e9f8ea65 SHA512 42e2b65e39e561301961fe7973e07f4a35a6347a6afd9c11b4410067417e63ee4bda8dcc3b8ea46d2ad2e2e2e0bb681557a1e99c9560e0419570c16968fbd7cc
-EBUILD perl-Test-Simple-1.302.133.ebuild 572 BLAKE2B b6ba1d50fd57f7a76611c677d2a6f1396d8ee79ad349d5de840d2d2f3f36031333e73c9cdaae4f8e7a6cab4c4392d5ccfb8ed06fad31fd60e48e372fc613dd41 SHA512 4f911fc0dbe73525eb4786350de15abd17820d50963c0c594d7566ca7e66728b22dbd9694d0d8287787908919c62725dc6eb87c0d124cc2876fc970eca280274
+EBUILD perl-Test-Simple-1.302.133.ebuild 571 BLAKE2B eaae22695447c67e4f260b4e7a5e1a602beebd224c062dd61b2f5ccda0edb1ef55f21f602a92fb37623be3a5e4143d7a24b66546f937717358d039ccb7634855 SHA512 9197088c3098fd34093ac6c93160aa3694a032245c3d0210f770257af1b305f3ff3b10c9933a35db5d31eda50e906352a926b457825e52c60829d41e5db73791
 EBUILD perl-Test-Simple-1.302.162.ebuild 583 BLAKE2B decc2d3a4a0822529f2a265b33edd47c59a218c84e038427bbd98c93e8f8ba398a7dbfcb639ca406c1072f0d2e2bd2b299e63f83332f78ea45a5465864985e01 SHA512 72355945e5a0697caa0144e9acb2a618ad680eb0e5b26ec839fc4161c189161ba5ab79806131ad31c5bd07ef7cd8b19a4fdac1ae395e838f151a8aef89b1455c
 EBUILD perl-Test-Simple-1.302.73.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
 EBUILD perl-Test-Simple-1.302.96.ebuild 555 BLAKE2B 0c696245d7815569ff6ff917242bc13eca04435fd3604e6b59b25f51eb22ace55a6d7f9cde424e3daaf5210227bb31f0f951aa503486faaf858b6f35377cf89f SHA512 9f6ea0f18beedbf28f4ed8cff824493afbc460a63209016c76ce5c28526ddc64f97cdfc80deb6a3f98bf55163ab49807df6b854a9080c626fbe7cb0d66a9cde4
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.133.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.133.ebuild
index 3f84fecb260b..93c12c1a9c5e 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-1.302.133.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-1.302.133.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Test/Manifest b/virtual/perl-Test/Manifest
index 68c57fc9097c..86c0aebb1e26 100644
--- a/virtual/perl-Test/Manifest
+++ b/virtual/perl-Test/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Test-1.280.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-Test-1.300.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-Test-1.310.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-Test-1.310.0-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-Test/perl-Test-1.310.0-r1.ebuild b/virtual/perl-Test/perl-Test-1.310.0-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-Test/perl-Test-1.310.0-r1.ebuild
+++ b/virtual/perl-Test/perl-Test-1.310.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-HiRes/Manifest b/virtual/perl-Time-HiRes/Manifest
index d76de0668a3d..0a057423b040 100644
--- a/virtual/perl-Time-HiRes/Manifest
+++ b/virtual/perl-Time-HiRes/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Time-HiRes-1.974.100-r2.ebuild 617 BLAKE2B a767d2b464d38add31ce6bf63192f1e60d024cf2d96f16d5537fee27c4b1278569e31f875d06aff93db8001bddcb02d3f8cd05f792e632cb6637851b3cbf1d16 SHA512 6b8dd45339072bf75c9ac9ad0d58406bfa996e334095de89978fa5ce9c74c10017d7efc7c8a52c69005a1389ce27f4ebab5588912451df1736ebdb0ca44d9291
-EBUILD perl-Time-HiRes-1.975.900.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-Time-HiRes-1.975.900.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-Time-HiRes-1.976.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.975.900.ebuild b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.975.900.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-Time-HiRes/perl-Time-HiRes-1.975.900.ebuild
+++ b/virtual/perl-Time-HiRes/perl-Time-HiRes-1.975.900.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Time-Piece/Manifest b/virtual/perl-Time-Piece/Manifest
index 0198343be821..1f575a8382e5 100644
--- a/virtual/perl-Time-Piece/Manifest
+++ b/virtual/perl-Time-Piece/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Time-Piece-1.310.0-r2.ebuild 427 BLAKE2B a182e13f91c701a7021f552ada8ed30a5c3e64212e3ec7f5a8bb8025da0fab3b84bc9b54d48b9f16a3e9c561bfdd32396dbbe1bec1e5395330a16c44f406607b SHA512 1f9b31867791a99a96620feb6335dc6016e6c923b30328bb8468905c9f2fa56f26587891c5ac6e168c6bb89b92278dd6c1cd784c8e4930cd53f8724a18a95dca
-EBUILD perl-Time-Piece-1.320.400.ebuild 418 BLAKE2B bdbef8407ff6b885f45e44caeefdc363497e4455bfa2be8cb6ec366905ee878518eaea506181f93771269fa4a0c21118eb078110f21cb078e56b5a49c4e5c70b SHA512 d2f1b3465d22468d1d1eae39b274aff6123ea9458f40ca50b81e8cfd76a1031b8e44c69ea5ca37703c46f5ee14b1d831e3798ba84079b12a35ade0f954880c60
+EBUILD perl-Time-Piece-1.320.400.ebuild 417 BLAKE2B cd1a1848912b66084761de832dc76396262fdc573fd7c6903aeb389dd714d4751e430fc75e8f9e8160d280e7df0a0cb8b88292e0452b9e491716213e4b86cf36 SHA512 6c677672c3307633d983a5c184f9a5d3285bdd46edaea2d9cd7bfc7f887e5a59f66c3218367343916ba5fe9bddcfd606d570e78e52fcf56c049ac06fa4ad6eef
 EBUILD perl-Time-Piece-1.330.0.ebuild 429 BLAKE2B ccba94494b7439181b99dd3d994106a8eeb607227e0fcd21ccc06a88352c16d6d23433e497a1fbddc528d70f5b0373e26843ac57d9a085d9657a7a8df766ffc9 SHA512 536c180a3869687b2517acdfcc44bd3f9069b0c7aacd03dfc9cebf81a8467b0112b5826f28ee0d94bb167b70c2c20838c69bee87a32ca8ad690d238db423d531
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Time-Piece/perl-Time-Piece-1.320.400.ebuild b/virtual/perl-Time-Piece/perl-Time-Piece-1.320.400.ebuild
index 467071a3b3c8..e80afadca63c 100644
--- a/virtual/perl-Time-Piece/perl-Time-Piece-1.320.400.ebuild
+++ b/virtual/perl-Time-Piece/perl-Time-Piece-1.320.400.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Unicode-Collate/Manifest b/virtual/perl-Unicode-Collate/Manifest
index c715e18fadb7..8a57af80b7eb 100644
--- a/virtual/perl-Unicode-Collate/Manifest
+++ b/virtual/perl-Unicode-Collate/Manifest
@@ -1,6 +1,6 @@
 EBUILD perl-Unicode-Collate-1.140.0-r2.ebuild 566 BLAKE2B a5dd6b775e0e0760c0493ed0e33971183e142bb1548a19ec87a8be5b4bfc267e198e4afc54bd9e69d6d2921d217e3c9e02484d5de595ec5e450c63dbae300205 SHA512 2d78f374f4b7c5bde4de7a2658cebee443fc196da75311eb2ac779bdcdba6fde0f47eb7fdb2b7ce81e3549ac77aa57e3fa507e62cd8d80a956ba256266edfb99
 EBUILD perl-Unicode-Collate-1.190.0-r1.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
 EBUILD perl-Unicode-Collate-1.210.0.ebuild 551 BLAKE2B 20fe0c2c0a1b2196339baa91f807378ecb32dfb72dce735c5dbcc0425abce58a57e38b4c7077565b6a3f0680a58e2dde91de6d4c365902ac3a262883f9cc5191 SHA512 9cf62c81b74b202f4e588eca9d8968655be00fa091848e4d708113bbc7cc04aa4593bd5957ee1f2b3228481cf6322faec6be71d0aced3dc6f4ecb177a81faed8
-EBUILD perl-Unicode-Collate-1.250.0.ebuild 568 BLAKE2B b04fc78f0a01e0ba552bcaa4870fc3521669648627b65b7ca5ea12d0134a866bdef9dc756615c6e78a555e3ee20096043d4fe6b2ebe60228bd7a216f91e7aae3 SHA512 ba477c2e274e4dc68019d5b31b0b48101ffacfaad38e7a8377cf98620ba33517ddebc1ba18260e3ef28474233a1d51b59779a19ce3342099405357d033f1dd15
+EBUILD perl-Unicode-Collate-1.250.0.ebuild 567 BLAKE2B b621685e414e02016f420fd661537e037d35d9f41aece96172177e3d8edc6be69e6571e9b6ada642ded193e1746ce308a30a813229b617f19c3010337666393d SHA512 ae6eaa2f0c4a88e00d19bcdea9275da6037f41db7b624a3c2b0fb44c928c518ea356ff5c66692ec92d431b831fd185c6b8a16f737084c2c335a256448c342fee
 EBUILD perl-Unicode-Collate-1.270.0.ebuild 579 BLAKE2B ee43c037c00f5894577191f68424efcd33d2f01ef9e615cc749b5db5aeabe98f92a0d7effc3714431acb2e5c138a0d4258433d8b279e875fb6e09c2454bbf375 SHA512 c2307f5398ca1600770c2af98310e0c94c9ee937fe6d401cf4118be78997685669ef7860a65137b7b92cea3c176971c179373d695d278e21851a712703d46e40
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.250.0.ebuild b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.250.0.ebuild
index 1eb46f3f09d1..7bddede2847b 100644
--- a/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.250.0.ebuild
+++ b/virtual/perl-Unicode-Collate/perl-Unicode-Collate-1.250.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-Unicode-Normalize/Manifest b/virtual/perl-Unicode-Normalize/Manifest
index 7052c43b8ade..7544f15c044d 100644
--- a/virtual/perl-Unicode-Normalize/Manifest
+++ b/virtual/perl-Unicode-Normalize/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-Unicode-Normalize-1.250.0-r3.ebuild 593 BLAKE2B 216c108794bf85a51b59603433f48ca9cced7ffbade33a283ec219125c76a1cef5feafe6de96a6cf5f650cfb9478a053b98703af524dd5d5551d2d72726d1671 SHA512 87e4386be4e467ee3dd64f4a679a30e06eeef70b279df445897c8602d54ddfb3bc2dca8ac0ccc38e9b8bf289c790c7abd48feb7eec68dea4fff3bc7fa35689fd
-EBUILD perl-Unicode-Normalize-1.260.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-Unicode-Normalize-1.260.0-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r1.ebuild b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r1.ebuild
+++ b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.260.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-XSLoader/Manifest b/virtual/perl-XSLoader/Manifest
index 4a92708ea83b..f50164e577c4 100644
--- a/virtual/perl-XSLoader/Manifest
+++ b/virtual/perl-XSLoader/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-XSLoader-0.220.0-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 EBUILD perl-XSLoader-0.270.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-XSLoader-0.300.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-XSLoader-0.300.0-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r1.ebuild b/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r1.ebuild
+++ b/virtual/perl-XSLoader/perl-XSLoader-0.300.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-bignum/Manifest b/virtual/perl-bignum/Manifest
index b3810f5e67b7..d5e3567b8551 100644
--- a/virtual/perl-bignum/Manifest
+++ b/virtual/perl-bignum/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-bignum-0.420.100_rc-r4.ebuild 582 BLAKE2B a81e94c84954f43dfeb42c2bf3efd621f9e88686198279fe19528c95ae785bb5c81b6aa06d4a28a9e239c00800ce85138cec57312f10d65db7b9d2de49834aaa SHA512 4e87eab71799c90b1c7858e6b8f1238008654c1ba4295482585ebf0077c66aa6b7d254841726865dad474c159f933a7120903cb2c50bed4d683fe955cff89525
 EBUILD perl-bignum-0.470.0.ebuild 554 BLAKE2B 7f315087948631d9798d12699789bea93f563ae0b13c70d836e1da4c6adb3f45773601b936e9c563a7a4d627141ace026906dec76ab9dfc5caf5bc93e893ec94 SHA512 91bfbce379aec3562b730da4147e51cd001178301fd373309e3fb2b85006ca87e2309e38c8ec8815171e22a193d3597cce935d32b97a6dbc9368038615e823f7
-EBUILD perl-bignum-0.490.0.ebuild 556 BLAKE2B 512a3e62da4cb7b18e152e01419a90b4d7fdcb1dd734b99b26e2c75f7abcaf23cddfab9febe23a740e5bcdce93977d93628eea33e35d5134403a76e40dd8cac4 SHA512 c6ae2e9f9f8928ef166a6168514afd36d760aed0a50e33d51dd0633ae9a24333227c846f6177d06f7d5c1434f085f4928793f2c9de813196add74415795b2516
+EBUILD perl-bignum-0.490.0.ebuild 555 BLAKE2B 66cb63e62e5ebfb6919eec6081c18a92f666edecb592044e9db6a5567e7023eb5d197fac470e600d9af3e91da3b80553eec6f26ee22e7b207140a05632351e8f SHA512 5fe16e03d7106fe88aec57624e96d9d12e35278415acd2c310a0e7f2fc292ab94f760fe3a98c5fe8cc3708e8dca77788aa559f125131177a105c93f7f94be964
 EBUILD perl-bignum-0.510.0.ebuild 567 BLAKE2B cb81dfd22a31023ac91f8bf5ebf71e9c83c8922a9ee2584ea136c407d1336faad8062dfdb0e539b406e0dcbfd0da8c29467c9f25618ef5c415ffbb7b2a0fbf5a SHA512 0f27731b4729f350b3c71c67996ed797770a6edef4881872419bca74bb117c3e09ea82f443d2b66e8e744cf74e8649a6dafcb3b32e4070dfe1b44256228eb637
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-bignum/perl-bignum-0.490.0.ebuild b/virtual/perl-bignum/perl-bignum-0.490.0.ebuild
index 39dba4fca720..7db55e8b5320 100644
--- a/virtual/perl-bignum/perl-bignum-0.490.0.ebuild
+++ b/virtual/perl-bignum/perl-bignum-0.490.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~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 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-if/Manifest b/virtual/perl-if/Manifest
index 2b244d259f96..55be329fa809 100644
--- a/virtual/perl-if/Manifest
+++ b/virtual/perl-if/Manifest
@@ -1,3 +1,3 @@
 EBUILD perl-if-0.60.600-r2.ebuild 590 BLAKE2B 435f74078015551bbbf3719854aff354c9323735541263e18b0b7dd7dba914506b2846e150e90d0548f40e8d35dc124c4bef1440f8038cb61ff17687f53c5247 SHA512 55948821d22a941f0a737d321ab1e86d42a8092248e6a42e9b63ea0c2555db06962f7b1ebbb93870a409adef8ae24d6f6c408c2b1a6a697c7af8d635356f435f
-EBUILD perl-if-0.60.800-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-if-0.60.800-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 MISC metadata.xml 269 BLAKE2B 8650faffcbae83b72e8dd1f4e3a712b749289a8a1d6dcf536b5f0cda438f7ea2ed353ef81daf36d3642de4680208f963eeaed340948c62b60c7516b660b3909c SHA512 57ff55054b685626458fc7314bbdbe18ddd3e20b1decf613a6c03cb28284a5a56c22ab90949b4e30b7d1420ca14551f4ea827aceebd75c4b3c2fd397f9773d84
diff --git a/virtual/perl-if/perl-if-0.60.800-r1.ebuild b/virtual/perl-if/perl-if-0.60.800-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-if/perl-if-0.60.800-r1.ebuild
+++ b/virtual/perl-if/perl-if-0.60.800-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-libnet/Manifest b/virtual/perl-libnet/Manifest
index 4c6663be3d0c..e22c73ca52de 100644
--- a/virtual/perl-libnet/Manifest
+++ b/virtual/perl-libnet/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-libnet-3.100.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-libnet-3.110.0-r1.ebuild 596 BLAKE2B e0988cdb88a688b898a6896e518a84b11a08a6142418add5a824159cb12b2646253555d5bf448498673eae7a453ceb99a119f79fe98021a461fe74c7d24fcf27 SHA512 a56be61da00f8f242ddf8776668e32d401fda0f977c12fd630b31f35e46f931e278247263230a32c6f0e184251b30dae8812fa9b9d1e4f9a0408dc69c5254e6b
+EBUILD perl-libnet-3.110.0-r1.ebuild 595 BLAKE2B b9c360207ed5b66e416228e0fdc398e826125421399513945d03c510c2564a965a089c21925dbaf68bfda2dd1b874d064ef7f4678ee49b627b9847f58c4614f6 SHA512 f59c6cf2fa06229cd0ca895cb38de8158e5cbf6135beed46a2e553a44dd93b59de0111d1b3503779b499052bc00eae8b53ff2e281c4e3431d0d679e89ecd148a
 EBUILD perl-libnet-3.80.100_rc-r4.ebuild 594 BLAKE2B 66c957bce6ab7a30aeb0ff0f3ca0b529114d584786b5a8feb907a19729bdcbf8f41a155e9a0695152532fee122c31e41f439ef6982f12780172f6081a3123657 SHA512 aa9dabb347aa28583f4743624179634fae06253e725c85450aa2e9887f9f6a1ce2edafe09f1ffd96b7b68ab4b193525f4cefc6a1417ce5dd9c0802401a35df0f
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-libnet/perl-libnet-3.110.0-r1.ebuild b/virtual/perl-libnet/perl-libnet-3.110.0-r1.ebuild
index 27e316434a64..5368f19f5f74 100644
--- a/virtual/perl-libnet/perl-libnet-3.110.0-r1.ebuild
+++ b/virtual/perl-libnet/perl-libnet-3.110.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30* =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-podlators/Manifest b/virtual/perl-podlators/Manifest
index e088a3338785..d8f627797936 100644
--- a/virtual/perl-podlators/Manifest
+++ b/virtual/perl-podlators/Manifest
@@ -1,4 +1,4 @@
-EBUILD perl-podlators-4.100.0.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-podlators-4.100.0.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-podlators-4.110.0.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 EBUILD perl-podlators-4.70.0-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-podlators-4.90.0.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
diff --git a/virtual/perl-podlators/perl-podlators-4.100.0.ebuild b/virtual/perl-podlators/perl-podlators-4.100.0.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-podlators/perl-podlators-4.100.0.ebuild
+++ b/virtual/perl-podlators/perl-podlators-4.100.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads-shared/Manifest b/virtual/perl-threads-shared/Manifest
index f0f0388dd894..817d8bfbb4f0 100644
--- a/virtual/perl-threads-shared/Manifest
+++ b/virtual/perl-threads-shared/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-threads-shared-1.510.0-r1.ebuild 393 BLAKE2B cd3b47281c1ef84cccb992da5fd2a91e6846d4fe12947e7c7603ab671e85d86d55641344af07e2e33921d735ce2e310273e5818abe3823c26d0f1b8139b45eaf SHA512 49498708571ea0d2ae0dfcacdc90e11a24c8636c69fcd3152b568dd5257a5f43cec00969ab0eb087a083dfc5f54b668fc438b9a808fcb708476b2b526950b0ad
 EBUILD perl-threads-shared-1.560.0.ebuild 403 BLAKE2B e353cafea2d97a6eabdaf3ed7c96a479b420b19cfcc5c8ad89f68d575795666844423959c15d36ab135f56bf19354fb0e6b2cb835a6615dbfdfbefc22773124d SHA512 3e763b3758063aa500ab14dcf9737ac75ec6f4a09236344a007a6be5fdd1e555d31ab1d744315ce7575734b1facb6b77d12ae1c4066b2c8fa8b281474fb0261c
-EBUILD perl-threads-shared-1.580.0.ebuild 405 BLAKE2B 9301da075293fecf09e7bd307566545c52fa442df8cdcdb5b48cab4b7b567fc9f9759cf573316ebbd3890a69f1f5eebbe54d7539361d7d50caf24277e00b48ec SHA512 cb6fd5621f9faf8ce22b4db001cf5832e841d44f6402c911c771ea031eb7b3eb88a06d92db0ae91024d779fb6768f0f1d3bbfe4e7d02a3f21c2e1b2514909425
+EBUILD perl-threads-shared-1.580.0.ebuild 404 BLAKE2B c80504b7c2a431234c2e30832a608828b99c7aacc9a20e0cad75f86d80051b51a5c50f324c989d1bd40a284d70ea481b68bce5347c033810dfabbc566f82e39c SHA512 e8fec1305fee4473c34897bd879b400fc4e26287029d8ebbb5bfefe0b0ee401cfe79e9683b2c0017cafc79ca4ef6fdc4b080fe0f7e25bfc7fa4e380ab245adaa
 EBUILD perl-threads-shared-1.600.0.ebuild 416 BLAKE2B 1cc93296875a0b2a01f31483d76428c2575c795d14c4c00261551c808b9e8db492c7fc17f31c69c49adcd46e1f84c0d65fed88fd820492cb4a4d89e1f0443558 SHA512 f4fb2b4adabca1d7762cfd0bf89175446343a2cc3b6f1628f04a8e7b3e1a04f3104a4102ce8286ffbc3fe7afb532af459669fbdefdc639745e091938591b92ce
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-threads-shared/perl-threads-shared-1.580.0.ebuild b/virtual/perl-threads-shared/perl-threads-shared-1.580.0.ebuild
index cc31c024a961..9e6e209fbdad 100644
--- a/virtual/perl-threads-shared/perl-threads-shared-1.580.0.ebuild
+++ b/virtual/perl-threads-shared/perl-threads-shared-1.580.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-threads/Manifest b/virtual/perl-threads/Manifest
index 5fb8128383d5..8fc24b849d6e 100644
--- a/virtual/perl-threads/Manifest
+++ b/virtual/perl-threads/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-threads-2.150.0.ebuild 413 BLAKE2B 19c17cf145c5220dff951fcb2ddd38f03c915cf5db90795b0a259336795068b035e03de1f3465a9e4adb2f23081d57f869af9dcefc00c7035c84a0f12c77b996 SHA512 ab68090ec6d1a3afb6dcd163a3ef6bb12e7ecf6640570206e5079f99d640eb3cd332d2643431d86e275c2fe85d8354fd3e836989fa2c86df75b4b418163cc430
-EBUILD perl-threads-2.220.0-r1.ebuild 446 BLAKE2B 9b4071016b654e84b810b6cb6916960515183bbf375b3710d337e097cb51e21e6fd475168f4ba07cbd95ea1aca3a53e6371ec775042a0395a842f81bc8dbaaf1 SHA512 f89c615119f75dc053a654832050619e779ad13bdac9fc49b38f412ccc239f1f9ce7e2929e36d75c7ba66415c94c3c2b6a6ccd79e9738e9e0176b0a476d3de9f
+EBUILD perl-threads-2.220.0-r1.ebuild 445 BLAKE2B 0119ec8154f76cd7b8dce987dfb7fb3a30e0478e76a899e2dac9f3223a18520157d385e26550a679b6cd843f7a726f30820f1bd14c4e57c7be4c9810e618baa9 SHA512 3a0f19b95d2c3b3e923fad7ec24d94b0b16e8a20a2c85d77d2f384ec7690c19921b253852c8df3d1794e4cafb050d1ec9be4f2cc29bd7101f416dd742e4dad0c
 EBUILD perl-threads-2.70.0-r1.ebuild 403 BLAKE2B db11dde1c389b910d29dd080829cbb8807d9d4acdf672b8a197ded1ae2d5e218c5fe0111bee0b488838f1fdb0c46bce143a0c1900c5c97398e3e4eee932cea22 SHA512 265aff9394e5115e5260df60898b392b612d5392fc4612a458156b66c05232d6bb2ef3ca434c6f84d3af4907a91c9d5c3876d22c21798609c425344747d4ebf3
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/virtual/perl-threads/perl-threads-2.220.0-r1.ebuild b/virtual/perl-threads/perl-threads-2.220.0-r1.ebuild
index 70abab84cc20..7ebd1d38de84 100644
--- a/virtual/perl-threads/perl-threads-2.220.0-r1.ebuild
+++ b/virtual/perl-threads/perl-threads-2.220.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x64-cygwin"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.30*[ithreads] =dev-lang/perl-5.28*[ithreads] ~perl-core/${PN#perl-}-${PV} )
diff --git a/virtual/perl-version/Manifest b/virtual/perl-version/Manifest
index d8d70d1b7c83..5bb2aaad63e3 100644
--- a/virtual/perl-version/Manifest
+++ b/virtual/perl-version/Manifest
@@ -1,5 +1,5 @@
 EBUILD perl-version-0.991.600-r1.ebuild 569 BLAKE2B 0b40d3a26d40d51775a49d4658857f68db785bd210fec3798266cd5a4477065e1f3fec3052fa865543d28f423038a79a4832bf75d0b2dddc4896353311fb99ee SHA512 23b38d99f3b5cecb9700236b76ab27b1a8d34aff08e0f42c6f8e0fb4d1332ed2c9ef9285b2a8294644d4c40c524955d5304039e7e9ebf7b32715dc9ef6bb3f9f
 EBUILD perl-version-0.991.700.ebuild 566 BLAKE2B d3caf56db98a026c2ec08f7800b2ccb5a94ba60a77153a68e111267e0823ba441b1392607a87c8e97bcc4fe35876fa686eb12f543ccd17e2405e124ff9ff5958 SHA512 ba8b0d44e22becdaeba41c1074f81cdcf5fa0f1b0b76d64832aefc58f770710ed8d05320af9608267aecdd82f9b0990840325ac0b2122e726415177f4df4be33
-EBUILD perl-version-0.992.300.ebuild 575 BLAKE2B 83df33549b11bb93aaa4851d42219d6761d291dd9d3f5c1be1650869f866cf74882f4d5cf90e79f2317dcbd378dd9a2a8e4939cb37b26db37fbb4e090d284dd9 SHA512 c40be0ab953d8256b06338f83f6f2fa83506839cc2a86b138e9e0716242303e5ca73cceed80358ee45b0d85f1ccf710476ac741eddabbc15d473d71d521c1134
+EBUILD perl-version-0.992.300.ebuild 574 BLAKE2B fc48f312f71aadd2c59128431b0adb3ba43fbab32d70751e95114c750a9c6f199c4ea575b5caee2591169cb3efc403071d073e442c11e8477721f284f3788c61 SHA512 c4e7c5ae6865a2b952df60933c959143a9e5fdbce5dd6a849e60dd8dfbaca8cee8de80b8dab7f542fe817473bb6c705527502ef5e7a30ca7c317fc0404a3b0ab
 EBUILD perl-version-0.992.400.ebuild 586 BLAKE2B cb95bcaaa4de7d5987ac62f12bbbb9933204c0723ec6550c8aba51b9f39d6aca4adbeebfd793d08a65d3523c9bf23ecc9633d8d8563917941cce17c95f3edb54 SHA512 5308296a3f680675e15ac12f50fb1053498de47751c606317724d0efb4388d05edb99ad02fbfc7990b83193b3f8be7f536bda87f62d4b032df221d64e3003eea
 MISC metadata.xml 257 BLAKE2B 04035438572dc9c398ed29172f6454a150c86d72e6cad7947b0adb3ec8fcc084c68530bca43988c6e1683f4b89d4698796cbe212e9a44b5dfe1908999a8444f0 SHA512 80cde0da56c3ac4023da7b0c17c62eae85139aaefd8ba453dd0c0718da1d40102c57d5beb5b8f984dcbeacad930517347e4d91dd5bd94e973fb81974d078a18e
diff --git a/virtual/perl-version/perl-version-0.992.300.ebuild b/virtual/perl-version/perl-version-0.992.300.ebuild
index fe786cddff29..5959e4b053ad 100644
--- a/virtual/perl-version/perl-version-0.992.300.ebuild
+++ b/virtual/perl-version/perl-version-0.992.300.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	|| ( =dev-lang/perl-5.28* ~perl-core/${PN#perl-}-${PV} )
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index b1900e69949f..08bc34203c86 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_diagnostics/Manifest b/www-apache/mod_diagnostics/Manifest
index 66b7578a46e2..f95084846025 100644
--- a/www-apache/mod_diagnostics/Manifest
+++ b/www-apache/mod_diagnostics/Manifest
@@ -1,4 +1,4 @@
 AUX 20_mod_diagnostics.conf 127 BLAKE2B 2eae27eaf774568cd7dcd7fa2fbc3a383df171c5109d348082a20f20609e2927fa76644c360aa50aa4f8ee084d3f93fbaefed7478fbd0889b31e1b1fb367f125 SHA512 ab19ed00552ac8424b773aea82b6760936cb1574e7dd43adc980c71fe6649419d8de6948a55c33b848ffa62cddff9680b202b7e1911f8448760d8b9f82b48692
 DIST mod_diagnostics-0.0.1.c 6373 BLAKE2B 4cc76a6abaef0eadfa6f6e1ba2d5c6852b6d73da0d17593b676e5112b855d9357754aef79b1a84bcfc279f7cf6056c84da8b6881bdac0ac822403d4e71852dd7 SHA512 b6f6498f70e37279508ca732aa3bbeb7180175ac35f16cfb88fa2c7558edec64b1cc3659b4516909888119f7984d51a98cadc9ef07480fdff5eac72174e8835b
-EBUILD mod_diagnostics-0.0.1.ebuild 597 BLAKE2B e780cbc10bbc3475eb80d94e1b907b4fe1e4845eb1906d3671d2d02cd7b0051b439c69072f8279c349954769d2d55f4f266c96b004207d02dee9cb8d38cc17d4 SHA512 2b14de257075ce80b04c184eafd57411a97570cffe416fc10b9ef08fa20f1156c700a4df43b476519674422b97101d4260264e09bb2244c2a4dc34c4e7f13d02
+EBUILD mod_diagnostics-0.0.1.ebuild 599 BLAKE2B ae6a60ebfa4cf51add9be82f637a14235f52f67a04b26bef56a8f07340e758a9d6ec7de089f6a69abe5cfd1a5b257d4dce47df0b75def2f9a5d7ebf267ee6a63 SHA512 3c93760c91a4498c9735b531cf7c018c47148297e068995d8ec9d0a0a5297289e35aad7b092ffe2073000d5abacc2a440568b264d87c4e5951696e717884af4e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild b/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
index a46688424551..a76bbf3ee643 100644
--- a/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
+++ b/www-apache/mod_diagnostics/mod_diagnostics-0.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -10,7 +10,7 @@ KEYWORDS="x86"
 DESCRIPTION="An Apache2 module which can do debugging of modules in the Apache2 Filter Chain"
 HOMEPAGE="http://apache.webthing.com/mod_diagnostics/"
 SRC_URI="mirror://gentoo/${P}.c"
-LICENSE="GPL-2"
+LICENSE="Apache-1.1"
 SLOT="0"
 IUSE=""
 
diff --git a/www-apache/mod_limitipconn/Manifest b/www-apache/mod_limitipconn/Manifest
index 6bfe4108ce68..a80600fbd0a9 100644
--- a/www-apache/mod_limitipconn/Manifest
+++ b/www-apache/mod_limitipconn/Manifest
@@ -1,5 +1,4 @@
 AUX 27_mod_limitipconn.conf 554 BLAKE2B 2bd5e2224a19d2b5a18b64224db41e232ed2c9028fdcaa751251e29d9990e1006b0ca25d09682f1a108d176a5898d2460bb26dc92816dd79530706434ac1adb6 SHA512 7ded8b48b769529a8fcb6b25855d31ef82cf3de423a75ae5e986974ba2c21643adff235ec9bfcde1955513d10fc3fc9dde172ddb9fb43626eb625bed96936c3d
 DIST mod_limitipconn-0.24.tar.bz2 10150 BLAKE2B 0715a0494f6d434217093625f10b5b723de3823c88c82fe2ffa22972b2496abae0924fc7b5d773568af125dc92466e8ab84e3e86acde7756c9535b244e729e88 SHA512 caf1337231ac83ef57938b0f89769afcf309a4a09a0a2c3fb171e49f038d42a5859dfdac06b2c7766f05d9431132b8752aa8ad5164794c89638eb90f392e827f
 EBUILD mod_limitipconn-0.24-r3.ebuild 563 BLAKE2B d703559d5b77d66386af7c1b39329a614ab5157696b890ed04e12d6886d23abd61180a2fc4f11c670cf9fd00af43ee72f6bcc9c4fc34e4f2162907380690954e SHA512 bb08f2755a05ff01588a20656edd41b344e85cd8dca8977c934ef1ecfaf316ed3931e55f510fdd2d51d1beb5bf4828d5b6ad19ebed0a005bd765b1d38709c78b
-EBUILD mod_limitipconn-0.24.ebuild 550 BLAKE2B 7b856fc0b40c3a585e982423bc8bda2228735eb000389f486915d62ba27cc51b7678eb50cb8b07a95830e516e752af0372630f6ae04a19622b942f56195ed88e SHA512 68bcab646ac732ced0ed6309a36db46f57d64b2a6b6ceacfaae351c654f694776f96d9420d61108e63f3e3570b2cf81d3f4552ee55497c9adeead5d4cb180ac9
 MISC metadata.xml 358 BLAKE2B 557957d79622c5cee28e1c29cf2b72a812814427f198e5795af545a705848766278b04d6d7f650dac7e7374e82456208716cf2223b562707d5870a0020dfe973 SHA512 89dd1558e063150565f346d3b844bb6534bf49fb65c0f32208c620df671c9482d42b8f50c93de34d1d5f290c9e5bb4109d8a818edf994871c5428f7b3a387930
diff --git a/www-apache/mod_limitipconn/mod_limitipconn-0.24.ebuild b/www-apache/mod_limitipconn/mod_limitipconn-0.24.ebuild
deleted file mode 100644
index be774423dee3..000000000000
--- a/www-apache/mod_limitipconn/mod_limitipconn-0.24.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit apache-module
-
-DESCRIPTION="Allows administrators to limit the number of simultaneous downloads permitted"
-HOMEPAGE="http://dominia.org/djao/limitipconn2.html"
-SRC_URI="http://dominia.org/djao/limit/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-RESTRICT="test"
-
-APACHE2_MOD_CONF="27_${PN}"
-APACHE2_MOD_DEFINE="LIMITIPCONN INFO"
-
-DOCFILES="ChangeLog README"
-
-need_apache2
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 0774078660e3..af4782090b3e 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -3,6 +3,8 @@ AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971
 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
 DIST passenger-5.3.7.tar.gz 7195477 BLAKE2B 43a2384574316f6c8472f326389e8c1feed769e78d66c20e63f6d2679b1ac1b20a9122612c98e3006520e6f24c5883addd93ef11e8f0385759ee0c9e9299b7ad SHA512 bbef4881e0e0c698b29b10ff8a7afbc001c31d14fb80ffa27ed6867a92ad23712319733e6162be1f7720ebda421630af2f258f8167fa73c7b5ea594bc8247158
 DIST passenger-6.0.2.tar.gz 7204982 BLAKE2B 056f85f88e49ca7dcfe37d1d1003beaa5325259a130b44aa60a319d36987c901b0a8a188998d38b68f3d396a71df0db8b8fc9562e58327b61a712dc39fb7ce1e SHA512 05a1c598588ad96864ef81ff8bc45535b3cb35c0f4840f16b93d39c0ece94378e806d967190a3d69b28b37d463624955bb45970459cf8febb258d8fd135e97f2
+DIST passenger-6.0.3.tar.gz 7347651 BLAKE2B 8f4b95d5f80cae2be05a57a5f125cc37241c9c4e0308ee09ec5b830a7ab5a3055408f043934f21723ac0d247f4d6d11c0f001b964c673efa791d1571aad75357 SHA512 0421255dbaa3992dea9d965ceec9fc9ffb3cf7d1a15f3f9837638e94bc3145e2e8eadeef94069cb8d9d759adeda308d92031f88cfc475b3b13c10b5088087a56
 EBUILD passenger-5.3.7.ebuild 3977 BLAKE2B da5ac9a4676d2ae1cd238be73803583619f2b0c5711761790a399cb19633f3f760de25dd7e04ad76a89cf2a7420fc74a60d150fc2fb2a25eff7aa7a8c6e60a5c SHA512 b6a6df0c2a3c0502632e6bb65511e9df1e468b013bbc56dbb430055e6dcca3dcf773f09fa108f9d993c1bddd5a2c41fd29cce889bc5a0985888b5cecc15bade2
 EBUILD passenger-6.0.2.ebuild 3984 BLAKE2B c5510d888f52ea09bc94d630804dfddcaa19ba8a504280fa38e3283cf3b03e18e8aa6e320f76b1a7b127fa4e1530b52eecd27e7e6977dec03bd2935a775e6f55 SHA512 2040af42ca47efe8ed3b51e8c5a2d3cf96cc840bb4c9e0e8cfcda06c150947a8a6bde5563ed3da8bd27b0374f334980802c84d2737c934c78c27fc320bd0b663
+EBUILD passenger-6.0.3.ebuild 3979 BLAKE2B 9ed1cd575c59b2c897b183c81e863685ab1ab992527f0267f3709f31e332ecc373b780593bc7cd0469f252b870159a21eee041d7b22d76601a2f0936d0472da0 SHA512 394ba8a643d00912031cfc1b2169d2cfca29d374ed10195eda3340b4f995cd0a3da08d2c98122ae86e9d78b72b549b1af9a08ac8934d5223faa0c8cf417db17a
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.3.ebuild b/www-apache/passenger/passenger-6.0.3.ebuild
new file mode 100644
index 000000000000..cca1985ecf44
--- /dev/null
+++ b/www-apache/passenger/passenger-6.0.3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.8.0
+	net-misc/curl[ssl]
+	apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+want_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+	depend.apache_pkg_setup
+}
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
+	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		src/ruby_supportlib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version where possible
+	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+
+	# Make sure apache support is not attempted with -apache2
+	if ! use apache2 ; then
+		sed -i -e '/fakeroot/ s/:apache2, //' build/packaging.rb || die
+	fi
+}
+
+all_ruby_compile() {
+	if use apache2 ; then
+		V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+		 APXS2="${APXS}" \
+		 HTTPD="${APACHE_BIN}" \
+		 FS_LIBDIR='/usr/'$(get_libdir) \
+		 USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+		 ruby -S rake apache2 || die "rake failed"
+	fi
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	if use apache2 ; then
+		APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+		apache-module_src_install
+
+		# Patch in the correct libdir
+		sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+	fi
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index d9436dbffcaa..1ba740bb9b47 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/blazeblogger/Manifest b/www-apps/blazeblogger/Manifest
index d1263e123769..2b73ddac32ee 100644
--- a/www-apps/blazeblogger/Manifest
+++ b/www-apps/blazeblogger/Manifest
@@ -2,5 +2,4 @@ AUX blazeblogger-1.2.0-bash-completion.patch 2058 BLAKE2B 461fc806002d2c6075248c
 DIST blazeblogger-1.2.0.tar.gz 81340 BLAKE2B 08415245ea7114ecfad7f5817eae4c2a9216178b7ec7ffdd5e72dc9467853dcecce71612c40e0395f88a3358d67e63eaf47cfecf7b84e8e832eff05deaba5406 SHA512 c0fb7d3493933e405c78e871baa0eba7bbf6245d98174ae1f80d215bc413a836a0872fef067ca0622bbb155b54d90e7e81d99e6d10e93aec3bce098677a827bd
 DIST blazeblogger-doc-1.2.0.tar.gz 191467 BLAKE2B 501981679a16b3cd592b6f2fd55c2d8192944106b507ce3119828a3266fe27d49e18887cabb072cece273475b1ccb2321e043195276e53bcb651317839655cd7 SHA512 135d77ae30fa090207cf1147188ceb3552582fcba28d548ed8b104d86d0cff1beb6a3209e4e7cc8984f698e927ab96437254277d96b9dff371d90866c5657989
 EBUILD blazeblogger-1.2.0-r1.ebuild 822 BLAKE2B 02d0fa7f918d0d1e534d629bfc4c2d67eee2bd23c2b953a00c9c8b53e82a1dad5960813b486ac0d37cc7fba34c2d171081d57a296229edff3fd136b9c4177f87 SHA512 21c6bd49895658dc2bb1e7c2c6d05c744ba01a955c0e3dd61a4a5f2ec723d33b66c06f856a754b541aea78a5d8de9f907ee45105a1cb62530bf36e9e175ad809
-EBUILD blazeblogger-1.2.0.ebuild 699 BLAKE2B 642fab200ebb1a56542c0669979a284feed911ea97a78cc70987065390dfccf75256f3c2061ceff399f6873925f8be5ed4da76df3dc6d1ab3929c5782d2e509a SHA512 03a9d25fb8594613b44857a2a0d0d66f715e974476f60dd56c512ddfe66b577553d5508da994eec8792e6a21dba9e6c75662275e2aea690e3807442756698b7b
 MISC metadata.xml 249 BLAKE2B 91cbef2ed101800f4cf8640ce7e6eccabbea893a436b81fbcf7a4d79914b80390e9ad90811eaac53a05f8a45eceeb939f32fff9b41bf9f086a0f51ccfe1f6e16 SHA512 276f06c4a1bea09c70d260c03dc673a0e0826484806b084761ed6f98506f37b551a84ff6a6b293988df9d29ad30f207bdf4206b666dcdd5286415fea1257480d
diff --git a/www-apps/blazeblogger/blazeblogger-1.2.0.ebuild b/www-apps/blazeblogger/blazeblogger-1.2.0.ebuild
deleted file mode 100644
index 2b210aa8daba..000000000000
--- a/www-apps/blazeblogger/blazeblogger-1.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Simple, capable content management system for producing static content"
-HOMEPAGE="http://blaze.blackened.cz/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz
-	doc? ( https://${PN}.googlecode.com/files/${PN}-doc-${PV}.tar.gz ) "
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e '/-m 644 COPYING/d' \
-		-e '/-m 644 INSTALL/d' \
-		-i Makefile || die
-}
-
-src_install() {
-	emake prefix="${D}/usr" config="${D}/etc" install
-
-	use doc && dohtml -r "${WORKDIR}"/${PN}-doc-${PV}/*
-}
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 95b3e0cb2f1b..898d7160f550 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -3,8 +3,10 @@ DIST drupal-7.67.tar.gz 3312764 BLAKE2B bb7f21e80ca192ff3e37f917c1fa43dcd8d3cd8b
 DIST drupal-8.6.16.tar.gz 17151378 BLAKE2B 2bdd14ff7a5f898af2d322a6b2862643899dfbe2ad05c99b85f036161612cccfc2c25105c8eef37311634a2aa03ed792db8de3e625aed5adb94cd8f644557fcb SHA512 34f260d780bce286a0a61b710c340d2622cb857aa92a2bdaad63737303ef2f4f1751edc3f415daaa14b9cb483757e367e639136d03f571cba5165129bba31e12
 DIST drupal-8.7.5.tar.gz 17843250 BLAKE2B e68895ae3d097c1bb4269bd77a2180723caa3601322443eaced9e6e157511468b2fe877ee72dafb735c6d7d077c1f3d29e3de6b3624bbcc0f080ec4deb305065 SHA512 f0f34f8314e86b9fa104992fe8f96dfada335f58c5e25c174f44e484c27dd4a2c9f4fb19505ac29636fc7f9548c898fbf497c119ac8dd588e881e7aa373aefde
 DIST drupal-8.7.6.tar.gz 17866782 BLAKE2B 19a616fd685078bdffa9f9e20234aa0aca8f24bc040068f7496cfb7163216977c4bfaf63f564b5fea08351f1899bb97bc50f48ae21250213ed8b93bbb15ab54f SHA512 eec8c5d5646371cb8382806c93e925d65b725878b2a4e53f4ad5559f14523c31e62cbba7ec813292b79cf1a332f64098e41720472171f233ce0bc1c0d24c395e
+DIST drupal-8.7.7.tar.gz 17873760 BLAKE2B b3614217ec84396714ed0bc9dfa95bd2ef6b9d41e842b7bb7301cd7d00505afbb4902613f814f438e3a9c4091cf48869b8298d0f6bcd71570a73eda287adc0f0 SHA512 098fa371159449eb7ff8ca1f25100700a6986a5b1efed9c4989372e1eb53e02ab9fd9ca218c51e59b2a3280e1dc0fdc95382c3bdce30eed2974176ef08b75eb6
 EBUILD drupal-7.67.ebuild 1758 BLAKE2B 52959ae6dc48617ec80e22ce74324e138897f01ed9e2c489d481554188825ce917a9461b79d07a7c77049cd4458d51329f19feb68a18949afd4517a0da40040f SHA512 2aabe685ca2fd5ff1f29c8e575f22b7c1030b830afadeefe3a591b3316410a97b3e7640690bc28fca4e22f6b816f8b898c2e15c22c2cb3557032f46ce2320609
 EBUILD drupal-8.6.16.ebuild 2296 BLAKE2B 65b24cb2396a5b9a80da6c1e89fc1cf860fd6c02e2dd10e0795f9dc142d0b618444471859644e6cb0f2996d0edddfe55cb89f023359a5cef864d2ae2f8051e37 SHA512 fdc26580fb94ee1b936789ac75b7a4439020c6dcf0e0f55dc3bf2acadc6d798107796747f1bbd0c2b7832f11d2e180771a8a86c7d2404ee8948b3687f7fab47e
 EBUILD drupal-8.7.5.ebuild 2296 BLAKE2B 65b24cb2396a5b9a80da6c1e89fc1cf860fd6c02e2dd10e0795f9dc142d0b618444471859644e6cb0f2996d0edddfe55cb89f023359a5cef864d2ae2f8051e37 SHA512 fdc26580fb94ee1b936789ac75b7a4439020c6dcf0e0f55dc3bf2acadc6d798107796747f1bbd0c2b7832f11d2e180771a8a86c7d2404ee8948b3687f7fab47e
 EBUILD drupal-8.7.6.ebuild 2296 BLAKE2B 65b24cb2396a5b9a80da6c1e89fc1cf860fd6c02e2dd10e0795f9dc142d0b618444471859644e6cb0f2996d0edddfe55cb89f023359a5cef864d2ae2f8051e37 SHA512 fdc26580fb94ee1b936789ac75b7a4439020c6dcf0e0f55dc3bf2acadc6d798107796747f1bbd0c2b7832f11d2e180771a8a86c7d2404ee8948b3687f7fab47e
+EBUILD drupal-8.7.7.ebuild 2308 BLAKE2B 9b49ed1062c78c37eb9ce3bab96f63fbe288756166a9f3168844c59a9ab71830a7150714d9db77e0a268f4d81fd16165b8272a38afe1fba472cb28eee4969b8d SHA512 2cd254d70d6d715bf2f7ee79ad63a5df5e0c8d9881476998b8d496293663341b00a1e5ebe50beab17cdf056f6cec43d80bda559c5d794f37de99e99543857f13
 MISC metadata.xml 419 BLAKE2B 3652ed012764eeebfd813e1979965e76caf500aea8a29bf8652c56f145e62e5ac8c5ae233919a0be123878cccdbab5fa52a4c02ed7367099862407487ca0b8b9 SHA512 3610c6151b6bbbb452a9c599d04d28a18c3e535c0976e425778e8b138bb03637bb28900acef2ef405ec10176390db33e997ba5d789f8a0fc49564538194fc8a1
diff --git a/www-apps/drupal/drupal-8.7.7.ebuild b/www-apps/drupal/drupal-8.7.7.ebuild
new file mode 100644
index 000000000000..904bdb363546
--- /dev/null
+++ b/www-apps/drupal/drupal-8.7.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="-alpha ~amd64 -ppc ~x86"
+IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
+	virtual/httpd-php
+	accelerator? ( ||
+		(
+			dev-php/xcache
+			(
+				>=dev-lang/php-5.5[opcache]
+				dev-php/pecl-apcu
+			)
+		)
+	)
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	sqlite? ( dev-lang/php[sqlite] )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/hugo/Manifest b/www-apps/hugo/Manifest
index 4022e01a2d24..0f491c26e413 100644
--- a/www-apps/hugo/Manifest
+++ b/www-apps/hugo/Manifest
@@ -4,12 +4,9 @@ DIST github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.
 DIST github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz 6799 BLAKE2B 8e27467b05093ef6af830c07a3a5a9fcfbd158c75893c6e0279538b02d70ed8ed48981ed1369aa1472903bec16c48b020a7949759dce625f6fa5cb8fe6fc4e03 SHA512 a7c80ad1cb51be792f92dd34fec99dd1d3f11e5762e196e8f2d126afaf7e62548f3355dcb2616a989d0e4afc4cd7f559a0bf528ca0e20b0d1013b27498308a30
 DIST github.com-alecthomas-assert-405dbfeb8e38effee6e723317226e93fff912d06.tar.gz 71099 BLAKE2B 2894bc0568c3d114aff71724dade89c604d9f0528cbe8f5c644c4a850941f146eec9a862886cb3241b75212c6f2272efc50a6923166eeb571be26c8aded40e0d SHA512 182f141d83bb9b1d7d94cf3b1beb2e7c4074f9be3bd0250e3423fe64e6182f34b54b36e517397aa88440e42fe116973ed435bde6b8343df299db6ebb32591331
 DIST github.com-alecthomas-chroma-5d7fef2ae60b501bbf28d476c3f273b8017d8261.tar.gz 317261 BLAKE2B 94922cf2a294e5109c79213eab7bac6a9ac7c33830d07fed8999dbdea7417f19f175e97f5ed1cfce1e6e33232248ce036ec4cf694e0a8b518482a5ae4cba8b20 SHA512 305b73b5e67a5d5567f22a84f44c1d25430ec132522d9ec91abbcf6167de8e25d283dd151aa078838fb7cf7e66ace13c58c62921c41dd3f088f982acbeef40d4
-DIST github.com-alecthomas-chroma-e4dff9a08cad984e9cf8eaa39fb80f2beae10484.tar.gz 316451 BLAKE2B 8025aba0ccd83bbfdce3eeaf9031f00db9555f851729605a625d5ed698b8edf2d24e9efdfd54ed2bfeee1f560fb5f9e9772e4ded5d2164ad4c1254df8f27a3fd SHA512 74da7b6b28b3e838ab8f0fb72ca66de54d0e8f28086a1e6a3509c6bf9435344a8f2e8437597e1d5d56c5ebf424f9ca0cf4dce82f3e77b0ad4fb85888e4ee0487
 DIST github.com-alecthomas-colour-60882d9e27213e8552dcff6328914fe4c2b44bc9.tar.gz 3483 BLAKE2B e4ecc9503cc8c6053adb66f87ddaf1e9fb66fa18060c07a0e26c1fd8fa1b143d48345ea73c399571f787b8104a7522672a945d885f5e24dcf0718a995d6567f0 SHA512 e428ba9fdc2fcf097ec9892241cbca65631924dfe66a08ec4131e7cfba24125145600f03b753b7bc4452b06f0c7380560d9165ebeb7dddb30d35db512c825796
 DIST github.com-alecthomas-repr-ead21651dde39fea129e6e4a612c675693d0f4ff.tar.gz 4641 BLAKE2B 318779dd36cfd71c092d332fad094fa490f9ed82caf239d27327c81f3531f22418172a3c69c9fde17d60e4183df7c7437e47f70ecf78a79684580863f58b1037 SHA512 f17e368d1f80a0b11f99d29fa3191af7abfa4fe0ca33ddd1f6dc99a019787e120435f21a79f9bcd7ae67a722da337dc938e001756cd60691120851dc112f4782
-DIST github.com-alecthomas-repr-f49988b46e025398b9f834f7c726afe001ec481f.tar.gz 4609 BLAKE2B 4407439779e981b39d1926437aa67a8922bad0eeed8858b0888c53ee819c8551367e8f74d6d04854ce57dc45a477060461ebb79b30be6b8f6880dbc94f5d53c2 SHA512 f07fda8ecd0c653dfd0024eee9e33851572ee21a6aaa196d453825bc28bb92b3c80c0dc0aad38ec4e2158e7f22d7aa1166e4ea7aead713fa834c686cb98dc02d
 DIST github.com-bep-debounce-844797fa1dd9ba969d71b62797ff19d1e49d4eac.tar.gz 3494 BLAKE2B 3f8103b07b4d37c060d48739c6a6cfc9b585ea3fcf1b87aa9bfee44245b8f4067763567864903b488070a3ae43a30b7ed95dcaa12517d119af0c4bc6cf73303b SHA512 2636d6ef6cdb5334da0e6ca560e64e2e1880ed749b7abdbc6ac6f2eff125c7c40e4eda549273d68097789234dc7e4bba3cd5d07ea5147e9d28ee390c2fd0216d
-DIST github.com-bep-gitmap-012701e8669671499fc43e9792335a1dcbfe2afb.tar.gz 4602 BLAKE2B 5bd1389e89f3d7b9c423d5a3dc2c40b374acd71c5f71a1032184464184cabd67e4885afd4aafe82b0f8c4733389ea639aa5e9d3a71b86285cd6579cf3803b35b SHA512 a46602ae2651d6b21442e797658553b5e4e5f6226a772152fe690aabc0670ec3aa5d65dd9fb7e6fbac98a31b0e854cb5838c998ab47114499d65351760c87ffb
 DIST github.com-bep-gitmap-ecb6fe06dbfd6bb4225e7fda7dc15612ecc8d960.tar.gz 4593 BLAKE2B e79ca928b2fa74ef75cf4c30b48c8e51cd872efc5c66bb8658528106ea4d07e1fd8ef8a0926b4bf87924ddc397688af5bd75ea9f1a6464a8a1983fff464b8443 SHA512 e6b155f87170db122593f08c81a3b8f6df662b5002c69189963ea77365bef4cfaaefb8d59799ad2019f0d4050060584ab84a7fdeeaeb3f464615c18991e4c0e8
 DIST github.com-bep-go-tocss-2abb118dc8688b6c7df44e12f4152c2bded9b19c.tar.gz 5373 BLAKE2B 63e63a26ffdeef5d27f5b39111b8b9e966982f4da720c9ff28f0b58517635319ae4fb1b349fa754a0a0ca01d8c3299d13f746a6ee920203c2837c18d064f2acd SHA512 e8f358a5007a5378d37489011beb6e178cdc864f195434f89295b09ff68ee79409ce0a062d4a0dfa1910e4f33201f04031b5a021aac5f40ce154de1f4da2ef60
 DIST github.com-chaseadamsio-goorgeous-dcf1ef873b8987bf12596fe6951c48347986eb2f.tar.gz 34326 BLAKE2B f8a163210623f8233f08b59ed62370640634d8c9a0354c972079efca4f15be3a3a0cd98b8e97145a8cf69a1a35fc28f4d801646c95b211c39773b8fd83007486 SHA512 07a4d649a7c6258fb4993b7a8dc7105ef649085612c9df2c72dc6b106ddedf7c0f9e7d3e729f01fe914bfb2ac4d8f225dbb04f96e7b56461ec8648f9c57f81e7
@@ -24,12 +21,9 @@ DIST github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.g
 DIST github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz 70322 BLAKE2B e4284bbc1825c0e78cf2818091d2d25c581fd5da86d66eb8f91877b8a92f62400962391efb911ff33ffbe3db1de432a892dcc3670f96710fdb7c2cb191309697 SHA512 a5c4cbfc12e932f161c827537ad8366d8c003f40c3959c39bba9b6032e3d381516998a046429ef0980072b717dab0ab1df6b1ef24a43e66e1bf4bda176302b49
 DIST github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz 25955 BLAKE2B d6c9b20f80800396ebc3eba2b08ad48522d297bd0da90ed32d6ea2ea4e575e9feea112513332a3c55bbeae2569770433466536698084e787127866efaf0d25c2 SHA512 e5767898e8aaeff59219e0a0578586b63717d5c8507c74ecb813e8e8a7b02470b10df0452cc378c7f0a4b9bec030be22deb3c3ce7c5ae88fd739271cf05e36ad
 DIST github.com-golang-image-f315e440302883054d0c2bd85486878cb4f8572c.tar.gz 4817487 BLAKE2B 679dca12fa3a3270477cb709dfd6a9af88245e4fcb14aefce7cd11038d7f2149c4f74957c104b7be6c66022a2a22d16c8cc05cf5c9a8c1651a0673e2dc0ca5de SHA512 2e0a128c61ff90f814d2fb718f68130e08f343de2cc0bde11711225df9b9173b56d8bb5d0cd5089747c74e960b045995eca3b28d4e87045b04b61ecc5c739d37
-DIST github.com-golang-net-61147c48b25b599e5b561d2e9c4f3e1ef489ca41.tar.gz 942375 BLAKE2B ace0a3815894185823046dcd31723b357c8a82a7390202a60998771b99222a78cda15efacba87b0933d38e00607791f1b7c2179e039120aeded38aeb18a03d0d SHA512 55206463e9f74c232d4ffc4120c9993bd2cb909a594610f617f96c1f4227be4adc094b641fb33fcf27e1d358e926dfb11b7966f5f1d752db762a1e4addb4f41c
 DIST github.com-golang-net-f4c29de78a2a91c00474a2e689954305c350adf9.tar.gz 965137 BLAKE2B afe124050dd7fae12d7e111df12b5fc1ae2004a2115fd85882045ec7d74557c99f43ff97d79b0284bd84ce6493bc6d327bf9018b1e3a185c32bfb78f84dcf986 SHA512 0d671750ab0b4782c3e0f3d86dc9c7e51d1ab59505aab49a95ae27ba0080c88fffced1c917f6057214e1d26c3a5c44586cb29f1cd70309191f314f4df0c3ed0b
 DIST github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz 16326 BLAKE2B d214c190a03006b726b4e5daa8320aa2f664572db46ac6a57545ccd3e98529c63fd5d9296e2afe0af0b781fcced4af52127d8079e72d116e0310688465e1882e SHA512 dc67de045513305edb3239b412b9154b44b6f408eace3cbbcf400c08d68322cec7090b9e6b22d63bcfaaec459e221d0e3f2c057aa19ae9b35a4a134dd72475c5
 DIST github.com-golang-sys-2be389f392cd91df245b41638f818a1c041f0c08.tar.gz 986287 BLAKE2B 26f0dcdd7f886556ee0a30fe267838e39b18b05a70dcd277eaa1b43921f924131e5ed88be225f1b89f9ebe1c36ee6463e52b3e589305558f31cf87270e8e293b SHA512 5d63006960e08313c95d8436c2a47b0cc25cb8ccfa439b383070da0d416ca34839033c029ffbc3d2830a543752dfe687b54708efa6be00ffda6a627ef0490ecf
-DIST github.com-golang-sys-3b87a42e500a6dc65dae1a55d0b641295971163e.tar.gz 803628 BLAKE2B 176b7448935ff2062bcb662e85280b6f622d6321b0a35b3126d437aa1f0f121b7d61447ee22e6be203e1c6da0b510662272c55a179c13ee496f233d4779ea263 SHA512 e97d6eba66b4b6a6f67a0e5adde34f26af6b7ced21d5a1edc5b42d8b0da9d6482503214918fcb648dab996a9aca4481ff81948ca9f94ce552fc977fa74d1b286
-DIST github.com-golang-text-2cb43934f0eece38629746959acc633cba083fe4.tar.gz 6567837 BLAKE2B 14f3b81ff6a41d6e309ff595102f3817967635a764fc1bfbaa3fae6d28464b1c59462c06d1828da5d3815d54fc71b796737834a14b9d33bc92c24b01ea639799 SHA512 0a29b4b8dbee9d4cbcddbfb361016fbd2f6426a4061c541f6cee3e7648d580c970d55dda3bd41fbd9acfcb40112f0aac37aa1096d4ddc080d78e371e2a83cbf8
 DIST github.com-golang-text-cb6730876b985e110843c1842a7a63a63677cf08.tar.gz 6572861 BLAKE2B f118e61844be2e2228fb9f7d43e4621edc784a5e95c505be36bd487521452877e9d28791c7b47660d6f996ed9da7da7627d654892ae3c0d9b4ce0d6f4b2141b0 SHA512 a9fb7483265669866e532229884482b0e24c9e54b15bbc10b67999a93ffe8b17eba3743a4b71d8f5c0605ae73ed309b80ee640fcfd9f7e2f052ca6a3cdc61178
 DIST github.com-gorilla-websocket-ea4d1f681babbce9545c9c5f3d5194a789c89f5b.tar.gz 42979 BLAKE2B ffbbc786654250e3b6d447e82dc2fc3ee14004b554323759d4a9b4df77c6b144ef38b6529552f2714d0f6e9e0f877cffc80062ccfcd5fe8a16b1f69dd7fb6c07 SHA512 8acefc7a8e57ffb04756c2b3c27d6c8af33bcf36ba597baf863d28b9d6388c37c7e84c348e44356ce99e22e9eda87cd5eaa146c2b3e541811df84d516f300b16
 DIST github.com-hashicorp-go-immutable-radix-7f3cd4390caab3250a57f30efdb2a65dd7649ecf.tar.gz 18972 BLAKE2B b66c34ca0286353bd19154c735a8a2cc3d6469c68cb4a0a58a7709c29d472d37506366e56c2a6de2e1a6685bb312aa79c63100704668063c4297e9e70df980ad SHA512 3b237511fca5c8bf17f718cc8e71479e839be8db3b71a1abb418bd25fe0ed05d80e954a231093cc7f13bacbcf2a98b2d8d82b2586cbc3a7d6ab5aca75c817a1f
@@ -38,25 +32,19 @@ DIST github.com-hashicorp-hcl-ef8a98b0bbce4a65b5aa4c368430a80ddc533168.tar.gz 70
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-jdkato-prose-20d3663d4bc9dd10d75abcde9d92e04b4861c674.tar.gz 4569776 BLAKE2B b50704953a8fbd207a7ab0ee74229f7f9be93d9dd39952165b3b05b0781305f573261feeb37ee628d215d0e2af3ae2c87619326112b2e2269533979b2f0918e2 SHA512 ff0fc88fab12618e54141a42ebf90725a3420c9a93d948d4f3dbf457f191f1a1b21346e03c5ecf0e6601fa650ba6d02411aa5b97dcfc1199bd0aaa8fac76b99b
 DIST github.com-kyokomi-emoji-2e9a9507333f3ee28f3fab88c2c3aba34455d734.tar.gz 35812 BLAKE2B fe4864dcce97b41c26bfc745961b69d01dc4344600774badae8c0cb214c72066c5875a3f0ac31f64493809e509bf962e139e8d3c611384362caa9ab565232bb8 SHA512 a7218d78c2166a08558d0f13a099560b493b946d0e21315a9609110a2ebcf371d36c47fe7690172faa32abeaf1201533c01bc05d0a88a86c497a25b4517873c4
-DIST github.com-kyokomi-emoji-7e06b236c489543f53868841f188a294e3383eab.tar.gz 32571 BLAKE2B 2caf4181610b3d74f615714385afbff0285852cebbf1725113f9542e5d7e9de07f169ee4abbc4e2da651a70efaecfa3545c82d93a34bf8350a7137add601970f SHA512 36d5a88c59779057b25c5bd4397aadc3976cea1d70fc13666a904f293723c322d8ac49cdf478e70ea5e42586cae2fe64a0e34c93df9e77578f620e679a5e27fb
 DIST github.com-magefile-mage-2f974307b636f59c13b88704cf350a4772fef271.tar.gz 8767393 BLAKE2B 520a0b581b3567fc95ddef4a44157cbb0e1cec13d94b0c4ac0a6af29ce61bfe703b0d0e6178900a782532d161ffe98f650a498879ee31e5f9ccab81e6ef03328 SHA512 6c22de2dc7820ea60ddc26faa3590ba9a52877f6e84edc6685fca59e8138eebbb96fb14de8a2ccaf7a1c9d524afdef456f8e14106c4b30eff48766f47be84d4f
 DIST github.com-magiconair-properties-c2353362d570a7bfa228149c62842019201cfb71.tar.gz 29495 BLAKE2B f394e50ce58dfb59db8e8ef6364cdf494604cec2e042009a8a72250908102ce31bac173291f9c75ad585cc570fb7635b7146b1ec85daf01899945b5bbe1be621 SHA512 fe3e521365758b42df60acd8d582a080eb4828ef56cd20da57b6041074bc4b7673f01a6ee83d8271abf60609efd0c200149ccd7564da1b3a40bbf3e2c9967e66
-DIST github.com-magiconair-properties-c3beff4c2358b44d0493c7dda585e7db7ff28ae6.tar.gz 28710 BLAKE2B d1f849b968e769f8ba3ec36a417bdd43eae79d4676b98092607330407c4ae79bb591822ea12cf7d4fc665c79e4018c52e6044ac1346afcdce9f7f1115142a23c SHA512 ba4d0cc293cd00f9f8c1971f0845fcf57d87507b60f2a4f4fb439baa34b47295f7b7da44c37dd447d8aab4a9b46901490999e8beced93f491c6a778dcedcb408
 DIST github.com-markbates-inflect-a12c3aec81a6a938bf584a4bac567afed9256586.tar.gz 10753 BLAKE2B ee2f15434c7cb9352a4acc1060a0eca725c32d4c127a68e0e5cec9dba8ee251d47ba7dab3b58a15a10e3cb5d3d47bd7051b2c879bfc27141a1b4168158f34310 SHA512 7af6f08396ab5777fa7c233d0bfbfcebf149a08dd17bca63c70a2d17027602ef01160e74479e8ac1ee529840211b849de46674edd32eac384f07dc7dc1158acc
 DIST github.com-mattn-go-isatty-0360b2af4f38e8d38c7fce2a9f4e702702d73a39.tar.gz 3366 BLAKE2B a98547ec2761d17b7afa7e69408292c3450c0661f442fe8aa0ae918c19c54c2fad4243f91a374f12029f0da0d2dd8145ba9d50ee91f052b69c99755f3701504d SHA512 e75aa6d17ee5fb1222b9505ebd015d9a5392b9627487adc7ebf83bdc66c337520ec819a41e4a92e231c6ca9ffbb145eb1bd3140852083c4c69df9b2ca886e172
 DIST github.com-mattn-go-runewidth-9e777a8366cce605130a531d2cd6363d07ad7317.tar.gz 22390 BLAKE2B 20b6793a424d2620e5ce57fad619e86e7bf251ad612322132939c3c53eeaa17c1a100aa75888209975c05e4c7f1ec099ac4c51b61f4fdd62a42d2e506c4f5b75 SHA512 85430512b8c199e7e2ae4bfa77aef58958211bf85148ea439cf26ffc30704d3bbbe21e1525df579a65e0262c7f8780ff0ec345fb76907f4c66bf715f10ff6e12
 DIST github.com-miekg-mmark-fd2f6c1403b37925bd7fe13af05853b8ae58ee5f.tar.gz 198941 BLAKE2B 31e691854ad8b4f697620d786027e29c8da6a63430033cf05892bb9846cd8202b9780037d31de7ac526db907b9a07b45ce09be814ed9106de2d266c94409333e SHA512 a027acbebd034e48be627d5a5aba1bef5becf702652595ca815aada5acc7a39d67dd05b1c23584a8d3a296bcfe267a507f9f1e690e7cc8f84b87ce462d0985cb
 DIST github.com-mitchellh-hashstructure-2bca23e0e452137f789efbc8610126fd8b94f73b.tar.gz 6461 BLAKE2B 6317479125515dcd18a7a5589bfccc44cd5bfb961da8004a4fbb336840fe22c2e8c765dffa587c41d75dec17b2c2e5ff324b95a9efad3326d9290280c4f60d16 SHA512 a818ebef810eccfdca70aecc1a19208fd6f1ee454fe3677249d43ff8a5a6d462f2b947a8fe5808cfc50f7387457e65581bb2ee45012e5e0df3cae541357d70d3
-DIST github.com-mitchellh-mapstructure-00c29f56e2386353d58c599509e8dc3801b0d716.tar.gz 18394 BLAKE2B 928baf92d3af36498a4fd74f23086dd4d759f72ebcfa18b49cda23e7fff719ae9fdba9576869ddf5e220f8f6cce61a9c5c772d34a0fba1cb96eb6e05dd9b916a SHA512 2b74b167940018f95f1e4767d44ff66d94b4bc8ccd97f98364e06bd1f6bc46006c0acfcd470567b6de8e357009f42e96b9058315cdbaa3254743480d2cbfd35b
 DIST github.com-mitchellh-mapstructure-f15292f7a699fcc1a38a80977f80a046874ba8ac.tar.gz 18797 BLAKE2B 6ed634b5d0e7a4fc586f30bfc5b4c5767e3f17d5fc61e51fea9bd2840bb1707256998cabf64f9deb08b9cd12a3d903f188d7850be0fd9f99f6a25279cfeac8d6 SHA512 36dbf10aff4ba4ce64f4a6a6d83842304b0c4610ab13b0d6d1a10f618775b5cd67714ba50580fb37708cf3e36c3d6253281bd98882000a72fac7c8f50fbc6f21
 DIST github.com-muesli-smartcrop-f6ebaa786a12a0fdb2d7c6dee72808e68c296464.tar.gz 448097 BLAKE2B fc3d3963959f7a611bae7e6492f11fbbc3787de2b9302c2f739c754a9efa7215bf3c3edfa10f6a10bc504700ed5b4ffd29a8c427f6b0d998a23edc91eef388e6 SHA512 04b38117087f540a03f9da9070a16010d7ef4cb6c321c94df3d3dc95faf57dc3a44f5e36055ce0a6a1c3d924ba01d8bdee40b0c1b457e6f03c650f91663c91cb
 DIST github.com-nicksnyder-go-i18n-0dc1626d56435e9d605a29875701721c54bc9bbd.tar.gz 39654 BLAKE2B 35dbb1e468596499721693cccc2aeb8bb9aaaa94c6001f708b43e405ed6aafa90a40f8782c88de89c15c69bfa9e90036b87a9422ef6d5352f6076ee56d75ae1f SHA512 c0d0048da1755e9ccf4607851eb16ac95568f55131e3017af886442ebacdd71226eb3db5854261c2b6b39985cd09d24d37329280c13a72aa286cefcdaa01cbcc
-DIST github.com-olekukonko-tablewriter-b8a9be070da40449e501c3c4730a889e42d87a9e.tar.gz 16790 BLAKE2B f69ec79cf7e3bfb6d7ee32139db6970b1f45edeb701bdb1b15de48f2a9b33a3eeab003e67e82de2c4b6597af4fd1d94064b7fd7d31b115491216d2e868ba6744 SHA512 697296bda248977a19c573ffe5ab8b2535becaf2d775229bab744b20f931e49ba83743b99201f2ac154ff2f8aab7ff1dae792d09e7be3b1d7e4963b5efffc53c
 DIST github.com-olekukonko-tablewriter-d4647c9c7a84d847478d890b816b7d8b62b0b279.tar.gz 17378 BLAKE2B 23cf5e288d72278f082e1b533ef8324abc268a317b7c11772af89f964e646b22fa246833eff4d0307a89dc89c0c304e3dcb3e37ac1f3252f7213655acdf887b6 SHA512 9418d06e67a72089f0b35f9f7eb1d0da68ee8c433e4577b798a6ba428233b2f9c3bec5723ed6620c5ed257ccb1a1f32262394f21d4d781c3d56e8b2034ac7111
-DIST github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz 56990 BLAKE2B 02a12c6c8ef85cdfacb6ab59406132c74cb0eb4fc270c680abd220210a7d0a5796bdc79c97c5623c4760e38cc143cf51e62fdbdc52d007241f2b61657fbf7d53 SHA512 cfce832c0a74dbc4f559600c846b8df8e94368785991a910169e1a535e2a57a72f7d20ec7c9fbd14a44b7b5a11b496af0bfd7705fd67a1c192e39819ca8aaa64
 DIST github.com-pelletier-go-toml-c01d1270ff3e442a8a57cddc1c92dc1138598194.tar.gz 57491 BLAKE2B a870b1a5e2340956a5af41c1dfd218aeabcc0a10edc1cf0fa975bd32254412e846213ca85de2c11d29f028336e4bab66284e8b2f381cf0d7db46646a85a81349 SHA512 b5f9daa6b95962130a691b5b634586efce81c33a1660466da7fdf4b88a2593b03374a84651c9b8941f71ed257574b7168253c3b196cd5563f02422b3431b370a
 DIST github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz 11399 BLAKE2B ac265a73d47b98740a067a2aa94f46aacb520e11795994109152feee990f6c4d6a97478333ef703543c38f997b11d0c7ea007326710804f881bca34a559651c3 SHA512 5f7a1a04981834f0e4cebf8b31c7070718c45ef549d8770b69c45c35c68417ac44b205057253a20cebd66db26c58cef6878d6832919b8a3e1283bc3d2af45df1
-DIST github.com-russross-blackfriday-11635eb403ff09dbc3a6b5a007ab5ab09151c229.tar.gz 75260 BLAKE2B 684fb920f0183b4fb6ef70a995f22efa6152fbd9bae5ffadb1ac67e97fef3f6b7ed7449c487f086a12a0e497a36ca050289a66ad3aa0105a5027800acb13dc12 SHA512 01b4ff8c392c2188c5d97a606fa74df132eb255df91a9b7a7a79416ddef23bf712526f771f6b5fb0713664714fa45961092e808dce68d733e9611118729b3918
 DIST github.com-russross-blackfriday-46c73eb196baff5bb07288f245b223bd1a30fba6.tar.gz 75364 BLAKE2B 966d2fb61206a0659d1b1c081936d2b16ec2af1091bb21e571fcdfedf5c52c9b90245c5790498454c58a6ddedc10bb6733a998ce67e50f62d16305395b0dc81e SHA512 60ce18f58a78a7e16bcf8c9b8378deebe9da35397f718c9972140512d31dbdba88d46224353ac10211f4daf63ef77743ba4d7cfa8ba5f5cb79cffaaa43161984
 DIST github.com-sanity-io-litter-ae543b7ba8fd6af63e4976198f146e1348ae53c1.tar.gz 8787 BLAKE2B c8f9a9036996f23267f836e2ba223d63099620f368c8e3c50830b1b90d9f7ac8e681b96d66d49a14ffcb03b4acc3242171ceacba14693c3e0560dc0fe860edca SHA512 801e021148504b2bd96b8b1953cbab6d980febaa103fc1f7ee59a491eb151b6cecdd3bb4058ed471dbca0624f3cb92d439ae9b023ea81426506f5aa09f082936
 DIST github.com-sergi-go-diff-1744e2970ca51c86172c8190fadad617561ed6e7.tar.gz 41675 BLAKE2B 36459e76965e83a638d3cfe840eccae0c4d75215c9a2d87b770456671fff0d7a8d1aa26597391dba3f928af12414f5877219f78d18f8110f5287f47a02efe4d1 SHA512 680d572de0841900f6bd1938fc8c0ad6e2dcf21af493bc9ff81ebcb013a15d9439c00fc11048c5de5a5916f8bc3038fcebd80c8faf74161562f5e3d3f90b1e24
@@ -68,17 +56,12 @@ DIST github.com-spf13-fsync-12a01e648f05a938100a26858d2d59a120307a18.tar.gz 4845
 DIST github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz 6345 BLAKE2B dad5459a45bc35e28f9ed7473a02bbfdfcc8da06e17cee15a1876125829065fd4bcaad35b8ec489f3b308637a3fa9cd829c04836207620e61db1a7f706660c6c SHA512 f98c62d7e74ce3e35c29862244d46fb19fcd615e500713dd7c26b30ebedd7a846e419af6586031b748029b8b4d5e32baff6d36bb1ec35856bb6ad5625a407f14
 DIST github.com-spf13-nitro-24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8.tar.gz 6750 BLAKE2B 1aa0bd5f0b7e82d8031fbf81f690eeb985f14682c7a4ff73bb6aa3cfe4d26baff283ffae82fb4862e8dcf1b1c2fa149f24083cd74a503d65ff1e286bbe8d1bcd SHA512 53bc9164ee928b29f32158c3249b22822ff905032a8a726f91093066f18559e52d2f6e8d364ea38bce10515284a8b8c624e4030ee67ef58791d7e3e0c811cf7a
 DIST github.com-spf13-pflag-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz 43327 BLAKE2B cc00d2852d895265eb0b60454877da841fe123535009025c761761c61b4d937d6293f3bef765d2a8919d63d8324dcb6addf774837df26fb864cb72d88add2d03 SHA512 061b9895e3936e356f707385ed7d7e5172f94167a1fabc84e9a0a69df4f03e0eaf435a4ac0cb00f5077855987ab1d2c3b051846c0466485a7bc329a547dc3d3a
-DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
 DIST github.com-spf13-viper-907c19d40d9a6c9bb55f040ff4ae45271a4754b9.tar.gz 32791 BLAKE2B 0948cbbf913f3e36cd2aee4d57cf8717bc6a3d0e4768834fee146f46eae81ce3a47438d9028c1c781d53e6c372ac6455ed8518247ccde13ac5ed39b361f49a55 SHA512 3d415bc893282d1ee6e8c454fb38ca907a2312048d06e482a1b0867e2d77da744dccf36d116f4fba94b8625fd9623e755d30a23860a1a614cfd8577581137131
-DIST github.com-spf13-viper-b5e8006cbee93ec955a89ab31e0e3ce3204f3736.tar.gz 32062 BLAKE2B ca08f97574d71f3e305ec52dc440c2293c23cedcff63f8297ba9352283375059700998b4f198b76e6903f6b8e1c32744b0c335d382bfc232f1038d527341c043 SHA512 fdf9358afc0bf3bc150d1340b65a9758b2c58d871cacb9e924a9501bca5980c86102eea6746ef5bce972bc3685759dbe5eadc8e82d8ccd6ccf56f73230686e63
-DIST github.com-stretchr-testify-12b6f73e6084dad08a7c6e575284b177ecafbc71.tar.gz 95392 BLAKE2B 7e6d970b409e3cc62ba24c5a8d132a7a871b66af4a287a217b40f19ea17b12ef680ff6ebd59c708acd5139f673b9ca8faef7e04c719939cbbd0e331f63eb22af SHA512 9924e8fce7ddfce9541f7da1dfec5a5f57a4d54261f3b16e4bd541a8fe4cb90d2900de24c6e9ae791df9264a27624d23c8b7a4d19a9974e2e2c83c68a0dd484a
 DIST github.com-stretchr-testify-f35b8ab0b5a2cef36673838d662e249dd9c94686.tar.gz 101953 BLAKE2B 17c689b1113d3fc3e2fa1a3bcf3b0f55abd50d2799e5c57d26e04951badf8367fc7e8222ecbe036ee64b0a07524567bcd3e40266be407c3c561367474c6306e5 SHA512 36a556457ba481a24247bd97f0adf7e1b1c90e6ee1495755ee12bf774df3228c42d72d7051312bc0ed7a7b2d9e7a20b4b521c9fbb3e065ba10f6b0320a67df30
 DIST github.com-tdewolff-minify-8d72a4127ae33b755e95bffede9b92e396267ce2.tar.gz 2108798 BLAKE2B 0ccef101e941c6f57b9bd1e461ddeae5d15864e17ab686768d7b09680dda4c08068b31dff14e5d9ca57fdd38c465e5fda6007fe74e3826617ba75a055bee3721 SHA512 3e8c4b716885e25b5c171730031e1b63ea94a73f89290ea1fa2f38dd5eb7945e4320fd269147739403d19b69076ff693e422b4400a200381cc3017916b384b24
 DIST github.com-tdewolff-parse-d739d6fccb0971177e06352fea02d3552625efb1.tar.gz 73581 BLAKE2B 20c061130798049e5f45bd0176e03fd5de9e9af141431ad475a74f8c788cd359f07ab33e10562e85d1b3eed7d98619f3b0c08427ad9486550ee9cb355c7b0721 SHA512 983f2239b394c67b0b4881632eb7885ce0a54788134619b07398778853bb2e0520049be45985976b16436beac1c69868b523cd73919339cf30acc81f2f1f8b40
 DIST github.com-wellington-go-libsass-615eaa47ef794d037c1906a0eb7bf85375a5decf.tar.gz 333495 BLAKE2B 3f2e909feb68f0f673ef378890548dad3585fddb9e40bcc8b97418123a268ec875e0ffcd50b5fd83b4dac68431f24a2be471d416624c165b15bf64f2f7843821 SHA512 a3413cb8b861eb2f05ba01c6735722b68dbaec5d8a646faa7d6175de9c8831d7409e602f72e64fa305fb3f49056a237ce8219c24d149b5e27dc60e5d94a87ee5
 DIST github.com-yosssi-ace-ea038f4770b6746c3f8f84f14fa60d9fe1205b56.tar.gz 23279 BLAKE2B 227141f6cc7b950392ecbbe97f8b889f20e14544b7c80a0986c68dc997956db18d96297cb6e1a49a89fe851f76184f0eac446d2e0fe1c93d45526a9ee26102f8 SHA512 1220a31b92b1e0f76e1e04e7161ee977fd4e17374437ee807ae943a2970df7fb4551f68f4d2175db8f6d7b37d52b564dee75e6f1e84e8fd5939572c3b64bd87d
-DIST hugo-0.46.tar.gz 17855569 BLAKE2B 6e33f963f0e8c1f90b1416857ad552145dcc2a165f9f0e7732546625afb190988756916dc181f0e0de5c214f75fb8a20d6fb982eb1e33926684e0639c5cf0f02 SHA512 b197a44b13df607cb6761d77a3f5ea3a40ec279151075ce0ec0db38797c7aef7d26689699d5a3aaa9e35405d388989d3a5da15227b06652ebed01aa5d6fa916c
 DIST hugo-0.48.tar.gz 18884670 BLAKE2B 1d3207fdc28b293cb76b601213454209d22cbc6eec7bde171c7f249d35be99399a8f07f201d5abf4bda7669ccfa32e588267555e3162b7d9a00887b58b890e0d SHA512 77eefb93288f2208db8e65a0f2ea84a4940a773237854e3f0c3dc41c8f6e67b6db1b98ff243a3665b3e02703089f6242354d185f0e110a72794867beda76ab81
-EBUILD hugo-0.46.ebuild 5684 BLAKE2B ca0fb858d24cd936fdba63bdd541bdd203e6304ab8bff5dae9863c690bacb8e71076f267f313b655d124a4be0795e09e7f2060a3024fe6f172a3af7610beccf1 SHA512 4e7ade7a40d7253dfe564251a095f648aad8b7388bd573a4008418362f82d0106be0f352ad25b7ec693857a1ebe45f7dfd4ac89fa06a3d8b55443104fc6fab94
 EBUILD hugo-0.48.ebuild 5684 BLAKE2B be7d61810d287494faee29df883322e0cbf2463d7a43ed6d9f1bd251cc07081207a996ec7e403658fa537ba4a37350df85b5be7b7361137086725c575dad22ac SHA512 b026bc55404246a7d371d0da072c9f72990bcbc5dd7a936af221cf88e4c5c7815dee03882875267a8c3b1ec211f29ef864afb9cd42d2bcf2485b3e7da9c33e5c
 MISC metadata.xml 234 BLAKE2B ddbfdbd20d0bd2045f8b97d1d72165aceb073433979a8f8d2c9faef620751cf7d62e7714a72674ba87016a6e7264fa7f30d5c4e04491b378623431b07cd6f042 SHA512 2acec09a935e20d0e13c57d60e2d88456b522d3977a76b7b730232a58dc0d6f1152f348f5db56d8d3f2051a70baf40d35b643a34ecf9081adb328ccc6abdcacd
diff --git a/www-apps/hugo/hugo-0.46.ebuild b/www-apps/hugo/hugo-0.46.ebuild
deleted file mode 100644
index e8cd6a0e9e1b..000000000000
--- a/www-apps/hugo/hugo-0.46.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_VENDOR=(
-	"github.com/BurntSushi/locker a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a"
-	"github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895"
-	"github.com/PuerkitoBio/purell 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
-	"github.com/PuerkitoBio/urlesc de5bf2ad457846296e2031421a34e2568e304e35"
-	"github.com/alecthomas/assert 405dbfeb8e38effee6e723317226e93fff912d06"
-	"github.com/alecthomas/chroma e4dff9a08cad984e9cf8eaa39fb80f2beae10484"
-	"github.com/alecthomas/colour 60882d9e27213e8552dcff6328914fe4c2b44bc9"
-	"github.com/alecthomas/repr f49988b46e025398b9f834f7c726afe001ec481f"
-	"github.com/bep/debounce 844797fa1dd9ba969d71b62797ff19d1e49d4eac"
-	"github.com/bep/gitmap 012701e8669671499fc43e9792335a1dcbfe2afb"
-	"github.com/bep/go-tocss 2abb118dc8688b6c7df44e12f4152c2bded9b19c"
-	"github.com/chaseadamsio/goorgeous dcf1ef873b8987bf12596fe6951c48347986eb2f"
-	"github.com/cpuguy83/go-md2man a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"
-	"github.com/danwakefield/fnmatch cbb64ac3d964b81592e64f957ad53df015803288"
-	"github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76"
-	"github.com/disintegration/imaging dd50a3ee9985ccd313a2f03c398fcaedc96dc707"
-	"github.com/dlclark/regexp2 487489b64fb796de2e55f4e8a4ad1e145f80e957"
-	"github.com/eknkc/amber cdade1c073850f4ffc70a829e31235ea6892853b"
-	"github.com/fortytw2/leaktest a5ef70473c97b71626b9abeda80ee92ba2a7de9e"
-	"github.com/fsnotify/fsnotify 629574ca2a5df945712d3079857300b5e4da0236"
-	"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-	"github.com/gorilla/websocket ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
-	"github.com/hashicorp/go-immutable-radix 7f3cd4390caab3250a57f30efdb2a65dd7649ecf"
-	"github.com/hashicorp/golang-lru 0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
-	"github.com/hashicorp/hcl ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
-	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-	"github.com/jdkato/prose 20d3663d4bc9dd10d75abcde9d92e04b4861c674"
-	"github.com/kyokomi/emoji 7e06b236c489543f53868841f188a294e3383eab"
-	"github.com/magefile/mage 2f974307b636f59c13b88704cf350a4772fef271"
-	"github.com/magiconair/properties c3beff4c2358b44d0493c7dda585e7db7ff28ae6"
-	"github.com/markbates/inflect a12c3aec81a6a938bf584a4bac567afed9256586"
-	"github.com/mattn/go-isatty 0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
-	"github.com/mattn/go-runewidth 9e777a8366cce605130a531d2cd6363d07ad7317"
-	"github.com/miekg/mmark fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"
-	"github.com/mitchellh/hashstructure 2bca23e0e452137f789efbc8610126fd8b94f73b"
-	"github.com/mitchellh/mapstructure 00c29f56e2386353d58c599509e8dc3801b0d716"
-	"github.com/muesli/smartcrop f6ebaa786a12a0fdb2d7c6dee72808e68c296464"
-	"github.com/nicksnyder/go-i18n 0dc1626d56435e9d605a29875701721c54bc9bbd"
-	"github.com/olekukonko/tablewriter b8a9be070da40449e501c3c4730a889e42d87a9e"
-	"github.com/pelletier/go-toml acdc4509485b587f5e675510c4f2c63e90ff68a8"
-	"github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2"
-	"github.com/russross/blackfriday 11635eb403ff09dbc3a6b5a007ab5ab09151c229"
-	"github.com/sanity-io/litter ae543b7ba8fd6af63e4976198f146e1348ae53c1"
-	"github.com/sergi/go-diff 1744e2970ca51c86172c8190fadad617561ed6e7"
-	"github.com/shurcooL/sanitized_anchor_name 86672fcb3f950f35f2e675df2240550f2a50762f"
-	"github.com/spf13/afero 787d034dfe70e44075ccc060d346146ef53270ad"
-	"github.com/spf13/cast 8965335b8c7107321228e3e3702cab9832751bac"
-	"github.com/spf13/cobra a1f051bc3eba734da4772d60e2d677f47cf93ef4"
-	"github.com/spf13/fsync 12a01e648f05a938100a26858d2d59a120307a18"
-	"github.com/spf13/jwalterweatherman 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
-	"github.com/spf13/nitro 24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"
-	"github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
-	"github.com/spf13/viper b5e8006cbee93ec955a89ab31e0e3ce3204f3736"
-	"github.com/stretchr/testify 12b6f73e6084dad08a7c6e575284b177ecafbc71"
-	"github.com/tdewolff/minify 8d72a4127ae33b755e95bffede9b92e396267ce2"
-	"github.com/tdewolff/parse d739d6fccb0971177e06352fea02d3552625efb1"
-	"github.com/wellington/go-libsass 615eaa47ef794d037c1906a0eb7bf85375a5decf"
-	"github.com/yosssi/ace ea038f4770b6746c3f8f84f14fa60d9fe1205b56"
-	"golang.org/x/image f315e440302883054d0c2bd85486878cb4f8572c github.com/golang/image"
-	"golang.org/x/net 61147c48b25b599e5b561d2e9c4f3e1ef489ca41 github.com/golang/net"
-	"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
-	"golang.org/x/sys 3b87a42e500a6dc65dae1a55d0b641295971163e github.com/golang/sys"
-	"golang.org/x/text 2cb43934f0eece38629746959acc633cba083fe4 github.com/golang/text"
-	"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml" )
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-EGO_PN="github.com/gohugoio/hugo"
-GIT_COMMIT="f14d773841c32ad48f2d2fa22e1e378d477e5c9e"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A Fast and Flexible Static Site Generator built with love in Go"
-HOMEPAGE="https://gohugo.io https://github.com/gohugoio/hugo"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+sass"
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go install -v -ldflags "-X ${EGO_PN}/hugolib.CommitHash=${GIT_COMMIT}" $(usex sass "-tags extended" "") || die
-	popd || die
-	bin/hugo gen man || die
-	bin/hugo gen autocomplete --completionfile hugo || die
-}
-
-src_install() {
-	dobin bin/*
-	dobashcomp hugo || die
-	doman man/*
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index 53d4ef316ce4..fdf22c566c29 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -1,8 +1,10 @@
 DIST nanoc-core-4.11.10.tar.gz 308049 BLAKE2B 8b587245d9935dad34bc0912ba65200cc6f3e8ebda00e21fc3c30e367264076d17d64fe9cc762c5ec11ab9624695f66132d5a69b29dcbf9f85fc7b0d57828592 SHA512 f4997b03834966fbda5aa28c392712ed53dda4f3d3b70b52d73e96c39612158c88f24543e0bcf74cea8ba24d108e2d64026ce3d4364f6eabbc9034ca5adf4814
+DIST nanoc-core-4.11.11.tar.gz 308375 BLAKE2B aed881153fb57561b62e5c5efb771777e3944232f5963dcf8bf5461802c7767b14776c161aa19bd0905b6ff5f91932d6b2ef2f0a90594e530beeac201e413568 SHA512 6db50ffb5b91e74e3d830fc8c154dcadec35376c18d8c8b909799b1d51031d307f70113f2319b1a5163ba746a2304a1aa3949e414a50e02e7396d5fd26e15a3f
 DIST nanoc-core-4.11.7.tar.gz 307042 BLAKE2B b1144c80ea80ccf5bf713f93469061fbfb8a74890c3b9563ee8d88cd85375810fa6161a53d9221d817985b870426cafb52257403d05245b735855aecd76356a3 SHA512 d82d89dcd9f056e711cb722b6fbe22045eecf9fd61e3541529b89c8eb916ca850ef498148f1065b792e1a1d786e6d2f1477b41713753ff9d7b283ecc3cf2649c
 DIST nanoc-core-4.11.8.tar.gz 307102 BLAKE2B 615dfc1e2a6424343327888d4d5c577652d8480178769accc15f86ae8f64f7dc8aecbfd98b16791f98dc3f5fbf1a9e88ed6ca38354aa5277aea13dec42a6404b SHA512 939e54a55ffeca9ea392d2e4ad49564761dc7497052a8bc367a9df9d7dd2fbc1943bc363e7df82da988d6897ed24d9a5db1c869ce063dd7dd6ae03d0da8d19b5
 DIST nanoc-core-4.11.9.tar.gz 307441 BLAKE2B 9357a78412056eb62b8aac04ff2d02238bd02786bf6d3a1d0d4cc738b833f596122f55d325779760d2afa579b2864561701ccf107c9f0bd1a04e6aacd6d2b64d SHA512 34b6a52e16d04d69e3016ae9b77080d96860ab406ada8a597d5cf721761d82ec5e6d4dcc64193b6804315f3731618cc6286b5d6844f55c8d20dabed1a8251579
 EBUILD nanoc-core-4.11.10.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
+EBUILD nanoc-core-4.11.11.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
 EBUILD nanoc-core-4.11.7.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
 EBUILD nanoc-core-4.11.8.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
 EBUILD nanoc-core-4.11.9.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
diff --git a/www-apps/nanoc-core/nanoc-core-4.11.11.ebuild b/www-apps/nanoc-core/nanoc-core-4.11.11.ebuild
new file mode 100644
index 000000000000..ccc331cdd62d
--- /dev/null
+++ b/www-apps/nanoc-core/nanoc-core-4.11.11.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="nanoc-${PV}/nanoc-core"
+
+ruby_add_rdepend "
+	dev-ruby/ddmemoize:1
+	dev-ruby/ddmetrics:1
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	>=dev-ruby/json_schema-0.19:0
+	dev-ruby/slow_enumerator_tools:1
+	>=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/rspec:3
+	dev-ruby/rspec-its
+	dev-ruby/fuubar
+	dev-ruby/minitest
+	dev-ruby/timecop
+	dev-ruby/yard
+)
+"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+	sed -i -e '1i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Use useable tmp dir
+	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/core/checksummer_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 269d29fd6b5c..4fd64489759f 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,10 +1,12 @@
 DIST nanoc-4.10.4.tar.gz 290367 BLAKE2B 0b5cf03938af1f971fccddb6bed4fa6b67da3aaf93cb7666c52e3ff8fc524f17ff10bf1a60ccf7f7b59f840d4c445ef57677349f5b83bc55e754e7078ac4b8d9 SHA512 5446e351906b5b6bbe5c9059dab86490d5deef5e1197adf5827fe201f2932d5cf79c65bfd9d9370ce57c35d965e013098d39d53fa96db8b4d1c6017977683ea2
 DIST nanoc-4.11.10.tar.gz 308049 BLAKE2B 8b587245d9935dad34bc0912ba65200cc6f3e8ebda00e21fc3c30e367264076d17d64fe9cc762c5ec11ab9624695f66132d5a69b29dcbf9f85fc7b0d57828592 SHA512 f4997b03834966fbda5aa28c392712ed53dda4f3d3b70b52d73e96c39612158c88f24543e0bcf74cea8ba24d108e2d64026ce3d4364f6eabbc9034ca5adf4814
+DIST nanoc-4.11.11.tar.gz 308375 BLAKE2B aed881153fb57561b62e5c5efb771777e3944232f5963dcf8bf5461802c7767b14776c161aa19bd0905b6ff5f91932d6b2ef2f0a90594e530beeac201e413568 SHA512 6db50ffb5b91e74e3d830fc8c154dcadec35376c18d8c8b909799b1d51031d307f70113f2319b1a5163ba746a2304a1aa3949e414a50e02e7396d5fd26e15a3f
 DIST nanoc-4.11.7.tar.gz 307042 BLAKE2B b1144c80ea80ccf5bf713f93469061fbfb8a74890c3b9563ee8d88cd85375810fa6161a53d9221d817985b870426cafb52257403d05245b735855aecd76356a3 SHA512 d82d89dcd9f056e711cb722b6fbe22045eecf9fd61e3541529b89c8eb916ca850ef498148f1065b792e1a1d786e6d2f1477b41713753ff9d7b283ecc3cf2649c
 DIST nanoc-4.11.8.tar.gz 307102 BLAKE2B 615dfc1e2a6424343327888d4d5c577652d8480178769accc15f86ae8f64f7dc8aecbfd98b16791f98dc3f5fbf1a9e88ed6ca38354aa5277aea13dec42a6404b SHA512 939e54a55ffeca9ea392d2e4ad49564761dc7497052a8bc367a9df9d7dd2fbc1943bc363e7df82da988d6897ed24d9a5db1c869ce063dd7dd6ae03d0da8d19b5
 DIST nanoc-4.11.9.tar.gz 307441 BLAKE2B 9357a78412056eb62b8aac04ff2d02238bd02786bf6d3a1d0d4cc738b833f596122f55d325779760d2afa579b2864561701ccf107c9f0bd1a04e6aacd6d2b64d SHA512 34b6a52e16d04d69e3016ae9b77080d96860ab406ada8a597d5cf721761d82ec5e6d4dcc64193b6804315f3731618cc6286b5d6844f55c8d20dabed1a8251579
 EBUILD nanoc-4.10.4.ebuild 2619 BLAKE2B 7e5ff080ec66019c9c0706b66fee93fc4029daa1a174eb907798f98673abd0b468ca49f85fa91c4bb214316613e1f0cbc2c42536a9a9ebc19e2d3126ad957a58 SHA512 588d87ec7f8545e89685e80c838280147792b10010ed8ae81dd8a1d10d2c68aa7681eea4cb12d1840242847c1ec164e4252d40a76812323ae10b57aab363a92b
 EBUILD nanoc-4.11.10.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
+EBUILD nanoc-4.11.11.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
 EBUILD nanoc-4.11.7.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
 EBUILD nanoc-4.11.8.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
 EBUILD nanoc-4.11.9.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
diff --git a/www-apps/nanoc/nanoc-4.11.11.ebuild b/www-apps/nanoc/nanoc-4.11.11.ebuild
new file mode 100644
index 000000000000..de28a28b1206
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.11.11.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="${P}/nanoc"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/addressable-2.5
+	>=dev-ruby/colored-1.2:0
+	>=dev-ruby/cri-2.15:0
+	~www-apps/nanoc-core-${PV}
+	>=dev-ruby/parallel-1.12:1
+	>=dev-ruby/tomlrb-1.2:1
+	>=dev-ruby/tty-command-0.8:0
+	>=dev-ruby/tty-file-0.7:0
+	>=dev-ruby/tty-platform-0.2:0
+	>=dev-ruby/tty-which-0.4:0
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/asciidoctor
+	dev-ruby/fuubar
+	dev-ruby/haml
+	dev-ruby/maruku
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/mustache
+	dev-ruby/pry
+	dev-ruby/rdoc
+	>=dev-ruby/rouge-3.5.1:2
+	dev-ruby/rubypants
+	dev-ruby/systemu
+	dev-ruby/timecop
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid basepath issues when generating gemspec
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests requiring a network connection or make assumptions
+	# about the local network environment.
+	rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/deploying/fog_spec.rb \
+	   spec/nanoc/filters/less_spec.rb \
+	   test/filters/test_{markaby,rainpress}.rb || die
+
+	# Avoid non-fatal failing tests due to specifics in the environment
+	sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+	sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index c874109b3f1e..7932a680ecd4 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,5 +1,5 @@
 DIST phpsysinfo-3.2.2.tar.gz 899974 BLAKE2B 4da569d90a4ee383535a5a155c754a40f104453d504148729fcde03a4ee6839e914dc0375115d392c81225a451a35e3009218c20019abf0661ba629c98377952 SHA512 fe1fae67379abf0fb75d166aaab87cb91ead33c87cfbd0569b61d95b9b3172820565dff37f6d35744fbf9332adc5a5af1ec49477a56572f55f57e53edb9164b9
 DIST phpsysinfo-3.3.1.tar.gz 866981 BLAKE2B 9dcaba2bd1b4faa79fe12a2c50dbc767953cf98d45801ca6bc8398eb625b93ebc56356db0f6e05422dd665d8c6e88cb831b4288a5f0190f3c113c1171ea81def SHA512 7b8e0c469651c878b2dcc37189be7b592be5bde4ece38e0aec21afa5a422286b4c6a555bbafc4b7a2eb19e1c2afdac80fddcf03b41084f9da02fb3c92c7242b5
 EBUILD phpsysinfo-3.2.2.ebuild 768 BLAKE2B 93aa4397be216ffd4e0b68d713343188beac30ed635931c93978747ec8fb2ea7a66b3bf5de1f7669c9fb280143425968dd9629e11b6f9c4ac2023cf251f1c023 SHA512 0d323edd89bc17bb949aa386505a2c5ad5e81f355f9abfe4d0d59009f7f62f94b156bd8d94a8bd0da7a9e2c2677bea23a4650357f8f75941fb49127f7c9370e2
-EBUILD phpsysinfo-3.3.1.ebuild 1690 BLAKE2B dd970fc1a01a11413ec438cf136825b6c51063b1099b206e85ed39499dff4170e6c1b6260b8ec8b54c8182b10e3489a433add47873f682e36061f2bcb5746ff5 SHA512 31c64b22daf9e3ddbec83d76336509cec80d425b421fd8fcc562e9ecec25284e24f86c5db19f3f483b31e9218cecf32da975d2f04d6a7dbab23cba32bca92e7b
+EBUILD phpsysinfo-3.3.1.ebuild 1690 BLAKE2B 075e6de48823ed6704a1c634143054f693ed30dd87a309e9a45d70d1706b59170f9c87afbeebf5962f899142ed1e7749b9e21795cf62cc7147d39ea5cabada41 SHA512 78aebb9c62af14065d9caa3921548355a632e9d1295bfc4b67fd0e0aba4c024b29b5e1e90452df021ec6eb648769561e306654ffbc1ca8055c63354d237f2a28
 MISC metadata.xml 630 BLAKE2B df872dd395f9330647888f294f5c971ad2153f5e6051b7611b5a890295f37abe4101e570f62c508c3393c58f15fa652f14f4f41937a20da412e807e2e8897a06 SHA512 eb92eb13af2ebbd1444035cca86e2754516f5fea843f6cec328e933b3a7b2799a6a00807945e73893dfda5558febf85317edec44c89515b292e532b1f80f62d8
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild
index c7e5df2476a8..6fd10066cbec 100644
--- a/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild
+++ b/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild
@@ -40,7 +40,7 @@ pkg_postinst() {
 	optfeature "showing iptables rules." net-firewall/iptables
 	optfeature "showing ipmi sensors." sys-apps/ipmitool
 	optfeature "showing ipmi sensors." sys-apps/ipmiutil
-	optfeature "showing system sensors." sys-apps/lm_sensors
+	optfeature "showing system sensors." sys-apps/lm-sensors
 	optfeature "showing s.m.a.r.t. health." sys-apps/smartmontools
 	optfeature "showing lsi raid controller health." sys-block/megactl
 	optfeature "showing fake raid statistics." sys-fs/dmraid
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 105a18d28498..e65c331d054e 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e56071f0c602..1a394499c8ad 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -31,9 +31,9 @@ AUX chromium-unbundle-zlib.patch 750 BLAKE2B ffce4f4069fa8f04c41b8395105d4dbe2f7
 AUX chromium-widevine-r4.patch 1155 BLAKE2B 7ba02c4b80883fa7ae5c46d95072798683bdc5c9d65b3cab40e6a3c21b29ce7eb9c45493ec10e522341033a80132818f946569ee774c662daafa4e09fbc2a988 SHA512 8f78c0e22f14f81f1903a77b315c7818603caaadbb5d517a3184a11e9553b99fd42d5a1d2ff19b3d79c03352b2e279a5102afa2fa66f276da2d9c42988a94366
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-76.0.3809.132.tar.xz 728899912 BLAKE2B 725513b659f613c5827f5e847dde8c5ea448adb3a3d5561312ad05d54293c72150b010e6c804fb17be22882e4c87f2ebcdd40d08dbd601d78573678fd9d195c9 SHA512 e267d4a975fdcc33125d8fed1597e2dc8ec37a78ee2f9a4e03a1aaf6b83b594b444280b7f2ee68b41d227e7daf31b9de91ab2f998f9146613ebd50651c0d16e8
-DIST chromium-77.0.3865.56.tar.xz 733257056 BLAKE2B 7915e97952361f9a28f345fe664398f6abd6532e57b9736687cae59d51d1b9d4ce1655dc756bb3a3764fc98d14866cbee743eb095348f1fa081532508ba88a9c SHA512 945a8aa721e4a3d35be79698b298c4c69e0850f5621fa565e25cd01aac0a67fb966a9ed90f597464ed117680794503205cc1f257bd41dc2454b02c3333c0c64e
+DIST chromium-77.0.3865.75.tar.xz 733233852 BLAKE2B e39856418a4dc0bcc690e0748781fd6d2395b2908d06616d44c76f5923d08f9ccd0cb1793447970302a47da631244aa96c7cf4d3df8cbd89fb3271badf163873 SHA512 7ab5103d75ddaeded69b63110a4ce401f4773017981eb2abaa650cc8a0c013323f7cd4beb19b6bfb6b0542a0269d86f6274da302b3b25d662c7a945f6d17f5d6
 DIST chromium-78.0.3887.7.tar.xz 737057024 BLAKE2B b4754f1fa9a243c29e83d6136494c6db1726a6d3f23013115a4a576428f7ca3c0fcd3f81cf7fe4037f2c3e6901b3fce015aeed7b7b945b4a3e368f2e6fb9afa1 SHA512 9b8eb33c6f19e5b247372e19a61ec1ae6c804bd7b9731222430e2e1b585146fc543a686ccfc9553d6d137999570c544cdb45696db6ce50c38dfead1b0760c1a4
 EBUILD chromium-76.0.3809.132.ebuild 22158 BLAKE2B 22157255629bb75571e3350d980b39e40dd682d3657369b992a7b0407bfb76523f876b0af89c8feaf935b88527a4df1ab1b133bcbb95cfad43a896d2f45d7491 SHA512 eaa8d69571ae28459d34fac97f0c4f12a4d1a3dde339636890a8468e54202cbe5f3f8280045940dd901d7bb202297edcf910ce64d430287bb0d230d314fce9f3
-EBUILD chromium-77.0.3865.56.ebuild 22354 BLAKE2B e2f1c20c0ab057c5f91b8df41de485ff413d04a167f0fdc8de515168fa502fb2a9935977a7dc1822a7a8ea15c83b306c8fc09802017d143c903fdbd1a6cfae34 SHA512 251062c4ccab20af592f1e7c847de294f9cdadd7a2e81948e02f8416cd4f38eca909bda663f523b346feb452b25f7961af4032dd599e609e7650dfe00fe1b5d0
+EBUILD chromium-77.0.3865.75.ebuild 22353 BLAKE2B b8a624e00b64565f7487d6a4548cd038ad5b3880f20e04980d7c8dd2a3ac43675e925b7668e050f677327923d49a9bd002bad2a68d6f76585a4c52b00a039d32 SHA512 47780e320f31c1e1d01a48f3b6b32ef0e4b04e3a53ef970a03e97fc2b027cfbb98cf6acce225fe9fc09b20f586c7ba3a88f683b5b68870b2ce23f87be55442dc
 EBUILD chromium-78.0.3887.7.ebuild 22248 BLAKE2B e66aec65771fdad9271dba342d3c8e5fa5079798de3711f8b82457d826e59f39768bb2e892a5b0e6c2f7ad944174712a470b373d18f372cdd2aa54dfd30e03ed SHA512 66f493b768d041bea1cc87a52c591e32f7198086d60c79b5d38aa6a3a6ffa91e1b6f22b4e627a44717660121703d77b86b20e74ed7b8bbd5f4164752f977418f
 MISC metadata.xml 1538 BLAKE2B 6c68f673e2892063f4b7a5afc8314356e3e8182d8765a193c36be7ed6b61e7680dbd0a58e2386904ff2877c81ad45cdae07754996f706f986f16f3a159500930 SHA512 16e98f9dc01cfdce307dd17fc2ba83ff1eff10eaeb65aaf9154b0dedfc61086334d56f50b6ce1d673715148e29e045eb0eed21495efef942ef56e4ba4e514187
diff --git a/www-client/chromium/chromium-77.0.3865.56.ebuild b/www-client/chromium/chromium-77.0.3865.56.ebuild
deleted file mode 100644
index bf0999f43cd5..000000000000
--- a/www-client/chromium/chromium-77.0.3865.56.ebuild
+++ /dev/null
@@ -1,728 +0,0 @@
-# Copyright 2009-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="component-build? ( !suid )"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.26:2
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/atk-2.26
-	dev-libs/expat:=
-	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-64:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=dev-libs/re2-0.2016.11.01:=
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12-r0
-		media-libs/opus:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!<www-plugins/chrome-binary-plugins-57
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-util/gn
-	dev-vcs/git
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-7.6.0[inspector]
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	closure-compile? ( virtual/jre )
-	virtual/pkgconfig
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-7"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-"
-
-PATCHES=(
-	"${FILESDIR}/chromium-compiler-r10.patch"
-	"${FILESDIR}/chromium-widevine-r4.patch"
-	"${FILESDIR}/chromium-fix-char_traits.patch"
-	"${FILESDIR}/chromium-unbundle-zlib.patch"
-	"${FILESDIR}/chromium-77-fix-gn-gen.patch"
-	"${FILESDIR}/chromium-77-system-icu.patch"
-	"${FILESDIR}/chromium-77-system-hb.patch"
-	"${FILESDIR}/chromium-77-clang.patch"
-	"${FILESDIR}/chromium-77-blink-include.patch"
-	"${FILESDIR}/chromium-77-std-string.patch"
-	"${FILESDIR}/chromium-77-no-cups.patch"
-	"${FILESDIR}/chromium-77-gcc-abstract.patch"
-	"${FILESDIR}/chromium-77-gcc-include.patch"
-)
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
-			die "At least gcc 8.0 is required"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="7G"
-	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/third_party/glslang
-		third_party/angle/third_party/spirv-headers
-		third_party/angle/third_party/spirv-tools
-		third_party/angle/third_party/vulkan-headers
-		third_party/angle/third_party/vulkan-loader
-		third_party/angle/third_party/vulkan-tools
-		third_party/angle/third_party/vulkan-validation-layers
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/boringssl/src/third_party/sike
-		third_party/boringssl/linux-aarch64/crypto/third_party/sike
-		third_party/boringssl/linux-x86_64/crypto/third_party/sike
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4
-		third_party/catapult/third_party/html5lib-python
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/emoji-segmenter
-		third_party/flatbuffers
-		third_party/flot
-		third_party/freetype
-		third_party/glslang
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/modp_b64
-		third_party/nasm
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/sfntly
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/gif
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/SPIRV-Tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-7.0
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-		third_party/unrar
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/fft4g
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-libvpx; then
-		keeplibs+=( third_party/libvpx )
-		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
-		# Force clang since gcc is pretty broken at the moment.
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
-	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		libxml
-		libxslt
-		openh264
-		re2
-		snappy
-		yasm
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-libvpx; then
-		gn_system_libraries+=( libvpx )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=true"
-
-	# Optional dependencies.
-	myconf_gn+=" closure_compile=$(usex closure-compile true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	doins out/Release/*.so
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-77.0.3865.75.ebuild b/www-client/chromium/chromium-77.0.3865.75.ebuild
new file mode 100644
index 000000000000..ba255e84ee08
--- /dev/null
+++ b/www-client/chromium/chromium-77.0.3865.75.ebuild
@@ -0,0 +1,728 @@
+# Copyright 2009-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+REQUIRED_USE="component-build? ( !suid )"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.26:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/atk-2.26
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-64:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.11.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12-r0
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-util/gn
+	dev-vcs/git
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-7.6.0[inspector]
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	closure-compile? ( virtual/jre )
+	virtual/pkgconfig
+"
+
+: ${CHROMIUM_FORCE_CLANG=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-7"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-compiler-r10.patch"
+	"${FILESDIR}/chromium-widevine-r4.patch"
+	"${FILESDIR}/chromium-fix-char_traits.patch"
+	"${FILESDIR}/chromium-unbundle-zlib.patch"
+	"${FILESDIR}/chromium-77-fix-gn-gen.patch"
+	"${FILESDIR}/chromium-77-system-icu.patch"
+	"${FILESDIR}/chromium-77-system-hb.patch"
+	"${FILESDIR}/chromium-77-clang.patch"
+	"${FILESDIR}/chromium-77-blink-include.patch"
+	"${FILESDIR}/chromium-77-std-string.patch"
+	"${FILESDIR}/chromium-77-no-cups.patch"
+	"${FILESDIR}/chromium-77-gcc-abstract.patch"
+	"${FILESDIR}/chromium-77-gcc-include.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
+			die "At least gcc 8.0 is required"
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="7G"
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/third_party/glslang
+		third_party/angle/third_party/spirv-headers
+		third_party/angle/third_party/spirv-tools
+		third_party/angle/third_party/vulkan-headers
+		third_party/angle/third_party/vulkan-loader
+		third_party/angle/third_party/vulkan-tools
+		third_party/angle/third_party/vulkan-validation-layers
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/boringssl/src/third_party/sike
+		third_party/boringssl/linux-aarch64/crypto/third_party/sike
+		third_party/boringssl/linux-x86_64/crypto/third_party/sike
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/emoji-segmenter
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/nasm
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/sfntly
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/SPIRV-Tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-7.0
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/fft4g
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" closure_compile=$(usex closure-compile true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index aeebe0d0df2c..7bb00931d324 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,6 +1,10 @@
 AUX var-tmp-tests.patch 659 BLAKE2B 2869f1c28c3a59974758986bd464aeb5c1d86d1b4e23f33d809529a1f1b800ffdb3daf24780774766a16c1f45fff145dd5524c682293dd117b29582adeade7ae SHA512 79480bed41ff59f423087dfd6d0f5eaee665fcba6602c7876ed63397edeb6cf5fcb2ce9f2f91b375117e389ec2fcf6cba1cf1e8919efef2ccad3c84547b7824a
 DIST epiphany-3.30.4.tar.xz 4531732 BLAKE2B a4741d353800517c0233456e513a974ecd7641799395df7cafe6940cbfa49402836484010634ef3c59e36bd3bb2ced331d19a4ed05d1630c00d7ee385961227b SHA512 8574a26a22a24db7e65254f65723f6e4405fccd783bb7e122f8a5f6aff62d3ef1dd0b3ce903eb1f750e7ae28c2f1154a2c1c15970892216211d51edee318bd47
+DIST epiphany-3.30.5.tar.xz 4532136 BLAKE2B 7c42e7ff5624bd85c380da97b2ca057b59d4dc77bec85f33bab755032b519db10ee52aa93c503e5b1f57c5acfce5a9b3decc7dddfacc3d68ea620eb884ec2da3 SHA512 1d31022e91a5ac79a032ebf988d4f8828cfa38a2b67e06b9432e479d7ebc93d3a08338261b92dfe3f37b6f745aeb5286b4acc65c537d935c1ace61ad9a494b7d
 DIST epiphany-3.32.4.tar.xz 5468576 BLAKE2B 8d9ed9f522a7f18c1e9b0fa6aea043c11e69eda8ee779e8cb05cbef1920154ee7e307ea92eac713c74f7a81a08d9fc31dfd3ba8fad59d5697f4aa652e12a6e8e SHA512 34f9f4267862b494cbeb225ce63cd7767851f1cca16b4c8e03057b074999954477f2ed891c60f20910abcc7a553371f8f03e59fc9da4cf459dd5cbfde8a6d67c
+DIST epiphany-3.32.5.tar.xz 5468976 BLAKE2B 7e15eccbf48e7d2ada7b7a4ee4643219149f0d81c8c1767e5871fbed023bf53cd548822eabe5c9e0a26fd62a255ec69efdbd5efd05faef0e0374cedb473f5978 SHA512 e14a2626071460ddf8493a765d877f7683ba51e572778bb03f83ce31170856c6de91327955bd2d3b43e9016457da35a966014019d8837cd85765f948a7d1e5d2
 EBUILD epiphany-3.30.4.ebuild 1710 BLAKE2B fd5953d07509ca9ae9b983ebf494750b2d0e26547f592f25b0a80e6fef5cd204d33917b7a5c98a0aa165a5a351ff4c20478562d9a3d71232b6e4de718f3d690f SHA512 c5af8b6866199eab89811ebd58a92b82a2d56235e8d50a7426a453224448dfda61c5a8f0cf8f16762859d736942e6b794e70db6b73fd65b10039baaf96ee2e68
-EBUILD epiphany-3.32.4.ebuild 1864 BLAKE2B d7a6a3d6b825094b3b9a6d853deb0f36a213c617d23f5550c8115b3664dbf4d1d132c90e8d92273f79fba4034cb563e922d0c1db1996d1803dc5b256370ca4d1 SHA512 e5d1e03c217a90953c4df4010796d5c49477c30146f379d1a5357f603d88ced2690784523ec9b2303724987686f8b53bd6aee52fa2926c981c542d1fe2e1d671
+EBUILD epiphany-3.30.5.ebuild 1712 BLAKE2B 7b7eb589a5c4d96b585a15b09c0f9d1df714975b4b4b8f40bcf29598a68d02b352eef0faa9ed231affa232394d1f1bbd44044565e9824df43db75fa42ed03cb1 SHA512 e26c744bb5fcab0ebdb0893a21f58d1f20cfc697188b33bd82af76ac068a33c04464d7cfc668a8c2e66b08550227672d421be71285f95523aeea9a79e8f6c7a4
+EBUILD epiphany-3.32.4.ebuild 1869 BLAKE2B 2c0a8a661528ed0fbdab5992721b756b9797d4cb39cf30dd14e7dcc88a893f360dfa95095c8805b39fef2b62a9766d86d75e0ad3895bd83e801fd06e98faaeb1 SHA512 9485b3ea3aa7664bde956add012f459504256181e07f95b6523e3e16290e6c0fde6e06d088dd71b5dc9313a389c0ca8bdea042ec2ab890f0fa4e853c02a40835
+EBUILD epiphany-3.32.5.ebuild 1869 BLAKE2B 2c0a8a661528ed0fbdab5992721b756b9797d4cb39cf30dd14e7dcc88a893f360dfa95095c8805b39fef2b62a9766d86d75e0ad3895bd83e801fd06e98faaeb1 SHA512 9485b3ea3aa7664bde956add012f459504256181e07f95b6523e3e16290e6c0fde6e06d088dd71b5dc9313a389c0ca8bdea042ec2ab890f0fa4e853c02a40835
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/www-client/epiphany/epiphany-3.30.5.ebuild b/www-client/epiphany/epiphany-3.30.5.ebuild
new file mode 100644
index 000000000000..8541b4a1ffde
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.30.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson xdg virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.52.0:2
+	>=x11-libs/gtk+-3.22.13:3
+	>=dev-libs/nettle-3.2:=
+	>=net-libs/webkit-gtk-2.21.92:4=
+	>=x11-libs/cairo-1.2
+	>=dev-libs/libdazzle-3.28.0
+	>=app-crypt/gcr-3.5.5:=[gtk]
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	dev-libs/icu:=
+	>=app-text/iso-codes-0.35
+	>=dev-libs/json-glib-1.2.4
+	>=x11-libs/libnotify-0.5.1
+	>=app-crypt/libsecret-0.14
+	>=net-libs/libsoup-2.48:2.4
+	>=dev-libs/libxml2-2.6.12:2
+	>=dev-libs/libxslt-1.1.7
+	dev-db/sqlite:3
+	dev-libs/gmp:0=
+	>=gnome-base/gsettings-desktop-schemas-0.0.1
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+# paxctl needed for bug #407085
+# appstream-glib needed for appdata.xml gettext translation
+DEPEND="${COMMON_DEPEND}
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	sys-apps/paxctl
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Ddeveloper_mode=false
+		-Ddistributor_name=Gentoo
+		-Dtech_preview=false
+		$(meson_use test unit_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version net-libs/webkit-gtk[jpeg2k]; then
+		ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k."
+		ewarn "Various image galleries/managers may be broken."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/www-client/epiphany/epiphany-3.32.4.ebuild b/www-client/epiphany/epiphany-3.32.4.ebuild
index d9f85340b6a6..07cf82ff5039 100644
--- a/www-client/epiphany/epiphany-3.32.4.ebuild
+++ b/www-client/epiphany/epiphany-3.32.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Web"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/www-client/epiphany/epiphany-3.32.5.ebuild b/www-client/epiphany/epiphany-3.32.5.ebuild
new file mode 100644
index 000000000000..07cf82ff5039
--- /dev/null
+++ b/www-client/epiphany/epiphany-3.32.5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg virtualx
+
+DESCRIPTION="GNOME webbrowser based on Webkit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Web"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.24.0:3
+	>=dev-libs/nettle-3.4:=
+	>=net-libs/webkit-gtk-2.24.1:4=
+	>=x11-libs/cairo-1.2
+	>=app-crypt/gcr-3.5.5:=[gtk]
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	gnome-base/gsettings-desktop-schemas
+	dev-libs/icu:=
+	>=app-text/iso-codes-0.35
+	>=dev-libs/json-glib-1.2.4
+	>=dev-libs/libdazzle-3.31.90
+	>=gui-libs/libhandy-0.0.9:0.0=
+	>=x11-libs/libnotify-0.5.1
+	>=app-crypt/libsecret-0.14
+	>=net-libs/libsoup-2.48.0:2.4
+	>=dev-libs/libxml2-2.6.12:2
+	dev-db/sqlite:3
+	dev-libs/gmp:0=
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+# appstream-glib needed for appdata.xml gettext translation
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR)
+	"${FILESDIR}"/var-tmp-tests.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddeveloper_mode=false
+		# maybe enable later if network-sandbox is off, but in 3.32.4 the network test
+		# is commented out upstream anyway
+		-Dnetwork_tests=disabled
+		-Dtech_preview=false
+		$(meson_feature test unit_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version net-libs/webkit-gtk[jpeg2k]; then
+		ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k."
+		ewarn "Various image galleries/managers may be broken."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index fbe48b9eb359..daaf642b2351 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -283,98 +283,6 @@ DIST firefox-60.9.0esr-zh-CN.xpi 559980 BLAKE2B cee4fab650cd87bd8e1c4bd14500c403
 DIST firefox-60.9.0esr-zh-TW.xpi 558304 BLAKE2B 94736adc0f3c74466f560ccfbab45ad6cdf436f2987cba65d25995dda15838109f5189e4d4bc87bd64f8a232d953ad69cdbe56cfc3ca3562b780a465180f0eae SHA512 dc2359c2d7245592034b58558357f986e612c119b54ba2b979ce1df0e7dab2a5a0a1422fad6958349a03832c96e9cf1df32bd55be167025a0c8eab5f14a27146
 DIST firefox-60.9.0esr.source.tar.xz 269089044 BLAKE2B 92532280063cb93515e9d791ec38b9062355fabf90efea15612ee6e66459aca32b71e1bff1f7c8dff16bb479fcb4ca0cb6c1200aa99b3810048e459bea702193 SHA512 4baea5c9c4eff257834bbaee6d7786f69f7e6bacd24ca13c2705226f4a0d88315ab38c650b2c5e9c76b698f2debc7cea1e5a99cb4dc24e03c48a24df5143a3cf
 DIST firefox-68.0-patches-11.tar.xz 15404 BLAKE2B 5322c64f7605e30aa1daf650cea19b66ce6c305d2862d76c4a4103676392cbd3029a8f35cbe8ed8077ac7cfe8194c08a0cd3cf25fef75c62a086077d0c5a419a SHA512 1897303b6864ca941afe6ee1d95fd975fb29a01f52d68f9f42c1a9a62d7e4fee0a797aa169b58dc4cf068916e01edaf5c9ad8ade23a997e52c37bd393a142ade
-DIST firefox-68.0.2-ach.xpi 471799 BLAKE2B 7b90971b3a3244a2b4005ed617f34d9b6a7e3be466d2ad462a9ac719405980b766013bb35c20a3d6b5320f782d55559da746c39fada7ee38031dc41bd6fefba5 SHA512 0cd2edab1e4420827ef0ea1d4be70819dfa58ebc7149e8c181947f8385cdbd15b590f577e3e5d29286d8c1e0a8fe35531a8e1fe323487e71a4a15b51b290c29e
-DIST firefox-68.0.2-af.xpi 450628 BLAKE2B 08ea70856d8af333a596d902f2175fc35cee7885c5757b0b3ab03393ff1c4898b766bf5748fdc3ca72ded1edba8735b69ed3042314e526af1fdfce8dfac1ecc5 SHA512 402325aaee3964e5d61dcca1d2e8a82c5e3d2ce812cd2a8870adaf1be8bb1a376ee26b6cc9b2f17d72306af6e92245a8302790218fa72e4b9b0823d1e84798cb
-DIST firefox-68.0.2-an.xpi 483102 BLAKE2B 1ad2e709d3289018fbe7e35eca993771123ee0c4172c77dfd76891d9f9369d96e43a71ccefefa70ed7fd46fefcc669e330ae8db21582e03624c4a805747fd411 SHA512 27433fad92ebbf584746ec1e93ea0528dcc5c6ac7367694aab9bd4223639e089d9fa23546e594f225db238d5bb890f20e924c692a2d8b61765b61a7d2f02276b
-DIST firefox-68.0.2-ar.xpi 538966 BLAKE2B 5b04636606bfef02f4bfb46bd520d7a5a8c2c18bfd9f321b739e8f4a5ac2c7ef4cb3bf7b1be0f809159ccd35600adaf01340d0d8f4f60aa7614075d75c9d702c SHA512 fc36f39f3ad24dfc3f94b62a84ebd31e2092eb58e88dce8928d97758b5a7e3a99e18b3e6210dbc4e9983fd836f40a8d8d480659e09983148782aaaa1ae365429
-DIST firefox-68.0.2-ast.xpi 480822 BLAKE2B fc41bca444364a675c7dc1c2c4aa1bf11231125651cff942f37f6dea75f45a6f99238422dd62e89282305f488be22f0d2705c14f5c3fa32571e2788173073f75 SHA512 2523c9c1d57ecfbbfce1ad421a95e0c222957eb519e715a8bf891aa823d094a13b7497c014c9f6f36e921ece55504d2b4cb06820dfbea5024e942635c8000e2d
-DIST firefox-68.0.2-az.xpi 510303 BLAKE2B cb5c30430054057ef6de4beba45d400b4039a1efe4cc9144ea2b0fb2e9e400f99c9e634d71e24a2c36265022dcc93b21ccb16647e60d611f7c7d71d3bda85c77 SHA512 1dab2b957642d6fdc2e954603a851da2df685021e614afab3f734dbd0e507b237bf5b0c08248d744015f698948342d91dbad7102fb2624bcc3d09f82a9c9b528
-DIST firefox-68.0.2-be.xpi 582146 BLAKE2B 4d58b258e8577ea1cfbc3608f26f22c9c9c1e766bb609de28059270e893363d3ec2dd651544b0895211c0cb69802566dfaed64765a428a486e9609481b0b0461 SHA512 1a6597909cc0042aaed765b65e10ff4769ab2646bf7a6fb4daf6e0393f583abc4e977e980ccf6980fa5102df01caaa7a6c2a2fcec8e1dc6614de1f22641109fc
-DIST firefox-68.0.2-bg.xpi 545359 BLAKE2B 0847bb6c73144964f9add5c230175072bd3ece6cd691e532c68c0cebf71e49154f6334b0e22bfbca8a6c0362c79ebaedf2ea55b2458aa6af915e54424136151c SHA512 9673164f44b4e0a4368cdc88c5f9c76cfed6c7ef2359d4a8a4305ead9009050438c2d01535ab9ac6e90712f833b81a3322f347d82f6c42ff9b8ec41cbfc0ded6
-DIST firefox-68.0.2-bn.xpi 566601 BLAKE2B 750073c9a64bda4579f1084c37cb684793bc5fd58f1fe047fc62fdb79669ce66f9b99ea1c07661eb812436dbd51ce7f0b62bf723e9800f177b5b90827eb03004 SHA512 1f8eac5d9bc3f60076108b670e74e3014a494b362b7a1b0278caed0d42f6aa97790773cf8bf1060d91e4957a31271bacec89700def8fc44bf6214da8502942c0
-DIST firefox-68.0.2-br.xpi 501692 BLAKE2B ee088044629c91cb1abbecb4c29389045d0d3bffeb1433f0d6cdd7f25231c606fbfec3e5e9bdc8cf922afb45b2da35d46d167cfd5cf384c202b60f0bfe73019a SHA512 70d15325dc9cc20414ac7bf3fee203fd3db7815e40175af0f7ee513d1724c1e5bcec770291454d3d2afb90ce34bbc5f87ef397bd09efd127929c35c5fcfeeaa6
-DIST firefox-68.0.2-bs.xpi 483155 BLAKE2B 61d5d7027601aa722bc76dbfa3254051bbd76e90a3f0d18dd0b51073d1fb5f145d5bf00b2606f6cc02ce53c09abd6ac3044a94341dbc0f66d69e6c8aae046387 SHA512 523b3b697eb207d8f5bf41b6ff0dbd1d9fe668634451ed6df80730cfdc3d9fbfff580724aeda2d14bd6b220fab8327a2613922244486f4a6ca166dd7230db039
-DIST firefox-68.0.2-ca.xpi 499861 BLAKE2B d2b6cf554fad8de6d2fc9dc2d8559898e20da873dbb8a425056bb915103423c089226ff9770090cf4cba6bc930bc56fa2ee9adc7d753ba661e54e7eca377992c SHA512 0da3ce3f8dcc2582c45a70c32ff53e541a5444df6d476248b83e10179997ececec41b8858cbf8ee7e1f1bbd76ef77c99c41a4277a6ff3f1262e41dc42df0f829
-DIST firefox-68.0.2-cak.xpi 527483 BLAKE2B 0f98e4ed66a7cf2ac40d3ff510c4fe7d52d21f174d408c21d9c70def9b49501c9f9384a15a712c342f1e2e017266e4b2dcc31f58db9f447ff6024034c79ed1ab SHA512 f5bad503887aec937df978cf03286dd9dc4992fb8f0db3dee46bab5678fe2a1023c5b6cf1c2283e833ecac1a9d3116054311444f8180c01c1dee8568b674b41d
-DIST firefox-68.0.2-cs.xpi 519961 BLAKE2B 11c154336a81fa103d46a5f81351e8e7741dcfd9b6d215031960eeaef75961a4a133f4a35afd7c5a4856dcb722a4ee0ee7426c8edc306988bd966f4dd0ddd1cd SHA512 4c6efe823fd233c4a248586504b48d39864515331327af7c9fd3d6d25ab6f36f6610d23479243779779d8792ba60532ab224cadcb57154aaa64819c1c1f10a42
-DIST firefox-68.0.2-cy.xpi 507183 BLAKE2B 573050a443c29d4065faead32356a635db35eb6b42ef07724d4bc605f60c86700ae7cad1cef2a5ea7935e116579f4e48cc14818f195d254bc2d428f22ecd0cd8 SHA512 db0921ee7cff2b3c24ea5cc60c6608a6f716cd06784c0d28e8b2b17998ff034662ea43215538861eb79ca5b32e0d08f1c66ea713f59a65b140005d1df4f621ba
-DIST firefox-68.0.2-da.xpi 520282 BLAKE2B 95a070d632196e490f21f354ad2aab808ca9b00aede5498a4ac92caef4babf3d3d0103769ab6e49b0779b93d8097193166f5b7eac15a00775d78bc1f3fee8703 SHA512 f96af5ef904d75205e4af8cfa2df6d9a47ac9bfaf5736a36a46bcf60d50ce56bc95dba6fd9a48492b05ba11be1f5c563907118c4dbd0837cc0fe1bacfcb77e2e
-DIST firefox-68.0.2-de.xpi 523751 BLAKE2B f555ccd10e07bf62073af53270560803f17ee85ccef8e6b59b4e629cf97ccbefdff12b7b0eca58746bec22cf27fb72b5a10843037aa22373525615c41be5a7f2 SHA512 c3bb00967bf0c4b532b2386f3c273a930c1b8ca107451b37541d8af5513b2ed76d44169d9e0e772c40a67568df8eb1cfe9df4a6193aee58b5b8abe103176532d
-DIST firefox-68.0.2-dsb.xpi 528680 BLAKE2B 4280c8eb5638dcbfcc83eba89ba9b2b1e8d9d9db64ff304966d05ef960e81c7621469c43fdaed9f002e3506c023dbecdfb96e6581267369df6aad8cbcaaf3661 SHA512 581415cfbdc0d56fd666c3a5d7afb629534832544d82ed8d41d99675c41efb113b408d2d062db1a898227232a702da6fe170617a9edc39f0987a47e7dc5ab5fe
-DIST firefox-68.0.2-el.xpi 597400 BLAKE2B 6dff693ac5d2926c6d2217bb34146be50a875c6b54580118afaef9ee9c1589b403af4bad60e13535a0be2ddac16ac090e26c54b5c9281254f2c24f27f714f243 SHA512 4472c7d2b3a65237201f7c5700b36bfaeb5d5559a8f361bb5e44bd3648d28afbd0a084c6d2d093282e086e1509d83898f4cfe39b7826c78e48de23e2519d099b
-DIST firefox-68.0.2-en-CA.xpi 478533 BLAKE2B e755004ebe6ac4129d40f1f6d6a6c17602e27b1e10c8193dd7e460cb3b9aaeaa11dd62af69f9c2162abfb45a35de9b09a7bffc562c2b3ae7f5100808a433b089 SHA512 62ca278839d4f2e007a08e31e2a53f4d1eb4b45ba7d1362941104e24b7993f1c9d17f67a35b647eddc869c8f2f9499fed6167052b2bc951bf38422f1080ac206
-DIST firefox-68.0.2-en-GB.xpi 478285 BLAKE2B 5280e0b22d137f6bdf970a96fa7415ced4d5e5aecc9375d6b7a207e76bc0294a2e3b2af58502b6a66af0ecd77b024eb38fefba4dfcd89440bb546786371cc386 SHA512 4f3de7cfc5bb87432f2798a46ccf5f68c821f51d438f0dcdef75d834af49ed2c8341ef19b5159cf6d543a90456a7b33ce22de316ab38de5170468763bdc2ef7c
-DIST firefox-68.0.2-eo.xpi 504237 BLAKE2B 55221de739d10d1c2d7339366592d59d655852576681ab0222cdd6e33da727771b48183d5448365726129c3d7fa49380cb433cb20ad23f82e9b6b859e4856e8c SHA512 7762c9651101481c80fe5a697bfcc176116b9ed1818baceca13072605fa98be130bb6e949e5df3feb3f903c608a8446975ba237e7b4c7f27ab6bfdbadcc75f46
-DIST firefox-68.0.2-es-AR.xpi 512458 BLAKE2B f45b89367f40bc0b4016ac2dae95deb3a7b17f4be7c7551620a718b13649b66710a0fad470851096def64e19c5ba022f3b1e0b7580949e9974c6f0b36fe8085e SHA512 4270d07d8495378e650d4f54fd3bc9c6ab03ced51daa7338671a0f848d08e80ef3d87c4f7af0e4573b2ab7a138956fe04a705f21ffa1ccf5a16793a493fa0593
-DIST firefox-68.0.2-es-CL.xpi 511934 BLAKE2B 593e721ae3c3c8e252216d3b48b06ad271a0e1d20fdf95d1633c2607dcc457a2b51043d8d67cc2158278a8557224ee549758a85c9d699c2a5fafa9792bb6cee7 SHA512 b7f452a270a790bb187ac85b1d1fab5f6c83775e4f3af31a244f257b31f5b169e3640979ea7202d6f24ef5c68ef4e309eab63ac522be98bdb68b6ccb8a083590
-DIST firefox-68.0.2-es-ES.xpi 481471 BLAKE2B 62dc4898b36e5e769dd30584f2ac3df4b70906e7a4643d50908f2c0871e1ecdf92fea2421192b6c0ceaf10aab8d503a524c73059afd4cd6436b3b8798b46d40a SHA512 edf0f5e2a392adcc6a4a9d1917d69eab28f5eb2794ccf704f59a32a01bc8f5679b38130fcc0cb4f137d2e25e4ed7107f9c0214979dbe4f72fcdcefd9aa346e8d
-DIST firefox-68.0.2-es-MX.xpi 504717 BLAKE2B b5cf02af5d6370d06fa1999a2f5ff7095fe8c46d8854a3be7e3fdf7aa3e18aa16cfd9da77efaaacaacc6c6c07f64975ab5a8671bc20dea48f07b3b09992fa2cd SHA512 54e437203202a3f9c01fc1916a7d3737639955c1b44d94371b9c36ef461f3d512b3bc70cd13ce3db5ce5b1ba1a905009382b03c594427e0ba7d6f1f4039a5997
-DIST firefox-68.0.2-et.xpi 488549 BLAKE2B e6d839fce6e3b94982055c3b222d23977042f33981ee82333a6c4f7e776c0c97a1d261f0e39c92c627e4e4889c4edbad313dc8397fbffb858dab621b6d89c745 SHA512 80d94efe5f5e65bb26a318b92978b6a9a80b8645be55478efa294b45068d46eabe0fc0fe0cc1833e7ecba5b40a75f5dc3ed18afce14bc25d5f6b0c566b4ad446
-DIST firefox-68.0.2-eu.xpi 502489 BLAKE2B 17bf15210492948fe1404dbe20f83efac649df1e1e4baa1649232c0a98603b3f79df51c1c025e6e27693c3aca94e36314b20f61006acc56119ef1c0582f918d4 SHA512 d88e7ac06106cef5c09df0859487bfaf83ebbe38e5daafd8aca75919577fc515a8b153c37c5e9b28fa4b52b58aece1e9d5b998da6998d43f7e998762f0c5ae83
-DIST firefox-68.0.2-fa.xpi 547859 BLAKE2B 74275af10821740521b10cfcecf7e530bbc7902973667dca46d46db8f4a1e51f9069140d823f0b1f60dbba00b91fbdedb82a544bff0c7fd66ec7fed11c932535 SHA512 78d7c7b766ae660597ab427e20882714789757021229c1f46536eb0e82c65546b75154947b4bd8c07926addf00d8d3cdbfb7708b27c864819f650d28243ef539
-DIST firefox-68.0.2-ff.xpi 484097 BLAKE2B c7f86c0803ce358615efa2b294ac14250b5aebc97e8ec7105033c0973d55e227716f5adc955e9d34f72e2603ce850cb3ad12eddaab208682664cb31df49c9e51 SHA512 05e8a1e2aebf844e3f6ef7bb5d6dfd3bd6be1742e0cfca574cfa4c20c6359411e49d2d023d554b46eb408470984ba8ae6d11fc61f02f13f9f34c9640f55f7ace
-DIST firefox-68.0.2-fi.xpi 494314 BLAKE2B 9768db3984b57c9031e93b81aba3603ee5216e789b640d976c10532031662eb30cc35f901978e8f2d271ba94c3a0653727d3b8da7901eeafec9bd3438e3822b3 SHA512 a1e12a6c7f940534fd902752d2389c367cb8f319d89451ea4e97912ac97ba2dd1645074ec2a14fdaed7cc93fddd245ace3b42af115a0098eeee275b6aa9263e5
-DIST firefox-68.0.2-fr.xpi 523088 BLAKE2B 5f35eca208bd00c942436afe46660a88f95680cdd0e6ccfefc0100f314613b5e35153213bbc7edfae87d9bc5de39b4ffd26deadaecce32a0acac75db79d770b3 SHA512 c505da94323ec3ada35061e67aa1d1b6d8706ce41d4926c8631b165743911b07839ffdc2bb31281efeaf5f5b2be8d12eeb1cac3fcb8358058dbbf355a1d88371
-DIST firefox-68.0.2-fy-NL.xpi 510430 BLAKE2B 83f6b4693176373e4953c2b7ea5662caae8343612ed3ab498d3cca177a54a313c63c078df57b5ca80e059fdf7df60043e68213f2f2d6fe73b70ba3ec0251f6aa SHA512 3d9bd035728f30008fb1ca9ceb26d2ee2da307f5f55b70dfb6437c96256d3605493e55b92aba2e9183fd537685639245c075387a69a15eb0e717d934ba66044d
-DIST firefox-68.0.2-ga-IE.xpi 489720 BLAKE2B 13993190c5e8b066a56cdbbad11a1aa0fce6741c8cb2fa34c29c9f39eba4114938564788556ba295e3e516bc05306642edaf25d6939972272c1eac107bea5e24 SHA512 df1242e90b2236e2196359bb8448ee7f96dda577a2182f95180d5275ce48c4d93b4dfad0eeece15a4c2459f02c5e6920e7c3e30e463dc66ea7765febdfb418b7
-DIST firefox-68.0.2-gd.xpi 506586 BLAKE2B d23817b322ebed2d91d82d91618e3c014aa76d44c615e8134d544aadee2f16ed4a606691dcd98d057c0e489313092cb001bf8ba2a8ab8ceba16998f33a0583fb SHA512 dd818eee777bd864e5f5d247ffc30af890d8b3bee7221c450f97f573c14647409b2160a765200f085c1d73be96591de98a06b484a00fd92ea235d3971b57bd13
-DIST firefox-68.0.2-gl.xpi 484026 BLAKE2B 887c1034f14f3bdca83a5b093c897dfe025f2710f41734926fd3e49d168b6ce52f5e1558fc7fa65212cfd0bc0793a89d7653752c271982a19e4cb4aae444003e SHA512 db5a3b35e700d739361a1a37a0a8d2bdbcec9a27f0af2782a2b7f2965591ca9f8bf64c6bc31b2786cdce5a0b750edbb27270850544c99638e4d1cfd3893f69c9
-DIST firefox-68.0.2-gn.xpi 522019 BLAKE2B 0d26300b59cf676e17536b71fcfa67a88bcd01ca6b790f514f6da5267158e70522027a6c42b9a22ae314dac8c9ed70206a6f5a6cd6f5c89b176e6544160da595 SHA512 7c32290953cf92c5f03bae757f2b7d3e5f328de3619eae6a75b90a9f02ef20eb4e9ffd7564176add7aa4ef7a9290e55f8e4cf51be0f6557866bf59f2ea67bf38
-DIST firefox-68.0.2-gu-IN.xpi 571751 BLAKE2B 6d7e58cb9b63471b8fe5a61a7b3f2e5e9ad590b068cfc4707c94a7ddf78ae52df6eaa8a73d22765cc9759824c46d25760c4432611e7476998df2fe7f00d571ef SHA512 94fed75bf58cb27e31a9975c847dca301fa6912a5303691daa39813c3c6f43b2f7469c04e30b4360a9fb86fede15562d5362f152bde5b77c2bda2fda1f782bce
-DIST firefox-68.0.2-he.xpi 514041 BLAKE2B da6488c57fba5181b8734113fd20f0d291b5819a1d1f7ae7d47a4924edc1646cc65815b50fe47a14d548e311f6b507d145731793f47c3216c958b5692687b838 SHA512 17e13b9c741e491ecf1b5e3662687889a822567720f822f40921798bbe454cbac2c2af495ce8d0c7140d6dd7a81f3944a19833cf3d9cb59c3f26ecaa1333311d
-DIST firefox-68.0.2-hi-IN.xpi 555497 BLAKE2B 565fa00cdc021eb1b80261c42e26cd6ead26be27f5f37ef94ac54643e9b70ec9906c7f16665ffea1e8d5c46e09845c3f7991392f6e435073bd34d7097a5bf76e SHA512 9e40c79ae97fbed467eab499682f8bd9ff2d41e2226a64546c6602c6820e362a17a8d907baa30f18981a73c8a0ee64e698d5a16ef53deff5553a83ab7a210b34
-DIST firefox-68.0.2-hr.xpi 491327 BLAKE2B d398031463dca8672fa7925a2451831a2a9f7c5ed25dc7591841f6f7dd8f9217d9a6053bb72b9d78984b0585693aa683337841c28f15aa004a091b0136f58c25 SHA512 7f47b678658114c45a9ed52c06cb8573c5fca754f7da678a1ef5a0a2517d7e659da975bf867345e09e1c3c255bf7831f65dd8d1a6f9a609dbe705ae502f77c12
-DIST firefox-68.0.2-hsb.xpi 527932 BLAKE2B faebf4561e851ed2da1d3c22b9eb08bd7471382848c15d660fd6664f6bff117531449adf090f707d97bbe548d7c70b92e0919e64b9d80abb570c24ec378385e1 SHA512 7d7d84a4d884a9f7e7bfef78b48e361ff6a38c356eabd8107a3949cf2db130e7bd77fcc2deadc2c0e92c10d8fb78d4694edfec808ab87810160f8c906421eae2
-DIST firefox-68.0.2-hu.xpi 526254 BLAKE2B c98461acfa6fd2adbfae0f5bb1e81390ea8c4cdd22440ffa6781abee3ce0d6fc5778aad3962406b68f2019550b09cdb75e13be289a8279cacab0842924b32094 SHA512 4c03f008739a4ad38aa4d8d5dc83f36ef777eb211cf723dd01ce5d38f9b8f45a60c43d5e82e1eacecf0dfec8e36e155ca074c6a37e89330815ddcc7a07fa0c1a
-DIST firefox-68.0.2-hy-AM.xpi 542619 BLAKE2B 05ce45a84266ff2e01aeb779e4071e2e95fdfda44b6254942a508ca2c21a3df6c45e13eccab52be6d03acf7d65d924ff757104ba6263825b5a023ec936b102a4 SHA512 29b8e36aecd0746008381c7f42409691ee48cb951d6d75d691275beb82671748c80e6849da76a7017a717548537a4dcb14337e100104d730fd86aa9dc8a08204
-DIST firefox-68.0.2-ia.xpi 496504 BLAKE2B 3cf1997c4ce76a452b493ceee7f5b0d583fae9b9b994cb5b002d71cf0ef9bb71870eb2c63792c1538bf67937c25582338dfd2ea5a3648365776cd727609c5b7d SHA512 a176126486621326cb59b975a28f1873c3a46d5b96495dd064e975716a231c54304f268920a0dbb90fb32b34a7f12f0550e3a0a4c3569dd35ff276831089fbe9
-DIST firefox-68.0.2-id.xpi 491923 BLAKE2B c931e9d44241f115ea12743721319e650527a9e3153a0d7f3c9dbbd7dfaf96f6dba5ef706585047712268a55548d856b9491b9a12d020d0684f8146b723aa49f SHA512 27e396f40c3429169ed0b27665071da606276196e9b1e6474e7433fbe7414b104040bfb639eed3e61292549ae37ca02e0d871236c3790cb3b5cb427007b75f00
-DIST firefox-68.0.2-is.xpi 499981 BLAKE2B 1e703a6fa20682feb690583922f9cdb1055ee326e03ca3af607e8ccd543115bef8f6ce31c124bb969461e1e992b130dee1e0bceee291c011a288571b046aed8c SHA512 eb5c81b7e4dbed401e1647fbd25eb73ebc0729444f50af75e97180c41cb53ab5cc5b7f11147a129525e448eae71b05e636ff1d2cf7763a227e382cab256ca848
-DIST firefox-68.0.2-it.xpi 383774 BLAKE2B 3eacc55a9c7c76dc128282fb58ac03767d482fcd5c1266327c15521b164fbfa73f930e3f95857c76b9b05d368ab238bb8aebc24b312da0f347025d16a78b0883 SHA512 2b2b7c26c6410af643d8d9cd87cba725707a06b2b8fc4e8f44472ec0aec314985b3081a7eac90e975f52dd0acc617780d502de9a44a5cfe98c02f04400f96b9f
-DIST firefox-68.0.2-ja.xpi 537086 BLAKE2B 4eaf04b5d0fac6a2436619f181e154726c10a61ac3a05ecea98230b75530989b5becb4b0e5ce20029da77bf940cfd447d7528a31fe4f846ced364cb36a2abfb8 SHA512 431ecddb4fcd050624410808252f66b3365cb56a6481b9ba2e5b5d3884ec47e9ea5105ee7801a9a51a65b00b986082cf061e0bebc0a8baa8cbec46661ffaad10
-DIST firefox-68.0.2-ka.xpi 544708 BLAKE2B 47fd6475e989c707cbad96ac1979cdb4f8cf705c22e1382d35678ea6b22cdb8759ce12a18293357218cacbad8fd383298e434bc110b0ddb267f6c52009241291 SHA512 182f9687e7db52d393d299a3069f1e5e57d01bb55ec3774e5801ff9e7ac897268d3b01f731bdb5b46381e717dbe2893eeaa80e6c1c71594b72605e7dcd82a2ce
-DIST firefox-68.0.2-kab.xpi 508639 BLAKE2B 7141e5bb901d224132a66599674f8904e58e41321e82661aace0c2b0aefd891b949e3f8f0c57dbece3470cdd589035f668782634ecd3b4fbd79d63f007c7e506 SHA512 8090ab4f0def627bff936f18325f9df001d343f8e587060efa819139a4548c9fb222325fa840a7f34f688cade578b35e070f1718e27806c66146f536e24bb532
-DIST firefox-68.0.2-kk.xpi 578955 BLAKE2B 96697f9ac306fd1e64a37e309e002e2cf919093fd9bac9909006b68ddcaa830fd4cb6ebb3ba871ca5e5d0a43b8c926bba202065e494a1163d4cf1c5ae5753630 SHA512 6bdbc0186859dcef0fc8119093508380f7f999dfcdd329bd7c31a7093e2a4e16e26613e4f7867183b6c9f0481234ff469388fad5ba4aea5781c7b930067f7255
-DIST firefox-68.0.2-km.xpi 551379 BLAKE2B 48bafc6de92118d4f1ba26b1c43002b4fe12c8f49bb4fca4c14b47b3c821f9f2e143991883ac79f22f3d9ac532e2de9f80c7788407504ef82207b20db2c2749f SHA512 488b73212fc296b5b3709328f93a31c5e5f5e77cf885d6f5102fd4430dd77c2ca0cfcb2fc88ab2d577ef78d314eced16e2637685cfde0f34b2b3882133d8eb8d
-DIST firefox-68.0.2-kn.xpi 547732 BLAKE2B 9e5e09cd7246c51a1eded1b868cb787e08cca967302f88ec16f37d69bbe16a511675b6a7fbcb570e7dccfadc3f3e5b403e00fad143f4899d7fa7127e7d85dc7a SHA512 e3d015650cc72f0ef277935c01616d61eb074e96c9a094f8730a2a586ae3fbebbafb1a65a576eae4769ecba72c65ab14d6b7925d7eacf663766a04636c532c2b
-DIST firefox-68.0.2-ko.xpi 535982 BLAKE2B d8d69ea4a2b39c8bdc7b5e6cc22462aa7946e1cf9557a9593a698e5a1f62e47d5639bdc3bab8a4a058aa48bd592df646d3a14354695585e5ada998dd0e0ba24d SHA512 f61c215b4849478036d13c39bf35aaa4521e01bd83b352b6e52bda674977d8d5598fbdb17a8ebb9ec7d50b993750d7b50cb465f958c4e5f1c49352d8f5cdb415
-DIST firefox-68.0.2-lij.xpi 482047 BLAKE2B 8bd0013a5e8ff9cb784b2d49886db6e42ea53eec581b8f8f1795d14c4928cf5a32b3c953bfa3c0fbe25031b1ebcacb2fdc112b5f4e81497d67e62d8309349f2d SHA512 5d89a1f6740937d1601ebb654b7b7f47916995ce67fdf76c0f7780596d4542a8851bf853826315e706fcc33d8aa16baaa8d0c86770e70154273db2c592fe4035
-DIST firefox-68.0.2-lt.xpi 527597 BLAKE2B f8d0325fb0e0c2cf6bf08e0c70d0ddcced5f5ef51d04c377563f2c39f8f154307f1b25132646748d519038b6972c1b168663881723519edbe5b953935dc211aa SHA512 891591f74b305684b8488006d1ca2c19304cbacf5533f696eb09bca9cc4e1fcd5cd19c9f8158d476db027a06f18d439fb2c1742a2301f3730e26348e9fa44e49
-DIST firefox-68.0.2-lv.xpi 500467 BLAKE2B 0fbf61a715ed46744482cc6e9565a331642dcbc4ff8a076793fdd8b9765688b75273d08988b9983d1dadc6c721456681c54beb38fbaeeeaeac875f58378fe12c SHA512 c691bdb21f7999cc4b298a008816b1c0bbd5671a3aa69b237631463ed9bcbcfefec25103ae01f5c6147c63f68e2401e428c4f9e9bcf6efdda1f1b0a745122b97
-DIST firefox-68.0.2-mk.xpi 485313 BLAKE2B 2a5562a050fface56552c0abf30be93af208b5ea8381ab461762292050bbc9431e79754988c7da97e13085ebfd5d97ff9e1a400c067fc8f85545cd379504991c SHA512 16ec7ce8f446a395e44dc776649b2f3d703f6724c9f6fdbc9f5ecf9671aa84c0bc7b363e81d41a96bfc50da263e1847e751d0103484302f7b85a93e457db8af5
-DIST firefox-68.0.2-mr.xpi 559178 BLAKE2B d6de37eb6c4f425a64b9ec290e35bed7e399901187b3834263974936b8995db89fcf8f7b13ec3c2dcbada46c06bab9a1319f0f3059818dd0a59178680e10f84b SHA512 aabc5300d527341469f3b34560eed8a240f92b2f48ae4e0c1a44959da774603004dcca0d9ef8a970307b285c9ec97d4e7ae6417b9df32d39ee4de22e68f42251
-DIST firefox-68.0.2-ms.xpi 480454 BLAKE2B 4c488f478db18aae240df0900b208282474410be290ce7655ea8f48cc41a7bc49f37172e5b76d48c66ee6750b45cec8a046e1c338511d584046302da75805935 SHA512 1ae3a019686022631737af261258c07d068bdefd7e524fdeda3f3ae50db69358d870ade9b2126ecfc5a9149910289f61cdedad0e1c21604a8484a84ffbf4e4b9
-DIST firefox-68.0.2-my.xpi 552182 BLAKE2B 68add7de135d079254c9ec17692df6fc0a059b003009bd8cb3c5c1e89f2ec8a5b8b846261fe883eef361cf1d83a4b09d8b07b021b11ee0d0ec46640fffd38f30 SHA512 0d0c2e3d28cd49d439425c22ac5419f64eac30a5b40aae786533f2ed3fd88dae8f82620939dbea9c999326d496088b5b7bf68d1b5e19b1cc00dfd41a69f280ee
-DIST firefox-68.0.2-nb-NO.xpi 496171 BLAKE2B 17675933360f31fc5de94a6682fa343cd0416c4dafdc537a760fd824678987f232a5a9d9d3373b940ae78b623ca855b1122b2bdaebcbd4d0785374687c4d90c4 SHA512 78a91b49c8c7f0b655bbdae50391c2586c2f0a8bc7208f3917e3d8ea381ceb3a4d7c7e70179907cc79bf8d137e703781049aedf4f37de186fcddd7739a4289a6
-DIST firefox-68.0.2-nl.xpi 492180 BLAKE2B d7a7ebfb4c5aed848acedfee925e5c2532919273b9ff0419f6b0e6800c3302113d3155dd35a27a713ca559bf8cd45152d76efd684565536d523d84339b6e5227 SHA512 113a9a69e41cec3cec319f894b407a85ec785f4893c453ae698b1674fd7e02b8fab62c77f80f4adab5fb39338be746191ede5e3a805c87514f606c8d7a35f025
-DIST firefox-68.0.2-nn-NO.xpi 494801 BLAKE2B 57c5600e9e470421d6f1a2e2a81bb4bdfd6b9249470e103d82c3533e5c54dc3bd4bc970bcdae6e8b57a0da3e3ebae3b4b34d1b0246afd1ee426ffcb4e4186209 SHA512 eb35cd0cf91efdc3312f035c50aa509551639ec8b083f8d5f21b1d71b105b68c004c5b69840b9a200bc1045076cb71de7d9de8a232a2084a771392b3dc4aec26
-DIST firefox-68.0.2-oc.xpi 498792 BLAKE2B 51350bcf457929d8a8792c79fde5001ef79a22846b51c9d8c859ec1e703738684d43f2a716b10e85b37e424e4770045c538fdc14d87901522935105d11f6becd SHA512 4ac4a61ecb92b969c23ddb8aeac02640a81c9945c2f744babf7615fd3f54fe5c5ffa787600f86071f9a4831e4bb46bd34940951e17ce5baa9a2113bd95cb301f
-DIST firefox-68.0.2-pa-IN.xpi 542697 BLAKE2B b426d4bc50e582fcca7fd86321f60303d513421bbddc020d281f29b21256956584ee28a7c0b7b800eca7aa5d8353f10af4d086c7a09bc6387f6d62ba1a3e9fe5 SHA512 dfff5100dfa35d1311e31efa3df04cddd6359c3681739b2f0fde2cd10d4c37c421768a7ebd332c5728cb4ff2b17bbee050bacc3f0fbb4c1edae3d0b77c172ef6
-DIST firefox-68.0.2-pl.xpi 495837 BLAKE2B ed367ec1d43f361b021da25df7ceb603981a2e9e96b4ba96fa8e84acedce56383f00a953c0cdc795c55bbc9120f8bbb46589eae1c2d7d9e686fa120f127e3625 SHA512 68d3c3a48487941ba8e263966a8d92d698e5f44279bb1760df7bd042ff5a875953900a3f497db35da36d763d542c01c0ab8a0d7a727b106bfab9492f9c48ad66
-DIST firefox-68.0.2-pt-BR.xpi 498245 BLAKE2B 88967a44bf40254295de6228d1a73aaefe0a92ad9b95fe76f7f38975f2890cb8a799344f3f794d208b9bb48696c18f64809fe46c6321df8bb054485a62637740 SHA512 34e579d7c91d9ee7252e082db6f3d735c6334435f14b44a2c81ff8b618a5038fb999588d8c7a9dbc1bfbb348c14ee0df2e9d2518c14e27c580b88d20417e6541
-DIST firefox-68.0.2-pt-PT.xpi 507863 BLAKE2B 9b2aefa5e81e7dc3ff0c638399da2d781413b350d902dac3b1f5eac9df8d81583d0b5e5d24bea870842611c5ce44eda407de29c58229efcba28875bcb927fab6 SHA512 c4e8d286aa662cf339d274ae49efbd467cd903e2b9ed698fea6b1959df300a46fef8057e8a47e2882825ed2dc5c67783dcfa26bc288e746b3c47a4c5b9a16d23
-DIST firefox-68.0.2-rm.xpi 495529 BLAKE2B 1e98c4aa5327f44b16aafc62e42fc34c7c2992bc163478dfdd870f939f84a22937bb93dbb9b00d0e7fc5715d30a37a2ace6655e119a4f2f5728491febdfb4936 SHA512 2bbc83e05154f00bef73889789234048dddf524760de5c1079f8d5667424df5d5d4fc4e700472644b3c78356afaddffba08b81d98d70245b82b47d2c360f73d5
-DIST firefox-68.0.2-ro.xpi 508822 BLAKE2B 757d5af49e8dab060d9307a8f40fca215584ca22a8afadae5813bac94f91e7128b9bc41f68820736d32063341961fca9c9d4d5da0b86b534dd0ba8a8c8cb127b SHA512 6809aee000a83b90ee657da21216695f687b7933cbb082c0b9e58ae846abcbcdc0b01391613c73108799b8ec80eda29d68135fb4ac9083006ac57193eb14364a
-DIST firefox-68.0.2-ru.xpi 583983 BLAKE2B b440a8d7c017df2a4d930881d6551ceb2a9f4e571817f71f99b8ef02c39267fd8794be4ef3af32b18734470469c5bd2ee3ce6e3ab475cc5cfcd1ab868b153f7d SHA512 c522d6dc4865b2c7aa1a0dbe290ea13c0e36f78951c66dad143e3a498152a9f9586b4b408dfd207cd960f9965fd2e0a9443267061fea6e61e208ccc93ebc4ff5
-DIST firefox-68.0.2-si.xpi 528260 BLAKE2B f095ba767e28c642c9c9d167110e8f97dcd20ede8664e1d29215deadc9332aca75156da3c2223db1c7c66755bdbec05d33ed4d406202b15cbff3975912ad0bd1 SHA512 83682d6efa9345e47b54b943f9b33eefd0b50bc7fdfbc93c5b837cebf0760636f7dbd6e58883a7de2f555e0c33aa40ab0d317f6728052aa9e30fdaa6ea8d559b
-DIST firefox-68.0.2-sk.xpi 525301 BLAKE2B 11ae56c56958b684ba9de40e5a6a9ca3b8ec32c531ad092b848f062f8ac55c0fc8e47e2bbc8ab2dae9ac84fd7271d0ed11c85e5445231157fabb7e5cfebdab0d SHA512 3490cbf8bc53a54040b8696f6b6eb4dc53b16abc1a821a9ec9dfd41e8917567ced90ddb899e76f6e837494670c9240348942198ac3e94cafbc6de923a5f61515
-DIST firefox-68.0.2-sl.xpi 502400 BLAKE2B 7edda5369fab0afa3d1b7b85e8e37298e8c555dfe70558d27b3158225ba17259229ab21103c31eca76bec4b5d595c4d2f45833d3e04e10b197fd1f7bb937ee47 SHA512 274abedb65230342f524f9b42dc9df114b15d551bbef74bb626e3fe82a8f50469317636d7be520cb0c1c26f6a5efecb3e72c847a42608658abbb92593e522c9d
-DIST firefox-68.0.2-son.xpi 459045 BLAKE2B 0fccc1daf58ebf78c7c8181ee44600237188afcd3333c48b510e1f5dd1afd1dc4791e82fcf9025aaca64a855b40250ef4343d2b977b352548409fe3d5406bed4 SHA512 30386556139893f41a915ac3f6fe8a421c4de7c9ff6db626926472f6537d209fc1f316dc0ce0cbe49a923c83ecebd38c8ce21901a92e1328ccdc5deaa435133f
-DIST firefox-68.0.2-sq.xpi 521628 BLAKE2B 874e97696611d1627bba970222bf89679d464a04b9e6258966d78b785fc14df790cd69534e6adeba9a009cdb568669d77ba5cfe3848ec2e85194e17674c33fb7 SHA512 a62b464f18923a7f11b636b86475bc221161ce79cf909f5295762d8c6a02100c78df7373b373aac071584614d8a193f2a3d1c55421263121866bee0c7fb8401a
-DIST firefox-68.0.2-sr.xpi 527537 BLAKE2B 388ba6072623c056515865efbab9ffa3c488bc888ab2da79363dec6582ddbc4fc03643c4e75c778335a3df45eddb315015f6d4e55f40cb59d0cf8f93492aef09 SHA512 b2c9606aa185d4e8ef636a0b484ca6bef5a4cb58be072e53ce0449e0c3e6e31d3c49f458a4db17764a18449c400b00425b8a7768f7b5f4e8dcb93352dcbaddb2
-DIST firefox-68.0.2-sv-SE.xpi 506919 BLAKE2B 50b809c84fe76a7d54a685659d66587b433b325b5743c6ed9c1d42475c548ba41391e93ea519df95c6fccab5a1ee32bba99cf18a6edcb0c19bf8ec607735885b SHA512 724220afe405e6f33a69aac68dd1dafb7cf7681186d2893055716fdce35e39c6cc4714bba72af80351c796b335b5e8da85f9389e908fd8da95c48a7a9485477a
-DIST firefox-68.0.2-ta.xpi 549379 BLAKE2B 811e8225d6143ed02b048ddf3ce90579b79ae5ca4bab3bb70b94a6576a563d22eb2e38b50319e368225dc63333f70e07e45f25743733e85458c0a548349ec590 SHA512 30ba55e3cb804bb26366259b957f3264544ae6cb0cd18924f3f8ecb2545d629bb10a5f33adc4c15222d6bc4cc3eed2cf5d94465dc6041ce8ac8dd2ceb5b5dfc3
-DIST firefox-68.0.2-te.xpi 561721 BLAKE2B 81199e6bee1ecd47c6ee37e2eebb26e4d8b2b9d8c604341bd6ad8b88acf21e676d5b4d5357d2d165eb256f7d657e217a7366bcc17171632813f4eaa05010dfb3 SHA512 e2f4d227a4215c26750d58d20ad6ac7cc33781c766d5b68a1b7938b8e3f16b0dd94aaef54dd0dc1e4a78cb26a4282565c32ef1d46d641cf747dde66eede12305
-DIST firefox-68.0.2-th.xpi 550955 BLAKE2B e3fb29692404b636a8921f4bb8875c43fa8937d7bcef62d0b1e3dd8eac229339501d363fb2a8f2d6efcbc9b0e6bfdaa8c1a125ee95a4c24f679dc6c139b0a601 SHA512 8752f698671a5d336cf956c578332cd3db6014bf0d20358acecc603ba089e96f04edc56ce5e15f8576c256b76410f12988afee756458e4178a2fe3d49365053f
-DIST firefox-68.0.2-tr.xpi 515318 BLAKE2B 3015b3de7e660338433705913b843e42a6550aed850ff18c638cf8ccbd199d39ac81fe049a8e4f7e2c955b0f4dc894c0aae064439d6355382a5a2e17c6e4d38b SHA512 56b84f8a862ced6958d4334d4ca177aa1921361bcae49d727514beb3a4b4889e79ce922812489a6cb5cc524d3c872b032416cd03d87ee4752177fa27e597debc
-DIST firefox-68.0.2-uk.xpi 569041 BLAKE2B 71139b30cf9d3ce735cb886ba5837cc712fc500682310381ecf5b6a29356c13544f884eeabc0522e08916febec135c2493cf45f85dc92d79732ad4df494d3e94 SHA512 00cbaf11839edfb694582b8fbfe1df2618fbb8ef057466d6b118130ab280d683e77cc580d49a730c7fc9b72fe28a385a0654c15a1934b40989bc78ab8d80260b
-DIST firefox-68.0.2-ur.xpi 542516 BLAKE2B fba79e102c657b83466799bb7849ccbe79697314030b0d5a02633bd51abb66676118b0e00a4a938c26bee3e043394826160d236e78e5b083cf86548a085689f2 SHA512 a35c5040b46bd7e077091a30a8323620b8a885f735e0d22c3d8e21b89d6899bb5c382393325de1f3ab5b269761533ff3e9590bbb75e2c93e615bbe3b0a4dc5dd
-DIST firefox-68.0.2-uz.xpi 482653 BLAKE2B 73723741197ec9c9bca847cb41212b6e83bedff5a1555ce9a400a0b449e32c073eb156a222b7833764d509b1436d2d72baa57a5806c6d2e8eab3591c565d0fc4 SHA512 2865540da8d48eb6856fd0df3b6f26c2e4fbe2d98b1337b7ca949838f8b23f93a2907738af0354f6a62d135702604afbfb61d45c35c1c62f199e37272a9b6104
-DIST firefox-68.0.2-vi.xpi 529344 BLAKE2B 81e6e8350c7b2b0c7590fb296f39eb1b309a567d31d5af7cae24512c0853a7a8c56665c60fc14698d63d0fde33f642c82b93865e252c02c5b7cd308f1f427a62 SHA512 181e518b86957f6bbdc6e025d631a361d564e6c24916bbf54cf955e5284284c10be38ef36020e4399258075812a08a8fc836096dbc28a5d7ca30b23868b87361
-DIST firefox-68.0.2-xh.xpi 470582 BLAKE2B 49528ad8adb72f968030f9df600841f1bede3469091dcc3b1a938e3ffd3217a571a1dfdeb599448b7bc34fe57f75290ebf5f9dbe2449be31fc86ffacf7b01e31 SHA512 0def428a9cadf6ddb7569e62896776e2eb4913db763511203e64c48b7e5d7a4df9a4006f5127efb3e7dfe63ceecb20cf1861d3d994f903c44cc8da40179ecb52
-DIST firefox-68.0.2-zh-CN.xpi 536613 BLAKE2B 723d926b9133b26b2d662276460c9588fbce939380a008fd3b5074275b94736a4e5bb941f82ecc7efb5d5e67298ac7a57f755272329a80386e148545138b6661 SHA512 757ec3baf9bcced011d59f33866f3b7f0d8097303e1b17f2ee7bce1ccc96b72ef239fa1c66c72f41ebb22acf09b1bf28a56ced9518f9eb9e20ee2a7482d9ad95
-DIST firefox-68.0.2-zh-TW.xpi 536156 BLAKE2B 6f683db409bcba53e6393278cba331c204d32ad61e450aefd047d83812430bf290b5be847ffc1e58e5868062cfd10fa5759cde317ccf1ac2cd01e56ae55c5ede SHA512 50b6f492b39f6596fcf14ea6c31d13afd1d033db7dfabc262942b79ff9e22acb17aac9420f13c7976e02cfd3d3d0bd38702a9c2d3f2b54f258da49e00a588bb5
-DIST firefox-68.0.2.source.tar.xz 311257408 BLAKE2B 5995ab3cf3b4322fb11d1d70877a3a224d69b86d03270b9d4bc8c59cd840c1bf0dbf2c0710cdc4a825095c7fd276e40e95d6ae9de09b509fd04534b48c0fea80 SHA512 5c289825fd0de062b9943eabcc16e09c1821c04717e689aa8df03162e722b72ea698195f3ea93e1e746c481dacd77d125301dba951468d134b986e35eb4ef5bb
 DIST firefox-68.1.0esr-ach.xpi 471802 BLAKE2B 7d5033d0bbdc708fb676b411e26e0f617c321101d3db70cae374be4fded2eca17450a3f5521f12c8800a4cc4654eebfd906539cabe426965857edd34d21095b1 SHA512 fc5648470f1ad6f4449613bd4d0e9cbc0d3202e92f00048e9122f2f1b865819af01db1f79a51deb15bfb2f294c3828f15545de71daf0875e09fdf69d84b4cf68
 DIST firefox-68.1.0esr-af.xpi 450637 BLAKE2B ef42b8e046469eb0d2edd7e2aa15b1a22e09374490d2910ef678a713fa0eb8e339d50840a4310377c0288500df4a953702a191571836a7be29f978b4c3edbf3d SHA512 4252bfa0c584f78fcf98b1142b40365f200264c31640f82bd466f8735819d73e32d5be988aaa9ce7d394c12372776e351c5438a9f95e20348e10cdd6bcc6e998
 DIST firefox-68.1.0esr-an.xpi 483094 BLAKE2B 71698125ab03f099abd52520a5fc6ec594d34ab2cd98853eaeba83dc42539592e83bdbe02a8c8014123cb9047448ba1c7b1ccb107e2beee02ef32777ffde490d SHA512 d89fd25d748b68a10469640217dd1923a754421e5868d43299c687864e2a58994e2c1470db64198bfd51191ff08ba2cfb3ed27ef1b05185005c325ebf060db0e
@@ -563,7 +471,6 @@ DIST firefox-69.0.source.tar.xz 323421020 BLAKE2B 18b176caf5c848f6386ec9cab0b614
 EBUILD firefox-52.9.0.ebuild 12991 BLAKE2B f6fd3bb3145bccf8ecdc85da7fc102ec71ccafd9dcff9f5c0d4ab8fd274bb438b1ea271c556f5153e44e7ed58acf7aeb6a095d49f43664ace69a4cce280555af SHA512 f30ca31284836f835bf37eb06d88a40fb49820b0bef66b200e20877eadc823d3220adcf1b5c050e207d8626577abe0d3986a8722a3fba2845d9b663423ee3d63
 EBUILD firefox-60.8.0.ebuild 13727 BLAKE2B a4611f7e61e3a5ee70de08726648596491fc7bbbe36873ea295e2f0abf18629b6e0c4343b97266f4977e85b05f2d1b2db298ac6e6b77697fdc4378c2a41071e0 SHA512 c2a8a9d194d04edc929743a000abebf15999b25dd4a702b18c1994bd07ba16abbbe7e5fec60617c7b645f52dfe715e8e3c7761d40f7ad229c39abffadf162770
 EBUILD firefox-60.9.0.ebuild 13705 BLAKE2B 52f88a5bfe0bd25e291da482c7d6e1bf0120a732c483a632732832f67f1dc9d251482de986c1fba0dfd758b625c720c1727eeb4c164edc93d4d95315a04ebd62 SHA512 a8ea62dc9154be361cf67e77e3a84ce5ba135b7cca3ec741fe55589cc93f3efe473316579b342c8220af8e284df5065fe63341cc78692ed24c40a890f613d7de
-EBUILD firefox-68.0.2.ebuild 24369 BLAKE2B bc1c471727125f61f14a9c690141876cdd2157b326359b6ceab9eb07af361e52d3316a5af1f7764277d960ff99ccb4eaec49cac62455de628a17bdb96ebd195e SHA512 140745b8de871b5167e7aa7a468ed8ff670a5c28407c83629cf98fa3e6bc4fbe3f931d74f1621533b91000cc50af19f49c5b2a3543ec351b1047622c11c410e5
 EBUILD firefox-68.1.0.ebuild 24437 BLAKE2B bcf741019e56ac9e63ae2a7f00ff12bc7d866525cf19e4f93dcf348d6dbc312305fd04f05a17646014dfb150402336aa943667d1b39b52e4d050fd2e501e5278 SHA512 b55ef6be4e16d0ca5f3027c619953fb629916b1c12e3ad58bb7fc71a280fe39351f51b266b9f2fe7b68318f67909cd402c30e6092b0e024066920e335f655aac
 EBUILD firefox-69.0.ebuild 24449 BLAKE2B c197e3735967870f549276b7424fba7df925fafe3d0746a87170175c313b8352f598219b2294904d1684fbd1c9d806fa7692ac179f730f36c34b1b53251a3bfb SHA512 9fa0d0b2db7e0366e6dcb671871cafbcf0d7d1698d10cb5b015ceb711259a4e77798b14ad21fc99ddd30a840c4c7cadeed8abf61f4cb520a2e58af65a5383d24
 MISC metadata.xml 2540 BLAKE2B 458e01980f6c0dd1722289fa23d3934d66b1cebe4e0f80b89cb1901bf823c67acc852f1a14f6fd2e59829209dead122ddaf77eacc81d3cc3c957d73fc649b187 SHA512 c2d232195fdc5950a1005c9f46e9b304cbe0c2c991312a82d35363021123719bd0f52058d6f33d075c091a02b920baa479a425c07a9bd7ed0c87857ef6479dcc
diff --git a/www-client/firefox/firefox-68.0.2.ebuild b/www-client/firefox/firefox-68.0.2.ebuild
deleted file mode 100644
index 8517bf2a9230..000000000000
--- a/www-client/firefox/firefox-68.0.2.ebuild
+++ /dev/null
@@ -1,763 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-MOZ_LANGS=(ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
-en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN
-he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk ur uz vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-68.0-patches-11"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
-fi
-
-LLVM_MAX_SLOT=8
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 virtualx
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver
-	+gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio
-	+screenshot selinux startup-notification +system-av1
-	+system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-sqlite +system-libvpx +system-webp test wayland wifi"
-RESTRICT="!bindist? ( bindist )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_SRC_URI}
-	${PATCH_URIS[@]}"
-
-CDEPEND="
-	>=dev-libs/nss-3.44.1
-	>=dev-libs/nspr-4.21
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	dbus? ( >=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10:=
-	virtual/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.4.0:0= >=media-gfx/graphite2-1.3.13 )
-	system-icu? ( >=dev-libs/icu-63.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? (
-		>=media-libs/libvpx-1.7.0:0=[postproc]
-		<media-libs/libvpx-1.8:0=[postproc]
-	)
-	system-sqlite? ( >=dev-db/sqlite-3.28.0:3[secure-delete,debug=] )
-	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
-	wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager ) )
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	>=dev-util/cbindgen-0.8.7
-	>=net-libs/nodejs-8.11.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	|| (
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:6
-			!clang? ( sys-devel/llvm:6 )
-			clang? (
-				=sys-devel/lld-6*
-				sys-devel/llvm:6[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	>=virtual/cargo-1.34.0
-	>=virtual/rust-1.34.0
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-REQUIRED_USE="wifi? ( dbus )
-	pgo? ( lto )"
-
-S="${WORKDIR}/firefox-${PV%_*}"
-
-QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-# allow GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z $GMP_PLUGIN_LIST ]] ; then
-	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-		return 1
-	fi
-
-	if use pgo ; then
-		if ! has usersandbox $FEATURES ; then
-			eerror "You must enable usersandbox as X server can not run as root!"
-		fi
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..."
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!"
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	# Avoid PGO profiling problems due to enviroment leakage
-	# These should *always* be cleaned up anyway
-	unset DBUS_SESSION_BUS_ADDRESS \
-		DISPLAY \
-		ORBIT_SOCKETDIR \
-		SESSION_MANAGER \
-		XDG_SESSION_COOKIE \
-		XAUTHORITY
-
-	if ! use bindist ; then
-		einfo
-		elog "You are enabling official branding. You may not redistribute this build"
-		elog "to any users on your network or the internet. Doing so puts yourself into"
-		elog "a legal problem with Mozilla Foundation."
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag."
-	fi
-
-	addpredict /proc/self/oom_score_adj
-
-	llvm_pkg_setup
-}
-
-pkg_pretend() {
-	# Ensure we have enough disk space to compile
-	if use pgo || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	eapply "${WORKDIR}/firefox"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Enable gnomebreakpad
-	if use debug ; then
-		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
-			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
-	fi
-
-	# Drop -Wl,--as-needed related manipulation for ia64 as it causes ld sefgaults, bug #582432
-	if use ia64 ; then
-		sed -i \
-		-e '/^OS_LIBS += no_as_needed/d' \
-		-e '/^OS_LIBS += as_needed/d' \
-		"${S}"/widget/gtk/mozgtk/gtk2/moz.build \
-		"${S}"/widget/gtk/mozgtk/gtk3/moz.build \
-		|| die "sed failed to drop --as-needed for ia64"
-	fi
-
-	# Fix sandbox violations during make clean, bug 372817
-	sed -e "s:\(/no-such-file\):${T}\1:g" \
-		-i "${S}"/config/rules.mk \
-		-i "${S}"/nsprpub/configure{.in,} \
-		|| die
-
-	# Don't exit with error when some libs are missing which we have in
-	# system.
-	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
-		-i "${S}"/browser/installer/Makefile.in || die
-
-	# Don't error out when there's no files to be removed:
-	sed 's@\(xargs rm\)$@\1 -f@' \
-		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
-	# Keep codebase the same even if not using official branding
-	sed '/^MOZ_DEV_EDITION=1/d' \
-		-i "${S}"/browser/branding/aurora/configure.sh || die
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# Autotools configure is now called old-configure.in
-	# This works because there is still a configure.in that happens to be for the
-	# shell wrapper configure script
-	eautoreconf old-configure.in
-
-	# Must run autoconf in js/src
-	cd "${S}"/js/src || die
-	eautoconf old-configure.in
-}
-
-src_configure() {
-	MEXTENSIONS="default"
-	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-	# get your own set of keys.
-	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
-	# Add information about TERM to output (build.log) to aid debugging
-	# blessings problems
-	if [[ -n "${TERM}" ]] ; then
-		einfo "TERM is set to: \"${TERM}\""
-	else
-		einfo "TERM is unset."
-	fi
-
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		strip-unsupported-flags
-	fi
-
-	####################################
-	#
-	# mozconfig, CFLAGS and CXXFLAGS setup
-	#
-	####################################
-
-	mozconfig_init
-	# common config components
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	# Must pass release in order to properly select linker
-	mozconfig_annotate 'Enable by Gentoo' --enable-release
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_annotate "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_annotate "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_annotate "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Add full relro support for hardened
-	if use hardened ; then
-		append-ldflags "-Wl,-z,relro,-z,now"
-		mozconfig_use_enable hardened hardening
-	fi
-
-	# Modifications to better support ARM, bug 553364
-	if use neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_annotate '' --with-thumb=yes
-			mozconfig_annotate '' --with-thumb-interwork=no
-		fi
-	fi
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_annotate '' --with-float-abi=hard
-		if ! use system-libvpx ; then
-			sed -i -e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build
-		fi
-	fi
-
-	mozconfig_use_enable !bindist official-branding
-
-	mozconfig_use_enable debug
-	mozconfig_use_enable debug tests
-	if ! use debug ; then
-		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
-	else
-		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
-	fi
-	# These are enabled by default in all mozilla applications
-	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
-	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include \
-		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-	mozconfig_annotate '' --enable-system-pixman
-	# Instead of the standard --build= and --host=, mozilla uses --host instead
-	# of --build, and --target intstead of --host.
-	# Note, mozilla also has --build but it does not do what you think it does.
-	# Set both --target and --host as mozilla uses python to guess values otherwise
-	mozconfig_annotate '' --target="${CHOST}"
-	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
-	if use system-libevent ; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_annotate '-pulseaudio' --enable-alsa
-	fi
-
-	# Disable built-in ccache support to avoid sandbox violation, #665420
-	# Use FEATURES=ccache instead!
-	mozconfig_annotate '' --without-ccache
-	sed -i -e 's/ccache_stats = None/return None/' \
-		python/mozbuild/mozbuild/controller/building.py || \
-		die "Failed to disable ccache stats call"
-
-	mozconfig_use_enable dbus
-
-	mozconfig_use_enable wifi necko-wifi
-
-	mozconfig_use_enable geckodriver
-
-	# enable JACK, bug 600002
-	mozconfig_use_enable jack
-
-	# Enable/Disable eme support
-	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
-	# Setup api key for location services and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# disable webrtc for now, bug 667642
-	use arm && mozconfig_annotate 'broken on arm' --disable-webrtc
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		mozconfig_annotate 'elf-hack is broken when using Clang' --disable-elf-hack
-	fi
-
-	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
-
-	# Finalize and report settings
-	mozconfig_final
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-		addpredict /etc/gconf
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	cd "${BUILD_OBJ_DIR}" || die
-
-	# Pax mark xpcshell for hardened support, only used for startupcache creation.
-	pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
-	# Add our default prefs for firefox
-	cp "${FILESDIR}"/gentoo-default-prefs.js-2 \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-
-	# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it
-	if use system-harfbuzz ; then
-		echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	# force cairo as the canvas renderer on platforms without skia support
-	if [[ $(tc-endian) == "big" ]] ; then
-		echo "sticky_pref(\"gfx.canvas.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die
-	fi
-
-	# Augment this with hwaccel prefs
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-	fi
-
-	if ! use screenshot ; then
-		echo "pref(\"extensions.screenshots.disabled\", true);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	fi
-
-	echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
-		"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-		|| die
-
-	local plugin
-	use gmp-autoupdate || use eme-free || for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
-		echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
-			"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
-			|| die
-	done
-
-	cd "${S}"
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	DESTDIR="${D}" ./mach install || die
-
-	if use geckodriver ; then
-		cp "${BUILD_OBJ_DIR}"/dist/bin/geckodriver "${ED%/}"${MOZILLA_FIVE_HOME} || die
-		pax-mark m "${ED%/}"${MOZILLA_FIVE_HOME}/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install language packs
-	MOZ_INSTALL_L10N_XPIFILE="1" mozlinguas_src_install
-
-	local size sizes icon_path icon name
-	if use bindist ; then
-		sizes="16 32 48"
-		icon_path="${S}/browser/branding/aurora"
-		# Firefox's new rapid release cycle means no more codenames
-		# Let's just stick with this one...
-		icon="aurora"
-		name="Aurora"
-
-		# Override preferences to set the MOZ_DEV_EDITION defaults, since we
-		# don't define MOZ_DEV_EDITION to avoid profile debaucles.
-		# (source: browser/app/profile/firefox.js)
-		cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF
-pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/");
-sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org");
-sticky_pref("browser.devedition.theme.enabled", true);
-sticky_pref("devtools.theme", "dark");
-PROFILE_EOF
-
-	else
-		sizes="16 22 24 32 48 64 128 256"
-		icon_path="${S}/browser/branding/official"
-		icon="${PN}"
-		name="Mozilla Firefox"
-	fi
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install icons and .desktop for menu entry
-	for size in ${sizes}; do
-		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
-		newins "${icon_path}/default${size}.png" "${icon}.png"
-	done
-	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
-	newicon "${icon_path}/default48.png" "${icon}.png"
-	newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
-	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
-		"${ED}/usr/share/applications/${PN}.desktop" || die
-
-	# Add StartupNotify=true bug 237317
-	if use startup-notification ; then
-		echo "StartupNotify=true"\
-			 >> "${ED}/usr/share/applications/${PN}.desktop" \
-			|| die
-	fi
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	[[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \
-		rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer"
-
-	# firefox and firefox-bin are identical
-	rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
-	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
-
-	# Required in order to use plugins and even run firefox on hardened.
-	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-
-	# if the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# doesn't need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		einfo "APULSE found - Generating library symlinks for sound support"
-		local lib
-		pushd "${ED}"${MOZILLA_FIVE_HOME} &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# a quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	if ! use gmp-autoupdate && ! use eme-free ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.9" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 3dcbdec3d1d4..b2a55ee85716 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_77.0.3865.70-1_amd64.deb 64112516 BLAKE2B a4739181ce829858d460d88e8864c611ef8a945dde87225cf4e80a5dd6cb04da373cc1043598cec96ea7f5750a6dcc102ca1e5a3eb85ad05894ff17ba958a59e SHA512 b043975754ebbf92aecd553935a73ac7f1b2fe5ab2154fff18996597a5682d208496c63c230cec9e5ff5a506c93168ecfc3acd07ad25a68e350678d85b9870f0
-EBUILD google-chrome-beta-77.0.3865.70.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740
+DIST google-chrome-beta_77.0.3865.75-1_amd64.deb 64103536 BLAKE2B 443200b8c821ed9c239fef08a8d97338033629bf2c5227240056d35a3a946fb97fe2b538a2e2d9fb14c01364c6ce59a82dc684eb522107dc129540c093d158b1 SHA512 524924bb88d601e86824067c6f4deca436e0af9d7d30ba68d2f2a857625c75ada8808dc3907dadd87a7a44ce88efb9dd058084be1a70c0f93142c041f4736d7a
+EBUILD google-chrome-beta-77.0.3865.75.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-beta/google-chrome-beta-77.0.3865.70.ebuild b/www-client/google-chrome-beta/google-chrome-beta-77.0.3865.75.ebuild
index fa060d36e118..fa060d36e118 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-77.0.3865.70.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-77.0.3865.75.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 102275f49798..0d0f2972e056 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_78.0.3902.4-1_amd64.deb 62088460 BLAKE2B 45fbcdf6664266179f0a1404e573b04b947899b6b3fc8c1463c1ccdddcee09e3102a6813686f9131918adab2bf41906b9d0c3032517c53677e6ae6582d6e29cb SHA512 4b98a0deeaa4a3c5266a7a1eafd84dc7ec6d21219abf095750aaba067db1877ee91ac30190954a746db313c07e9c55e90e67ab25d9cb2266c5bc5db160ea66e5
-EBUILD google-chrome-unstable-78.0.3902.4.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740
+DIST google-chrome-unstable_78.0.3904.9-1_amd64.deb 61900668 BLAKE2B a52062dd94887243bcc98df4001f762ff2552454aa81a07b50acce047f8035ad9f772d8d4c936a6994c46a8121c503bb527bb5f89485a770e576a236de91fd00 SHA512 c88acb643e14e63efb42ef2d45357377d02d6e48232e16cf02f0586357405f72ada593ab0bc465a4a96dff7d4fc820582f2aaf77c782ee288049b2d0a1780316
+EBUILD google-chrome-unstable-78.0.3904.9.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-78.0.3902.4.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-78.0.3904.9.ebuild
index fa060d36e118..fa060d36e118 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-78.0.3902.4.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-78.0.3904.9.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index a3d02914b68f..b06c017527ef 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-stable_76.0.3809.132-1_amd64.deb 59170956 BLAKE2B 3eea5ff9c3bafa4c4e7f0dd27a8f85a505f2c8a7260f6c517264343c57ddddeb0694e66203622c01d19f89f01c90a384255eaabf2c43e62c7a510e379f3c0a73 SHA512 c93aa39776ae5ca3f24092668c5d3e7fd873ce1b0ce05fa9a5d8a4a164981cf9cb4724a368026cab2475467bc0c85247626ac4f859d6e71f3072af9b7f8f1393
-EBUILD google-chrome-76.0.3809.132.ebuild 2896 BLAKE2B b8480582d335c83bda8c86e6f29c196da1d282a457384faf320ed140e23a4f1a8b52f451701eb642b3b12e069289e3b9b2df89b6a79952264ea989e94250d797 SHA512 dd240b9d09c10b4c2da081e1cc22b9d31d22fe46ec4ae534ae67e731acf43e2e679f31bb2d78f6db5dd9b3ab60925c6e62a17e27ed8994b9eb8f65dd13ed5dfa
+DIST google-chrome-stable_77.0.3865.75-1_amd64.deb 62302944 BLAKE2B d4231928ff823e5c89339ff8327d9851b89f52761d9a8998f077535183476b6f39b948ac2604e4e3631b20ef25f985fb1d3fad0f7ea00ca97aba5fb58868a80d SHA512 b239fbf5549da67d900a605a62999900f9f3c8cd2f4ad9c55dcc91b20fda351ba82845ee908cc17daa8678ddacc01a3b2795adccf075ce22c9811667c3ca3216
+EBUILD google-chrome-77.0.3865.75.ebuild 2893 BLAKE2B 210ef750c01f045089344e3496cd92e3e04f70a4588204e983e3c5a45c16cb06c6c9d29f9ad39fd9e88649b41020fc509f4380d731020ac191516272f915585b SHA512 d7b84fc537be62fbd73fc591021cb8196fcdd3ed8783acf5700d1ebc3b11bb666f4cb0e9cc8cce2d09c130f3162cba0a650404f76cbe191d42a88b5e1d37a740
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome/google-chrome-76.0.3809.132.ebuild b/www-client/google-chrome/google-chrome-76.0.3809.132.ebuild
deleted file mode 100644
index e75218fcde20..000000000000
--- a/www-client/google-chrome/google-chrome-76.0.3809.132.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="https://www.google.com/chrome"
-
-if [[ ${PN} == google-chrome ]]; then
-	KEYWORDS="-* amd64"
-	MY_PN=${PN}-stable
-else
-	KEYWORDS="-* ~amd64"
-	MY_PN=${PN}
-fi
-
-MY_P="${MY_PN}_${PV}-1"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-
-LICENSE="google-chrome"
-SLOT="0"
-RESTRICT="bindist mirror strip"
-
-DEPEND=""
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	>=dev-libs/nss-3.26
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype:2
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	>=x11-libs/libX11-1.5.0
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	x11-libs/libxcb
-	x11-libs/pango
-	x11-misc/xdg-utils
-"
-
-QA_PREBUILT="*"
-QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
-S=${WORKDIR}
-CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
-}
-
-pkg_pretend() {
-	# Protect against people using autounmask overzealously
-	use amd64 || die "google-chrome only works on amd64"
-}
-
-pkg_setup() {
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	dodir /
-	cd "${ED}" || die
-	unpacker
-
-	rm -r etc usr/share/menu || die
-	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
-
-	gzip -d usr/share/doc/${PF}/changelog.gz || die
-	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
-	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
-		rm usr/share/man/man1/google-chrome.1.gz || die
-		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
-	fi
-
-	pushd "${CHROME_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	local suffix=
-	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
-	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
-	done
-
-	pax-mark m "${CHROME_HOME}/chrome"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/www-client/google-chrome/google-chrome-77.0.3865.75.ebuild b/www-client/google-chrome/google-chrome-77.0.3865.75.ebuild
new file mode 100644
index 000000000000..fa060d36e118
--- /dev/null
+++ b/www-client/google-chrome/google-chrome-77.0.3865.75.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2011-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Google"
+HOMEPAGE="https://www.google.com/chrome"
+
+if [[ ${PN} == google-chrome ]]; then
+	KEYWORDS="-* amd64"
+	MY_PN=${PN}-stable
+else
+	KEYWORDS="-* ~amd64"
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="google-chrome"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+DEPEND=""
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	>=dev-libs/nss-3.26
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	>=x11-libs/libX11-1.5.0
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libxcb
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop"
+S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "google-chrome only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+	if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then
+		rm usr/share/man/man1/google-chrome.1.gz || die
+		dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1
+	fi
+
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	local suffix=
+	[[ ${PN} == google-chrome-beta ]] && suffix=_beta
+	[[ ${PN} == google-chrome-unstable ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${CHROME_HOME}/chrome"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 0c58654404cb..d2be2fd8d627 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,3 +1,5 @@
 DIST midori-v7.0.tar.gz 1827341 BLAKE2B e008be32851a3ee12744b7b4e686545a2f9cd84fc6f05a647744c512ea5286fdc1db3b1ec40f546208ffbca4ca8a179752f27b85d9060765a7612ac7c260c67f SHA512 4110d1566ba8b0979c29f1c3a95af3da4cba884f44a1305403d8951f7f2dfb17946c3c7326eebafc111738950c907d06cc6c54ce670cde321da890d8b9ced051
+DIST midori-v9.0.tar.gz 1902467 BLAKE2B 0a6b46bddd0286c56d3f30b429dc46f90177931f8c596912183ed990124b831b5407807e2693e3b5e0d02074386b46e98823b33f6e785963b9507742bac58763 SHA512 0cc28643593f53c47b453838152dcbe35a9a287bff38bda830844eb8f321a4f48c99b21e16a9b07bebdd0abc936d88fd759c3222a36325aa667a28ae00148be3
 EBUILD midori-7.0.ebuild 1271 BLAKE2B 4175ad4b6471b44e1e0d11087d1cf8f9fbc6d514ed30f800f1fe5317c4d10c49b96e8c6a893210b3bcca9b9f10293409ae1016f92b7a5601241e8ba389c37d25 SHA512 8932fe6d44d4c6e687af849bd2e5e1832e84d93ba937a7e2b49fc4724022939f4d2c046c1d1de3e1779237fe1c3b545e0b4fc4e3b67fd897b25659de21d4db89
+EBUILD midori-9.0.ebuild 1287 BLAKE2B dc3cac29933148990e22b151c1a846ae7146e7fcf4f7ab35a616c23da2ce015e1e8ab00e33abbcc5a4d8a9433f3208368e283670da69dc07f3a35ac0cf7dcaf2 SHA512 56d432c3810e9437e3db9e9d2262936e3e2688cd3144121d3e28f8f79167f24a14bcac4bc3b33bcd59cd17966e6005bf751abdb5eb08601452df67fa648809eb
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/www-client/midori/midori-9.0.ebuild b/www-client/midori/midori-9.0.ebuild
new file mode 100644
index 000000000000..436f97ec9ee3
--- /dev/null
+++ b/www-client/midori/midori-9.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION=0.36
+
+inherit cmake-utils vala xdg-utils
+
+MY_P=${PN}-v${PV}
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="https://www.midori-browser.org/"
+SRC_URI="https://github.com/midori-browser/core/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/libarchive:=
+	>=app-crypt/gcr-3:=[gtk,vala]
+	>=dev-db/sqlite-3.6.19:3
+	>=dev-libs/glib-2.46.2:2
+	>=dev-libs/json-glib-0.12
+	dev-libs/libpeas[gtk]
+	dev-libs/libxml2
+	>=net-libs/libsoup-2.38:2.4[vala]
+	>=net-libs/webkit-gtk-2.16.6:4[introspection]
+	>=x11-libs/libnotify-0.7
+	>=x11-libs/gtk+-3.12.0:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	vala_src_prepare
+	sed -i -e '/^install/s:COPYING::' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DVALA_EXECUTABLE="${VALAC}"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 106996599fd0..a85c276d05d3 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,3 +1,5 @@
+DIST opera-beta_64.0.3417.11_amd64.deb 67591076 BLAKE2B 2826b68521274ef148c88f16bd19659826bd013a82bb84b6d4ca9317cb1ab121c2fdcd7ecb51fdb368f5ba87671b721f21701838688c1dc236a386cd1ae2571e SHA512 3110c502cf3bb74f5122e9d97ef9d278e1aaab24aeb42da989705efed85dd05815e0b4b2004e6e9d7c01aa7acae8b035a83bb32449a514ec833ac5d803b98fe3
 DIST opera-beta_64.0.3417.8_amd64.deb 66468202 BLAKE2B cacfce4db714ef83e7130bb2d5729541aa4e86d1645e0b80009c7b6a354fbf459976a692b4b24a5f5a4afabb292a87f5be8c5b1f74d6ac5ba0e2724f2bc52569 SHA512 783d875986f0ca64bbe049370cac718982075412fa07e27830452b0b6df630f9121add83caa5dae5758bf6f67d71876aea36ef0011739eaf98980bb053680569
+EBUILD opera-beta-64.0.3417.11.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
 EBUILD opera-beta-64.0.3417.8.ebuild 2293 BLAKE2B c066b5914d30363a90495d6dacbdfa2090a720d2d64828cb224282cdf21f935cb3f3a330afbd2b043d00918f6ad2ac1ce43c9e352b3769e3030f3a30c5c24f2c SHA512 7f1000de9030346e28f01ba876fa6596cd80f6cca6cb764a4d74db8b197d0af0c8e33219d4fed078e78e72b3ba2ed383b276ad7133d09edf0134a61cfce44e12
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-64.0.3417.11.ebuild b/www-client/opera-beta/opera-beta-64.0.3417.11.ebuild
new file mode 100644
index 000000000000..59a8587ec4bd
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-64.0.3417.11.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+pkg_setup() {
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index a8e8fe0fa9f7..9acb77090fa1 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_65.0.3425.0_amd64.deb 66352440 BLAKE2B 3c7cdd6cab22d1334e9fcda0cd3fd9be106b22988edd5dd8b98300e74c46e4acbf3d765898e91f8e4d847a92b0553d6a9d567ecfa7e2c10523c51964b1043845 SHA512 8fa0a787e9b3bfed900e08eb67b86ba5f7a650357215920aca743c193c5fb167a00683719487bdde44967c66dd1617951ad7db41d79d64458c768dc3c75bfc54
 DIST opera-developer_65.0.3430.0_amd64.deb 66348184 BLAKE2B 728ace2befaa4a252a2178db06ac1715483a732b4d3484c4322441eae4515a8ec6c126cfe8f7943361d64236211f81ec40fbd25adafa86ca21aa1086493c8f30 SHA512 dc8f4e03546eadbd3b7827c4ea976d03ea7f59b6def40a007933cee4ccc761c8c869471797263f39fd2fd5f24625b34fe4d55dd46309daa4d1cc77d0fbb99827
-EBUILD opera-developer-65.0.3425.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
+DIST opera-developer_65.0.3437.0_amd64.deb 67898864 BLAKE2B 464e41d39caf40b21292ef42f13c86ac603b5662da6f1fca82a8caa6eb8ea29b51941227cf9bb3cb4bc204c5786675ca5b410f4f176070bf2d88642a26510e40 SHA512 9d902b2d952be4b481b3bda4a4fc770ff974931310bff49911f4f600539a32ad95c370bf61a45ea8a349322a9f00a9e68188c566b897acbe16bf3d795b861bb5
 EBUILD opera-developer-65.0.3430.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
+EBUILD opera-developer-65.0.3437.0.ebuild 2293 BLAKE2B 6124beabd01bd27eff345855d147c87368eb6753c616cd0e95195daa428bf02f9694ca924162460aa28a30d62fb3fb58fea7bf5f76a72108c97f1d1421cda163 SHA512 d785b798f471e869faa4a92e2b431d1321d10bafc1cda02f4e92d3a70a1ed68f007f0bb68632d9c32980098a4bf0ef7acc812d07bab02fbdeb5c173235421c03
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-65.0.3425.0.ebuild b/www-client/opera-developer/opera-developer-65.0.3437.0.ebuild
index 132f88d22363..132f88d22363 100644
--- a/www-client/opera-developer/opera-developer-65.0.3425.0.ebuild
+++ b/www-client/opera-developer/opera-developer-65.0.3437.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 3770779e85e3..fc742c0a0726 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,5 +1,5 @@
-DIST opera-stable_63.0.3368.53_amd64.deb 60374636 BLAKE2B 4cb6726f275504972d5d97b8fdde1d96f9d122a31e241914cd3f62a0e2eb94d25ada8e1ad10b4416456dfd173d01e680134a94ae2a68b1ab087fbe78d36558d1 SHA512 f3d89f4a7857b76cab2480efb2c43d9997b110a049a9a8a84509d05a35d691e12b9ffd58e5e85f2ee6520ee172662008d6d021653807df49638931ac1e7f6eb9
 DIST opera-stable_63.0.3368.66_amd64.deb 60668118 BLAKE2B b580a6e946c02bf4fb549a511b11a4c7f5edd18061428f154204e798d35e8c5488c441602a344895e06b4275c4d61c069566a022497499cbd12f9cef511376ec SHA512 4877f8582afb0edbdee4e03adc60c586ca063f863b64139bbbac156800e9f3ca81505944f56434f6f227a6bff49eec68a25c7281174d482dbe34b474099d494b
-EBUILD opera-63.0.3368.53.ebuild 2283 BLAKE2B 9ae44a98f7d4631a10ef1178ee4ecddb7fbf18ca1ea0398132470f5210819f711c44c2bb9b66e629363fd2ac184533ea8fd42c8f6a6957777a0a286294d3942e SHA512 77ef1f88d31a043dd6f786dafcd9c110916bd4cd4c1ed11548a429cc91e3edf47beec5ac73148c1c4265a019f378dba1289903040f623939f87bd6b00f55e6b3
-EBUILD opera-63.0.3368.66.ebuild 2284 BLAKE2B 156eb6922c60ae7be4f229911315969b149b356f969c1949e4c169662b1bea23c2900870f25b02a96fd1f9325a7ece296dcdc4e8baab4fd9daa5fcf91ff82327 SHA512 17e8f2a02a120d69e7b35f9a2d3f896595d541322c32a42a1deae3c913ca5de06b33bda04fd1925878adf403e2d096563703afa3b95e89765bac1b4cdda43891
+DIST opera-stable_63.0.3368.88_amd64.deb 61078938 BLAKE2B 37b402e51f23304f4e67a66d5765b4db13940a50b317d24a50376f8cc1ef8b9fadfc58c70b498be5e04ad28ffa675bf5e7e33031f265bae791377647ec61b26b SHA512 40743f01cc50dff851f303067d565f53757c4280d59fd2e9abf6de4c4016c9a0c3d1620dda06d9bbdcc40925c0f681960db43bb5a9fdd20d0d402153cdd7446b
+EBUILD opera-63.0.3368.66.ebuild 2283 BLAKE2B 9ae44a98f7d4631a10ef1178ee4ecddb7fbf18ca1ea0398132470f5210819f711c44c2bb9b66e629363fd2ac184533ea8fd42c8f6a6957777a0a286294d3942e SHA512 77ef1f88d31a043dd6f786dafcd9c110916bd4cd4c1ed11548a429cc91e3edf47beec5ac73148c1c4265a019f378dba1289903040f623939f87bd6b00f55e6b3
+EBUILD opera-63.0.3368.88.ebuild 2284 BLAKE2B 156eb6922c60ae7be4f229911315969b149b356f969c1949e4c169662b1bea23c2900870f25b02a96fd1f9325a7ece296dcdc4e8baab4fd9daa5fcf91ff82327 SHA512 17e8f2a02a120d69e7b35f9a2d3f896595d541322c32a42a1deae3c913ca5de06b33bda04fd1925878adf403e2d096563703afa3b95e89765bac1b4cdda43891
 MISC metadata.xml 446 BLAKE2B dbd473cdfed1e48919a7d03f61999b3bbeb294a8ab917bb438b52dcffc304d6cd954f79817b0a73a396a9d153eb5917cfba1c1bd33e419918dc8b9a5dc449379 SHA512 42d93f4994820e8ca5f6d56a94709f8194046395f9aff8f445ce2f80777a43763c124a4ab514bab55751c6a651c9d0002c61c92d77bf9c841ef9e112abd26105
diff --git a/www-client/opera/opera-63.0.3368.53.ebuild b/www-client/opera/opera-63.0.3368.53.ebuild
deleted file mode 100644
index b28807261d09..000000000000
--- a/www-client/opera/opera-63.0.3368.53.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
-	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-
-"
-inherit chromium-2 multilib unpacker xdg-utils
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
-	https://download1.operacdn.com/pub/
-	https://download2.operacdn.com/pub/
-	https://download3.operacdn.com/pub/
-	https://download4.operacdn.com/pub/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
-	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}-stable/copyright || die
-	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	pushd "${OPERA_HOME}"/localization > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	rm "${OPERA_HOME}"/${PN}_autoupdate || die
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera/opera-63.0.3368.66.ebuild b/www-client/opera/opera-63.0.3368.66.ebuild
index eec568e74cf4..b28807261d09 100644
--- a/www-client/opera/opera-63.0.3368.66.ebuild
+++ b/www-client/opera/opera-63.0.3368.66.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
 "
 done
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/www-client/opera/opera-63.0.3368.88.ebuild b/www-client/opera/opera-63.0.3368.88.ebuild
new file mode 100644
index 000000000000..eec568e74cf4
--- /dev/null
+++ b/www-client/opera/opera-63.0.3368.88.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
+	it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+
+"
+inherit chromium-2 multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
+"
+done
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}-stable/copyright || die
+	mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	pushd "${OPERA_HOME}"/localization > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	rm "${OPERA_HOME}"/${PN}_autoupdate || die
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-client/ripe-atlas-cousteau/Manifest b/www-client/ripe-atlas-cousteau/Manifest
index 7d1127c56165..f9f60a1cf82d 100644
--- a/www-client/ripe-atlas-cousteau/Manifest
+++ b/www-client/ripe-atlas-cousteau/Manifest
@@ -1,7 +1,3 @@
-DIST ripe.atlas.cousteau-1.0.6.tar.gz 45467 BLAKE2B fde909f74e6a2d32712d747c92d3e7aefdf882531bde9912e26aa2e5b4f3736d333ccf6bb0d225111baf81ee4d671f861a429ce4542ee6f1c3d73c07f275416e SHA512 212c9890af269f945d01a1b587ba87583cbde87ce0a64b09e053644f9fa4cd01414a1092a39d0d21d68b3bd5977e0159c6a32196aaadbd78940fd4675b791daf
-DIST ripe.atlas.cousteau-1.0.7.tar.gz 45757 BLAKE2B 6bce4a9e1fbcdf595cb8a40cca8ee5aa69e05c840fe8c9bf03bae4d6f1e82857d3aee8a3ca12c5f1d4f6df9c4608af4bf6939cb2fcd2c4cad30f6d6b880637f0 SHA512 921526beef43b666f6c64480e14f3d9d73e980ea6696964791c8f663c218f2c1c5658f2d9dc9ef4e9d40687b244d98b7775b3eeda74bd4886842f18e073765de
 DIST ripe.atlas.cousteau-1.2.tar.gz 47015 BLAKE2B 722ebc41a221f64784fbc2535c2727c0f2e7559e6460c6ee1453b17c739562c0b44047ccf24b2d4aa93d3911d7f9be6d43df4464524135d7efd1829b29689417 SHA512 06df80499aa3696450396b1dec66360b3996d56c98dbec52d9192c8e2442a63f3cc334a815a4615d5f9d87fc3f0facb26875f2ad3a5cdbd5047aaad506974c8e
-EBUILD ripe-atlas-cousteau-1.0.6.ebuild 917 BLAKE2B 008e7505e7eed23cdb9620dd48a867a7448da782263799cb3d0211dcecf325505cce9029918a7c06d83cb5c0e2138a79598bd71ccd5c9ac90de4985f3e517d44 SHA512 42b5f8124af5c1b9ed18b00d369003d1da3aa6b7b552160b5a145cd8676ae0b94afd3f7e91d71dfcc55479f1e7457a241565b0329410348dc934b676fd692daa
-EBUILD ripe-atlas-cousteau-1.0.7.ebuild 915 BLAKE2B e5d12cd4d81dd848b2bd6f95622adab93c053f62f30bcc68b606d6c4d234b8b1de0383986070895e45bc6c9280998cbeb5548ff29b620861b0df9128790a6b22 SHA512 f88c34f6a6c1e87d62c1fff5ac2b9d954223141d5f8a9cc971861ea6d82b3bc9256cce3af068fda0d1bf2052ebbef34e49ff156172689c7bfa8e2b600e3ed170
 EBUILD ripe-atlas-cousteau-1.2.ebuild 961 BLAKE2B f9b387d8b56119c02b0b96610628849f627759a04b221fe990b1f6d605aff4dc009502d9b074ab8fe00b1bcfc3c1a108cc8917d4cd7bdf43b5b99092f4e3f3cc SHA512 633b6117d778f968ed305b633d706d9e4d084d3582b19a2c3512ff97863ece3fd662e5c6d15558807b0a7c30641a12b72edfe4eae2e86da1f6fb2dd4536a7f54
 MISC metadata.xml 248 BLAKE2B 5e5244a307c5e42549d6b8c6695a3807edbc8c98b0b097804e9d522d830277e2afec1e773d273f87b2ecf135e19249588168d13ad9de4f5379081ab81a391d57 SHA512 619ebf760d3244f9438e998eaa002dcd66b8fe0cdde43c8c672969bc9b772995a5e727b526ec1e895793977095c6d1158c039dd8cc0c6b35a6f1595e24b9a9d3
diff --git a/www-client/ripe-atlas-cousteau/ripe-atlas-cousteau-1.0.6.ebuild b/www-client/ripe-atlas-cousteau/ripe-atlas-cousteau-1.0.6.ebuild
deleted file mode 100644
index 330f825d3b78..000000000000
--- a/www-client/ripe-atlas-cousteau/ripe-atlas-cousteau-1.0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="A Python wrapper around the RIPE Atlas API"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.cousteau/ripe.atlas.cousteau-${PVR}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-RDEPEND="
-	>=dev-python/socketio-client-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		"${RDEPEND}"
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
diff --git a/www-client/ripe-atlas-cousteau/ripe-atlas-cousteau-1.0.7.ebuild b/www-client/ripe-atlas-cousteau/ripe-atlas-cousteau-1.0.7.ebuild
deleted file mode 100644
index 80a11014143b..000000000000
--- a/www-client/ripe-atlas-cousteau/ripe-atlas-cousteau-1.0.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/.}
-DESCRIPTION="A Python wrapper around the RIPE Atlas API"
-HOMEPAGE="https://atlas.ripe.net/"
-SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.cousteau/ripe.atlas.cousteau-${PVR}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_PN}-${PVR}"
-
-RDEPEND="
-	>=dev-python/socketio-client-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		"${RDEPEND}"
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-python_test() {
-	nosetests --verbose || die "Tests failed with ${EPYTHON}"
-}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 5fefd50c9933..f72f798ff5cc 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,8 +1,9 @@
-DIST vivaldi-snapshot-2.8.1650.3_p1-amd64.deb 64441352 BLAKE2B bd58e560f4119cd9b25795ee2e32d890795cc816cd8d7865dbed3039bebabe88dcc521b75ebe9b2182eda75efdf0619a21d4854fb6d5d3bfcc5312481f9abc43 SHA512 eaebd3a2d718490d73f5b02c37c4bb0f04c68923268325df8f1cc79474ffacd07f48dbe5789a3c3ace03a0a19e2395c147996cb5c199dc4d13af8d190b655fc8
-DIST vivaldi-snapshot-2.8.1650.3_p1-arm64.deb 57594708 BLAKE2B e60c2dedb9d8cde365611ee4ea6b69d6c31ab430901428ab6e6d28421b6444fdd93547405f297b32ac42d00e49c9ff405b36d2c291f748d1be5b84091ca7f5e0 SHA512 70a110bd62ef0222aa532945815c8a73b9c6e7dd213dab07ee4bff9aa3c0989ea78608fa84645d4df9c8c510bd45e83372bd896bfbfd14bc232fd05c4a9c4212
-DIST vivaldi-snapshot-2.8.1650.3_p1-i386.deb 62803076 BLAKE2B 31195dfcf5727e484c3b7b172c8ca3acefaf81a595c81b179cff1937112b0d92a527c197b326e14d81a530bfd5cf6de2bda0ba112cf64e669028670a993a906e SHA512 ea08c75a538250881091291e98bae348dbe4e0cf5ae2a494c63c5c21dc84fd5b9b4389f72566bb666d4661dcc63f8585afc454094c17c282a66c3aca4b83daee
-DIST vivaldi-snapshot-2.8.1657.8_p1-amd64.deb 64435440 BLAKE2B b9f4c90dd3a48bd58a2d5d16bac4f7f8f1ac19bedd13bebbfed530df6e41550d17ffbb335109f8565b58b652033148b6524e17eaf1977f72ddb71a5426ebbc9f SHA512 e4950b3afd5b75e43dc1251134c677e4e25958ad1c6836906e3c13e2091c7a3d1b657a27303f98127710932c493ea8986542215fca3c7295dadb69923e3a7cf5
-DIST vivaldi-snapshot-2.8.1657.8_p1-i386.deb 62724372 BLAKE2B afec699ed1b59d5ba545d6facc6993719ec906f67068b2b8fac6c06f993d3b7b72eeac2479b66c8a8348fe1c9e67ec7b0a9a67b218871fa424e3db43a2019876 SHA512 ffec22b9df7947e6063d8c25aa0ea8182aafffe025193f58e819f2cbb7a008ec2534e1834a0753e8ed2928af6a5fa04864793b189031d528f2939da777c4fbf7
-EBUILD vivaldi-snapshot-2.8.1650.3_p1.ebuild 2558 BLAKE2B 0112466ce4abb940cd992c851e1cc9f272f5ce2f5a5cee385be42b3a0c4605585ac22818883e806b35b120872129e108739a0c471b2e73c549202ebae87f5369 SHA512 7bdb369ed0d80eca18af3605edf09b300ae646680a30fc9021b7e1d8a43e4b8ffc658a42bb710ad45ce8672c3ec8543ec442ab0e657cb5e7fbb00bf1baa9ca78
-EBUILD vivaldi-snapshot-2.8.1657.8_p1.ebuild 2492 BLAKE2B 1c7a275ff001fe6028ade2f7ee6b89886435023c88727316d305f29e24692b049b8312933f4cdabf9d706f4febee7cf034e0af62b287ed96f4d301494d446a5c SHA512 69c23601b00de50cb277842a9cdce832d888f4a50b9270844a057ef93618035d0bd48ebf4242a57d919b7c8bc040d71fccb0b1467642368dbc3d71836bb0ad42
+DIST vivaldi-snapshot-2.8.1662.4_p1-amd64.deb 64473408 BLAKE2B 75dc4cfcb844fc4fa6730a125084c3efb644f435ccca553312a3b71a21ea60f5eb012f315c087edfb3349a3123cab8acd2b1d5e9f2aff18a8d9e764eafaa9677 SHA512 62914638e2e6cdef5f9075b977fef693492793173b45cb5bfea7ef44419a0db6ec1d0d9a77dd4ceda999029b5d5dd574210363a44ad72bad62f4af1fd937eb36
+DIST vivaldi-snapshot-2.8.1662.4_p1-arm64.deb 57681488 BLAKE2B b2c2db3da90fe5cdd30b9d5b43153066499f38f9ba49e68f2903f9ea9ea85617406fa81feff8f0785bca008d4d3ed639aff5799fbaf1a9dc211e410f55b97d1e SHA512 816795edf23cf863dbe3aaacdf9188f6c11172d20edc9a1138f2e20d963d95fbff1dc587fe47ce057b571bbcb50aa31f4b155199151b47ab568fddacdea1cd26
+DIST vivaldi-snapshot-2.8.1662.4_p1-i386.deb 62760156 BLAKE2B e5595de66d5940d14e53e0c78f25c7347378be18ee9e3af8563c5f75518f99df62a4383df63582f49765500c31f9996e23bba3b7522789e574da3f91ff3ad573 SHA512 f4e28e7ab6558a2189a2916d32f9f391403b97d4156c317f1e33bacd05efc5a8448b04b4dc0371c09717b6669531ec6ca3623401877e8e873859fad881b74f88
+DIST vivaldi-snapshot-2.8.1664.4_p1-amd64.deb 64446980 BLAKE2B 6ece15767fdc7d7efaacdb00f3ce74341dd2abeddfbf1ffdade2d2573fdf67addc79315abe273be674109df4e73c88643604bc8a6f4cd0c3d75b4067fb42ac26 SHA512 f88836297e122a98531ae7b6e0e19eb9b2ffcfee1558dbaebcb292c8e5a418d6c864b45c5a569c737756c16f686b303387d2bb49d82fddb28ba36ab0e3080d4d
+DIST vivaldi-snapshot-2.8.1664.4_p1-arm64.deb 57674972 BLAKE2B 3c87b7c8511dc1603694fd3e1021d9f3ae2a2b790de96cb2270e5ae600276bb036d46ca571f76cb5920100244ecefb142d329c178b50628130be276128595217 SHA512 4831a48b14a8d76dcc2e320b6710b63dd22ca182929b086e99c73af51497ee68733d7dd30a2af83a4737e45f48f0fcf6c962096388d75fbfb1af54d678695445
+DIST vivaldi-snapshot-2.8.1664.4_p1-i386.deb 62750860 BLAKE2B 19f0795a016f9d169f10eba39737ae4ef55b24d10ffc7ec4ab658e1b96274fd131392cec02edfc3fcf75484a426d0a177c57a4ca88715635fd61fc55eb85592e SHA512 f00fc5db598c8799ca6bee9548a8d8279dbf9ed643a73fda6570511053206712e4ee6978dedd6cec271fada69e33525ecc6a6fd16c0081efbf16f349a6989faa
+EBUILD vivaldi-snapshot-2.8.1662.4_p1.ebuild 2558 BLAKE2B 0112466ce4abb940cd992c851e1cc9f272f5ce2f5a5cee385be42b3a0c4605585ac22818883e806b35b120872129e108739a0c471b2e73c549202ebae87f5369 SHA512 7bdb369ed0d80eca18af3605edf09b300ae646680a30fc9021b7e1d8a43e4b8ffc658a42bb710ad45ce8672c3ec8543ec442ab0e657cb5e7fbb00bf1baa9ca78
+EBUILD vivaldi-snapshot-2.8.1664.4_p1.ebuild 2558 BLAKE2B 0112466ce4abb940cd992c851e1cc9f272f5ce2f5a5cee385be42b3a0c4605585ac22818883e806b35b120872129e108739a0c471b2e73c549202ebae87f5369 SHA512 7bdb369ed0d80eca18af3605edf09b300ae646680a30fc9021b7e1d8a43e4b8ffc658a42bb710ad45ce8672c3ec8543ec442ab0e657cb5e7fbb00bf1baa9ca78
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1657.8_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1657.8_p1.ebuild
deleted file mode 100644
index d13b8e785846..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1657.8_p1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu fa fi
-	fil fr fy gd gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
-	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
-
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${PN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1650.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1662.4_p1.ebuild
index 3777ea957e1e..3777ea957e1e 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1650.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1662.4_p1.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1664.4_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1664.4_p1.ebuild
new file mode 100644
index 000000000000..3777ea957e1e
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.8.1664.4_p1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu fa fi
+	fil fr fy gd gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
+	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	chmod 0755 usr/share/doc/${PF} || die
+
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm \
+		_gpgbuilder \
+		etc/cron.daily/${PN} \
+		${VIVALDI_HOME}/libwidevinecdm.so \
+		|| die
+	rmdir \
+		etc/cron.daily/ \
+		etc/ \
+		|| die
+
+	local c d
+	for d in 16 22 24 32 48 64 128 256; do
+		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+		cp \
+			${VIVALDI_HOME}/product_logo_${d}.png \
+			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+	done
+
+	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 765da4cf7a60..620d25abdbd2 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,9 +1,5 @@
-DIST vivaldi-2.7.1628.30_p1-amd64.deb 61729696 BLAKE2B acf5b3f9405122191655dc90be39ed1beb41d98d0f89596f731402caea0df32b4e806669cdc629bddcf8aeb301fddf62c3dfd88a8890178b3903682846a4a7bd SHA512 66fc19193c45ecec87b7a2e57650d14bdc3760d0334d72e2908c39ad1b0fcf7a3f90f03683680d0a957cd449848e569a3e12f7a28f1bf709d340973bd6aa6607
-DIST vivaldi-2.7.1628.30_p1-armhf.deb 54616352 BLAKE2B 1b11e52d25bfe67e408ec42cea3b6ab6a8bbadabb97734ee42a81473ccb6d15582e731d81560703969333c180a745eac3e810ad5439faf6629e45bab33815622 SHA512 a32571579c97ed5227985c698ac1812b4b079b16bb82e9994ee1519bb8206bc235d0a4e01b165e6e8691ed56adb0f3a2fc4c5bfad15194b248db265d643259ea
-DIST vivaldi-2.7.1628.30_p1-i386.deb 60218100 BLAKE2B e9cf2fa0b9c6dbb38df1807d8462dc7d6012db4dd1c279f963e1ce4954ebd1f36713be7c3d4d0c5896e243dfafd89303a2456919a686d28e5e77e702ec29d57d SHA512 8c4d6074ca35e8181a901cddb4412418b3a3c3981220d08e71ea3783508b649fd3e1f4b9d1c7f4bfd1ec713a04be609336345a5cab13d303eb61dbfb0c872ad1
 DIST vivaldi-2.7.1628.33_p1-amd64.deb 61738688 BLAKE2B cb685ced9184a252deb203cc70296b8ea3c7e47bf12a43f12c3a636ada2dce81df340bbdec07271aa3832396e446dc93ebee4123290509b8c8d6c5bca64c28fe SHA512 5c098335e79aa2eb17bce6fa5bfdbf1713050b8fb90d412b218dcd39fcd5f597e7a41bff81eb783f32712261e9bd2333777c6fd1f9d246d60fb5d1e8460a0077
 DIST vivaldi-2.7.1628.33_p1-armhf.deb 54632760 BLAKE2B aafebbf2c406e860676e95f13ffb86c5d887f78c6860315cd9921e4682064a04db9620d524efafbe0d83d94d25472d9723f725ae1d78d3486b9eff985259b529 SHA512 db35c67911093d11c48bcf9bbe404a5d9ff362afb7dd53c782201d5b5a733af0cc88f9dbcdcceb7f3587b4fe651f40529d2167ca335c96cd80d957794a6666f3
 DIST vivaldi-2.7.1628.33_p1-i386.deb 60221768 BLAKE2B 448b2ed57f6770fe378deec0024368274ca05bd767afa10f537386d5a1afeb54a0fcff976b108ab87b62a410a40578f4be8e184511bc04afd74bcce5d6d6885b SHA512 b8abd46b13d5ded6b3e8856cd5fe749a39f672094adcfb8b7a32d6fceb7c4a7b07cfa00cc69b9160d2190a21276296e61dc6ebe82adf7dc66c28a461d3782b88
-EBUILD vivaldi-2.7.1628.30_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
-EBUILD vivaldi-2.7.1628.33_p1.ebuild 2900 BLAKE2B 7adba11b98e251040fbab8239a89e82d65beb1f157be0de612f11e6b0b0866c42c3718198e59d3db5d46473c727a64505e7b8c20f648831d0c6bcf9ad69545af SHA512 947799d605ac25bf48c59453ff92414db1f0202169892b727161647eedc9a50ca30aa325df5417eb289370feb53ef46f1d7d90af95116e9be8eb9c659b06c19a
+EBUILD vivaldi-2.7.1628.33_p1.ebuild 2898 BLAKE2B 248ecd80042f7e35dcb42d7c7e8ae7426d5db8b9afe54baaffec31d8ef7ad95c4d41c4672c1645c485ba33e326c13d49c720ce06cce15c01f50899a04447f2be SHA512 e085c651a03b86fb48a9f5cb140cf9da6856dc39c160f707cfc35bfe56b0dbd6cae28cc1cd85fe18ce07afeac2c0014018086ee775abaf70e3b9739fe4ef3aa7
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi/vivaldi-2.7.1628.30_p1.ebuild b/www-client/vivaldi/vivaldi-2.7.1628.30_p1.ebuild
deleted file mode 100644
index 479dfcff4842..000000000000
--- a/www-client/vivaldi/vivaldi-2.7.1628.30_p1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	am ar be bg bn ca cs da de el en-GB en-US eo es es-419 es-PE et eu fa fi
-	fil fr fy gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt lv mk ml
-	mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th tr uk vi
-	zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker toolchain-funcs xdg-utils
-
-#VIVALDI_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
-
-	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${VIVALDI_BIN} \
-		${VIVALDI_HOME}/libwidevinecdm.so \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/vivaldi/vivaldi-2.7.1628.33_p1.ebuild b/www-client/vivaldi/vivaldi-2.7.1628.33_p1.ebuild
index 69ed6a41d087..479dfcff4842 100644
--- a/www-client/vivaldi/vivaldi-2.7.1628.33_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-2.7.1628.33_p1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~x86"
+KEYWORDS="-* amd64 ~arm x86"
 RESTRICT="bindist mirror"
 
 DEPEND="
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 72ed296e2dc6..233c011b36e4 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/fcgiwrap/Manifest b/www-misc/fcgiwrap/Manifest
index f0a1db29b0c6..1a61dc6d63ba 100644
--- a/www-misc/fcgiwrap/Manifest
+++ b/www-misc/fcgiwrap/Manifest
@@ -1,6 +1,4 @@
 DIST fcgiwrap-1.1.0.tar.gz 9924 BLAKE2B a96a87bfd1e4845be3a5018e5574edd40a800926ac531a041fae07f6810da509eecf97a19b2debe0ea318f2968f30184f4f6c1c02495777492d32826a0f759a1 SHA512 b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc
-DIST fcgiwrap-1.1.0_pre20150419.tar.gz 10834 BLAKE2B 174a832b8d2996de38203244ecece55ca1bd808b1e6724894c9ef99a7236ad40fbe4031450797f14931008305d50b4d2dfcc1abe97586fda9f45194c8b16bf4e SHA512 48df3f0b5ad15d172b7ee883d53c59ecbd78c0c401ef1452df8fc03af1a7aed153464b2515ca18881af70f6baf6c80e0b405d1dde4888a20397b9db272ea6ba4
 EBUILD fcgiwrap-1.1.0-r1.ebuild 1313 BLAKE2B b87272e5158a3ea56b573e34c31eebb75a900ac3f799a5533be65685260b4c02955fc58aa78e29b8e48f64512358646c99faffd8bb8ce3377254d9b132792dea SHA512 82c1d923eaf31578f7bd53beb1e342773dcb0d6d151f892c1e0281944c4bb91b5a9f65075b23045844f7374ac8ceb4948dfc92577060e0645355f1a7f520ae31
-EBUILD fcgiwrap-1.1.0_pre20150419.ebuild 1471 BLAKE2B b75461a9cbbcce40ccdfc2ff347a7ab84ac6c2292a80b92001860aa7497fea0b79b7131762c84789041f8f4f41b6a711faa6ebf8ff9b8c1bb0641ab7d65ef641 SHA512 abbcfea26e21a59350035aec6c6ea3d109a56735bc8a00de81226d7e73afe39f5951ce9b3537118f9c2e678e518fa5af5caad4b9af05a12070bd74d02109c211
 EBUILD fcgiwrap-9999.ebuild 1361 BLAKE2B eee47215eb02c0b034ce4648244bfc71b8fb9a83b6e90690a8318ea4a7891cfa889129b07464cd2f7b2450e3c9307c83627c77b0167091cb356fa8b2c010a246 SHA512 0271ad94f88ec1c158f6c1e52e7037ada92f5c29f872eb8941b42d215c4465642e8ca7c8a905f4dc65fa02559f2995d42225fb048dc0a9ec0833b36d60d87e32
 MISC metadata.xml 458 BLAKE2B 5170c572ca69ce1f1b03748af228cc788021c6f92dd2cc77584a852d6d03112a7ce3c36c4e6a41c952e55c180d8c750004f372565bf2c283b7f15f34aa806ff2 SHA512 d668390a3f179b243abeed455b9fe85eaef426848c1484572a564d1d631835ddd069046bbd84f5841ce60eadf81866ed69b60ce0b4bb301a91f5695441c3a1c9
diff --git a/www-misc/fcgiwrap/fcgiwrap-1.1.0_pre20150419.ebuild b/www-misc/fcgiwrap/fcgiwrap-1.1.0_pre20150419.ebuild
deleted file mode 100644
index b6310e79a9d5..000000000000
--- a/www-misc/fcgiwrap/fcgiwrap-1.1.0_pre20150419.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-r3" || VCS_ECLASS=""
-inherit autotools systemd toolchain-funcs ${VCS_ECLASS}
-
-DESCRIPTION="Simple FastCGI wrapper for CGI scripts (CGI support for nginx)"
-HOMEPAGE="https://github.com/gnosek/fcgiwrap"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="systemd"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gnosek/${PN}.git"
-else
-	MY_REV="99c942c90063c73734e56bacaa65f947772d9186"
-	MY_P="gnosek-fcgiwrap-${MY_REV:0:7}"
-	SRC_URI="https://github.com/gnosek/${PN}/tarball/${MY_REV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-RDEPEND="
-	dev-libs/fcgi
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( README.rst )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -e "s/-Werror//" \
-		-i configure.ac || die "sed failed"
-
-	sed -e '/man8dir = $(DESTDIR)/s/@prefix@//' \
-		-i Makefile.in || die "sed failed"
-
-	sed -e "s/libsystemd-daemon/libsystemd/" \
-		-i configure.ac || die "sed failed"
-	tc-export CC
-
-	# Fix systemd units for Gentoo
-	sed -i -e '/User/d' systemd/fcgiwrap.service || die
-	sed -i -e '/Group/d' systemd/fcgiwrap.service || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with systemd) \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-pkg_postinst() {
-	einfo 'You may want to install www-servers/spawn-fcgi to use with fcgiwrap.'
-}
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 9d80cbff43f8..60bd1308eb1c 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -3,8 +3,8 @@ DIST monitorix-3.10.0.tar.gz 309688 BLAKE2B 58345fbe02e24be48baecb1b91b4c24de8be
 DIST monitorix-3.10.1.tar.gz 313587 BLAKE2B 2dfc63499966346cf7e862a44d904f2599a6eb40544c511c9d64f1fa32684bccbecccbbfaff8d46cdb1c4af8b5904c2622ede8d3d8f955bd9bacc32848c2ef02 SHA512 b1e2a5c6a2992c6280129ec7fcdd72783902f475c3c98f09aab86b56305efacce7222732669639dc59b29da2fdf5cda49999ee159f4a95b12e4ee3a491d55c55
 DIST monitorix-3.11.0.tar.gz 318741 BLAKE2B af190e716acea9dfa56ebf3976e387abc19d0254fbebf6b6b18deff98b989266bff7e7c59e57832ad8b29dff8abb220e19da079c004ec185b63845cf70fb2727 SHA512 81832ef569416cc2e587beff8dbd485a6d361c0b5f11611522bde58c06d3156888e8c7b49cb3205adafbf737cd2d2b22e6041cd8b94e6d8c78cb5a4c3b1587de
 DIST monitorix-3.9.0.tar.gz 288443 BLAKE2B 6203f2950e0061d1ff268a2c42c31e7e14b5103e09ec82411f3ee3b957212c8799ba00710b269e0097ed0a3c060eb2d6972dd7b2c1af820bb09de2281113238c SHA512 599f3fa004c2e9657f255ca0ef0ae69ca63623976d17ebf8883a8c19b8a76193916634844f794da508439336edc37e424263aa6ccd8e06bb3584b6cf3cda783b
-EBUILD monitorix-3.10.0-r1.ebuild 2829 BLAKE2B 35b2cab57552086a6afc6e4709895be971504862e54bc7471272667eb02e70419148223a55557e6544538bc98ac1cbef032d0302e58eb49ad8cdd81e700c155b SHA512 d62c3705ac13ced472111d12cf5538bfed90e48613e254b07a6d374c62a8c0bc54eb6a8ca9364900016c32c63c739a3617242f04f2f18593e55ead51ab3e4a70
-EBUILD monitorix-3.10.1.ebuild 2758 BLAKE2B da5f92b0af54a146ad093fb2674b0aa332300835949d0a95bdbe6ae7eb9cbe4acdef5d7e316c4cbe2dcd49feaf3c22c25968a93ecca548d224031359d3717b9f SHA512 3a86040d73c2fa23ffaf2f5d43bb10a97b4cd1476bb6cac091e99814915adcb002e9bb7dec56a4cb09bf3500b08d1cb9f608c4ec5384f3406b5ba9e489ede6cd
-EBUILD monitorix-3.11.0.ebuild 2853 BLAKE2B 2f68d7a79ce9ef90aef5dbecfd6ef966b49a8ccc4115b5e005658b1632ed38537e9fecdd310fb0ed9808b330f2fd101a1cdb6d8fc2d59442ea105b85db6fece2 SHA512 0b5829d46b0b13d071649a2270b4bdb41ba3f9bddbdafac6a092fe89dd55ddf80c052d44073bd984e4881135af38500390ee9e91c48d1a7645c033d0c32b3a9a
-EBUILD monitorix-3.9.0.ebuild 2653 BLAKE2B 1231d79709465b94d2208a8497c993e1fa365b58433241d05dc0103b68bdf1385c41e5e37420663f4828390387e7b4fe0322c04407e273083f79226141bb1b65 SHA512 57f7b6aa48943f9f17c9f060dcc29dc505ad57b42378bfa108a9a8a44da6188049f9dd79d98f2e3adff12ec5f84dc16638d8511a6432a68c10e7d64df8290735
+EBUILD monitorix-3.10.0-r1.ebuild 2829 BLAKE2B 57e92a739ac167d873144bcaad9d91ec3f8c3b7ba0937dabc73efd7fbbaf2d745a7fda3cc61fc3d5c87e783a772b45ad0e78fc27d26b637d5fb2769c47e955f3 SHA512 20b8d8899e9cffafb41db15f16683edd19bd807cef91c3cd9dab5b619ba37e8fed08bb18080e1dc8eca5c3f99933a744b7a830f2296f6cae0a5b739186dc6d3e
+EBUILD monitorix-3.10.1.ebuild 2758 BLAKE2B f72f6baf4b8b5d75cbee89ab5e816446833c988b6940ee31f33cf48704fe50f65b888580fe68a0567f45112e7a2d467000154afdbe36642add26d17da3f39d69 SHA512 242f0d3d65f3589d7047683c52486cabd0a5893e650055e8e082aa03994e912a43f6137bea2a8f4bd4e8364c68e19dd7d185deff1b9ebfba19d5d090c5c32fbc
+EBUILD monitorix-3.11.0.ebuild 2853 BLAKE2B 4603137b6b25007f72d773d07e5206f70d61aba17b1eb65818629e2a271755bac6de02099c164d41a70e4532115ec335c0d8147b595961dec6709940b173247c SHA512 ab1a4ebd76bd10489fc5dcc8d426c1276bfe3d4ed6faae0b74e79bcf1c420b7f441a5adbf635e30d0996cd01b2aa3eef1f8b85ac29410be56a4bfcd64d47255d
+EBUILD monitorix-3.9.0.ebuild 2653 BLAKE2B eb2aa0539329608e83032342a16324f0224cfc10bc562ab52cf1a45b09c946316ed722aa00995d2c272db14e03c38371f23e9562293a9791c692e33b6348cefe SHA512 2fdb051ff113c569b9123f69af31b39de83472710684dde0fc25925a59bd38801baaa5a10835507fab3456590cf5c22b61512b2cf8db24c1ec055eba5367e237
 MISC metadata.xml 857 BLAKE2B 952d7eaa095fed062ac2662bf4750ecf002e0015642cc928e56964774aa354b445576aa9d04f8d9368c3454e2f41fa8746df9edcdc84ee2d53d5ee66e0af5c08 SHA512 c44c6e3357b95f174bd886a9373b7259d182a254af2d4ad3495c3d081279f76d5e682db8ae1d28f768d493bd2d85965303f9561b602abcb42248c264342c63b3
diff --git a/www-misc/monitorix/monitorix-3.10.0-r1.ebuild b/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
index 65bcc53b45f2..7181ae3d0cc1 100644
--- a/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
+++ b/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
@@ -93,7 +93,7 @@ pkg_postinst() {
 	elog "  app-admin/hddtemp   (disk drive temperatures and health)"
 	elog "  mail-mta/postfix    (email reports/statics)"
 	elog "  mail-mta/sendmail   (email reports/statics)"
-	elog "  sys-apps/lm_sensors (lm_sensors and GPU temperatures)"
+	elog "  sys-apps/lm-sensors (lm-sensors and GPU temperatures)"
 	elog "  sys-power/apcupsd   (APC UPS statistics)"
 	elog "  sys-power/nut       (Network UPS Tools statistics)"
 	elog
diff --git a/www-misc/monitorix/monitorix-3.10.1.ebuild b/www-misc/monitorix/monitorix-3.10.1.ebuild
index 3e6b4c2569d7..6cfe49a36664 100644
--- a/www-misc/monitorix/monitorix-3.10.1.ebuild
+++ b/www-misc/monitorix/monitorix-3.10.1.ebuild
@@ -92,7 +92,7 @@ pkg_postinst() {
 	elog "  app-admin/hddtemp   (disk drive temperatures and health)"
 	elog "  mail-mta/postfix    (email reports/statics)"
 	elog "  mail-mta/sendmail   (email reports/statics)"
-	elog "  sys-apps/lm_sensors (lm_sensors and GPU temperatures)"
+	elog "  sys-apps/lm-sensors (lm-sensors and GPU temperatures)"
 	elog "  sys-power/apcupsd   (APC UPS statistics)"
 	elog "  sys-power/nut       (Network UPS Tools statistics)"
 	elog
diff --git a/www-misc/monitorix/monitorix-3.11.0.ebuild b/www-misc/monitorix/monitorix-3.11.0.ebuild
index efb99c9012a7..7b47c6db0dce 100644
--- a/www-misc/monitorix/monitorix-3.11.0.ebuild
+++ b/www-misc/monitorix/monitorix-3.11.0.ebuild
@@ -94,7 +94,7 @@ pkg_postinst() {
 	elog "  app-admin/hddtemp   (disk drive temperatures and health)"
 	elog "  mail-mta/postfix    (email reports/statics)"
 	elog "  mail-mta/sendmail   (email reports/statics)"
-	elog "  sys-apps/lm_sensors (lm_sensors and GPU temperatures)"
+	elog "  sys-apps/lm-sensors (lm-sensors and GPU temperatures)"
 	elog "  sys-power/apcupsd   (APC UPS statistics)"
 	elog "  sys-power/nut       (Network UPS Tools statistics)"
 	elog
diff --git a/www-misc/monitorix/monitorix-3.9.0.ebuild b/www-misc/monitorix/monitorix-3.9.0.ebuild
index d56a7fd63984..75df0a787d66 100644
--- a/www-misc/monitorix/monitorix-3.9.0.ebuild
+++ b/www-misc/monitorix/monitorix-3.9.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mikaku/Monitorix/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="apcupsd hddtemp httpd lm_sensors postfix"
+IUSE="apcupsd hddtemp httpd lm-sensors postfix"
 S="${WORKDIR}/Monitorix-${PV}"
 
 RDEPEND="dev-perl/Config-General
@@ -27,7 +27,7 @@ RDEPEND="dev-perl/Config-General
 	apcupsd? ( sys-power/apcupsd )
 	hddtemp? ( app-admin/hddtemp )
 	httpd? ( virtual/httpd-cgi )
-	lm_sensors? ( sys-apps/lm_sensors )
+	lm-sensors? ( sys-apps/lm-sensors )
 	postfix? ( net-mail/pflogsumm dev-perl/MailTools )"
 
 pkg_setup() {
diff --git a/www-misc/xxv/Manifest b/www-misc/xxv/Manifest
index 7a44718dc1d7..3c4d52595ef4 100644
--- a/www-misc/xxv/Manifest
+++ b/www-misc/xxv/Manifest
@@ -3,4 +3,4 @@ AUX xxvd-1.0.cfg 2257 BLAKE2B 16e83bc63415f658c1dca638b8ab8d7d62a3f5b64fa0d9d260
 AUX xxvd-logrotate 367 BLAKE2B ede5967e1868dbd53eb81b6216598b7d15a890ed5914f4581b654bd5c0cd965475fe2837fb7640d68917c6c42de188e47cb840779995157e043b36f7fa63ba3e SHA512 b10918d478a42f90a9f24e3b358fc8af7fd8366146a42291ea6c5bed258414d834348dd58688f260aecc69c4f76af362c881ebd5a4abef52c1244310a8751c0e
 DIST xxv-1.6.1.tgz 992065 BLAKE2B 9c0b9d2575f412a677a84b1fe0417042f74c4ee4225181a14447e996a8fad46d0fdb4f5ada57fc02ff875be3a7602cf2e8976416b0fd5596b3adb1061ddc8f4a SHA512 e5171ea02d00d7c07d0faf5361a5261bf882d3c5a996b864593216a941c35f823b09431579341f43cf75f87dd42a1635275e8a24b393d407c83c7eb299095566
 EBUILD xxv-1.6.1-r1.ebuild 4665 BLAKE2B ce14eafcb6e0064c601376c045479103bcf934758da1f6724d3a975e9d7bc4dcc3a44da63d801ea7f719f90afab8b0c87f2ab38db786e1353c6896bc72eddd7e SHA512 41dcf75b7ffffaab12dc49a94fdacf44ec8ca52dd16b8d122725ac1a96f4eab3bf7c2362722ad8501bf49b93397e76f1f1da5e4721a5542ae84be322cb34a5f6
-MISC metadata.xml 599 BLAKE2B 3c2fd89512d72e023d781d0856c613e3fe6dd2a2b5fad739fe649f80f7158e9e1c33019b91d0a93034edbd950bdc78f081c164996da4618947dc528e0b06f743 SHA512 840993092f3f752b59ec9c2a8401c3befad44463116b6febc0692e06a8e781238f19e84a0112c15b9e96e3c4c1a75344c34697c6c8590f657f50a6deeb9e7e8c
+MISC metadata.xml 514 BLAKE2B 0c6981980fd49f6ea9b7beeb835a354c77103dabcd23901357885a2e20c176b6872fc175d776aa73a6a608591121bce51ffaab979c778cd51bd64c57b47fa741 SHA512 f4c3d21321956e2efa2eb1898463127b42223aa41a40547ae17887db614b78fbfd03123e74074bc3b7502df91e1fbcf58b1c26bd8ffe4f0a00b94470851814b5
diff --git a/www-misc/xxv/metadata.xml b/www-misc/xxv/metadata.xml
index 974f0802cc90..103ae1ef3d00 100644
--- a/www-misc/xxv/metadata.xml
+++ b/www-misc/xxv/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hd_brummy@gentoo.org</email>
-		<name>Joerg Bornkessel</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		To program and steer central service over a Browser the VDR 
 	</longdescription>
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 7d418d17f182..1a6361faed00 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 7e4ab4afa465..323ea001ab86 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,9 +1,9 @@
 AUX mms.cfg 4420 BLAKE2B 4557315bfa6f8edb6c8b28907065cdac3771175bd36a8ce2b6e72f0e1f0af20a7bb1ea8abb67f5c7b16fcaa7dd81c3eb89f926957d2ae5fffd499a7e6e709354 SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd
 AUX pepper-flash 151 BLAKE2B ab58f8d7dd307fea0d53b7f58887e3caeef8913940d6bfb662a42cc1f475ec59009998898e991d7a82d55a26ec1b2fbbc8b2a626fb8c9ba0d2da1e1735ab26ac SHA512 f20176b9567097482c3b1fdd062affb33a69b671f6298a98cd58e03ca80dd01bada4126ac5fd940fddc53a097669f52d4b8bba7850daf211e11dc24cc4d97eb1
 AUX pepper-flash-r1 143 BLAKE2B 049f7ec4e3df5fbdaa62e40acf8d21d42f61789c6d9ecde64f300df3d3c51f2b5580fb571ebbf172d590799801c632a2eb4daa01dd86e318441719ff6412f3ed SHA512 e4e1c1f204af1e5ce531dd43a22b4cd08e8def1099bba88ac96af09bd0879dfbb6383653ec85d5d199d418098e4b17d71998bee5a9fb5bb7bd8873432a4f66ee
-DIST adobe-flash-32.0.0.238-npapi.i386.tar.gz 8537560 BLAKE2B e4a039dcdf329c053fb727cfa35a2ba9dc7d8255c287e49cc7d27d9618bf7e705c0df3027bfb6145c752f01940cf05bb5e77d45d43a10d6fac60f74172458d60 SHA512 65ca4e8f936d67302305b94876b7cc029d2ec6711393407aba829abc4d13aefbe77eb6b4a9705dd986db630ecc9d132df3597911d7290ca0f6c0465d811ca5f2
-DIST adobe-flash-32.0.0.238-npapi.x86_64.tar.gz 9054187 BLAKE2B d2f50d3add8c70f872039c103099c5a378876c12f3ced4a5f8b539226f82bc0c2bcf181454276479c2ecdc4325d0b36816043dd0dd4f232d9ad7b3d7db702d96 SHA512 b79d073790888d90ef1612fbc104880d762833a8e61fbdb2ed081c20553eb546037577ef766ba529bb8202ee3cbcca0a07675857982e0ebd5884f8ad342f6fba
-DIST adobe-flash-32.0.0.238-ppapi.i386.tar.gz 8574403 BLAKE2B 8f31ab87dbce433e380d659c6542a497ae47522be8e852b59176ab3e338a9717c826f28d62f607cc0bfe8d2fbea86487891c61671b41c3e395f9d47f8dce68c4 SHA512 386af88ce22730c49db024b37b6ff71ad9642b0cf9844fcff91e53b529928ff9e672414167fe50a09bf815e77184a23b8ba8b4db081970dcafb646e148e95c99
-DIST adobe-flash-32.0.0.238-ppapi.x86_64.tar.gz 9492227 BLAKE2B 7f6c975056217cedb1b201dd159007b5182fca58999ecdd282a3b99743c721e8bc3c6ba7b28908eb04c57ad30edc0239870935869957c5ae7f9cf377aee78633 SHA512 fd5bde252400e11272d17cd8271d2455934e2565526a0526f05ecfbf141644511302fb05101bb408c5b79612b43627e19958ea4be300981473ca047a782f187a
-EBUILD adobe-flash-32.0.0.238.ebuild 3659 BLAKE2B 1606e7f9d4994bb7c3f2425d812ea732a88b64559c187572f85cdaf58d52ace571a918c8708f0e9444ebea928283fc01d3cda296b3970092c414e525e86816c1 SHA512 c5f9432d00b037ce2a58ed682d12a94d5b486d1cf27d2a5ee3076384179ed8c9998a4ed63f70303221997f4adf6f482e5c5b0224caea4c2f825dbc41bf6f5e31
+DIST adobe-flash-32.0.0.255-npapi.i386.tar.gz 8538367 BLAKE2B 2a2a1ee2afe690b78a7ef3ce8af26db823b7299ae46bc66ee6a2d0940262ca6c2b3b42c319321bcf5e91bca2f133d9d1d3faa64637dcb8a5a5fbb26bfb0fee04 SHA512 3f9f42e3eb07b7667e9b0da8582ad3687c1e082cceda34eb855c4b9a9a17b925d0d75eb2e4819fae9138e6b8313165a55fa474a45147fa907fc6286302f4bb88
+DIST adobe-flash-32.0.0.255-npapi.x86_64.tar.gz 9053852 BLAKE2B 4305ca7cf9171270162aed537cf8308eb4bcb6d80621a93c4c80af4093c681b84febf7927b9dba0f8b19a6f9237d4be349ef3029892e0d8166f2c59e6b841bcf SHA512 28817f6d3d2f618f750cd56f98ef0bac04e2a35498f1b259f61df1001efa4d0b1f49cd9975c8641fb4bc6c6ef32b97484d5f9ab0095261f58454b3f1d0bab7ec
+DIST adobe-flash-32.0.0.255-ppapi.i386.tar.gz 8574530 BLAKE2B ce413404762b43fa020bca9e7e404bdb4a8f3c8f1325824e8aca18aca6ed8256c0995229df2b693f87725869f4a45fe86dfb2624ff07046e16d309dad63fdab8 SHA512 c39377f3aabf5e7cd9838eb848021296968153cde93d50d9bc46205926ebda96bb5048be1ee0fce99d364d74548d57e77096371afe51bbb4cc4c98131169865c
+DIST adobe-flash-32.0.0.255-ppapi.x86_64.tar.gz 9491821 BLAKE2B 4d1a03f90413b0183d9560199e24383e252628cf6ca4a96a4da47206503461f00188647f3acb4e3715af62707bc98259654ab7b7a32ddba577fdd54fc388a9a0 SHA512 e17ba6499f823fdd7a11a805abba1655ac8683b292ce198124123ca3e2cf6cf36c5948c01b69fbd6ca7671d06e532983b31e3000a24f27ff75e62776b6b201e4
+EBUILD adobe-flash-32.0.0.255.ebuild 3659 BLAKE2B 1606e7f9d4994bb7c3f2425d812ea732a88b64559c187572f85cdaf58d52ace571a918c8708f0e9444ebea928283fc01d3cda296b3970092c414e525e86816c1 SHA512 c5f9432d00b037ce2a58ed682d12a94d5b486d1cf27d2a5ee3076384179ed8c9998a4ed63f70303221997f4adf6f482e5c5b0224caea4c2f825dbc41bf6f5e31
 MISC metadata.xml 552 BLAKE2B 56ec8c5f43e9624c4102f52834b63855be35d064ce05bfbc866af225fb8e60cf1b83e02c9917b474183b81cad9e4ecfba7595d8de7fa94974824d2a7f4de302d SHA512 0f84cf3e517eb92f73629e6a157a2999f409fa6dea40682e2248edeb957e5bc6f5228c49aebdc3b5d434d0fd8f717a19c793aee8776397871e1bc5ebf8cf7fa1
diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.238.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.255.ebuild
index 14f113c3c5f5..14f113c3c5f5 100644
--- a/www-plugins/adobe-flash/adobe-flash-32.0.0.238.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-32.0.0.255.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 2dc80d97dfae..f00071d07500 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,5 @@
-DIST google-chrome-beta_77.0.3865.70-1_amd64.deb 64112516 BLAKE2B a4739181ce829858d460d88e8864c611ef8a945dde87225cf4e80a5dd6cb04da373cc1043598cec96ea7f5750a6dcc102ca1e5a3eb85ad05894ff17ba958a59e SHA512 b043975754ebbf92aecd553935a73ac7f1b2fe5ab2154fff18996597a5682d208496c63c230cec9e5ff5a506c93168ecfc3acd07ad25a68e350678d85b9870f0
-DIST google-chrome-stable_76.0.3809.132-1_amd64.deb 59170956 BLAKE2B 3eea5ff9c3bafa4c4e7f0dd27a8f85a505f2c8a7260f6c517264343c57ddddeb0694e66203622c01d19f89f01c90a384255eaabf2c43e62c7a510e379f3c0a73 SHA512 c93aa39776ae5ca3f24092668c5d3e7fd873ce1b0ce05fa9a5d8a4a164981cf9cb4724a368026cab2475467bc0c85247626ac4f859d6e71f3072af9b7f8f1393
-DIST google-chrome-unstable_78.0.3902.4-1_amd64.deb 62088460 BLAKE2B 45fbcdf6664266179f0a1404e573b04b947899b6b3fc8c1463c1ccdddcee09e3102a6813686f9131918adab2bf41906b9d0c3032517c53677e6ae6582d6e29cb SHA512 4b98a0deeaa4a3c5266a7a1eafd84dc7ec6d21219abf095750aaba067db1877ee91ac30190954a746db313c07e9c55e90e67ab25d9cb2266c5bc5db160ea66e5
-EBUILD chrome-binary-plugins-76.0.3809.132.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
-EBUILD chrome-binary-plugins-77.0.3865.70_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
-EBUILD chrome-binary-plugins-78.0.3902.4_alpha.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
+DIST google-chrome-beta_77.0.3865.75-1_amd64.deb 64103536 BLAKE2B 443200b8c821ed9c239fef08a8d97338033629bf2c5227240056d35a3a946fb97fe2b538a2e2d9fb14c01364c6ce59a82dc684eb522107dc129540c093d158b1 SHA512 524924bb88d601e86824067c6f4deca436e0af9d7d30ba68d2f2a857625c75ada8808dc3907dadd87a7a44ce88efb9dd058084be1a70c0f93142c041f4736d7a
+DIST google-chrome-stable_77.0.3865.75-1_amd64.deb 62302944 BLAKE2B d4231928ff823e5c89339ff8327d9851b89f52761d9a8998f077535183476b6f39b948ac2604e4e3631b20ef25f985fb1d3fad0f7ea00ca97aba5fb58868a80d SHA512 b239fbf5549da67d900a605a62999900f9f3c8cd2f4ad9c55dcc91b20fda351ba82845ee908cc17daa8678ddacc01a3b2795adccf075ce22c9811667c3ca3216
+EBUILD chrome-binary-plugins-77.0.3865.75.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
+EBUILD chrome-binary-plugins-77.0.3865.75_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3809.132.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.75.ebuild
index c60abbfa5a56..c60abbfa5a56 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3809.132.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.75.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.70_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.75_beta.ebuild
index 3fd84e77d226..3fd84e77d226 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.70_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.75_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3902.4_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3902.4_alpha.ebuild
deleted file mode 100644
index 3fd84e77d226..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3902.4_alpha.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2012-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-KEYWORDS="-* ~amd64"
-
-LICENSE="google-chrome"
-IUSE="+widevine"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	widevine? (
-		dev-libs/glib:2
-		dev-libs/nspr
-		dev-libs/nss
-		!<www-client/chromium-57[widevine(-)]
-	)
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/chromium
-	if use widevine; then
-		doins libwidevinecdm.so
-		dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so
-	fi
-}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index dd38c3a7d6da..97aea339e78b 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index e924e3e502b7..75683832be17 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1,5 +1,3 @@
-DIST caddy-0.10.10.tar.gz 2706112 BLAKE2B 23ba725f3e8530233bc604b8f16342782c349b58bc78db49412fe72885a872a200407e3b27d5c28b24c5d0e286cbb2886d9ea54d0c034839cd04075366024a17 SHA512 78152e01739ffbe6d36f5d10cab92ad0d112242d679064199c271c20fd22c24f8d51ed884ddef6d80291d15d41d4620d6431e9a6fb0e8c0eab66cc50d57d5b0d
 DIST caddy-0.10.11.tar.gz 2860871 BLAKE2B 9050ee76a325c5ae183dcafec05b0d234a1308103f617908ec31a2bd8c3ce55c8d9ced9e30a36d616ff2c6f1581e1496bed4379a6f1ba3d0b5e7f9242edfabf8 SHA512 03539ae59f654d56ad0b441e7f67eb51135b1ffd539f9eb5953445089e72d3eab905ad9b08b001ef27e5054b760887a898b89ea85b48b4f852398b073e6e4924
-EBUILD caddy-0.10.10.ebuild 744 BLAKE2B 23e13762e450d34482608dfa6f7e7f2ae9cbe9b3bc29135dd6904a84014d23457bdfd94bf6e4bbdf583a5661a4c021fc9c938fb79f88951c50732af9eb6d8ce4 SHA512 2b28a0c202d546845fd0106dd235cdb9fd1c45972948c1c190f4843c6ce9464914471308b2320281ee72e4a3ac9eac1c8399ad04ef2332447d1030cbe48b5df7
 EBUILD caddy-0.10.11.ebuild 740 BLAKE2B 5db6734ed49caa6fd0df9a95a393a3fb763ee8963fbff9ea3e370239bd10ef6da189335505b1e04ebbedf6cb204f317c04c16474c03b77d9d2bf600938019de6 SHA512 27e78b3ec41d60e3acd781ff59f93468a998b2fae789e8a71bb142c433a9e07153251b5bac08d0b982dbdc98773f934013525bb7c68f5dc302c562dbee18fde1
 MISC metadata.xml 243 BLAKE2B db1542294c2fef7bcf6f008542d87fc1661eeb5ba5caee9658a0b2f803f17c30b26523fe6d252f70d692b52e85ba7c7c16567316ce33a534cf250a169e2b0f36 SHA512 9f804a00b8c8d98d3c097b0487f8f528d3648a316214b0009292903d0930f6808fde06be5a3b2b938203ee124f9102e7f15a1446e468c26e057cba332f70c539
diff --git a/www-servers/caddy/caddy-0.10.10.ebuild b/www-servers/caddy/caddy-0.10.10.ebuild
deleted file mode 100644
index 28d63e7aab2d..000000000000
--- a/www-servers/caddy/caddy-0.10.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/mholt/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-EGIT_COMMIT="v${PV}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
-HOMEPAGE="https://github.com/mholt/caddy"
-
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" go install -ldflags "-X github.com/mholt/caddy/caddy/caddymain.gitTag=${PV}" ${EGO_PN}/caddy || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc src/${EGO_PN}/README.md src/${EGO_PN}/dist/CHANGES.txt
-}
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index bc0548eb2926..b81681d0634d 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index efda45d2441a..68dee07964c4 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -20,7 +20,7 @@ DIST NVIDIA-FreeBSD-x86_64-410.104.tar.gz 61995820 BLAKE2B 281b7567fcba6e7457bca
 DIST NVIDIA-FreeBSD-x86_64-415.27.tar.gz 62389955 BLAKE2B 39ac5970ef1a6ffbb03abe8b758a6f5d7eaca787231845fa4b4bff5f26aa770fb7c695bbd5585d919c934c65b9ed0cfe42f9674bcaabd796c9bd8b89cea87ee6 SHA512 857d1523bad2fca21c75b45c29066be0f530afa8ca124806bcaa36509ac5135df1c4037e6b09e5718c701f085b3608925e2b1fea45d0681e69a99ef709c307d0
 DIST NVIDIA-FreeBSD-x86_64-418.88.tar.gz 62076023 BLAKE2B 10f9fc4073c926d170a57e165454171c31624824d44a67f78bad68843b87f965361db509a5b86989a1224a347ca0550015ffd8e137ad17974708e802604b397b SHA512 d3a0f029f3d8c78a7419dbf7fd3af1b22ab01cf8d6d770572e44f2b61635e05f17d3262b611a7760b66bdc3ad4283a558c393f0f8c0e64d87eacbc929bb657bc
 DIST NVIDIA-FreeBSD-x86_64-430.40.tar.gz 62712042 BLAKE2B 6791f5931c715888dc76a0e4d2d28deecce24fc7ab989eba6def0369c3f30ccb680dbc792a0a9c3df9194c21286612c9a02f3130e0db53e06a2071f7b3662097 SHA512 a8fd481bafaff2a5aa68a4b1bc57bed80eb794c2d2a35d26546e113610276d0aec79116fb31bd34283da9fae559eef6357e5639baf8a5ced63eb8af6c26fc7bc
-DIST NVIDIA-FreeBSD-x86_64-435.17.tar.gz 64151018 BLAKE2B 22e18998d2b169de759e8f2951f6ffd4bfea643985d45895b267d1a36e211565b30d3937f75c17fe9a0cc3368902b9968eb817767053e691a15eaecc6b5d7412 SHA512 203727be00e8dd2a3df140058c111527bcb2b2689559cccbfd4557b45f832898cd89f04fda810262d4d91a8629c4c85b3a360f10b77a57dbf5c123549a5da0c0
+DIST NVIDIA-FreeBSD-x86_64-430.50.tar.gz 62715888 BLAKE2B 8bb22ccf23054f5dae16f63775492a141ea69c540018a9f4dee358d6cb022d2ab8b7c32acc03f9632d9797b6eeeb6b5e76240b857906db28835240bcf8cede19 SHA512 c028262d67e3962ecce616d68e6d45c0ce8e3d1b38695c18b9b1d08506f848954a59831d99fa414fc09408134d0730e40766d74ac462cf322006b22c14a2124a
 DIST NVIDIA-FreeBSD-x86_64-435.21.tar.gz 64153630 BLAKE2B fee655cc843c004ac0c1ec85b9417292016a013136e04ad047d2513edbdc7c732561d6bcc4603c658905972dce6618de49d4d6ac583e84fdf212cf45397b48c1 SHA512 2c160c06ca58e3009deb1ba4a4a28d39419e251ced3bfa9a442942f9cce17003d67e8a8bfa23036d3916cc0e66f4bff0fbedaae73db6f10b995235a56d7eba7c
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.129.run 29102893 BLAKE2B 19f73b7ac4df7d0584f180492676eba65a42c527566175308ebb78bd10e0a43c3f300f013193cafc9eccf1cb32a58f8d6dc574073d4197d2d71d90f224e6a5c4 SHA512 9e7a10e0bbd856a7a630fb8d1660a3e5cd224a04243989dbd24f3cc2e869a817a1fabe98b4257e9e5870a96f8d6dbcf51312c960a4a185457cb011ac9a0246fc
 DIST NVIDIA-Linux-x86-340.107.run 39016798 BLAKE2B 2632c8f257d0cf7c5b9294eb2c0b763eee6feb60eacc316024655971e4d067c4af6548aab3b7b2b295792b064f3f3ac3e6403a2ecfa096761d308dfb6b2569b8 SHA512 0add713942bcdb639d19b5c36f5e0cea14f9e07490191d46dfeba0515ede7700fd8e9467ec531d38329fe1e76bf45905e70e0d440e7bc2dc79c1d767eab03338
@@ -31,7 +31,7 @@ DIST NVIDIA-Linux-x86_64-410.104.run 106042115 BLAKE2B 2f977d6afd5484fb630e2eeec
 DIST NVIDIA-Linux-x86_64-415.27.run 108399659 BLAKE2B 05fb81a4ab8626d0170a30b70ed114c639ba7f0e5ac260d2f38cb5042a4d6052e40ada51cf2feff6bae0f394781d77cb70014f390873a715b7d9495b86918bf1 SHA512 5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6
 DIST NVIDIA-Linux-x86_64-418.88.run 109217245 BLAKE2B fd7e4aee2306cda92e99a3adeb74ada4ac64f81f0ffbc72bac6eb5f0f9815e4f71452e7fdbf49c749b0a7dd0e147e12c44282c2d8be6747b8504b1621b982844 SHA512 c4ee1eae30e8158007c3bbcff941bc8ee0bef9bba216b8a57c42305bc338d2d98d5fc56ec90b0809216a7eba8d7a67fe5be298943f2688daccf5c78efc0dd119
 DIST NVIDIA-Linux-x86_64-430.40.run 111258448 BLAKE2B 9782181d5044430b374305fc868dd753d0f27c3b2f1f6b4bd34b3a49226730c4cf34b1ea4f3ba2c4fce5739c0408c64cc79f1a2c5a312ff3e09a5d20a79ce625 SHA512 68e6187fe74b43e92de6159589463db5f74eba09652b0f55d5fcc790c315405df6cd27129185f4dbe18790abdbb61e79b52977d47c6407e74d3372b5511a4e1b
-DIST NVIDIA-Linux-x86_64-435.17.run 142539690 BLAKE2B 0e196128496fce634dfe8eceb873af5beebe1ac6c1c040c449e24bf00336b16716d065b622ab2a0f26c41c570db156afd5f3b36f2145d96988e9dff1e2a6dff6 SHA512 28f1d82f00d4c46431ec8ce6e2357b94c2eb68516e650ca941ab04e202b0aa15ee6573eb692b43a3eff6afc974a5702b2873a864c43b9f2b0e5b2feb8fe00923
+DIST NVIDIA-Linux-x86_64-430.50.run 110545029 BLAKE2B 01c87f7b1b71146e04d1310431227d125904e0475c7e9656fa2aea598b95952fed083024277607a5a06c6c6bf93df4e0a89051cf887f28c902c3d409c98fa807 SHA512 ccc70fc717e53365e340bc210d8817939eb2d798608190144a9a1d690d04eb140f0d01a85a427bf2223b6d12848177e2ab94cdb3902f5117950638dc1ef28fa2
 DIST NVIDIA-Linux-x86_64-435.21.run 144387574 BLAKE2B e9afd6335182a28f5136dbef55195a2f2d8f768376ebc148190a0a82470a34d008ce04170ffc1aab36585605910c1300567a90443b5f58cb46ec3bff6ab9409c SHA512 e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270
 DIST nvidia-settings-340.107.tar.bz2 1549413 BLAKE2B 127442ee2c35ceec47ab4f103bdd2d0278c621fcb9be47051111f6f8728ef5699bdc95fe33a3812a807c38c4868b04c2176e2ed218a422171d2a88ac0c00de96 SHA512 593e7e83aa350a3a7beaaa32aca8660d7e203f6f2e460a6e6eabcdc092087f9917ee4e6d141e37ad4e3b0a1b9908c085e4a71d2f579e481a03bbd1c6f75ca776
 DIST nvidia-settings-390.129.tar.bz2 1109456 BLAKE2B cdce0bba52697e214ea26514467ea6f61fa06429f0a58ca549b74d8da1f7b07cbc52b1c9de6a13aed77545c2ba8c98b212a7865fdc5026dcd74f5565b73c4e1e SHA512 bf004608fbee6a12521fbcd9ab4e3d0333896b320c943ed9f2dc5373d8ffb2eb9cb4c6873a263acac87a9ab67a5f4589344d2bbd70bce36cf14242f4d57e1b87
@@ -39,7 +39,7 @@ DIST nvidia-settings-410.104.tar.bz2 1120639 BLAKE2B 75554b0cca7c022a0f1cc02091f
 DIST nvidia-settings-415.27.tar.bz2 1128013 BLAKE2B 36513252ff3d5f2036c80250e012d79bebfc14daff56fdaabb032856f5f78ce77cf4ce32d6eaee5fe4c1a18db63d5c69d6848517f025c711f133e28b3e509396 SHA512 5ac3b673c41194a1952ec10cd3c961aefd281bb044ecae5c9d11cb55d4555fed44e6056b5a2e97b5b87687743cd7f702f33ce7e0f841f04c8175d63693a24594
 DIST nvidia-settings-418.88.tar.bz2 1127894 BLAKE2B 04b7c888e006f49e1745ede6eb8db35563c248b3c6be0c15539af1f9224c13ac7273037827e20294b03db0d5a56a62da8544ec605c40fcc0a2a15c741d76af9d SHA512 fbd46aaf41da4f04e8cdb3c484c9170633921673adfc878588f1e5464cc690b8a9fcb37b3c3cb8f0fdb496ed1abafcf0694039543c1354f7b481a46418309099
 DIST nvidia-settings-430.40.tar.bz2 1131627 BLAKE2B da55a08d3a4d096afe5aec5fc7faf36b10d814cf135a444f06a115b225d94fe20046a266e6afee3660b588561c4fadb1581e6f9ab9196fe19eb171140f05ba9c SHA512 9273887c2487476fc004839320b66726a766b0378dfd81d030386918d67e6a25ec6b26bed1db5c07634347e8cd6782f826c75e9ba8977b06e37880e4b55a1b9f
-DIST nvidia-settings-435.17.tar.bz2 1131069 BLAKE2B 9c0b13b5a023b819a4ce88cb238efe8b5b6eb7a7b72d0affe947e84629b55e42ee1f6eddb2c874fb2856918fe7bfb9ea2e844ffdfd6bc298d95ba23ca8b86947 SHA512 30e683f0ad0b663946cdc5bd8aa9eb4e52774f378e1499536b0f7e37c32960ba2a6901cd4dec3eb0ffd874cf0225c5e95f4d69e78ca99d44a93a2de054251344
+DIST nvidia-settings-430.50.tar.bz2 1132111 BLAKE2B 3b95957f8737ebefb14d01db03929835dc0b58ba4c539f153a5d0278bf11f3b10b189cd529f7e65fac339a2660c2aac1df16e79b61bd13749ffdd0a17db6792f SHA512 02dd870021333825da8eff3b27c3414a8c4f6e0af14a07ffe1616466e80338daf33d6085d23690d71898b2219ca0f83ebbabbe176b40909ac7556b8a0184eaf1
 DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24 SHA512 8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb
 EBUILD nvidia-drivers-340.107-r1.ebuild 14337 BLAKE2B 9d69d838adcbb2bcc20d69ae60156cb99baa4b5030c9f895def311f561b1fe8066936aa9d4fe7863e55077fdc00a7d136e51c463edb4472431e15d046f77f118 SHA512 ff1bd377e6eef99415eb245a1027ad6c2645edaa8a341305884147d36a7d0347c40baa5053bb807237d28c6ce25d8d130f3f00e062333f3c1397e97ccf8cc46c
 EBUILD nvidia-drivers-390.129.ebuild 16279 BLAKE2B 2f8198c3715397f4c707f90f79d5fa5d6639a649669ff1552501e8e6fe995850e64883a3d85159200c1e7cedbaf6b739993cb60822c32048eabaaebdf3be8fbd SHA512 3b0bafb836b3eb686c2dd063502b5a19a5012c866c588c34d2a4248ce25d5b27fc0c84ad143946d7dbe5f1c369f3f7a9ddbfd2a008bab00915257e60a75ed6bf
@@ -47,6 +47,6 @@ EBUILD nvidia-drivers-410.104-r2.ebuild 16168 BLAKE2B 8087579f48a012b3045e01ad0a
 EBUILD nvidia-drivers-415.27-r2.ebuild 16179 BLAKE2B 5a22bb5a3fadaf892565f5f6c4c61bb504d0ea293796f530609662a75f4f793907fdac3e713cf3eae7dff4a9a2d7f121ea65b60a8faddd124a26196982a48eb0 SHA512 6decb715a64616c8dd1d32aae21a7f511968b12c167f0e375d997ee8a1729f4d82721fbd595944f536186429b0fc98a53df01f3d51cd81d81e3710cdbdfaa7dc
 EBUILD nvidia-drivers-418.88.ebuild 16026 BLAKE2B fd64c1da1e2b0eca1b9c6d70d56271b6b15c28ac187e4409a19f04ac3fe43755b85a1a88fc732f95b91d1855508934ac20b503c96cc743ecc42dd774191c92fb SHA512 16166fd6182670e15fd03b38550960d4fcbd6eff0833839b2fdb1fea0e597dfa3d00cc4170945244a9b5918a4d29112f172e3ef50a87359bd6c41c942ee58316
 EBUILD nvidia-drivers-430.40.ebuild 15841 BLAKE2B 1b18946c96999a975c1356f14b14be1c89b92ef218291553fe893fbc84eba4c8e3faf739f291a06433adbd0fbbe0a0957d1d46bbd265b5a53486a03fc1ffc332 SHA512 092c0b41af44315f149074c089c660b022a7851c7bab17add8aeb588da6e9e4fb975fe6e60554c8c3fce3bf0e9eab6bbcc675c35463ec939a0717f0b5867f9b7
-EBUILD nvidia-drivers-435.17.ebuild 15857 BLAKE2B e1a905c3cd9b29205367310d18035ee6700432fc10b65f9060c9f7ae8ebab593ffcdbfe8ad91904a81f7b79c293db9dc2a50d10e9c0045892e1295f2eae65bca SHA512 998067efd5b29ce135fd2011eecc5312d75d85741c4bcc39df3641cd3c912e99d360e70005ed7f148f77f124ce4e0fb7f65648e42cb33b1d3aedd4e536179715
-EBUILD nvidia-drivers-435.21.ebuild 16200 BLAKE2B 07519af8290da16184f606eba6c9a79ec6dffc5e7d123c477c7f7dad551ac80e39e61c9ed54d76ec9d6b6fa23165b0913dd2012e94865ac5db27cdcbd545bae8 SHA512 4a531c79ed95d6a473b481f446b9a570d9231b3b7bfeafd1289c3efafae4433b3aedef64e88ff6f2adee4a57a33261288d43ce617dceab3cb10de6c34977321f
+EBUILD nvidia-drivers-430.50.ebuild 15842 BLAKE2B f597a9406443e15198bf764cf1134e8b448bab9627cb7f7eb9582d734f2fee2ea1b059de2e927b9b8deec974ccf864b98cdff9a836fab732ac8433f003f25464 SHA512 f4837423f6fca91463ad28039747e01b03cf55b4bd42844f29fde626db69c276a71ad86a2c6e42c0c22fe89d0609eb2137b6728831087c5ba7065ca63e928ee8
+EBUILD nvidia-drivers-435.21.ebuild 16199 BLAKE2B 76bac173fd311225782ae9ea9224d1f64f91acddc1a89727e6079dcc52cb268f3897ead9f208a4d291e51fb6156d1803fe6543da878fcb6d4d02fd32fc14f29c SHA512 d4b62cef3e175d3dceed00ae511412000ea9683ea9f23c38db62f2c82b18941226ea107f39355bf1f843ac40acf0460e68fa998896b536444ed80f815ec377d1
 MISC metadata.xml 1284 BLAKE2B 0e13b2eae77fee75a4757da7ae80540093962b6e8ccc3b0950caa3a0957ff79c6b08c80ceeec8ffcde47b293c258159f8722a13334fe06868589a18802ec0434 SHA512 0a3c6679f7fc23bf87340145f3a97945c9e8c7fc9c8721fa4643fb662347af312b4b927635901e95acb9349a7b191ef088ff0e51bbbc0cbd333603bb60984020
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.50.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.50.ebuild
new file mode 100644
index 000000000000..79f8ea7a600e
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.50.ebuild
@@ -0,0 +1,585 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/"
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+KEYWORDS="-* ~amd64 ~amd64-fbsd"
+RESTRICT="bindist mirror"
+EMULTILIB_PKG="true"
+
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+RESTRICT="test"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? ( !media-video/nvidia-settings )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		<x11-base/xorg-server-1.20.99:=
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+
+nvidia_drivers_versions_check() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 5 3; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-5.3"
+		ewarn "<sys-kernel/vanilla-sources-5.3"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+		ewarn ""
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_pretend() {
+	nvidia_drivers_versions_check
+}
+
+pkg_setup() {
+	nvidia_drivers_versions_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_configure() {
+	tc-export AR CC LD
+
+	default
+}
+
+src_prepare() {
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-linker.patch || die
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+	fi
+
+	default
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
+			DO_STRIP= \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			RANLIB="$(tc-getRANLIB)"
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=.
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
+			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
+		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		if use uvm; then
+			doins "${FILESDIR}"/nvidia-rmmod.conf
+			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+		else
+			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+				> "${T}"/nvidia-rmmod.conf || die
+			doins "${T}"/nvidia-rmmod.conf
+		fi
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
+			/usr/$(get_libdir)/xorg/modules/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			PREFIX=/usr \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	readme.gentoo_create_doc
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
+			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2.so.2.1.0 ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX.so.0 ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLdispatch.so.0 ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libOpenGL.so.0 ${GL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.1.2"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-cbl.so.${NV_SOVER}"
+				"libnvidia-rtcore.so.${NV_SOVER}"
+				"libnvoptix.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.17.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.17.ebuild
deleted file mode 100644
index 0d4aa5949343..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.17.ebuild
+++ /dev/null
@@ -1,585 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="https://www.nvidia.com/"
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	tools? (
-		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-	)
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~amd64-fbsd"
-RESTRICT="bindist mirror"
-EMULTILIB_PKG="true"
-
-IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-	tools? ( X )
-	static-libs? ( tools )
-"
-RESTRICT="test"
-
-COMMON="
-	app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		dev-libs/jansson
-		gtk3? (
-			x11-libs/gtk+:3
-		)
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf[X]
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr
-		x11-libs/libXv
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-	)
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-		app-misc/pax-utils
-	)
-"
-DEPEND="
-	${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-	tools? ( sys-apps/dbus )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? ( !media-video/nvidia-settings )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	X? (
-		<x11-base/xorg-server-1.20.99:=
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 5 3; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-5.3"
-		ewarn "<sys-kernel/vanilla-sources-5.3"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-		ewarn ""
-	fi
-
-	# Since Nvidia ships many different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_pretend() {
-	nvidia_drivers_versions_check
-}
-
-pkg_setup() {
-	nvidia_drivers_versions_check
-
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use driver && use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	if use kernel_linux && kernel_is lt 2 6 9; then
-		eerror "You must build this against 2.6.9 or higher kernels."
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_configure() {
-	tc-export AR CC LD
-
-	default
-}
-
-src_prepare() {
-	local man_file
-	for man_file in "${NV_MAN}"/*1.gz; do
-		gunzip $man_file || die
-	done
-
-	if use tools; then
-		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
-		sed -i \
-			-e "s:@PV@:${PV}:g" \
-			"${WORKDIR}"/nvidia-settings-linker.patch || die
-		eapply "${WORKDIR}"/nvidia-settings-linker.patch
-	fi
-
-	default
-
-	if ! [ -f nvidia_icd.json ]; then
-		cp nvidia_icd.json.template nvidia_icd.json || die
-		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
-	fi
-}
-
-src_compile() {
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use driver && use kernel_linux; then
-		BUILD_TARGETS=module linux-mod_src_compile \
-			KERNELRELEASE="${KV_FULL}" \
-			src="${KERNEL_DIR}"
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-			DO_STRIP= \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NV_VERBOSE=1 \
-			OUTPUTDIR=. \
-			RANLIB="$(tc-getRANLIB)"
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="$(get_libdir)" \
-			NVLD="$(tc-getLD)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			OUTPUTDIR=.
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
-			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
-		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		if use uvm; then
-			doins "${FILESDIR}"/nvidia-rmmod.conf
-			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
-		else
-			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
-				> "${T}"/nvidia-rmmod.conf || die
-			doins "${T}"/nvidia-rmmod.conf
-		fi
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-			/usr/$(get_libdir)/xorg/modules/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		insinto /usr/share/glvnd/egl_vendor.d
-		doins ${NV_X11}/10_nvidia.json
-	fi
-
-	if use wayland; then
-		insinto /usr/share/egl/egl_external_platform.d
-		doins ${NV_X11}/10_nvidia_wayland.json
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-
-		insinto /etc/vulkan/icd.d
-		doins nvidia_icd.json
-	fi
-
-	if use kernel_linux; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1
-		doman nvidia-modprobe.1
-		doman nvidia-persistenced.1
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/ \
-			DESTDIR="${D}" \
-			DO_STRIP= \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LIBDIR="${D}/usr/$(get_libdir)" \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			OUTPUTDIR=. \
-			PREFIX=/usr \
-			install
-
-		if use static-libs; then
-			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-			insinto /usr/include/NVCtrl
-			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-		fi
-
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-
-		insinto /etc/nvidia
-		newins \
-			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || \
-			doicon ${NV_OBJ}/nvidia-settings.png
-
-		domenu "${FILESDIR}"/nvidia-settings.desktop
-
-		exeinto /etc/X11/xinit/xinitrc.d
-		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	# Documentation
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}"/nvidia-smi.1
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-	fi
-
-	readme.gentoo_create_doc
-
-	docinto html
-	dodoc -r ${NV_DOC}/html/*
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local nv_libdir="${NV_OBJ}"
-
-	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		nv_libdir="${NV_OBJ}"/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.1.7.0 ${GL_ROOT}"
-			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2.1.0 ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX.so.0 ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so.0 ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libOpenGL.so.0 ${GL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-glvkspirv.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.1.3"
-			)
-		fi
-
-		if use kernel_FreeBSD; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so.${NV_SOVER}"
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-cbl.so.${NV_SOVER}"
-				"libnvidia-rtcore.so.${NV_SOVER}"
-				"libnvoptix.so.${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia "${nv_libdir}"/${NV_LIB}
-		done
-	fi
-}
-
-pkg_preinst() {
-	if use driver && use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use driver && use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use driver && use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
index 328511e0cf6f..913512459985 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~amd64-fbsd"
+KEYWORDS="-* amd64 ~amd64-fbsd"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
 
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index e38e34d6cefc..c9ab90555dc4 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index f445486d9561..0137b97321f9 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -2,6 +2,8 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e
 DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
 DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
+DIST gdk-pixbuf-2.38.2.tar.xz 5509752 BLAKE2B f78ba049edc7b1a6c909746ec68948764b3602988e110ee2ad752d26d8b3a37c3f2957a91d3c8a5fe3455cf11b477eaa43d097554048e8988c563b4074bfd751 SHA512 b0f83cca9bfbe45dab200b19a5ec6231b628c09633fd41348f433c226d523c2f9b805d41e4d955e9fd65c5b6d24df59c7c94193032379d6f09b0472ae988a0c1
 EBUILD gdk-pixbuf-2.36.12.ebuild 4007 BLAKE2B de6f3819c976e33c87a1f9f84fc8d85ce16ca793b147282545a796493cd43b827e034c7a0f5f529f160165781c02465f71859a863c6af8fa9882aa1a8235aa72 SHA512 98f39a76ebec24dc4f22559b487fff324f2b714d3203a5e98d6d4a18e85b4b8ab7f9c584e0f9c57dbb5d3f727e66b932458901408bc20a3c84eac7aafaa6be03
 EBUILD gdk-pixbuf-2.38.1.ebuild 4014 BLAKE2B b9d4e2cee94e4ee563804f6e98ac687063b2604c4a37b9ec64a981e3632beb516d11a9588cab341d9e0dba4fa1ff176fc9d99152fb760191c01b301e160f5ae4 SHA512 b1f1061e9d833667d4ebf4c7107b7446b21d66a6d955f79fdf64043c1fc7ce13b329f11b0a738f4aab3bd2c2104f8733f7f1ff6da4586491fdcb014a259734ec
-MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
+EBUILD gdk-pixbuf-2.38.2.ebuild 4028 BLAKE2B 42e4a44d8b20ff9a173671f125570f33a7386dad045b4165042730da44780e6f6ba47aae6cb90d1aba26d10d51bd450085163c70ee3d3a588848db781c5cbdae SHA512 63959485fb45cbab1bff37e9ec17e88c649bde28296ad1f875439fecf2b8e03f9a51eb04d5da60c0a5a11540d2a70722cc227bac3f4c3819a458756d5ed2e4e8
+MISC metadata.xml 424 BLAKE2B 07b31586e47af1803baf8ce93c9e61334fbe566e8fae5bcc9d442d09b3ddfc51b06be8f02ffebf663b0307130c57e94b63ff57a83856ebec755704b8d3b232bd SHA512 3ef93327d28195a186bcc16c8acbb931c2cedcc7893173ca76af0db90eb088a838f5cb1c2f43f4b72fcf9067f6c483c96a5549c57c3542cccbb70450cce485bd
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild
new file mode 100644
index 000000000000..35bdc66994e6
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="X gtk-doc +introspection jpeg tiff"
+
+# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
+DEPEND="
+	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3
+"
+DEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+PATCHES=(
+	# Do not run lowmem test on uclibc
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
+	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpng=true
+		$(meson_use tiff)
+		$(meson_use jpeg)
+		-Djasper=false
+		$(meson_use X x11)
+		-Dbuiltin_loaders=png
+		-Drelocatable=false
+		#native_windows_loaders
+		-Dinstalled_tests=false
+		-Dgio_sniffing=true
+	)
+	if multilib_is_native_abi; then
+		emesonargs+=(
+			$(meson_use gtk-doc docs)
+			$(meson_use introspection gir)
+			-Dman=true
+		)
+	else
+		emesonargs+=(
+			-Ddocs=false
+			-Dgir=false
+			-Dman=false
+		)
+	fi
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}/${cache} ]]; then
+			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	xdg_pkg_postinst
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+
+	# Migration snippet for when this was handled by gtk+
+	if [ -e "${EROOT}"/usr/lib/gtk-2.0/2.*/loaders ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"/usr/lib/gtk-2.0/2.*/loaders
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index 6c6d2ea40eb5..8901219e2688 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 	<flag name="X">Build and install the legacy gdk_pixbuf_xlib-2.0 library</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 45b42d99f70f..222decbea3f7 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -16,7 +16,7 @@ DIST gtk+-3.24.8-patchset.tar.xz 3684 BLAKE2B 686356993b95f5342942764af5f92ab52b
 DIST gtk+-3.24.8.tar.xz 22419364 BLAKE2B 262384d0bf1d843edfcb13007eae3584235fa166286f071b8b98803d452df3f4f8934f2b1830427d0c0cd956b67170e576f8c3f733e9b6323b8f89f6d0ddea71 SHA512 a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5
 EBUILD gtk+-2.24.32-r1.ebuild 10008 BLAKE2B 8bceca83e3a73a2565cd980c80d1baa5fa2a79de61b4b8cb984738bbf6740c59a5df4b04e878fa2282d46642970e11dc4db8dadbf479447576b854f597b274cc SHA512 f3dca376a7794bc8ecdc47362a09dc58d46de7636dc0fec7dda86727ed47cb0d2105d5901884b60ae0601159ba1a79d0da2e05d725e0d119d9382a7771369ad2
 EBUILD gtk+-3.24.1.ebuild 6911 BLAKE2B 2320cdd69304ba179e9d3a679f4fcbbbef233f454b4661fa1268e7f209401fac175d1a50f57c931ec669ff64168891d66abea8f057b84837cf3801404f6cc6e8 SHA512 0df091ae2f0ad31ef4a77c77ea62e1e6075af62234483bc841b9c027aff45e0c7632354895d3066f9d480177f90eaa25069b6082b21da48640e7525b96000194
-EBUILD gtk+-3.24.10.ebuild 7319 BLAKE2B c95b010239374cb401c75b885e149519b75dbeb880be1e77d86fb829142ce86c19638376eee58dd6829852aeaddc3d13b2d63394eafc50010f46f59332eb666c SHA512 8303ad265908b470a9268266600035a5657acaecf77221f46fdbb6765152a2b458d0e8d197fb3b63ca6c95316b10e50e585b9ecdb36cfc8b729e316a2b3c3ed2
+EBUILD gtk+-3.24.10.ebuild 7318 BLAKE2B bf9be6e82fe39f53c254a4e93ae8c040654efef0a8438e361084c5d1c260d183c70385095b01ed36b048b148dc9485071df0b056e4d5df179141af5d2205c482 SHA512 ead2f168392bf78234f15d84926f69a2009730724675900dd6225a36f02334165803865f4085a3521cd3f0924a7af1364b58d7ab34ce5be22c3ee6a999f38877
 EBUILD gtk+-3.24.11.ebuild 7356 BLAKE2B 932d654e21ebe74724571f013ec35d69722547071e106442180e0b5a79f234b3d2c84fff1d222e32e337f2ac9866cd1cc86a3745be0be503b4606f0af920cd9d SHA512 07e90ebf374fa35372121eeb46db27fefb5b349e98327b130fe1472beeeaba83c44153b6ad5e51123b6665bb00d04c9c35fc6bd8f041b382f5050c626adaeaa0
 EBUILD gtk+-3.24.4-r1.ebuild 7277 BLAKE2B 833c8d22a401ba319fce77e3dc17223213d96e3d170b382377af5aa95fcee179c357e69d7dabc02e653a21877e199c5871e9843f800887dfe87985e3a068e231 SHA512 a26d38f97f1186452abb836ae7508f1d70d8913f466915afc7f6970af52a389bfb1b16914ee933be4ef0e2cd9eed99684f7b3aa2c41cbd793a3d55bbb0b4e0fa
 EBUILD gtk+-3.24.8.ebuild 7107 BLAKE2B d7f5db20d8f6821c5c50568493ffa0a01fe0b50c935055cd6d4cc0ea0ee34ea8fb3cbb8737f15868267017430466c0404c2c8084f759001d4642af4970c25b99 SHA512 051a2cbad61cff75b30fc8c889f7a1884bb8ee483cf304f92cd5b04a81dadae664aee1994d71111b2b3ff8389f794b0d02dbf998826367ffab70a7441f5ce4b9
diff --git a/x11-libs/gtk+/gtk+-3.24.10.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
index efd5436f0669..ecf03668282b 100644
--- a/x11-libs/gtk+/gtk+-3.24.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.10.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index 6389db739e43..935094cc3a0e 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,3 +1,3 @@
 DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
 EBUILD libXdmcp-1.1.3.ebuild 675 BLAKE2B 64beb2c9eac2c56d2c65ff231605535778313158bb2f4426957abf8dfb500894217e243bae1f80c4ef1b6b981c7647e8a20aad603c77ebddb680bb8bd4e8bb7c SHA512 524693085023b54c098eb4cdd0757d8f7a49ccc42f208c08b32bbfab4684e4835d7b9a5bd835e6f29b61495dd2e5d4c28dfc840567eaf6c6df8459ad606130e2
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
+MISC metadata.xml 310 BLAKE2B d30b368c138282f71b307e21c101bceac3df72c78519e9a20b124602e84d46d19f18c781e29ed797329122c63459602d56c2be4c5ad62e255e3586865a9a0c99 SHA512 fcfd052b3bd6c53658fea8bf241ca82753c12be1d0850536b02f700d9f9d830304296fee70a3b551ffd0c5d9378e13119c3bb12fd986764c940a644f3ac96656
diff --git a/x11-libs/libXdmcp/metadata.xml b/x11-libs/libXdmcp/metadata.xml
index e943b72b8a48..8b173f9d4e9b 100644
--- a/x11-libs/libXdmcp/metadata.xml
+++ b/x11-libs/libXdmcp/metadata.xml
@@ -5,4 +5,7 @@
 	<email>x11@gentoo.org</email>
 	<name>X11</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:x.org:libxdmcp</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 03066224ae99..d8c13fe8f24b 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +1,3 @@
 DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
 EBUILD libxcb-1.13.1.ebuild 1457 BLAKE2B e073eaa4ae6167b5de1ff2296f4c47085dca5d9699cc3e2b73686b7bc8b8f8f46833aa5a0bbf2d7de27b9fceb6dfceb3effb7c1b37df0ab3ca1381dd527bb33c SHA512 68a0345e90049f6dfb6e62b70f91486f2b281944b7791d3eafd67518e75f319c786d9fee9a7a628c4ab5743f724f1ae72bcc3ac7110bb17a0ebfb7a01cb756cc
-MISC metadata.xml 319 BLAKE2B 8dc76aaf5b8760a5b4a1b6785de5c77cac259c44ec88e41a02834e240cabb2037cf90117462c9aeadbd73502f63e8fdd1223e7dd07fdbfa11fee2c6eb6659cc2 SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e
+MISC metadata.xml 400 BLAKE2B e4de0bffe9b79f7c4a715ade0014f14d85ae7389a3fa523572b4abed6ed6849250902ea479e9aa90745f104c9020d671742d0aec8bffa539e20f0bd7b48f2e64 SHA512 f9688e8ee148768a072e6da7f72985a7a3971a445117bbfa8448f2337ce1b601296501eda1da531c6bcb50a0d3106376e8cda0b98ef10219882c2f66fe02f40f
diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml
index c68f9e8922a7..396f8bde1dad 100644
--- a/x11-libs/libxcb/metadata.xml
+++ b/x11-libs/libxcb/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="xkb">Enable the XCB keyboard extension</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x:libxcb</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index f0dbfe3f8c63..e16c17647da1 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,3 +1,3 @@
 DIST libxkbcommon-0.8.4.tar.xz 648592 BLAKE2B 6205ca08f1ccb6d85320428317e9d023e2f2a56dcaa77e34a9f9ea42bbf67c9ee27a3123dd8e880ead3fa92c4cd7718bde55a255c52f16fef8d33c395c2511a9 SHA512 dbd441d0d7d5ba4fb352d64d150d163d4cdcf8340059457c291dc1fc69d1606ff6589732cb41a7fcfe106af0192977b243d7d68c4d95b90ece7abb620df360e3
 EBUILD libxkbcommon-0.8.4.ebuild 883 BLAKE2B a15d0aa82065f12f9259df5d3e578525b10e5f1448764d9286da355fbddb756448c974628edfe1cfb30cd51db79036836a680ff8eef8ece73f185f03ec1f0d75 SHA512 e8df23bcc8d74d04264c2fcfbecf563d7b01960b929bde15d1d139de915a74098c8c17c5a87b0c9fe0bbcfe3f8324eb072c4cd9a78f134ec8ecf703dd99e1141
-MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
+MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/metadata.xml b/x11-libs/libxkbcommon/metadata.xml
index 7a7bbf810544..720e8a2f5f07 100644
--- a/x11-libs/libxkbcommon/metadata.xml
+++ b/x11-libs/libxkbcommon/metadata.xml
@@ -5,4 +5,7 @@
 		<email>x11@gentoo.org</email>
 		<name>X11</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:xkbcommon:libxkbcommon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 7a79592a356a..c260d5edaea0 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
 EBUILD pixman-0.38.4.ebuild 1753 BLAKE2B e86ec9678222c2c6db62519aa6fc2838a88ce2e6ec9ea700a8fc8748b59a18cd4fd6c489cf866d43394352ddc470df0098e49d56e918abd9938e5b420dbcfe13 SHA512 e842f8d972f82f218d5426a819b00b3c44690ec2437fd5612a06d349b32cb3c87bbc7701cc36f697cedf808f44f18b9f8c26c2170cc8d90652dea98b6b3f1fee
-EBUILD pixman-9999.ebuild 1725 BLAKE2B ba5cc714e618976708ce2edcfae88c380a984455a06bff9a1d8b278bc06ebdc7f30ed5b8a0a3435eb822db18c63795f7ce97f2447d54ee9b5b1010f9491295ab SHA512 7e2408dd9f703a7f042067d64bf76eb35f65ce3959b4190c8cbda34161fda53cddeed7df3fee96dc4c6cbd673cc88dc9a668b6482999b1ff582b22ef648d940d
+EBUILD pixman-9999.ebuild 1753 BLAKE2B f6388f72690d3675f71bc30cd0788e534cc7f41c0c631bef3dd92dc92313bd85241aa4c737ab95381c51baccec31d14ea8973a4406a75322333981ccc043871d SHA512 cf3e78e6ce72008a489368627811e079ecaaa9e7a7566d2846d834df97be6d4b39104298398415b737618c49b04bbd04bae6fbead44004241c74cc439d20cfef
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 97ba3b6a51a8..95726ead8e99 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 
 multilib_src_configure() {
 	local openmp=disabled
@@ -34,7 +34,7 @@ multilib_src_configure() {
 		$(meson_feature cpu_flags_x86_mmxext mmx)
 		$(meson_feature cpu_flags_x86_sse2 sse2)
 		$(meson_feature cpu_flags_x86_ssse3 ssse3)
-		$(meson_feature altivec vmx)
+		$(meson_feature cpu_flags_ppc_altivec vmx)
 		$(meson_feature cpu_flags_arm_neon neon)
 		$(meson_feature loongson2f loongson-mmi)
 		-Dgtk=disabled
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index a6ced3a0b19b..6f5e8761d969 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST rep-gtk-0.90.8.1.tar.xz 251652 BLAKE2B b10a2a88b1950da4cb0f85d7dea53167184fcbf28a515b68de70f9ffc6e6cb9a2e2208020f8d6a9a52235cf4b1454901a0edeae990a2bb7227ba7eaa5da6db45 SHA512 033c148b34591672f29b0a1636b4c962ff82423f627243db07746899bfbf0ccd479322743d0822903bf954cdb3bae662ef7b2f8064cbe2741c5e8cf886e56d1b
 DIST rep-gtk_0.90.8.3.tar.xz 120616 BLAKE2B a0ada2bb13a8104d0dd532f35b64e6b049711284b60b4c4960b730909061ecce058a0ee79517cc508db95647d93f9af95c5ca73cf76e26b59467c8441064ac07 SHA512 d33de562c94731c0ce0fbca574952b9f36c2f2cb084783976486c8751daba5de0d20bc781a06ebd2005e541bbbec3f984453ef65ba6233bb7acfefa31b1acaac
-EBUILD rep-gtk-0.90.8.1.ebuild 1163 BLAKE2B 29f07de2e6265aa82b35d8d9398714edb2edb62c0f201632404428e5a12debbddc8bfc7dada51b30c8ec1475738b28a2e6e23a4cf41fb9e3681cd2c7631e658f SHA512 f66f4e7bad2ef1611fe5aa64379706011d91f3962a078cb9c3448e152e2796bdff99c4e05352df61c5dc243c1ec4c3031fa99e4610560f5d64ee6b82e55dd0c4
 EBUILD rep-gtk-0.90.8.3.ebuild 992 BLAKE2B 07fdc83b91f99f1a69af90774e296876f558fa70edc3ef4e1b61bd8a9f59bdfb08384f39d448b6f883068562d9722eb4f00e5b86a8ef5d361b3b79e90311a160 SHA512 c2128a9ddf5704242b74633bc0a0ea601a9bf640361efeb0e34ccb627fa89bbff9f4a5431cb612e63b258779316af85df998ad8c3da17668c6de7a6587ae3ae8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild
deleted file mode 100644
index 03812c54a2cd..000000000000
--- a/x11-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="A GTK+/libglade/GNOME language binding for the librep Lisp environment"
-HOMEPAGE="http://sawfish.wikia.com/wiki/Main_Page"
-SRC_URI="http://download.tuxfamily.org/librep/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="gtk-2.0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/librep-0.90.5
-	>=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.24.0:2
-	>=x11-libs/gdk-pixbuf-2.23:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/xz-utils"
-
-#src_prepare() {
-	# Fix undefined symbol problems like bug #367623
-	# http://listengine.tuxfamily.org/lists.tuxfamily.org/sawfish/2011/09/msg00026.html
-	# TODO: Doesn't apply, if some people still get the failure, try to push a bit upstream
-	#epatch "${FILESDIR}/${PN}-0.90.7-implicit-def-new.patch"
-#}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-	dodoc AUTHORS ChangeLog README* TODO
-}
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index fa57b7e76f22..47c06b2eafc6 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -6,6 +6,5 @@ DIST xosd_2.2.14-1.diff.gz 8616 BLAKE2B b9eb96eee0bd561923507fb2bddf87e8f9ad986a
 DIST xosd_2.2.14-2.1.debian.tar.xz 17276 BLAKE2B 77caf1f33ba66698ab7f1894da3da27e754fe5989814427de804b9797f71930e2d52ced403f72cdbac9522337876bec2c93fc83b0d97f7e0d05f8b78337d0b34 SHA512 ba5d86d2391e6dfdc6a2994e486f9c5ecd1934438815f4dc01c0633192d74a2fa2cabe647574052c4a87203e0c12b9bb8c38851975c36f19d113787dae3681ee
 DIST xosd_2.2.14.orig.tar.gz 418331 BLAKE2B 2f7b8fbc31a2341ede7bc85c35ede4209c1d3a74ce07dbc62f302aa6d81a00e5e0dd4880d8ac290c0ff0f3babfcdb8b5975f7375cdafdc87fa0747c8ed8295ad SHA512 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473
 EBUILD xosd-2.2.14-r1.ebuild 1099 BLAKE2B a9efbbb9e7b743c9d04f1ebc6c803c427a312ea3e792c1fa5903136a3cf32fee16c1e53358dbd6e9d890c59d7b8665557c247ab8014a30b6bd6b18a372e512ae SHA512 b0b66039f6275381f403a9be4f5354cd4bfbee8b8ac006aff95fe20b0876dbdb866ea01be8ea3b5eceb374cdb21f5ed988edd8d021a44988b0679ee060ba954a
-EBUILD xosd-2.2.14-r2.ebuild 1190 BLAKE2B 054a0dae420343fd1cd566e99a27303db6c2864ce7b3f9f80b951a0cc2d378d1b60991b45a037b0d14c376c35c6408ce9ea82abded92dd082166e401062db3c6 SHA512 07682fb573d500f91c8ec140edd30b7caa438a38f07e05f6fde9b040d4ce26d58023c3f3e3783364faf1bd52ed73cd0ab3ff9b07ead6ccbc62e4d340de1a0f89
 EBUILD xosd-2.2.14_p2_p1.ebuild 1299 BLAKE2B 17b626b5b5fe3a3575c1c5e920a3540ee3dad816090f4144fb2d020734043d19b1756af3b13aad2be880de7ce06eb672bbad6f2133dd862b4df818fb0b3be995 SHA512 b4c294dec4978c8bb2ba6b16d1505f678877b814c1fc0d9231cd085f829177017441b0a0e5fe80215729d069e4702a5d4931b4df97fb26bdb8f110bff15f5b55
 MISC metadata.xml 242 BLAKE2B 7363ed5aa4ab2d52ba96610654eeb5e2f2f8f0c2e5ca4f695f6ffa88af926130fcc9ea41257f281b542a45703848ecdf78ff99c89f1fbe51116d8e6234095782 SHA512 cf2d021687f90caa78f0f9738a07a81fb632ff35dd323dbe63b080f3985d9bcc665e5cf8549840e2369d1c4427f9831a0d61d20c4b65bab93794464a98f82519
diff --git a/x11-libs/xosd/xosd-2.2.14-r2.ebuild b/x11-libs/xosd/xosd-2.2.14-r2.ebuild
deleted file mode 100644
index f5629247357b..000000000000
--- a/x11-libs/xosd/xosd-2.2.14-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display"
-HOMEPAGE="https://sourceforge.net/projects/libxosd/"
-SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
-	https://dev.gentoo.org/~jer/${PN}_${PV}-1.diff.gz
-	http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="xinerama"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	media-fonts/font-misc-misc"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
-	# bug #286632
-	epatch "${FILESDIR}"/"${PN}"-config-incorrect-dup-filter-fix.patch
-
-	AT_M4DIR="${WORKDIR}/m4" eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable xinerama)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 5dcdb8b5a7de..83d04c833270 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest
index b7d92c87ea24..ff2e714b2420 100644
--- a/x11-misc/grsync/Manifest
+++ b/x11-misc/grsync/Manifest
@@ -1,3 +1,3 @@
 DIST grsync-1.2.6.tar.gz 333540 BLAKE2B 20719580309aba5737b74e85629b21b9715ceb8d97bd00d1840a5eda0e04316439d90999b7b787cdf8b368fff90ba489dcfc3b91992dd599f7ae05f4a565f1e7 SHA512 a7aac0cf264c968d50896156730dc0b925045def6e513adf1f2783e19fd1cdd423aa69480963479b95927fb4e863f110f3fc0439661ef7cfcacc7376fe95ff1d
-EBUILD grsync-1.2.6.ebuild 498 BLAKE2B 3ed19359d70b48cdc85befe8569b7a1b1b4336131c3b6a2d18d9c6ad221d257a5c414117c58c75a99bebc1fc20dd9d8a244df5b2f516825e39836cee9b39a2c9 SHA512 df1a619c1722547c956fd79a4490f13cb4e6aaedea6e2ff054f22bc419ee93dc5bb05cd7d68b8328f8899758ac066a1f53fa2b50ebee8acd77246f111a1759b7
+EBUILD grsync-1.2.6.ebuild 496 BLAKE2B ce9eef255c3e3212ac54f12253264633b48a8f4b103dd35a14d3b94786e3ed7e3d708146a36127c95cc0a19422c083a15de6ad6109cd9600884a3f9119b6fc18 SHA512 de5e2c0f10f9ad3d812c6d2159bdc88f95c54c5edbb8b5988c73a2e617778d6c1bb22bb2adee79fa995485760a46a85f6710ca3d132875dfe2c097b0d7e45886
 MISC metadata.xml 258 BLAKE2B 46e283e28202f000bdb3b2b01ac3b3e4aa25a42715e1940135cdcef61181c745865042fe44a908a5d3e83308f7f98f0eff2b8519c0a4691e3bf5637799de420e SHA512 9909d39f5a2a4d3c92d1c105ea5250603f505e9fbb0ff433c25290ac5c2b53f00d96fe8dc0a98bec2240298b3b7060503f59caf04cb47484a63e4057bcce82c6
diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild
index 3476502ec396..a799b0ffda98 100644
--- a/x11-misc/grsync/grsync-1.2.6.ebuild
+++ b/x11-misc/grsync/grsync-1.2.6.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A gtk frontend to rsync"
 HOMEPAGE="http://www.opbyte.it/grsync/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
 
diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index 03973465d30e..4f839f50c625 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,4 +1,4 @@
 AUX i3blocks-default-sysconfdir.patch 373 BLAKE2B 4483b6c4e838559997acff86c46a879206decc0e834bd92cf8573eab28f5ce3ec74f186ce53fe3e2a69f8e7006265ce956f677470828f8b3e1bc40b5ab925abe SHA512 db974877a1eadb1b37279dd4e4159b47947958f688aed94dd3e3c49457a94a0e5d803f221dc7a160ed2cfdc915399892d010a1083a49a7ba7a53d49572c16554
 DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578
-EBUILD i3blocks-1.4-r1.ebuild 772 BLAKE2B 95b265f0688bfe391f387915d9c97a03e24108c43962927f7673ce517290b01217d96db7bf54d400956343cb552d188385b36e8116ed9d99d1288b3d3f4c3203 SHA512 b062e292ad61e9060bcf5255344ced864190f0c355580467e633baa47681766fedc967959ec68ddda8f83b8b111cd13543184c483d8ead2a558082752f220fe1
+EBUILD i3blocks-1.4-r1.ebuild 772 BLAKE2B 20d48a2f984aade294280830ede7f6cdfe79b86b34cd269762896827648af0c5cc3e848ab9607bf140ba1600b5c5c324f4d50ffa4bbd931aebbaa67ea49480c0 SHA512 518be7c571700a5f1a10c7f19e79c66747adefa54535eb7a884a31a15cb61c41051fb9f7c9b31a327bfe05bb0817beabb837df6eead4bb71b1f22a3a73681a78
 MISC metadata.xml 331 BLAKE2B 4e906b5d485968ff9cc55dca82cbd704cc57a5ecf77c230bb7fd6e2a910c236bc0afa1d457f4b90b758ca5ecba0b2505512fc21f7dd12179d2b275d425430a14 SHA512 2191950260e909fd05a03d80a1f9ccde802e4e3ab890a2e05305f2e3e1c48e4c56200fddc9019b630a9efeaeac92509910e1f9b22f1a2ce85a8d005930cd05af
diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
index e481e6cfda3b..165a389c483e 100644
--- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-3"
 
 RDEPEND="app-admin/sysstat
 	media-sound/playerctl
-	sys-apps/lm_sensors
+	sys-apps/lm-sensors
 	sys-power/acpi
 	|| ( x11-wm/i3 x11-wm/i3-gaps )"
 
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index 2a16542f3b47..c2576118db18 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,3 +1,3 @@
 DIST obconf-qt-0.14.1.tar.xz 97032 BLAKE2B 8bfe93325d37bdcca40b38f99f635cddf39ad1781e694f002676f6ff6fd0d6c708908ca458a051f63509f572b247b4de5778a1451e763c4372038ef99a1594d7 SHA512 7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed
-EBUILD obconf-qt-0.14.1.ebuild 897 BLAKE2B abc3c5c4068221a95161ffe51178b32baece88769aa979cb719e966922e04089dd229b11afd48f9cd08a6a6a0b240c28ae25e66ed13048abb02178574fa796f0 SHA512 ff86b7a9f2e3f924961461c959d9532e036f95c3d496ea00689173c754286e01defc784186bf1cbaa77c08aace6925b67687bf345dae0f2dad472c45cbe951c3
+EBUILD obconf-qt-0.14.1.ebuild 904 BLAKE2B 7e3123553f5345d7872a41d975a7dc1c2fb5135b93e925574427d65162ade6c0fc3d9492c7d661d8dec20230cb9ae0e7234b6f3cf492f95b8c8631cf51bc19bf SHA512 de4040bc6ba5e72d7ec639d35cc116d7d4376db8b6e33214a8ae9263131163bc0096404a991d864449568f9061c01ea48ca9659e9c524530acd615d5c9ea7e36
 MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
index f67003d63b24..11fa1f32bb9a 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index 1da7b38d798e..ab22c8845851 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,5 +1,3 @@
-DIST obmenu-generator-0.66.tar.gz 19352 BLAKE2B e08591922c18b79f895f3080bd494287c227672603dcd224241c87295b3ace891f4e5419306d7065d7374d845ced06d109903382bd3a656348874c943d94b723 SHA512 75da0f62f591f9a9678d93560826829c0555ba5de3359be90c2cb16c4b8d07a9f10cbbd53f4a08cf93f75d6df8cb68381fb9a975cdb8500bed4ec7b51615e287
 DIST obmenu-generator-0.85.tar.gz 20558 BLAKE2B 526657eb9fc7ed0adc3681809d0f8b763f5faf7b2cb578962e1c2ab2e2bd488f386bcd6e7bf45e5752a2d339048af37f05bf31ef3947c2a9642f15e99db00eac SHA512 d6925ec8c2b75eec12bc23840799cedf4b882787b62a6b8814ca6c8b3bc5d22d2b8a4510fa6829d66541923caf3163a85eefc068a96ead631a3200467c563545
-EBUILD obmenu-generator-0.66.ebuild 577 BLAKE2B 306c1e1c5193bd2312ed88b8e3828b505aceee689e5a18231d3d5862bf9ab9a17c780d5fcf643dce119b82286bfc79c9bbb7e123a47071476b58f54c5d9111e5 SHA512 2548ce8d28ef16a95c257fb9a886affa9a3c0f067827d386263da831ec4c16818b0bc61717747946fdca08b4de9fcc35b7ba5128c872a6b82901c507b1bb3f6a
 EBUILD obmenu-generator-0.85.ebuild 559 BLAKE2B 94563f4460da98eb4bb7fcce5e2b79a6dca8567009dd965e34a168d913e593ce74f2483106c418c2529cee3ac2015f77de77287eefa0438ddb3c7f32c892b913 SHA512 d37cd81fa57d761a3481c445ec868f8286f9903f111cbac4ad72fe9cf9d6d554ae921761794bb5f95abeec9e60825f0780e4249c88b92fb19482f738ce875976
 MISC metadata.xml 366 BLAKE2B b86e2366a6df0199a2fc48e10a6aea3f0d2c12a60013adb4f1308b18a082e90f0b21a28fa539f36eb8fd575c7f645e5b53422c8d553810cdb82a626593dbbd5c SHA512 7bb0e3571b601e324a4634f33eae29592d3a76d9636d3dbfa6bf2e486386672d6c1cac041e95028b76ff107877fba18f66fbbeef8eb72ab9348de97d6e91853b
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.66.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.66.ebuild
deleted file mode 100644
index 23597f915649..000000000000
--- a/x11-misc/obmenu-generator/obmenu-generator-0.66.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
-HOMEPAGE="http://trizen.go.ro/"
-SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Data-Dump
-	>=dev-perl/Linux-DesktopFiles-0.90.0
-	x11-wm/openbox
-"
-
-src_install() {
-	dobin ${PN}
-	insinto /etc/xdg/obmenu-generator
-	doins schema.pl
-	newdoc README.md README
-}
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 0c9a6e6585b1..9cca61b1f3ad 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -9,5 +9,5 @@ AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f5
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
-EBUILD sddm-0.18.1-r1.ebuild 3108 BLAKE2B 61985293fae70ae9c621c4dd793180055ffdc7cc4aae72075e35ed01bb4ad8e8b4749c9ce870ba9570d0198d64f536feb86a898b440323e88a4db7c842ce75ec SHA512 a8a4b891dffa14bb276f46c724ffd74b422ced67becadbd7d1fbab5ab4d96f7b0caeb287fc81e9c0f35a7fa601906edbefb5a670285f369220a194fc34458c5a
+EBUILD sddm-0.18.1-r1.ebuild 3115 BLAKE2B 28a915bba1937f1c58e11c3ab5e9e815a3a0a1b60d84b02def057a7c1fd391d3047f16223b7382386738d101abd7269758cb8dfb05375b5bf7089d46bd3be115 SHA512 5e2bb8279b1ff7ff392c6a0a10251beedb57f0ca204cc182fe6221452f7ff93e72ba26cd65664f2c91b8814aedb5746ade2a655c1a947214ff790e90fc3ff3d6
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index 2f50d0f57a00..6aa05f682d1f 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="consolekit elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index e76a2209d4e6..79038e83bd07 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,3 +1,4 @@
 DIST vdpauinfo-1.0.tar.gz 88567 BLAKE2B 6f0834bf6a8fb83204b70858ac529010ab69c55de4b2c6b8b8864ea33aed385bb9125ad12a82a28086dac43f39f06c2b757718142d800b5de2263513e9c5f02e SHA512 54c177424bdae65374a13c0546ecda0e25e7357f9e779fb48dc018a9c11593039f87715ea18b320684dca22455df9b41a4eea6b0f977956efb6ab85b8b99297e
 EBUILD vdpauinfo-1.0.ebuild 468 BLAKE2B c05da34e957445e60eb712db339defb72093fd0ce39fcb56c93dee9d67002d9d57507da439e54aed3fb9b89db7f8555fb9e67e63e90aa940a6bbcb8ea84f0d88 SHA512 5e6c58eb2a50a1a7040ed6355016730443dcfddb3a76da8efb38e235974466fa31d8fcbfb12cfc9f9fff7fe175a7651cadc8df3a44a01aaf8cfe71ef936e5bdf
-MISC metadata.xml 247 BLAKE2B ff88597c9ef60254f0818903a632dc7b1e85ca9193202e9001308c597430343283a13ba66f6b32e838bb904207e30d440f1bb95d65c0d663b58e1e6288e708d6 SHA512 e0b9dd88835de51f48aa42521b6540a1f2c7c7b4c419875eda099049cd0793352ced1717851e190a13fc10d2572963e10ccc3a8bae97a8b22190f9c3ab4401e6
+EBUILD vdpauinfo-99999.ebuild 515 BLAKE2B c350d4c00d47de2ee887f1f2054afc61c3952740f08b6d8bbd366f61181868d462528c8e05120820232f12cb38a6336dcd622cbb59021aee22260e2664ad18bd SHA512 0f638788bf19f242501804988f27118cf49cd5aba4b219f01013f2f7d414a6031dc9079d524c6343421120de41c0ec406c0468dd599f9510ddf7d4beef2c14ba
+MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/x11-misc/vdpauinfo/metadata.xml b/x11-misc/vdpauinfo/metadata.xml
index 349b99bbb869..fed47a353275 100644
--- a/x11-misc/vdpauinfo/metadata.xml
+++ b/x11-misc/vdpauinfo/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
+<maintainer type='person'>
+<email>jer@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild b/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild
new file mode 100644
index 000000000000..7f4ca7b3d7bb
--- /dev/null
+++ b/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3
+
+DESCRIPTION="Displays info about your card's VDPAU support"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+	x11-libs/libX11
+	>=x11-libs/libvdpau-1.3
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index b0009b0cdd80..c589c69648b5 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,4 @@
 DIST xkeyboard-config-2.27.tar.bz2 1664454 BLAKE2B ac5e02903f46579a1df0423c01d2c07412642d00a5e73b05c0d112e4a65163c20c2df762438775afc52445eed47025c8e061fa0945140245679b693d740e904c SHA512 ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e
 EBUILD xkeyboard-config-2.27.ebuild 1255 BLAKE2B acba6a3442b60470401db9b898927172f7f32d0f2e625c85701bc47fb9e4cc806f1f51031b5375eb5b195d4b2f3ff53fb5e7af88cf1511f123813d6e07bd75b9 SHA512 b7e457f396689ee4653fbabe3a34025621026b14d1cb11638c20cc373d0931d379747cca2466dfb3b732d92e6a446c45a2bfe98fde0709b0c838157a286a2deb
 EBUILD xkeyboard-config-9999.ebuild 1266 BLAKE2B 16798865be0a1659f706780c07c79caabb51f1cb9b2079e595122ec9afc49dcce769e784fd0e7ff0ea8f3581c7a03aff30fe773cbe7803a2a9f7ef627994efa4 SHA512 ec7096942471274e3ac0b78e5bfe8fe569259d3571ce83a4dd92cf5de2f52999b3d05e11a6aa8f31f8c9994d8c8dc77829ce3b65863ebf2c8d1e7bdc26d4cac5
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
+MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml
index e943b72b8a48..d3cbfbdb344e 100644
--- a/x11-misc/xkeyboard-config/metadata.xml
+++ b/x11-misc/xkeyboard-config/metadata.xml
@@ -5,4 +5,7 @@
 	<email>x11@gentoo.org</email>
 	<name>X11</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:xkeyboard_config_project:xkeyboard-config</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index a07439643cd9..ba9a070d8631 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,14 +1,13 @@
 AUX xlockmore-5.46-freetype261.patch 587 BLAKE2B a5666fd2c06d23b388d20cc8fbb6b64b47e81c219a248f539e76fdaedafba8765a3f8786483d801f8f95703b1d6911c4d595bb904daf5a010faef7697ceb1226 SHA512 330d2120a0e3c9c6ffffe90e1fdde255325394fc03aa4f9d532086859e6bdcb3f80aeab4a0b4d7f5eae4bcaef69fcba924ec86014c3c8e13fe8c878f9ebc8077
 AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd176616c531aa71ff5d051169165f991dd8a586685b5a0b8e1a66b0da247a441fd7a56ecd24cc39bd58f2267e8b SHA512 4eef79a2b791401433ae0c6e55179975f88b74c4e57cd64ca81df48a232723e5edaccbd7045c9f67ba81ba159e70257d5e070ea59808f52430ac08539ea91087
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
-AUX xlockmore-5.56-soundpath.patch 501 BLAKE2B 1d0197fb2a16f47560033f2143a53e3c7f20863fa809a22989b458235c196ee0d85e0c391d6b61ec169795ca65b36d180f8a5683604f8fd14bb4caee90bd96d5 SHA512 1f0768647b965322210a0640144d56e40dd95912998a5b7004071139c1e305741cb10bdd27c0297e957b2a78264c867a579f0a7f2af389d473fcef897126df97
 DIST ax_pthread.m4.xz 6356 BLAKE2B 784bfa3fcae2499230acba588cea5591f62229d721cac357012c5d19b0a506c2d77201145eb90cdb15217190926cdad09cf5897e49dc3644be41ccac30e60ee2 SHA512 04dddd91a98a4f544d065de1b70340e6835657015385959d98c3c5eedea175f58657db73b60011af181a8cf2ff5d48d533cedfa6020943d8b41770bdc4aae329
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
-DIST xlockmore-5.56.tar.xz 1649808 BLAKE2B 82d56a3570bd1be52014503d7c0a36cf27f68aaf31fe4a7ed06159dc796dbd1410711a56fa8e72709499b1ceb3063b2acd9646ba38400669d3671d04e9fb5745 SHA512 1ae5cde5d0167897229e9cb8ebd15e26fdeadc9b0e2d221e6334980f23403385bf1adbd44a955b455e3ecdf8b02b18b0e06273d8dc566b17ac3692ee5ae44f4d
 DIST xlockmore-5.57.tar.xz 1835880 BLAKE2B b26a9792286ded7647c816b907107b9c524ddbf46afab94c5b6b5dc5d5c918f5715c914ce4246497018bd56fd11329bcd1afe07608e44a70d24dd2c4c3d97e38 SHA512 2107efc7e1e9c811b6f86e9bb048dae3861a4e2f421b3d963856a77746834c08c5d349dc15cb3bc9b9aaf21abdc8f0e4af9463a90359b575604f3393c325400f
-DIST xlockmore-5.58ALPHA.tar.xz 1849660 BLAKE2B 9b4be74fb1987bb1c946e63f8cf6ee596c0c0a7af4682cffe78c0341c5d444c111478f9849ff44db3f5d7dba317bcd464e0fc1bd070b5710250da56b392e36df SHA512 0457499376294d3aa295a24e7aa6d40f0da4e2b09aaf85bd0aaa32c9b7a5f52edefab69ec2815994e476f43719ced21f6cde30bcc42f6c0f2ad60884a405c80d
+DIST xlockmore-5.58.tar.xz 1878452 BLAKE2B 90b19c7c7c99188b056e69d80c0e89a0030faba46f942bd5e278403cde00ba66fe626f457dcf03e049280c0eff1af0dd3e598dda8e2d8d7eee194e38e97124b5 SHA512 470107a9f00c94db8f1ce20c33d04a3b0cbd3d5616aeffa42f98d3a75053cfd8a05a63e38349a88cfc3056fb7bdf3beeaa4277dc83121c35bcff071955ed9511
+DIST xlockmore-5.59ALPHA4.tar.xz 1884644 BLAKE2B eb3c7ba4467d75daf9cd7a12a256cc2c7e5a81aa8635d46b4190a03d1e6c509dabed717976d7bba6de9e58aca35530347da059bb48f6d71bc16d0d6766a05479 SHA512 ea4f47196432013c52078b0c5af4172e7db7ff064b37dacd6890886b815c2b18d439109cf871428b80eb0654132c318e3b0231176ad3c45f58bd72c003ca66f9
 EBUILD xlockmore-5.50.ebuild 2165 BLAKE2B feadf465ae112ad5d4b482a0a4fda8293eef90f2daf76076d37175182dfcd2491f7fde83af37298e35eedb65f7c27b3915e3f3ef60b4c3ec1ee6145dad125ee5 SHA512 982a26f33a14d5ccfee07f190cf4a4391c2f767b000e8ebdbe46a6f71650bb4beb9d1758fdf947f801b27bc3f331eac5c9e95d6cd779ebdb5d81e1cedf81c673
-EBUILD xlockmore-5.56.ebuild 2422 BLAKE2B 90a79533897d5e0cdab0d3b4fa4009894c50ee6b2f199078e38a9ff873da117dc9c0c5935435c5b640edf4d9c147512ab9e4a57fb70502b150782bc9ed3cfecc SHA512 6d88bf97b12a880203fe79d788db105685ab219c94ee5ccc33ff99d1120d39e3a8c7d5cd4cccddbfc507e13abe0710054e306c0442e5adee625bccf096526895
-EBUILD xlockmore-5.57.ebuild 2370 BLAKE2B f03ad7b49be9ca7967c40613573ca4d8559c670d7bbab6a68664467163d37dcfa9f8edd4fca6d695cebcd3c45d1fdaeb72806dddcb086cfecf8ed13972eef7bf SHA512 471580b4e69912f2977e5a7c0e6d6fce3fc5462d031aae67ca8f19aaa7c8df4a96e338d98a7f3ca881466de3e6bd2c890d165048090c24f54a9bc0e78ea6beba
-EBUILD xlockmore-5.58_alpha.ebuild 2370 BLAKE2B f03ad7b49be9ca7967c40613573ca4d8559c670d7bbab6a68664467163d37dcfa9f8edd4fca6d695cebcd3c45d1fdaeb72806dddcb086cfecf8ed13972eef7bf SHA512 471580b4e69912f2977e5a7c0e6d6fce3fc5462d031aae67ca8f19aaa7c8df4a96e338d98a7f3ca881466de3e6bd2c890d165048090c24f54a9bc0e78ea6beba
+EBUILD xlockmore-5.57.ebuild 2374 BLAKE2B 398a8458d84b479fde1a7b6b53fb232aec3a8b66a0430f62ea1896b9e69a9b34ae07acde840ee38b6aefe7a4405cdbd2b11f90d0576303bad76566e5f08607d6 SHA512 0a9e3410a71c8251439e15cb3c5695137de3149dab414e1b31b489c576021063240b21aac39e99e701546c8ca1404ae3d959d4d473b13bc7b7b09c51ec497eb9
+EBUILD xlockmore-5.58.ebuild 2374 BLAKE2B 398a8458d84b479fde1a7b6b53fb232aec3a8b66a0430f62ea1896b9e69a9b34ae07acde840ee38b6aefe7a4405cdbd2b11f90d0576303bad76566e5f08607d6 SHA512 0a9e3410a71c8251439e15cb3c5695137de3149dab414e1b31b489c576021063240b21aac39e99e701546c8ca1404ae3d959d4d473b13bc7b7b09c51ec497eb9
+EBUILD xlockmore-5.59_alpha4.ebuild 2374 BLAKE2B 398a8458d84b479fde1a7b6b53fb232aec3a8b66a0430f62ea1896b9e69a9b34ae07acde840ee38b6aefe7a4405cdbd2b11f90d0576303bad76566e5f08607d6 SHA512 0a9e3410a71c8251439e15cb3c5695137de3149dab414e1b31b489c576021063240b21aac39e99e701546c8ca1404ae3d959d4d473b13bc7b7b09c51ec497eb9
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch b/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch
deleted file mode 100644
index a5c9079e3aeb..000000000000
--- a/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/modes/Makefile.in
-+++ b/modes/Makefile.in
-@@ -624,7 +624,7 @@
- install-sound :
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	@NOPLAY@$(INSTALL_SCRIPT) $(ETCDIR)play.sh $(DESTDIR)$(bindir)
--	$(top_srcdir)/mkinstalldirs $(SOUNDPATH)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(SOUNDPATH)
- 	$(INSTALL_DATA) $(SOUNDDIR)complete.au $(DESTDIR)$(SOUNDPATH)
- 	$(INSTALL_DATA) $(SOUNDDIR)identify-please.au $(DESTDIR)$(SOUNDPATH)
- 	$(INSTALL_DATA) $(SOUNDDIR)not-programmed.au $(DESTDIR)$(SOUNDPATH)
diff --git a/x11-misc/xlockmore/xlockmore-5.56.ebuild b/x11-misc/xlockmore/xlockmore-5.56.ebuild
deleted file mode 100644
index 7679ed6cc890..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.56.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://dev.gentoo.org/~jer/ax_pthread.m4.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( virtual/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-	"${FILESDIR}"/${PN}-5.56-soundpath.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_unpack() {
-	unpack ${P/_alpha/ALPHA}.tar.xz
-	xz -cd ${DISTDIR}/ax_pthread.m4.xz > ${S}/ax_pthread.m4 || die
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-flags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	pamd_mimic_system xlock auth
-
-	if use pam; then
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.57.ebuild b/x11-misc/xlockmore/xlockmore-5.57.ebuild
index 360f6c9070f1..ddeb507159c2 100644
--- a/x11-misc/xlockmore/xlockmore-5.57.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.57.ebuild
@@ -55,7 +55,7 @@ S=${WORKDIR}/${P/_alpha/ALPHA}
 
 src_unpack() {
 	unpack ${P/_alpha/ALPHA}.tar.xz
-	xz -cd ${DISTDIR}/ax_pthread.m4.xz > ${S}/ax_pthread.m4 || die
+	xz -cd "${DISTDIR}"/ax_pthread.m4.xz > "${S}"/ax_pthread.m4 || die
 }
 
 src_prepare() {
diff --git a/x11-misc/xlockmore/xlockmore-5.58.ebuild b/x11-misc/xlockmore/xlockmore-5.58.ebuild
new file mode 100644
index 000000000000..ddeb507159c2
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.58.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://dev.gentoo.org/~jer/ax_pthread.m4.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( virtual/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_unpack() {
+	unpack ${P/_alpha/ALPHA}.tar.xz
+	xz -cd "${DISTDIR}"/ax_pthread.m4.xz > "${S}"/ax_pthread.m4 || die
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-flags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}
diff --git a/x11-misc/xlockmore/xlockmore-5.58_alpha.ebuild b/x11-misc/xlockmore/xlockmore-5.58_alpha.ebuild
deleted file mode 100644
index 360f6c9070f1..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.58_alpha.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://dev.gentoo.org/~jer/ax_pthread.m4.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( virtual/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_unpack() {
-	unpack ${P/_alpha/ALPHA}.tar.xz
-	xz -cd ${DISTDIR}/ax_pthread.m4.xz > ${S}/ax_pthread.m4 || die
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-flags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	pamd_mimic_system xlock auth
-
-	if use pam; then
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.59_alpha4.ebuild b/x11-misc/xlockmore/xlockmore-5.59_alpha4.ebuild
new file mode 100644
index 000000000000..ddeb507159c2
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.59_alpha4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://dev.gentoo.org/~jer/ax_pthread.m4.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( virtual/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_unpack() {
+	unpack ${P/_alpha/ALPHA}.tar.xz
+	xz -cd "${DISTDIR}"/ax_pthread.m4.xz > "${S}"/ax_pthread.m4 || die
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-flags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}
diff --git a/x11-misc/xsensors/Manifest b/x11-misc/xsensors/Manifest
index 96e07c186a36..5e535bc30a28 100644
--- a/x11-misc/xsensors/Manifest
+++ b/x11-misc/xsensors/Manifest
@@ -1,4 +1,4 @@
 AUX xsensors-0.70-gtk220.patch 1566 BLAKE2B a36a31d4a7810d77d5ee3d451936a111204570863c253d7a6afdd7d058b87ea58efa494a048f32b29cb152b30025a1f23d5bad18d0a14ee481ee909f373b692a SHA512 24196915ebde6264a5ec364539ede4827459a87e675dff3e187a556d4adb24ee0efb41db49fe2ae0c94e5ab467eb3caff205df28d30c15c8bca9f78641324199
 DIST xsensors-0.70.tar.gz 115430 BLAKE2B af18fa723a9e6b84df62d0ea0397d7b30ab800816b84449f91357aa75d99944796ae8164171bd217118dd93ef713d286fe435354614baef7947f3f851b368df9 SHA512 34f038b192f3cecb2e7587e19c4837b795a2705e6d0e9ea2bd3ead6d3259a1dded364fcfc70fa5e37d64f32c879e1dd9c6e43dcf32fa9aeb73ee5cc49bf290a4
-EBUILD xsensors-0.70-r1.ebuild 708 BLAKE2B 2b860476bc1eb719bf062ab870b4a52c61271034f68cff358446fc1881a8903136c1f5e6d6306dc6706c5503cbc6e26e26f34b9b8e7c18dfcc84ea4f0c8a8f43 SHA512 d92bc077f023345ad6fc6af4b23b7d467cc2d5b420d21282efba043cf9717d05c89689801d6c9ab9e20a8aa531bd332a719da5ee0a39f0eabea111b3382dadea
+EBUILD xsensors-0.70-r1.ebuild 708 BLAKE2B d4f5951126d6dd67f0f93d5ef6bfaf1ddb508a1fc38769ffb4c1d99cd8bb72a1892834dada4a72adbf7ff278caa5f343a4313577ed0645f1c00aac36b73257bf SHA512 846d49b4ba76bb7a46f40068f1ea522d6590bdcc18b64796d9d54523a8d2694d55112030e3254a3d70b78286c69d8b2fcd713c7c5480967d836907261659a5f0
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsensors/xsensors-0.70-r1.ebuild b/x11-misc/xsensors/xsensors-0.70-r1.ebuild
index 344c180cf8e6..bcca5da249e8 100644
--- a/x11-misc/xsensors/xsensors-0.70-r1.ebuild
+++ b/x11-misc/xsensors/xsensors-0.70-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
-	>=sys-apps/lm_sensors-3"
+	>=sys-apps/lm-sensors-3"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index b950a277a107..30628ccfcc5c 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -3,6 +3,6 @@ DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5a
 DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
 DIST zim-0.72.0.tar.gz 2590406 BLAKE2B 0d77052e9eaa62b855be30eee64863197498ee54949f8610528ccd86cf32e7c9c55fb2faca719a4d92e0568941dc6b100299e76a33f8c49bddc5e367ec98d923 SHA512 60f59c2cf2ebb920515ecbc77e7fb1ddb9b0a6f6179503176b582b6b87ada759707ec4ccee929896a8a7d489f25ff13f7a6ff61fa637ecdb3d02640182cda0b9
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
-EBUILD zim-0.71.1.ebuild 1913 BLAKE2B 0b8bd0e02d0882a56cca1e7717092b395a2c0f34dfce0f30366b7e6c8a97d5d7962a36ee8fd93c258436b384f0064ef7e11c8382135583cf57b27bdc7a57fb81 SHA512 8de22f9256a69d3452eeda7dfb801707011886c7d772c8acfabb64caa11c5fc34a16d505895b84a6be6f41b072e3c45e262f3f40fff0594c312456bbcf741564
+EBUILD zim-0.71.1.ebuild 1912 BLAKE2B 453cfa5a308a9e00622a508b27aae0f0511b241a8f1ca9f3555964defec514617430e3b88e92c10b2814e2ce727c8f975e273315dfbbcb8759fc4d85e593a1dd SHA512 a6b3845fb5a20895e96027221e2fdc4a23958e2ee9a7cd8e220037c30294288bc7bc5a353ce6b9a5e46cc8a2c6cb9c1221382b3fafe4ae7a3d38db175a4777ac
 EBUILD zim-0.72.0.ebuild 1895 BLAKE2B 066acc255bb356c9841b4e7eae17b3baa632b4b9c7ad9dba8ec926ba1590484a87f0525ab8e73dadbb9bdf92c624da37e84ef117bbca2e03ed9449695799826e SHA512 8d05dbf1c1db89f4dbbc0de727b8be11a6c908bd08b11f9b4601af9feb78a6e80422bc8dd3a11869abdd73295ce48d4bc3bf9eb86238b48a55288ef786a8f5ae
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.71.1.ebuild b/x11-misc/zim/zim-0.71.1.ebuild
index d8925b78f1d1..99b03d91550e 100644
--- a/x11-misc/zim/zim-0.71.1.ebuild
+++ b/x11-misc/zim/zim-0.71.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test"
 
 RDEPEND="
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index d6e083c64e9c..717fbbbf51c4 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmacpimon/Manifest b/x11-plugins/wmacpimon/Manifest
index 4d2bf7cd9c4d..64cf9ac93689 100644
--- a/x11-plugins/wmacpimon/Manifest
+++ b/x11-plugins/wmacpimon/Manifest
@@ -2,5 +2,5 @@ AUX Makefile.patch 650 BLAKE2B 2dc6d65ff772b2a2594704acfcfac023183c1b5990075c9f7
 AUX wmacpimon.c.patch 972 BLAKE2B 70e600339f3a43ca190ba67201dbf9dc6f0b2c0eca8171b333058624dbcfda0280999106215e959fec84a77e0bdc593b17173c515391fa1455b6573e61c4a8f6 SHA512 cb9080de40ae41804c0b4f8d1c105c7eed758cd12be71fda85afc0eeebb67965e619a6ed95b09bcaef99f0a6bebb51fbb7764080fbe511f1fbb483d43e581650
 AUX wmacpimon.initscript 407 BLAKE2B f8a37c7f73febf9c1bc5403bf8f70ae95def8a2d411540ddda19d97bf07f4514ff13361a255dd52bf615e4243f3e9a32c38aa09d9b009068a5db01b259229c93 SHA512 cecadb137bc6acf2ef4c85afa75dd186c9217435c07384c8190a81e727509aa3715bf3b0e5c9851f0a54c6bb9d70c08339275aee30d110bd0cd3f37a9410f866
 DIST wmacpimon-0.2.1.tar.gz 26498 BLAKE2B db1d308b24786a0db0fed5763ab5191f6ac2654c62d75996acaa93867cf7bc588da1f763b5483d64563b1e26b8d48063f143c28a61b61c4cbdb8de6c7ad58d1b SHA512 2b2d1da7608272969f0a2c98fae6398ebaa663a847acb79c795870cad85ca8d1317f5dfde6443634419c0c59b7457356bb8c195c1e7936f3cd8f3b251406084b
-EBUILD wmacpimon-0.2.1.ebuild 1031 BLAKE2B 193648338b13254fc1260724427754d16faf5add076dd0cecba27f78a2bf74b270a02ceb39585a4a2f7c57737212dcf698eabb57bec5ca2d6c794a4fcf0d4546 SHA512 0d30931801d86cdb961422bcda2c4c02de98885aeb4829a84e8b0f1b383e90fb0a1bdb5f39f90079ced9a8f74223f07191ed29ddc7f12ec95031e4c768eda904
+EBUILD wmacpimon-0.2.1.ebuild 1035 BLAKE2B ad88a1467418421200d4c4f2323dc9ee8fc92030f46b7e1ca81eaf5e900a4a914833388f8b809a1ea002a09429b8e85b909c10e89ad8c2a33c6018896c1e80ed SHA512 7fe519e4a8b2e553a9d8a22ab6272feeeee921c0f916dfd162cabac0708a0ab03274be09839c0f0e567fd1b716185e7fc27c48415859b3a7bdca02ea772e65ed
 MISC metadata.xml 571 BLAKE2B cd4ecf0c7fdd14001596376389736f3efb5ae152884a188d9dd4568ac62385635e2d331de2a445e8a22947c1f48dd417784d0fc3e2cbacfaad8ec79a19ff2546 SHA512 a749cc0ff0e2ac2aed7f2e06e5d389e7a98142468c971940343ee704eae69b9e9d440056cae76b33d69d330096fd1c216504ac0509b0c4a2bc1a4e98e4111959
diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
index ffc03d2648bb..e076f7013f39 100644
--- a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
+++ b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="DockApp monitors the temperature and Speedstep features in ACPI-based systems"
-HOMEPAGE="http://www.vrlteam.org/wmacpimon/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmgtemp/Manifest b/x11-plugins/wmgtemp/Manifest
index 24e52b959487..a4f337bbb91a 100644
--- a/x11-plugins/wmgtemp/Manifest
+++ b/x11-plugins/wmgtemp/Manifest
@@ -1,3 +1,3 @@
 DIST wmgtemp-1.2.tar.gz 96949 BLAKE2B c578666451260e49ebfd0986b4961586f9425ef3e7426168a0dc14aa9b6ddf65097f69da6a3871711ab96f3d678285e538bff17780f57437aa5835aeb61e8d24 SHA512 ab76eabb5459b6a8dde28c23b8c8d39587e7874daaf368afcbe7aabe57ce499285d4151b53afa8295991742c481ca18617e71107ae264c05ab28b24b67c00b9b
-EBUILD wmgtemp-1.2.ebuild 420 BLAKE2B fb243b45055e7f220034c5d85b99879af077c3df6786e63e3ddb974a4f7afd835b0f83aadde7289078729b36ba1f217dbc84b2e9552c2c8f622c4e0c6bcb3c0b SHA512 2014a1e8c4408855d7d70e49a91b7edeafaf48de97053122205337eaf1afd682173a2e156a9a4b7dae3bc48185071533253268a149026acf72584548b5ea4f28
-MISC metadata.xml 739 BLAKE2B 791f77c670ef085fed4481719f4f56e7135b2bce849981d87e2d97ca6b9fa8d2c1a30c22baa9c4177404af70d1dbcecaa5b4d2587965d75bd4a014788b127434 SHA512 a8750419c79941025fbd79e72f9a0e646bb08cdfa341dd531b77c755f48f97c07574e095b57d9cba3fcbc27404c5f35b0ff52617828623e48cfcc42bbfba552f
+EBUILD wmgtemp-1.2.ebuild 420 BLAKE2B ec6478e06e336bb384495ba33dfe9fdd604fba32084983f81ef0af64affe16ccc1c6e5809ad40c43d39c12576d1552eaea63fac00f7f5bac2b07a120add984b2 SHA512 1fa32a77caae87ee1561511cf89d1bc9ea6a30fbe7f4972b6635d8c0b2baf841cc994217ec4d3a190667d4fcebba99ee8bceebd71ac9e5f2145aa5b65a68d7aa
+MISC metadata.xml 739 BLAKE2B 095601890d8962a8fdb9cc3b39b6edec90e09145388511c25edf6cd7adf8047d2ee6c6e9785b39b2f058e092f92a061b75aed34157343f943b5c576f2f8c9300 SHA512 873468c2e1aac9118c7d1749160df5e51797d52305dbf7a0f28f71931731c525bf4950051075aba278905d8e026b9786379b8681fa217d547ebff62139340749
diff --git a/x11-plugins/wmgtemp/metadata.xml b/x11-plugins/wmgtemp/metadata.xml
index 6573fee387af..f8e691047dac 100644
--- a/x11-plugins/wmgtemp/metadata.xml
+++ b/x11-plugins/wmgtemp/metadata.xml
@@ -8,7 +8,7 @@
 
 <longdescription>
 wmgtemp is a dock-app for Window Maker that graphically displays the CPU and 
-System temperatures using the lm_sensors package. It was originally intended to 
+System temperatures using the lm-sensors package. It was originally intended to 
 work with the VIA686A chipset although it can dynamically detect chipset 
 features to work with other sensors. It displays the CPU and System temperature 
 values, a scaling graph of temperature history, and high-temperature warning 
diff --git a/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild b/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
index f857b6e048f1..5040d25087d5 100644
--- a/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
+++ b/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="sys-apps/lm_sensors:=
+DEPEND="sys-apps/lm-sensors:=
 	>=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11"
 RDEPEND="${DEPEND}"
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index ab5716bd4467..68bad967d8c2 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/echo-icon-theme/Manifest b/x11-themes/echo-icon-theme/Manifest
index a80e127843e7..d6853fdfd14d 100644
--- a/x11-themes/echo-icon-theme/Manifest
+++ b/x11-themes/echo-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST echo-icon-theme-0.3.89.0_pre20081031.tar.bz2 4413037 BLAKE2B bec77afcad7fb615614bab66493a58df89b64e80faeb6678895780dfbb559008f4b54b263e4abe13e5865a3ae60b7d6bebfcd7c6acfd4396c8298563a86808bb SHA512 58214247ed967fe510212611c20c247242de02bc4b12f337a4f77e7043e30828486a58172ba8602d32a932726b462effed17323faa5aa8c2213c87505280b52f
 EBUILD echo-icon-theme-0.3.89.0_pre20081031.ebuild 630 BLAKE2B 069c05dd002fba96ceb1ca4d03803085883a3156b85b3821e5c4498f2c45a29b9b0beaeeb26a3bca839256cfc285eb576f8ddf1d153740f45f2a4515ce11b2f8 SHA512 c314e4169099d4f4a32ea516a20b0b5ddd22815341e7d5de38b410048224a7764f5d87801429eac73ba26583bbdd146b8414cc78a963973cc6cdc8a5207867d5
-MISC metadata.xml 215 BLAKE2B a00257a723cec0a400ae0db0b5f52c31e1ca52ed223a1fc8d29c55c7549bef8c8de073310109b103165292147eeda154f2f4d8923bb15fd99e9bcc3c77d34775 SHA512 80158580997855d96b83d7b4ef2983d741acee85b6e4ee049b89f4614af36b5cb1bb7d0a49c668a66a7bb87224613781bc66793b32fa93e99bf1d047ce97a763
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-themes/echo-icon-theme/metadata.xml b/x11-themes/echo-icon-theme/metadata.xml
index 6b097441bc06..6f49eba8f496 100644
--- a/x11-themes/echo-icon-theme/metadata.xml
+++ b/x11-themes/echo-icon-theme/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>cardoe@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-themes/lxqt-themes/Manifest b/x11-themes/lxqt-themes/Manifest
index 89facad50608..b088d8b7308a 100644
--- a/x11-themes/lxqt-themes/Manifest
+++ b/x11-themes/lxqt-themes/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-themes-0.14.0.tar.xz 3203820 BLAKE2B a8fd0e77f3c6844f13755bd5c6e0e48c194475c082cbcf83b3999e120f548f457293cc0bcf06cff2ab38ac4ddf54346cf07abb80d5f5f326eca5c5a6baee45da SHA512 622449df60f5f50d59ab308a7aaae35114e91bda48e112fb2abb2c394bfdfc5794d2bf0c6ce63689a29081a31bdde191e3c8cb7217f833d76a407f9970eb1fb2
-EBUILD lxqt-themes-0.14.0.ebuild 530 BLAKE2B edc17e652b4369ea8651f144a4194e93b72b3f934c1a20fc27f48ecc324dcaec22ababc423b6d69c3ec508e0b458a6f47dda538422866cd76cba678542700e87 SHA512 68e1e2011a44a8f28be932695bdc1179d27b2f5a8c4c31ba79e17ccf148dfd7b4b755b75f619b66c5333d96132ae9143bb3c9e23482d937dac201126e3b82569
+EBUILD lxqt-themes-0.14.0.ebuild 537 BLAKE2B 5e21c0a6a86925a3e75e54b1639221b293953a89d78baf7a71ff466a6bd404eea4a2527e8d93f8e1e114391b0d045c57627d78bc4fa8f84b479620e711e33985 SHA512 e772378bfecb6f090c343a530b430b22ba0d1f3ae62cc042677fd8ad4a177ee62c173e142e93eb5af1d6e19e9c54ec15a8975f42600783e405a785fe09fcfe6e
 MISC metadata.xml 317 BLAKE2B 5570995b3ad6a8fbde584e6ec5d9d0e09e6000313c1b7e1caaea7fc36aed93f86af522fd4ce0ace8ad764135d7d07a3c3a27b97e8144c915a9d3621f53e77c3f SHA512 7ac9d03d1f2248513ae60d61ec213d18ac6757f66924d0273bf93f9c47e6b32a5f05d393c4c92484c59b23d7ddb8f4fd915bc31e45885bef91f44f6a9cabad41
diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
index f881e16914e0..88399b455274 100644
--- a/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
+++ b/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index b34ff513f9a1..0f9138561a04 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 9025da525b81..0cfa8b39add4 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -4,9 +4,11 @@ DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a652
 DIST i3-4.15.tar.bz2 1196263 BLAKE2B 36f20327202957dba30aface91af4d2c6261979e726584712a508a11cb4a612d812e771dc9f28ec4cfcbf3ebc9d92c72f5e940048516cca0f185eab20f95ae32 SHA512 60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4
 DIST i3-4.16.1.tar.bz2 1211532 BLAKE2B 64a6996c0b89516069b58bf1cba92908a7f61ab04d66659b612b27411eb92fa9d49a7214eccdba33e7c33605b5f9247f69c1f0e23de629552edf113ab7520747 SHA512 3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0
 DIST i3-4.16.tar.bz2 1213251 BLAKE2B a65d15278a83bac9903a611628ea53c64cd554ab9fff2a8864e649fd962858b2f3e77fe69d0dc70affc93dc69b3cbbd7b3ee670a2af9d697e28e9e4ea3323f67 SHA512 99abd15349ee8e61c084b3664ef3a189c92ea07812ac59eb6a5441df7cebea8211be52204e39bddcc33d8c714447fddbbe2c5c8a25b756a96e2dc6732526cbf8
+DIST i3-4.17.1.tar.bz2 1218418 BLAKE2B eb798eee2b618691ceb47b72c08fe09b09e2913c17fe667fab95426069c86497bff67278bea5fc97fdf90ebdfc6574e68cad36b21036a63d053edced1edf8592 SHA512 af397dc1768ea6530e4b2ce8ef21b20ecff8ab9eebf380df224456173eea4c3bacf28b55c8efcdc70f76f0d66543c163564a94cfd66028221ace481fa3c2913f
 EBUILD i3-4.14.ebuild 2113 BLAKE2B c602bbb48b166ffa70d735f9181ec81a4174fe7df08830bff5c2cd955f668d2e34453f421dd1c8fb616497be5cc5707332f412d73397287ed55ea5468ffc755d SHA512 709efb5ca49d7e2e1aa6426c631e653b66f15e261eb1462036b4bdef61cd68a690a03a71ae787d221939808b9b15f3d7604551c1cc3227b9194efea076b1390e
 EBUILD i3-4.15.ebuild 2323 BLAKE2B bf5ead0f91a4a040866f00f3dfe4b0c71a2d4e41eb9480c27e464790c37cbf641069729d34e48152223e4f7545a6b6b43be3f45213774219fe49eaa594491ad2 SHA512 95cf2e6f2053ffe180418dda38535a08ed8447085d65cd3ac342ba0e0468e8320d95ed8468bdcc11ec637ea2f2ef4926a0df8bacad186109fc5f2c42330e3692
 EBUILD i3-4.16.1.ebuild 2325 BLAKE2B 8b944e98274f9b573712f90906f5c44f4770107743ec2742fb90d9076209b4b8db2ce4e0cc530a95b2064b969f5cde30b1af494d3b00bb6e9d5b8bf363ed2923 SHA512 325c3129b367ddace668f1f162466f94f970b8f0a3cde9f2d9d0be2506ae2389fb6946a94952035e5a8a8912e4b618dbda04e2ee72c9351a3fc851d2b042acd1
 EBUILD i3-4.16.ebuild 2318 BLAKE2B 5897090120c632fc6385196d48e8bb14c9c1346699df738230b28c954842a8cf192adc9e690fdee208003e4d514b76d850970e8e12624c7ff17ef7dff0d1046b SHA512 ec02ae998edfa9f4188b51d4038f44cf3a910b5ac7a1e75552bce5387d3b93b77bfa5770adcb04bf4bd82d2b25c79dee6420561d18f9a7ad2062eda3969884a8
+EBUILD i3-4.17.1.ebuild 2324 BLAKE2B 5573454ae13e9e700b471155becf18b648c5aa3da86438eceb0ff2d0eb6b20b4412b00687143184b821c062356c532b8a84fed064c08c73b8d5f221b26ccf9c9 SHA512 ebbdb9d58ac64fded6da388fc736d0a1e056a377898f90eeb079002fdc9d30d53ef6c209613c11941792d3b8ca169148c2f0f67d7498a4f76e029397c9fb9f22
 EBUILD i3-9999.ebuild 1814 BLAKE2B 4bc786cad1c87f351da34303c63fa0d5e1874bb97852df7bef3ba4c9837a524c4abd18294c3be46752fe66c66efeb40f781e9964f0c1207c76b4145aa7d7583d SHA512 b3a4429575ac3440f026a73be0dc2d412bc4292a0e1640d20e4042f72c59ed7ade740f8f45fb7b6d7daf69f4cb09b863db923ad7f82b181caadfe2d57aa4bf60
 MISC metadata.xml 470 BLAKE2B 1c4fd7b44860934e88fb5165254fe0e8ca7e647c11af9af7d959f240e51002e6a454d9b93b30da8944891a1aa6a989f7a3e2a8af44ba41de174e78745393dd79 SHA512 52eddb56541d1172b04ca3ae646d01e52fb300dd62f5dfeaf2abe9d791965813e87b24a1477743797227bf8d407051f79076d54edb599524f89f3cfc716cc47e
diff --git a/x11-wm/i3/i3-4.17.1.ebuild b/x11-wm/i3/i3-4.17.1.ebuild
new file mode 100644
index 000000000000..70b10d43e8f7
--- /dev/null
+++ b/x11-wm/i3/i3-4.17.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source virtualx
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="https://i3wm.org/"
+SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc debug test"
+
+CDEPEND="dev-libs/libev
+	dev-libs/libpcre
+	>=dev-libs/yajl-2.0.3
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
+	>=x11-libs/cairo-1.14.4[X,xcb]
+	>=x11-libs/pango-1.30.0[X]"
+DEPEND="${CDEPEND}
+	test? (
+		dev-perl/AnyEvent
+		>=dev-perl/X11-XCB-0.120.0
+		dev-perl/Inline
+		dev-perl/Inline-C
+		dev-perl/IPC-Run
+		dev-perl/ExtUtils-PkgConfig
+		dev-perl/local-lib
+		>=virtual/perl-Test-Simple-0.940.0
+		x11-base/xorg-server[xephyr]
+	)"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS"
+BDEPEND="virtual/pkgconfig"
+
+# Test without debug will apply optimization levels, which results
+# in type-punned pointers - which in turn causes test failures.
+REQUIRED_USE="test? ( debug )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch"
+)
+
+# https://github.com/i3/i3/issues/3013
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+
+	eautoreconf
+}
+
+my_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+my_src_test() {
+	emake \
+		test.commands_parser \
+		test.config_parser \
+		test.inject_randr15
+
+	virtx perl \
+		-I "${S}/testcases/lib" \
+		-I "${BUILD_DIR}/testcases/lib" \
+		testcases/complete-run.pl
+}
+
+my_src_install_all() {
+	doman man/*.1
+
+	einstalldocs
+	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
+
+	exeinto /etc/X11/Sessions
+	doexe "${T}/i3wm"
+}
+
+pkg_postinst() {
+	# Only show the elog information on a new install
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "There are several packages that you may find useful with ${PN} and"
+		elog "their usage is suggested by the upstream maintainers, namely:"
+		elog "  x11-misc/dmenu"
+		elog "  x11-misc/i3status"
+		elog "  x11-misc/i3lock"
+		elog "Please refer to their description for additional info."
+	fi
+}
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index 9d52e93d01d3..7e2f03e80bcf 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -1,12 +1,6 @@
 AUX jwm.desktop 166 BLAKE2B 5c6adbd815e6f4f4261c8c0a8d642b749cc47703aa7ec5a79ac86a0c9aba0adf2e0865cd0b2f115146867909e880067e5157905452f08275ebd6a168088d0413 SHA512 42135a9b282467edec1a61de0180a97b7a0f5bbbb8fe4a5d88dd418dcb5edf32c1c15efee3d8cf96eadf7468dd4d44c679690ec2ff2a89381bb0e0dc9664a43b
 DIST jwm-2.3.2.tar.xz 325648 BLAKE2B 93654116b0dedff4ad03c7981a9978530a1989edf4766591f083c3b10fefb128acc85e93b888a7700cb59e0bd85e1e7f7e118a22327f79ddcc1d380887764028 SHA512 34b9d482815e8b269203e1f5bf02d3e13f3186153755c9e74094e4a8af376f35b8bef4553056e83c20ba0c532e6d2606633d71272e186fe45dfed9e4ea836a27
-DIST jwm-2.3.4.tar.xz 332140 BLAKE2B ad2ea9d094b6cded0891176c97900b8491c3d81f64b1df7617c8936d581c849c4515deb8795f3f10018f469c1a97617fa97ec50fb2088dc7ea221ed55af2de97 SHA512 db9f46ced4b1f8128673b551cd865b6c9b6c8d43f839cfe898168251e8326d402a510ce77144273488c1e65a96d66e16124e4b4749a5a96a9057c1eb20c2bee1
-DIST jwm-2.3.5.tar.xz 339792 BLAKE2B dcbaeac2e6842499509651155618821cf302b3e3ae1b013f3811c49e65ac83122e00aff33af4a366ea0c126f2a009a0baba0538e132f00efac306319b94e50c4 SHA512 cb45a5fb349e6c130b89996ba11a99059e95ccedc4ea82ad527676130833fd93297b64fad905a1f22908a4ae69cca544a6353c37160ed8df3e1089f40f9a0565
-DIST jwm-2.3.6.tar.xz 343644 BLAKE2B 44d6156b79957352b52f8f4000f12e655259f2125eeba183a087358b7537d3affd7125a50b0ff93efa9c8d2599d08e7cc3db6c26807ad587481ce689541aaad0 SHA512 ed3556bf2e28bfcf36b2b145e6c08e75c24e47b723b16ce072100d2773338d819c5465e7af2dc6b842e2e35f375ec3a0b85d9987e0a8acecdbe628dc09eabd11
 DIST jwm-2.3.7.tar.xz 350332 BLAKE2B 479d853ae9b1dd2d1a39c9e823f39cd7671b477f6e9878bc6652072bce1ce364f8c392663dc1187a4a4970918c0f68cd506654f6dfe6c91cc5f1f2f275a2021b SHA512 dab0241518e52aa2e3e1ef3f67b6965ceb683bdb0224de7d3a653d76440606d70e86e35047eda40ea53a80aa227408be77739ad7c53d51f53026e3d113ab7efc
 EBUILD jwm-2.3.2.ebuild 1423 BLAKE2B d9033cea48ccf8414941bb5a6e2aecdd64e59e2aef5074a599df926729f7a8dce38424ae95beaf89e11fdd66ec2eeda00c8eb134be100520cb22f684680ef806 SHA512 18379ea09e94db1c5996752ccb75d13c5417b548863804c2c58885125b8d463e897e2baf233298008fe6a1bd829035e72221c471afdee78af3e8d3dc17370645
-EBUILD jwm-2.3.4-r1.ebuild 1493 BLAKE2B ade32fbe5954271c26943490d0c1970084b7f53dd9d3559bbd26b9bdc4a32c712eac8fb68a1abe3328c942c5ca35be4fd68e3d0e9da0efdf415c0fbe8f83b00b SHA512 42135fa2006cbc7b8109df9c6e8b19f78715f88802ad3d3ab24810dfc078b4c309e569c48b3a57aa86df928ac55447363829a9cc0543ba7afaae26f21822c1d1
-EBUILD jwm-2.3.5.ebuild 1773 BLAKE2B 38544c2219983545a7c3d12d2656858e0e790cbec3344f1f6b5cff82bde53fce18e681038155ba65e98075e504f0d595ba145dce1bfbfba4c0b1203cde827203 SHA512 1608c2e237a6acb2f608ba6b7e36b4feb172f75de94ae8b170985b7c78d501ffd5264ea5b6a1191f71778aace4163af0cf8839f03684219d89eeef3f872e5412
-EBUILD jwm-2.3.6.ebuild 1832 BLAKE2B ccfe15f50a45c4471ef445fa51950e8c100a2b8e76310b9db73439a347534fb5bda6fc64fbeb8730154462ebe6722319d501e15c8715c00bd39c77a3e00e6369 SHA512 b9268ac1ce453158433f608b43b4367cde2eb4c9792b80ff426b8eccc5e68cdcea4ce1d4a04ac19e79c5601917eff4ad678519f4da437329a81172c0590bf2ae
 EBUILD jwm-2.3.7.ebuild 1832 BLAKE2B ccfe15f50a45c4471ef445fa51950e8c100a2b8e76310b9db73439a347534fb5bda6fc64fbeb8730154462ebe6722319d501e15c8715c00bd39c77a3e00e6369 SHA512 b9268ac1ce453158433f608b43b4367cde2eb4c9792b80ff426b8eccc5e68cdcea4ce1d4a04ac19e79c5601917eff4ad678519f4da437329a81172c0590bf2ae
 MISC metadata.xml 898 BLAKE2B 0b366993a3e1c91c6f4abfba9f97144d00c2a002f81b898f9403c4a4ed79c9ad491edd6ad36a675287bbf4543e0faca6da127bbb8cf1eb9b0baa0e54beef3dc1 SHA512 87e56bee3a559b4056846016673eba8784f287b69162027ab0da9e2e9cd17d71fb8fb693dcd3fa1aa70017d567ca93160958a76eddb97ea97f2acf0a0ff2a019
diff --git a/x11-wm/jwm/jwm-2.3.4-r1.ebuild b/x11-wm/jwm/jwm-2.3.4-r1.ebuild
deleted file mode 100644
index 1cc308d043e8..000000000000
--- a/x11-wm/jwm/jwm-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Very fast and lightweight still powerful window manager for X"
-HOMEPAGE="http://joewing.net/projects/jwm/"
-SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
-IUSE="bidi debug jpeg png truetype xinerama xpm"
-
-RDEPEND="xpm? ( x11-libs/libXpm )
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	truetype? ( x11-libs/libXft )
-	png? ( media-libs/libpng:0= )
-	jpeg? ( virtual/jpeg:0= )
-	bidi? ( dev-libs/fribidi )
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		$(use_enable xpm) \
-		$(use_enable bidi fribidi) \
-		--enable-shape \
-		--enable-xrender
-}
-
-src_install() {
-	dodir /etc
-	dodir /usr/bin
-	dodir /usr/share/man
-
-	default
-
-	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
-
-	insinto "/usr/share/xsessions"
-	doins "${FILESDIR}"/jwm.desktop
-
-	dodoc README.md example.jwmrc ChangeLog
-}
-
-pkg_postinst() {
-	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
-	einfo "or per-user by creating a configuration file in ~/.jwmrc"
-	einfo
-	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
-}
diff --git a/x11-wm/jwm/jwm-2.3.5.ebuild b/x11-wm/jwm/jwm-2.3.5.ebuild
deleted file mode 100644
index 8607775ee278..000000000000
--- a/x11-wm/jwm/jwm-2.3.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Very fast and lightweight still powerful window manager for X"
-HOMEPAGE="http://joewing.net/projects/jwm/"
-SRC_URI="http://joewing.net/projects/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
-IUSE="bidi cairo debug iconv jpeg nls png truetype xinerama xpm"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	cairo? (
-		x11-libs/cairo
-		gnome-base/librsvg
-	)
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg:0= )
-	nls? ( sys-devel/gettext
-		virtual/libintl )
-	png? ( media-libs/libpng:0= )
-	truetype? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf \
-		$(use_enable bidi fribidi) \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable iconv) \
-		$(use_enable jpeg) \
-		$(use_enable nls) \
-		$(use_enable png) \
-		$(use_enable cairo rsvg) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		$(use_enable xpm) \
-		--enable-shape \
-		--enable-xrender \
-		--disable-rpath
-}
-
-src_install() {
-	dodir /etc
-	dodir /usr/bin
-	dodir /usr/share/man
-
-	default
-
-	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
-
-	insinto "/usr/share/xsessions"
-	doins "${FILESDIR}"/jwm.desktop
-
-	dodoc README.md example.jwmrc ChangeLog
-}
-
-pkg_postinst() {
-	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
-	einfo "or per-user by creating a configuration file in ~/.jwmrc"
-	einfo
-	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
-}
diff --git a/x11-wm/jwm/jwm-2.3.6.ebuild b/x11-wm/jwm/jwm-2.3.6.ebuild
deleted file mode 100644
index 44d5478bb9ef..000000000000
--- a/x11-wm/jwm/jwm-2.3.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Very fast and lightweight still powerful window manager for X"
-HOMEPAGE="http://joewing.net/projects/jwm/"
-SRC_URI="http://joewing.net/projects/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
-IUSE="bidi cairo debug iconv jpeg nls png truetype xinerama xpm"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	cairo? (
-		x11-libs/cairo
-		gnome-base/librsvg
-	)
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg:0= )
-	nls? ( sys-devel/gettext
-		virtual/libintl )
-	png? ( media-libs/libpng:0= )
-	truetype? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf \
-		$(use_enable bidi fribidi) \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable jpeg) \
-		$(use_enable nls) \
-		$(use_enable png) \
-		$(use_enable cairo rsvg) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		$(use_enable xpm) \
-		$(use_with iconv libiconv-prefix /usr) \
-		$(use_with nls libintl-prefix /usr) \
-		--enable-shape \
-		--enable-xrender \
-		--disable-rpath
-}
-
-src_install() {
-	dodir /etc
-	dodir /usr/bin
-	dodir /usr/share/man
-
-	default
-
-	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
-
-	insinto "/usr/share/xsessions"
-	doins "${FILESDIR}"/jwm.desktop
-
-	dodoc README.md example.jwmrc ChangeLog
-}
-
-pkg_postinst() {
-	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
-	einfo "or per-user by creating a configuration file in ~/.jwmrc"
-	einfo
-	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
-}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index a28d03565051..1456282e3257 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -12,6 +12,6 @@ DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 8b69436778d9c3e10b0373c83e1f306cb2718e
 EBUILD mutter-3.26.2-r1.ebuild 4080 BLAKE2B 1d5f4a3124fefcd5ef813fd53fe4a62b6d7aeec3963e2f0719b58accdbe8ac23e768a420e2d1424282dd476b8c544612c9fe0fe9e5aea5c8781705708c5aef5b SHA512 b551ed5ede7d49b489f89f226dccd4a313f94ae2c429c9b572747782df197157cfe961b5d5bc36abe7f160578ecad248c2c213009abac79d68e943f6ab680892
 EBUILD mutter-3.30.2-r1.ebuild 4779 BLAKE2B a074b6bab4ea5005ec421ed8c7c9529da1ecdded81e6d6a9a25b795a784c77defbfcb6af34bf404ca92adc22faea10c786c9566d6ea2194ccf618b888c679f56 SHA512 2e7a7f68c8d8e3d2c185ee9e073a60e7f72639897b48b0f823b4a5ab3f95452595aa501657f7a5953f92e95170766d55dc661724ea616e088b91b7e98622e533
 EBUILD mutter-3.30.2-r3.ebuild 4788 BLAKE2B c369445d8f99380447ec5d9278ce1753f7b8e41c36aaf05836cdd5e05d5516472dd07dcdc0b4241cba08b58417ed1b16c90c350ceba07bdc8a97def8a76ee908 SHA512 9a474d06a0c71306b9ba8c3e81113abd78f44f22a8b62d045d8da83143b9da3f19f20ad3c7cd6fbcfcd467dcd4431409c05680a29cd31e1f3f5033ab3cb6a5a4
-EBUILD mutter-3.30.2-r4.ebuild 4866 BLAKE2B a174de32d79499cfb7e13562056b3bf768e27b3e8a499cc65a4b6a445431339146b986e5121743d5ce020e95c68f172d2c4520d11f58e05047705e01aa70f3b2 SHA512 5527cc326594e06ddf96522e09cb39c1dee1a688b26c2052061ec89525a80fe90b1f6a372dce59dcb3e1484188be6dbc4842c4844e6569a204db198ce946cc21
+EBUILD mutter-3.30.2-r4.ebuild 4865 BLAKE2B 47b15d79cb0fa7abcbbe920f7746cf6dae9ef5ad97c3efc1d63540995e4a047aeb7b9e0815fcd15755614cff883b0ae74d01c85b7a71bced43731e829e5cb8aa SHA512 078bdc5ed7f4f4c6c51bdd7efa2a0dca65056073d3a82e5d6b384a4dcb8f941ad2baa7ee3f42c1644d9bb92b81dc05e36511049e499dc2f78a3d493cb94ca94e
 EBUILD mutter-3.32.2.ebuild 4571 BLAKE2B 91a683716be774f7377080e834148a154d839b816e6bfe7b25017a147191acb07de0fe96f437b7b12ee2c5d466a81b63ab2a453f43e1818904223dfcfc70336a SHA512 89f589a8554d9e5aea69269c2240e464eaac713729c0ba2bcf4722540d8ef48e33f1237e1cc2b6f377539fd4b0e964cbb8e5f433ccec5ad7651ce4812af25a7f
 MISC metadata.xml 552 BLAKE2B 1e0ae54a432b5f0882ec17726ae8753e0168a8191c57fe204f7dbbd54ead1eb543224a46e42644508b7c69d6969d8849bf80dd16f0af2f5075f1942725851e40 SHA512 cf8d304399b4af16bcfb43c5ba3b1ea94ea9bf92be925fab584b4febf8ede21bb0f95dd590b12e1a5528f48372792da2ca31c5c469ad443c7fd20e5b8f7cc700
diff --git a/x11-wm/mutter/mutter-3.30.2-r4.ebuild b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
index cb9832016954..8329ec0e94b4 100644
--- a/x11-wm/mutter/mutter-3.30.2-r4.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
@@ -17,7 +17,7 @@ IUSE="debug elogind gles2 input_devices_wacom +introspection screencast systemd
 REQUIRED_USE="
 	wayland? ( ^^ ( elogind systemd ) )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # libXi-1.7.4 or newer needed per:
 # https://bugzilla.gnome.org/show_bug.cgi?id=738944
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 136c20bc11dc..9ec7bd6361b1 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,7 +1,4 @@
-AUX spectrwm-2.6.2-Makefile.patch 661 BLAKE2B 45e021e9d81929a71c98f525a586070d58a7f7558398357cda9b161a009bba09f84522a0d6ea3c4df0919b6fcac5b86711e7ace097b32c60374917b1a2afdf85 SHA512 12246a6bb44cf7f0f02bba4b488e7783acdc32a8dc28a93e979995a640e3731e26d2108f19e0cebe3ea3540903f495ebc4b487a7f642ad3c87077c63df5bfb3a
 AUX spectrwm-3.1.0-Makefile.patch 1049 BLAKE2B eaa14f871a82c2c413c65a65d0a007210dc1f3e934145e8c932768311f644948c80d240e8817de87c80f36f105bd1017d8b7bf28a129d489bcd2ffd93c41464e SHA512 7b0bdb63d01713a946c68d1154df8cfdb213a155ddb5cd9ec5876dffe48dfa3f3d272c420391acab1ac86c314ace6d4a999ed18865ed148d97c64b5497e751ee
-DIST spectrwm-2.7.2.tgz 132554 BLAKE2B 78d1956be33a192f63a46bdef250427d14f415261b734355266cec236fcec1ab66fc08ab2e0aa1981a92849ca23f53441494c6990c3ef72fe4c7956e22c7aff9 SHA512 cebb0e42566125933bf2c4c9200765d360bb572fd953c510ad39e7abcf9cc507e61420441234fb1bb44d06d28526ba6c594272c173a04181d2c6798e404b7421
 DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842562579d47cd1dd83c5de82a015b02343972d4d85cf291b63bfbaf0e901616cca94d911014672ffc35436bdd3c1 SHA512 dd8e16361b979a55b210a88a1ae5d53e7086fd854e92320e09b6407d374580cc271c0e974e38606481ab57a504a86e16293edee967d251b043a1eb65e8c77687
-EBUILD spectrwm-2.7.2-r1.ebuild 1093 BLAKE2B 692d22a1d46bb800caafca7fecd868e51a3e65c4e58063544b203d5b674ccf75e14de4aa5839204786d87ffa6ac6cfb24071d04ce7c6ec49419906211b726d68 SHA512 8781f95f64cfa1443ea9c33b01499257ea3d6e31600ed669990a883b9ace0ff070903e5cf7cd501fa0ad0f117fdbda30fca4ffdcb925f852d76df1cfdfa3e568
 EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/spectrwm/files/spectrwm-2.6.2-Makefile.patch b/x11-wm/spectrwm/files/spectrwm-2.6.2-Makefile.patch
deleted file mode 100644
index e380b60fdf13..000000000000
--- a/x11-wm/spectrwm/files/spectrwm-2.6.2-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- spectrwm-2.6.2/linux/Makefile
-+++ spectrwm-2.6.2/linux/Makefile
-@@ -9,7 +9,7 @@
- LIBVERSION      = $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major.$$minor)
- LIBMAJORVERSION = $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major)
- 
--MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
-+MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized
- MAINT_CPPFLAGS = -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
- MAINT_LDLIBS   = -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
- 
diff --git a/x11-wm/spectrwm/spectrwm-2.7.2-r1.ebuild b/x11-wm/spectrwm/spectrwm-2.7.2-r1.ebuild
deleted file mode 100644
index 0a0371d5135d..000000000000
--- a/x11-wm/spectrwm/spectrwm-2.7.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Small dynamic tiling window manager for X11"
-HOMEPAGE="https://opensource.conformal.com/wiki/spectrwm"
-SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-misc/dmenu"
-DEPEND="${DEPEND}
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	!x11-wm/scrotwm"
-
-S=${WORKDIR}/${P}/linux
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.6.2-Makefile.patch
-	tc-export CC
-}
-
-src_compile() {
-	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)"
-}
-
-src_install() {
-	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" DESTDIR="${D}" install
-
-	cd "${WORKDIR}"/${P} || die
-
-	insinto /etc
-	doins ${PN}.conf
-	dodoc ${PN}_*.conf {initscreen,screenshot}.sh
-
-	make_session_desktop ${PN} ${PN}
-
-	elog "Example keyboard config and helpful scripts can be found"
-	elog "in ${ROOT}usr/share/doc/${PF}"
-}
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index a8b53f6ddd78..5fbc9dc5d802 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -1,7 +1,5 @@
 AUX 70stumpwm-gentoo.el 84 BLAKE2B 12ce0e9a1b53a1c1c84a9f350484b9620a2db9a30eaefb11bb409b89aae7f1226173930c52d018ec8a845c8e6ff69efd5570a369444537d070d21427a6960c09 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1
 AUX README.Gentoo 1894 BLAKE2B 23dd829621f92b2e5ab22bd3d54d9338d1034bd55d4adcfde24f6c0a780e41dddd747ee2baecdfd9b03a54de7e4acf08d903205dcdc68851afea5317401681aa SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09
-DIST stumpwm-1.0.1_rc.tar.gz 197530 BLAKE2B 2883ee8a0f75d3c673f6b6f65675c98e9fad8ef181b3ed9cf8bbd5eed7c0d63f3f48d021d056265d4e6c14dd0594bfe3a36492cd9bcdf2b3379d2aa62eba1f67 SHA512 3ba68987e61bdb46fde9c6bbed82b630be1db3272bdfb844a9d7abf3f810e94e560a28d4951308cab5af1f93b35710b10bb1a1a35450a8445a1b959888266df2
 DIST stumpwm-18.05.tar.gz 199467 BLAKE2B d532a531b7ceec7a80be66563dc2f36a6f1957d1e0f014ccf61cac1edf23073370dbe7cf3d7004f6dab144a88a4b54360e82ce7b13bdbc40cba59adfcb8e8af1 SHA512 a28c0af3a82670c0f31a5839227301672cc0706c47fb353355f90f791944556fb6125f3fa4d8547e6fbcf4817cdac5b0fe47de2dbae3a304d631a895af6ddb35
-EBUILD stumpwm-1.0.1_rc.ebuild 1720 BLAKE2B a6289438611ad9fbc80574180ecc3c1e8a7f69e043e092c9bf65011bd8f302dcbb22eb3eefce1cec3a3ae4a62370456bde525df4f3463ef56db5bd77bd3c0fb9 SHA512 3a384f1a61caa62bd8ed598ef546d43a842beaf19cce966c319d6b8ae371f23ac1d0da5ff57a34078b112d051695a69ce512ae401ec64eadc4ac100513676b1d
 EBUILD stumpwm-18.05.ebuild 1636 BLAKE2B 9ad4bfb55786e66731069b3c54d6a5c62dd66d6bb3c54f597ac21b5f807a00847c93837242fcdb13437a0e21c95f156d96c407659b9e89cc3643f3bff156e0aa SHA512 ed4381c2b597db24ea622ff2b0de301be55a70a7917e4cbeb144b8a881e32b9f656b8c01987734a4fa698799ff5b61f19356e3d5d14e1c0f3dce30409e13a87f
 MISC metadata.xml 2220 BLAKE2B f41cb5a9738d00631d9fa733f705d8717db4c75640914d7e5b115fa18a6bf1869c7019e79d8330f2cf4d514ed7c48eda7b2bf5f8f9a22a11fff9022c9b7cf927 SHA512 457b833b3e03bac4189c980e12de25289c1f8c6b26cffdd40e09c410554f5d48aa06ea559cf9cf86c0d00014c50c06af902802303736fed7ac086244266ed0bb
diff --git a/x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild b/x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild
deleted file mode 100644
index 9b097e9195f3..000000000000
--- a/x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit common-lisp-3 autotools elisp-common xdg-utils versionator
-
-MY_PV="$(replace_version_separator '_' '-')"
-
-DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
-HOMEPAGE="https://stumpwm.github.io/"
-SRC_URI="https://github.com/stumpwm/stumpwm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc emacs"
-
-RESTRICT="strip mirror"
-
-RDEPEND="dev-lisp/alexandria
-		dev-lisp/cl-ppcre
-		dev-lisp/clx
-		>=dev-lisp/sbcl-1.3.0
-		emacs? ( virtual/emacs app-emacs/slime )"
-DEPEND="${RDEPEND}
-		sys-apps/texinfo
-		doc? ( virtual/texi2dvi )"
-
-PDEPEND="contrib? ( x11-wm/stumpwm-contrib )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-SITEFILE=70${PN}-gentoo.el
-CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
-
-install_docs() {
-	local pdffile="${PN}.pdf"
-
-	texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die
-	cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die
-	dodoc AUTHORS NEWS README.md README.Gentoo
-	doinfo "${PN}.info"
-	docinto examples
-	dodoc sample-stumpwmrc.lisp
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf --with-lisp=sbcl
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	dobin stumpwm
-	make_session_desktop StumpWM /usr/bin/stumpwm
-
-	common-lisp-install-sources *.lisp
-	common-lisp-install-asdf
-	# Fix ASDF dir
-	sed -i -e "/(:directory/c\   (:directory \"${CLPKGDIR}\")" \
-		"${D}${CLPKGDIR}/load-stumpwm.lisp" || die
-	use doc && install_docs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 851aeb9f1f99..293c7f43fd76 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 0719305abc55..d6c0be7c7a76 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,9 +1,5 @@
 DIST xfwm4-4.12.5.tar.bz2 1215450 BLAKE2B 3a156af589ec7391245edbedbc6e10ac9c746121f68e4bd0c64e30b9b0c11abfe13c1fb77321249edd4e5c8d3051f62f135093fabfd8ba215573d330fd3745c2 SHA512 b723638b9cd858beb75232a251471cfb2d01ddb412b536c3f0b432e1f894014e1ad51c77d208d5439ae8a8d970344d0146d5f9475106c1b66d22715af7af42d9
-DIST xfwm4-4.13.3.tar.bz2 1143136 BLAKE2B 3d39b9313e97350c8c914b772262be83aa87255521dfde3f9f57a669e855c31824b717a617d7cf6f0b858b6611475dbe256dec5c1708b967e114f4d3cff87f79 SHA512 cbd410c9a5a997be6582c9bcd0af879be2c6e5b5362c0e950bb1281b4d2f4a1acbf40b3da88fb8dea3b22f491b69bc3c6df4f75c09c8c36cf9c76a02b528785a
-DIST xfwm4-4.13.4.tar.bz2 1144261 BLAKE2B 70b54f0393008706bec4dc2e763bd089908ebffed98ee33b85901d99bdf4de325e31525c1e21a50615318b3558d78808f54e7831cc055d5bdea262e34a098b28 SHA512 a4adbd5212ed34f8877adbe43c12edb17372ad871d34ad844a3c64c647f8c2fd3d8b9e44e7e09e12508bfc92837b32116fae7416b9c16d4f430f2fadcb2b845a
 DIST xfwm4-4.14.0.tar.bz2 1122735 BLAKE2B 1865c0714ddd4107e806de5607ef0e260c3fd1b6c9abcbec112a126bf780f456873786595a4cb924ce2154a40868670699519e4bb4576d971f853f7d3f63e98c SHA512 27261b08b53ba7e70db547db81775154c2f4285ab0f1f8336bd9ef0aeacb3ab705ae8ac5b05f9ac23de550a9065e76487dc93a99e553549bff1c25ceb5216939
 EBUILD xfwm4-4.12.5-r1.ebuild 1548 BLAKE2B 74e15a4c8873e0ae8f51bbf21e18176337caa0a58256af7d107c78348de4cfb1a98ad944ff960cc822defc7d42f52963fe3ff96021d5890172357498e63fa2e9 SHA512 4adc5ae9ba1f7ba320c2877bf8a538fdce30475bbea0fc74e4b3954b4240713365af4f2f00e4c97358949a1c3b8eb70fab95cce5ce2eb30345330e58a1255874
-EBUILD xfwm4-4.13.3.ebuild 1702 BLAKE2B 612829b87bff6a08c0fcc038e5016b04b3a097e3bdba922ecaaba90480f5c141bee636984f6cd324ed3d693050fa795597567d96e6bbbf572e2b50e67da4db84 SHA512 1b3f47648df9b1962e01a609bca77b29d94f03ce7fd4599daac318b8d3e221f4585ddc0aa89bbb7d5afb7bac72016a53b4e91410b3673c38033925cfcf334cfd
-EBUILD xfwm4-4.13.4.ebuild 1702 BLAKE2B 612829b87bff6a08c0fcc038e5016b04b3a097e3bdba922ecaaba90480f5c141bee636984f6cd324ed3d693050fa795597567d96e6bbbf572e2b50e67da4db84 SHA512 1b3f47648df9b1962e01a609bca77b29d94f03ce7fd4599daac318b8d3e221f4585ddc0aa89bbb7d5afb7bac72016a53b4e91410b3673c38033925cfcf334cfd
-EBUILD xfwm4-4.14.0.ebuild 1676 BLAKE2B 2fc382f1266ff35925f45550d491b4a797401abddff0670be344eb815e54c75e67230597b77110380c2c5921eac8d6a837fdeae2fb34bda3f68b88c1dce09115 SHA512 8875b2c34f02fec9396aa0a7c780f0aa470193dfb5b63407700461f6bfe4bebdf23dbb22d2b549c111b5937b39305298e9ddf393d8474a8850b424f9612244aa
+EBUILD xfwm4-4.14.0-r1.ebuild 1656 BLAKE2B e431b48663dfa9d708d35cd5f552023e9fa475f4ae63e1e9281582df4d0103f514295e3a94f411ed743b3c3157226628886e4b1de3802807f9637c5a57729bf1 SHA512 f1c7ebdf68ab3925815635530c4658fd11a055e36c48ff839dbe391c6a38d7ca12cbce3ca0eeb2f42c29de4d097690859eceae1d19c63a30b6a0d7352cb4044a
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/xfwm4-4.13.3.ebuild b/xfce-base/xfwm4/xfwm4-4.13.3.ebuild
deleted file mode 100644
index b4ae00f6bcec..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite +xpresent"
-
-RDEPEND="dev-libs/dbus-glib:=
-	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-3.20:3=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/pango:=
-	>=x11-libs/libwnck-3.14:3=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfconf-4.13:=
-	opengl? ( media-libs/libepoxy:=[X(+)] )
-	startup-notification? ( x11-libs/startup-notification:= )
-	xpresent? ( x11-libs/libXpresent )
-	xcomposite? (
-		x11-libs/libXcomposite:=
-		x11-libs/libXdamage:=
-		x11-libs/libXfixes:=
-		)"
-# libICE/libSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	x11-libs/libICE
-	x11-libs/libSM
-	xfce-base/exo
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable opengl epoxy)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xpresent)
-		$(use_enable xcomposite compositor)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.13.4.ebuild b/xfce-base/xfwm4/xfwm4-4.13.4.ebuild
deleted file mode 100644
index b4ae00f6bcec..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.13.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite +xpresent"
-
-RDEPEND="dev-libs/dbus-glib:=
-	>=dev-libs/glib-2.20:=
-	>=x11-libs/gtk+-3.20:3=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/pango:=
-	>=x11-libs/libwnck-3.14:3=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfconf-4.13:=
-	opengl? ( media-libs/libepoxy:=[X(+)] )
-	startup-notification? ( x11-libs/startup-notification:= )
-	xpresent? ( x11-libs/libXpresent )
-	xcomposite? (
-		x11-libs/libXcomposite:=
-		x11-libs/libXdamage:=
-		x11-libs/libXfixes:=
-		)"
-# libICE/libSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	x11-libs/libICE
-	x11-libs/libSM
-	xfce-base/exo
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable opengl epoxy)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xpresent)
-		$(use_enable xcomposite compositor)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfwm4/xfwm4-4.14.0-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.14.0-r1.ebuild
new file mode 100644
index 000000000000..15e63bfa3ad9
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.14.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="opengl startup-notification +xcomposite +xpresent"
+
+RDEPEND=">=dev-libs/glib-2.20
+	>=x11-libs/gtk+-3.20:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/pango
+	>=x11-libs/libwnck-3.14:3
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/xfconf-4.13:=
+	opengl? ( media-libs/libepoxy:=[X(+)] )
+	startup-notification? ( x11-libs/startup-notification )
+	xpresent? ( x11-libs/libXpresent )
+	xcomposite? (
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		)"
+# libICE/libSM: not really used anywhere but checked by configure
+#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	x11-libs/libICE
+	x11-libs/libSM
+	xfce-base/exo
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable opengl epoxy)
+		$(use_enable startup-notification)
+		--enable-xsync
+		--enable-render
+		--enable-randr
+		$(use_enable xpresent)
+		$(use_enable xcomposite compositor)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfwm4/xfwm4-4.14.0.ebuild b/xfce-base/xfwm4/xfwm4-4.14.0.ebuild
deleted file mode 100644
index 8b257894cfbb..000000000000
--- a/xfce-base/xfwm4/xfwm4-4.14.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Window manager for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite +xpresent"
-
-RDEPEND="dev-libs/dbus-glib
-	>=dev-libs/glib-2.20
-	>=x11-libs/gtk+-3.20:3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/pango
-	>=x11-libs/libwnck-3.14:3
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/xfconf-4.13:=
-	opengl? ( media-libs/libepoxy:=[X(+)] )
-	startup-notification? ( x11-libs/startup-notification )
-	xpresent? ( x11-libs/libXpresent )
-	xcomposite? (
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXfixes
-		)"
-# libICE/libSM: not really used anywhere but checked by configure
-#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	x11-libs/libICE
-	x11-libs/libSM
-	xfce-base/exo
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable opengl epoxy)
-		$(use_enable startup-notification)
-		--enable-xsync
-		--enable-render
-		--enable-randr
-		$(use_enable xpresent)
-		$(use_enable xcomposite compositor)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 98393d417c17..260d84065ae3 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index c2e0374c86e1..de07047391a7 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-sensors-plugin-1.3.0.tar.bz2 466468 BLAKE2B 52eadaec22980105fcf4c4e5efb4621b0966e86520e7ded90a1514f7925d76232278ec105785409dbe13f5ab4019363b47b63b5df642319a924fe5a8882b847c SHA512 77f6df354c883f9f0b99856738e0976e7bddd5f16c90a8715777c4f4d6debe116cdc21c2e0efbbe9f371d36f9469797d3e631854c33f8561e3ff32291cdef35a
 DIST xfce4-sensors-plugin-1.3.92.tar.bz2 477837 BLAKE2B e5399a3052b124c5391209c6ca6bc849467e09be3dac6b7a7d1c946f800e22dcfe84d245b6236cb56cdcea756c98d9bb70c1c945b597f13e49ff18455f4f4715 SHA512 a5b7d90683c993205323084431606cc6d13de88989e3636fba5c06bfa7ef52fbe6285e3bd7f8eb70683541b5c42727c8fbe7bf80e8832bcfb378de0e6d7d7b37
-EBUILD xfce4-sensors-plugin-1.3.0-r1.ebuild 1594 BLAKE2B 2136e7c0a2f0840d417afa6c2fe61b094ed6570979cca15e79525d76d7efa6dbc3b47433dc12194db1bf6f7b1094d7120bdaa06b3f8a9483cc667f0aa198305a SHA512 9d7f190f6dd4b04041c8abec235ac6fa74d76fc7b3fcf0d677dbc915b830afb7a115617a1d22486537430b703c60c1fc2455059e032f0120994e2e2ddfe4c3fc
-EBUILD xfce4-sensors-plugin-1.3.92-r1.ebuild 1597 BLAKE2B 54fd372e7b1946af7e970f94add1c6222960331a4015b8b4db188eacc40a9450b02819f0d4d9071b21738ba3039bf50830ac175d756dfa003db25b846b9ece1e SHA512 e042d1e691bf7bf3afcb1fbda7215dc554a16a5fbc32a07635864740a9f48580482a98f028b843654efa008e0f7563619a785f6b2bb09de0cb052655cd1d6049
+EBUILD xfce4-sensors-plugin-1.3.0-r1.ebuild 1594 BLAKE2B ab013a33e9a900f13ae968788c4a5aedad40e852f66dc273037316d412ad0107a70c3218bf29949567a485dadf1a08d4b6c5ccacb7b449cf97e9b67b6e4b2524 SHA512 c7f482c7165bd7e7eb6cab8956505e5b9bbb9e62799b695d6da3c9127ca0d65f9d6c3608b5009497c1d4351f871600ff0518ef53eafe01f5dad5e085562e7ec7
+EBUILD xfce4-sensors-plugin-1.3.92-r1.ebuild 1597 BLAKE2B bae0557e5fbf2d9efbb2baca93f8d4bccf3e9edee8089d908304462513bcec252e8ec2b635baae67297246101e9a45782a4e2786a6c465b96bfd68d1d3526b63 SHA512 e0ef9d336d2dee601bb57abad087d7cc8ee8373d54c8a693ee16a2a4d7aa0f6b8efa36979cbd5f31d9e9522ff2e37b277d1e54125ed316d3e93ac37157210576
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
index b34896e279f6..9d8815f02a92 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
@@ -5,16 +5,16 @@ EAPI=6
 
 inherit gnome2-utils
 
-DESCRIPTION="A panel plug-in for acpi, lm_sensors and hddtemp sensors"
+DESCRIPTION="A panel plug-in for acpi, lm-sensors and hddtemp sensors"
 HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="+acpi hddtemp libnotify lm_sensors video_cards_nvidia"
+IUSE="+acpi hddtemp libnotify lm-sensors video_cards_nvidia"
 
-REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
+REQUIRED_USE="|| ( hddtemp lm-sensors acpi )"
 
 RDEPEND=">=x11-libs/gtk+-3.20:3=
 	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
@@ -28,7 +28,7 @@ RDEPEND=">=x11-libs/gtk+-3.20:3=
 		)
 	)
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
+	lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
 
 DEPEND="${RDEPEND}
@@ -40,7 +40,7 @@ DOCS=( AUTHORS ChangeLog NEWS NOTES README TODO )
 src_configure() {
 	local myconf=(
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable lm_sensors libsensors)
+		$(use_enable lm-sensors libsensors)
 		$(use_enable hddtemp)
 		$(use_enable hddtemp netcat)
 		$(use_enable acpi procacpi)
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
index e0f3cbc46371..16b568dc0ee5 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
@@ -5,16 +5,16 @@ EAPI=6
 
 inherit gnome2-utils
 
-DESCRIPTION="A panel plug-in for acpi, lm_sensors and hddtemp sensors"
+DESCRIPTION="A panel plug-in for acpi, lm-sensors and hddtemp sensors"
 HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+acpi hddtemp libnotify lm_sensors video_cards_nvidia"
+IUSE="+acpi hddtemp libnotify lm-sensors video_cards_nvidia"
 
-REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
+REQUIRED_USE="|| ( hddtemp lm-sensors acpi )"
 
 RDEPEND=">=x11-libs/gtk+-3.20:3=
 	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
@@ -28,7 +28,7 @@ RDEPEND=">=x11-libs/gtk+-3.20:3=
 		)
 	)
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
+	lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
 
 DEPEND="${RDEPEND}
@@ -40,7 +40,7 @@ DOCS=( AUTHORS ChangeLog NEWS NOTES README TODO )
 src_configure() {
 	local myconf=(
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable lm_sensors libsensors)
+		$(use_enable lm-sensors libsensors)
 		$(use_enable hddtemp)
 		$(use_enable hddtemp netcat)
 		$(use_enable acpi procacpi)
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-14 18:52:15 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-14 18:52:15 +0100
commit	d00821e77f72d4af4ea30158c1c6e18ffff0875b (patch)
tree	b28b6cb077ae6b2457e30d49028fc978d8e2b59b
parent	36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 (diff)
parent	6a339b4f9ec107438bb71a6f9ca72fd42fbfd436 (diff)